mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
merge: update to ungoogled-chromium 137.0.7151.55
This commit is contained in:
@@ -1 +1 @@
|
||||
136.0.7103.113
|
||||
137.0.7151.55
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,9 @@
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3685,8 +3685,6 @@ static_library("browser") {
|
||||
@@ -3694,8 +3694,6 @@ static_library("browser") {
|
||||
"download/download_auto_open_policy_handler.cc",
|
||||
"download/download_auto_open_policy_handler.h",
|
||||
"download/download_commands.cc",
|
||||
"download/download_crx_util.cc",
|
||||
"download/download_crx_util.h",
|
||||
- "download/download_danger_prompt.cc",
|
||||
- "download/download_danger_prompt.h",
|
||||
"download/download_dir_policy_handler.cc",
|
||||
@@ -11,7 +11,7 @@
|
||||
"download/download_dir_util.cc",
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -5467,10 +5467,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
@@ -5511,10 +5511,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
|
||||
handle, handle->GetWebContents()->GetBrowserContext()));
|
||||
|
||||
@@ -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
|
||||
@@ -711,18 +711,6 @@ void WebstorePrivateBeginInstallWithMani
|
||||
@@ -705,18 +705,6 @@ void WebstorePrivateBeginInstallWithMani
|
||||
|
||||
void WebstorePrivateBeginInstallWithManifest3Function::
|
||||
ReportFrictionAcceptedEvent() {
|
||||
@@ -226,7 +226,7 @@
|
||||
std::unique_ptr<std::string> response_body) {
|
||||
--- a/chrome/browser/extensions/blocklist_state_fetcher.h
|
||||
+++ b/chrome/browser/extensions/blocklist_state_fetcher.h
|
||||
@@ -36,8 +36,6 @@ class BlocklistStateFetcher {
|
||||
@@ -39,8 +39,6 @@ class BlocklistStateFetcher {
|
||||
|
||||
virtual void Request(const std::string& id, RequestCallback callback);
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
|
||||
# Note: is_android is not equivalent to safe_browsing_mode == 2.
|
||||
# Sources and dependencies added to this block must not depend on anything
|
||||
@@ -564,6 +566,7 @@ static_library("advanced_protection") {
|
||||
@@ -577,6 +579,7 @@ static_library("advanced_protection") {
|
||||
}
|
||||
|
||||
source_set("metrics_collector") {
|
||||
@@ -261,14 +261,14 @@
|
||||
sources = [
|
||||
"safe_browsing_metrics_collector_factory.cc",
|
||||
"safe_browsing_metrics_collector_factory.h",
|
||||
@@ -583,6 +586,7 @@ source_set("metrics_collector") {
|
||||
@@ -596,6 +599,7 @@ source_set("metrics_collector") {
|
||||
"//components/safe_browsing/core/common:safe_browsing_prefs",
|
||||
"//content/public/browser",
|
||||
]
|
||||
+ }
|
||||
}
|
||||
|
||||
source_set("test_support") {
|
||||
source_set("unit_tests") {
|
||||
--- a/chrome/browser/ui/views/download/BUILD.gn
|
||||
+++ b/chrome/browser/ui/views/download/BUILD.gn
|
||||
@@ -27,7 +27,6 @@ source_set("download") {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
|
||||
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
|
||||
@@ -890,93 +890,6 @@ std::tuple<GURL, std::string> AutofillCr
|
||||
@@ -891,93 +891,6 @@ std::tuple<GURL, std::string> AutofillCr
|
||||
}
|
||||
|
||||
bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {
|
||||
|
||||
@@ -178,7 +178,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
|
||||
@@ -33,7 +33,7 @@
|
||||
@@ -32,7 +32,7 @@
|
||||
namespace {
|
||||
|
||||
// The URL to be used to re-install Chrome when auto-update failed for too long.
|
||||
@@ -405,7 +405,7 @@ by default.
|
||||
GURL url(base::WideToUTF16(args[0]));
|
||||
--- a/extensions/common/extension_urls.cc
|
||||
+++ b/extensions/common/extension_urls.cc
|
||||
@@ -38,11 +38,11 @@ const GURL* g_item_snippet_url_for_test_
|
||||
@@ -38,13 +38,13 @@ const GURL* g_item_snippet_url_for_test_
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -413,6 +413,9 @@ by default.
|
||||
-const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/";
|
||||
+const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore";
|
||||
+const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/";
|
||||
const char kExtensionsDocsWhatsNewURL[] =
|
||||
- "https://developer.chrome.com/docs/extensions/whats-new";
|
||||
+ "trk:06:https://developer.chrome.com/docs/extensions/whats-new";
|
||||
const char kChromeWebstoreUpdateURL[] =
|
||||
- "https://clients2.google.com/service/update2/crx";
|
||||
-const char kChromeWebstoreApiURL[] = "https://chromewebstore.googleapis.com/";
|
||||
|
||||
@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
|
||||
|
||||
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
|
||||
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
|
||||
@@ -324,6 +324,10 @@ void ClientSideDetectionService::StartCl
|
||||
@@ -342,6 +342,10 @@ void ClientSideDetectionService::StartCl
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
|
||||
std::string request_data;
|
||||
request->SerializeToString(&request_data);
|
||||
|
||||
@@ -406,6 +410,7 @@ void ClientSideDetectionService::StartCl
|
||||
@@ -424,6 +428,7 @@ void ClientSideDetectionService::StartCl
|
||||
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
|
||||
base::Unretained(WebUIInfoSingleton::GetInstance()),
|
||||
std::move(request), access_token));
|
||||
|
||||
@@ -26,16 +26,6 @@
|
||||
std::string command_id;
|
||||
// Replace the promo URL with "command:<id>" if such a command ID is set
|
||||
// via the feature params.
|
||||
--- a/chrome/browser/search/background/ntp_background_service.cc
|
||||
+++ b/chrome/browser/search/background/ntp_background_service.cc
|
||||
@@ -96,6 +96,7 @@ void NtpBackgroundService::Shutdown() {
|
||||
}
|
||||
|
||||
void NtpBackgroundService::FetchCollectionInfo() {
|
||||
+ return;
|
||||
if (collections_loader_ != nullptr)
|
||||
return;
|
||||
collection_error_info_.ClearError();
|
||||
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
|
||||
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
|
||||
@@ -280,6 +280,7 @@ GURL SpellcheckHunspellDictionary::GetDi
|
||||
@@ -48,7 +38,7 @@
|
||||
|
||||
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
|
||||
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
|
||||
@@ -137,6 +137,10 @@ AffiliationFetcherDelegate* HashAffiliat
|
||||
@@ -132,6 +132,10 @@ HashAffiliationFetcher::~HashAffiliation
|
||||
}
|
||||
|
||||
void HashAffiliationFetcher::StartRequest(
|
||||
@@ -61,7 +51,7 @@
|
||||
base::OnceCallback<void(FetchResult)> result_callback) {
|
||||
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.h
|
||||
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.h
|
||||
@@ -40,6 +40,8 @@ class HashAffiliationFetcher : public Af
|
||||
@@ -39,6 +39,8 @@ class HashAffiliationFetcher : public Af
|
||||
const std::vector<FacetURI>& facet_uris,
|
||||
RequestInfo request_info,
|
||||
base::OnceCallback<void(FetchResult)> result_callback) override;
|
||||
@@ -80,6 +70,16 @@
|
||||
// This function is not supposed to be called if the previous operation is not
|
||||
// finished.
|
||||
if (state_ == REQUESTING) {
|
||||
--- a/components/themes/ntp_background_service.cc
|
||||
+++ b/components/themes/ntp_background_service.cc
|
||||
@@ -96,6 +96,7 @@ void NtpBackgroundService::Shutdown() {
|
||||
}
|
||||
|
||||
void NtpBackgroundService::FetchCollectionInfo() {
|
||||
+ return;
|
||||
if (collections_loader_ != nullptr) {
|
||||
return;
|
||||
}
|
||||
--- a/components/update_client/update_checker.cc
|
||||
+++ b/components/update_client/update_checker.cc
|
||||
@@ -104,6 +104,7 @@ void UpdateCheckerImpl::CheckForUpdates(
|
||||
@@ -92,12 +92,24 @@
|
||||
update_check_callback_ = std::move(update_check_callback);
|
||||
--- a/third_party/devtools-frontend/src/front_end/panels/elements/WebCustomData.ts
|
||||
+++ b/third_party/devtools-frontend/src/front_end/panels/elements/WebCustomData.ts
|
||||
@@ -19,18 +19,7 @@ export class WebCustomData {
|
||||
readonly fetchPromiseForTest: Promise<unknown>;
|
||||
@@ -2,7 +2,6 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
constructor(remoteBase: string) {
|
||||
-import * as Root from '../../core/root/root.js';
|
||||
|
||||
/**
|
||||
* Lazily loads the vscode.web-custom-data/browser.css-data.json and allows
|
||||
@@ -15,33 +14,14 @@ import * as Root from '../../core/root/r
|
||||
export class WebCustomData {
|
||||
#data = new Map<string, CSSProperty>();
|
||||
|
||||
- /** The test actually needs to wait for the result */
|
||||
- readonly fetchPromiseForTest: Promise<unknown>;
|
||||
-
|
||||
- constructor(remoteBase: string) {
|
||||
- if (!remoteBase) {
|
||||
this.fetchPromiseForTest = Promise.resolve();
|
||||
- this.fetchPromiseForTest = Promise.resolve();
|
||||
- return;
|
||||
- }
|
||||
- this.fetchPromiseForTest = fetch(`${remoteBase}third_party/vscode.web-custom-data/browsers.css-data.json`)
|
||||
@@ -108,6 +120,28 @@
|
||||
- }
|
||||
- })
|
||||
- .catch();
|
||||
- }
|
||||
-
|
||||
/**
|
||||
* Creates a fresh `WebCustomData` instance using the standard
|
||||
* DevTools remote base.
|
||||
* Throws if no valid remoteBase was found.
|
||||
*/
|
||||
static create(): WebCustomData {
|
||||
- const remoteBase = Root.Runtime.getRemoteBase();
|
||||
// Silently skip loading of the CSS data if remoteBase is not set properly.
|
||||
- return new WebCustomData(remoteBase?.base ?? '');
|
||||
+ return new WebCustomData();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -54,9 +34,6 @@ export class WebCustomData {
|
||||
}
|
||||
}
|
||||
|
||||
-interface CSSBrowserData {
|
||||
- properties: CSSProperty[];
|
||||
-}
|
||||
|
||||
export interface CSSProperty {
|
||||
name: string;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
url.SchemeIs(dom_distiller::kDomDistillerScheme))
|
||||
--- a/chrome/browser/ui/singleton_tabs.cc
|
||||
+++ b/chrome/browser/ui/singleton_tabs.cc
|
||||
@@ -124,7 +124,8 @@ int GetIndexOfExistingTab(Browser* brows
|
||||
@@ -132,7 +132,8 @@ int GetIndexOfExistingTab(Browser* brows
|
||||
// RewriteURLIfNecessary removes the "view-source:" scheme which could lead
|
||||
// to incorrect matching, so ensure that the target and the candidate are
|
||||
// either both view-source:, or neither is.
|
||||
@@ -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
|
||||
@@ -1081,6 +1081,8 @@ component("net") {
|
||||
@@ -1094,6 +1094,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",
|
||||
@@ -173,7 +173,7 @@
|
||||
return NetLogURLRequestConstructorParams(url, priority_,
|
||||
--- a/net/url_request/url_request_context_builder.cc
|
||||
+++ b/net/url_request/url_request_context_builder.cc
|
||||
@@ -50,6 +50,7 @@
|
||||
@@ -53,6 +53,7 @@
|
||||
#include "net/socket/network_binding_client_socket_factory.h"
|
||||
#include "net/ssl/ssl_config_service_defaults.h"
|
||||
#include "net/url_request/static_http_user_agent_settings.h"
|
||||
@@ -181,7 +181,7 @@
|
||||
#include "net/url_request/url_request_context.h"
|
||||
#include "net/url_request/url_request_job_factory.h"
|
||||
#include "url/url_constants.h"
|
||||
@@ -597,6 +598,9 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
@@ -612,6 +613,9 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
}
|
||||
protocol_handlers_.clear();
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -2714,24 +2714,6 @@ void ChromeContentBrowserClient::AppendE
|
||||
@@ -2752,24 +2752,6 @@ void ChromeContentBrowserClient::AppendE
|
||||
command_line->AppendSwitchASCII(switches::kMetricsClientID,
|
||||
client_info->client_id);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
|
||||
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
|
||||
@@ -297,7 +297,7 @@ bool DomDistillerViewerSource::ShouldSer
|
||||
@@ -291,7 +291,7 @@ bool DomDistillerViewerSource::ShouldSer
|
||||
std::string DomDistillerViewerSource::GetContentSecurityPolicy(
|
||||
network::mojom::CSPDirectiveName directive) {
|
||||
if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
|
||||
|
||||
@@ -681,7 +681,7 @@
|
||||
} // namespace variations
|
||||
--- a/content/browser/preloading/prefetch/prefetch_container.cc
|
||||
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
|
||||
@@ -999,7 +999,7 @@ void PrefetchContainer::AddRedirectHop(c
|
||||
@@ -970,7 +970,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;
|
||||
|
||||
@@ -12,20 +12,20 @@
|
||||
|
||||
data_deps += [
|
||||
- "//chrome/browser/resources/media/mei_preload:component",
|
||||
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
|
||||
"//components/webapps/isolated_web_apps/preload:component",
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
@@ -1202,7 +1201,6 @@ if (is_win) {
|
||||
@@ -1206,7 +1205,6 @@ if (is_win) {
|
||||
":optimization_guide_library",
|
||||
":swiftshader_binaries",
|
||||
":widevine_cdm_library",
|
||||
- "//chrome/browser/resources/media/mei_preload:component_bundle",
|
||||
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle",
|
||||
"//components/webapps/isolated_web_apps/preload:component_bundle",
|
||||
]
|
||||
|
||||
--- a/chrome/browser/resources/BUILD.gn
|
||||
+++ b/chrome/browser/resources/BUILD.gn
|
||||
@@ -88,11 +88,6 @@ group("resources") {
|
||||
@@ -89,11 +89,6 @@ group("resources") {
|
||||
public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
|
||||
}
|
||||
|
||||
@@ -36,4 +36,4 @@
|
||||
- }
|
||||
|
||||
if (is_win || is_mac || is_linux || is_chromeos) {
|
||||
public_deps += [
|
||||
public_deps += [ "connectors_internals:resources" ]
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
--- a/components/network_time/network_time_tracker.cc
|
||||
+++ b/components/network_time/network_time_tracker.cc
|
||||
@@ -282,7 +282,7 @@ void NetworkTimeTracker::UpdateNetworkTi
|
||||
@@ -279,7 +279,7 @@ void NetworkTimeTracker::UpdateNetworkTi
|
||||
}
|
||||
|
||||
bool NetworkTimeTracker::AreTimeFetchesEnabled() const {
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
}
|
||||
|
||||
// static
|
||||
@@ -861,7 +861,7 @@ void PrivacySandboxSettingsImpl::SetTopi
|
||||
@@ -864,7 +864,7 @@ void PrivacySandboxSettingsImpl::SetTopi
|
||||
}
|
||||
|
||||
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
|
||||
@@ -61,7 +61,7 @@
|
||||
}
|
||||
|
||||
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
|
||||
@@ -947,11 +947,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
|
||||
@@ -933,11 +933,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
|
||||
return Status::kIncognitoProfile;
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
// static
|
||||
--- a/content/browser/interest_group/ad_auction_service_impl.cc
|
||||
+++ b/content/browser/interest_group/ad_auction_service_impl.cc
|
||||
@@ -191,11 +191,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
|
||||
@@ -193,11 +193,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
|
||||
void AdAuctionServiceImpl::CreateMojoService(
|
||||
RenderFrameHost* render_frame_host,
|
||||
mojo::PendingReceiver<blink::mojom::AdAuctionService> receiver) {
|
||||
@@ -178,7 +178,7 @@
|
||||
void AdAuctionServiceImpl::JoinInterestGroup(
|
||||
--- a/content/browser/storage_partition_impl.cc
|
||||
+++ b/content/browser/storage_partition_impl.cc
|
||||
@@ -1483,38 +1483,7 @@ void StoragePartitionImpl::Initialize(
|
||||
@@ -1466,38 +1466,7 @@ void StoragePartitionImpl::Initialize(
|
||||
|
||||
bucket_manager_ = std::make_unique<BucketManager>(this);
|
||||
|
||||
@@ -217,7 +217,7 @@
|
||||
|
||||
GeneratedCodeCacheSettings settings =
|
||||
GetContentClient()->browser()->GetGeneratedCodeCacheSettings(
|
||||
@@ -1543,8 +1512,6 @@ void StoragePartitionImpl::Initialize(
|
||||
@@ -1526,8 +1495,6 @@ void StoragePartitionImpl::Initialize(
|
||||
|
||||
font_access_manager_ = FontAccessManager::Create();
|
||||
|
||||
@@ -226,7 +226,7 @@
|
||||
|
||||
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
|
||||
if (is_in_memory()) {
|
||||
@@ -1568,11 +1535,6 @@ void StoragePartitionImpl::Initialize(
|
||||
@@ -1551,11 +1518,6 @@ void StoragePartitionImpl::Initialize(
|
||||
std::make_unique<SharedStorageHeaderObserver>(this);
|
||||
}
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
void StoragePartitionImpl::OnStorageServiceDisconnected() {
|
||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3949,12 +3949,6 @@ void WebContentsImpl::Init(const WebCont
|
||||
@@ -3979,12 +3979,6 @@ void WebContentsImpl::Init(const WebCont
|
||||
DateTimeChooser::CreateDateTimeChooser(this);
|
||||
#endif
|
||||
|
||||
@@ -255,7 +255,7 @@
|
||||
BtmWebContentsObserver::MaybeCreateForWebContents(this);
|
||||
--- a/content/services/auction_worklet/private_aggregation_bindings.cc
|
||||
+++ b/content/services/auction_worklet/private_aggregation_bindings.cc
|
||||
@@ -402,56 +402,6 @@ PrivateAggregationBindings::~PrivateAggr
|
||||
@@ -406,53 +406,6 @@ PrivateAggregationBindings::~PrivateAggr
|
||||
|
||||
void PrivateAggregationBindings::AttachToContext(
|
||||
v8::Local<v8::Context> context) {
|
||||
@@ -281,8 +281,6 @@
|
||||
- send_histogram_report_function)
|
||||
- .Check();
|
||||
-
|
||||
- if (blink::features::kPrivateAggregationApiProtectedAudienceExtensionsEnabled
|
||||
- .Get()) {
|
||||
- v8::Local<v8::Function> report_contribution_for_event_function =
|
||||
- v8::Function::New(
|
||||
- context, &PrivateAggregationBindings::ContributeToHistogramOnEvent,
|
||||
@@ -294,7 +292,6 @@
|
||||
- v8_helper_->CreateStringFromLiteral("contributeToHistogramOnEvent"),
|
||||
- report_contribution_for_event_function)
|
||||
- .Check();
|
||||
- }
|
||||
-
|
||||
- v8::Local<v8::Function> enable_debug_mode_function =
|
||||
- v8::Function::New(context, &PrivateAggregationBindings::EnableDebugMode,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
|
||||
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
|
||||
@@ -680,12 +680,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
@@ -678,12 +678,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
GetOriginsRequiringDedicatedProcess() {
|
||||
std::vector<url::Origin> list;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
|
||||
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
|
||||
@@ -300,17 +300,7 @@ bool ChromeContentVerifierDelegate::IsFr
|
||||
@@ -303,17 +303,7 @@ bool ChromeContentVerifierDelegate::IsFr
|
||||
// between which extensions are considered in-store.
|
||||
// See https://crbug.com/766806 for details.
|
||||
if (!InstallVerifier::IsFromStore(extension, context_)) {
|
||||
@@ -60,15 +60,15 @@
|
||||
}
|
||||
--- a/chrome/browser/extensions/extension_migrator.h
|
||||
+++ b/chrome/browser/extensions/extension_migrator.h
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "chrome/browser/extensions/external_loader.h"
|
||||
#include "extensions/buildflags/buildflags.h"
|
||||
+#include "url/gurl.h"
|
||||
|
||||
class Profile;
|
||||
static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
|
||||
|
||||
@@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa
|
||||
@@ -43,6 +44,7 @@ class ExtensionMigrator : public Externa
|
||||
raw_ptr<Profile> profile_;
|
||||
const std::string old_id_;
|
||||
const std::string new_id_;
|
||||
@@ -177,7 +177,7 @@
|
||||
fetch->oauth2_attempt_count++;
|
||||
--- a/extensions/common/extension_urls.cc
|
||||
+++ b/extensions/common/extension_urls.cc
|
||||
@@ -68,8 +68,6 @@ GURL AppendUtmSource(const GURL& url, st
|
||||
@@ -74,8 +74,6 @@ GURL AppendUtmSource(const GURL& url, st
|
||||
|
||||
GURL GetWebstoreExtensionsCategoryURL() {
|
||||
GURL base_url = GetNewWebstoreLaunchURL();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc
|
||||
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc
|
||||
@@ -132,17 +132,6 @@ void ExtensionInfoGenerator::FillExtensi
|
||||
@@ -61,17 +61,6 @@ void ExtensionInfoGenerator::FillExtensi
|
||||
info.controlled_info.emplace();
|
||||
info.controlled_info->text =
|
||||
l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE);
|
||||
@@ -17,10 +17,10 @@
|
||||
- }
|
||||
}
|
||||
|
||||
bool is_enabled = state == developer::ExtensionState::kEnabled;
|
||||
// Dependent extensions.
|
||||
--- a/chrome/browser/extensions/extension_management.cc
|
||||
+++ b/chrome/browser/extensions/extension_management.cc
|
||||
@@ -317,31 +317,7 @@ bool ExtensionManagement::IsAllowedManif
|
||||
@@ -322,31 +322,7 @@ bool ExtensionManagement::IsAllowedManif
|
||||
int manifest_version,
|
||||
const std::string& extension_id,
|
||||
Manifest::Type manifest_type) {
|
||||
@@ -52,7 +52,7 @@
|
||||
}
|
||||
|
||||
bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
|
||||
@@ -362,26 +338,8 @@ bool ExtensionManagement::IsExemptFromMV
|
||||
@@ -367,26 +343,8 @@ bool ExtensionManagement::IsExemptFromMV
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -81,7 +81,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:
|
||||
@@ -146,22 +146,6 @@ bool ManifestV2ExperimentManagerFactory:
|
||||
|
||||
// Determines the current stage of the MV2 deprecation experiments.
|
||||
MV2ExperimentStage CalculateCurrentExperimentStage() {
|
||||
@@ -104,7 +104,7 @@
|
||||
return MV2ExperimentStage::kNone;
|
||||
}
|
||||
|
||||
@@ -200,19 +184,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
|
||||
@@ -201,19 +185,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
|
||||
// Returns true if legacy extensions should be disabled, looking at both
|
||||
// experiment stage and global state.
|
||||
bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) {
|
||||
@@ -126,7 +126,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
|
||||
@@ -481,7 +481,7 @@ content::WebUIDataSource* CreateAndAddEx
|
||||
@@ -490,7 +490,7 @@ content::WebUIDataSource* CreateAndAddEx
|
||||
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
|
||||
source->AddBoolean(
|
||||
"safetyHubThreeDotDetails",
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -374,7 +374,6 @@ if (!is_android && !is_mac) {
|
||||
@@ -373,7 +373,6 @@ if (!is_android && !is_mac) {
|
||||
|
||||
data_deps += [
|
||||
"//chrome/browser/resources/media/mei_preload:component",
|
||||
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
|
||||
- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component",
|
||||
"//components/webapps/isolated_web_apps/preload:component",
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
|
||||
@@ -933,8 +932,6 @@ if (is_win) {
|
||||
@@ -937,8 +936,6 @@ if (is_win) {
|
||||
|
||||
bundle_data("chrome_framework_resources") {
|
||||
sources = [
|
||||
@@ -20,17 +20,17 @@
|
||||
# This image is used to badge the lock icon in the
|
||||
# authentication dialogs, such as those used for installation
|
||||
# from disk image and Keystone promotion (if so enabled). It
|
||||
@@ -1207,7 +1204,6 @@ if (is_win) {
|
||||
@@ -1210,7 +1207,6 @@ if (is_win) {
|
||||
":swiftshader_binaries",
|
||||
":widevine_cdm_library",
|
||||
"//chrome/browser/resources/media/mei_preload:component_bundle",
|
||||
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle",
|
||||
- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component_bundle",
|
||||
"//components/webapps/isolated_web_apps/preload:component_bundle",
|
||||
]
|
||||
|
||||
if (is_chrome_branded) {
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -765,10 +765,6 @@ static_library("browser") {
|
||||
@@ -761,10 +761,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",
|
||||
@@ -3549,10 +3545,6 @@ static_library("browser") {
|
||||
@@ -3560,10 +3556,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",
|
||||
@@ -4268,8 +4260,6 @@ static_library("browser") {
|
||||
@@ -4283,8 +4275,6 @@ static_library("browser") {
|
||||
"//chrome/app:command_ids",
|
||||
"//chrome/app/theme:chrome_unscaled_resources_grit",
|
||||
"//chrome/app/vector_icons",
|
||||
@@ -60,8 +60,8 @@
|
||||
- "//chrome/browser/accessibility/tree_fixing:service",
|
||||
"//chrome/browser/apps/app_service",
|
||||
"//chrome/browser/apps/link_capturing",
|
||||
"//chrome/browser/autofill_ai:util",
|
||||
@@ -4291,10 +4281,6 @@ static_library("browser") {
|
||||
"//chrome/browser/contextual_cueing",
|
||||
@@ -4305,10 +4295,6 @@ static_library("browser") {
|
||||
"//chrome/browser/new_tab_page/chrome_colors",
|
||||
"//chrome/browser/policy:path_parser",
|
||||
"//chrome/browser/resources:component_extension_resources",
|
||||
@@ -72,7 +72,7 @@
|
||||
"//chrome/browser/search/background",
|
||||
"//chrome/browser/smart_card",
|
||||
"//chrome/browser/themes",
|
||||
@@ -4419,9 +4405,6 @@ static_library("browser") {
|
||||
@@ -4442,9 +4428,6 @@ static_library("browser") {
|
||||
"//components/webauthn/core/browser",
|
||||
"//components/webauthn/core/browser:passkey_model",
|
||||
"//services/device/public/cpp/hid",
|
||||
@@ -82,7 +82,7 @@
|
||||
"//third_party/crashpad/crashpad/client:common",
|
||||
"//third_party/zxcvbn-cpp",
|
||||
"//ui/views",
|
||||
@@ -4516,8 +4499,6 @@ static_library("browser") {
|
||||
@@ -4544,8 +4527,6 @@ static_library("browser") {
|
||||
sources += [
|
||||
"accessibility/soda_installer_impl.cc",
|
||||
"accessibility/soda_installer_impl.h",
|
||||
@@ -91,7 +91,7 @@
|
||||
"device_identity/device_oauth2_token_store_desktop.cc",
|
||||
"device_identity/device_oauth2_token_store_desktop.h",
|
||||
"device_notifications/device_status_icon_renderer.cc",
|
||||
@@ -4556,8 +4537,6 @@ static_library("browser") {
|
||||
@@ -4584,8 +4565,6 @@ static_library("browser") {
|
||||
"profiles/profile_activity_metrics_recorder.h",
|
||||
"profiles/profile_list_desktop.cc",
|
||||
"profiles/profile_list_desktop.h",
|
||||
@@ -100,7 +100,7 @@
|
||||
"signin/force_signin_verifier.cc",
|
||||
"signin/force_signin_verifier.h",
|
||||
"signin/signin_manager.cc",
|
||||
@@ -5359,7 +5338,6 @@ static_library("browser") {
|
||||
@@ -5386,7 +5365,6 @@ static_library("browser") {
|
||||
"//chrome/browser/policy:system_features_disable_list",
|
||||
"//chrome/browser/push_notification:push_notification",
|
||||
"//chrome/browser/resources:app_icon_resources",
|
||||
@@ -108,7 +108,7 @@
|
||||
"//chrome/browser/support_tool/ash",
|
||||
"//chrome/browser/ui/ash/accelerator",
|
||||
"//chrome/browser/ui/ash/accessibility",
|
||||
@@ -5623,7 +5601,6 @@ static_library("browser") {
|
||||
@@ -5651,7 +5629,6 @@ static_library("browser") {
|
||||
"//remoting/host/chromeos:browser_interop",
|
||||
"//remoting/host/chromeos:features",
|
||||
"//services/device/public/cpp/geolocation",
|
||||
@@ -116,7 +116,7 @@
|
||||
"//third_party/nearby:rpc_resources_proto",
|
||||
"//third_party/nearby:wire_format_proto",
|
||||
"//ui/chromeos",
|
||||
@@ -7850,12 +7827,6 @@ static_library("browser") {
|
||||
@@ -7893,12 +7870,6 @@ static_library("browser") {
|
||||
}
|
||||
|
||||
if (enable_pdf) {
|
||||
@@ -131,18 +131,21 @@
|
||||
"//chrome/browser/pdf:pdf_pref_names",
|
||||
--- a/chrome/browser/accessibility/tree_fixing/BUILD.gn
|
||||
+++ b/chrome/browser/accessibility/tree_fixing/BUILD.gn
|
||||
@@ -60,8 +60,6 @@ source_set("internal") {
|
||||
@@ -64,11 +64,9 @@ source_set("internal") {
|
||||
deps = [
|
||||
"//base",
|
||||
"//chrome/browser/profiles:profile",
|
||||
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
|
||||
"//components/paint_preview/browser",
|
||||
"//components/paint_preview/common",
|
||||
"//components/paint_preview/public",
|
||||
"//content/public/browser:browser",
|
||||
- "//services/screen_ai/public/mojom:mojom",
|
||||
]
|
||||
}
|
||||
--- a/chrome/browser/browser_process_impl.cc
|
||||
+++ b/chrome/browser/browser_process_impl.cc
|
||||
@@ -249,12 +249,10 @@
|
||||
@@ -250,12 +250,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"
|
||||
@@ -155,7 +158,7 @@
|
||||
#include "chrome/browser/usb/usb_status_icon.h"
|
||||
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
|
||||
#endif
|
||||
@@ -1359,9 +1357,6 @@ void BrowserProcessImpl::PreMainMessageL
|
||||
@@ -1381,9 +1379,6 @@ void BrowserProcessImpl::PreMainMessageL
|
||||
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -177,7 +180,7 @@
|
||||
|
||||
// Real implementation of BrowserProcess that creates and returns the services.
|
||||
class BrowserProcessImpl : public BrowserProcess,
|
||||
@@ -431,9 +428,6 @@ class BrowserProcessImpl : public Browse
|
||||
@@ -439,9 +436,6 @@ class BrowserProcessImpl : public Browse
|
||||
// to ensure that SodaInstallerImpl gets destructed first.
|
||||
std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
|
||||
|
||||
@@ -189,7 +192,7 @@
|
||||
std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
|
||||
--- a/chrome/browser/chrome_browser_interface_binders.cc
|
||||
+++ b/chrome/browser/chrome_browser_interface_binders.cc
|
||||
@@ -78,8 +78,6 @@
|
||||
@@ -82,8 +82,6 @@
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -198,7 +201,7 @@
|
||||
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
|
||||
#endif
|
||||
|
||||
@@ -357,27 +355,6 @@ void BindMediaFoundationPreferences(
|
||||
@@ -362,27 +360,6 @@ void BindMediaFoundationPreferences(
|
||||
}
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -224,9 +227,9 @@
|
||||
-}
|
||||
-#endif
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -510,11 +487,6 @@ void PopulateChromeFrameBinders(
|
||||
void BindModelBroker(
|
||||
content::RenderFrameHost* frame_host,
|
||||
@@ -530,11 +507,6 @@ void PopulateChromeFrameBinders(
|
||||
base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
|
||||
}
|
||||
|
||||
@@ -364,7 +367,7 @@
|
||||
void NavigationPredictor::SetModelScoreCallbackForTesting(
|
||||
--- a/chrome/browser/pdf/pdf_extension_util.cc
|
||||
+++ b/chrome/browser/pdf/pdf_extension_util.cc
|
||||
@@ -104,7 +104,6 @@ void AddPdfViewerStrings(base::Value::Di
|
||||
@@ -100,7 +100,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},
|
||||
@@ -374,17 +377,17 @@
|
||||
{"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
|
||||
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
|
||||
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
|
||||
@@ -282,21 +282,6 @@ void PredictionBasedPermissionUiSelector
|
||||
@@ -283,21 +283,6 @@ void PredictionBasedPermissionUiSelector
|
||||
if (inner_text.size() > kPageContentMaxLength) {
|
||||
inner_text.resize(kPageContentMaxLength);
|
||||
}
|
||||
- if (PredictionModelHandlerProvider* prediction_model_handler_provider =
|
||||
- PredictionModelHandlerProviderFactory::GetForBrowserContext(
|
||||
- profile_)) {
|
||||
- if (PermissionsAiHandler* gen_ai_model_handler =
|
||||
- prediction_model_handler_provider->GetPermissionsAiHandler()) {
|
||||
- if (PermissionsAiv1Handler* aiv1_model_handler =
|
||||
- prediction_model_handler_provider->GetPermissionsAiv1Handler()) {
|
||||
- VLOG(1) << "[PermissionsAIv1] Inquire model.";
|
||||
- gen_ai_model_handler->InquireAiOnDeviceModel(
|
||||
- aiv1_model_handler->InquireAiOnDeviceModel(
|
||||
- std::move(inner_text), request_type,
|
||||
- base::BindRepeating(&PredictionBasedPermissionUiSelector::
|
||||
- AiOnDeviceModelExecutionCallback,
|
||||
@@ -398,7 +401,7 @@
|
||||
VLOG(1) << "[PermissionsAIv1] The page's contnet too short or empty";
|
||||
--- a/chrome/browser/prefs/BUILD.gn
|
||||
+++ b/chrome/browser/prefs/BUILD.gn
|
||||
@@ -267,7 +267,6 @@ source_set("impl") {
|
||||
@@ -274,7 +274,6 @@ source_set("impl") {
|
||||
} else {
|
||||
deps += [
|
||||
"//chrome/browser/promos:utils",
|
||||
@@ -408,7 +411,7 @@
|
||||
"//chrome/browser/search_engines",
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
+++ b/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -1792,9 +1792,6 @@ void RegisterLocalState(PrefRegistrySimp
|
||||
@@ -1807,9 +1807,6 @@ void RegisterLocalState(PrefRegistrySimp
|
||||
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
|
||||
#endif
|
||||
|
||||
@@ -420,7 +423,7 @@
|
||||
PlatformAuthPolicyObserver::RegisterPrefs(registry);
|
||||
--- a/chrome/browser/profiles/BUILD.gn
|
||||
+++ b/chrome/browser/profiles/BUILD.gn
|
||||
@@ -294,7 +294,6 @@ source_set("profiles_extra_parts_impl")
|
||||
@@ -297,7 +297,6 @@ source_set("profiles_extra_parts_impl")
|
||||
]
|
||||
} else {
|
||||
deps += [
|
||||
@@ -428,7 +431,7 @@
|
||||
"//chrome/browser/apps/app_service",
|
||||
"//chrome/browser/autofill",
|
||||
"//chrome/browser/contextual_cueing",
|
||||
@@ -302,7 +301,6 @@ source_set("profiles_extra_parts_impl")
|
||||
@@ -305,7 +304,6 @@ source_set("profiles_extra_parts_impl")
|
||||
"//chrome/browser/feedback",
|
||||
"//chrome/browser/hid",
|
||||
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
|
||||
@@ -438,7 +441,7 @@
|
||||
"//chrome/browser/search_engine_choice",
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -102,7 +102,6 @@
|
||||
@@ -104,7 +104,6 @@
|
||||
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
|
||||
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
|
||||
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
|
||||
@@ -446,7 +449,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"
|
||||
@@ -322,7 +321,6 @@
|
||||
@@ -326,7 +325,6 @@
|
||||
#include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h"
|
||||
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
|
||||
#include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
|
||||
@@ -454,7 +457,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"
|
||||
@@ -1005,7 +1003,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1025,7 +1023,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
|
||||
net::ServerCertificateDatabaseServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -462,7 +465,7 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
NearbySharingServiceFactory::GetInstance();
|
||||
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
|
||||
@@ -1057,9 +1054,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1077,9 +1074,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
OneTimePermissionsTrackerFactory::GetInstance();
|
||||
#endif
|
||||
OpenerHeuristicServiceFactory::GetInstance();
|
||||
@@ -472,7 +475,7 @@
|
||||
OptimizationGuideKeyedServiceFactory::GetInstance();
|
||||
OriginKeyedPermissionActionServiceFactory::GetInstance();
|
||||
OriginTrialsFactory::GetInstance();
|
||||
@@ -1123,13 +1117,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1146,13 +1140,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
policy::UserPolicySigninServiceFactory::GetInstance();
|
||||
#endif
|
||||
PolicyBlocklistFactory::GetInstance();
|
||||
@@ -486,7 +489,7 @@
|
||||
PredictionServiceFactory::GetInstance();
|
||||
predictors::AutocompleteActionPredictorFactory::GetInstance();
|
||||
predictors::LoadingPredictorFactory::GetInstance();
|
||||
@@ -1215,13 +1202,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1239,13 +1226,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#else
|
||||
SafetyHubMenuNotificationServiceFactory::GetInstance();
|
||||
SafetyHubHatsServiceFactory::GetInstance();
|
||||
@@ -500,7 +503,7 @@
|
||||
#endif
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
if (ash::features::IsScannerEnabled()) {
|
||||
@@ -1331,7 +1311,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1356,7 +1336,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
TrackingProtectionSettingsFactory::GetInstance();
|
||||
translate::TranslateRankerFactory::GetInstance();
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
@@ -510,7 +513,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
|
||||
@@ -221,11 +221,6 @@ void OffTheRecordProfileImpl::Init() {
|
||||
@@ -225,11 +225,6 @@ void OffTheRecordProfileImpl::Init() {
|
||||
// AccessibilityLabelsService has a default prefs behavior in incognito.
|
||||
AccessibilityLabelsService::InitOffTheRecordPrefs(this);
|
||||
|
||||
@@ -559,7 +562,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"
|
||||
@@ -1508,9 +1507,6 @@ void ProfileManager::DoFinalInitForServi
|
||||
@@ -1506,9 +1505,6 @@ void ProfileManager::DoFinalInitForServi
|
||||
// Ensure NavigationPredictorKeyedService is started.
|
||||
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
|
||||
|
||||
@@ -571,7 +574,7 @@
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
--- a/chrome/browser/resources/BUILD.gn
|
||||
+++ b/chrome/browser/resources/BUILD.gn
|
||||
@@ -91,7 +91,6 @@ group("resources") {
|
||||
@@ -92,7 +92,6 @@ group("resources") {
|
||||
if (is_mac) {
|
||||
public_deps += [
|
||||
"//chrome/browser/resources/media/mei_preload:component",
|
||||
@@ -581,7 +584,7 @@
|
||||
|
||||
--- a/chrome/browser/resources/pdf/pdf_viewer.html
|
||||
+++ b/chrome/browser/resources/pdf/pdf_viewer.html
|
||||
@@ -94,10 +94,6 @@ import {AnnotationMode} from './constant
|
||||
@@ -98,10 +98,6 @@ import {AnnotationMode} from './constant
|
||||
</cr-page-selector>
|
||||
` : ''}
|
||||
</if>
|
||||
@@ -594,7 +597,7 @@
|
||||
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -1716,8 +1716,6 @@ static_library("ui") {
|
||||
@@ -1722,8 +1722,6 @@ static_library("ui") {
|
||||
"//chrome/browser/regional_capabilities",
|
||||
"//chrome/browser/safe_browsing",
|
||||
"//chrome/browser/safe_browsing:advanced_protection",
|
||||
@@ -603,7 +606,7 @@
|
||||
"//chrome/browser/smart_card:smart_card",
|
||||
"//chrome/browser/tab_group_sync:utils",
|
||||
"//chrome/browser/themes",
|
||||
@@ -2397,7 +2395,6 @@ static_library("ui") {
|
||||
@@ -2415,7 +2413,6 @@ static_library("ui") {
|
||||
"//chrome/browser/policy:onc",
|
||||
"//chrome/browser/policy:system_features_disable_list",
|
||||
"//chrome/browser/push_notification:push_notification",
|
||||
@@ -747,7 +750,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"
|
||||
@@ -371,24 +369,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
|
||||
@@ -364,24 +362,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
|
||||
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
|
||||
SetDefaultLanguageCode(prefs_lang);
|
||||
|
||||
@@ -772,7 +775,7 @@
|
||||
|
||||
// Enable accessibility for the top level render frame and all descendants.
|
||||
// This causes AXTreeSerializer to reset and send accessibility events of
|
||||
@@ -842,12 +822,6 @@ void ReadAnythingUntrustedPageHandler::S
|
||||
@@ -829,12 +809,6 @@ void ReadAnythingUntrustedPageHandler::S
|
||||
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
|
||||
}
|
||||
}
|
||||
@@ -848,7 +851,7 @@
|
||||
void ChromeRenderFrameObserver::DidMeaningfulLayout(
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -2187,9 +2187,6 @@ if (!is_android) {
|
||||
@@ -2250,9 +2250,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",
|
||||
@@ -858,7 +861,7 @@
|
||||
"//chrome/browser/search",
|
||||
"//chrome/browser/search_engines",
|
||||
"//chrome/browser/segmentation_platform:test_utils",
|
||||
@@ -2592,9 +2589,6 @@ if (!is_android) {
|
||||
@@ -2664,9 +2661,6 @@ if (!is_android) {
|
||||
"//services/network/public/proto:sct_audit_report_proto",
|
||||
"//services/preferences/public/cpp",
|
||||
"//services/preferences/public/cpp/tracked",
|
||||
@@ -868,7 +871,7 @@
|
||||
"//services/service_manager/public/cpp",
|
||||
"//services/strings",
|
||||
"//services/test/echo/public/mojom",
|
||||
@@ -8121,7 +8115,6 @@ test("unit_tests") {
|
||||
@@ -8211,7 +8205,6 @@ test("unit_tests") {
|
||||
|
||||
# Non-android deps for "unit_tests" target.
|
||||
deps += [
|
||||
@@ -876,7 +879,7 @@
|
||||
"//chrome:packed_resources_integrity_header",
|
||||
"//chrome/browser/apps:icon_standardizer",
|
||||
"//chrome/browser/apps/app_service",
|
||||
@@ -8156,7 +8149,6 @@ test("unit_tests") {
|
||||
@@ -8246,7 +8239,6 @@ test("unit_tests") {
|
||||
"//chrome/browser/resource_coordinator:tab_manager_features",
|
||||
"//chrome/browser/resources:component_extension_resources_grit",
|
||||
"//chrome/browser/resources/new_tab_page_instant:resources_grit",
|
||||
@@ -884,7 +887,7 @@
|
||||
"//chrome/browser/search/background",
|
||||
"//chrome/browser/search/background:constants",
|
||||
"//chrome/browser/search_engine_choice:unit_tests",
|
||||
@@ -8265,7 +8257,6 @@ test("unit_tests") {
|
||||
@@ -8358,7 +8350,6 @@ test("unit_tests") {
|
||||
"//components/webapps/browser",
|
||||
"//services/metrics/public/cpp:ukm_builders",
|
||||
"//services/network:test_support",
|
||||
@@ -955,9 +958,19 @@
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
|
||||
--- a/components/BUILD.gn
|
||||
+++ b/components/BUILD.gn
|
||||
@@ -597,7 +597,6 @@ test("components_unittests") {
|
||||
"//components/media_router/common/providers/cast/channel:unit_tests",
|
||||
"//components/page_info:unit_tests",
|
||||
"//components/permissions:unit_tests",
|
||||
- "//components/permissions/prediction_service:unit_tests",
|
||||
"//components/privacy_sandbox:unit_tests",
|
||||
"//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests",
|
||||
"//components/safety_check:unit_tests",
|
||||
--- a/components/omnibox/browser/autocomplete_classifier.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_classifier.cc
|
||||
@@ -122,8 +122,6 @@ void AutocompleteClassifier::Classify(
|
||||
@@ -126,8 +126,6 @@ void AutocompleteClassifier::Classify(
|
||||
metrics::OmniboxEventProto::PageClassification page_classification,
|
||||
AutocompleteMatch* match,
|
||||
GURL* alternate_nav_url) {
|
||||
@@ -1083,7 +1096,7 @@
|
||||
};
|
||||
--- a/components/update_client/BUILD.gn
|
||||
+++ b/components/update_client/BUILD.gn
|
||||
@@ -341,8 +341,6 @@ source_set("unit_tests") {
|
||||
@@ -361,8 +361,6 @@ source_set("unit_tests") {
|
||||
"//third_party/puffin:libpuffpatch",
|
||||
"//third_party/re2",
|
||||
]
|
||||
@@ -1094,7 +1107,7 @@
|
||||
fuzzer_test("update_client_protocol_serializer_fuzzer") {
|
||||
--- a/content/shell/BUILD.gn
|
||||
+++ b/content/shell/BUILD.gn
|
||||
@@ -820,10 +820,6 @@ if (is_apple) {
|
||||
@@ -830,10 +830,6 @@ if (is_apple) {
|
||||
deps = [ "//third_party/icu:icudata" ]
|
||||
}
|
||||
|
||||
@@ -1160,7 +1173,7 @@
|
||||
|
||||
--- a/pdf/pdfium/pdfium_engine.cc
|
||||
+++ b/pdf/pdfium/pdfium_engine.cc
|
||||
@@ -2696,7 +2696,7 @@ void PDFiumEngine::HandleLongPress(const
|
||||
@@ -2697,7 +2697,7 @@ void PDFiumEngine::HandleLongPress(const
|
||||
|
||||
SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) {
|
||||
DCHECK(PageIndexInBounds(page_index));
|
||||
@@ -1209,19 +1222,9 @@
|
||||
- use_fake_screen_ai = is_msan || is_ubsan || is_ubsan_vptr || is_ubsan_security
|
||||
+ use_fake_screen_ai = false
|
||||
}
|
||||
--- a/third_party/devtools-frontend/src/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/BUILD.gn
|
||||
@@ -16,7 +16,6 @@ import("./third_party/blink/public/publi
|
||||
devtools_frontend_resources_deps = [
|
||||
":favicon",
|
||||
"front_end",
|
||||
- "test",
|
||||
]
|
||||
|
||||
group("devtools_all_files") {
|
||||
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
|
||||
@@ -213,7 +213,6 @@ group("unittests") {
|
||||
@@ -207,7 +207,6 @@ group("unittests") {
|
||||
"panels/timeline:unittests",
|
||||
"panels/timeline/components:unittests",
|
||||
"panels/timeline/components/insights:unittests",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -608,8 +608,6 @@ static_library("browser") {
|
||||
@@ -606,8 +606,6 @@ static_library("browser") {
|
||||
"infobars/simple_alert_infobar_creator.h",
|
||||
"interstitials/chrome_settings_page_helper.cc",
|
||||
"interstitials/chrome_settings_page_helper.h",
|
||||
@@ -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",
|
||||
@@ -3892,10 +3889,6 @@ static_library("browser") {
|
||||
@@ -3903,10 +3900,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",
|
||||
@@ -8468,7 +8461,6 @@ static_library("browser_generated_files"
|
||||
@@ -8515,7 +8508,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",
|
||||
@@ -8954,8 +8946,6 @@ static_library("test_support") {
|
||||
@@ -9005,8 +8997,6 @@ static_library("test_support") {
|
||||
"//components/reporting/util:status",
|
||||
"//components/reporting/util:status_macros",
|
||||
"//components/reporting/util:task_runner_context",
|
||||
@@ -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
|
||||
@@ -169,7 +169,6 @@ using content::DownloadManager;
|
||||
@@ -171,7 +171,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)
|
||||
@@ -1815,7 +1814,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
||||
@@ -1840,7 +1839,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(
|
||||
@@ -1896,49 +1894,20 @@ bool ChromeDownloadManagerDelegate::IsOp
|
||||
@@ -1921,49 +1919,20 @@ bool ChromeDownloadManagerDelegate::IsOp
|
||||
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
|
||||
download::DownloadItem* item,
|
||||
download::DownloadDangerType danger_type) const {
|
||||
@@ -146,7 +146,7 @@
|
||||
<< static_cast<int>(download_restriction);
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -1373,14 +1373,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
@@ -1371,14 +1371,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
|
||||
std::optional<base::Time>
|
||||
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
|
||||
@@ -294,15 +294,15 @@
|
||||
analysis_config_->supported_tags[0].max_file_size;
|
||||
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
||||
@@ -40,8 +40,6 @@
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
@@ -41,8 +41,6 @@
|
||||
#include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_factory.h"
|
||||
#include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h"
|
||||
#include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
|
||||
-#include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
|
||||
-#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h"
|
||||
#include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager_factory.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/enterprise/buildflags/buildflags.h"
|
||||
#include "components/enterprise/common/files_scan_data.h"
|
||||
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc
|
||||
@@ -126,7 +126,7 @@ ContentAnalysisDownloadsDelegate::GetCus
|
||||
@@ -491,7 +491,7 @@
|
||||
signals.Set(device_signals::names::kBuiltInDnsClientEnabled,
|
||||
--- 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
|
||||
@@ -187,20 +187,7 @@ void RealtimeReportingClient::SetProfile
|
||||
}
|
||||
|
||||
std::string RealtimeReportingClient::GetProfileUserName() {
|
||||
@@ -513,6 +513,28 @@
|
||||
}
|
||||
|
||||
std::string RealtimeReportingClient::GetProfileIdentifier() {
|
||||
--- a/chrome/browser/enterprise/connectors/reporting/telomere_reporting_context.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/reporting/telomere_reporting_context.cc
|
||||
@@ -176,19 +176,6 @@ TelomereReportingContext* TelomereReport
|
||||
}
|
||||
|
||||
RealtimeReportingClient* TelomereReportingContext::GetReportingClient() const {
|
||||
- for (auto& it : active_profiles_) {
|
||||
- Profile* profile = it.second;
|
||||
- RealtimeReportingClient* reporting_client =
|
||||
- RealtimeReportingClientFactory::GetForProfile(profile);
|
||||
- if (!reporting_client) {
|
||||
- continue;
|
||||
- }
|
||||
- std::optional<ReportingSettings> settings =
|
||||
- reporting_client->GetReportingSettings();
|
||||
- if (settings.has_value() && !settings->per_profile) {
|
||||
- return reporting_client;
|
||||
- }
|
||||
- }
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
--- a/chrome/browser/enterprise/data_controls/reporting_service.cc
|
||||
+++ b/chrome/browser/enterprise/data_controls/reporting_service.cc
|
||||
@@ -163,10 +163,6 @@ void ReportingService::ReportPaste(
|
||||
@@ -641,73 +663,47 @@
|
||||
std::string browser_version;
|
||||
safe_browsing::SafeBrowsingState safe_browsing_protection_level;
|
||||
bool site_isolation_enabled;
|
||||
--- a/chrome/browser/enterprise/signals/signals_utils.cc
|
||||
+++ b/chrome/browser/enterprise/signals/signals_utils.cc
|
||||
@@ -33,38 +33,11 @@ bool IsURLBlocked(const GURL& url, Polic
|
||||
|
||||
} // namespace
|
||||
|
||||
-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel(
|
||||
- PrefService* profile_prefs) {
|
||||
- DCHECK(profile_prefs);
|
||||
- bool safe_browsing_enabled =
|
||||
- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnabled);
|
||||
- bool safe_browsing_enhanced_enabled =
|
||||
- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnhanced);
|
||||
-
|
||||
- if (safe_browsing_enabled) {
|
||||
- if (safe_browsing_enhanced_enabled)
|
||||
- return safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION;
|
||||
- else
|
||||
- return safe_browsing::SafeBrowsingState::STANDARD_PROTECTION;
|
||||
- } else {
|
||||
- return safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
bool GetBuiltInDnsClientEnabled(PrefService* local_state) {
|
||||
DCHECK(local_state);
|
||||
return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled);
|
||||
--- a/chrome/browser/enterprise/signals/profile_signals_collector.cc
|
||||
+++ b/chrome/browser/enterprise/signals/profile_signals_collector.cc
|
||||
@@ -45,13 +45,7 @@ ProfileSignalsCollector::ProfileSignalsC
|
||||
policy_blocklist_service_(
|
||||
PolicyBlocklistFactory::GetForBrowserContext(profile)),
|
||||
profile_prefs_(profile->GetPrefs()),
|
||||
- policy_manager_(profile->GetCloudPolicyManager()),
|
||||
- connectors_service_(
|
||||
- enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext(
|
||||
- profile)) {
|
||||
-#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
|
||||
- DCHECK(connectors_service_);
|
||||
-#endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
|
||||
+ policy_manager_(profile->GetCloudPolicyManager()) {
|
||||
DCHECK(policy_blocklist_service_);
|
||||
}
|
||||
|
||||
-std::optional<safe_browsing::PasswordProtectionTrigger>
|
||||
-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs) {
|
||||
- DCHECK(profile_prefs);
|
||||
- if (!profile_prefs->HasPrefPath(prefs::kPasswordProtectionWarningTrigger))
|
||||
- return std::nullopt;
|
||||
- return static_cast<safe_browsing::PasswordProtectionTrigger>(
|
||||
- profile_prefs->GetInteger(prefs::kPasswordProtectionWarningTrigger));
|
||||
-}
|
||||
-
|
||||
bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service) {
|
||||
DCHECK(service);
|
||||
return IsURLBlocked(GURL("https://remotedesktop.google.com"), service) ||
|
||||
--- a/chrome/browser/enterprise/signals/signals_utils.h
|
||||
+++ b/chrome/browser/enterprise/signals/signals_utils.h
|
||||
@@ -17,12 +17,6 @@ namespace utils {
|
||||
|
||||
bool GetBuiltInDnsClientEnabled(PrefService* local_state);
|
||||
|
||||
-std::optional<safe_browsing::PasswordProtectionTrigger>
|
||||
-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs);
|
||||
-
|
||||
-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel(
|
||||
- PrefService* profile_prefs);
|
||||
-
|
||||
bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service);
|
||||
|
||||
} // namespace utils
|
||||
@@ -68,12 +62,8 @@ void ProfileSignalsCollector::GetProfile
|
||||
signal_response.chrome_remote_desktop_app_blocked =
|
||||
device_signals::GetChromeRemoteDesktopAppBlocked(
|
||||
policy_blocklist_service_);
|
||||
- signal_response.password_protection_warning_trigger =
|
||||
- device_signals::GetPasswordProtectionWarningTrigger(profile_prefs_);
|
||||
signal_response.profile_enrollment_domain =
|
||||
device_signals::TryGetEnrollmentDomain(policy_manager_);
|
||||
- signal_response.safe_browsing_protection_level =
|
||||
- device_signals::GetSafeBrowsingProtectionLevel(profile_prefs_);
|
||||
signal_response.site_isolation_enabled =
|
||||
device_signals::GetSiteIsolationEnabled();
|
||||
#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -705,8 +705,6 @@ source_set("extensions") {
|
||||
"mv2_deprecation_impact_checker.h",
|
||||
"navigation_extension_enabler.cc",
|
||||
"navigation_extension_enabler.h",
|
||||
- "omaha_attributes_handler.cc",
|
||||
- "omaha_attributes_handler.h",
|
||||
"permissions/site_permissions_helper.cc",
|
||||
"permissions/site_permissions_helper.h",
|
||||
"permissions_based_management_policy_provider.cc",
|
||||
@@ -330,8 +330,6 @@ source_set("extensions") {
|
||||
"management/management_util.h",
|
||||
"manifest_check_level.h",
|
||||
"mv2_experiment_stage.h",
|
||||
- "omaha_attributes_handler.cc",
|
||||
- "omaha_attributes_handler.h",
|
||||
"pack_extension_job.cc",
|
||||
"pack_extension_job.h",
|
||||
"permissions/permissions_updater.cc",
|
||||
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
@@ -99,16 +99,8 @@ api::enterprise_reporting_private::Conte
|
||||
@@ -753,15 +749,15 @@
|
||||
void Blocklist::GetMalwareIDs(const std::set<ExtensionId>& ids,
|
||||
--- a/chrome/browser/extensions/chrome_extension_system.cc
|
||||
+++ b/chrome/browser/extensions/chrome_extension_system.cc
|
||||
@@ -454,8 +454,6 @@ void ChromeExtensionSystem::InstallUpdat
|
||||
void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes(
|
||||
const std::string& extension_id,
|
||||
@@ -465,8 +465,6 @@ void ChromeExtensionSystem::PerformActio
|
||||
const base::Value::Dict& attributes) {
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
// TODO(crbug.com/413460628): Port ExtensionService to desktop Android.
|
||||
- extension_service()->PerformActionBasedOnOmahaAttributes(extension_id,
|
||||
- attributes);
|
||||
}
|
||||
|
||||
bool ChromeExtensionSystem::FinishDelayedInstallationIfReady(
|
||||
#else
|
||||
NOTIMPLEMENTED();
|
||||
#endif
|
||||
--- a/chrome/browser/extensions/extension_allowlist_factory.cc
|
||||
+++ b/chrome/browser/extensions/extension_allowlist_factory.cc
|
||||
@@ -45,7 +45,6 @@ ExtensionAllowlistFactory::ExtensionAllo
|
||||
@@ -774,28 +770,38 @@
|
||||
ExtensionAllowlistFactory::~ExtensionAllowlistFactory() = default;
|
||||
--- a/chrome/browser/extensions/extension_service.cc
|
||||
+++ b/chrome/browser/extensions/extension_service.cc
|
||||
@@ -57,7 +57,6 @@
|
||||
@@ -54,7 +54,6 @@
|
||||
#include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h"
|
||||
#include "chrome/browser/extensions/install_verifier.h"
|
||||
#include "chrome/browser/extensions/installed_loader.h"
|
||||
#include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
|
||||
#include "chrome/browser/extensions/mv2_experiment_stage.h"
|
||||
-#include "chrome/browser/extensions/omaha_attributes_handler.h"
|
||||
#include "chrome/browser/extensions/pending_extension_manager.h"
|
||||
#include "chrome/browser/extensions/permissions/permissions_updater.h"
|
||||
#include "chrome/browser/extensions/profile_util.h"
|
||||
@@ -218,10 +217,6 @@ ExtensionService::ExtensionService(
|
||||
this,
|
||||
component_loader_.get())),
|
||||
extension_registrar_(ExtensionRegistrar::Get(profile)),
|
||||
#include "chrome/browser/extensions/unpacked_installer.h"
|
||||
@@ -215,9 +214,6 @@ ExtensionService::ExtensionService(
|
||||
extension_telemetry_service_verdict_handler_(extension_prefs,
|
||||
registry_,
|
||||
extension_registrar_),
|
||||
- omaha_attributes_handler_(extension_prefs,
|
||||
- ExtensionRegistry::Get(profile),
|
||||
- this,
|
||||
- registry_,
|
||||
- extension_registrar_),
|
||||
force_installed_tracker_(registry_, profile_),
|
||||
force_installed_metrics_(registry_, profile_, &force_installed_tracker_),
|
||||
corrupted_extension_reinstaller_(
|
||||
@@ -451,17 +446,6 @@ bool ExtensionService::UninstallExtensio
|
||||
transient_extension_id, reason, error, std::move(done_callback));
|
||||
@@ -358,10 +354,6 @@ void ExtensionService::Init() {
|
||||
extensions_features::kDisableLoadExtensionCommandLineSwitch)) {
|
||||
LOG(WARNING)
|
||||
<< "--load-extension is not allowed in Google Chrome, ignoring.";
|
||||
- } else if (safe_browsing::IsEnhancedProtectionEnabled(
|
||||
- *profile_->GetPrefs())) {
|
||||
- VLOG(1) << "--load-extension is not allowed for users opted into "
|
||||
- << "Enhanced Safe Browsing, ignoring.";
|
||||
} else if (ShouldBlockCommandLineExtension(*profile_)) {
|
||||
// TODO(crbug.com/401529219): Deprecate this restriction once
|
||||
// --load-extension switch is restricted on Chrome builds.
|
||||
@@ -440,17 +432,6 @@ void ExtensionService::LoadSigninProfile
|
||||
}
|
||||
#endif
|
||||
|
||||
-void ExtensionService::PerformActionBasedOnOmahaAttributes(
|
||||
- const std::string& extension_id,
|
||||
@@ -813,7 +819,7 @@
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
--- a/chrome/browser/extensions/extension_service.h
|
||||
+++ b/chrome/browser/extensions/extension_service.h
|
||||
@@ -28,7 +28,6 @@
|
||||
@@ -27,7 +27,6 @@
|
||||
#include "chrome/browser/extensions/extension_telemetry_service_verdict_handler.h"
|
||||
#include "chrome/browser/extensions/forced_extensions/force_installed_metrics.h"
|
||||
#include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h"
|
||||
@@ -821,9 +827,9 @@
|
||||
#include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
|
||||
#include "chrome/browser/profiles/profile_manager_observer.h"
|
||||
#include "chrome/browser/upgrade_detector/upgrade_observer.h"
|
||||
@@ -252,10 +251,6 @@ class ExtensionService : public Extensio
|
||||
void RemoveDisableReasonAndMaybeEnable(const std::string& extension_id,
|
||||
disable_reason::DisableReason reason);
|
||||
@@ -170,10 +169,6 @@ class ExtensionService : public Extensio
|
||||
// nothing.
|
||||
void EnableExtension(const std::string& extension_id);
|
||||
|
||||
- // Performs action based on Omaha attributes for the extension.
|
||||
- void PerformActionBasedOnOmahaAttributes(const std::string& extension_id,
|
||||
@@ -832,9 +838,9 @@
|
||||
// Performs action based on verdicts received from the Extension Telemetry
|
||||
// server. Currently, these verdicts are limited to off-store extensions.
|
||||
void PerformActionBasedOnExtensionTelemetryServiceVerdicts(
|
||||
@@ -553,8 +548,6 @@ class ExtensionService : public Extensio
|
||||
// Helper to register and unregister extensions.
|
||||
raw_ptr<ExtensionRegistrar> extension_registrar_ = nullptr;
|
||||
@@ -371,8 +366,6 @@ class ExtensionService : public Extensio
|
||||
ExtensionTelemetryServiceVerdictHandler
|
||||
extension_telemetry_service_verdict_handler_;
|
||||
|
||||
- // Needs `extension_registrar_` during construction.
|
||||
- OmahaAttributesHandler omaha_attributes_handler_;
|
||||
@@ -847,54 +853,54 @@
|
||||
blocklist_prefs::SetExtensionTelemetryServiceBlocklistState(
|
||||
extension_id, BitMapBlocklistState::NOT_BLOCKLISTED,
|
||||
extension_prefs_);
|
||||
- extension_service_->OnBlocklistStateRemoved(extension_id);
|
||||
- registrar_->OnBlocklistStateRemoved(extension_id);
|
||||
ReportOffstoreExtensionReenabled(current_state);
|
||||
break;
|
||||
case BLOCKLISTED_MALWARE:
|
||||
blocklist_prefs::SetExtensionTelemetryServiceBlocklistState(
|
||||
extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
|
||||
extension_prefs_);
|
||||
- extension_service_->OnBlocklistStateAdded(extension_id);
|
||||
- registrar_->OnBlocklistStateAdded(extension_id);
|
||||
ReportOffstoreExtensionDisabled(
|
||||
ExtensionTelemetryDisableReason::kMalware);
|
||||
break;
|
||||
--- a/chrome/browser/extensions/safe_browsing_verdict_handler.cc
|
||||
+++ b/chrome/browser/extensions/safe_browsing_verdict_handler.cc
|
||||
@@ -119,7 +119,6 @@ void SafeBrowsingVerdictHandler::UpdateB
|
||||
@@ -120,7 +120,6 @@ void SafeBrowsingVerdictHandler::UpdateB
|
||||
blocklist_.Remove(id);
|
||||
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
|
||||
id, BitMapBlocklistState::NOT_BLOCKLISTED, extension_prefs_);
|
||||
- extension_service_->OnBlocklistStateRemoved(id);
|
||||
- registrar_->OnBlocklistStateRemoved(id);
|
||||
UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.UnblacklistInstalled",
|
||||
extension->location());
|
||||
}
|
||||
@@ -133,7 +132,6 @@ void SafeBrowsingVerdictHandler::UpdateB
|
||||
@@ -134,7 +133,6 @@ void SafeBrowsingVerdictHandler::UpdateB
|
||||
blocklist_.Insert(extension);
|
||||
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
|
||||
id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_);
|
||||
- extension_service_->OnBlocklistStateAdded(id);
|
||||
- registrar_->OnBlocklistStateAdded(id);
|
||||
UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlacklistInstalled",
|
||||
extension->location());
|
||||
}
|
||||
@@ -157,7 +155,6 @@ void SafeBrowsingVerdictHandler::UpdateG
|
||||
@@ -158,7 +156,6 @@ void SafeBrowsingVerdictHandler::UpdateG
|
||||
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
|
||||
extension->id(), BitMapBlocklistState::NOT_BLOCKLISTED,
|
||||
extension_prefs_);
|
||||
- extension_service_->OnGreylistStateRemoved(extension->id());
|
||||
- registrar_->OnGreylistStateRemoved(extension->id());
|
||||
UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Enabled",
|
||||
extension->location());
|
||||
}
|
||||
@@ -177,7 +174,6 @@ void SafeBrowsingVerdictHandler::UpdateG
|
||||
@@ -178,7 +175,6 @@ void SafeBrowsingVerdictHandler::UpdateG
|
||||
blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state);
|
||||
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
|
||||
extension->id(), bitmap_greylist_state, extension_prefs_);
|
||||
- extension_service_->OnGreylistStateAdded(id, bitmap_greylist_state);
|
||||
- registrar_->OnGreylistStateAdded(id, bitmap_greylist_state);
|
||||
UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled",
|
||||
extension->location());
|
||||
}
|
||||
--- a/chrome/browser/notifications/persistent_notification_handler.cc
|
||||
+++ b/chrome/browser/notifications/persistent_notification_handler.cc
|
||||
@@ -212,16 +212,6 @@ void PersistentNotificationHandler::Disa
|
||||
@@ -235,16 +235,6 @@ void PersistentNotificationHandler::Disa
|
||||
NotificationPermissionContext::UpdatePermission(profile, origin,
|
||||
CONTENT_SETTING_BLOCK);
|
||||
#endif
|
||||
@@ -911,6 +917,76 @@
|
||||
}
|
||||
|
||||
void PersistentNotificationHandler::OpenSettings(Profile* profile,
|
||||
@@ -282,42 +272,6 @@ void PersistentNotificationHandler::OnMa
|
||||
Profile* profile,
|
||||
bool did_show_warning,
|
||||
bool did_user_unsubscribe) {
|
||||
- CHECK(profile);
|
||||
-
|
||||
- // In case the data volume becomes excessive, logging should happen at a
|
||||
- // sampled rate. This rate is defined by the
|
||||
- // `kReportNotificationContentDetectionDataRate` feature parameter.
|
||||
- if (base::RandDouble() * 100 >
|
||||
- safe_browsing::kReportNotificationContentDetectionDataRate.Get()) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- scoped_refptr<content::PlatformNotificationContext> notification_context =
|
||||
- profile->GetStoragePartitionForUrl(url)->GetPlatformNotificationContext();
|
||||
- if (!notification_context ||
|
||||
- !OptimizationGuideKeyedServiceFactory::GetForProfile(profile)) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- blink::mojom::EngagementLevel engagement_level =
|
||||
- blink::mojom::EngagementLevel::NONE;
|
||||
- if (site_engagement::SiteEngagementService::Get(profile)) {
|
||||
- engagement_level = site_engagement::SiteEngagementService::Get(profile)
|
||||
- ->GetEngagementLevel(url);
|
||||
- }
|
||||
-
|
||||
- // Read notification data from database and upload as log to model quality
|
||||
- // service.
|
||||
- notification_context->ReadNotificationDataAndRecordInteraction(
|
||||
- notification_id, url,
|
||||
- content::PlatformNotificationContext::Interaction::NONE,
|
||||
- base::BindOnce(
|
||||
- &safe_browsing::SendNotificationContentDetectionDataToMQLSServer,
|
||||
- OptimizationGuideKeyedServiceFactory::GetForProfile(profile)
|
||||
- ->GetModelQualityLogsUploaderService()
|
||||
- ->GetWeakPtr(),
|
||||
- safe_browsing::NotificationContentDetectionMQLSMetadata(
|
||||
- did_show_warning, did_user_unsubscribe, engagement_level)));
|
||||
}
|
||||
|
||||
#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
|
||||
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
|
||||
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
|
||||
@@ -773,24 +773,6 @@ void PlatformNotificationServiceImpl::Up
|
||||
std::unique_ptr<PersistentNotificationMetadata> persistent_metadata,
|
||||
bool should_show_warning,
|
||||
std::optional<std::string> serialized_content_detection_metadata) {
|
||||
- if (base::FeatureList::IsEnabled(
|
||||
- safe_browsing::kReportNotificationContentDetectionData) &&
|
||||
- serialized_content_detection_metadata.has_value()) {
|
||||
- scoped_refptr<content::PlatformNotificationContext> notification_context =
|
||||
- profile_->GetStoragePartitionForUrl(notification.origin_url())
|
||||
- ->GetPlatformNotificationContext();
|
||||
- if (notification_context) {
|
||||
- notification_context->WriteNotificationMetadata(
|
||||
- notification.id(), notification.origin_url(),
|
||||
- safe_browsing::kMetadataDictionaryKey,
|
||||
- serialized_content_detection_metadata.value(),
|
||||
- base::BindOnce(
|
||||
- &PlatformNotificationServiceImpl::DidUpdatePersistentMetadata,
|
||||
- weak_ptr_factory_.GetWeakPtr(), std::move(persistent_metadata),
|
||||
- notification, should_show_warning));
|
||||
- return;
|
||||
- }
|
||||
- }
|
||||
DoUpdatePersistentMetadataThenDisplay(std::move(persistent_metadata),
|
||||
notification, should_show_warning);
|
||||
}
|
||||
--- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
|
||||
+++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
|
||||
@@ -16,7 +16,6 @@
|
||||
@@ -998,7 +1074,7 @@
|
||||
|
||||
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
|
||||
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
|
||||
@@ -462,55 +462,5 @@ bool PredictionBasedPermissionUiSelector
|
||||
@@ -463,55 +463,5 @@ bool PredictionBasedPermissionUiSelector
|
||||
|
||||
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
|
||||
permissions::RequestType request_type) {
|
||||
@@ -1056,7 +1132,7 @@
|
||||
}
|
||||
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -2489,8 +2489,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
@@ -2506,8 +2506,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
handlers->AddHandler(
|
||||
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
|
||||
chrome_schema));
|
||||
@@ -1067,7 +1143,7 @@
|
||||
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
+++ b/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -275,7 +275,6 @@
|
||||
@@ -283,7 +283,6 @@
|
||||
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
|
||||
#include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h"
|
||||
#include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h"
|
||||
@@ -1075,19 +1151,21 @@
|
||||
#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"
|
||||
@@ -2029,7 +2028,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
MicrosoftFilesPageHandler::RegisterProfilePrefs(registry);
|
||||
@@ -2054,7 +2053,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
NewTabFooterUI::RegisterProfilePrefs(registry);
|
||||
NewTabPageHandler::RegisterProfilePrefs(registry);
|
||||
NewTabPageUI::RegisterProfilePrefs(registry);
|
||||
- ntp::SafeBrowsingHandler::RegisterProfilePrefs(registry);
|
||||
ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
|
||||
OutlookCalendarPageHandler::RegisterProfilePrefs(registry);
|
||||
PinnedTabCodec::RegisterProfilePrefs(registry);
|
||||
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
|
||||
@@ -839,7 +839,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance();
|
||||
@@ -854,9 +854,7 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
enterprise_connectors::TelomereEventRouterFactory::GetInstance();
|
||||
}
|
||||
#endif
|
||||
- enterprise_connectors::BrowserCrashEventRouterFactory::GetInstance();
|
||||
enterprise_connectors::ConnectorsServiceFactory::GetInstance();
|
||||
- enterprise_connectors::ReportingEventRouterFactory::GetInstance();
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@@ -1260,7 +1338,7 @@
|
||||
// certificate. So, when users click proceed on an interstitial, move the tab
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -4558,8 +4558,6 @@ static_library("ui") {
|
||||
@@ -4585,8 +4585,6 @@ static_library("ui") {
|
||||
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
|
||||
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
|
||||
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
|
||||
@@ -1269,18 +1347,18 @@
|
||||
"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/safety_hub/unused_site_permissions_service.cc
|
||||
+++ b/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc
|
||||
@@ -52,7 +52,6 @@
|
||||
--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
|
||||
+++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
|
||||
@@ -53,7 +53,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 "ui/base/l10n/l10n_util.h"
|
||||
@@ -371,34 +370,6 @@ UnusedSitePermissionsService::UnusedSite
|
||||
base::Unretained(this)));
|
||||
#include "revoked_permissions_service.h"
|
||||
@@ -386,34 +385,6 @@ RevokedPermissionsService::RevokedPermis
|
||||
base::Unretained(this)));
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
- if (base::FeatureList::IsEnabled(
|
||||
@@ -1296,28 +1374,28 @@
|
||||
-#endif
|
||||
- hcsm());
|
||||
-
|
||||
- if (base::FeatureList::IsEnabled(
|
||||
- safe_browsing::kSafetyHubDisruptiveNotificationRevocation)) {
|
||||
- disruptive_notification_manager_ =
|
||||
- std::make_unique<DisruptiveNotificationPermissionsManager>(
|
||||
- hcsm(),
|
||||
- site_engagement::SiteEngagementServiceFactory::GetForProfile(
|
||||
- browser_context_));
|
||||
- }
|
||||
-
|
||||
- pref_change_registrar_->Add(
|
||||
- prefs::kSafeBrowsingEnabled,
|
||||
- base::BindRepeating(&UnusedSitePermissionsService::
|
||||
- base::BindRepeating(&RevokedPermissionsService::
|
||||
- OnPermissionsAutorevocationControlChanged,
|
||||
- base::Unretained(this)));
|
||||
- }
|
||||
-
|
||||
- if (base::FeatureList::IsEnabled(
|
||||
- safe_browsing::kSafetyHubDisruptiveNotificationRevocation)) {
|
||||
- disruptive_notification_manager_ =
|
||||
- std::make_unique<DisruptiveNotificationPermissionsManager>(
|
||||
- hcsm(),
|
||||
- site_engagement::SiteEngagementServiceFactory::GetForProfile(
|
||||
- browser_context_));
|
||||
- }
|
||||
|
||||
bool migration_completed = pref_change_registrar_->prefs()->GetBoolean(
|
||||
safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted);
|
||||
@@ -1056,9 +1027,7 @@ bool UnusedSitePermissionsService::IsUnu
|
||||
@@ -1154,9 +1125,7 @@ bool RevokedPermissionsService::IsUnused
|
||||
}
|
||||
|
||||
bool UnusedSitePermissionsService::
|
||||
IsAbusiveNotificationAutoRevocationEnabled() {
|
||||
bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() {
|
||||
- return base::FeatureList::IsEnabled(
|
||||
- safe_browsing::kSafetyHubAbusiveNotificationRevocation) &&
|
||||
- safe_browsing::IsSafeBrowsingEnabled(*pref_change_registrar_->prefs());
|
||||
@@ -1327,7 +1405,7 @@
|
||||
const std::set<ContentSettingsType>
|
||||
--- a/chrome/browser/ui/tab_contents/BUILD.gn
|
||||
+++ b/chrome/browser/ui/tab_contents/BUILD.gn
|
||||
@@ -50,7 +50,6 @@ source_set("impl") {
|
||||
@@ -51,7 +51,6 @@ source_set("impl") {
|
||||
if (is_win || is_mac || is_linux || is_chromeos) {
|
||||
sources += [
|
||||
"chrome_web_contents_menu_helper.cc",
|
||||
@@ -1343,7 +1421,7 @@
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "components/tab_collections/public/tab_interface.h"
|
||||
#include "components/tabs/public/tab_interface.h"
|
||||
#include "components/vector_icons/vector_icons.h"
|
||||
@@ -140,57 +139,6 @@ void ToastService::RegisterToasts(
|
||||
.Build());
|
||||
@@ -1574,7 +1652,7 @@
|
||||
std::move(callback),
|
||||
--- a/chrome/common/webui_url_constants.cc
|
||||
+++ b/chrome/common/webui_url_constants.cc
|
||||
@@ -122,7 +122,6 @@ base::span<const base::cstring_view> Chr
|
||||
@@ -123,7 +123,6 @@ base::span<const base::cstring_view> Chr
|
||||
kChromeUISuggestInternalsHost,
|
||||
#endif
|
||||
kChromeUINTPTilesInternalsHost,
|
||||
@@ -1584,7 +1662,7 @@
|
||||
kChromeUITabSearchHost,
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -2449,7 +2449,6 @@ if (!is_android) {
|
||||
@@ -2523,7 +2523,6 @@ if (!is_android) {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -1592,7 +1670,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",
|
||||
@@ -6771,7 +6770,6 @@ test("unit_tests") {
|
||||
@@ -6871,7 +6870,6 @@ test("unit_tests") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -1600,6 +1678,166 @@
|
||||
"//components/safe_browsing/content/browser/notification_content_detection",
|
||||
"//components/safe_browsing/content/browser/notification_content_detection:test_utils",
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
--- a/components/device_signals/core/browser/browser_utils.cc
|
||||
+++ b/components/device_signals/core/browser/browser_utils.cc
|
||||
@@ -29,35 +29,6 @@ bool IsURLBlocked(const GURL& url, Polic
|
||||
|
||||
namespace device_signals {
|
||||
|
||||
-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel(
|
||||
- PrefService* profile_prefs) {
|
||||
- DCHECK(profile_prefs);
|
||||
- bool safe_browsing_enabled =
|
||||
- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnabled);
|
||||
- bool safe_browsing_enhanced_enabled =
|
||||
- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnhanced);
|
||||
-
|
||||
- if (safe_browsing_enabled) {
|
||||
- if (safe_browsing_enhanced_enabled) {
|
||||
- return safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION;
|
||||
- } else {
|
||||
- return safe_browsing::SafeBrowsingState::STANDARD_PROTECTION;
|
||||
- }
|
||||
- } else {
|
||||
- return safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-std::optional<safe_browsing::PasswordProtectionTrigger>
|
||||
-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs) {
|
||||
- DCHECK(profile_prefs);
|
||||
- if (!profile_prefs->HasPrefPath(prefs::kPasswordProtectionWarningTrigger)) {
|
||||
- return std::nullopt;
|
||||
- }
|
||||
- return static_cast<safe_browsing::PasswordProtectionTrigger>(
|
||||
- profile_prefs->GetInteger(prefs::kPasswordProtectionWarningTrigger));
|
||||
-}
|
||||
-
|
||||
bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service) {
|
||||
DCHECK(service);
|
||||
return IsURLBlocked(GURL("https://remotedesktop.google.com"), service) ||
|
||||
--- a/components/device_signals/core/browser/browser_utils.h
|
||||
+++ b/components/device_signals/core/browser/browser_utils.h
|
||||
@@ -22,12 +22,6 @@ namespace device_signals {
|
||||
|
||||
bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service);
|
||||
|
||||
-std::optional<safe_browsing::PasswordProtectionTrigger>
|
||||
-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs);
|
||||
-
|
||||
-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel(
|
||||
- PrefService* profile_prefs);
|
||||
-
|
||||
std::optional<std::string> TryGetEnrollmentDomain(
|
||||
policy::CloudPolicyManager* manager);
|
||||
|
||||
--- a/components/device_signals/core/browser/signals_types.h
|
||||
+++ b/components/device_signals/core/browser/signals_types.h
|
||||
@@ -13,7 +13,6 @@
|
||||
#include "build/build_config.h"
|
||||
#include "components/device_signals/core/common/common_types.h"
|
||||
#include "components/enterprise/connectors/core/reporting_constants.h"
|
||||
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
#include "components/device_signals/core/common/win/win_types.h"
|
||||
@@ -246,10 +245,7 @@ struct ProfileSignalsResponse : BaseSign
|
||||
|
||||
bool built_in_dns_client_enabled;
|
||||
bool chrome_remote_desktop_app_blocked;
|
||||
- std::optional<safe_browsing::PasswordProtectionTrigger>
|
||||
- password_protection_warning_trigger = std::nullopt;
|
||||
std::optional<std::string> profile_enrollment_domain = std::nullopt;
|
||||
- safe_browsing::SafeBrowsingState safe_browsing_protection_level;
|
||||
bool site_isolation_enabled;
|
||||
|
||||
// Enterprise cloud content analysis exclusive
|
||||
--- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
|
||||
+++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
|
||||
@@ -229,16 +229,10 @@ void ChromeProfileRequestGenerator::OnAg
|
||||
profile_signals.built_in_dns_client_enabled);
|
||||
profile_signals_report->set_chrome_remote_desktop_app_blocked(
|
||||
profile_signals.chrome_remote_desktop_app_blocked);
|
||||
- profile_signals_report->set_password_protection_warning_trigger(
|
||||
- TranslatePasswordProtectionTrigger(
|
||||
- profile_signals.password_protection_warning_trigger));
|
||||
profile_signals_report->set_profile_enrollment_domain(
|
||||
profile_signals.profile_enrollment_domain.value_or(""));
|
||||
profile_signals_report->set_realtime_url_check_mode(
|
||||
TranslateRealtimeUrlCheckMode(profile_signals.realtime_url_check_mode));
|
||||
- profile_signals_report->set_safe_browsing_protection_level(
|
||||
- TranslateSafeBrowsingLevel(
|
||||
- profile_signals.safe_browsing_protection_level));
|
||||
profile_signals_report->set_site_isolation_enabled(
|
||||
profile_signals.site_isolation_enabled);
|
||||
profile_report->set_allocated_profile_signals_report(
|
||||
--- a/components/enterprise/browser/reporting/report_util.cc
|
||||
+++ b/components/enterprise/browser/reporting/report_util.cc
|
||||
@@ -80,25 +80,6 @@ em::SettingValue TranslateSettingValue(
|
||||
}
|
||||
}
|
||||
|
||||
-em::ProfileSignalsReport::PasswordProtectionTrigger
|
||||
-TranslatePasswordProtectionTrigger(
|
||||
- std::optional<safe_browsing::PasswordProtectionTrigger> trigger) {
|
||||
- if (trigger == std::nullopt) {
|
||||
- return em::ProfileSignalsReport::POLICY_UNSET;
|
||||
- }
|
||||
- switch (trigger.value()) {
|
||||
- case safe_browsing::PasswordProtectionTrigger::PASSWORD_PROTECTION_OFF:
|
||||
- return em::ProfileSignalsReport::PASSWORD_PROTECTION_OFF;
|
||||
- case safe_browsing::PasswordProtectionTrigger::PASSWORD_REUSE:
|
||||
- return em::ProfileSignalsReport::PASSWORD_REUSE;
|
||||
- case safe_browsing::PasswordProtectionTrigger::PHISHING_REUSE:
|
||||
- return em::ProfileSignalsReport::PHISHING_REUSE;
|
||||
- case safe_browsing::PasswordProtectionTrigger::
|
||||
- PASSWORD_PROTECTION_TRIGGER_MAX:
|
||||
- NOTREACHED();
|
||||
- }
|
||||
-}
|
||||
-
|
||||
em::ProfileSignalsReport::RealtimeUrlCheckMode TranslateRealtimeUrlCheckMode(
|
||||
enterprise_connectors::EnterpriseRealTimeUrlCheckMode mode) {
|
||||
switch (mode) {
|
||||
@@ -111,18 +92,6 @@ em::ProfileSignalsReport::RealtimeUrlChe
|
||||
}
|
||||
}
|
||||
|
||||
-em::ProfileSignalsReport::SafeBrowsingLevel TranslateSafeBrowsingLevel(
|
||||
- safe_browsing::SafeBrowsingState level) {
|
||||
- switch (level) {
|
||||
- case safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING:
|
||||
- return em::ProfileSignalsReport::NO_SAFE_BROWSING;
|
||||
- case safe_browsing::SafeBrowsingState::STANDARD_PROTECTION:
|
||||
- return em::ProfileSignalsReport::STANDARD_PROTECTION;
|
||||
- case safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION:
|
||||
- return em::ProfileSignalsReport::ENHANCED_PROTECTION;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
std::unique_ptr<em::AntiVirusProduct> TranslateAvProduct(
|
||||
device_signals::AvProduct av_product) {
|
||||
--- a/components/enterprise/browser/reporting/report_util.h
|
||||
+++ b/components/enterprise/browser/reporting/report_util.h
|
||||
@@ -19,17 +19,10 @@ std::string ObfuscateFilePath(const std:
|
||||
enterprise_management::SettingValue TranslateSettingValue(
|
||||
device_signals::SettingValue setting_value);
|
||||
|
||||
-enterprise_management::ProfileSignalsReport::PasswordProtectionTrigger
|
||||
-TranslatePasswordProtectionTrigger(
|
||||
- std::optional<safe_browsing::PasswordProtectionTrigger> trigger);
|
||||
-
|
||||
enterprise_management::ProfileSignalsReport::RealtimeUrlCheckMode
|
||||
TranslateRealtimeUrlCheckMode(
|
||||
enterprise_connectors::EnterpriseRealTimeUrlCheckMode mode);
|
||||
|
||||
-enterprise_management::ProfileSignalsReport::SafeBrowsingLevel
|
||||
-TranslateSafeBrowsingLevel(safe_browsing::SafeBrowsingState level);
|
||||
-
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
std::unique_ptr<enterprise_management::AntiVirusProduct> TranslateAvProduct(
|
||||
device_signals::AvProduct av_product);
|
||||
--- a/components/enterprise/buildflags/buildflags.gni
|
||||
+++ b/components/enterprise/buildflags/buildflags.gni
|
||||
@@ -10,11 +10,11 @@ declare_args() {
|
||||
@@ -1763,7 +2001,7 @@
|
||||
void OhttpKeyService::Shutdown() {
|
||||
--- a/components/safe_browsing/core/browser/realtime/chrome_enterprise_url_lookup_service.cc
|
||||
+++ b/components/safe_browsing/core/browser/realtime/chrome_enterprise_url_lookup_service.cc
|
||||
@@ -135,7 +135,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe
|
||||
@@ -138,7 +138,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe
|
||||
|
||||
bool ChromeEnterpriseRealTimeUrlLookupService::CanCheckSafeBrowsingDb() const {
|
||||
// Check database if safe browsing is enabled.
|
||||
@@ -1794,7 +2032,7 @@
|
||||
void RealTimeUrlLookupService::MaybeFillReferringWebApk(
|
||||
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
|
||||
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
|
||||
@@ -614,17 +614,6 @@ std::unique_ptr<RTLookupRequest> RealTim
|
||||
@@ -595,17 +595,6 @@ void RealTimeUrlLookupServiceBase::Start
|
||||
request->set_report_type(is_sampled_report ? RTLookupRequest::SAMPLED_REPORT
|
||||
: RTLookupRequest::FULL_REPORT);
|
||||
request->set_frame_type(RTLookupRequest::MAIN_FRAME);
|
||||
@@ -1809,9 +2047,9 @@
|
||||
- std::move(referring_app_info_proto);
|
||||
- MaybeFillReferringWebApk(*referring_app_info, *request);
|
||||
- }
|
||||
std::optional<std::string> dm_token_string = GetDMTokenString();
|
||||
if (dm_token_string.has_value()) {
|
||||
request->set_dm_token(dm_token_string.value());
|
||||
|
||||
std::string browser_dm_token = GetBrowserDMTokenString();
|
||||
if (!browser_dm_token.empty()) {
|
||||
--- a/components/safe_browsing/core/browser/safe_browsing_hats_delegate.h
|
||||
+++ b/components/safe_browsing/core/browser/safe_browsing_hats_delegate.h
|
||||
@@ -5,6 +5,8 @@
|
||||
@@ -1952,7 +2190,7 @@
|
||||
void SSLBlockingPageBase::PopulateEnhancedProtectionMessage(
|
||||
--- a/components/sync_preferences/common_syncable_prefs_database.cc
|
||||
+++ b/components/sync_preferences/common_syncable_prefs_database.cc
|
||||
@@ -322,9 +322,6 @@ constexpr auto kCommonSyncablePrefsAllow
|
||||
@@ -327,9 +327,6 @@ constexpr auto kCommonSyncablePrefsAllow
|
||||
{plus_addresses::prefs::kLastPlusAddressFillingTime,
|
||||
{syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES,
|
||||
PrefSensitivity::kNone, MergeBehavior::kNone}},
|
||||
@@ -2040,7 +2278,7 @@
|
||||
void DidFileSkipQuarantine(base::File::Error result);
|
||||
--- a/extensions/browser/extension_registrar.cc
|
||||
+++ b/extensions/browser/extension_registrar.cc
|
||||
@@ -747,103 +747,27 @@ void ExtensionRegistrar::UnblockAllExten
|
||||
@@ -772,103 +772,27 @@ void ExtensionRegistrar::UnblockAllExten
|
||||
|
||||
void ExtensionRegistrar::OnBlocklistStateRemoved(
|
||||
const std::string& extension_id) {
|
||||
@@ -2146,7 +2384,7 @@
|
||||
void ExtensionRegistrar::OnUnpackedExtensionReloadFailed(
|
||||
--- a/extensions/browser/updater/update_service.cc
|
||||
+++ b/extensions/browser/updater/update_service.cc
|
||||
@@ -132,13 +132,6 @@ void UpdateService::OnCrxStateChange(Upd
|
||||
@@ -133,13 +133,6 @@ void UpdateService::OnCrxStateChange(Upd
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
# Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set
|
||||
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -173,6 +173,7 @@
|
||||
@@ -174,6 +174,7 @@
|
||||
#include "components/supervised_user/core/browser/supervised_user_preferences.h"
|
||||
#include "components/supervised_user/core/browser/supervised_user_service.h"
|
||||
#include "components/supervised_user/core/browser/supervised_user_url_filter.h"
|
||||
@@ -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"
|
||||
@@ -2241,6 +2242,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -2242,6 +2243,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
}
|
||||
|
||||
if (CanTranslate(/*menu_logging=*/true)) {
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
"//third_party/widevine/cdm:headers",
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -181,6 +181,7 @@
|
||||
@@ -182,6 +182,7 @@
|
||||
#include "components/translate/core/common/translate_util.h"
|
||||
#include "components/trusted_vault/features.h"
|
||||
#include "components/ui_devtools/switches.h"
|
||||
@@ -44,7 +44,7 @@
|
||||
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -294,6 +294,7 @@ source_set("browser") {
|
||||
@@ -296,6 +296,7 @@ source_set("browser") {
|
||||
"//third_party/re2",
|
||||
"//third_party/snappy",
|
||||
"//third_party/sqlite",
|
||||
@@ -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"
|
||||
@@ -3493,6 +3494,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3491,6 +3492,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"
|
||||
@@ -485,6 +486,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -490,6 +491,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
true},
|
||||
{wrf::EnableWebAudioBypassOutputBufferingOptOut,
|
||||
blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
|
||||
@@ -116,15 +116,15 @@
|
||||
|
||||
--- a/third_party/blink/renderer/core/dom/document.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/document.cc
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "base/metrics/histogram_functions.h"
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "base/not_fatal_until.h"
|
||||
#include "base/notreached.h"
|
||||
+#include "base/rand_util.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
#include "base/time/time.h"
|
||||
#include "base/trace_event/trace_event.h"
|
||||
@@ -869,6 +870,11 @@ Document::Document(const DocumentInit& i
|
||||
#include "base/timer/elapsed_timer.h"
|
||||
@@ -889,6 +890,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();
|
||||
@@ -995,6 +1001,14 @@ const Position Document::PositionAdjuste
|
||||
@@ -1015,6 +1021,14 @@ const Position Document::PositionAdjuste
|
||||
return Position::BeforeNode(*shadow_host);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
selector_query_cache_ = MakeGarbageCollected<SelectorQueryCache>();
|
||||
--- a/third_party/blink/renderer/core/dom/document.h
|
||||
+++ b/third_party/blink/renderer/core/dom/document.h
|
||||
@@ -558,6 +558,10 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -556,6 +556,10 @@ class CORE_EXPORT Document : public Cont
|
||||
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
V8VisibilityState visibilityState() const;
|
||||
String visibilityStateAsString() const;
|
||||
bool IsPageVisible() const;
|
||||
@@ -2704,6 +2708,9 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -2732,6 +2736,9 @@ class CORE_EXPORT Document : public Cont
|
||||
|
||||
base::ElapsedTimer start_time_;
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
|
||||
--- a/third_party/blink/renderer/core/dom/element.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/element.cc
|
||||
@@ -2836,6 +2836,11 @@ DOMRectList* Element::getClientRects() {
|
||||
@@ -2878,6 +2878,11 @@ DOMRectList* Element::getClientRects() {
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
|
||||
*element_layout_object);
|
||||
@@ -188,7 +188,7 @@
|
||||
return MakeGarbageCollected<DOMRectList>(quads);
|
||||
}
|
||||
|
||||
@@ -2863,6 +2868,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
@@ -2905,6 +2910,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
|
||||
*element_layout_object);
|
||||
@@ -200,7 +200,7 @@
|
||||
|
||||
--- a/third_party/blink/renderer/core/dom/range.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/range.cc
|
||||
@@ -1634,6 +1634,12 @@ DOMRectList* Range::getClientRects() con
|
||||
@@ -1648,6 +1648,12 @@ DOMRectList* Range::getClientRects() con
|
||||
Vector<gfx::QuadF> quads;
|
||||
GetBorderAndTextQuads(quads);
|
||||
|
||||
@@ -213,7 +213,7 @@
|
||||
return MakeGarbageCollected<DOMRectList>(quads);
|
||||
}
|
||||
|
||||
@@ -1641,7 +1647,11 @@ DOMRect* Range::getBoundingClientRect()
|
||||
@@ -1655,7 +1661,11 @@ DOMRect* Range::getBoundingClientRect()
|
||||
// TODO(crbug.com/1499981): This should be removed once synchronized scrolling
|
||||
// impact is understood.
|
||||
SyncScrollAttemptHeuristic::DidAccessScrollOffset();
|
||||
@@ -266,7 +266,7 @@
|
||||
const TextDirection& direction,
|
||||
--- 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
|
||||
@@ -103,6 +103,9 @@
|
||||
@@ -109,6 +109,9 @@
|
||||
// https://github.com/include-what-you-use/include-what-you-use/issues/1122
|
||||
// IWYU pragma: no_include "base/numerics/clamped_math.h"
|
||||
|
||||
@@ -274,9 +274,9 @@
|
||||
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
|
||||
+
|
||||
namespace blink {
|
||||
namespace {
|
||||
|
||||
constexpr char kDefaultFont[] = "10px sans-serif";
|
||||
@@ -1182,13 +1185,26 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
@@ -1293,13 +1296,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
|
||||
@@ -1784,6 +1784,7 @@ component("platform") {
|
||||
@@ -1797,6 +1797,7 @@ component("platform") {
|
||||
"//components/paint_preview/common",
|
||||
"//components/search_engines:search_engine_utils",
|
||||
"//components/translate/core/language_detection:language_detection",
|
||||
@@ -343,7 +343,7 @@
|
||||
#include "third_party/skia/include/core/SkSurface.h"
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2092,6 +2092,12 @@
|
||||
@@ -2176,6 +2176,12 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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
|
||||
@@ -3496,6 +3496,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3494,6 +3494,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kFileUrlPathAlias,
|
||||
switches::kFingerprintingClientRectsNoise,
|
||||
switches::kFingerprintingCanvasMeasureTextNoise,
|
||||
@@ -44,7 +44,7 @@ approach to change color components.
|
||||
switches::kForceGpuMemAvailableMb,
|
||||
--- a/content/child/runtime_features.cc
|
||||
+++ b/content/child/runtime_features.cc
|
||||
@@ -490,6 +490,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -495,6 +495,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
|
||||
@@ -508,6 +508,9 @@ ImageData* BaseRenderingContext2D::getIm
|
||||
@@ -615,6 +615,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
|
||||
@@ -1729,7 +1729,9 @@ component("platform") {
|
||||
@@ -1741,7 +1741,9 @@ component("platform") {
|
||||
"//third_party/blink/renderer:non_test_config",
|
||||
]
|
||||
|
||||
@@ -305,7 +305,7 @@ approach to change color components.
|
||||
// Methods overridden by all sub-classes
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2098,6 +2098,9 @@
|
||||
@@ -2182,6 +2182,9 @@
|
||||
name: "FingerprintingCanvasMeasureTextNoise",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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
|
||||
@@ -2205,6 +2205,7 @@ static_library("browser") {
|
||||
@@ -2207,6 +2207,7 @@ static_library("browser") {
|
||||
"//components/net_log",
|
||||
"//components/network_hints/common:mojo_bindings",
|
||||
"//components/network_session_configurator/browser",
|
||||
@@ -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"
|
||||
@@ -118,6 +120,7 @@
|
||||
@@ -119,6 +121,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"
|
||||
@@ -151,6 +154,7 @@
|
||||
@@ -152,6 +155,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 "ppapi/buildflags/buildflags.h"
|
||||
#include "printing/buildflags/buildflags.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
@@ -417,6 +421,18 @@ void BrowserProcessImpl::Init() {
|
||||
@@ -418,6 +422,18 @@ void BrowserProcessImpl::Init() {
|
||||
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
|
||||
base::BindRepeating(&ApplyMetricsReportingPolicy));
|
||||
|
||||
@@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -2536,6 +2536,10 @@ const char kMantisFeatureKeyDescription[
|
||||
@@ -2603,6 +2603,10 @@ const char kMantisFeatureKeyDescription[
|
||||
"Feature key to use the Mantis feature on ChromeOS.";
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -115,7 +115,7 @@ 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
|
||||
@@ -1465,6 +1465,9 @@ extern const char kMantisFeatureKeyName[
|
||||
@@ -1506,6 +1506,9 @@ extern const char kMantisFeatureKeyName[
|
||||
extern const char kMantisFeatureKeyDescription[];
|
||||
#endif // IS_CHROMEOS
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -156,10 +156,6 @@ void AddInfoBarsIfNecessary(Browser* bro
|
||||
@@ -163,10 +163,6 @@ void AddInfoBarsIfNecessary(Browser* bro
|
||||
infobars::ContentInfoBarManager* infobar_manager =
|
||||
infobars::ContentInfoBarManager::FromWebContents(web_contents);
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::Registe
|
||||
@@ -1567,7 +1567,7 @@ void ChromeContentBrowserClient::Registe
|
||||
void ChromeContentBrowserClient::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
|
||||
@@ -87,7 +87,7 @@
|
||||
kAutofillPaymentCvcStorage, true,
|
||||
--- a/components/bookmarks/browser/bookmark_utils.cc
|
||||
+++ b/components/bookmarks/browser/bookmark_utils.cc
|
||||
@@ -456,7 +456,7 @@ bool DoesBookmarkContainWords(const std:
|
||||
@@ -457,7 +457,7 @@ bool DoesBookmarkContainWords(const std:
|
||||
|
||||
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
|
||||
@@ -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
|
||||
@@ -1578,11 +1578,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
@@ -1583,11 +1583,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
// and preferences have been registered since some of the import code depends
|
||||
// on preferences.
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
|
||||
@@ -12,7 +12,7 @@ it as hidden as it was before?
|
||||
|
||||
--- a/net/cert/x509_util.cc
|
||||
+++ b/net/cert/x509_util.cc
|
||||
@@ -280,7 +280,7 @@ bool GetTLSServerEndPointChannelBinding(
|
||||
@@ -281,7 +281,7 @@ bool GetTLSServerEndPointChannelBinding(
|
||||
}
|
||||
|
||||
// RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/browser.cc
|
||||
+++ b/chrome/browser/ui/browser.cc
|
||||
@@ -142,6 +142,7 @@
|
||||
@@ -143,6 +143,7 @@
|
||||
#include "chrome/browser/ui/unload_controller.h"
|
||||
#include "chrome/browser/ui/views/frame/browser_view.h"
|
||||
#include "chrome/browser/ui/views/frame/contents_web_view.h"
|
||||
@@ -8,7 +8,7 @@
|
||||
#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"
|
||||
@@ -586,6 +587,7 @@ Browser::Browser(const CreateParams& par
|
||||
@@ -587,6 +588,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),
|
||||
@@ -1049,20 +1051,22 @@ Browser::WarnBeforeClosingResult Browser
|
||||
@@ -1050,20 +1052,22 @@ Browser::WarnBeforeClosingResult Browser
|
||||
return WarnBeforeClosingResult::kOkToClose;
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
}
|
||||
|
||||
DCHECK(!warn_before_closing_callback_)
|
||||
@@ -1100,6 +1104,7 @@ bool Browser::TryToCloseWindow(
|
||||
@@ -1101,6 +1105,7 @@ bool Browser::TryToCloseWindow(
|
||||
|
||||
void Browser::ResetTryToCloseWindow() {
|
||||
cancel_download_confirmation_state_ = NOT_PROMPTED;
|
||||
@@ -60,7 +60,7 @@
|
||||
unload_controller_.ResetTryToCloseWindow();
|
||||
}
|
||||
|
||||
@@ -3408,6 +3413,58 @@ bool Browser::CanCloseWithInProgressDown
|
||||
@@ -3447,6 +3452,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;
|
||||
@@ -3433,6 +3490,22 @@ void Browser::InProgressDownloadResponse
|
||||
@@ -3472,6 +3529,22 @@ void Browser::InProgressDownloadResponse
|
||||
|
||||
std::move(warn_before_closing_callback_)
|
||||
.Run(WarnBeforeClosingResult::kDoNotClose);
|
||||
@@ -152,7 +152,7 @@
|
||||
#include "chrome/browser/ui/signin/signin_view_controller.h"
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model.h"
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
||||
@@ -1216,12 +1217,17 @@ class Browser : public TabStripModelObse
|
||||
@@ -1237,12 +1238,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.
|
||||
@@ -1394,6 +1400,8 @@ class Browser : public TabStripModelObse
|
||||
@@ -1415,6 +1421,8 @@ class Browser : public TabStripModelObse
|
||||
// when the browser is closed with in-progress downloads.
|
||||
CancelDownloadConfirmationState cancel_download_confirmation_state_;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -934,10 +934,14 @@ bool HandleNewTabPageLocationOverride(
|
||||
@@ -943,10 +943,14 @@ bool HandleNewTabPageLocationOverride(
|
||||
|
||||
// Don't change the URL when incognito mode.
|
||||
if (profile->IsOffTheRecord())
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_frame.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
|
||||
@@ -642,5 +642,7 @@ bool BrowserFrame::RegenerateFrameOnThem
|
||||
@@ -643,5 +643,7 @@ bool BrowserFrame::RegenerateFrameOnThem
|
||||
}
|
||||
|
||||
bool BrowserFrame::IsIncognitoBrowser() const {
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/format_macros.h"
|
||||
#include "base/functional/bind.h"
|
||||
@@ -544,6 +545,15 @@ AutocompleteController::AutocompleteCont
|
||||
@@ -546,6 +547,15 @@ AutocompleteController::AutocompleteCont
|
||||
steady_state_omnibox_position_(
|
||||
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
|
||||
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
search_engine_choice_service_(search_engine_choice_service),
|
||||
prepopulate_data_resolver_(prepopulate_data_resolver),
|
||||
search_terms_data_(std::move(search_terms_data)),
|
||||
@@ -592,8 +600,8 @@ bool TemplateURLService::CanAddAutogener
|
||||
@@ -594,8 +602,8 @@ bool TemplateURLService::CanAddAutogener
|
||||
// that may interfere with search queries). An easy heuristic for this is
|
||||
// whether the user has a TemplateURL that has been manually modified (e.g.,
|
||||
// renamed) connected to the same host.
|
||||
@@ -92,7 +92,7 @@
|
||||
}
|
||||
|
||||
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
|
||||
@@ -2316,6 +2324,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
@@ -2438,6 +2446,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
}
|
||||
|
||||
void TemplateURLService::Init() {
|
||||
@@ -101,7 +101,7 @@
|
||||
if (client_) {
|
||||
client_->SetOwner(this);
|
||||
}
|
||||
@@ -2498,6 +2508,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
@@ -2620,6 +2630,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
|
||||
@@ -895,6 +895,8 @@ class TemplateURLService final : public
|
||||
@@ -901,6 +901,8 @@ class TemplateURLService final : public
|
||||
|
||||
raw_ref<TemplateURLPrepopulateData::Resolver> prepopulate_data_resolver_;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/debug/alias.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/i18n/rtl.h"
|
||||
@@ -726,6 +727,13 @@ void Tab::HideHover(TabStyle::HideHoverS
|
||||
@@ -728,6 +729,13 @@ void Tab::HideHover(TabStyle::HideHoverS
|
||||
DeprecatedLayoutImmediately();
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
void PaintChildren(const views::PaintInfo& info) override;
|
||||
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
@@ -15,6 +15,7 @@
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "base/check.h"
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/containers/adapters.h"
|
||||
@@ -1923,6 +1924,8 @@ void TabStrip::OnMouseEventInTab(views::
|
||||
@@ -1946,6 +1947,8 @@ void TabStrip::OnMouseEventInTab(views::
|
||||
}
|
||||
|
||||
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/browser_command_controller.cc
|
||||
+++ b/chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -1487,7 +1487,8 @@ void BrowserCommandController::InitComma
|
||||
@@ -1535,7 +1535,8 @@ void BrowserCommandController::InitComma
|
||||
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
|
||||
normal_window);
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE,
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -5069,6 +5069,7 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -5197,6 +5197,7 @@ void BrowserView::AddedToWidget() {
|
||||
|
||||
toolbar_->Init();
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -436,7 +436,8 @@ BASE_FEATURE(kTabstripComboButton,
|
||||
@@ -538,7 +538,8 @@ BASE_FEATURE(kTabstripComboButton,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
bool IsTabSearchMoving() {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/browser_features.cc
|
||||
+++ b/chrome/browser/browser_features.cc
|
||||
@@ -351,4 +351,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
|
||||
@@ -349,4 +349,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
|
||||
"RemovalOfIWAsFromTabCapture",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"
|
||||
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
|
||||
@@ -147,6 +148,21 @@ class BrowsingDataRemoverObserver
|
||||
@@ -148,6 +149,21 @@ class BrowsingDataRemoverObserver
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
uint64_t GetOriginTypeMask(const base::Value::List& data_types) {
|
||||
uint64_t result = 0;
|
||||
for (const auto& data_type : data_types) {
|
||||
@@ -313,9 +329,10 @@ void ChromeBrowsingDataLifetimeManager::
|
||||
@@ -326,9 +342,10 @@ void ChromeBrowsingDataLifetimeManager::
|
||||
const base::Value::List& data_types = profile_->GetPrefs()->GetList(
|
||||
browsing_data::prefs::kClearBrowsingDataOnExitList);
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
profile_->GetPrefs()->SetBoolean(
|
||||
browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
|
||||
auto* remover = profile_->GetBrowsingDataRemover();
|
||||
@@ -326,8 +343,8 @@ void ChromeBrowsingDataLifetimeManager::
|
||||
@@ -339,8 +356,8 @@ void ChromeBrowsingDataLifetimeManager::
|
||||
DCHECK(keep_browser_alive);
|
||||
#endif
|
||||
remover->RemoveAndReply(base::Time(), base::Time::Max(),
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/containers/adapters.h"
|
||||
#include "base/containers/flat_map.h"
|
||||
#include "base/containers/span.h"
|
||||
@@ -987,6 +988,10 @@ void TabStripModel::CloseAllTabsInGroup(
|
||||
@@ -998,6 +999,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);
|
||||
}
|
||||
|
||||
@@ -2276,9 +2281,13 @@ TabStripModel::GetGroupsDestroyedFromRem
|
||||
@@ -2466,9 +2471,13 @@ TabStripModel::GetGroupsDestroyedFromRem
|
||||
void TabStripModel::ExecuteCloseTabsByIndices(
|
||||
base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
|
||||
uint32_t close_types) {
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
|
||||
#include "base/auto_reset.h"
|
||||
+#include "base/command_line.h"
|
||||
#include "build/build_config.h"
|
||||
#include "chrome/browser/extensions/crx_installer.h"
|
||||
#include "chrome/browser/extensions/extension_install_prompt.h"
|
||||
#include "chrome/browser/extensions/extension_management.h"
|
||||
@@ -97,6 +98,14 @@ scoped_refptr<extensions::CrxInstaller>
|
||||
@@ -112,6 +113,14 @@ scoped_refptr<extensions::CrxInstaller>
|
||||
return installer;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
bool IsExtensionDownload(const DownloadItem& download_item) {
|
||||
if (download_item.GetTargetDisposition() ==
|
||||
DownloadItem::TARGET_DISPOSITION_PROMPT)
|
||||
@@ -105,7 +114,7 @@ bool IsExtensionDownload(const DownloadI
|
||||
@@ -120,7 +129,7 @@ bool IsExtensionDownload(const DownloadI
|
||||
if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
|
||||
extensions::UserScript::IsURLUserScript(download_item.GetURL(),
|
||||
download_item.GetMimeType())) {
|
||||
@@ -50,7 +50,7 @@
|
||||
bool IsExtensionDownload(const download::DownloadItem& download_item);
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -1238,10 +1238,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
@@ -1236,10 +1236,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
return DownloadConfirmationReason::SAVE_AS;
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
@@ -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
|
||||
@@ -283,6 +283,13 @@ bool ExtensionManagement::IsInstallation
|
||||
@@ -286,6 +286,13 @@ bool ExtensionManagement::IsInstallation
|
||||
bool ExtensionManagement::IsOffstoreInstallAllowed(
|
||||
const GURL& url,
|
||||
const GURL& referrer_url) const {
|
||||
|
||||
@@ -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
|
||||
@@ -1208,6 +1208,8 @@ WindowOpenDisposition NavigationPolicyTo
|
||||
@@ -1207,6 +1207,8 @@ WindowOpenDisposition NavigationPolicyTo
|
||||
case blink::kWebNavigationPolicyNewWindow:
|
||||
return WindowOpenDisposition::NEW_WINDOW;
|
||||
case blink::kWebNavigationPolicyNewPopup:
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
|
||||
+#include "base/command_line.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/i18n/rtl.h"
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
@@ -194,7 +195,8 @@ void AppModalDialogManager::RunBeforeUnl
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
@@ -145,7 +146,8 @@ void AppModalDialogManager::RunBeforeUnl
|
||||
ChromeJavaScriptDialogExtraData* extra_data =
|
||||
&javascript_dialog_extra_data_[web_contents];
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/net/socket/ssl_client_socket_impl.cc
|
||||
+++ b/net/socket/ssl_client_socket_impl.cc
|
||||
@@ -202,7 +202,8 @@ class SSLClientSocketImpl::SSLContext {
|
||||
@@ -203,7 +203,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 */);
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/startup/infobar_utils.cc
|
||||
+++ b/chrome/browser/ui/startup/infobar_utils.cc
|
||||
@@ -124,7 +124,8 @@ void AddInfoBarsIfNecessary(Browser* bro
|
||||
@@ -131,7 +131,8 @@ void AddInfoBarsIfNecessary(Browser* bro
|
||||
}
|
||||
|
||||
// Web apps should not display the session restore bubble (crbug.com/1264121)
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/feature_engagement/public/event_constants.h"
|
||||
@@ -543,6 +545,17 @@ void ExtensionsToolbarContainer::AnchorA
|
||||
@@ -545,6 +547,17 @@ void ExtensionsToolbarContainer::AnchorA
|
||||
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
|
||||
anchor_view && anchor_view->GetVisible() ? anchor_view
|
||||
: GetExtensionsButton());
|
||||
@@ -34,7 +34,7 @@
|
||||
widget->Show();
|
||||
}
|
||||
|
||||
@@ -942,6 +955,9 @@ void ExtensionsToolbarContainer::UpdateC
|
||||
@@ -944,6 +957,9 @@ void ExtensionsToolbarContainer::UpdateC
|
||||
}
|
||||
|
||||
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -2220,6 +2220,10 @@ void BrowserView::ExitFullscreen() {
|
||||
@@ -2265,6 +2265,10 @@ void BrowserView::ExitFullscreen() {
|
||||
void BrowserView::UpdateExclusiveAccessBubble(
|
||||
const ExclusiveAccessBubbleParams& params,
|
||||
ExclusiveAccessBubbleHideCallback first_hide_callback) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/tabs/tab.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab.cc
|
||||
@@ -1156,7 +1156,11 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1178,7 +1178,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;
|
||||
@@ -1185,6 +1189,8 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1207,6 +1211,8 @@ void Tab::UpdateIconVisibility() {
|
||||
!controller_->IsLockedForOnTask() &&
|
||||
#endif
|
||||
large_enough_for_close_button;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -462,6 +462,17 @@ void ToolbarView::Init() {
|
||||
@@ -464,6 +464,17 @@ void ToolbarView::Init() {
|
||||
browser_->profile()->IsGuestSession() ||
|
||||
browser_->profile()->IsRegularProfile();
|
||||
#endif
|
||||
|
||||
@@ -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
|
||||
@@ -3857,6 +3857,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3897,6 +3897,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
pname, IdentifiabilityBenignStringToken(
|
||||
String(ContextGL()->GetString(GL_RENDERER))));
|
||||
}
|
||||
@@ -95,7 +95,7 @@
|
||||
return WebGLAny(script_state,
|
||||
String(ContextGL()->GetString(GL_RENDERER)));
|
||||
}
|
||||
@@ -3872,6 +3874,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3912,6 +3914,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
pname, IdentifiabilityBenignStringToken(
|
||||
String(ContextGL()->GetString(GL_VENDOR))));
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4446,10 +4446,12 @@ const FeatureEntry::FeatureVariation kEn
|
||||
@@ -4619,10 +4619,12 @@ const FeatureEntry::FeatureVariation
|
||||
#include "chrome/browser/ungoogled_flag_choices.h"
|
||||
#include "chrome/browser/bromite_flag_choices.h"
|
||||
#include "chrome/browser/ungoogled_platform_flag_choices.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"
|
||||
@@ -385,10 +386,10 @@ void AddAdditionalRequestHeaders(
|
||||
@@ -386,10 +387,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
|
||||
@@ -136,6 +136,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"
|
||||
@@ -4656,10 +4657,13 @@ void RenderFrameImpl::FinalizeRequestInt
|
||||
@@ -4666,10 +4667,13 @@ void RenderFrameImpl::FinalizeRequestInt
|
||||
|
||||
request.SetHasUserGesture(frame_->HasTransientUserActivation());
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
void RenderFrameImpl::DidLoadResourceFromMemoryCache(
|
||||
--- a/services/network/network_service_network_delegate.cc
|
||||
+++ b/services/network/network_service_network_delegate.cc
|
||||
@@ -30,6 +30,7 @@
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "services/network/network_service_proxy_delegate.h"
|
||||
#include "services/network/pending_callback_chain.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
@@ -80,7 +80,7 @@
|
||||
#include "services/network/url_loader.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
@@ -57,9 +58,14 @@ NetworkServiceNetworkDelegate::~NetworkS
|
||||
@@ -68,9 +69,14 @@ NetworkServiceNetworkDelegate::~NetworkS
|
||||
void NetworkServiceNetworkDelegate::MaybeTruncateReferrer(
|
||||
net::URLRequest* const request,
|
||||
const GURL& effective_url) {
|
||||
@@ -261,7 +261,7 @@
|
||||
std::vector<std::unique_ptr<URLLoaderThrottle>>
|
||||
--- a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc
|
||||
+++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc
|
||||
@@ -12,6 +12,7 @@
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "base/task/sequenced_task_runner.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
@@ -269,7 +269,7 @@
|
||||
#include "services/network/public/cpp/resource_request.h"
|
||||
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
|
||||
#include "third_party/blink/public/common/loader/loader_constants.h"
|
||||
@@ -22,6 +23,7 @@
|
||||
@@ -23,6 +24,7 @@
|
||||
#include "third_party/blink/public/platform/modules/service_worker/web_service_worker_provider_context.h"
|
||||
#include "third_party/blink/public/platform/platform.h"
|
||||
#include "third_party/blink/public/platform/resource_load_info_notifier_wrapper.h"
|
||||
@@ -277,7 +277,7 @@
|
||||
#include "third_party/blink/public/platform/url_loader_throttle_provider.h"
|
||||
#include "third_party/blink/public/platform/weak_wrapper_resource_load_info_notifier.h"
|
||||
#include "third_party/blink/public/platform/web_security_origin.h"
|
||||
@@ -342,10 +344,13 @@ void DedicatedOrSharedWorkerFetchContext
|
||||
@@ -373,10 +375,13 @@ void DedicatedOrSharedWorkerFetchContext
|
||||
auto url_request_extra_data = base::MakeRefCounted<WebURLRequestExtraData>();
|
||||
request.SetURLRequestExtraData(std::move(url_request_extra_data));
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/net/base/features.cc
|
||||
+++ b/net/base/features.cc
|
||||
@@ -13,6 +13,8 @@
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
namespace net::features {
|
||||
|
||||
@@ -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;
|
||||
@@ -153,11 +153,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.");
|
||||
@@ -1487,33 +1482,10 @@ int HostResolverManager::StartIPv6Reacha
|
||||
@@ -1490,33 +1485,10 @@ int HostResolverManager::StartIPv6Reacha
|
||||
return OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -36,13 +36,13 @@
|
||||
actionButtonText_: String,
|
||||
cancelButtonHidden_: Boolean,
|
||||
@@ -79,6 +81,7 @@ export class SettingsSearchEngineEditDia
|
||||
private searchEngine_: string;
|
||||
private keyword_: string;
|
||||
private queryUrl_: string;
|
||||
+ private suggestionsUrl_: string;
|
||||
private dialogTitle_: string;
|
||||
private actionButtonText_: string;
|
||||
private cancelButtonHidden_: boolean;
|
||||
declare private searchEngine_: string;
|
||||
declare private keyword_: string;
|
||||
declare private queryUrl_: string;
|
||||
+ declare private suggestionsUrl_: string;
|
||||
declare private dialogTitle_: string;
|
||||
declare private actionButtonText_: string;
|
||||
declare private cancelButtonHidden_: boolean;
|
||||
@@ -109,6 +112,7 @@ export class SettingsSearchEngineEditDia
|
||||
this.keyword_ = this.model.keyword;
|
||||
this.queryUrl_ = this.model.url;
|
||||
@@ -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
|
||||
@@ -206,21 +206,25 @@ void TemplateURLTableModel::Remove(size_
|
||||
@@ -207,21 +207,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);
|
||||
@@ -229,7 +233,8 @@ void TemplateURLTableModel::ModifyTempla
|
||||
@@ -230,7 +234,8 @@ void TemplateURLTableModel::ModifyTempla
|
||||
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
|
||||
template_url->SupportsReplacement(
|
||||
template_url_service_->search_terms_data()));
|
||||
@@ -342,7 +342,7 @@
|
||||
|
||||
// Dummy number used for indicating that a new search engine is added.
|
||||
const int kNewSearchEngineIndex = -1;
|
||||
@@ -228,6 +229,8 @@ base::Value::Dict SearchEnginesHandler::
|
||||
@@ -255,6 +256,8 @@ base::Value::Dict SearchEnginesHandler::
|
||||
Profile* profile = Profile::FromWebUI(web_ui());
|
||||
dict.Set("url",
|
||||
template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
|
||||
@@ -351,7 +351,7 @@
|
||||
dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
|
||||
(template_url->starter_pack_id() > 0)));
|
||||
GURL icon_url = template_url->favicon_url();
|
||||
@@ -403,12 +406,14 @@ void SearchEnginesHandler::HandleSearchE
|
||||
@@ -414,12 +417,14 @@ void SearchEnginesHandler::HandleSearchE
|
||||
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -369,7 +369,7 @@
|
||||
}
|
||||
|
||||
edit_controller_.reset();
|
||||
@@ -438,6 +443,8 @@ bool SearchEnginesHandler::CheckFieldVal
|
||||
@@ -449,6 +454,8 @@ bool SearchEnginesHandler::CheckFieldVal
|
||||
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
|
||||
} else if (field_name.compare(kQueryUrlField) == 0) {
|
||||
is_valid = edit_controller_->IsURLValid(field_value);
|
||||
@@ -378,7 +378,7 @@
|
||||
} else {
|
||||
NOTREACHED();
|
||||
}
|
||||
@@ -460,18 +467,21 @@ void SearchEnginesHandler::HandleSearchE
|
||||
@@ -471,18 +478,21 @@ void SearchEnginesHandler::HandleSearchE
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -448,7 +448,7 @@
|
||||
syncer::kSeparateLocalAndAccountSearchEngines)
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -342,7 +342,8 @@ class TemplateURLService final : public
|
||||
@@ -346,7 +346,8 @@ class TemplateURLService final : public
|
||||
void ResetTemplateURL(TemplateURL* url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4442,7 +4442,13 @@ const FeatureEntry::FeatureVariation kEn
|
||||
@@ -4615,7 +4615,13 @@ const FeatureEntry::FeatureVariation
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
--- a/chrome/browser/media/webrtc/capture_policy_utils.cc
|
||||
+++ b/chrome/browser/media/webrtc/capture_policy_utils.cc
|
||||
@@ -56,36 +56,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
|
||||
base::OnceCallback<void(bool)> callback,
|
||||
content::BrowserContext* context,
|
||||
bool is_multi_capture_allowed_for_any_origin_on_main_profile) {
|
||||
- // If the new MultiScreenCaptureAllowedForUrls policy permits access, exit
|
||||
- // early. If not, check the legacy
|
||||
- // GetDisplayMediaSetSelectAllScreensAllowedForUrls policy.
|
||||
- if (is_multi_capture_allowed_for_any_origin_on_main_profile) {
|
||||
- std::move(callback).Run(true);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- // TODO(b/329064666): Remove the checks below once the pivot to IWAs is
|
||||
- // complete.
|
||||
- Profile* profile = Profile::FromBrowserContext(context);
|
||||
- if (!profile) {
|
||||
std::move(callback).Run(false);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- HostContentSettingsMap* host_content_settings_map =
|
||||
- HostContentSettingsMapFactory::GetForProfile(profile);
|
||||
- if (!host_content_settings_map) {
|
||||
- std::move(callback).Run(false);
|
||||
- return;
|
||||
- }
|
||||
- ContentSettingsForOneType content_settings =
|
||||
- host_content_settings_map->GetSettingsForOneType(
|
||||
- ContentSettingsType::ALL_SCREEN_CAPTURE);
|
||||
- std::move(callback).Run(std::ranges::any_of(
|
||||
- content_settings, [](const ContentSettingPatternSource& source) {
|
||||
- return source.GetContentSetting() ==
|
||||
- ContentSetting::CONTENT_SETTING_ALLOW;
|
||||
- }));
|
||||
}
|
||||
|
||||
void CheckAllScreensMediaAllowedForIwaResultReceived(
|
||||
@@ -257,43 +228,13 @@ void RegisterProfilePrefs(PrefRegistrySi
|
||||
void CheckGetAllScreensMediaAllowedForAnyOrigin(
|
||||
content::BrowserContext* context,
|
||||
base::OnceCallback<void(bool)> callback) {
|
||||
-#if BUILDFLAG(IS_CHROMEOS)
|
||||
- if (crosapi::mojom::MultiCaptureService* multi_capture_service =
|
||||
- GetMultiCaptureService()) {
|
||||
- multi_capture_service->IsMultiCaptureAllowedForAnyOriginOnMainProfile(
|
||||
- base::BindOnce(
|
||||
- IsMultiCaptureAllowedForAnyOriginOnMainProfileResultReceived,
|
||||
- std::move(callback), context));
|
||||
- } else {
|
||||
- // If the multi capture service is not available with the required version,
|
||||
- // fall back to the original flow using the deprecated policy.
|
||||
- IsMultiCaptureAllowedForAnyOriginOnMainProfileResultReceived(
|
||||
- std::move(callback), context, /*result=*/false);
|
||||
- }
|
||||
-#else
|
||||
std::move(callback).Run(false);
|
||||
-#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
}
|
||||
|
||||
void CheckGetAllScreensMediaAllowed(content::BrowserContext* context,
|
||||
const GURL& url,
|
||||
base::OnceCallback<void(bool)> callback) {
|
||||
-#if BUILDFLAG(IS_CHROMEOS)
|
||||
- crosapi::mojom::MultiCaptureService* multi_capture_service =
|
||||
- GetMultiCaptureService();
|
||||
- if (multi_capture_service) {
|
||||
- multi_capture_service->IsMultiCaptureAllowed(
|
||||
- url, base::BindOnce(&CheckAllScreensMediaAllowedForIwaResultReceived,
|
||||
- std::move(callback), std::move(url), context));
|
||||
- } else {
|
||||
- // If the multi capture service is not available with the required version,
|
||||
- // fall back to the original flow using the deprecated policy.
|
||||
- CheckAllScreensMediaAllowedForIwaResultReceived(
|
||||
- std::move(callback), std::move(url), context, /*result=*/false);
|
||||
- }
|
||||
-#else
|
||||
std::move(callback).Run(false);
|
||||
-#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
}
|
||||
|
||||
#if BUILDFLAG(ENABLE_SCREEN_CAPTURE)
|
||||
@@ -142,7 +142,7 @@
|
||||
} // namespace download
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -129,7 +129,6 @@ source_set("browser") {
|
||||
@@ -131,7 +131,6 @@ source_set("browser") {
|
||||
"//components/performance_manager/scenario_api",
|
||||
"//components/power_monitor",
|
||||
"//components/services/filesystem:lib",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/components/safe_browsing/core/common/features.cc
|
||||
+++ b/components/safe_browsing/core/common/features.cc
|
||||
@@ -121,7 +121,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints,
|
||||
@@ -133,7 +133,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints,
|
||||
|
||||
BASE_FEATURE(kDownloadsPageReferrerUrl,
|
||||
"DownloadsPageReferrerUrl",
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
|
||||
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
|
||||
@@ -266,5 +266,5 @@ TemplateURLService* ChromeLocationBarMod
|
||||
@@ -268,5 +268,5 @@ TemplateURLService* ChromeLocationBarMod
|
||||
// static
|
||||
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -2060,7 +2060,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
|
||||
@@ -2089,7 +2089,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
|
||||
// crbug.com/988956.
|
||||
BASE_FEATURE(kPrefetchPrivacyChanges,
|
||||
"PrefetchPrivacyChanges",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/browser_commands.cc
|
||||
+++ b/chrome/browser/ui/browser_commands.cc
|
||||
@@ -557,11 +557,6 @@ int GetContentRestrictions(const Browser
|
||||
@@ -562,11 +562,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;
|
||||
}
|
||||
@@ -1712,8 +1707,7 @@ bool CanSavePage(const Browser* browser)
|
||||
@@ -1822,8 +1817,7 @@ bool CanSavePage(const Browser* browser)
|
||||
policy::DownloadRestriction::ALL_FILES) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
@@ -2185,8 +2185,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
@@ -2208,8 +2208,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 "
|
||||
@@ -2197,7 +2195,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
@@ -2220,7 +2218,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
if (!clipboard_text.empty()) {
|
||||
controller_->CreateNewTabWithLocation(clipboard_text);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
--- a/components/omnibox/common/omnibox_features.cc
|
||||
+++ b/components/omnibox/common/omnibox_features.cc
|
||||
@@ -326,7 +326,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
|
||||
@@ -320,7 +320,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
|
||||
// Enables additional site search providers for the Site search Starter Pack.
|
||||
BASE_FEATURE(kStarterPackExpansion,
|
||||
"StarterPackExpansion",
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
# Google sign-in and Anonymized Data Collection sections
|
||||
# help bubble for the removed data collection section
|
||||
# Privacy guide section on the privacy page
|
||||
# The password leak detection toggle on the security settings page
|
||||
# Advanced Protection Program link on the security settings page
|
||||
# the 'Learn more' link from the search engine entry on the settings page
|
||||
# Safety Check entry on the side menu on the settings page
|
||||
@@ -25,7 +26,6 @@
|
||||
# the 'Vist Chrome Web Store' entry in the extensions section of the main menu
|
||||
# the side panel entry in All Bookmarks
|
||||
# the feedback entry in the third party cookie popup
|
||||
# unneeded elements from the profile menu
|
||||
# the 'Learn more' link on crashed tabs
|
||||
# the Third-party sign-in site settings (FedCM)
|
||||
# non-functional AI options
|
||||
@@ -53,7 +53,7 @@
|
||||
<!-- Languages Page -->
|
||||
--- a/chrome/app/settings_strings.grdp
|
||||
+++ b/chrome/app/settings_strings.grdp
|
||||
@@ -1211,7 +1211,7 @@
|
||||
@@ -1216,7 +1216,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
|
||||
@@ -1235,7 +1235,7 @@
|
||||
@@ -1240,7 +1240,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
|
||||
@@ -1247,7 +1247,7 @@
|
||||
@@ -1252,7 +1252,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.">
|
||||
@@ -97,10 +97,18 @@
|
||||
<span>$i18n{noSearchResults}</span>
|
||||
--- a/chrome/browser/resources/extensions/sidebar.html.ts
|
||||
+++ b/chrome/browser/resources/extensions/sidebar.html.ts
|
||||
@@ -33,16 +33,6 @@ export function getHtml(this: Extensions
|
||||
@@ -33,24 +33,6 @@ export function getHtml(this: Extensions
|
||||
<cr-ripple></cr-ripple>
|
||||
</a>
|
||||
</cr-menu-selector>
|
||||
-<div class="separator" ?hidden="${!this.inDevMode}"></div>
|
||||
- ${this.inDevMode ? html`
|
||||
- <div class="cr-nav-menu-item" id="moreExtensions">
|
||||
- <span id="promo-message-text" class="cr-secondary-text"
|
||||
- .innerHTML="${this.computeDocsPromoText_()}">
|
||||
- </span>
|
||||
- </div>
|
||||
- `: ''}
|
||||
-<div class="separator"></div>
|
||||
-<div class="cr-nav-menu-item" id="moreExtensions">
|
||||
- <cr-icon id="web-store-icon" icon="extensions-icons:web_store">
|
||||
@@ -124,7 +132,7 @@
|
||||
import {CrLitElement} from 'chrome://resources/lit/v3_0/lit.rollup.js';
|
||||
import type {PropertyValues} from 'chrome://resources/lit/v3_0/lit.rollup.js';
|
||||
|
||||
@@ -111,13 +110,6 @@ export class ExtensionsSidebarElement ex
|
||||
@@ -113,21 +112,6 @@ export class ExtensionsSidebarElement ex
|
||||
}
|
||||
}
|
||||
|
||||
@@ -134,6 +142,14 @@
|
||||
- attrs: ['target'],
|
||||
- substitutions: [loadTimeData.getString('getMoreExtensionsUrl')],
|
||||
- });
|
||||
- }
|
||||
-
|
||||
- protected computeDocsPromoText_(): TrustedHTML {
|
||||
- return this.i18nAdvanced('sidebarDocsPromo', {
|
||||
- tags: ['a'],
|
||||
- attrs: ['target'],
|
||||
- substitutions: [loadTimeData.getString('extensionsWhatsNewURL')],
|
||||
- });
|
||||
- }
|
||||
}
|
||||
|
||||
@@ -177,7 +193,7 @@
|
||||
<cr-link-row id="captions"
|
||||
class="hr"
|
||||
label="$i18n{captionsTitle}"
|
||||
@@ -97,11 +97,6 @@
|
||||
@@ -105,11 +105,6 @@
|
||||
</settings-toggle-button>
|
||||
</template>
|
||||
</if>
|
||||
@@ -235,7 +251,7 @@
|
||||
<template is="dom-if"
|
||||
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
|
||||
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
|
||||
@@ -72,7 +72,7 @@
|
||||
@@ -74,7 +74,7 @@
|
||||
<!-- TODO(crbug.com/40267370): Add a test to basic_page_test.ts
|
||||
to check that settings-safety-hub-entry-point is not visible
|
||||
in the guest mode. -->
|
||||
@@ -254,7 +270,7 @@
|
||||
import '../privacy_page/privacy_page.js';
|
||||
import '../safety_hub/safety_hub_entry_point.js';
|
||||
import '../autofill_page/autofill_page.js';
|
||||
@@ -277,7 +276,6 @@ export class SettingsBasicPageElement ex
|
||||
@@ -283,7 +282,6 @@ export class SettingsBasicPageElement ex
|
||||
this.showPrivacyGuidePromo_ = false;
|
||||
return;
|
||||
}
|
||||
@@ -288,7 +304,7 @@
|
||||
<cr-link-row id="historySearchRow"
|
||||
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
|
||||
@@ -201,10 +201,6 @@ export class SettingsPersonalizationOpti
|
||||
@@ -202,10 +202,6 @@ export class SettingsPersonalizationOpti
|
||||
'chrome-signin-user-choice-info-change',
|
||||
this.setChromeSigninUserChoiceInfo_.bind(this));
|
||||
// </if>
|
||||
@@ -319,7 +335,21 @@
|
||||
class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
|
||||
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
|
||||
@@ -237,9 +237,3 @@
|
||||
@@ -113,13 +113,6 @@
|
||||
<div class="cr-row first">
|
||||
<h2 class="cr-title-text">$i18n{advancedPageTitle}</h2>
|
||||
</div>
|
||||
- <settings-toggle-button id="passwordsLeakToggle"
|
||||
- label="$i18n{passwordsLeakDetectionLabel}"
|
||||
- pref="{{prefs.generated.password_leak_detection}}"
|
||||
- sub-label="[[getPasswordsLeakToggleSubLabel_(
|
||||
- prefs.profile.password_manager_leak_detection.*,
|
||||
- prefs.generated.password_leak_detection.*)]]">
|
||||
- </settings-toggle-button>
|
||||
<template is="dom-if" if="[[!enableHttpsFirstModeNewSettings_]]" restamp>
|
||||
<settings-toggle-button id="httpsOnlyModeToggle"
|
||||
pref="{{prefs.generated.https_first_mode_enabled}}"
|
||||
@@ -229,9 +222,3 @@
|
||||
</cr-link-row>
|
||||
</if>
|
||||
|
||||
@@ -366,7 +396,7 @@
|
||||
void RecentTabsSubMenuModel::BuildLocalEntries() {
|
||||
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
@@ -971,16 +971,6 @@ void ExtensionsMenuModel::Build(Browser*
|
||||
@@ -954,16 +954,6 @@ void ExtensionsMenuModel::Build(Browser*
|
||||
SetElementIdentifierAt(
|
||||
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
|
||||
kManageExtensionsMenuItem);
|
||||
@@ -385,7 +415,7 @@
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
@@ -1237,12 +1237,14 @@ void BookmarkMenuDelegate::BuildOtherNod
|
||||
@@ -1236,12 +1236,14 @@ void BookmarkMenuDelegate::BuildOtherNod
|
||||
menu->AppendMenuItem(
|
||||
IDC_SHOW_BOOKMARK_SIDE_PANEL,
|
||||
l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
|
||||
@@ -403,7 +433,7 @@
|
||||
}
|
||||
--- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
|
||||
+++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
|
||||
@@ -213,14 +213,7 @@ void CookieControlsContentView::SetEnfor
|
||||
@@ -148,14 +148,7 @@ void CookieControlsContentView::SetEnfor
|
||||
}
|
||||
|
||||
void CookieControlsContentView::SetFeedbackSectionVisibility(bool visible) {
|
||||
@@ -417,35 +447,7 @@
|
||||
- }
|
||||
}
|
||||
|
||||
void CookieControlsContentView::AddDescriptionRow() {
|
||||
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
@@ -224,6 +224,7 @@ void ProfileMenuView::BuildMenu() {
|
||||
}
|
||||
|
||||
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
|
||||
+ return gfx::ImageSkia();
|
||||
Profile* profile = browser()->profile();
|
||||
if (profile->IsOffTheRecord() || profile->IsGuestSession()) {
|
||||
return gfx::ImageSkia();
|
||||
@@ -646,16 +647,8 @@ void ProfileMenuView::BuildIdentity() {
|
||||
badge_image_model, menu_title_, menu_subtitle_, management_label);
|
||||
} else {
|
||||
std::string profile_user_display_name, profile_user_email;
|
||||
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
- profile_user_display_name = profile->GetPrefs()->GetString(
|
||||
- enterprise_signin::prefs::kProfileUserDisplayName);
|
||||
- profile_user_email = profile->GetPrefs()->GetString(
|
||||
- enterprise_signin::prefs::kProfileUserEmail);
|
||||
-#endif
|
||||
menu_title_ =
|
||||
- profile_user_display_name.empty()
|
||||
- ? l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE)
|
||||
- : base::UTF8ToUTF16(profile_user_display_name);
|
||||
+ base::UTF8ToUTF16(profile_user_display_name);
|
||||
// The email may be empty.
|
||||
menu_subtitle_ = base::UTF8ToUTF16(
|
||||
profile_user_email.empty() ? account_info.email : profile_user_email);
|
||||
void CookieControlsContentView::AddToggleRow() {
|
||||
--- a/chrome/browser/ui/views/sad_tab_view.cc
|
||||
+++ b/chrome/browser/ui/views/sad_tab_view.cc
|
||||
@@ -574,9 +574,6 @@ SadTabView::SadTabView(content::WebConte
|
||||
@@ -483,7 +485,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
|
||||
@@ -928,40 +928,20 @@ void AddPerformanceStrings(content::WebU
|
||||
@@ -959,40 +959,20 @@ void AddPerformanceStrings(content::WebU
|
||||
IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
|
||||
{"performanceInterventionEnabledLabel",
|
||||
IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
|
||||
@@ -533,7 +535,7 @@
|
||||
|
||||
html_source->AddString(
|
||||
"tabDiscardTimerFiveMinutes",
|
||||
@@ -1007,11 +987,6 @@ void AddPerformanceStrings(content::WebU
|
||||
@@ -1038,11 +1018,6 @@ void AddPerformanceStrings(content::WebU
|
||||
base::NumberToString16(
|
||||
performance_manager::user_tuning::BatterySaverModeManager::
|
||||
kLowBatteryThresholdPercent)));
|
||||
@@ -545,7 +547,7 @@
|
||||
|
||||
html_source->AddString("discardRingTreatmentLearnMoreUrl",
|
||||
chrome::kDiscardRingTreatmentLearnMoreUrl);
|
||||
@@ -3475,7 +3450,7 @@ void AddSiteSettingsStrings(content::Web
|
||||
@@ -3494,7 +3469,7 @@ void AddSiteSettingsStrings(content::Web
|
||||
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
|
||||
|
||||
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
|
||||
@@ -556,7 +558,7 @@
|
||||
html_source->AddBoolean(
|
||||
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
|
||||
@@ -640,13 +640,7 @@ SettingsUI::SettingsUI(content::WebUI* w
|
||||
@@ -673,13 +673,7 @@ SettingsUI::SettingsUI(content::WebUI* w
|
||||
auto* optimization_guide_service =
|
||||
OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
|
||||
for (auto [key, name] : optimization_guide_features) {
|
||||
@@ -570,10 +572,10 @@
|
||||
+ html_source->AddBoolean(name, false);
|
||||
}
|
||||
|
||||
is_any_ai_feature_enabled |= glic_enabled;
|
||||
html_source->AddBoolean("showAdvancedFeaturesMainControl",
|
||||
--- a/media/base/media_switches.cc
|
||||
+++ b/media/base/media_switches.cc
|
||||
@@ -863,7 +863,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
|
||||
@@ -852,7 +852,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
// Enables the Live Caption feature on supported devices.
|
||||
|
||||
@@ -96,7 +96,7 @@ extra/ungoogled-chromium/add-flag-for-incognito-themes.patch
|
||||
extra/ungoogled-chromium/add-flags-for-referrer-customization.patch
|
||||
extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch
|
||||
extra/ungoogled-chromium/add-flags-for-existing-switches.patch
|
||||
extra/ungoogled-chromium/disable-capture-all-screens.patch
|
||||
|
||||
extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
|
||||
extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch
|
||||
extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
|
||||
|
||||
@@ -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
|
||||
@@ -252,9 +252,6 @@ declare_args() {
|
||||
@@ -257,9 +257,6 @@ declare_args() {
|
||||
force_enable_raw_ptr_exclusion = false
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,16 @@
|
||||
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
|
||||
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "components/device_signals/core/browser/browser_utils.h"
|
||||
#include "components/enterprise/browser/identifiers/profile_id_service.h"
|
||||
#include "components/policy/content/policy_blocklist_service.h"
|
||||
+#include "components/prefs/pref_service.h"
|
||||
#include "components/version_info/version_info.h"
|
||||
#include "device_management_backend.pb.h"
|
||||
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -957,6 +957,7 @@ source_set("extensions") {
|
||||
@@ -958,6 +958,7 @@ source_set("extensions") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser/web_ui:web_ui",
|
||||
@@ -8,9 +18,19 @@
|
||||
"//components/safe_browsing/core/common/proto:csd_proto",
|
||||
"//components/search_engines",
|
||||
"//components/services/app_service",
|
||||
--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
|
||||
+++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "chrome/app/chrome_command_ids.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/engagement/site_engagement_service_factory.h"
|
||||
+#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/ui/safety_hub/safety_hub_prefs.h"
|
||||
#include "chrome/browser/ui/safety_hub/safety_hub_service.h"
|
||||
#include "chrome/browser/ui/safety_hub/safety_hub_util.h"
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -544,6 +544,7 @@ static_library("url_constants") {
|
||||
@@ -545,6 +545,7 @@ static_library("url_constants") {
|
||||
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
|
||||
"//components/password_manager/content/common",
|
||||
"//components/safe_browsing/core/common",
|
||||
@@ -40,7 +60,7 @@
|
||||
public_deps = [
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -111,6 +111,7 @@ source_set("browser") {
|
||||
@@ -112,6 +112,7 @@ source_set("browser") {
|
||||
"//components/filename_generation",
|
||||
"//components/fingerprinting_protection_filter/interventions/common:features",
|
||||
"//components/input",
|
||||
|
||||
154
pruning.list
154
pruning.list
@@ -91,6 +91,34 @@ chrome/browser/resources/chromeos/accessibility/chromevox/mv2/earcons/selection_
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv2/earcons/skip.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv2/earcons/wrap.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv2/earcons/wrap_edge.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/alert_modal.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/alert_nonmodal.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/button.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/check_off.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/check_on.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/chromevox_loaded.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/chromevox_loading.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/editable_text.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/ellipsis.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/invalid_keypress.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/link.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/list_item.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/listbox.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/long_desc.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/math.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/object_close.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/object_enter.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/object_exit.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/object_open.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/object_select.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/page_finish_loading.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/page_start_loading.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/recover_focus.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/selection.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/selection_reverse.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/skip.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/wrap.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/chromevox/mv3/earcons/wrap_edge.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/common/testing/fake_facegaze_assets_dlc.tar.xz
|
||||
chrome/browser/resources/chromeos/accessibility/common/testing/fake_pumpkin_dlc.tar.xz
|
||||
chrome/browser/resources/chromeos/accessibility/select_to_speak/mv2/earcons/null_selection.ogg
|
||||
@@ -290,6 +318,8 @@ content/test/data/interest_group/auction_only.wbn
|
||||
content/test/data/interest_group/auction_only_both_new_and_old_names.wbn
|
||||
content/test/data/interest_group/auction_only_new_name.wbn
|
||||
content/test/data/interest_group/multiply.wasm
|
||||
content/test/data/loader/compressed.html.gz
|
||||
content/test/data/loader/compressed.js.gz
|
||||
content/test/data/shared_dictionary/path/compressed.data
|
||||
content/test/data/site_isolation/nosniff.png.octet-stream
|
||||
content/test/data/sxg/127.0.0.1.public.pem.cbor
|
||||
@@ -1600,6 +1630,7 @@ third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Ciudad_
|
||||
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Coral_Harbour
|
||||
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Cordoba
|
||||
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Costa_Rica
|
||||
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Coyhaique
|
||||
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Creston
|
||||
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Cuiaba
|
||||
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Curacao
|
||||
@@ -2142,9 +2173,6 @@ third_party/anonymous_tokens/src/anonymous_tokens/testdata/strong_rsa_modulus204
|
||||
third_party/anonymous_tokens/src/anonymous_tokens/testdata/strong_rsa_modulus2048_example_2.binarypb
|
||||
third_party/anonymous_tokens/src/anonymous_tokens/testdata/strong_rsa_modulus3072_example.binarypb
|
||||
third_party/anonymous_tokens/src/anonymous_tokens/testdata/strong_rsa_modulus4096_example.binarypb
|
||||
third_party/beto-core/src/nearby/connections/ukey2/ukey2_jni/java/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/beto-core/src/nearby/presence/ldt_np_jni/java/LdtNpJni/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/beto-core/src/nearby/presence/np_java_ffi/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/blink-0bb59816-x86
|
||||
third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/blink-10205257-x86
|
||||
third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/blink-12221360-x86
|
||||
@@ -2822,6 +2850,13 @@ third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Secu
|
||||
third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx
|
||||
third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx
|
||||
third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx
|
||||
third_party/boringssl/src/crypto/pkcs7/test/nss.p7c
|
||||
third_party/boringssl/src/crypto/pkcs7/test/openssl_crl.p7c
|
||||
third_party/boringssl/src/crypto/pkcs7/test/sign_sha1.p7s
|
||||
third_party/boringssl/src/crypto/pkcs7/test/sign_sha1_key_id.p7s
|
||||
third_party/boringssl/src/crypto/pkcs7/test/sign_sha256.p7s
|
||||
third_party/boringssl/src/crypto/pkcs7/test/sign_sha256_key_id.p7s
|
||||
third_party/boringssl/src/crypto/pkcs7/test/windows.p7c
|
||||
third_party/boringssl/src/crypto/pkcs8/test/bad1.p12
|
||||
third_party/boringssl/src/crypto/pkcs8/test/bad2.p12
|
||||
third_party/boringssl/src/crypto/pkcs8/test/bad3.p12
|
||||
@@ -7805,6 +7840,9 @@ third_party/dawn/third_party/dxc/test/tools/llvm-symbolizer/pdb/Inputs/test.exe
|
||||
third_party/dawn/third_party/dxc/test/tools/llvm-symbolizer/pdb/Inputs/test.pdb
|
||||
third_party/dawn/third_party/dxc/tools/clang/test/DXC/Inputs/bom-inc-utf16le.hlsli
|
||||
third_party/dawn/third_party/dxc/tools/clang/test/DXC/Inputs/bom-main-utf16le.hlsl
|
||||
third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_hitobject_accessors_failing.ll
|
||||
third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_hitobject_make_failing.ll
|
||||
third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_maybereorder_failing.ll
|
||||
third_party/dawn/third_party/dxc/tools/clang/test/Misc/Inputs/serialized-diags-stable.dia
|
||||
third_party/dawn/third_party/dxc/tools/clang/test/Preprocessor/Inputs/headermap-rel/foo.hmap
|
||||
third_party/dawn/third_party/dxc/tools/clang/test/Preprocessor/Inputs/headermap-rel2/project-headers.hmap
|
||||
@@ -8028,6 +8066,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lant
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-layout-small-recalc.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-profile.cpuprofile.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-recalc-style.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/layout-shifts-root-causes.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-discovery-delay.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-fetchpriority-high.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-images-rasterizer.json.gz
|
||||
@@ -8061,6 +8100,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/over
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/parser-blocking-after-paint.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/postmessage-initiators.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/primary-page-frame.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/react-console-timestamp.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/react-hello-world.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/recursive-blocking-js.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/recursive-counting-js.json.gz
|
||||
@@ -10843,16 +10883,20 @@ third_party/mediapipe/src/mediapipe/modules/face_geometry/data/canonical_face_mo
|
||||
third_party/nasm/test/br3392667.asm
|
||||
third_party/nasm/test/br3392668-3.asm
|
||||
third_party/nasm/test/br3392669-57.asm
|
||||
third_party/nasm/test/br3392708.asm
|
||||
third_party/nasm/travis/test/_file_.bin.t
|
||||
third_party/nasm/travis/test/a64.bin.t
|
||||
third_party/nasm/travis/test/absolute.bin.t
|
||||
third_party/nasm/travis/test/addr64x.bin.t
|
||||
third_party/nasm/travis/test/alonesym-obj.obj.t
|
||||
third_party/nasm/travis/test/amx.bin.t
|
||||
third_party/nasm/travis/test/aoutso-o0.o.t
|
||||
third_party/nasm/travis/test/aoutso-ox.o.t
|
||||
third_party/nasm/travis/test/aouttest-o0.o.t
|
||||
third_party/nasm/travis/test/aouttest-ox.o.t
|
||||
third_party/nasm/travis/test/avx.bin.t
|
||||
third_party/nasm/travis/test/avx005.bin.t
|
||||
third_party/nasm/travis/test/avx2.bin.t
|
||||
third_party/nasm/travis/test/avx512cd.bin.t
|
||||
third_party/nasm/travis/test/avx512er.bin.t
|
||||
third_party/nasm/travis/test/avx512f.bin.t
|
||||
@@ -10875,10 +10919,26 @@ third_party/nasm/travis/test/br3189064.bin.t
|
||||
third_party/nasm/travis/test/br3385573.bin.t
|
||||
third_party/nasm/travis/test/br3392252.bin.t
|
||||
third_party/nasm/travis/test/br3392259.o.t
|
||||
third_party/nasm/travis/test/br3392275.bin.t
|
||||
third_party/nasm/travis/test/br3392278.o.t
|
||||
third_party/nasm/travis/test/br3392392.bin.t
|
||||
third_party/nasm/travis/test/br3392396.bin.t
|
||||
third_party/nasm/travis/test/br3392411.out.t
|
||||
third_party/nasm/travis/test/br3392442.bin.t
|
||||
third_party/nasm/travis/test/br3392531.asm
|
||||
third_party/nasm/travis/test/br3392637.o.t
|
||||
third_party/nasm/travis/test/br3392643.obj.t
|
||||
third_party/nasm/travis/test/br3392707.bin.t
|
||||
third_party/nasm/travis/test/br3392711.o.t
|
||||
third_party/nasm/travis/test/br3392716.asm
|
||||
third_party/nasm/travis/test/br890790.bin.t
|
||||
third_party/nasm/travis/test/br978756.o.t
|
||||
third_party/nasm/travis/test/clzero.bin.t
|
||||
third_party/nasm/travis/test/coffalign.obj.t
|
||||
third_party/nasm/travis/test/cofftest.obj.t
|
||||
third_party/nasm/travis/test/crc32.bin.t
|
||||
third_party/nasm/travis/test/ctxlocal.o.t
|
||||
third_party/nasm/travis/test/dbxsize.o.t
|
||||
third_party/nasm/travis/test/elfso-o0.o.t
|
||||
third_party/nasm/travis/test/elfso-ox.o.t
|
||||
third_party/nasm/travis/test/elif.o.t
|
||||
@@ -10893,11 +10953,17 @@ third_party/nasm/travis/test/floatexp-o0.bin.t
|
||||
third_party/nasm/travis/test/floatexp-ox.bin.t
|
||||
third_party/nasm/travis/test/floatize.bin.t
|
||||
third_party/nasm/travis/test/floattest.o.t
|
||||
third_party/nasm/travis/test/floatx.bin.t
|
||||
third_party/nasm/travis/test/fwdopt.bin.t
|
||||
third_party/nasm/travis/test/fwdoptpp.bin.t
|
||||
third_party/nasm/travis/test/fwdoptpp.warning.bin.t
|
||||
third_party/nasm/travis/test/gather.bin.t
|
||||
third_party/nasm/travis/test/gotoff64.o.t
|
||||
third_party/nasm/travis/test/hexfp.bin.t
|
||||
third_party/nasm/travis/test/hle.bin.t
|
||||
third_party/nasm/travis/test/ifelse.bin.t
|
||||
third_party/nasm/travis/test/ilog.bin.t
|
||||
third_party/nasm/travis/test/imm.o.t
|
||||
third_party/nasm/travis/test/imm64-o0.bin.t
|
||||
third_party/nasm/travis/test/imm64-o1.bin.t
|
||||
third_party/nasm/travis/test/imm64-ox.bin.t
|
||||
@@ -10908,6 +10974,7 @@ third_party/nasm/travis/test/immwarn.bin.t
|
||||
third_party/nasm/travis/test/imul-nowarn.bin.t
|
||||
third_party/nasm/travis/test/imul-warn.bin.t
|
||||
third_party/nasm/travis/test/inctest.com.t
|
||||
third_party/nasm/travis/test/insertps.bin.t
|
||||
third_party/nasm/travis/test/insnlbl.bin.t
|
||||
third_party/nasm/travis/test/invlpga.bin.t
|
||||
third_party/nasm/travis/test/jmp64.bin.t
|
||||
@@ -10915,8 +10982,11 @@ third_party/nasm/travis/test/lar_lsl.bin.t
|
||||
third_party/nasm/travis/test/larlsl.bin.t
|
||||
third_party/nasm/travis/test/lnxhello.o.t
|
||||
third_party/nasm/travis/test/local.bin.t
|
||||
third_party/nasm/travis/test/lwp.bin.t
|
||||
third_party/nasm/travis/test/mmxsize.bin.t
|
||||
third_party/nasm/travis/test/movd.bin.t
|
||||
third_party/nasm/travis/test/movd64.bin.t
|
||||
third_party/nasm/travis/test/movhpd.bin.t
|
||||
third_party/nasm/travis/test/movimm-o0.bin.t
|
||||
third_party/nasm/travis/test/movimm-ox.bin.t
|
||||
third_party/nasm/travis/test/movnti.bin.t
|
||||
@@ -10925,12 +10995,9 @@ third_party/nasm/travis/test/mpx.o.t
|
||||
third_party/nasm/travis/test/multisection-elf32.o.t
|
||||
third_party/nasm/travis/test/multisection-elf64.o.t
|
||||
third_party/nasm/travis/test/multisection.bin.t
|
||||
third_party/nasm/travis/test/nasmformat-elf32.o.t
|
||||
third_party/nasm/travis/test/nasmformat-elf64.o.t
|
||||
third_party/nasm/travis/test/nasmformat-macho32.o.t
|
||||
third_party/nasm/travis/test/nasmformat-macho64.o.t
|
||||
third_party/nasm/travis/test/newrdwr.bin.t
|
||||
third_party/nasm/travis/test/obj.o.t
|
||||
third_party/nasm/travis/test/objexe.obj.t
|
||||
third_party/nasm/travis/test/optimization-o0.bin.t
|
||||
third_party/nasm/travis/test/optimization-o1.bin.t
|
||||
third_party/nasm/travis/test/optimization-ox.bin.t
|
||||
@@ -10942,6 +11009,7 @@ third_party/nasm/travis/test/prefix66.bin.t
|
||||
third_party/nasm/travis/test/pushseg.bin.t
|
||||
third_party/nasm/travis/test/r13.bin.t
|
||||
third_party/nasm/travis/test/radix.bin.t
|
||||
third_party/nasm/travis/test/rdpid.bin.t
|
||||
third_party/nasm/travis/test/riprel.bin.t
|
||||
third_party/nasm/travis/test/riprel2.bin.t
|
||||
third_party/nasm/travis/test/sha-64.o.t
|
||||
@@ -10949,6 +11017,9 @@ third_party/nasm/travis/test/sha.o.t
|
||||
third_party/nasm/travis/test/smartalign16.bin.t
|
||||
third_party/nasm/travis/test/smartalign32.bin.t
|
||||
third_party/nasm/travis/test/smartalign64.bin.t
|
||||
third_party/nasm/travis/test/splitea.bin.t
|
||||
third_party/nasm/travis/test/sreg.bin.t
|
||||
third_party/nasm/travis/test/ssesize.o.t
|
||||
third_party/nasm/travis/test/struc.bin.t
|
||||
third_party/nasm/travis/test/test67.bin.t
|
||||
third_party/nasm/travis/test/testdos.bin.t
|
||||
@@ -10956,9 +11027,17 @@ third_party/nasm/travis/test/testnos3.bin.t
|
||||
third_party/nasm/travis/test/tmap.o.t
|
||||
third_party/nasm/travis/test/uscore.bin.t
|
||||
third_party/nasm/travis/test/utf.bin.t
|
||||
third_party/nasm/travis/test/v4.bin.t
|
||||
third_party/nasm/travis/test/vaesenc.bin.t
|
||||
third_party/nasm/travis/test/vex.bin.t
|
||||
third_party/nasm/travis/test/vgather.bin.t
|
||||
third_party/nasm/travis/test/vmread.bin.t
|
||||
third_party/nasm/travis/test/vmx.o.t
|
||||
third_party/nasm/travis/test/vpcmp.bin.t
|
||||
third_party/nasm/travis/test/weirdpaste.bin.t
|
||||
third_party/nasm/travis/test/winalign.obj.t
|
||||
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/openh264/src/autotest/performanceTest/ios/fruitstrap
|
||||
@@ -11152,35 +11231,35 @@ third_party/quic_trace/src/examples/example.json.gz
|
||||
third_party/quic_trace/src/examples/example.qtr
|
||||
third_party/r8/custom_d8.jar
|
||||
third_party/r8/custom_r8.jar
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-0.3.7/tests/input-chunking-sensitivity-example1.zz
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-0.3.7/tests/input-chunking-sensitivity-example2.zz
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-0.3.7/tests/input-chunking-sensitivity-example3.zz
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-1.1.0/examples/hello_world.txt.gz
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-1.1.0/tests/corrupt-gz-file.bin
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-1.1.0/tests/good-file.gz
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-1.1.0/tests/multi.gz
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_dense_crash-9486fb7c8a93b12c12a62166b43d31640c0208a9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_dense_minimized-from-9486fb7c8a93b12c12a62166b43d31640c0208a9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_sparse_crash-0da59c0434eaf35e5a6b470fa9244bb79c72b000
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_sparse_crash-18cfc246f2ddfc3dfc92b0c7893178c7cf65efa9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_sparse_crash-61fd8e3003bf9d99f6c1e5a8488727eefd234b98
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_sparse_crash-a1b839d899ced76d5d7d0f78f9edb7a421505838
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_sparse_crash-c383ae07ec5e191422eadc492117439011816570
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_sparse_crash-d07703ceb94b10dcd9e4acb809f2051420449e2b
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/fuzz/testdata/deserialize_sparse_crash-dbb8172d3984e7e7d03f4b5f8bb86ecd1460eff9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/dense/multi_pattern_v2_fwd.bigendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/dense/multi_pattern_v2_fwd.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/dense/multi_pattern_v2_rev.bigendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/dense/multi_pattern_v2_rev.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/sparse/multi_pattern_v2_fwd.bigendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/sparse/multi_pattern_v2_fwd.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/sparse/multi_pattern_v2_rev.bigendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/sparse/multi_pattern_v2_rev.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.18/tests/fst/xid_continue.fst
|
||||
third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.18/tests/fst/xid_start.fst
|
||||
third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-v0_3/tests/input-chunking-sensitivity-example1.zz
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-v0_3/tests/input-chunking-sensitivity-example2.zz
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-v0_3/tests/input-chunking-sensitivity-example3.zz
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-v1/examples/hello_world.txt.gz
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-v1/tests/corrupt-gz-file.bin
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-v1/tests/good-file.gz
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-v1/tests/multi.gz
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_dense_crash-9486fb7c8a93b12c12a62166b43d31640c0208a9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_dense_minimized-from-9486fb7c8a93b12c12a62166b43d31640c0208a9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_sparse_crash-0da59c0434eaf35e5a6b470fa9244bb79c72b000
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_sparse_crash-18cfc246f2ddfc3dfc92b0c7893178c7cf65efa9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_sparse_crash-61fd8e3003bf9d99f6c1e5a8488727eefd234b98
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_sparse_crash-a1b839d899ced76d5d7d0f78f9edb7a421505838
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_sparse_crash-c383ae07ec5e191422eadc492117439011816570
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_sparse_crash-d07703ceb94b10dcd9e4acb809f2051420449e2b
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_sparse_crash-dbb8172d3984e7e7d03f4b5f8bb86ecd1460eff9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/dense/multi_pattern_v2_fwd.bigendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/dense/multi_pattern_v2_fwd.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/dense/multi_pattern_v2_rev.bigendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/dense/multi_pattern_v2_rev.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/sparse/multi_pattern_v2_fwd.bigendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/sparse/multi_pattern_v2_fwd.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/sparse/multi_pattern_v2_rev.bigendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/sparse/multi_pattern_v2_rev.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/unicode-ident-v1/tests/fst/xid_continue.fst
|
||||
third_party/rust/chromium_crates_io/vendor/unicode-ident-v1/tests/fst/xid_start.fst
|
||||
third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/lib/windows.0.52.0.lib
|
||||
third_party/skia/demos.skia.org/demos/mesh2d/canvaskit.wasm
|
||||
third_party/skia/modules/canvaskit/tests/assets/Roboto-Regular.otf
|
||||
third_party/skia/modules/canvaskit/tests/assets/red_line.skp
|
||||
@@ -11809,9 +11888,6 @@ third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/
|
||||
third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/data/toys_192_192_3.jpeg
|
||||
third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/models/blazeface_mlkit_v1.tfl
|
||||
third_party/tflite/src/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes
|
||||
third_party/tflite/src/tensorflow/lite/experimental/litert/test/testdata/simple_model_google_tensor.bin
|
||||
third_party/tflite/src/tensorflow/lite/experimental/litert/test/testdata/simple_model_mtk.bin
|
||||
third_party/tflite/src/tensorflow/lite/experimental/litert/test/testdata/simple_model_qualcomm.bin
|
||||
third_party/tflite/src/tensorflow/lite/ios/testdata/extended_filename/input.a
|
||||
third_party/tflite/src/tensorflow/lite/java/demo/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/tflite/src/tensorflow/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
@@ -1 +1 @@
|
||||
10
|
||||
1
|
||||
|
||||
@@ -66,17 +66,17 @@
|
||||
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*
|
||||
@@ -3977,6 +3987,7 @@ def CMDsync(parser, args):
|
||||
dest='experiments',
|
||||
@@ -3983,6 +3993,7 @@ def CMDsync(parser, args):
|
||||
default=[],
|
||||
help='Which experiments should be enabled.')
|
||||
help='Specify to skip processing of a certain type of '
|
||||
'dep.')
|
||||
+ parser.add_option('--sysroot')
|
||||
(options, args) = parser.parse_args(args)
|
||||
client = GClient.LoadCurrentConfig(options)
|
||||
|
||||
--- a/gclient_scm.py
|
||||
+++ b/gclient_scm.py
|
||||
@@ -971,8 +971,7 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -979,8 +979,7 @@ class GitWrapper(SCMWrapper):
|
||||
self._SetFetchConfig(options)
|
||||
|
||||
# Fetch upstream if we don't already have |revision|.
|
||||
@@ -86,7 +86,7 @@
|
||||
self._Fetch(options, prune=options.force)
|
||||
|
||||
if not scm.GIT.IsValidRevision(
|
||||
@@ -988,7 +987,7 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -996,7 +995,7 @@ class GitWrapper(SCMWrapper):
|
||||
|
||||
# This is a big hammer, debatable if it should even be here...
|
||||
if options.force or options.reset:
|
||||
@@ -95,7 +95,7 @@
|
||||
if options.upstream and upstream_branch:
|
||||
target = upstream_branch
|
||||
self._Scrub(target, options)
|
||||
@@ -1003,7 +1002,6 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -1011,7 +1010,6 @@ class GitWrapper(SCMWrapper):
|
||||
# to the checkout step.
|
||||
if not (options.force or options.reset):
|
||||
self._CheckClean(revision)
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
if not current_revision:
|
||||
current_revision = self._Capture(
|
||||
@@ -1691,8 +1689,7 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -1702,8 +1700,7 @@ class GitWrapper(SCMWrapper):
|
||||
fetch_cmd.append('--no-tags')
|
||||
elif quiet:
|
||||
fetch_cmd.append('--quiet')
|
||||
|
||||
Reference in New Issue
Block a user