merge: update to ungoogled-chromium 141.0.7390.54

This commit is contained in:
wukko
2025-10-02 18:00:29 +06:00
72 changed files with 1061 additions and 762 deletions

View File

@@ -1 +1 @@
140.0.7339.213
141.0.7390.54

File diff suppressed because it is too large Load Diff

View File

@@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials
/**
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -223,22 +223,7 @@ bool GetInstanceManipulations(const net:
@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net:
// Variations seed fetching is only enabled in official Chrome builds, if a URL
// is specified on the command line, and for testing.
bool IsFetchingEnabled() {

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3794,8 +3794,6 @@ static_library("browser") {
@@ -3802,8 +3802,6 @@ static_library("browser") {
"download/download_auto_open_policy_handler.cc",
"download/download_auto_open_policy_handler.h",
"download/download_commands.cc",
@@ -48,7 +48,7 @@
} // namespace
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -128,7 +128,7 @@ class DownloadItemModelData : public bas
@@ -129,7 +129,7 @@ class DownloadItemModelData : public bas
// Danger level of the file determined based on the file type and whether
// there was a user action associated with the download.
@@ -57,7 +57,7 @@
// Whether the download is currently being revived.
bool is_being_revived_ = false;
@@ -463,13 +463,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -464,13 +464,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -180,7 +180,7 @@
class DownloadsShowFunction : public ExtensionFunction {
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -703,18 +703,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -701,18 +701,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -245,7 +245,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -77,6 +78,7 @@ static_library("safe_browsing") {
@@ -80,6 +81,7 @@ static_library("safe_browsing") {
"//services/metrics/public/cpp:ukm_builders",
"//services/preferences/public/cpp",
]
@@ -253,7 +253,7 @@
if (enable_extensions) {
deps += [ "//chrome/browser/ui/web_applications" ]
@@ -601,6 +603,7 @@ static_library("advanced_protection") {
@@ -612,6 +614,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -261,7 +261,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -620,6 +623,7 @@ source_set("metrics_collector") {
@@ -631,6 +634,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -314,7 +314,7 @@
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -110,7 +110,6 @@
@@ -114,7 +114,6 @@
#include "components/pdf/common/pdf_util.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/buildflags.h"

View File

@@ -1,6 +1,6 @@
--- a/chrome/updater/configurator.cc
+++ b/chrome/updater/configurator.cc
@@ -147,7 +147,7 @@ base::TimeDelta Configurator::UpdateDela
@@ -133,7 +133,7 @@ base::TimeDelta Configurator::UpdateDela
std::vector<GURL> Configurator::UpdateUrl() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

View File

@@ -101,7 +101,7 @@ by default.
"-----BEGIN PUBLIC KEY-----"
--- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
@@ -110,7 +110,7 @@ void OnURLLoadUploadProgress(uint64_t cu
@@ -111,7 +111,7 @@ void OnURLLoadUploadProgress(uint64_t cu
} // namespace
const char WebRtcEventLogUploaderImpl::kUploadURL[] =
@@ -167,7 +167,7 @@ by default.
base::ToLowerASCII(bdict_file));
--- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
+++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
@@ -32,7 +32,7 @@
@@ -33,7 +33,7 @@
namespace {
// The URL to be used to re-install Chrome when auto-update failed for too long.
@@ -178,7 +178,7 @@ by default.
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -76,17 +76,17 @@ namespace {
@@ -66,17 +66,17 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if BUILDFLAG(IS_CHROMEOS)
@@ -202,7 +202,7 @@ by default.
std::string ReplaceTemplateExpressions(
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -45,9 +45,9 @@ namespace {
@@ -46,9 +46,9 @@ namespace {
// TODO(battre): Delete the HTTP URL once the blocklist is downloaded via HTTPS.
const char kExtensionBlocklistUrlPrefix[] =
@@ -274,13 +274,9 @@ by default.
url::Component query(0, static_cast<int>(str.length())), key, value;
--- a/components/history/core/browser/web_history_service.cc
+++ b/components/history/core/browser/web_history_service.cc
@@ -42,13 +42,13 @@ namespace history {
@@ -43,13 +43,13 @@ namespace history {
namespace {
-const char kHistoryOAuthScope[] = "https://www.googleapis.com/auth/chromesync";
+const char kHistoryOAuthScope[] = "trk:138:https://www.googleapis.com/auth/chromesync";
const char kHistoryQueryHistoryUrl[] =
- "https://history.google.com/history/api/lookup?client=chrome";
+ "trk:139:https://history.google.com/history/api/lookup?client=chrome";
@@ -289,8 +285,12 @@ by default.
- "https://history.google.com/history/api/delete?client=chrome";
+ "trk:140:https://history.google.com/history/api/delete?client=chrome";
const char kHistoryAudioHistoryUrl[] =
"https://history.google.com/history/api/lookup?client=audio";
const char kQueryWebAndAppActivityUrl[] =
- "https://history.google.com/history/api/lookup?client=web_app";
+ "trk:138:https://history.google.com/history/api/lookup?client=web_app";
const char kQueryOtherFormsOfBrowsingHistoryUrlSuffix[] = "/historystatus";
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -68,7 +68,7 @@ const int ClientSideDetectionService::kN
@@ -326,9 +326,9 @@ by default.
base::Value::Dict dict;
--- a/components/translate/core/browser/translate_url_fetcher.cc
+++ b/components/translate/core/browser/translate_url_fetcher.cc
@@ -98,6 +98,7 @@ bool TranslateURLFetcher::Request(const
if (!extra_request_header_.empty())
resource_request->headers.AddHeaderFromString(extra_request_header_);
@@ -97,6 +97,7 @@ bool TranslateURLFetcher::Request(const
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->headers.MergeFrom(extra_request_header_);
+ fprintf(stderr, "translator: fetching something from %s\n", url_.spec().c_str());
simple_loader_ =
@@ -343,8 +343,8 @@ by default.
-const char kSecurityOrigin[] = "https://translate.googleapis.com/";
+const char kSecurityOrigin[] = "trk:220:https://translate.googleapis.com/";
// The feature is explicitly disabled on Webview and Weblayer.
// TODO(crbug.com/40819484): Enable the feature on Webview.
// The feature is explicitly disabled on WebView.
// TODO(crbug.com/40819484): Enable the feature on WebView.
--- a/components/variations/variations_url_constants.cc
+++ b/components/variations/variations_url_constants.cc
@@ -8,7 +8,7 @@ namespace variations {

View File

@@ -16,7 +16,7 @@ the URL so we get notified if this happens again in the future).
--- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
+++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
@@ -63,8 +63,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
@@ -64,8 +64,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
Profile::FromBrowserContext(web_contents->GetBrowserContext());
// Create appropriate display options for this blocking page.
PrefService* prefs = profile->GetPrefs();

View File

@@ -8,7 +8,7 @@
# Dev tools attempts to download css data
--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
@@ -307,6 +307,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
@@ -302,6 +302,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {

View File

@@ -47,7 +47,7 @@
std::u16string real_url(text.substr(after_scheme_and_colon));
--- a/components/url_formatter/url_fixer.cc
+++ b/components/url_formatter/url_fixer.cc
@@ -602,6 +602,10 @@ GURL FixupURLInternal(const std::string&
@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string&
}
}
@@ -70,7 +70,7 @@
// other origins, so we should not treat them as web safe. Remove callers of
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1113,6 +1113,8 @@ component("net") {
@@ -1123,6 +1123,8 @@ component("net") {
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
"url_request/storage_access_status_cache.h",

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2711,24 +2711,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2844,24 +2844,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}

View File

@@ -24,7 +24,7 @@
.english :lang(zh) {display: none}
--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
@@ -153,7 +153,7 @@ function maybeSetWebFont() {
@@ -211,7 +211,7 @@ function maybeSetWebFont() {
}
const e = document.createElement('link');

View File

@@ -570,7 +570,7 @@
bool IsProbablyGoogleSearchUrl(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -608,10 +608,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -609,10 +609,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -595,7 +595,7 @@
namespace {
// The result of checking whether a request to a URL should have variations
@@ -112,16 +108,6 @@ URLValidationResult GetUrlValidationResu
@@ -116,16 +112,6 @@ URLValidationResult GetUrlValidationResu
return URLValidationResult::kShouldAppend;
}
@@ -612,7 +612,7 @@
// Returns true if the request is sent from a Google web property, i.e. from a
// first-party context.
//
@@ -248,28 +234,7 @@ class VariationsHeaderHelper {
@@ -252,30 +238,7 @@ class VariationsHeaderHelper {
VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
@@ -626,11 +626,13 @@
- // 2. Only transmit for non-Incognito profiles.
- // 3. For the X-Client-Data header, only include non-empty variation IDs.
- if ((incognito == InIncognito::kYes) ||
- !ShouldAppendVariationsHeader(url, "Append"))
- !ShouldAppendVariationsHeader(url, "Append")) {
- return false;
- }
-
- if (variations_header_.empty())
- if (variations_header_.empty()) {
- return false;
- }
-
- // Set the variations header to cors_exempt_headers rather than headers to
- // be exempted from CORS checks, and to avoid exposing the header to service
@@ -642,16 +644,17 @@
}
private:
@@ -334,8 +299,6 @@ void RemoveVariationsHeaderIfNeeded(
@@ -341,9 +304,6 @@ void RemoveVariationsHeaderIfNeeded(
const net::RedirectInfo& redirect_info,
const network::mojom::URLResponseHead& response_head,
std::vector<std::string>* to_be_removed_headers) {
- if (!ShouldAppendVariationsHeader(redirect_info.new_url, "Remove"))
- if (!ShouldAppendVariationsHeader(redirect_info.new_url, "Remove")) {
- to_be_removed_headers->push_back(kClientDataHeader);
- }
}
std::unique_ptr<network::SimpleURLLoader>
@@ -371,29 +334,22 @@ CreateSimpleURLLoaderWithVariationsHeade
@@ -379,29 +339,22 @@ CreateSimpleURLLoaderWithVariationsHeade
}
bool HasVariationsHeader(const network::ResourceRequest& request) {
@@ -686,7 +689,7 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -949,7 +949,7 @@ void PrefetchContainer::AddRedirectHop(c
@@ -777,7 +777,7 @@ void PrefetchContainer::AddRedirectHop(c
// some which are added by throttles). These aren't yet supported for
// prefetch, including browsing topics and client hints.
net::HttpRequestHeaders updated_headers;

View File

@@ -25,7 +25,7 @@
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -104,11 +104,6 @@ group("resources") {
@@ -106,11 +106,6 @@ group("resources") {
]
}

View File

@@ -75,7 +75,7 @@
PrivacySandboxSettingsImpl::Status
--- a/content/browser/attribution_reporting/attribution_suitable_context.cc
+++ b/content/browser/attribution_reporting/attribution_suitable_context.cc
@@ -45,85 +45,13 @@ bool UkmSourceIdAllowed(RenderFrameHostI
@@ -44,82 +44,13 @@ bool UkmSourceIdAllowed(RenderFrameHostI
// static
std::optional<AttributionSuitableContext> AttributionSuitableContext::Create(
NavigationHandle* navigation_handle) {
@@ -152,9 +152,6 @@
- attribution_host->GetMostRecentNavigationInputEvent(),
- AttributionOsLevelManager::GetAttributionReportingOsRegistrars(
- web_contents),
- !url_matcher::util::GetGoogleAmpViewerEmbeddedURL(
- initiator_root_frame->GetLastCommittedURL())
- .is_empty(),
- UkmSourceIdAllowed(initiator_root_frame)
- ? attribution_host->GetPageUkmSourceId()
- : ukm::kInvalidSourceId,
@@ -164,7 +161,7 @@
// static
--- a/content/browser/interest_group/ad_auction_service_impl.cc
+++ b/content/browser/interest_group/ad_auction_service_impl.cc
@@ -192,11 +192,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
@@ -193,11 +193,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
void AdAuctionServiceImpl::CreateMojoService(
RenderFrameHost* render_frame_host,
mojo::PendingReceiver<blink::mojom::AdAuctionService> receiver) {
@@ -240,7 +237,7 @@
void StoragePartitionImpl::ResetSessionStorageConnections() {
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4196,12 +4196,6 @@ void WebContentsImpl::Init(const WebCont
@@ -4192,12 +4192,6 @@ void WebContentsImpl::Init(const WebCont
DateTimeChooser::CreateDateTimeChooser(this);
#endif

View File

@@ -116,7 +116,7 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -135,7 +135,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -139,7 +139,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

View File

@@ -78,15 +78,11 @@
} // namespace extensions
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -92,28 +92,19 @@ const char kNotFromWebstoreInstallSource
@@ -92,25 +92,16 @@ const char kNotFromWebstoreInstallSource
const char kDefaultInstallSource[] = "";
const char kReinstallInstallSource[] = "reinstall";
-const char kGoogleDotCom[] = "google.com";
const char kTokenServiceConsumerId[] = "extension_downloader";
const char kWebstoreOAuth2Scope[] =
- "https://www.googleapis.com/auth/chromewebstore.readonly";
+ "trk:10:https://www.googleapis.com/auth/chromewebstore.readonly";
ExtensionDownloader::TestObserver* g_test_observer = nullptr;
ExtensionDownloaderTestDelegate* g_test_delegate = nullptr;
@@ -109,7 +105,7 @@
bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
DCHECK(loader);
@@ -169,7 +160,7 @@ std::optional<GURL> SanitizeUpdateURL(co
@@ -166,7 +157,7 @@ std::optional<GURL> SanitizeUpdateURL(co
const GURL& update_url) {
if (update_url.is_empty()) {
// Fill in default update URL.
@@ -118,7 +114,7 @@
}
// Skip extensions with non-empty invalid update URLs.
@@ -187,11 +178,6 @@ std::optional<GURL> SanitizeUpdateURL(co
@@ -184,11 +175,6 @@ std::optional<GURL> SanitizeUpdateURL(co
return std::nullopt;
}
@@ -130,7 +126,7 @@
return update_url;
}
@@ -369,10 +355,6 @@ void ExtensionDownloader::DoStartAllPend
@@ -366,10 +352,6 @@ void ExtensionDownloader::DoStartAllPend
AddToFetches(fetches_preparing, std::move(task));
pending_tasks_.clear();
@@ -141,7 +137,7 @@
}
void ExtensionDownloader::SetIdentityManager(
@@ -833,20 +815,6 @@ void ExtensionDownloader::HandleManifest
@@ -830,20 +812,6 @@ void ExtensionDownloader::HandleManifest
update.second->info);
}
@@ -162,7 +158,7 @@
ExtensionIdSet extension_ids_with_errors;
for (const auto& failure : failures)
extension_ids_with_errors.insert(failure.first.id);
@@ -1428,11 +1396,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -1423,11 +1391,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -864,19 +864,6 @@ void ExtensionInfoGenerator::FillExtensi
@@ -867,19 +867,6 @@ void ExtensionInfoGenerator::FillExtensi
toolbar_actions_model->IsActionPinned(extension.id());
}
@@ -22,7 +22,7 @@
// `CanUploadAsAccountExtension` should already check for the feature flag
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -355,31 +355,7 @@ bool ExtensionManagement::IsAllowedManif
@@ -348,31 +348,7 @@ bool ExtensionManagement::IsAllowedManif
int manifest_version,
const std::string& extension_id,
Manifest::Type manifest_type) {
@@ -54,7 +54,7 @@
}
bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
@@ -400,26 +376,8 @@ bool ExtensionManagement::IsExemptFromMV
@@ -393,26 +369,8 @@ bool ExtensionManagement::IsExemptFromMV
return false;
}
@@ -83,7 +83,7 @@
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
@@ -145,22 +145,6 @@ bool ManifestV2ExperimentManagerFactory:
@@ -145,17 +145,6 @@ bool ManifestV2ExperimentManagerFactory:
// Determines the current stage of the MV2 deprecation experiments.
MV2ExperimentStage CalculateCurrentExperimentStage() {
@@ -98,15 +98,10 @@
- return MV2ExperimentStage::kDisableWithReEnable;
- }
-
- if (base::FeatureList::IsEnabled(
- extensions_features::kExtensionManifestV2DeprecationWarning)) {
- return MV2ExperimentStage::kWarning;
- }
-
return MV2ExperimentStage::kNone;
return MV2ExperimentStage::kWarning;
}
@@ -200,19 +184,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
@@ -189,18 +178,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
// Returns true if legacy extensions should be disabled, looking at both
// experiment stage and global state.
bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) {
@@ -116,7 +111,6 @@
- }
-
- switch (stage) {
- case MV2ExperimentStage::kNone:
- case MV2ExperimentStage::kWarning:
return false;
- case MV2ExperimentStage::kDisableWithReEnable:
@@ -128,7 +122,7 @@
// Returns true if the given `stage` is one in which extension enablement should
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -482,7 +482,7 @@ content::WebUIDataSource* CreateAndAddEx
@@ -484,7 +484,7 @@ content::WebUIDataSource* CreateAndAddEx
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
source->AddBoolean(
"safetyHubThreeDotDetails",
@@ -139,7 +133,7 @@
auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -103,13 +103,6 @@ bool IsManifestSupported(int manifest_ve
@@ -101,13 +101,6 @@ bool IsManifestSupported(int manifest_ve
// Supported versions are always safe.
if (manifest_version >= kMinimumSupportedManifestVersion &&
manifest_version <= kMaximumSupportedManifestVersion) {

View File

@@ -30,7 +30,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -797,10 +797,6 @@ static_library("browser") {
@@ -793,10 +793,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_metrics_document_data.h",
"navigation_predictor/navigation_predictor_preconnect_client.cc",
"navigation_predictor/navigation_predictor_preconnect_client.h",
@@ -41,7 +41,7 @@
"navigation_predictor/search_engine_preconnector_keyed_service_factory.cc",
"navigation_predictor/search_engine_preconnector_keyed_service_factory.h",
"net/cert_verifier_service_time_updater.cc",
@@ -3678,10 +3674,6 @@ static_library("browser") {
@@ -3686,10 +3682,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
@@ -52,7 +52,7 @@
"accessibility/caption_bubble_context_browser.h",
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4341,8 +4333,6 @@ static_library("browser") {
@@ -4345,8 +4337,6 @@ static_library("browser") {
"//chrome/app:command_ids",
"//chrome/app/theme:chrome_unscaled_resources_grit",
"//chrome/app/vector_icons",
@@ -61,7 +61,7 @@
"//chrome/browser/actor",
"//chrome/browser/actor:impl",
"//chrome/browser/actor/ui",
@@ -4369,10 +4359,6 @@ static_library("browser") {
@@ -4373,10 +4363,6 @@ static_library("browser") {
"//chrome/browser/performance_manager/user_tuning",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resource_coordinator",
@@ -72,7 +72,7 @@
"//chrome/browser/search/background",
"//chrome/browser/sharing_hub",
"//chrome/browser/smart_card",
@@ -4416,7 +4402,6 @@ static_library("browser") {
@@ -4421,7 +4407,6 @@ static_library("browser") {
"//chrome/browser/ui/webui/access_code_cast",
"//chrome/browser/ui/webui/actor_internals",
"//chrome/browser/ui/webui/app_service_internals",
@@ -80,7 +80,7 @@
"//chrome/browser/ui/webui/color_pipeline_internals",
"//chrome/browser/ui/webui/infobar_internals",
"//chrome/browser/ui/webui/infobar_internals:impl",
@@ -4536,9 +4521,6 @@ static_library("browser") {
@@ -4551,9 +4536,6 @@ static_library("browser") {
"//components/webauthn/core/browser",
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/hid",
@@ -90,7 +90,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4644,8 +4626,6 @@ static_library("browser") {
@@ -4714,8 +4696,6 @@ static_library("browser") {
sources += [
"accessibility/soda_installer_impl.cc",
"accessibility/soda_installer_impl.h",
@@ -99,7 +99,7 @@
"device_identity/device_oauth2_token_store_desktop.cc",
"device_identity/device_oauth2_token_store_desktop.h",
"device_notifications/device_status_icon_renderer.cc",
@@ -4701,8 +4681,6 @@ static_library("browser") {
@@ -4771,8 +4751,6 @@ static_library("browser") {
"profiles/profile_activity_metrics_recorder.h",
"profiles/profile_list_desktop.cc",
"profiles/profile_list_desktop.h",
@@ -108,7 +108,7 @@
"signin/force_signin_verifier.cc",
"signin/force_signin_verifier.h",
"signin/signin_manager.cc",
@@ -5511,7 +5489,6 @@ static_library("browser") {
@@ -5568,7 +5546,6 @@ static_library("browser") {
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification",
"//chrome/browser/resources:app_icon_resources",
@@ -116,7 +116,7 @@
"//chrome/browser/sharesheet",
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash/accelerator",
@@ -5775,7 +5752,6 @@ static_library("browser") {
@@ -5831,7 +5808,6 @@ static_library("browser") {
"//remoting/host/chromeos:browser_interop",
"//remoting/host/chromeos:features",
"//services/device/public/cpp/geolocation",
@@ -140,7 +140,7 @@
}
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -247,12 +247,10 @@
@@ -243,12 +243,10 @@
#if BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
#include "chrome/browser/hid/hid_pinned_notification.h"
@@ -153,7 +153,7 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1384,9 +1382,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1381,9 +1379,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -237,7 +237,7 @@
#if BUILDFLAG(IS_WIN)
--- a/chrome/browser/chrome_browser_interface_binders_webui.cc
+++ b/chrome/browser/chrome_browser_interface_binders_webui.cc
@@ -803,8 +803,6 @@ void PopulateChromeWebUIFrameBinders(
@@ -810,8 +810,6 @@ void PopulateChromeWebUIFrameBinders(
::mojom::app_service_internals::AppServiceInternalsPageHandler,
AppServiceInternalsUI>(map);
@@ -372,7 +372,7 @@
void NavigationPredictor::SetModelScoreCallbackForTesting(
--- a/chrome/browser/pdf/pdf_extension_util.cc
+++ b/chrome/browser/pdf/pdf_extension_util.cc
@@ -110,7 +110,6 @@ void AddPdfViewerStrings(base::Value::Di
@@ -111,7 +111,6 @@ void AddPdfViewerStrings(base::Value::Di
{"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90},
{"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180},
{"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270},
@@ -395,7 +395,7 @@
"prediction_service/prediction_service_request.cc",
--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -475,8 +475,6 @@ ChromePermissionsClient::CreatePermissio
@@ -474,8 +474,6 @@ ChromePermissionsClient::CreatePermissio
#endif
selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
Profile::FromBrowserContext(browser_context)));
@@ -406,21 +406,28 @@
--- a/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
+++ b/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
@@ -17,11 +17,6 @@ PassageEmbedderDelegate::PassageEmbedder
@@ -17,18 +17,6 @@ PassageEmbedderDelegate::PassageEmbedder
: profile_(profile) {}
Embedder* PassageEmbedderDelegate::get_passage_embedder() {
- if (auto* prediction_model_handler_provider =
- PredictionModelHandlerProviderFactory::GetForBrowserContext(
- profile_)) {
- bool is_ready = prediction_model_handler_provider->IsPassageEmbedderReady();
- PermissionUmaUtil::RecordPassageEmbedderMetadataValid(is_ready);
- if (!is_ready) {
- VLOG(1) << "[PermissionsAIv4] "
- "PassageEmbedderDelegate::get_passage_embedder is not ready.";
- return nullptr;
- }
- return prediction_model_handler_provider->GetPassageEmbedder();
- }
PermissionUmaUtil::RecordPassageEmbedderMetadataValid(false);
return nullptr;
}
--- a/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
@@ -836,7 +836,7 @@ void PredictionBasedPermissionUiSelector
@@ -857,7 +857,7 @@ void PredictionBasedPermissionUiSelector
ModelExecutionData model_data) {
VLOG(1) << "[PermissionsAI] ExecuteOnDeviceAivXModel";
PredictionModelHandlerProvider* prediction_model_handler_provider =
@@ -441,7 +448,7 @@
"//chrome/browser/search_engines",
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1830,9 +1830,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1907,9 +1907,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -453,7 +460,7 @@
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -320,7 +320,6 @@ source_set("profiles_extra_parts_impl")
@@ -324,7 +324,6 @@ source_set("profiles_extra_parts_impl")
]
} else {
deps += [
@@ -461,7 +468,7 @@
"//chrome/browser/apps/app_service",
"//chrome/browser/autofill",
"//chrome/browser/contextual_cueing",
@@ -328,7 +327,6 @@ source_set("profiles_extra_parts_impl")
@@ -332,7 +331,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/feedback",
"//chrome/browser/hid",
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
@@ -479,7 +486,7 @@
#include "chrome/browser/navigation_predictor/search_engine_preconnector.h"
#include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h"
#include "chrome/browser/net/dns_probe_service_factory.h"
@@ -339,7 +338,6 @@
@@ -342,7 +341,6 @@
#include "chrome/browser/prefs/persistent_renderer_prefs_manager_factory.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
#include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
@@ -487,7 +494,7 @@
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/search/instant_service_factory.h"
@@ -1057,7 +1055,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1056,7 +1054,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
net::ServerCertificateDatabaseServiceFactory::GetInstance();
#endif
@@ -495,7 +502,7 @@
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
ProfileManagementDisclaimerServiceFactory::GetInstance();
#endif
@@ -1112,9 +1109,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1105,9 +1102,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -505,7 +512,7 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1186,13 +1180,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1187,13 +1181,6 @@ void ChromeBrowserMainExtraPartsProfiles
policy::UserPolicySigninServiceFactory::GetInstance();
#endif
PolicyBlocklistFactory::GetInstance();
@@ -519,9 +526,9 @@
PredictionServiceFactory::GetInstance();
predictors::AutocompleteActionPredictorFactory::GetInstance();
predictors::LoadingPredictorFactory::GetInstance();
@@ -1278,10 +1265,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
@@ -1275,10 +1262,6 @@ void ChromeBrowserMainExtraPartsProfiles
SafetyHubMenuNotificationServiceFactory::GetInstance();
#if !BUILDFLAG(IS_ANDROID)
SafetyHubHatsServiceFactory::GetInstance();
- if (features::IsMainNodeAnnotationsEnabled()) {
- screen_ai::AXMainNodeAnnotatorControllerFactory::GetInstance();
@@ -530,7 +537,7 @@
#endif
#if BUILDFLAG(IS_CHROMEOS)
if (ash::features::IsScannerEnabled()) {
@@ -1401,7 +1384,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1399,7 +1382,6 @@ void ChromeBrowserMainExtraPartsProfiles
TrackingProtectionSettingsFactory::GetInstance();
translate::TranslateRankerFactory::GetInstance();
#if !BUILDFLAG(IS_ANDROID)
@@ -540,7 +547,7 @@
#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -225,11 +225,6 @@ void OffTheRecordProfileImpl::Init() {
@@ -224,11 +224,6 @@ void OffTheRecordProfileImpl::Init() {
// AccessibilityLabelsService has a default prefs behavior in incognito.
AccessibilityLabelsService::InitOffTheRecordPrefs(this);
@@ -554,7 +561,7 @@
// System Profile.
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -855,11 +855,6 @@ void ProfileImpl::DoFinalInit(CreateMode
@@ -845,11 +845,6 @@ void ProfileImpl::DoFinalInit(CreateMode
// The password settings service needs to start listening to settings
// changes from Google Mobile Services, as early as possible.
PasswordManagerSettingsServiceFactory::GetForProfile(this);
@@ -576,7 +583,7 @@
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/delete_profile_helper.h"
#include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
@@ -1493,9 +1492,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1486,9 +1485,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -588,7 +595,7 @@
#if BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -107,7 +107,6 @@ group("resources") {
@@ -109,7 +109,6 @@ group("resources") {
if (is_mac) {
public_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -598,7 +605,7 @@
--- a/chrome/browser/resources/pdf/pdf_viewer.html
+++ b/chrome/browser/resources/pdf/pdf_viewer.html
@@ -113,10 +113,6 @@ import {AnnotationMode} from './constant
@@ -105,10 +105,6 @@ import {AnnotationMode} from './constant
</cr-page-selector>
` : ''}
</if>
@@ -611,7 +618,7 @@
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1524,8 +1524,6 @@ static_library("ui") {
@@ -1430,8 +1430,6 @@ static_library("ui") {
"//chrome/browser/regional_capabilities",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
@@ -620,7 +627,7 @@
"//chrome/browser/smart_card",
"//chrome/browser/tab_group_sync:utils",
"//chrome/browser/themes",
@@ -2278,7 +2276,6 @@ static_library("ui") {
@@ -2191,7 +2189,6 @@ static_library("ui") {
"//chrome/browser/policy:onc",
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification",
@@ -628,8 +635,8 @@
"//chrome/browser/ui/ash/accessibility",
"//chrome/browser/ui/ash/app_access",
"//chrome/browser/ui/ash/arc",
@@ -4787,7 +4784,6 @@ static_library("ui") {
"//chrome/browser/ui/views/user_education",
@@ -4638,7 +4635,6 @@ static_library("ui") {
# c/b/ui/passwords/passwords_model_delegate.h, passwords_client_ui_delegate.h.
"//chrome/browser/ui/webauthn:impl",
"//chrome/browser/ui/webui/app_service_internals",
- "//chrome/browser/ui/webui/autofill_ml_internals",
@@ -690,7 +697,7 @@
std::vector<base::CallbackListSubscription> tab_subscriptions_;
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -764,39 +764,6 @@ void MaybeRegisterChromeFeaturePromos(
@@ -746,39 +746,6 @@ void MaybeRegisterChromeFeaturePromos(
.SetBubbleIcon(kLightbulbOutlineIcon)
.SetBubbleTitleText(IDS_PASSWORD_MANAGER_IPH_CREATE_SHORTCUT_TITLE)));
@@ -742,7 +749,7 @@
"//chrome/browser/ui/webui/new_tab_footer",
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -295,7 +295,6 @@ void RegisterChromeWebUIConfigs() {
@@ -297,7 +297,6 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<actor::ui::ActorOverlayUIConfig>());
map.AddWebUIConfig(std::make_unique<ActorInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<AppServiceInternalsUIConfig>());
@@ -855,7 +862,7 @@
#include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
@@ -376,14 +374,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -325,14 +323,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
@@ -870,9 +877,20 @@
// Enable accessibility for the top level render frame and all descendants.
// This causes AXTreeSerializer to reset and send accessibility events of
--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
@@ -46,7 +46,7 @@ declare_args() {
enable_chrome_notifications = is_mac || is_win || is_linux || is_fuchsia
# Enables inclusion of glic in the build.
- enable_glic = is_mac || is_win || is_linux
+ enable_glic = false
# Hangout services is an extension that adds extra features to Hangouts.
# It is enableable separately to facilitate testing.
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -334,18 +334,6 @@ static_library("renderer") {
@@ -340,18 +340,6 @@ static_library("renderer") {
]
} else {
sources += [
@@ -891,7 +909,7 @@
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -360,7 +348,6 @@ static_library("renderer") {
@@ -367,7 +355,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
@@ -901,7 +919,7 @@
]
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -71,7 +71,6 @@
@@ -72,7 +72,6 @@
#include "url/gurl.h"
#if !BUILDFLAG(IS_ANDROID)
@@ -909,15 +927,14 @@
#include "chrome/renderer/actor/journal.h"
#include "chrome/renderer/actor/tool_executor.h"
#include "chrome/renderer/searchbox/searchbox_extension.h"
@@ -324,21 +323,6 @@ void ChromeRenderFrameObserver::DidCommi
@@ -325,20 +324,6 @@ void ChromeRenderFrameObserver::DidCommi
}
void ChromeRenderFrameObserver::DidClearWindowObject() {
-#if !BUILDFLAG(IS_ANDROID)
- const base::CommandLine& command_line =
- *base::CommandLine::ForCurrentProcess();
- if (command_line.HasSwitch(switches::kInstantProcess))
- if (process_state::IsInstantProcess()) {
- SearchBoxExtension::Install(render_frame()->GetWebFrame());
- }
-
- // Install ReadAnythingAppController on render frames with the Read Anything
- // url, which is chrome-untrusted. ReadAnythingAppController installs v8
@@ -933,7 +950,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2375,9 +2375,6 @@ if (!is_android) {
@@ -2405,9 +2405,6 @@ if (!is_android) {
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/safe_browsing:advanced_protection",
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -943,7 +960,7 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2809,8 +2806,6 @@ if (!is_android) {
@@ -2847,8 +2844,6 @@ if (!is_android) {
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
"//services/preferences/tracked:features",
@@ -952,7 +969,7 @@
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -8444,7 +8439,6 @@ test("unit_tests") {
@@ -8504,7 +8499,6 @@ test("unit_tests") {
#
# TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
deps += [
@@ -960,7 +977,7 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -8477,7 +8471,6 @@ test("unit_tests") {
@@ -8537,7 +8531,6 @@ test("unit_tests") {
"//chrome/browser/profile_resetter:fake_profile_resetter",
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/resources/new_tab_page_instant:resources_grit",
@@ -1033,7 +1050,7 @@
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -613,7 +613,6 @@ test("components_unittests") {
@@ -617,7 +617,6 @@ test("components_unittests") {
"//components/media_router/common/providers/cast/channel:unit_tests",
"//components/page_info:unit_tests",
"//components/permissions:unit_tests",
@@ -1051,6 +1068,35 @@
#include "components/autofill/core/browser/proto/server.pb.h"
#include "components/autofill/core/common/autofill_constants.h"
#include "components/autofill/core/common/autofill_features.h"
--- a/components/autofill/core/browser/foundations/autofill_manager.cc
+++ b/components/autofill/core/browser/foundations/autofill_manager.cc
@@ -909,26 +909,6 @@ void AutofillManager::LogCurrentFieldTyp
void AutofillManager::SubscribeToMlModelChanges(
FieldClassificationModelHandler& handler,
optimization_guide::proto::OptimizationTarget optimization_target) {
- switch (optimization_target) {
- case optimization_guide::proto::OptimizationTarget::
- OPTIMIZATION_TARGET_AUTOFILL_FIELD_CLASSIFICATION:
- if (!autofill_model_change_subscription_) {
- autofill_model_change_subscription_ =
- handler.RegisterModelChangeCallback(base::BindRepeating(
- &AutofillManager::ReparseKnownForms, base::Unretained(this)));
- }
- break;
- case optimization_guide::proto::OptimizationTarget::
- OPTIMIZATION_TARGET_PASSWORD_MANAGER_FORM_CLASSIFICATION:
- if (!password_manager_model_change_subscription_) {
- password_manager_model_change_subscription_ =
- handler.RegisterModelChangeCallback(base::BindRepeating(
- &AutofillManager::ReparseKnownForms, base::Unretained(this)));
- }
- break;
- default:
- NOTREACHED();
- }
}
} // namespace autofill
--- a/components/omnibox/browser/autocomplete_classifier.cc
+++ b/components/omnibox/browser/autocomplete_classifier.cc
@@ -131,8 +131,6 @@ void AutocompleteClassifier::Classify(
@@ -1094,7 +1140,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -836,10 +836,6 @@ if (is_apple) {
@@ -835,10 +835,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -1105,6 +1151,64 @@
if (v8_use_external_startup_data) {
public_deps += [ "//v8" ]
if (use_v8_context_snapshot) {
--- a/services/on_device_model/ml/BUILD.gn
+++ b/services/on_device_model/ml/BUILD.gn
@@ -66,7 +66,6 @@ if (use_blink || (is_ios && build_with_i
"//components/optimization_guide/core:features",
"//components/translate/core/language_detection",
"//services/on_device_model:backend_interfaces",
- "//services/on_device_model/safety:safety_util",
"//third_party/abseil-cpp:absl",
"//third_party/angle:includes",
"//third_party/dawn/src/dawn:proc",
@@ -79,9 +78,6 @@ if (use_blink || (is_ios && build_with_i
if (use_blink) {
deps += [ "//gpu/config" ]
}
- if (!is_fuchsia) {
- deps += [ "//services/on_device_model/safety:bert_safety_model" ]
- }
if (is_win || is_mac || is_linux) {
deps += [ "//third_party/xnnpack" ]
}
--- a/services/on_device_model/ml/ts_model.cc
+++ b/services/on_device_model/ml/ts_model.cc
@@ -25,9 +25,6 @@
#include "services/on_device_model/public/mojom/on_device_model_service.mojom.h"
#include "services/on_device_model/safety/safety_util.h"
-#if !BUILDFLAG(IS_FUCHSIA)
-#include "services/on_device_model/safety/bert_safety_model.h"
-#endif
namespace ml {
@@ -166,13 +163,7 @@ mojom::SafetyInfoPtr TsModel::ClassifyTe
mojom::LanguageDetectionResultPtr TsModel::DetectLanguage(
std::string_view text) {
- if (!language_detector_) {
return nullptr;
- }
- language_detection::Prediction prediction = on_device_model::PredictLanguage(
- language_detector_->tflite_model(), text);
- return mojom::LanguageDetectionResult::New(prediction.language,
- prediction.score);
}
TsHolder::TsHolder(raw_ref<const ChromeML> chrome_ml) : chrome_ml_(chrome_ml) {}
@@ -196,11 +187,6 @@ void TsHolder::Reset(mojom::TextSafetyMo
if (impl) {
model_.Add(std::move(impl), std::move(model));
}
- } else {
- auto impl = on_device_model::BertSafetyModel::Create(std::move(params));
- if (impl) {
- model_.Add(std::move(impl), std::move(model));
- }
}
#else
CHECK(params->safety_assets->which() ==
--- a/services/on_device_model/on_device_model.gni
+++ b/services/on_device_model/on_device_model.gni
@@ -15,7 +15,6 @@ declare_args() {
@@ -1116,6 +1220,51 @@
+ enable_ml_internal = false
use_chromeos_model_service = is_chrome_branded && is_cbx
}
--- a/services/on_device_model/safety/BUILD.gn
+++ b/services/on_device_model/safety/BUILD.gn
@@ -4,42 +4,6 @@
import("//components/optimization_guide/features.gni")
-if (!is_fuchsia) {
- source_set("bert_safety_op_resolver") {
- sources = [
- "bert_safety_op_resolver.cc",
- "bert_safety_op_resolver.h",
- ]
-
- deps = [
- "//components/optimization_guide/core/inference:op_resolver",
- "//third_party/tensorflow-text:shimed_bert_model_ops",
- "//third_party/tflite",
- ]
- }
-
- source_set("bert_safety_model") {
- sources = [
- "bert_safety_model.cc",
- "bert_safety_model.h",
- ]
-
- deps = [
- ":bert_safety_op_resolver",
- ":safety_util",
- "//base",
- "//components/translate/core/language_detection",
- ]
-
- public_deps = [
- "//mojo/public/cpp/bindings",
- "//services/on_device_model/public/mojom",
- "//third_party/tflite",
- "//third_party/tflite_support",
- "//third_party/tflite_support:tflite_support_proto",
- ]
- }
-}
source_set("safety_util") {
sources = [
--- a/services/passage_embeddings/passage_embeddings_service.cc
+++ b/services/passage_embeddings/passage_embeddings_service.cc
@@ -23,7 +23,6 @@ PassageEmbeddingsService::~PassageEmbedd
@@ -1158,7 +1307,7 @@
}
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
@@ -209,7 +209,6 @@ group("unittests") {
@@ -210,7 +210,6 @@ group("unittests") {
"panels/timeline:unittests",
"panels/timeline/components:unittests",
"panels/timeline/components/insights:unittests",

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -635,8 +635,6 @@ static_library("browser") {
@@ -631,8 +631,6 @@ static_library("browser") {
"idle/idle_detection_permission_context.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -11,7 +11,7 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"k_anonymity_service/k_anonymity_service_client.cc",
@@ -2403,7 +2401,6 @@ static_library("browser") {
@@ -2384,7 +2382,6 @@ static_library("browser") {
"//components/resources",
"//components/safe_browsing/content/browser",
"//components/safe_browsing/content/browser:safe_browsing_service",
@@ -19,7 +19,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/content/common/proto:download_file_types_proto",
@@ -3992,10 +3989,6 @@ static_library("browser") {
@@ -4004,10 +4001,6 @@ static_library("browser") {
"new_tab_page/modules/modules_switches.h",
"new_tab_page/modules/new_tab_page_modules.cc",
"new_tab_page/modules/new_tab_page_modules.h",
@@ -30,7 +30,7 @@
"new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc",
"new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h",
"new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc",
@@ -8662,7 +8655,6 @@ static_library("browser_generated_files"
@@ -8716,7 +8709,6 @@ static_library("browser_generated_files"
"//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info",
"//chrome/browser/new_tab_page/chrome_colors:generate_colors_info",
"//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings",
@@ -38,7 +38,7 @@
"//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings",
@@ -9153,8 +9145,6 @@ static_library("test_support") {
@@ -9211,8 +9203,6 @@ static_library("test_support") {
"//components/reporting/util:status",
"//components/reporting/util:status_macros",
"//components/reporting/util:task_runner_context",
@@ -57,7 +57,7 @@
#include "content/public/browser/download_item_utils.h"
#include "content/public/browser/download_manager.h"
@@ -275,14 +274,6 @@ void DownloadBubbleUIController::Process
@@ -278,14 +277,6 @@ void DownloadBubbleUIController::Process
switch (command) {
case DownloadCommands::KEEP:
case DownloadCommands::DISCARD: {
@@ -74,7 +74,7 @@
// Launch a HaTS survey. Note this needs to come before the command is
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -178,7 +178,6 @@ using content::DownloadManager;
@@ -179,7 +179,6 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -82,7 +82,7 @@
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
#if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION)
@@ -1895,7 +1894,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -1899,7 +1898,6 @@ void ChromeDownloadManagerDelegate::OnDo
DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info.target_path, target_info.is_filetype_handled_safely);
@@ -90,7 +90,7 @@
}
if (ShouldBlockFile(item, target_info.danger_type)) {
MaybeReportDangerousDownloadBlocked(
@@ -1976,49 +1974,20 @@ bool ChromeDownloadManagerDelegate::IsOp
@@ -1980,49 +1978,20 @@ bool ChromeDownloadManagerDelegate::IsOp
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item,
download::DownloadDangerType danger_type) const {
@@ -489,9 +489,23 @@
signals.Set(device_signals::names::kChromeRemoteDesktopAppBlocked,
context_info.chrome_remote_desktop_app_blocked);
signals.Set(device_signals::names::kBuiltInDnsClientEnabled,
--- a/chrome/browser/enterprise/connectors/referrer_cache_utils.cc
+++ b/chrome/browser/enterprise/connectors/referrer_cache_utils.cc
@@ -44,11 +44,6 @@ safe_browsing::ReferrerChain GetSafeBrow
const GURL& url,
content::WebContents& web_contents) {
safe_browsing::ReferrerChain referrers;
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
- GetForBrowserContext(web_contents.GetBrowserContext())
- ->IdentifyReferrerChainByEventURL(
- url, sessions::SessionTabHelper::IdForTab(&web_contents),
- kReferrerUserGestureLimit, &referrers);
return referrers;
}
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -188,20 +188,7 @@ void RealtimeReportingClient::SetProfile
@@ -277,20 +277,7 @@ void RealtimeReportingClient::SetProfile
}
std::string RealtimeReportingClient::GetProfileUserName() {
@@ -535,110 +549,6 @@
return nullptr;
}
--- a/chrome/browser/enterprise/data_controls/reporting_service.cc
+++ b/chrome/browser/enterprise/data_controls/reporting_service.cc
@@ -185,10 +185,6 @@ void ReportingService::ReportPaste(
const content::ClipboardEndpoint& destination,
const content::ClipboardMetadata& metadata,
const Verdict& verdict) {
- ReportCopyOrPaste(
- source, destination, metadata, verdict,
- enterprise_connectors::kWebContentUploadDataTransferEventTrigger,
- GetEventResult(verdict.level()));
}
void ReportingService::ReportPasteWarningBypassed(
@@ -196,29 +192,17 @@ void ReportingService::ReportPasteWarnin
const content::ClipboardEndpoint& destination,
const content::ClipboardMetadata& metadata,
const Verdict& verdict) {
- ReportCopyOrPaste(
- source, destination, metadata, verdict,
- enterprise_connectors::kWebContentUploadDataTransferEventTrigger,
- enterprise_connectors::EventResult::BYPASSED);
}
void ReportingService::ReportCopy(const content::ClipboardEndpoint& source,
const content::ClipboardMetadata& metadata,
const Verdict& verdict) {
- ReportCopyOrPaste(
- source, /*destination=*/std::nullopt, metadata, verdict,
- enterprise_connectors::kClipboardCopyDataTransferEventTrigger,
- GetEventResult(verdict.level()));
}
void ReportingService::ReportCopyWarningBypassed(
const content::ClipboardEndpoint& source,
const content::ClipboardMetadata& metadata,
const Verdict& verdict) {
- ReportCopyOrPaste(
- source, /*destination=*/std::nullopt, metadata, verdict,
- enterprise_connectors::kClipboardCopyDataTransferEventTrigger,
- enterprise_connectors::EventResult::BYPASSED);
}
void ReportingService::ReportCopyOrPaste(
@@ -228,52 +212,6 @@ void ReportingService::ReportCopyOrPaste
const Verdict& verdict,
const std::string& trigger,
enterprise_connectors::EventResult event_result) {
- auto* router =
- enterprise_connectors::ReportingEventRouterFactory::GetForBrowserContext(
- &profile_.get());
-
- if (!router || verdict.triggered_rules().empty()) {
- return;
- }
-
- GURL url;
- std::string destination_string;
- std::string source_string;
- content::WebContents* web_contents = nullptr;
- if (trigger ==
- enterprise_connectors::kWebContentUploadDataTransferEventTrigger) {
- DCHECK(destination.has_value());
-
- url = GetURL(*destination);
- destination_string = url.spec();
- source_string = GetClipboardSourceString(source, *destination,
- kDataControlsRulesScopePref);
- web_contents = destination->web_contents();
- } else {
- DCHECK_EQ(trigger,
- enterprise_connectors::kClipboardCopyDataTransferEventTrigger);
- DCHECK(!destination.has_value());
-
- url = GetURL(source);
- source_string = GetURL(source).spec();
- web_contents = source.web_contents();
- }
-
- router->OnDataControlsSensitiveDataEvent(
- /*url=*/url,
- /*tab_url=*/url,
- /*source=*/source_string,
- /*destination=*/destination_string,
- /*mime_type=*/GetMimeType(metadata.format_type),
- /*trigger=*/trigger,
- /*source_active_user_email=*/
- enterprise_data_protection::GetActiveContentAreaUser(source),
- /*content_area_account_email=*/
- enterprise_connectors::ContentAreaUserProvider::GetUser(
- &profile_.get(), web_contents, url),
- /*triggered_rules=*/verdict.triggered_rules(),
- /*event_result=*/event_result,
- /*content_size=*/metadata.size.value_or(-1));
}
// --------------------------------------
@@ -303,7 +241,6 @@ ReportingServiceFactory::ReportingServic
.WithSystem(ProfileSelection::kNone)
.WithAshInternals(ProfileSelection::kNone)
.Build()) {
- DependsOn(enterprise_connectors::ReportingEventRouterFactory::GetInstance());
}
ReportingServiceFactory::~ReportingServiceFactory() = default;
--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
@@ -202,9 +202,7 @@ void LogVerdictSource(
@@ -700,7 +610,7 @@
signal_response.profile_id = profile_id_service_->GetProfileId();
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -406,8 +406,6 @@ source_set("extensions") {
@@ -411,8 +411,6 @@ source_set("extensions") {
"mv2_deprecation_impact_checker.cc",
"mv2_deprecation_impact_checker.h",
"mv2_experiment_stage.h",
@@ -730,7 +640,7 @@
info.enterprise_profile_id = signals.enterprise_profile_id;
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -377,8 +377,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -381,8 +381,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::kGeneratedHttpsFirstModePref] =
settings_api::PrefType::kNumber;
@@ -776,7 +686,7 @@
} // namespace extensions
--- a/chrome/browser/extensions/chrome_extensions_browser_client_non_android.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client_non_android.cc
@@ -34,8 +34,6 @@ void ChromeExtensionsBrowserClient::Init
@@ -31,8 +31,6 @@ void ChromeExtensionsBrowserClient::Init
// Must occur after g_browser_process is initialized.
user_script_listener_ = std::make_unique<UserScriptListener>();
@@ -1049,9 +959,23 @@
}
void PlatformNotificationServiceImpl::LogPersistentNotificationShownMetrics(
--- a/chrome/browser/page_load_metrics/observers/serp_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/serp_page_load_metrics_observer.cc
@@ -80,11 +80,6 @@ void SerpPageLoadMetricsObserver::OnFirs
return;
}
- safe_browsing::ExtensionTelemetryService* telemetry_service =
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(profile);
- if (telemetry_service) {
- telemetry_service->OnDseSerpLoaded();
- }
}
page_load_metrics::PageLoadMetricsObserver::ObservePolicy
--- a/chrome/browser/permissions/permission_revocation_request.cc
+++ b/chrome/browser/permissions/permission_revocation_request.cc
@@ -172,32 +172,6 @@ void PermissionRevocationRequest::OnSite
@@ -209,32 +209,6 @@ void PermissionRevocationRequest::OnSite
base::TimeTicks::Now() - crowd_deny_request_start_time_.value();
}
@@ -1136,7 +1060,7 @@
void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
--- a/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
@@ -687,83 +687,6 @@ bool PredictionBasedPermissionUiSelector
@@ -708,83 +708,6 @@ bool PredictionBasedPermissionUiSelector
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
permissions::RequestType request_type) {
@@ -1222,7 +1146,7 @@
return PredictionSource::kNoCpssModel;
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -2511,8 +2511,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2515,8 +2515,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -1241,7 +1165,7 @@
#include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h"
@@ -2083,7 +2082,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -2160,7 +2159,6 @@ void RegisterProfilePrefs(user_prefs::Pr
NewTabFooterUI::RegisterProfilePrefs(registry);
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
@@ -1251,7 +1175,7 @@
promos_utils::RegisterProfilePrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -880,9 +880,7 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -878,9 +878,7 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::TelomereEventRouterFactory::GetInstance();
}
#endif
@@ -1261,9 +1185,38 @@
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
BUILDFLAG(IS_WIN)
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
--- a/chrome/browser/push_messaging/push_messaging_service_factory.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "components/gcm_driver/instance_id/instance_id_profile_service.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
// static
PushMessagingServiceImpl* PushMessagingServiceFactory::GetForProfile(
@@ -73,17 +72,7 @@ PushMessagingServiceFactory::BuildServic
content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);
CHECK(!profile->IsOffTheRecord());
- // Reporting service worker network requests should only be done for ESB
- // users. The check below is the first ESB check. A second ESB check is
- // performed before anything about the service worker is sent off device to
- // Safe Browsing. If at the time of the second check the user is found to no
- // longer be an ESB user, no Safe Browsing report will be sent.
- bool includeSafeBrowsingDatabase =
- g_browser_process && g_browser_process->safe_browsing_service() &&
- safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs());
return std::make_unique<PushMessagingServiceImpl>(
profile,
- includeSafeBrowsingDatabase
- ? g_browser_process->safe_browsing_service()->database_manager()
- : nullptr);
+ nullptr);
}
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -80,9 +80,6 @@ static_library("safe_browsing") {
@@ -83,9 +83,6 @@ static_library("safe_browsing") {
]
}
@@ -1273,7 +1226,7 @@
# Note: is_android is not equivalent to safe_browsing_mode == 2.
# Sources and dependencies added to this block must not depend on anything
@@ -102,13 +99,6 @@ static_library("safe_browsing") {
@@ -105,13 +102,6 @@ static_library("safe_browsing") {
allow_circular_includes_from += [ "//chrome/browser/ash/file_manager" ]
}
@@ -1493,15 +1446,15 @@
// certificate. So, when users click proceed on an interstitial, move the tab
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4345,8 +4345,6 @@ static_library("ui") {
@@ -4185,8 +4185,6 @@ static_library("ui") {
"views/safe_browsing/password_reuse_modal_warning_dialog.h",
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
- "views/safe_browsing/tailored_security_unconsented_modal.cc",
- "views/safe_browsing/tailored_security_unconsented_modal.h",
"views/screen_sharing_util.cc",
"views/screen_sharing_util.h",
"views/select_audio_output/select_audio_output_dialog.cc",
"views/select_audio_output/select_audio_output_dialog.h",
"views/select_audio_output/select_audio_output_views.cc",
--- a/chrome/browser/ui/file_system_access/BUILD.gn
+++ b/chrome/browser/ui/file_system_access/BUILD.gn
@@ -23,7 +23,6 @@ source_set("file_system_access") {
@@ -1512,17 +1465,32 @@
"file_system_access_dialogs.cc",
"file_system_access_permission_dialog.cc",
"file_system_access_restricted_directory_dialog.cc",
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
@@ -795,12 +795,6 @@ void ChromeOmniboxClient::OnAutocomplete
extensions::MaybeShowExtensionControlledSearchNotification(
location_bar_->GetWebContents(), match_type);
- if (AutocompleteMatch::IsSearchType(match_type)) {
- if (auto* telemetry_service =
- safe_browsing::ExtensionTelemetryService::Get(profile_)) {
- telemetry_service->OnOmniboxSearch(match);
- }
- }
#endif
}
--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
+++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
@@ -46,7 +46,6 @@
@@ -40,7 +40,6 @@
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/common/features.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "revoked_permissions_service.h"
@@ -210,31 +209,6 @@ RevokedPermissionsService::RevokedPermis
#include "content/public/browser/page.h"
@@ -157,31 +156,6 @@ RevokedPermissionsService::RevokedPermis
base::Unretained(this)));
#endif // BUILDFLAG(IS_ANDROID)
@@ -1554,15 +1522,13 @@
unused_site_permissions_manager_ =
std::make_unique<UnusedSitePermissionsManager>(browser_context, prefs);
@@ -1005,7 +979,7 @@ bool RevokedPermissionsService::IsUnused
@@ -562,5 +536,5 @@ bool RevokedPermissionsService::IsUnused
}
bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() {
- return safe_browsing::IsSafeBrowsingEnabled(*pref_change_registrar_->prefs());
+ return false;
}
const std::set<ContentSettingsType>
--- a/chrome/browser/ui/tab_contents/BUILD.gn
+++ b/chrome/browser/ui/tab_contents/BUILD.gn
@@ -51,7 +51,6 @@ source_set("impl") {
@@ -1576,7 +1542,7 @@
--- a/chrome/browser/ui/toasts/toast_service.cc
+++ b/chrome/browser/ui/toasts/toast_service.cc
@@ -35,7 +35,6 @@
#include "components/plus_addresses/features.h"
#include "components/plus_addresses/core/common/features.h"
#include "components/plus_addresses/grit/plus_addresses_strings.h"
#include "components/safe_browsing/core/common/features.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -1687,9 +1653,26 @@
}
void RecordDownloadsPageValidatedHistogram(download::DownloadItem* item) {
--- a/chrome/browser/ui/webui/searchbox/searchbox_omnibox_client.cc
+++ b/chrome/browser/ui/webui/searchbox/searchbox_omnibox_client.cc
@@ -156,14 +156,6 @@ void SearchboxOmniboxClient::OnAutocompl
transition, false),
/*navigation_handle_callback=*/{});
-#if BUILDFLAG(ENABLE_EXTENSIONS)
- if (AutocompleteMatch::IsSearchType(match.type)) {
- if (auto* telemetry_service =
- safe_browsing::ExtensionTelemetryService::Get(profile_)) {
- telemetry_service->OnOmniboxSearch(match);
- }
- }
-#endif
}
base::WeakPtr<OmniboxClient> SearchboxOmniboxClient::AsWeakPtr() {
--- a/chrome/browser/ui/webui/settings/hats_handler.cc
+++ b/chrome/browser/ui/webui/settings/hats_handler.cc
@@ -64,60 +64,6 @@ void HatsHandler::RegisterMessages() {
@@ -64,56 +64,6 @@ void HatsHandler::RegisterMessages() {
*/
void HatsHandler::HandleSecurityPageHatsRequest(const base::Value::List& args) {
AllowJavascript();
@@ -1743,14 +1726,10 @@
- /*failure_callback*/ base::DoNothing(),
- /*product_specific_bits_data=*/{},
- /*product_specific_string_data=*/product_specific_string_data);
-
- // Log histogram that indicates that a survey is requested from the security
- // page.
- base::UmaHistogramBoolean("Feedback.SecurityPage.SurveyRequested", true);
}
/**
@@ -184,17 +130,7 @@ SurveyStringData HatsHandler::GetSecurit
@@ -180,17 +130,7 @@ SurveyStringData HatsHandler::GetSecurit
}
}
@@ -1812,7 +1791,7 @@
std::move(callback),
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -124,7 +124,6 @@ base::span<const base::cstring_view> Chr
@@ -127,7 +127,6 @@ base::span<const base::cstring_view> Chr
kChromeUISuggestInternalsHost,
#endif
kChromeUINTPTilesInternalsHost,
@@ -1822,7 +1801,7 @@
kChromeUITabSearchHost,
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2670,7 +2670,6 @@ if (!is_android) {
@@ -2707,7 +2707,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -1830,7 +1809,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -7114,7 +7113,6 @@ test("unit_tests") {
@@ -7175,7 +7174,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2051,29 +2030,6 @@
}
} // namespace password_manager
--- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui_util.cc
+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui_util.cc
@@ -299,20 +299,7 @@ std::string SerializeHitReport(const Hit
}
hit_report_dict.Set("threat_source", std::move(threat_source));
std::string extended_reporting_level;
- switch (hit_report.extended_reporting_level) {
- case ExtendedReportingLevel::SBER_LEVEL_OFF:
extended_reporting_level = "SBER_LEVEL_OFF";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_LEGACY:
- extended_reporting_level = "SBER_LEVEL_LEGACY";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_SCOUT:
- extended_reporting_level = "SBER_LEVEL_SCOUT";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_ENHANCED_PROTECTION:
- extended_reporting_level = "SBER_LEVEL_ENHANCED_PROTECTION";
- break;
- }
hit_report_dict.Set("extended_reporting_level",
std::move(extended_reporting_level));
hit_report_dict.Set("is_enhanced_protection",
--- a/components/safe_browsing/content/common/safe_browsing.mojom
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
@@ -170,7 +170,6 @@ interface PhishingDetector {
@@ -2248,7 +2204,7 @@
#include "components/safe_browsing/core/common/proto/csd.pb.h"
--- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
+++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
@@ -407,7 +407,6 @@ void TailoredSecurityService::MaybeNotif
@@ -405,7 +405,6 @@ void TailoredSecurityService::MaybeNotif
RecordEnabledNotificationResult(
TailoredSecurityNotificationResult::kHistoryNotSynced);
}
@@ -2256,7 +2212,7 @@
return;
}
@@ -417,7 +416,6 @@ void TailoredSecurityService::MaybeNotif
@@ -415,7 +414,6 @@ void TailoredSecurityService::MaybeNotif
RecordEnabledNotificationResult(
TailoredSecurityNotificationResult::kSafeBrowsingControlledByPolicy);
}
@@ -2264,7 +2220,7 @@
return;
}
@@ -521,25 +519,10 @@ void TailoredSecurityService::Shutdown()
@@ -519,25 +517,10 @@ void TailoredSecurityService::Shutdown()
}
void TailoredSecurityService::TailoredSecurityTimestampUpdateCallback() {
@@ -2329,6 +2285,29 @@
}
// sync_observer_ can be null in some embedders that don't support sync.
if (sync_observer_) {
--- a/components/safe_browsing/core/browser/web_ui/safe_browsing_ui_util.cc
+++ b/components/safe_browsing/core/browser/web_ui/safe_browsing_ui_util.cc
@@ -300,20 +300,7 @@ std::string SerializeHitReport(const Hit
}
hit_report_dict.Set("threat_source", std::move(threat_source));
std::string extended_reporting_level;
- switch (hit_report.extended_reporting_level) {
- case ExtendedReportingLevel::SBER_LEVEL_OFF:
extended_reporting_level = "SBER_LEVEL_OFF";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_LEGACY:
- extended_reporting_level = "SBER_LEVEL_LEGACY";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_SCOUT:
- extended_reporting_level = "SBER_LEVEL_SCOUT";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_ENHANCED_PROTECTION:
- extended_reporting_level = "SBER_LEVEL_ENHANCED_PROTECTION";
- break;
- }
hit_report_dict.Set("extended_reporting_level",
std::move(extended_reporting_level));
hit_report_dict.Set("is_enhanced_protection",
--- a/components/security_interstitials/content/ssl_blocking_page_base.cc
+++ b/components/security_interstitials/content/ssl_blocking_page_base.cc
@@ -4,7 +4,6 @@
@@ -2375,7 +2354,7 @@
void SSLBlockingPageBase::PopulateEnhancedProtectionMessage(
--- a/components/sync_preferences/common_syncable_prefs_database.cc
+++ b/components/sync_preferences/common_syncable_prefs_database.cc
@@ -316,9 +316,6 @@ constexpr auto kCommonSyncablePrefsAllow
@@ -328,9 +328,6 @@ constexpr auto kCommonSyncablePrefsAllow
{plus_addresses::prefs::kLastPlusAddressFillingTime,
{syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES,
PrefSensitivity::kNone, MergeBehavior::kNone}},
@@ -2387,7 +2366,7 @@
{syncable_prefs_ids::kFacilitatedPaymentsPix, syncer::PREFERENCES,
--- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
@@ -167,15 +167,8 @@ void FileSystemAccessSafeMoveHelper::Sta
@@ -169,15 +169,8 @@ void FileSystemAccessSafeMoveHelper::Sta
return;
}
@@ -2403,7 +2382,7 @@
}
void FileSystemAccessSafeMoveHelper::ComputeHashForSourceFile(
@@ -214,45 +207,6 @@ bool FileSystemAccessSafeMoveHelper::Req
@@ -216,45 +209,6 @@ bool FileSystemAccessSafeMoveHelper::Req
return dest_url().type() != storage::kFileSystemTypeTemporary;
}
@@ -2539,7 +2518,7 @@
}
--- a/extensions/browser/extension_registrar.cc
+++ b/extensions/browser/extension_registrar.cc
@@ -783,103 +783,27 @@ void ExtensionRegistrar::UnblockAllExten
@@ -782,103 +782,27 @@ void ExtensionRegistrar::UnblockAllExten
void ExtensionRegistrar::OnBlocklistStateRemoved(
const std::string& extension_id) {
@@ -2645,7 +2624,7 @@
void ExtensionRegistrar::OnUnpackedExtensionReloadFailed(
--- a/extensions/browser/updater/update_service.cc
+++ b/extensions/browser/updater/update_service.cc
@@ -133,13 +133,6 @@ void UpdateService::OnCrxStateChange(Upd
@@ -132,13 +132,6 @@ void UpdateService::OnCrxStateChange(Upd
break;
}

View File

@@ -1,5 +1,5 @@
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
--- a/chrome/browser/ui/accelerator_table.cc
+++ b/chrome/browser/ui/accelerator_table.cc
@@ -132,7 +132,6 @@ const AcceleratorMapping kAcceleratorMap
{ui::VKEY_OEM_PLUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_PLUS},
{ui::VKEY_ADD, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_PLUS},

View File

@@ -9,7 +9,7 @@
#include "components/translate/core/browser/translate_download_manager.h"
#include "components/translate/core/browser/translate_manager.h"
#include "components/translate/core/browser/translate_prefs.h"
@@ -2183,6 +2184,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2192,6 +2193,7 @@ void RenderViewContextMenu::AppendPageIt
}
if (CanTranslate(/*menu_logging=*/true)) {
@@ -88,7 +88,7 @@
translate_event->set_ranker_version(GetModelVersion());
--- a/components/translate/core/browser/translate_script.cc
+++ b/components/translate/core/browser/translate_script.cc
@@ -138,8 +138,13 @@ void TranslateScript::OnScriptFetchCompl
@@ -146,8 +146,13 @@ void TranslateScript::OnScriptFetchCompl
server_params.c_str());
GURL security_origin = translate::GetTranslateSecurityOrigin();

View File

@@ -9,7 +9,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2617,6 +2617,7 @@ static_library("browser") {
@@ -2599,6 +2599,7 @@ static_library("browser") {
"//third_party/libyuv",
"//third_party/metrics_proto",
"//third_party/re2",
@@ -19,7 +19,7 @@
"//third_party/widevine/cdm:headers",
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -184,6 +184,7 @@
@@ -188,6 +188,7 @@
#include "components/translate/core/common/translate_util.h"
#include "components/trusted_vault/features.h"
#include "components/ui_devtools/switches.h"
@@ -54,7 +54,7 @@
"//tools/v8_context_snapshot:buildflags",
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -81,6 +81,7 @@
@@ -83,6 +83,7 @@
#include "components/services/storage/public/cpp/quota_error_or.h"
#include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
#include "components/tracing/common/tracing_switches.h"
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "components/viz/host/host_frame_sink_manager.h"
@@ -3498,6 +3499,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3541,6 +3542,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -481,6 +482,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -484,6 +485,10 @@ void SetRuntimeFeaturesFromCommandLine(c
true},
{wrf::EnableWebAudioBypassOutputBufferingOptOut,
blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
@@ -124,7 +124,7 @@
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
@@ -1085,6 +1086,11 @@ Document::Document(const DocumentInit& i
@@ -1084,6 +1085,11 @@ Document::Document(const DocumentInit& i
TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this),
TRACE_EVENT_FLAG_FLOW_OUT);
DCHECK(agent_);
@@ -136,7 +136,7 @@
if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) &&
features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) {
script_runner_delayer_->Activate();
@@ -1215,6 +1221,14 @@ const Position Document::PositionAdjuste
@@ -1221,6 +1227,14 @@ const Position Document::PositionAdjuste
return Position::BeforeNode(*shadow_host);
}
@@ -164,19 +164,19 @@
V8VisibilityState visibilityState() const;
String visibilityStateAsString() const;
bool IsPageVisible() const;
@@ -2770,6 +2774,9 @@ class CORE_EXPORT Document : public Cont
@@ -2783,6 +2787,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
+ double noise_factor_x_ = 1;
+ double noise_factor_y_ = 1;
+
Member<ScriptRunner> script_runner_;
Member<ScriptRunnerDelayer> script_runner_delayer_;
// The script runner is used to run scripts of the following scheduling types:
// - ScriptSchedulingType::kAsync
// - ScriptSchedulingType::kInOrder
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -3092,6 +3092,11 @@ DOMRectList* Element::getClientRects() {
@@ -3133,6 +3133,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -3119,6 +3124,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -3160,6 +3165,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -276,7 +276,7 @@
namespace blink {
class MemoryManagedPaintCanvas;
@@ -1248,13 +1251,26 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -1245,13 +1248,26 @@ TextMetrics* BaseRenderingContext2D::mea
TextDirection direction =
ToTextDirection(state.GetDirection(), host, computed_style);
@@ -308,7 +308,7 @@
String BaseRenderingContext2D::lang() const {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1797,6 +1797,7 @@ component("platform") {
@@ -1813,6 +1813,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection",
@@ -343,7 +343,7 @@
#include "third_party/skia/include/core/SkImage.h"
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2273,6 +2273,12 @@
@@ -2319,6 +2319,12 @@
status: "stable",
},
{

View File

@@ -34,7 +34,7 @@ approach to change color components.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3501,6 +3501,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3544,6 +3544,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -44,7 +44,7 @@ approach to change color components.
switches::kForceHighContrast,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -486,6 +486,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -489,6 +489,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -65,7 +65,7 @@ approach to change color components.
};
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -557,6 +557,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -555,6 +555,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -77,7 +77,7 @@ approach to change color components.
return image_data;
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1741,7 +1741,9 @@ component("platform") {
@@ -1756,7 +1756,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -281,7 +281,7 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage
@@ -39,6 +39,8 @@ class PLATFORM_EXPORT StaticBitmapImage
StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
@@ -314,7 +314,7 @@ approach to change color components.
SkJpegEncoder::Options options;
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2279,6 +2279,9 @@
@@ -2325,6 +2325,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

View File

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2295,6 +2295,7 @@ static_library("browser") {
@@ -2276,6 +2276,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -49,7 +49,7 @@ with limited CPU/memory resources and it is disabled by default.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -26,6 +26,7 @@
@@ -22,6 +22,7 @@
#include "base/functional/callback.h"
#include "base/functional/callback_helpers.h"
#include "base/location.h"
@@ -57,7 +57,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
@@ -33,6 +34,7 @@
@@ -29,6 +30,7 @@
#include "base/notreached.h"
#include "base/path_service.h"
#include "base/run_loop.h"
@@ -65,7 +65,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
@@ -119,6 +121,7 @@
@@ -115,6 +117,7 @@
#include "components/metrics/metrics_service.h"
#include "components/metrics_services_manager/metrics_services_manager.h"
#include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -73,7 +73,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/os_crypt/async/browser/os_crypt_async.h"
#include "components/permissions/permissions_client.h"
@@ -153,6 +156,7 @@
@@ -149,6 +152,7 @@
#include "extensions/common/constants.h"
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -81,7 +81,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/network_switches.h"
@@ -421,6 +425,18 @@ void BrowserProcessImpl::Init() {
@@ -417,6 +421,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -102,9 +102,9 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2661,6 +2661,10 @@ const char kMantisFeatureKeyDescription[
"Feature key to use the Mantis feature on ChromeOS.";
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -2654,6 +2654,10 @@ const char kLogJsConsoleMessagesDescript
"Enable logging JS console messages in system logs, please note that they "
"may contain PII.";
+const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
+const char kMaxConnectionsPerHostDescription[] =
@@ -115,9 +115,9 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1551,6 +1551,9 @@ extern const char kMantisFeatureKeyName[
extern const char kMantisFeatureKeyDescription[];
#endif // IS_CHROMEOS
@@ -1555,6 +1555,9 @@ extern const char kLockTopControlsOnLarg
extern const char kLogJsConsoleMessagesName[];
extern const char kLogJsConsoleMessagesDescription[];
+extern const char kMaxConnectionsPerHostName[];
+extern const char kMaxConnectionsPerHostDescription[];

View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -175,10 +175,6 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -178,10 +178,6 @@ void AddInfoBarsIfNecessary(Browser* bro
infobars::ContentInfoBarManager* infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(web_contents);

View File

@@ -12,7 +12,7 @@
void BackgroundModeManager::RegisterProfile(Profile* profile) {
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1418,7 +1418,7 @@ void ChromeContentBrowserClient::Registe
@@ -1462,7 +1462,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -23,7 +23,7 @@
// used for mapping the command-line flags).
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -620,7 +620,7 @@ void ProfileNetworkContextService::Confi
@@ -621,7 +621,7 @@ void ProfileNetworkContextService::Confi
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -56,7 +56,7 @@
</cr-dialog>
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -117,7 +117,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -121,7 +121,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
@@ -109,7 +109,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -504,7 +504,7 @@ void HandleFailedLoginDetectionForPasswo
@@ -512,7 +512,7 @@ void HandleFailedLoginDetectionForPasswo
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -118,7 +118,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
#if BUILDFLAG(IS_IOS)
// Deprecated pref in profile prefs.
@@ -512,7 +512,7 @@ void PasswordManager::RegisterProfilePre
@@ -520,7 +520,7 @@ void PasswordManager::RegisterProfilePre
false);
#endif // BUILDFLAG(IS_IOS)
registry->RegisterBooleanPref(

View File

@@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1588,11 +1588,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1581,27 +1581,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {
@@ -13,6 +13,22 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
- // "BrowserSignin" policy is set to "Force". If so, skip the auto import.
- if (profile) {
- first_run::AutoImport(profile, master_prefs_->import_bookmarks_path);
-
- if (base::FeatureList::IsEnabled(features::kBookmarksImportOnFirstRun) &&
- !master_prefs_->import_bookmarks_dict.empty()) {
- first_run::StartBookmarksImportFromDict(
- profile, std::move(master_prefs_->import_bookmarks_dict));
- }
-
-#if BUILDFLAG(ENABLE_EXTENSIONS)
- if (base::FeatureList::IsEnabled(features::kInitialExternalExtensions)) {
- // Store the initial extension IDs into the profile's prefs so that
- // InitialExternalExtensionLoader can later pick them up.
- profile->GetPrefs()->SetList(
- extensions::pref_names::kInitialInstallList,
- std::move(master_prefs_->initial_extensions));
- }
-#endif // BUILDFLAG(ENABLE_EXTENSIONS)
- }
// Note: This can pop-up the first run consent dialog on Linux & Mac.

View File

@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -1076,7 +1076,7 @@ class AppControllerNativeThemeObserver :
@@ -1074,7 +1074,7 @@ class AppControllerNativeThemeObserver :
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

View File

@@ -8,7 +8,7 @@
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_features.h"
#include "chrome/browser/defaults.h"
@@ -132,6 +133,10 @@ void BookmarkBarController::OnSplitTabCh
@@ -139,6 +140,10 @@ void BookmarkBarController::OnSplitTabCh
}
bool BookmarkBarController::ShouldShowBookmarkBar() const {

View File

@@ -1,14 +1,14 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -138,6 +138,7 @@
@@ -139,6 +139,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h"
#include "chrome/browser/ui/views/frame/multi_contents_view.h"
+#include "chrome/browser/ui/views/message_box_dialog.h"
#include "chrome/browser/ui/views/status_bubble_views.h"
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
@@ -620,6 +621,7 @@ Browser::Browser(const CreateParams& par
#include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h"
@@ -611,6 +612,7 @@ Browser::Browser(const CreateParams& par
omit_from_session_restore_(params.omit_from_session_restore),
should_trigger_session_restore_(params.should_trigger_session_restore),
cancel_download_confirmation_state_(NOT_PROMPTED),
@@ -16,7 +16,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -994,20 +996,22 @@ Browser::WarnBeforeClosingResult Browser
@@ -993,20 +995,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1045,6 +1049,7 @@ bool Browser::TryToCloseWindow(
@@ -1044,6 +1048,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3496,6 +3501,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3494,6 +3499,58 @@ bool Browser::CanCloseWithInProgressDown
return false;
}
@@ -119,7 +119,7 @@
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
if (cancel_downloads) {
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
@@ -3521,6 +3578,22 @@ void Browser::InProgressDownloadResponse
@@ -3519,6 +3576,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -152,7 +152,7 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/unload_controller.h"
@@ -1147,12 +1148,17 @@ class Browser : public TabStripModelObse
@@ -1150,12 +1151,17 @@ class Browser : public TabStripModelObse
// Returns true if the window can close, false otherwise.
bool CanCloseWithInProgressDownloads();
@@ -170,7 +170,7 @@
// Called when the user has decided whether to proceed or not with the browser
// closure, in case the cookie migration notice was shown. |proceed_closing|
// is true if the browser can be closed.
@@ -1333,6 +1339,8 @@ class Browser : public TabStripModelObse
@@ -1341,6 +1347,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -821,11 +821,15 @@ bool HandleNewTabPageLocationOverride(
@@ -839,11 +839,15 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord()) {

View File

@@ -58,15 +58,15 @@
Node* inner_node = event.InnerNode();
--- a/third_party/blink/renderer/core/input/mouse_event_manager.cc
+++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc
@@ -5,6 +5,7 @@
#include "third_party/blink/renderer/core/input/mouse_event_manager.h"
@@ -6,6 +6,7 @@
#include "base/metrics/histogram_functions.h"
#include "build/build_config.h"
+#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/web_input_event_result.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_drag_event_init.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_pointer_event_init.h"
@@ -623,8 +624,14 @@ WebInputEventResult MouseEventManager::H
@@ -622,8 +623,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -74,6 +74,7 @@ class FrameGrabHandle : public views::Vi
@@ -84,6 +84,7 @@ class FrameGrabHandle : public views::Vi
// Reserve some space for the frame to be grabbed by, even if the tabstrip
// is full.
// TODO(tbergquist): Define this relative to the NTB insets again.

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -707,5 +707,7 @@ bool BrowserFrame::RegenerateFrameOnThem
@@ -723,5 +723,7 @@ bool BrowserFrame::RegenerateFrameOnThem
}
bool BrowserFrame::IsIncognitoBrowser() const {
@@ -10,7 +10,7 @@
}
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -60,6 +60,7 @@
@@ -50,6 +50,7 @@
#include "ui/base/webui/jstemplate_builder.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/color/color_provider.h"
@@ -18,7 +18,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -467,7 +468,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -389,7 +390,9 @@ void NTPResourceCache::CreateNewTabIncog
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
// Colors.

View File

@@ -79,7 +79,7 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/functional/callback.h"
@@ -632,6 +633,9 @@ void SearchProvider::Run(bool query_is_p
@@ -637,6 +638,9 @@ void SearchProvider::Run(bool query_is_p
}
void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -91,16 +91,16 @@
if (minimal_changes)
--- a/components/url_formatter/url_fixer.cc
+++ b/components/url_formatter/url_fixer.cc
@@ -15,6 +15,8 @@
@@ -10,6 +10,8 @@
#include <string_view>
#include "base/check_op.h"
+#include "base/containers/contains.h"
+#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/i18n/char_iterator.h"
@@ -648,6 +650,8 @@ GURL FixupURLInternal(const std::string&
@@ -644,6 +646,8 @@ GURL FixupURLInternal(const std::string&
FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
if (chrome_url && !parts.host.is_valid()) {

View File

@@ -30,17 +30,20 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/sharing_message/features.cc
+++ b/components/sharing_message/features.cc
@@ -7,3 +7,5 @@
@@ -6,6 +6,8 @@
#include "build/build_config.h"
BASE_FEATURE(kClickToCall, "ClickToCall", base::FEATURE_DISABLED_BY_DEFAULT);
+
+BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT);
+
BASE_FEATURE(kClickToCall, "ClickToCall", base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kMobilePromoOnDesktop,
--- a/components/sharing_message/features.h
+++ b/components/sharing_message/features.h
@@ -10,4 +10,5 @@
BASE_DECLARE_FEATURE(kClickToCall);
@@ -18,4 +18,5 @@ extern const char kMobilePromoOnDesktopP
// Parameter of `kMobilePromoOnDesktop` for showing the iOS push notification.
extern const char kMobilePromoOnDesktopNotificationParam[];
+BASE_DECLARE_FEATURE(kDisableQRGenerator);
#endif // COMPONENTS_SHARING_MESSAGE_FEATURES_H_

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -544,7 +544,9 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -560,7 +560,9 @@ void TabHelpers::AttachTabHelpers(WebCon
profile, web_contents);
#endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
@@ -25,7 +25,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -259,14 +259,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -260,14 +260,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent() || frame->IsInFencedFrameTree())
return;
@@ -92,7 +92,7 @@
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -2493,6 +2501,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2489,6 +2497,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
if (client_) {
client_->SetOwner(this);
}
@@ -2658,6 +2668,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2654,6 +2664,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -113,7 +113,7 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -905,6 +905,8 @@ class TemplateURLService final : public
@@ -909,6 +909,8 @@ class TemplateURLService final : public
raw_ref<TemplateURLPrepopulateData::Resolver> prepopulate_data_resolver_;

View File

@@ -8,7 +8,7 @@
#include "base/debug/alias.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
@@ -761,6 +762,13 @@ void Tab::HideHover(TabStyle::HideHoverS
@@ -762,6 +763,13 @@ void Tab::HideHover(TabStyle::HideHoverS
DeprecatedLayoutImmediately();
}
@@ -42,7 +42,7 @@
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
@@ -2003,6 +2004,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -1998,6 +1999,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1585,7 +1585,8 @@ void BrowserCommandController::InitComma
@@ -1609,7 +1609,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -12,7 +12,15 @@
command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE,
--- a/chrome/browser/ui/ui_features.cc
+++ b/chrome/browser/ui/ui_features.cc
@@ -594,6 +594,10 @@ static std::string GetCountryCode() {
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/ui_features.h"
+#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/metrics/field_trial_params.h"
#include "base/time/time.h"
@@ -707,6 +708,10 @@ static std::string GetCountryCode() {
}
bool HasTabSearchToolbarButton() {
@@ -25,7 +33,7 @@
base::FeatureList::IsEnabled(
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -5159,6 +5159,7 @@ void BrowserView::AddedToWidget() {
@@ -5182,6 +5182,7 @@ void BrowserView::AddedToWidget() {
toolbar_->Init();
@@ -43,7 +51,7 @@
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
@@ -127,6 +128,7 @@ TabStripRegionView::TabStripRegionView(s
@@ -209,6 +210,7 @@ TabStripRegionView::TabStripRegionView(s
std::unique_ptr<TabStripActionContainer> tab_strip_action_container;
std::unique_ptr<ProductSpecificationsButton> product_specifications_button;
if (browser &&

View File

@@ -8,7 +8,7 @@
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -121,6 +121,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
@@ -125,6 +125,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
// module, e.g.
// //chrome/browser/<foo_module>/features.h
//

View File

@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/flat_map.h"
#include "base/containers/span.h"
@@ -1145,6 +1146,10 @@ void TabStripModel::CloseAllTabsInGroup(
@@ -1171,6 +1172,10 @@ void TabStripModel::CloseAllTabsInGroup(
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));
@@ -19,7 +19,7 @@
CloseTabs({GetWebContentsAt(index)}, close_types);
}
@@ -2928,9 +2933,13 @@ TabStripModel::GetGroupsDestroyedFromRem
@@ -3020,9 +3025,13 @@ TabStripModel::GetGroupsDestroyedFromRem
void TabStripModel::ExecuteCloseTabsByIndices(
base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
uint32_t close_types) {

View File

@@ -69,7 +69,7 @@
// Don't prompt for file types that are marked for opening automatically.
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -319,6 +319,13 @@ bool ExtensionManagement::IsInstallation
@@ -312,6 +312,13 @@ bool ExtensionManagement::IsInstallation
bool ExtensionManagement::IsOffstoreInstallAllowed(
const GURL& url,
const GURL& referrer_url) const {

View File

@@ -13,7 +13,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1198,6 +1198,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1200,6 +1200,8 @@ WindowOpenDisposition NavigationPolicyTo
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

View File

@@ -21,7 +21,7 @@
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
#include "base/feature_list.h"
@@ -1327,7 +1328,8 @@ void HistoryBackend::InitImpl(
@@ -1341,7 +1342,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.
@@ -31,7 +31,7 @@
}
void HistoryBackend::OnMemoryPressure(
@@ -1549,6 +1551,8 @@ void HistoryBackend::AddPagesWithDetails
@@ -1570,6 +1572,8 @@ void HistoryBackend::AddPagesWithDetails
}
bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const {

View File

@@ -11,7 +11,15 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -200,7 +200,8 @@ class SSLClientSocketImpl::SSLContext {
@@ -14,6 +14,7 @@
#include <string_view>
#include <utility>
+#include "base/command_line.h"
#include "base/containers/span.h"
#include "base/containers/to_vector.h"
#include "base/feature_list.h"
@@ -200,7 +201,8 @@ class SSLClientSocketImpl::SSLContext {
SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback);
SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */);

View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -140,7 +140,8 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -143,7 +143,8 @@ void AddInfoBarsIfNecessary(Browser* bro
}
// Web apps should not display the session restore bubble (crbug.com/1264121)

View File

@@ -16,7 +16,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/feature_engagement/public/event_constants.h"
@@ -544,6 +546,17 @@ void ExtensionsToolbarContainer::AnchorA
@@ -548,6 +550,17 @@ void ExtensionsToolbarContainer::AnchorA
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
anchor_view && anchor_view->GetVisible() ? anchor_view
: GetExtensionsButton());
@@ -34,7 +34,7 @@
widget->Show();
}
@@ -958,6 +971,9 @@ void ExtensionsToolbarContainer::UpdateC
@@ -964,6 +977,9 @@ void ExtensionsToolbarContainer::UpdateC
}
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2130,6 +2130,10 @@ void BrowserView::ExitFullscreen() {
@@ -2116,6 +2116,10 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateExclusiveAccessBubble(
const ExclusiveAccessBubbleParams& params,
ExclusiveAccessBubbleHideCallback first_hide_callback) {
@@ -13,7 +13,7 @@
platform_util::IsBrowserLockedFullscreen(browser_.get());
--- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc
+++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc
@@ -73,6 +73,10 @@ bool IsExitUiEnabled() {
@@ -74,6 +74,10 @@ bool IsExitUiEnabled() {
// menu and controls reveal when the cursor is moved to the top.
return false;
#else

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -1170,7 +1170,11 @@ void Tab::UpdateIconVisibility() {
@@ -1177,7 +1177,11 @@ void Tab::UpdateIconVisibility() {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1199,6 +1203,8 @@ void Tab::UpdateIconVisibility() {
@@ -1206,6 +1210,8 @@ void Tab::UpdateIconVisibility() {
!controller_->IsLockedForOnTask() &&
#endif
large_enough_for_close_button;

View File

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/client_hints/client_hints.cc
+++ b/content/browser/client_hints/client_hints.cc
@@ -821,6 +821,8 @@ void UpdateNavigationRequestClientUaHead
@@ -823,6 +823,8 @@ void UpdateNavigationRequestClientUaHead
net::HttpRequestHeaders* headers,
const std::optional<GURL>& request_url) {
DCHECK(frame_tree_node);
@@ -20,13 +20,13 @@
if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) {
return;
}
@@ -842,6 +844,8 @@ void AddRequestClientHintsHeaders(
@@ -854,6 +856,8 @@ void AddRequestClientHintsHeaders(
FrameTreeNode* frame_tree_node,
const network::ParsedPermissionsPolicy& container_policy,
const std::optional<GURL>& request_url) {
FrameTreeNode* ftn_for_devtools_override) {
+ if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints))
+ return;
ClientHintsExtendedData data(origin, frame_tree_node, delegate, request_url);
ClientHintsExtendedData data(origin, frame_tree_node, delegate);
UpdateIFramePermissionsPolicyWithDelegationSupportForClientHints(
data, container_policy);
--- a/third_party/blink/common/features.cc

View File

@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/feature_list.h"
#include "base/functional/bind.h"
@@ -175,6 +176,18 @@ DragOperation GetDropEffect(const ui::Dr
@@ -176,6 +177,18 @@ DragOperation GetDropEffect(const ui::Dr
return DragOperation::kMove;
}
@@ -27,7 +27,7 @@
} // namespace
BrowserRootView::DropInfo::DropInfo() = default;
@@ -187,7 +200,9 @@ BrowserRootView::DropInfo::~DropInfo() {
@@ -188,7 +201,9 @@ BrowserRootView::DropInfo::~DropInfo() {
BrowserRootView::BrowserRootView(BrowserView* browser_view,
views::Widget* widget)
@@ -38,7 +38,7 @@
BrowserRootView::~BrowserRootView() {
// It's possible to destroy the browser while a drop is active. In this case,
@@ -327,7 +342,7 @@ bool BrowserRootView::OnMouseWheel(const
@@ -328,7 +343,7 @@ bool BrowserRootView::OnMouseWheel(const
// Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
// disable it if the latter feature is enabled.
@@ -49,7 +49,7 @@
// tabstrip, or the empty space beside the tabstrip.
--- a/chrome/browser/ui/views/frame/browser_root_view.h
+++ b/chrome/browser/ui/views/frame/browser_root_view.h
@@ -159,6 +159,8 @@ class BrowserRootView : public views::in
@@ -160,6 +160,8 @@ class BrowserRootView : public views::in
int scroll_remainder_x_ = 0;
int scroll_remainder_y_ = 0;

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -460,6 +460,17 @@ void ToolbarView::Init() {
@@ -466,6 +466,17 @@ void ToolbarView::Init() {
browser_->profile()->IsGuestSession() ||
browser_->profile()->IsRegularProfile();
#endif

View File

@@ -86,7 +86,7 @@
// Feature declarations and associated constants (feature params, et cetera)
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -4113,6 +4113,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -4121,6 +4121,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -95,7 +95,7 @@
return WebGLAny(script_state,
String(ContextGL()->GetString(GL_RENDERER)));
}
@@ -4128,6 +4130,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -4136,6 +4138,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4930,10 +4930,12 @@ constexpr char kWebiumFlag[] = "webium";
@@ -4922,10 +4922,12 @@ const FeatureEntry::FeatureVariation kNt
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

View File

@@ -19,7 +19,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -172,6 +172,7 @@
@@ -173,6 +173,7 @@
#include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy_features.h"
@@ -27,7 +27,7 @@
#include "services/network/public/cpp/resource_request_body.h"
#include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h"
#include "services/network/public/cpp/url_loader_completion_status.h"
@@ -393,10 +394,10 @@ void AddAdditionalRequestHeaders(
@@ -392,10 +393,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
@@ -44,7 +44,7 @@
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -133,6 +133,7 @@
@@ -135,6 +135,7 @@
#include "services/network/public/cpp/content_decoding_interceptor.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/not_implemented_url_loader_factory.h"
@@ -52,7 +52,7 @@
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
@@ -4522,10 +4523,13 @@ void RenderFrameImpl::FinalizeRequestInt
@@ -4523,10 +4524,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());

View File

@@ -13,15 +13,15 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -19,6 +19,8 @@
@@ -20,6 +20,8 @@
namespace net::features {
+BASE_FEATURE(kSetIpv6ProbeFalse, "SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT);
+
BASE_FEATURE(kAlpsForHttp2, "AlpsForHttp2", base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(AlpsForHttp2, base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kAvoidH2Reprioritization,
BASE_FEATURE(AvoidH2Reprioritization, base::FEATURE_DISABLED_BY_DEFAULT);
--- a/net/base/features.h
+++ b/net/base/features.h
@@ -21,6 +21,8 @@
@@ -35,7 +35,7 @@
// https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html.
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -152,11 +152,6 @@ const size_t kMaxHostLength = 4096;
@@ -151,11 +151,6 @@ const size_t kMaxHostLength = 4096;
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -47,7 +47,7 @@
// True if |hostname| ends with either ".local" or ".local.".
bool ResemblesMulticastDNSName(std::string_view hostname) {
return hostname.ends_with(".local") || hostname.ends_with(".local.");
@@ -1497,33 +1492,10 @@ int HostResolverManager::StartIPv6Reacha
@@ -1496,33 +1491,10 @@ int HostResolverManager::StartIPv6Reacha
return OK;
}

View File

@@ -196,7 +196,7 @@
// already owned by the TemplateURLService.
--- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
@@ -28,23 +28,27 @@ KeywordEditorController::KeywordEditorCo
@@ -27,23 +27,27 @@ KeywordEditorController::KeywordEditorCo
KeywordEditorController::~KeywordEditorController() = default;
@@ -232,7 +232,7 @@
DCHECK(!url.empty());
const std::optional<size_t> index =
table_model_->IndexOfTemplateURL(template_url);
@@ -56,11 +60,13 @@ void KeywordEditorController::ModifyTemp
@@ -55,11 +59,13 @@ void KeywordEditorController::ModifyTemp
// Don't do anything if the entry didn't change.
if ((template_url->short_name() == title) &&
@@ -271,7 +271,7 @@
bool CanEdit(const TemplateURL* url) const;
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -212,21 +212,25 @@ void TemplateURLTableModel::Remove(size_
@@ -211,21 +211,25 @@ void TemplateURLTableModel::Remove(size_
void TemplateURLTableModel::Add(size_t index,
const std::u16string& short_name,
const std::u16string& keyword,
@@ -302,7 +302,7 @@
DCHECK(index <= RowCount());
DCHECK(!url.empty());
TemplateURL* template_url = GetTemplateURL(index);
@@ -235,7 +239,8 @@ void TemplateURLTableModel::ModifyTempla
@@ -234,7 +238,8 @@ void TemplateURLTableModel::ModifyTempla
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
template_url->SupportsReplacement(
template_url_service_->search_terms_data()));
@@ -448,7 +448,7 @@
syncer::kSeparateLocalAndAccountSearchEngines)
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -341,7 +341,8 @@ class TemplateURLService final : public
@@ -345,7 +345,8 @@ class TemplateURLService final : public
void ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4926,7 +4926,13 @@ constexpr char kWebiumFlag[] = "webium";
@@ -4918,7 +4918,13 @@ const FeatureEntry::FeatureVariation kNt
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -129,7 +129,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -133,7 +133,7 @@ void RegisterBrowserUserPrefs(user_prefs
false);
#endif
registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -117,23 +117,10 @@ void TemplateURLTableModel::Reload() {
@@ -117,22 +117,10 @@ void TemplateURLTableModel::Reload() {
extension_entries;
// Keywords that can be made the default first.
for (TemplateURL* template_url : urls) {
@@ -19,8 +19,7 @@
- // Skip @aimode if feature disabled.
- if (template_url->starter_pack_id() ==
- template_url_starter_pack_data::kAiMode &&
- (!omnibox_feature_configs::Toolbelt::Get().enabled ||
- !ai_mode_enabled_)) {
- !ai_mode_enabled_) {
+ // Disable all Google AI starter pack options
+ if (template_url->starter_pack_id() == template_url_starter_pack_data::kGemini ||
+ template_url->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
@@ -30,7 +29,7 @@
--- a/components/omnibox/browser/featured_search_provider.cc
+++ b/components/omnibox/browser/featured_search_provider.cc
@@ -290,21 +290,10 @@ void FeaturedSearchProvider::AddFeatured
@@ -290,20 +290,10 @@ void FeaturedSearchProvider::AddFeatured
for (TemplateURL* turl : turls) {
if (turl->starter_pack_id() > 0 &&
turl->is_active() == TemplateURLData::ActiveStatus::kTrue) {
@@ -46,9 +45,8 @@
- }
- // Skip @aimode if feature disabled.
- if (turl->starter_pack_id() == template_url_starter_pack_data::kAiMode &&
- (!omnibox_feature_configs::Toolbelt::Get().enabled ||
- !client_->GetAimEligibilityService() ||
- !client_->GetAimEligibilityService()->IsAimEligible())) {
- !OmniboxFieldTrial::IsAimStarterPackEnabled(
- client_->GetAimEligibilityService())) {
+ // Disable all Google AI starter pack options
+ if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini ||
+ turl->starter_pack_id() == template_url_starter_pack_data::kAiMode ||

View File

@@ -2,15 +2,15 @@
--- a/components/download/internal/common/base_file.cc
+++ b/components/download/internal/common/base_file.cc
@@ -29,7 +29,6 @@
@@ -26,7 +26,6 @@
#include "components/download/public/common/download_interrupt_reasons_utils.h"
#include "components/download/public/common/download_item.h"
#include "components/download/public/common/download_stats.h"
-#include "components/services/quarantine/quarantine.h"
#include "crypto/hash.h"
#include "crypto/secure_hash.h"
#if BUILDFLAG(IS_ANDROID)
@@ -563,94 +562,10 @@ DownloadInterruptReason BaseFile::Publis
@@ -538,94 +537,10 @@ DownloadInterruptReason BaseFile::Publis
}
#endif // BUILDFLAG(IS_ANDROID)
@@ -105,7 +105,7 @@
}
void BaseFile::AnnotateWithSourceInformation(
@@ -660,32 +575,8 @@ void BaseFile::AnnotateWithSourceInforma
@@ -635,32 +550,8 @@ void BaseFile::AnnotateWithSourceInforma
const std::optional<url::Origin>& request_initiator,
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
OnAnnotationDoneCallback on_annotation_done_callback) {
@@ -142,7 +142,7 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -138,7 +138,6 @@ source_set("browser") {
@@ -139,7 +139,6 @@ source_set("browser") {
"//components/performance_manager/scenario_api",
"//components/power_monitor",
"//components/services/filesystem:lib",
@@ -152,7 +152,7 @@
"//components/services/storage/dom_storage:local_storage_proto",
--- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
@@ -13,7 +13,6 @@
@@ -14,7 +14,6 @@
#include "base/task/thread_pool.h"
#include "base/thread_annotations.h"
#include "build/build_config.h"
@@ -160,7 +160,7 @@
#include "content/browser/file_system_access/features.h"
#include "content/browser/file_system_access/file_system_access_error.h"
#include "content/public/browser/content_browser_client.h"
@@ -229,22 +228,9 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -231,22 +230,9 @@ void FileSystemAccessSafeMoveHelper::Did
// not exist anymore. In case of error, the source file URL will point to a
// valid filesystem location.
base::OnceCallback<void(base::File::Error)> result_callback;
@@ -183,7 +183,7 @@
manager_->DoFileSystemOperation(
FROM_HERE, &storage::FileSystemOperationRunner::Move,
std::move(result_callback), source_url(), dest_url(), options_,
@@ -261,7 +247,6 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -263,7 +249,6 @@ void FileSystemAccessSafeMoveHelper::Did
void FileSystemAccessSafeMoveHelper::DidFileDoQuarantine(
const storage::FileSystemURL& target_url,
const GURL& referrer_url,
@@ -191,7 +191,7 @@
base::File::Error result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -292,40 +277,9 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -294,40 +279,9 @@ void FileSystemAccessSafeMoveHelper::Did
referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
? referrer_url
: GURL();

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -54,7 +54,7 @@ BASE_FEATURE(kBookmarkTriggerForPreconne
@@ -60,7 +60,7 @@ BASE_FEATURE(kBookmarkTriggerForPrefetch
// switch.
BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling,
"CertificateTransparencyAskBeforeEnabling",

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -611,11 +611,6 @@ int GetContentRestrictions(const Browser
@@ -629,11 +629,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -14,7 +14,7 @@
}
return content_restrictions;
}
@@ -1938,8 +1933,7 @@ bool CanSavePage(const Browser* browser)
@@ -1992,8 +1987,7 @@ bool CanSavePage(const Browser* browser)
policy::DownloadRestriction::ALL_FILES) {
return false;
}
@@ -23,7 +23,7 @@
+ return true;
}
void Print(Browser* browser) {
void Print(BrowserWindowInterface* bwi) {
--- a/components/offline_pages/core/offline_page_model.cc
+++ b/components/offline_pages/core/offline_page_model.cc
@@ -21,7 +21,7 @@ OfflinePageModel::SavePageParams::~SaveP

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -222,12 +222,10 @@ TabStripRegionView::TabStripRegionView(s
@@ -304,12 +304,10 @@ TabStripRegionView::TabStripRegionView(s
new_tab_button_->GetViewAccessibility().SetName(
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
@@ -15,7 +15,7 @@
reserved_grab_handle_space_ =
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2273,8 +2273,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2269,8 +2269,6 @@ void TabStrip::NewTabButtonPressed(const
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {
@@ -24,7 +24,7 @@
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
CHECK(clipboard)
<< "Clipboard instance is not available, cannot proceed with "
@@ -2285,7 +2283,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2281,7 +2279,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}

View File

@@ -1,6 +1,6 @@
--- a/components/dom_distiller/core/css/distilledpage.css
+++ b/components/dom_distiller/core/css/distilledpage.css
@@ -28,6 +28,11 @@
--- a/components/dom_distiller/core/css/distilledpage_common.css
+++ b/components/dom_distiller/core/css/distilledpage_common.css
@@ -26,6 +26,11 @@
box-sizing: border-box;
}

View File

@@ -2,7 +2,7 @@
#
--- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc
@@ -288,7 +288,7 @@ BASE_FEATURE(kOmniboxSiteSearch, "Omnibo
@@ -291,7 +291,7 @@ BASE_FEATURE(kOmniboxSiteSearch, "Omnibo
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",

View File

@@ -34,7 +34,7 @@
--- a/chrome/app/settings_chromium_strings.grdp
+++ b/chrome/app/settings_chromium_strings.grdp
@@ -385,13 +385,13 @@ Chromium understands forms better and ca
@@ -401,13 +401,13 @@ Chromium understands forms better and ca
<!-- Performance Page -->
<message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
@@ -53,7 +53,7 @@
<!-- Languages Page -->
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1058,7 +1058,7 @@
@@ -1067,7 +1067,7 @@
Active site
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP" desc="Help text shown on the second tab of the tab discarding exception list add dialog. Explains how to use the filter format to add an exclusion rule to the list.">
@@ -62,7 +62,7 @@
</message>
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
Power
@@ -1082,7 +1082,7 @@
@@ -1091,7 +1091,7 @@
Inactive tabs appearance
</message>
<message name="IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK" desc="Label for a performance settings toggle description that controls whether the inactive tab UI is shown. Also contains a link to the help center article.">
@@ -71,7 +71,7 @@
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_TITLE" desc="Title for the link row that points to tab hover preview card apperance settings.">
Tab hover preview card appearance
@@ -1094,7 +1094,7 @@
@@ -1103,7 +1103,7 @@
Performance issue alerts
</message>
<message name="IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION" desc="Label for a performance settings toggle that controls whether performance intervention notifications should be shown and link to learn more about performance issue alerts.">
@@ -295,7 +295,7 @@
// <if expr="is_chromeos">
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -52,15 +52,6 @@
@@ -39,15 +39,6 @@
label="$i18n{clearBrowsingData}"
sub-label="$i18n{clearBrowsingDataDescription}"
on-click="onClearBrowsingDataClick_"></cr-link-row>
@@ -321,7 +321,7 @@
import './privacy_page.js';
import {PrefsMixin} from '/shared/settings/prefs/prefs_mixin.js';
@@ -104,13 +103,6 @@ export class SettingsPrivacyPageIndexEle
@@ -158,13 +157,6 @@ export class SettingsPrivacyPageIndexEle
private getDefaultViews_(): string[] {
const defaultViews = ['old'];
@@ -335,7 +335,7 @@
return defaultViews;
}
@@ -231,7 +223,6 @@ export class SettingsPrivacyPageIndexEle
@@ -335,7 +327,6 @@ export class SettingsPrivacyPageIndexEle
this.showPrivacyGuidePromo_ = false;
return;
}
@@ -407,7 +407,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -959,16 +959,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -960,16 +960,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -461,7 +461,7 @@
void CookieControlsContentView::SetCookiesRowVisible(bool visible) {
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -160,9 +160,6 @@ SadTabView::SadTabView(content::WebConte
@@ -159,9 +159,6 @@ SadTabView::SadTabView(content::WebConte
// There is currently no good way to handle kEnd alignment for a single
// element.
actions_container->SetLayoutManagerUseConstrainedSpace(false);
@@ -471,7 +471,7 @@
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -263,22 +260,6 @@ void SadTabView::AttachToWebView() {
@@ -262,22 +259,6 @@ void SadTabView::AttachToWebView() {
}
}
@@ -496,7 +496,7 @@
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -986,40 +986,20 @@ void AddPerformanceStrings(content::WebU
@@ -972,40 +972,20 @@ void AddPerformanceStrings(content::WebU
IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
{"performanceInterventionEnabledLabel",
IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
@@ -546,7 +546,7 @@
html_source->AddString(
"tabDiscardTimerFiveMinutes",
@@ -1065,11 +1045,6 @@ void AddPerformanceStrings(content::WebU
@@ -1051,11 +1031,6 @@ void AddPerformanceStrings(content::WebU
base::NumberToString16(
performance_manager::user_tuning::BatterySaverModeManager::
kLowBatteryThresholdPercent)));
@@ -558,7 +558,7 @@
html_source->AddString("discardRingTreatmentLearnMoreUrl",
chrome::kDiscardRingTreatmentLearnMoreUrl);
@@ -3585,7 +3560,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3533,7 +3508,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -569,7 +569,7 @@
html_source->AddBoolean(
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -598,27 +598,20 @@ SettingsUI::SettingsUI(content::WebUI* w
@@ -576,27 +576,20 @@ SettingsUI::SettingsUI(content::WebUI* w
->UserIsActivePasswordChangeUser()},
};
@@ -603,12 +603,12 @@
html_source->AddBoolean(
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -905,7 +905,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -773,7 +773,7 @@ BASE_FEATURE(OnDeviceWebSpeech,
);
// Enables the Live Caption feature on supported devices.
-BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(LiveCaption, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(LiveCaption, base::FEATURE_DISABLED_BY_DEFAULT);
// Logs a DumpWithoutCrashing() call each time the Speech On-Device API (SODA)
// fails to load. Used to diagnose issues when rolling out new versions of the

View File

@@ -3,7 +3,7 @@
# This removes the remaining references needed to build
--- a/base/allocator/partition_allocator/partition_alloc.gni
+++ b/base/allocator/partition_allocator/partition_alloc.gni
@@ -244,9 +244,6 @@ declare_args() {
@@ -234,9 +234,6 @@ declare_args() {
force_enable_raw_ptr_exclusion = false
}

View File

@@ -1,3 +1,13 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -324,6 +324,7 @@
#include "content/public/browser/internal_webui_config.h"
#include "content/public/browser/isolated_web_apps_policy.h"
#include "content/public/browser/legacy_tech_cookie_issue_details.h"
+#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/network_service_instance.h"
#include "content/public/browser/overlay_window.h"
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
@@ -21,6 +21,7 @@
@@ -10,7 +20,7 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1025,6 +1025,7 @@ source_set("extensions") {
@@ -1030,6 +1030,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui",
@@ -20,7 +30,7 @@
"//components/services/app_service",
--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
+++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
@@ -20,6 +20,7 @@
@@ -18,6 +18,7 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/engagement/site_engagement_service_factory.h"
@@ -30,14 +40,14 @@
#include "chrome/browser/ui/safety_hub/safety_hub_service.h"
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -525,6 +525,7 @@ static_library("url_constants") {
@@ -526,6 +526,7 @@ static_library("url_constants") {
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
"//components/password_manager/content/common",
"//components/safe_browsing/core/common",
+ "//components/supervised_user/core/common:buildflags",
"//device/vr/buildflags",
]
}
--- a/components/component_updater/installer_policies/BUILD.gn
+++ b/components/component_updater/installer_policies/BUILD.gn
@@ -53,6 +53,7 @@ static_library("installer_policies_no_co
@@ -50,7 +60,7 @@
# Disallow depending on content.
--- a/components/plus_addresses/BUILD.gn
+++ b/components/plus_addresses/BUILD.gn
@@ -127,6 +127,7 @@ source_set("plus_addresses") {
@@ -58,6 +58,7 @@ source_set("plus_addresses") {
"//net",
"//services/data_decoder/public/cpp",
"//services/network/public/cpp",
@@ -60,9 +70,9 @@
public_deps = [
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -119,6 +119,7 @@ source_set("browser") {
"//components/filename_generation",
@@ -120,6 +120,7 @@ source_set("browser") {
"//components/fingerprinting_protection_filter/interventions/common:features",
"//components/history/core/browser:features",
"//components/input",
+ "//components/lens:buildflags",
"//components/language/core/common",

View File

@@ -1516,7 +1516,6 @@ sql/test/data/recovery_387868
testing/libfuzzer/fuzzers/flatbuffers_corpus/monsterdata_test.mon
testing/libfuzzer/fuzzers/woff2_corpus/6df91fe5cbca947ae7b7b43d4cd4a861213fae9f
testing/libfuzzer/fuzzers/woff2_corpus/fd14c502730b85e8b9c078ecd5b309d1e6c0a6d1
testing/scripts/variations_smoke_test_data/webview_test_seed
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Africa/Abidjan
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Africa/Accra
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Africa/Addis_Ababa
@@ -2139,7 +2138,6 @@ third_party/afl/src/testcases/multimedia/h264/small_movie.mp4
third_party/afl/src/testcases/others/pcap/small_capture.pcap
third_party/android_build_tools/gradle_wrapper/gradle/wrapper/gradle-wrapper.jar
third_party/android_build_tools/lint/custom_lint.jar
third_party/android_sdk/xr_extensions/com.android.extensions.xr.jar
third_party/angle/samples/multi_texture/basemap.tga
third_party/angle/samples/multi_texture/lightmap.tga
third_party/angle/samples/particle_system/smoke.tga
@@ -8026,6 +8024,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/basi
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/basic.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/byte-efficiency.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/changing-priority.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/chrome-ext-sourcemap-script-content.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-cluster-max-duration.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-cluster-max-timeout.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-cluster-navigation.json.gz
@@ -8182,6 +8181,9 @@ third_party/devtools-frontend/src/third_party/image_diff/mac/libbase.dylib
third_party/devtools-frontend/src/third_party/image_diff/mac/libc++.dylib
third_party/devtools-frontend/src/third_party/image_diff/mac/libchrome_zlib.dylib
third_party/devtools-frontend/src/third_party/image_diff/win32/image_diff.exe
third_party/federated_compute/src/fcp/client/engine/data/join_model.flatbuffer
third_party/federated_compute/src/fcp/client/engine/data/length_model.flatbuffer
third_party/federated_compute/src/fcp/client/rust/testdata/endorsement.json.sig
third_party/ffmpeg/tests/reference.pnm
third_party/flatbuffers/src/android/gradle/wrapper/gradle-wrapper.jar
third_party/flatbuffers/src/dart/test/monsterdata_test.mon
@@ -10764,6 +10766,24 @@ third_party/nasm/travis/test/xcrypt.bin.t
third_party/nasm/travis/test/xpaste.bin.t
third_party/nasm/travis/test/zerobyte.bin.t
third_party/node/node_modules/node_modules.tar.gz
third_party/oak/src/.xtask_bash_completion.zwc
third_party/oak/src/oak_attestation_explain/testdata/rk_evidence.binarypb
third_party/oak/src/oak_attestation_verification/testdata/cb_endorsement.binarypb
third_party/oak/src/oak_attestation_verification/testdata/cb_evidence.binarypb
third_party/oak/src/oak_attestation_verification/testdata/cb_reference_values.binarypb
third_party/oak/src/oak_attestation_verification/testdata/endorsement.json.sig
third_party/oak/src/oak_attestation_verification/testdata/fake_evidence.binarypb
third_party/oak/src/oak_attestation_verification/testdata/fake_expected_values.binarypb
third_party/oak/src/oak_attestation_verification/testdata/genoa_oc_evidence.binarypb
third_party/oak/src/oak_attestation_verification/testdata/genoa_oc_reference_values.binarypb
third_party/oak/src/oak_attestation_verification/testdata/oc_evidence.binarypb
third_party/oak/src/oak_attestation_verification/testdata/oc_vcek_milan.der
third_party/oak/src/oak_attestation_verification/testdata/rk_evidence.binarypb
third_party/oak/src/oak_attestation_verification/testdata/rk_evidence_20240312.binarypb
third_party/oak/src/oak_attestation_verification/testdata/rk_vcek_milan.der
third_party/oak/src/oak_attestation_verification/testdata/vcek_genoa.der
third_party/oak/src/oak_containers/orchestrator/testdata/test_dice
third_party/oak/src/oak_functions_launcher/mock_lookup_data
third_party/openh264/src/autotest/performanceTest/ios/fruitstrap
third_party/openh264/src/autotest/performanceTest/ios/iFileTransfer
third_party/openh264/src/res/Adobe_PDF_sample_a_1024x768_50Frms.264
@@ -11860,7 +11880,9 @@ third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_case
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-5416197367070720
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-5801855065915392
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-6353004288081920
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6470575830925312
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6583684169269248
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6740380288876544
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-4512865114259456
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-6182254813249536
third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-6265355951996928
@@ -12389,6 +12411,7 @@ third_party/zlib/google/test/data/symlink_absolute_path.zip
third_party/zlib/google/test/data/symlink_duplicate_link.zip
third_party/zlib/google/test/data/symlink_evil_relative_path.zip
third_party/zlib/google/test/data/symlink_follow_own_link.zip
third_party/zlib/google/test/data/symlink_follow_own_link_dir.zip
third_party/zlib/google/test/data/symlink_too_large.zip
third_party/zlib/google/test/data/symlinks.zip
third_party/zlib/google/test/data/test.zip

View File

@@ -6,6 +6,7 @@
# replace 'src' in checkout paths with the output directory
# add flag to specify an allowed sysroot
# ensure shallow fetches
# allow using newer httplib2 with pysocks
# utilize a newer version of gsutil to support later versions of python
--- a/gclient.bat
+++ b/gclient.bat
@@ -57,7 +58,7 @@
gcs_deps.append(
GcsDependency(parent=self,
name=name,
@@ -931,6 +939,8 @@ class Dependency(gclient_utils.WorkItem,
@@ -930,6 +938,8 @@ class Dependency(gclient_utils.WorkItem,
self._gn_args_from = local_scope.get('gclient_gn_args_from')
self._gn_args_file = local_scope.get('gclient_gn_args_file')
@@ -66,7 +67,7 @@
self._gn_args = local_scope.get('gclient_gn_args', [])
# It doesn't make sense to set all of these, since setting gn_args_from
# to another DEPS will make gclient ignore any other local gn_args*
@@ -3983,6 +3993,7 @@ def CMDsync(parser, args):
@@ -3987,6 +3997,7 @@ def CMDsync(parser, args):
default=[],
help='Specify to skip processing of a certain type of '
'dep.')
@@ -113,9 +114,23 @@
self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
def _SetFetchConfig(self, options):
--- a/gerrit_util.py
+++ b/gerrit_util.py
@@ -35,7 +35,10 @@ from typing import NamedTuple, List, Opt
from typing import Tuple, TypedDict, cast
import httplib2
-import httplib2.socks
+try:
+ import httplib2.socks
+except ModuleNotFoundError:
+ import socks
import auth
import gclient_utils
--- a/gsutil.py
+++ b/gsutil.py
@@ -25,7 +25,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR,
@@ -26,7 +26,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR,
IS_WINDOWS = os.name == 'nt'