Update to Chromium 119.0.6045.105

This commit is contained in:
Blaise
2023-10-24 17:09:01 -05:00
parent 2f0227eff3
commit 13fc15e4ec
59 changed files with 931 additions and 1017 deletions

View File

@@ -1 +1 @@
118.0.5993.117
119.0.6045.105

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2303,7 +2303,6 @@ static_library("browser") {
@@ -2359,7 +2359,6 @@ static_library("browser") {
"//components/reporting/util:task_runner_context",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -8,7 +8,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3703,8 +3702,6 @@ static_library("browser") {
@@ -3776,8 +3775,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -42,15 +42,15 @@
virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -73,7 +73,6 @@
#include "chrome/browser/printing/print_preview_dialog_controller.h"
@@ -72,7 +72,6 @@
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -435,8 +434,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -437,8 +436,6 @@ void BrowserProcessImpl::StartTearDown()
#endif
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1078,14 +1075,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1080,14 +1077,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -74,7 +74,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1319,26 +1308,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1321,26 +1310,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -144,7 +144,7 @@
browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1072,34 +1072,6 @@ void SetApplicationLocaleOnIOThread(cons
@@ -1070,34 +1070,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}
@@ -179,7 +179,7 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
AppLoadedInTabSource ClassifyAppLoadedInTabSource(
@@ -5141,14 +5113,9 @@ ChromeContentBrowserClient::CreateThrott
@@ -5168,14 +5140,9 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
handle, handle->GetWebContents()->GetBrowserContext()));
@@ -195,7 +195,7 @@
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
base::BindOnce(
&ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
@@ -5194,16 +5161,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5221,16 +5188,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -212,7 +212,7 @@
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
throttles.push_back(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
@@ -5476,8 +5433,6 @@ void ChromeContentBrowserClient::Overrid
@@ -5504,8 +5461,6 @@ void ChromeContentBrowserClient::Overrid
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -223,7 +223,7 @@
base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -39,20 +39,6 @@ const uint8_t kFileTypePoliciesPublicKey
@@ -38,20 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey
const char kFileTypePoliciesManifestName[] = "File Type Policies";
void LoadFileTypesFromDisk(const base::FilePath& pb_path) {
@@ -298,7 +298,7 @@
is_being_revived_(false) {}
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -543,13 +543,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -530,13 +530,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -315,7 +315,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -729,9 +729,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -716,9 +716,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -327,7 +327,7 @@
return !download_->IsSavePackageDownload() &&
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -264,14 +264,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
@@ -263,14 +263,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
@@ -343,7 +343,7 @@
}
}
@@ -462,10 +455,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -460,10 +453,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -412,7 +412,7 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1363,9 +1362,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1364,9 +1363,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@@ -422,7 +422,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
absl::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1403,42 +1399,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1404,42 +1400,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -548,7 +548,7 @@
referrer_entries)));
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -722,18 +722,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -717,18 +717,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -567,7 +567,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1265,56 +1253,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1236,56 +1224,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -695,18 +695,6 @@
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
@@ -128,9 +128,6 @@ void TrialComparisonCertVerifierControll
std::string serialized_report;
if (!report.Serialize(&serialized_report))
return;
-
- CertificateReportingServiceFactory::GetForBrowserContext(profile_)->Send(
- serialized_report);
}
// static
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -92,7 +92,6 @@
@@ -757,15 +745,15 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -96,6 +97,7 @@ static_library("safe_browsing") {
"//extensions/browser",
]
}
@@ -68,6 +69,7 @@ static_library("safe_browsing") {
"//mojo/public/cpp/system",
"//services/preferences/public/cpp",
]
+ }
if (safe_browsing_mode != 0) {
# "Safe Browsing Basic" files used for safe browsing in full mode
@@ -521,6 +523,7 @@ static_library("advanced_protection") {
@@ -494,6 +496,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -773,7 +761,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -540,6 +543,7 @@ source_set("metrics_collector") {
@@ -513,6 +516,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -878,7 +866,7 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4876,7 +4876,6 @@ static_library("ui") {
@@ -4952,7 +4952,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h",
@@ -888,7 +876,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -446,22 +446,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -454,22 +454,6 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -921,7 +909,7 @@
#include "chrome/browser/download/download_history.h"
#include "chrome/browser/download/download_item_model.h"
#include "chrome/browser/download/download_item_warning_data.h"
@@ -195,13 +194,6 @@ void DownloadsDOMHandler::SaveDangerousR
@@ -198,13 +197,6 @@ void DownloadsDOMHandler::SaveDangerousR
}
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
@@ -935,7 +923,7 @@
}
void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
@@ -379,12 +371,6 @@ void DownloadsDOMHandler::RemoveDownload
@@ -400,12 +392,6 @@ void DownloadsDOMHandler::RemoveDownload
IdSet ids;
for (auto* download : to_remove) {
@@ -948,7 +936,7 @@
DownloadItemModel item_model(download);
if (!item_model.ShouldShowInShelf() ||
download->GetState() == download::DownloadItem::IN_PROGRESS) {
@@ -512,44 +498,6 @@ void DownloadsDOMHandler::FinalizeRemova
@@ -533,44 +519,6 @@ void DownloadsDOMHandler::FinalizeRemova
}
}

View File

@@ -189,7 +189,7 @@ by default.
bool g_upgrade_bubble_is_showing = false;
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -73,17 +73,17 @@ namespace {
@@ -75,17 +75,17 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -211,28 +211,6 @@ by default.
#endif
std::string ReplaceTemplateExpressions(
--- a/chrome/chrome_cleaner/components/recovery_component.cc
+++ b/chrome/chrome_cleaner/components/recovery_component.cc
@@ -37,7 +37,7 @@ namespace chrome_cleaner {
namespace {
const char kComponentDownloadUrl[] =
- "https://clients2.google.com/service/update2/crx?response=redirect&os=win"
+ "trk:108:https://clients2.google.com/service/update2/crx?response=redirect&os=win"
"&installsource=swreporter&x=id%3Dnpdjjkjlcidkjlamlmmdelcjbcpdjocm"
"%26v%3D0.0.0.0%26uc&acceptformat=crx3";
--- a/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc
+++ b/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc
@@ -28,7 +28,7 @@
namespace {
// The URL where crash reports are uploaded.
-const char kReportUploadURL[] = "https://clients2.google.com/cr/report";
+const char kReportUploadURL[] = "trk:302:https://clients2.google.com/cr/report";
// Whether the current process is connected to a crash handler process.
bool g_is_connected_to_crash_handler = false;
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -45,9 +45,9 @@ namespace {
@@ -438,7 +416,7 @@ by default.
GURL url(base::WideToUTF16(args[0]));
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -26,10 +26,10 @@ bool IsSourceFromAnExtension(const std::
@@ -27,10 +27,10 @@ bool IsSourceFromAnExtension(const std::
namespace extension_urls {

View File

@@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -811,6 +811,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -817,6 +817,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterWebSafeScheme(url::kWssScheme);
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kDataScheme);
@@ -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
@@ -1042,6 +1042,8 @@ component("net") {
@@ -1040,6 +1040,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2598,7 +2598,8 @@ void ChromeContentBrowserClient::AppendE
@@ -2596,7 +2596,8 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -29,7 +29,7 @@
const base::FilePath& exe_path,
--- a/components/gwp_asan/client/gwp_asan.cc
+++ b/components/gwp_asan/client/gwp_asan.cc
@@ -164,6 +164,11 @@ size_t AllocationSamplingFrequency(const
@@ -173,6 +173,11 @@ size_t AllocationSamplingFrequency(const
// Exported for testing.
GWP_ASAN_EXPORT absl::optional<AllocatorSettings> GetAllocatorSettings(

View File

@@ -3,7 +3,7 @@
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -271,61 +271,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -259,61 +259,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
network::mojom::CredentialsMode credentials_mode,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";

View File

@@ -455,7 +455,7 @@
--- a/components/page_load_metrics/browser/page_load_metrics_util.cc
+++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
@@ -282,9 +282,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
@@ -281,9 +281,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
}
bool IsGoogleSearchHostname(const GURL& url) {

View File

@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -1252,7 +1251,6 @@ if (is_win) {
@@ -1248,7 +1247,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_library",
":widevine_cdm_library",

View File

@@ -1,3 +1,14 @@
--- a/components/attribution_reporting/features.cc
+++ b/components/attribution_reporting/features.cc
@@ -11,7 +11,7 @@ namespace attribution_reporting::feature
// Controls whether the Conversion Measurement API infrastructure is enabled.
BASE_FEATURE(kConversionMeasurement,
"ConversionMeasurement",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kAttributionReportingNullAggregatableReports,
"AttributionReportingNullAggregatableReports",
--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -12,7 +12,7 @@ namespace privacy_sandbox {
@@ -11,7 +22,7 @@
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1ConsentDecisionMade,
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -102,7 +102,7 @@ base::Value::Dict CreateBlockedTopicEntr
@@ -120,7 +120,7 @@ std::set<browsing_topics::Topic> GetTopi
// static
bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -20,7 +31,7 @@
}
// static
@@ -672,20 +672,7 @@ bool PrivacySandboxSettingsImpl::IsPriva
@@ -728,20 +728,7 @@ bool PrivacySandboxSettingsImpl::IsPriva
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabled() const {
@@ -42,7 +53,7 @@
}
void PrivacySandboxSettingsImpl::SetAllPrivacySandboxAllowedForTesting() {
@@ -710,11 +697,10 @@ void PrivacySandboxSettingsImpl::SetTopi
@@ -766,11 +753,10 @@ void PrivacySandboxSettingsImpl::SetTopi
}
void PrivacySandboxSettingsImpl::SetPrivacySandboxEnabled(bool enabled) {
@@ -55,7 +66,7 @@
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
@@ -802,11 +788,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
@@ -857,11 +843,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
return Status::kIncognitoProfile;
}
@@ -69,8 +80,8 @@
PrivacySandboxSettingsImpl::Status
--- a/content/browser/aggregation_service/aggregation_service_features.cc
+++ b/content/browser/aggregation_service/aggregation_service_features.cc
@@ -9,7 +9,7 @@ namespace content {
// Enables the Aggregation Service. See crbug.com/1207974.
@@ -8,7 +8,7 @@ namespace content {
BASE_FEATURE(kPrivacySandboxAggregationService,
"PrivacySandboxAggregationService",
- base::FEATURE_ENABLED_BY_DEFAULT);
@@ -78,14 +89,3 @@
const base::FeatureParam<std::string>
kPrivacySandboxAggregationServiceTrustedServerUrlAwsParam{
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -542,7 +542,7 @@ BASE_FEATURE(kContentCaptureConstantStre
// Controls whether the Conversion Measurement API infrastructure is enabled.
BASE_FEATURE(kConversionMeasurement,
"ConversionMeasurement",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kCorrectFloatExtensionTestForWebGL,
"CorrectFloatExtensionTestForWebGL",

View File

@@ -1,6 +1,6 @@
--- a/android_webview/browser/BUILD.gn
+++ b/android_webview/browser/BUILD.gn
@@ -233,7 +233,6 @@ source_set("browser") {
@@ -235,7 +235,6 @@ source_set("browser") {
"//components/embedder_support:embedder_support",
"//components/embedder_support/android:util",
"//components/embedder_support/origin_trials",
@@ -10,7 +10,7 @@
"//components/keyed_service/content",
--- a/chrome/android/chrome_test_java_sources.gni
+++ b/chrome/android/chrome_test_java_sources.gni
@@ -194,7 +194,6 @@ chrome_test_java_sources = [
@@ -195,7 +195,6 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/download/OMADownloadHandlerTest.java",
"javatests/src/org/chromium/chrome/browser/download/ServicificationDownloadTest.java",
"javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadDialogIncognitoTest.java",
@@ -20,7 +20,7 @@
"javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTest.java",
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3435,7 +3435,6 @@ static_library("browser") {
@@ -3511,7 +3511,6 @@ static_library("browser") {
"//components/embedder_support/android:util",
"//components/embedder_support/android:web_contents_delegate",
"//components/endpoint_fetcher:endpoint_fetcher",
@@ -30,7 +30,7 @@
"//components/favicon/core:database",
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -533,7 +533,6 @@ test("components_unittests") {
@@ -597,7 +597,6 @@ test("components_unittests") {
"//components/embedder_support/android:native_java_unittests_java",
"//components/embedder_support/android/metrics:test_support_java",
"//components/embedder_support/android/metrics:unit_tests",
@@ -68,7 +68,7 @@
void AndroidEnvironmentIntegrityService::OnGetHandle(
--- a/content/browser/browser_interface_binders.cc
+++ b/content/browser/browser_interface_binders.cc
@@ -128,7 +128,6 @@
@@ -130,7 +130,6 @@
#include "third_party/blink/public/mojom/cookie_store/cookie_store.mojom.h"
#include "third_party/blink/public/mojom/credentialmanagement/credential_manager.mojom.h"
#include "third_party/blink/public/mojom/device/device.mojom.h"
@@ -76,7 +76,7 @@
#include "third_party/blink/public/mojom/feature_observer/feature_observer.mojom.h"
#include "third_party/blink/public/mojom/file/file_utilities.mojom.h"
#include "third_party/blink/public/mojom/file_system_access/file_system_access_manager.mojom.h"
@@ -1147,10 +1146,6 @@ void PopulateBinderMapWithContext(
@@ -1140,10 +1139,6 @@ void PopulateBinderMapWithContext(
map->Add<blink::mojom::BrowsingTopicsDocumentService>(
base::BindRepeating(&BrowsingTopicsDocumentHost::CreateMojoService));
}
@@ -85,7 +85,7 @@
- &EmptyBinderForFrame<blink::mojom::EnvironmentIntegrityService>));
- }
if (base::FeatureList::IsEnabled(
net::features::kCookieDeprecationFacilitatedTestingLabels)) {
features::kCookieDeprecationFacilitatedTesting)) {
map->Add<blink::mojom::CookieDeprecationLabelDocumentService>(
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -99,7 +99,7 @@
"fenced_frame/fenced_frame_config.mojom",
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -1923,8 +1923,6 @@ generated_interface_sources_in_modules =
@@ -1921,8 +1921,6 @@ generated_interface_sources_in_modules =
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_entry.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_entry_sync.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_entry_sync.h",
@@ -107,10 +107,10 @@
- "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_environment_integrity.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_event_source.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_event_source.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ext_blend_min_max.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ext_blend_func_extended.cc",
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -243,8 +243,6 @@ static_idl_files_in_modules = [
@@ -244,8 +244,6 @@ static_idl_files_in_modules = [
"//third_party/blink/renderer/modules/encryptedmedia/media_keys_get_status_for_policy.idl",
"//third_party/blink/renderer/modules/encryptedmedia/media_keys_policy.idl",
"//third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.idl",
@@ -121,7 +121,7 @@
"//third_party/blink/renderer/modules/eyedropper/color_selection_options.idl",
--- a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
+++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
@@ -548,10 +548,6 @@ bool OriginTrialContext::CanEnableTrialF
@@ -550,10 +550,6 @@ bool OriginTrialContext::CanEnableTrialF
return base::FeatureList::IsEnabled(features::kComputePressure);
}
@@ -144,7 +144,7 @@
"//third_party/blink/renderer/modules/eyedropper",
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -4112,17 +4112,6 @@
@@ -4180,17 +4180,6 @@
base_feature: "none",
},
{

View File

@@ -117,7 +117,7 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -102,7 +102,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -99,7 +99,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
registry->RegisterBooleanPref(prefs::kWebRTCAllowLegacyTLSProtocols, false);

View File

@@ -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
@@ -663,12 +663,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -654,12 +654,6 @@ std::vector<url::Origin> ChromeContentBr
GetOriginsRequiringDedicatedProcess() {
std::vector<url::Origin> list;

View File

@@ -1,6 +1,6 @@
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -358,12 +358,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
@@ -370,12 +370,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
// Enable DNS over HTTPS (DoH).
BASE_FEATURE(kDnsOverHttps,
"DnsOverHttps",
@@ -15,14 +15,13 @@
// Set whether fallback to insecure DNS is allowed by default. This setting may
--- a/net/dns/public/doh_provider_entry.cc
+++ b/net/dns/public/doh_provider_entry.cc
@@ -174,32 +174,6 @@ const DohProviderEntry::List& DohProvide
@@ -165,30 +165,6 @@ const DohProviderEntry::List& DohProvide
/*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
LoggingLevel::kNormal),
new DohProviderEntry(
- "Google",
- MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(
- DohProviderGoogle, base::FEATURE_ENABLED_BY_DEFAULT),
- DohProviderIdForHistogram::kGoogle,
- {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888",
- "2001:4860:4860::8844"},
- /*dns_over_tls_hostnames=*/
@@ -37,7 +36,6 @@
- "GoogleDns64",
- MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(
- DohProviderGoogleDns64, base::FEATURE_ENABLED_BY_DEFAULT),
- /*provider_id_for_histogram=*/absl::nullopt,
- {"2001:4860:4860::64", "2001:4860:4860::6464"},
- /*dns_over_tls_hostnames=*/{"dns64.dns.google"},
- "https://dns64.dns.google/dns-query{?dns}",
@@ -50,7 +48,7 @@
DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT),
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -95,12 +95,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
@@ -96,12 +96,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
// Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
BASE_FEATURE(kDnsOverHttpsUpgrade,
"DnsOverHttpsUpgrade",

View File

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -948,8 +948,6 @@ if (is_win) {
@@ -944,8 +944,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -14,7 +14,7 @@
# from disk image and Keystone promotion (if so enabled). It
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -867,14 +867,6 @@ static_library("browser") {
@@ -868,14 +868,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",
@@ -37,8 +37,8 @@
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service.h"
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
#include "chrome/browser/prefetch/prefetch_prefs.h"
#include "chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_manager_factory.h"
#include "chrome/browser/preloading/preloading_prefs.h"
#include "chrome/browser/profiles/profile.h"
@@ -88,11 +86,6 @@ base::TimeDelta MLModelExecutionTimerSta
return base::Milliseconds(timer_start_delay);
@@ -128,7 +128,7 @@
void NavigationPredictor::SetModelScoreCallbackForTesting(
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -89,7 +89,6 @@
@@ -91,7 +91,6 @@
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/metrics/variations/google_groups_updater_service_factory.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -136,7 +136,7 @@
#include "chrome/browser/net/dns_probe_service_factory.h"
#include "chrome/browser/net/profile_network_context_service_factory.h"
#include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h"
@@ -823,7 +822,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -850,7 +849,6 @@ void ChromeBrowserMainExtraPartsProfiles
#endif
ModelTypeStoreServiceFactory::GetInstance();
NavigationPredictorKeyedServiceFactory::GetInstance();
@@ -187,7 +187,7 @@
python_library("fixtures") {
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -308,8 +308,6 @@ source_set("unit_tests") {
@@ -312,8 +312,6 @@ source_set("unit_tests") {
"//third_party/puffin:libpuffpatch",
"//third_party/re2",
]
@@ -198,7 +198,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -736,10 +736,6 @@ if (is_apple) {
@@ -737,10 +737,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -628,8 +628,6 @@ static_library("browser") {
@@ -629,8 +629,6 @@ static_library("browser") {
"internal_auth.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -11,7 +11,7 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"ip_protection/ip_protection_config_http.cc",
@@ -3721,9 +3719,6 @@ static_library("browser") {
@@ -3792,9 +3790,6 @@ static_library("browser") {
"enterprise/connectors/analysis/analysis_service_settings.h",
"enterprise/connectors/analysis/analysis_settings.cc",
"enterprise/connectors/analysis/analysis_settings.h",
@@ -21,7 +21,7 @@
"enterprise/connectors/analysis/content_analysis_dialog.cc",
"enterprise/connectors/analysis/content_analysis_dialog.h",
"enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
@@ -4032,10 +4027,6 @@ static_library("browser") {
@@ -4108,10 +4103,6 @@ static_library("browser") {
"new_tab_page/modules/recipes/recipes_service_factory.h",
"new_tab_page/modules/recipes/time_format_util.cc",
"new_tab_page/modules/recipes/time_format_util.h",
@@ -32,7 +32,7 @@
"new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.cc",
"new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.h",
"new_tab_page/new_tab_page_util.cc",
@@ -4515,7 +4506,6 @@ static_library("browser") {
@@ -4591,7 +4582,6 @@ static_library("browser") {
"//chrome/browser/new_tab_page/modules/history_clusters/discount:mojo_bindings",
"//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
"//chrome/browser/new_tab_page/modules/recipes:mojo_bindings",
@@ -40,7 +40,7 @@
"//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings",
"//chrome/browser/policy:path_parser",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
@@ -6277,10 +6267,6 @@ static_library("browser") {
@@ -6367,10 +6357,6 @@ static_library("browser") {
sources += [
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
@@ -51,7 +51,7 @@
"enterprise/connectors/device_trust/attestation/browser/attestation_switches.cc",
"enterprise/connectors/device_trust/attestation/browser/attestation_switches.h",
"enterprise/connectors/device_trust/attestation/browser/attester.h",
@@ -7814,9 +7800,14 @@ static_library("browser") {
@@ -7901,9 +7887,14 @@ static_library("browser") {
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
"//components/safe_browsing/content/browser/download:download_stats",
"//components/safe_browsing/content/common:file_type_policies",
@@ -69,7 +69,7 @@
sources += [
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5162,11 +5162,13 @@ ChromeContentBrowserClient::CreateThrott
@@ -5189,11 +5189,13 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -83,7 +83,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -6909,26 +6911,7 @@ ChromeContentBrowserClient::GetSafeBrows
@@ -6979,26 +6981,7 @@ ChromeContentBrowserClient::GetSafeBrows
? content::BrowserThread::UI
: content::BrowserThread::IO);
@@ -111,7 +111,7 @@
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -6949,11 +6932,6 @@ ChromeContentBrowserClient::GetUrlLookup
@@ -7019,11 +7002,6 @@ ChromeContentBrowserClient::GetUrlLookup
GetForProfile(profile);
}
#endif
@@ -133,7 +133,28 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -263,8 +262,6 @@ void DownloadBubbleUIController::Process
@@ -44,7 +43,6 @@
#include "components/feature_engagement/public/tracker.h"
#include "components/offline_items_collection/core/offline_content_aggregator.h"
#include "components/safe_browsing/core/common/features.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "content/public/browser/download_item_utils.h"
#include "content/public/browser/download_manager.h"
@@ -268,21 +266,11 @@ void DownloadBubbleUIController::Process
switch (command) {
case DownloadCommands::KEEP:
case DownloadCommands::DISCARD:
- if (safe_browsing::IsSafeBrowsingSurveysEnabled(*profile_->GetPrefs())) {
- TrustSafetySentimentService* trust_safety_sentiment_service =
- TrustSafetySentimentServiceFactory::GetForProfile(profile_);
- if (trust_safety_sentiment_service) {
- trust_safety_sentiment_service->InteractedWithDownloadWarningUI(
- warning_surface, warning_action);
- }
- }
DownloadItemWarningData::AddWarningActionEvent(
model->GetDownloadItem(), warning_surface, warning_action);
commands.ExecuteCommand(command);
break;
case DownloadCommands::REVIEW:
@@ -264,7 +285,7 @@
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -926,80 +926,10 @@ void DownloadItemModel::ExecuteCommand(D
@@ -918,80 +918,10 @@ void DownloadItemModel::ExecuteCommand(D
DownloadItemModel::BubbleUIInfo
DownloadItemModel::GetBubbleUIInfoForTailoredWarning() const {
@@ -424,7 +445,7 @@
std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel()
--- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
+++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
@@ -170,52 +170,12 @@ void FilesRequestHandler::FileRequestCal
@@ -171,52 +171,12 @@ void FilesRequestHandler::FileRequestCal
}
bool FilesRequestHandler::UploadDataImpl() {
@@ -477,7 +498,7 @@
void FilesRequestHandler::OnGotFileInfo(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
size_t index,
@@ -258,14 +218,6 @@ void FilesRequestHandler::OnGotFileInfo(
@@ -259,14 +219,6 @@ void FilesRequestHandler::OnGotFileInfo(
void FilesRequestHandler::FinishRequestEarly(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
safe_browsing::BinaryUploadService::Result result) {
@@ -507,7 +528,7 @@
void OnGotFileInfo(
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
@@ -439,19 +439,6 @@ absl::optional<std::string> ConnectorsSe
@@ -443,19 +443,6 @@ absl::optional<std::string> ConnectorsSe
return absl::nullopt;
}
@@ -529,7 +550,7 @@
}
--- a/chrome/browser/enterprise/connectors/connectors_service.h
+++ b/chrome/browser/enterprise/connectors/connectors_service.h
@@ -88,12 +88,6 @@ class ConnectorsService : public KeyedSe
@@ -91,12 +91,6 @@ class ConnectorsService : public KeyedSe
// is no token to use.
absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
@@ -589,7 +610,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
@@ -509,8 +509,7 @@ void RealtimeReportingClient::ReportEven
@@ -496,8 +496,7 @@ void RealtimeReportingClient::ReportEven
}
std::string RealtimeReportingClient::GetProfileUserName() const {
@@ -620,7 +641,7 @@
const base::Value::List* enabled_opt_in_events_value =
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
@@ -214,7 +214,6 @@ void ContextInfoFetcher::Fetch(ContextIn
@@ -221,7 +221,6 @@ void ContextInfoFetcher::Fetch(ContextIn
GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
info.on_print_providers =
GetAnalysisConnectorProviders(enterprise_connectors::PRINT);
@@ -628,7 +649,7 @@
info.on_security_event_providers = GetOnSecurityEventProviders();
info.browser_version = version_info::GetVersionNumber();
info.site_isolation_enabled =
@@ -271,11 +270,6 @@ std::vector<std::string> ContextInfoFetc
@@ -278,11 +277,6 @@ std::vector<std::string> ContextInfoFetc
return connectors_service_->GetAnalysisServiceProviderNames(connector);
}
@@ -737,7 +758,7 @@
"api/safe_browsing_private/safe_browsing_util.cc",
"api/safe_browsing_private/safe_browsing_util.h",
"api/search/search_api.cc",
@@ -646,8 +642,6 @@ static_library("extensions") {
@@ -647,8 +643,6 @@ static_library("extensions") {
"menu_manager_factory.h",
"navigation_observer.cc",
"navigation_observer.h",
@@ -748,7 +769,7 @@
"pending_extension_info.cc",
--- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -103,7 +103,6 @@ void EnsureApiBrowserContextKeyedService
@@ -110,7 +110,6 @@ void EnsureApiBrowserContextKeyedService
extensions::PreferenceAPI::GetFactoryInstance();
extensions::ProcessesAPI::GetFactoryInstance();
extensions::ReadingListEventRouter::GetFactoryInstance();
@@ -758,7 +779,7 @@
extensions::SettingsOverridesAPI::GetFactoryInstance();
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -285,21 +285,6 @@ void CookiesGetFunction::GetCookieListCa
@@ -303,19 +303,6 @@ void CookiesGetFunction::GetCookieListCa
}
void CookiesGetFunction::NotifyExtensionTelemetry() {
@@ -766,9 +787,7 @@
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
- Profile::FromBrowserContext(browser_context()));
-
- if (!telemetry_service || !telemetry_service->enabled() ||
- !base::FeatureList::IsEnabled(
- safe_browsing::kExtensionTelemetryCookiesGetSignal)) {
- if (!telemetry_service || !telemetry_service->enabled()) {
- return;
- }
-
@@ -780,7 +799,7 @@
}
CookiesGetAllFunction::CookiesGetAllFunction() {
@@ -377,26 +362,6 @@ void CookiesGetAllFunction::GetCookieLis
@@ -408,24 +395,6 @@ void CookiesGetAllFunction::GetCookieLis
}
void CookiesGetAllFunction::NotifyExtensionTelemetry() {
@@ -788,9 +807,7 @@
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
- Profile::FromBrowserContext(browser_context()));
-
- if (!telemetry_service || !telemetry_service->enabled() ||
- !base::FeatureList::IsEnabled(
- safe_browsing::kExtensionTelemetryCookiesGetAllSignal)) {
- if (!telemetry_service || !telemetry_service->enabled()) {
- return;
- }
-
@@ -829,7 +846,7 @@
info.enterprise_profile_id = signals.enterprise_profile_id;
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -445,23 +445,6 @@ void NotifyExtensionTelemetry(Profile* p
@@ -446,23 +446,6 @@ void NotifyExtensionTelemetry(Profile* p
safe_browsing::TabsApiInfo::ApiMethod api_method,
const std::string& current_url,
const std::string& new_url) {
@@ -879,7 +896,7 @@
void Blocklist::GetMalwareIDs(const std::set<std::string>& ids,
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -731,83 +731,23 @@ void ChromeExtensionsBrowserClient::Noti
@@ -731,81 +731,23 @@ void ChromeExtensionsBrowserClient::Noti
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::string& code) const {
@@ -913,9 +930,7 @@
- auto* telemetry_service =
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
- Profile::FromBrowserContext(context));
- if (!telemetry_service || !telemetry_service->enabled() ||
- !base::FeatureList::IsEnabled(
- safe_browsing::kExtensionTelemetryDeclarativeNetRequestSignal)) {
- if (!telemetry_service || !telemetry_service->enabled()) {
- return;
- }
-
@@ -964,7 +979,7 @@
}
// static
@@ -977,7 +917,6 @@ void ChromeExtensionsBrowserClient::GetW
@@ -975,7 +917,6 @@ void ChromeExtensionsBrowserClient::GetW
void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager(
content::WebContents* web_contents) const {
@@ -1232,15 +1247,15 @@
}
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -33,7 +33,6 @@
#include "chrome/browser/download/download_prefs.h"
@@ -34,7 +34,6 @@
#include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
#include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
#include "chrome/browser/ui/file_system_access_dialogs.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pdf_util.h"
@@ -401,86 +400,6 @@ bool ShouldBlockAccessToPath(const base:
@@ -411,86 +410,6 @@ bool ShouldBlockAccessToPath(const base:
return true;
}
@@ -1327,7 +1342,7 @@
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
return id.empty() ? kDefaultLastPickedDirectoryKey
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
@@ -500,13 +419,7 @@ std::string_view GetGrantKeyFromGrantTyp
@@ -510,13 +429,7 @@ std::string_view GetGrantKeyFromGrantTyp
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -1342,7 +1357,7 @@
}
} // namespace
@@ -1413,29 +1326,6 @@ void ChromeFileSystemAccessPermissionCon
@@ -1494,29 +1407,6 @@ void ChromeFileSystemAccessPermissionCon
std::move(callback));
}
@@ -1374,7 +1389,7 @@
const base::FilePath& path,
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
@@ -93,10 +93,6 @@ class ChromeFileSystemAccessPermissionCo
@@ -138,10 +138,6 @@ class ChromeFileSystemAccessPermissionCo
UserAction user_action,
content::GlobalRenderFrameHostId frame_id,
base::OnceCallback<void(SensitiveEntryResult)> callback) override;
@@ -1429,15 +1444,15 @@
NotificationHandler::Type::EXTENSION,
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -32,7 +32,6 @@
#include "chrome/browser/password_manager/password_reuse_manager_factory.h"
@@ -34,7 +34,6 @@
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/sync_service_factory.h"
@@ -858,6 +857,7 @@ autofill::LanguageCode ChromePasswordMan
@@ -863,6 +862,7 @@ autofill::LanguageCode ChromePasswordMan
return autofill::LanguageCode();
}
@@ -1445,7 +1460,7 @@
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
return safe_browsing::ChromePasswordProtectionService::
@@ -877,6 +877,7 @@ void ChromePasswordManagerClient::CheckS
@@ -882,6 +882,7 @@ void ChromePasswordManagerClient::CheckS
}
}
#endif // defined(ON_FOCUS_PING_ENABLED)
@@ -1453,7 +1468,7 @@
#if !BUILDFLAG(IS_ANDROID)
void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
@@ -884,28 +885,10 @@ void ChromePasswordManagerClient::MaybeR
@@ -889,28 +890,10 @@ void ChromePasswordManagerClient::MaybeR
bool is_federated,
const url::Origin& federated_origin,
const std::u16string& login_user_name) const {
@@ -1482,7 +1497,7 @@
}
#endif
@@ -1494,6 +1477,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1498,6 +1481,7 @@ bool ChromePasswordManagerClient::IsPass
is_enabled = false;
}
@@ -1490,7 +1505,7 @@
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Disable password
@@ -1504,6 +1488,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1508,6 +1492,7 @@ bool ChromePasswordManagerClient::IsPass
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -1500,7 +1515,7 @@
password_manager::BrowserSavePasswordProgressLogger logger(
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -230,6 +230,7 @@ class ChromePasswordManagerClient
@@ -229,6 +229,7 @@ class ChromePasswordManagerClient
void AnnotateNavigationEntry(bool has_password_field) override;
autofill::LanguageCode GetPageLanguage() const override;
@@ -1508,7 +1523,7 @@
safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
const override;
@@ -237,6 +238,7 @@ class ChromePasswordManagerClient
@@ -236,6 +237,7 @@ class ChromePasswordManagerClient
void CheckSafeBrowsingReputation(const GURL& form_action,
const GURL& frame_url) override;
#endif
@@ -1632,65 +1647,52 @@
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -334,63 +334,5 @@ bool PredictionBasedPermissionUiSelector
@@ -335,50 +335,5 @@ bool PredictionBasedPermissionUiSelector
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
permissions::RequestType request_type) {
- if (base::FeatureList::IsEnabled(
- permissions::features::kPermissionDedicatedCpssSetting)) {
- if (request_type == permissions::RequestType::kNotifications &&
- !profile_->GetPrefs()->GetBoolean(prefs::kEnableNotificationCPSS)) {
- return PredictionSource::USE_NONE;
- }
- if (request_type == permissions::RequestType::kGeolocation &&
- !profile_->GetPrefs()->GetBoolean(prefs::kEnableGeolocationCPSS)) {
- return PredictionSource::USE_NONE;
- }
- } else {
- if (!safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) {
- return PredictionSource::USE_NONE;
- }
- const bool is_msbb_enabled = profile_->GetPrefs()->GetBoolean(
- unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
-
- const bool is_notification_cpss_enabled =
- profile_->GetPrefs()->GetBoolean(prefs::kEnableNotificationCPSS) &&
- (base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) ||
- base::FeatureList::IsEnabled(
- permissions::features::kPermissionQuietChip));
-
- const bool is_geolocation_cpss_enabled =
- profile_->GetPrefs()->GetBoolean(prefs::kEnableGeolocationCPSS) &&
- base::FeatureList::IsEnabled(permissions::features::kPermissionQuietChip);
-
- if (request_type == permissions::RequestType::kNotifications &&
- !is_notification_cpss_enabled) {
- return PredictionSource::USE_NONE;
- }
-
- if (request_type == permissions::RequestType::kGeolocation &&
- !is_geolocation_cpss_enabled) {
- return PredictionSource::USE_NONE;
- }
- bool is_server_side_prediction_enabled = false;
- bool is_ondevice_prediction_enabled = false;
-
- bool is_tflite_available = false;
-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- is_tflite_available = true;
-#endif // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
-
- // Notification supports both flavours of the quiet prompt
- if (request_type == permissions::RequestType::kNotifications &&
- (base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) ||
- base::FeatureList::IsEnabled(
- permissions::features::kPermissionQuietChip))) {
- is_server_side_prediction_enabled =
- base::FeatureList::IsEnabled(features::kPermissionPredictions);
- bool is_on_device_enabled = false;
-
- is_ondevice_prediction_enabled =
- is_tflite_available &&
- base::FeatureList::IsEnabled(
- permissions::features::kPermissionOnDeviceNotificationPredictions);
- if (request_type == permissions::RequestType::kNotifications) {
- is_on_device_enabled = base::FeatureList::IsEnabled(
- permissions::features::kPermissionOnDeviceNotificationPredictions);
- } else if (request_type == permissions::RequestType::kGeolocation) {
- is_on_device_enabled = base::FeatureList::IsEnabled(
- permissions::features::kPermissionOnDeviceGeolocationPredictions);
- }
-
- // Geolocation supports only the quiet chip ui
- if (request_type == permissions::RequestType::kGeolocation &&
- base::FeatureList::IsEnabled(
- permissions::features::kPermissionQuietChip)) {
- is_server_side_prediction_enabled = base::FeatureList::IsEnabled(
- features::kPermissionGeolocationPredictions);
-
- is_ondevice_prediction_enabled =
- is_tflite_available &&
- base::FeatureList::IsEnabled(
- permissions::features::kPermissionOnDeviceGeolocationPredictions);
- }
-
- if (is_server_side_prediction_enabled && is_ondevice_prediction_enabled) {
- return PredictionSource::USE_ANY;
- } else if (is_server_side_prediction_enabled) {
- if (is_msbb_enabled && base::FeatureList::IsEnabled(
- permissions::features::kPermissionPredictionsV2)) {
- return PredictionSource::USE_SERVER_SIDE;
- } else if (is_ondevice_prediction_enabled) {
- } else if (is_tflite_available && is_on_device_enabled) {
- return PredictionSource::USE_ONDEVICE;
- } else {
return PredictionSource::USE_NONE;
@@ -1698,7 +1700,7 @@
}
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -96,6 +96,7 @@
@@ -100,6 +100,7 @@
#include "components/policy/policy_constants.h"
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
#include "components/proxy_config/proxy_policy_handler.h"
@@ -1706,7 +1708,7 @@
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -2080,8 +2081,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2095,8 +2096,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -1715,7 +1717,7 @@
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
handlers->AddHandler(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
@@ -2164,20 +2163,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2179,20 +2178,6 @@ std::unique_ptr<ConfigurationPolicyHandl
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
@@ -1738,7 +1740,7 @@
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -270,7 +270,6 @@
@@ -280,7 +280,6 @@
#include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
#include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
#include "chrome/browser/new_tab_page/modules/recipes/recipes_service.h"
@@ -1746,7 +1748,7 @@
#include "chrome/browser/new_tab_page/promos/promo_service.h"
#include "chrome/browser/policy/developer_tools_policy_handler.h"
#include "chrome/browser/search/background/ntp_custom_background_service.h"
@@ -1714,7 +1713,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -1805,7 +1804,6 @@ void RegisterProfilePrefs(user_prefs::Pr
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
NewTabUI::RegisterProfilePrefs(registry);
@@ -1756,7 +1758,7 @@
PinnedTabCodec::RegisterProfilePrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -692,9 +692,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -710,9 +710,6 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
#endif
@@ -1766,7 +1768,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_ANDROID)
enterprise_idle::IdleServiceFactory::GetInstance();
@@ -980,23 +977,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1008,23 +1005,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if !BUILDFLAG(IS_ANDROID)
ResetReportUploaderFactory::GetInstance();
#endif
@@ -1981,7 +1983,7 @@
} // namespace
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -575,7 +575,6 @@ static_library("ui") {
@@ -568,7 +568,6 @@ static_library("ui") {
"//components/renderer_context_menu",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -1989,7 +1991,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser/db:database_manager",
@@ -3804,8 +3803,6 @@ static_library("ui") {
@@ -3877,8 +3876,6 @@ static_library("ui") {
"startup/web_app_startup_utils.h",
"tab_contents/chrome_web_contents_menu_helper.cc",
"tab_contents/chrome_web_contents_menu_helper.h",
@@ -1998,7 +2000,7 @@
"views/autofill/payments/virtual_card_selection_dialog_view.cc",
"views/autofill/payments/virtual_card_selection_dialog_view.h",
"views/autofill/payments/webauthn_dialog_view.cc",
@@ -5387,8 +5384,6 @@ static_library("ui") {
@@ -5480,8 +5477,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",
@@ -2035,7 +2037,7 @@
void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -340,7 +340,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -347,7 +347,6 @@ void TabHelpers::AttachTabHelpers(WebCon
chrome::ChainedBackNavigationTracker::CreateForWebContents(web_contents);
chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents);
ChromePasswordManagerClient::CreateForWebContents(web_contents);
@@ -2053,7 +2055,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/views/download/bubble/download_bubble_partial_view.h"
#include "chrome/browser/ui/views/download/bubble/download_bubble_primary_view.h"
@@ -131,10 +130,6 @@ void DownloadBubbleContentsView::AddSecu
@@ -140,10 +139,6 @@ void DownloadBubbleContentsView::AddSecu
void DownloadBubbleContentsView::ProcessDeepScanPress(
const ContentId& id,
base::optional_ref<const std::string> password) {
@@ -2074,7 +2076,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/color/chrome_color_id.h"
@@ -818,9 +817,7 @@ void DownloadItemView::UpdateLabels() {
@@ -821,9 +820,7 @@ void DownloadItemView::UpdateLabels() {
deep_scanning_label_->SetVisible(mode_ ==
download::DownloadItemMode::kDeepScanning);
if (deep_scanning_label_->GetVisible()) {
@@ -2085,7 +2087,7 @@
? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
: IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
const std::u16string filename = ElidedFilename(*deep_scanning_label_);
@@ -846,11 +843,15 @@ void DownloadItemView::UpdateButtons() {
@@ -849,11 +846,15 @@ void DownloadItemView::UpdateButtons() {
}
const bool allow_open_during_deep_scan =
@@ -2101,7 +2103,7 @@
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
prompt_to_scan || allow_open_during_deep_scan);
@@ -1274,7 +1275,9 @@ void DownloadItemView::ShowContextMenuIm
@@ -1276,7 +1277,9 @@ void DownloadItemView::ShowContextMenuIm
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -2136,10 +2138,10 @@
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
@@ -110,7 +110,7 @@ void ChromeWebContentsViewDelegateViews:
void ChromeWebContentsViewDelegateViews::OnPerformDrop(
void ChromeWebContentsViewDelegateViews::OnPerformingDrop(
const content::DropData& drop_data,
DropCompletionCallback callback) {
- HandleOnPerformDrop(web_contents_, drop_data, std::move(callback));
- HandleOnPerformingDrop(web_contents_, drop_data, std::move(callback));
+ if (!callback.is_null()) std::move(callback).Run(std::move(drop_data));
}
@@ -2147,22 +2149,40 @@
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm
@@ -87,7 +87,7 @@ bool ChromeWebContentsViewDelegateViewsM
void ChromeWebContentsViewDelegateViewsMac::OnPerformDrop(
void ChromeWebContentsViewDelegateViewsMac::OnPerformingDrop(
const content::DropData& drop_data,
DropCompletionCallback callback) {
- HandleOnPerformDrop(web_contents_, drop_data, std::move(callback));
- HandleOnPerformingDrop(web_contents_, drop_data, std::move(callback));
+ if (!callback.is_null()) std::move(callback).Run(std::move(drop_data));
}
std::unique_ptr<RenderViewContextMenuBase>
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -198,37 +198,6 @@ void DownloadsDOMHandler::SaveDangerousR
@@ -201,55 +201,6 @@ void DownloadsDOMHandler::SaveDangerousR
void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_DISCARD_DANGEROUS);
- download::DownloadItem* download = GetDownloadByStringId(id);
- if (download) {
- content::DownloadManager* manager = GetMainNotifierManager();
- if (manager) {
- Profile* profile =
- Profile::FromBrowserContext(manager->GetBrowserContext());
- if (profile &&
- safe_browsing::IsSafeBrowsingSurveysEnabled(*(profile->GetPrefs()))) {
- TrustSafetySentimentService* trust_safety_sentiment_service =
- TrustSafetySentimentServiceFactory::GetForProfile(profile);
- if (trust_safety_sentiment_service) {
- // Survey triggered on DISCARD action only. If the user clicks to
- // PROCEED in the downloads page, their choice is not confirmed until
- // they PROCEED within the dangerous download prompt.
- trust_safety_sentiment_service->InteractedWithDownloadWarningUI(
- DownloadItemWarningData::WarningSurface::DOWNLOADS_PAGE,
- DownloadItemWarningData::WarningAction::DISCARD);
- }
- }
- }
- // The warning action event needs to be added before Safe Browsing report is
- // sent, because this event should be included in the report.
- DownloadItemWarningData::AddWarningActionEvent(
@@ -2195,7 +2215,7 @@
RemoveDownloadInArgs(id);
}
@@ -466,12 +435,6 @@ void DownloadsDOMHandler::ReviewDangerou
@@ -487,12 +438,6 @@ void DownloadsDOMHandler::ReviewDangerou
return;
}
@@ -2267,7 +2287,7 @@
std::move(callback),
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1667,7 +1667,6 @@ if (!is_android) {
@@ -1721,7 +1721,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2275,7 +2295,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",
@@ -6614,7 +6613,6 @@ test("unit_tests") {
@@ -6679,7 +6678,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2283,7 +2303,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:mock_password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -9765,9 +9763,6 @@ test("unit_tests") {
@@ -9848,9 +9846,6 @@ test("unit_tests") {
]
}
@@ -2335,7 +2355,7 @@
}
--- a/components/password_manager/core/browser/password_manager_client.h
+++ b/components/password_manager/core/browser/password_manager_client.h
@@ -399,11 +399,14 @@ class PasswordManagerClient {
@@ -398,11 +398,14 @@ class PasswordManagerClient {
// Returns the current best guess as to the page's display language.
virtual autofill::LanguageCode GetPageLanguage() const;
@@ -2419,14 +2439,19 @@
#include "components/safe_browsing/core/common/utils.h"
#include "google_apis/google_api_keys.h"
#include "net/base/net_errors.h"
@@ -111,18 +110,7 @@ constexpr net::NetworkTrafficAnnotationT
@@ -111,23 +110,7 @@ constexpr net::NetworkTrafficAnnotationT
)");
bool IsEnabled(PrefService* pref_service) {
- safe_browsing::SafeBrowsingState state =
- safe_browsing::GetSafeBrowsingState(*pref_service);
- // If this class has been created, it is already known that the session is not
- // off-the-record and that the user's location is eligible, so
- // |is_off_the_record| is passed through as false and
- // |stored_permanent_country| as nullopt.
- return safe_browsing::hash_realtime_utils::DetermineHashRealTimeSelection(
- /*is_off_the_record=*/false, pref_service) ==
- /*is_off_the_record=*/false, pref_service,
- /*stored_permanent_country=*/absl::nullopt) ==
- safe_browsing::hash_realtime_utils::HashRealTimeSelection::
- kHashRealTimeService ||
- // The service is enabled when enhanced protection and
@@ -2439,7 +2464,7 @@
}
GURL GetKeyFetchingUrl() {
@@ -363,26 +351,9 @@ void OhttpKeyService::MaybeStartServerTr
@@ -376,26 +359,9 @@ void OhttpKeyService::MaybeStartServerTr
}
void OhttpKeyService::PopulateKeyFromPref() {
@@ -2468,7 +2493,7 @@
void OhttpKeyService::Shutdown() {
--- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
+++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
@@ -518,20 +518,6 @@ void TailoredSecurityService::Shutdown()
@@ -519,20 +519,6 @@ void TailoredSecurityService::Shutdown()
}
void TailoredSecurityService::TailoredSecurityTimestampUpdateCallback() {
@@ -2664,7 +2689,7 @@
--- a/extensions/browser/updater/update_service.cc
+++ b/extensions/browser/updater/update_service.cc
@@ -128,13 +128,6 @@ void UpdateService::OnCrxStateChange(Upd
@@ -127,13 +127,6 @@ void UpdateService::OnCrxStateChange(Upd
break;
}
@@ -2689,13 +2714,3 @@
}
declare_args() {
--- a/weblayer/BUILD.gn
+++ b/weblayer/BUILD.gn
@@ -475,7 +475,6 @@ source_set("weblayer_lib_base") {
"//components/reduce_accept_language/browser",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/content/common:interfaces",
"//components/safe_browsing/content/renderer:throttles",

View File

@@ -1,6 +1,6 @@
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -114,27 +114,11 @@
@@ -125,27 +125,11 @@
},
"google": {

View File

@@ -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
@@ -162,6 +162,7 @@
@@ -163,6 +163,7 @@
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/strings/grit/components_strings.h"
#include "components/supervised_user/core/common/buildflags.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"
@@ -2045,6 +2046,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2031,6 +2032,7 @@ void RenderViewContextMenu::AppendPageIt
menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
if (CanTranslate(/*menu_logging=*/true)) {
@@ -47,7 +47,7 @@
request_pending_ = true;
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -825,8 +825,9 @@ void TranslateManager::FilterIsTranslate
@@ -832,8 +832,9 @@ void TranslateManager::FilterIsTranslate
TriggerDecision::kDisabledOffline);
}

View File

@@ -9,7 +9,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2482,6 +2482,7 @@ static_library("browser") {
@@ -2539,6 +2539,7 @@ static_library("browser") {
"//third_party/libyuv",
"//third_party/metrics_proto",
"//third_party/re2",
@@ -19,7 +19,7 @@
"//third_party/widevine/cdm:headers",
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -161,6 +161,7 @@
@@ -162,6 +162,7 @@
#include "components/translate/core/browser/translate_ranker_impl.h"
#include "components/translate/core/common/translate_util.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
@@ -250,6 +250,7 @@ source_set("browser") {
@@ -245,6 +245,7 @@ source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/sqlite",
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/attribution_reporting/attribution_manager.h"
@@ -3350,6 +3351,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3346,6 +3347,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -83,7 +83,7 @@
"//ui/events/blink",
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -37,6 +37,7 @@
@@ -39,6 +39,7 @@
#include "third_party/blink/public/common/loader/referrer_utils.h"
#include "third_party/blink/public/common/switches.h"
#include "third_party/blink/public/platform/web_runtime_features.h"
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -463,6 +464,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -465,6 +466,10 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kEnableWebGPUDeveloperFeatures, true},
{wrf::EnableDirectSockets, switches::kEnableIsolatedWebAppsInRenderer,
true},
@@ -116,15 +116,15 @@
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -38,6 +38,7 @@
#include "base/debug/dump_without_crashing.h"
@@ -39,6 +39,7 @@
#include "base/i18n/time_formatting.h"
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
+#include "base/rand_util.h"
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -941,6 +942,14 @@ Range* Document::CreateRangeAdjustedToTr
@@ -943,6 +944,14 @@ Range* Document::CreateRangeAdjustedToTr
Position::BeforeNode(*shadow_host));
}
@@ -139,7 +139,7 @@
SelectorQueryCache& Document::GetSelectorQueryCache() {
if (!selector_query_cache_)
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
@@ -2294,6 +2303,15 @@ void Document::UpdateStyleAndLayoutTreeF
@@ -2295,6 +2304,15 @@ void Document::UpdateStyleAndLayoutTreeF
#if DCHECK_IS_ON()
AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
#endif
@@ -168,7 +168,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2415,6 +2419,9 @@ class CORE_EXPORT Document : public Cont
@@ -2427,6 +2431,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -180,7 +180,7 @@
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2143,6 +2143,11 @@ DOMRectList* Element::getClientRects() {
@@ -2144,6 +2144,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -192,7 +192,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2170,6 +2175,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2171,6 +2176,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -277,7 +277,7 @@
namespace blink {
BASE_FEATURE(kDisableCanvasOverdrawOptimization,
@@ -2865,9 +2868,22 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -2864,9 +2867,22 @@ TextMetrics* BaseRenderingContext2D::mea
TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas);
@@ -303,7 +303,7 @@
void BaseRenderingContext2D::SnapshotStateForFilter() {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1694,6 +1694,7 @@ component("platform") {
@@ -1693,6 +1693,7 @@ component("platform") {
"//cc/mojo_embedder",
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
@@ -328,7 +328,7 @@
} // namespace blink
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1808,6 +1808,12 @@
@@ -1817,6 +1817,12 @@
origin_trial_feature_name: "Focusgroup",
},
{

View File

@@ -34,7 +34,7 @@ approach to change color components.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3353,6 +3353,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3349,6 +3349,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
@@ -468,6 +468,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -470,6 +470,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -73,7 +73,7 @@ approach to change color components.
#include "third_party/blink/renderer/platform/graphics/stroke_data.h"
#include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
@@ -2191,6 +2192,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2190,6 +2191,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -85,7 +85,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
@@ -1650,7 +1650,9 @@ component("platform") {
@@ -1648,7 +1648,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -322,7 +322,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
@@ -1814,6 +1814,9 @@
@@ -1823,6 +1823,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

View File

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2207,6 +2207,7 @@ static_library("browser") {
@@ -2258,6 +2258,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -63,7 +63,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"
@@ -105,6 +107,7 @@
@@ -104,6 +106,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"
@@ -71,7 +71,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/permissions/permissions_client.h"
#include "components/policy/core/common/policy_service.h"
@@ -136,6 +139,7 @@
@@ -135,6 +138,7 @@
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "net/log/net_log.h"
@@ -79,7 +79,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"
@@ -366,6 +370,18 @@ void BrowserProcessImpl::Init() {
@@ -368,6 +372,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -100,7 +100,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2181,6 +2181,10 @@ const char kUnthrottledNestedTimeoutDesc
@@ -2226,6 +2226,10 @@ const char kUnthrottledNestedTimeoutDesc
"websites abusing the API will still eventually have their setTimeouts "
"clamped.";
@@ -113,7 +113,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
@@ -1233,6 +1233,9 @@ extern const char kUndoAutofillDescripti
@@ -1261,6 +1261,9 @@ extern const char kUndoAutofillDescripti
extern const char kUnthrottledNestedTimeoutName[];
extern const char kUnthrottledNestedTimeoutDescription[];

View File

@@ -23,17 +23,17 @@
// used for mapping the command-line flags).
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -431,7 +431,7 @@ void ProfileNetworkContextService::Updat
@@ -410,7 +410,7 @@ void ProfileNetworkContextService::Updat
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
- embedder_support::kAlternateErrorPagesEnabled, true,
+ embedder_support::kAlternateErrorPagesEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
- true);
+ false);
registry->RegisterBooleanPref(prefs::kQuicAllowed, true);
registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled,
--- a/chrome/browser/prefetch/prefetch_prefs.h
+++ b/chrome/browser/prefetch/prefetch_prefs.h
false);
--- a/chrome/browser/preloading/preloading_prefs.h
+++ b/chrome/browser/preloading/preloading_prefs.h
@@ -23,7 +23,7 @@ enum class NetworkPredictionOptions {
kWifiOnlyDeprecated = 1,
kDisabled = 2,
@@ -78,7 +78,7 @@
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
@@ -140,7 +140,7 @@ const char kAutofillUsingVirtualViewStru
@@ -144,7 +144,7 @@ const char kAutofillUsingVirtualViewStru
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
registry->RegisterBooleanPref(
@@ -87,7 +87,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kAutofillLastVersionDeduped, 0,
@@ -152,7 +152,7 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -156,7 +156,7 @@ void RegisterProfilePrefs(user_prefs::Pr
prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
@@ -95,10 +95,10 @@
+ prefs::kAutofillCreditCardEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kAutofillIbanEnabled, true,
prefs::kAutofillPaymentCvcStorage, true,
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -480,7 +480,7 @@ bool DoesBookmarkContainWords(const std:
@@ -483,7 +483,7 @@ bool DoesBookmarkContainWords(const std:
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -109,7 +109,7 @@
registry->RegisterBooleanPref(
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -68,7 +68,7 @@ void CookieSettings::RegisterProfilePref
@@ -74,7 +74,7 @@ void CookieSettings::RegisterProfilePref
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(
prefs::kCookieControlsMode,

View File

@@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1694,11 +1694,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1645,11 +1645,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {

View File

@@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily.
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -275,7 +275,7 @@ void DownloadPrefs::RegisterProfilePrefs
@@ -274,7 +274,7 @@ void DownloadPrefs::RegisterProfilePrefs
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kPromptForDownload,

View File

@@ -9,7 +9,7 @@
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -471,6 +473,7 @@ Browser::Browser(const CreateParams& par
@@ -475,6 +477,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),
@@ -17,7 +17,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -855,6 +858,7 @@ Browser::WarnBeforeClosingResult Browser
@@ -859,6 +862,7 @@ Browser::WarnBeforeClosingResult Browser
// true or there are no pending downloads we need to prompt about) then
// there's no need to warn.
if (force_skip_warning_user_on_close_ || CanCloseWithInProgressDownloads())
@@ -25,7 +25,7 @@
return WarnBeforeClosingResult::kOkToClose;
DCHECK(!warn_before_closing_callback_)
@@ -889,6 +893,7 @@ bool Browser::TryToCloseWindow(
@@ -893,6 +897,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -33,7 +33,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -2864,6 +2869,62 @@ bool Browser::CanCloseWithInProgressDown
@@ -2878,6 +2883,62 @@ bool Browser::CanCloseWithInProgressDown
return false;
}
@@ -96,7 +96,7 @@
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
if (cancel_downloads) {
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
@@ -2882,6 +2943,22 @@ void Browser::InProgressDownloadResponse
@@ -2896,6 +2957,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -129,7 +129,7 @@
#include "chrome/browser/ui/signin/signin_view_controller.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/unload_controller.h"
@@ -1095,12 +1096,17 @@ class Browser : public TabStripModelObse
@@ -1099,12 +1100,17 @@ class Browser : public TabStripModelObse
// Returns true if the window can close, false otherwise.
bool CanCloseWithInProgressDownloads();
@@ -147,7 +147,7 @@
// Called when all warnings have completed when attempting to close the
// browser directly (e.g. via hotkey, close button, terminate signal, etc.)
// Used as a WarnBeforeClosingCallback by ShouldCloseWindow().
@@ -1271,6 +1277,8 @@ class Browser : public TabStripModelObse
@@ -1275,6 +1281,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -893,10 +893,14 @@ bool HandleNewTabPageLocationOverride(
@@ -891,10 +891,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())

View File

@@ -11,8 +11,8 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -149,6 +149,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe
"AutofillSendUnidentifiedKeyAfterFill",
@@ -155,6 +155,8 @@ BASE_FEATURE(kAutofillUseDomNodeIdForRen
"AutofillUseDomNodeIdForRendererId",
base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -50,7 +50,7 @@
Node* inner_node = event.InnerNode();
--- a/third_party/blink/renderer/core/input/mouse_event_manager.cc
+++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc
@@ -656,8 +656,14 @@ WebInputEventResult MouseEventManager::H
@@ -621,8 +621,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

View File

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

View File

@@ -10,7 +10,7 @@
}
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -53,6 +53,7 @@
@@ -55,6 +55,7 @@
#include "ui/base/webui/jstemplate_builder.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/color/color_provider.h"
@@ -18,7 +18,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -423,7 +424,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -446,7 +447,9 @@ void NTPResourceCache::CreateNewTabIncog
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
// Colors.

View File

@@ -41,7 +41,7 @@
#include "base/feature_list.h"
#include "base/format_macros.h"
#include "base/functional/bind.h"
@@ -369,6 +370,15 @@ AutocompleteController::AutocompleteCont
@@ -306,6 +307,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();

View File

@@ -27,7 +27,7 @@
return true;
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -331,7 +331,8 @@ void LocationBarView::Init() {
@@ -333,7 +333,8 @@ void LocationBarView::Init() {
params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
params.types_enabled.push_back(PageActionIconType::kClickToCall);

View File

@@ -69,7 +69,7 @@
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
client_(std::move(client)),
@@ -330,8 +338,8 @@ bool TemplateURLService::CanAddAutogener
@@ -331,8 +339,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.
@@ -80,7 +80,7 @@
}
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
@@ -1618,6 +1626,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -1622,6 +1630,8 @@ SyncDataMap TemplateURLService::CreateGU
void TemplateURLService::Init(const Initializer* initializers,
int num_initializers) {
@@ -89,7 +89,7 @@
if (client_)
client_->SetOwner(this);
@@ -1761,6 +1771,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -1773,6 +1783,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {

View File

@@ -8,7 +8,7 @@
#include "base/debug/alias.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
@@ -666,6 +667,8 @@ void Tab::OnGestureEvent(ui::GestureEven
@@ -684,6 +685,8 @@ void Tab::OnGestureEvent(ui::GestureEven
}
std::u16string Tab::GetTooltipText(const gfx::Point& p) const {

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1361,7 +1361,8 @@ void BrowserCommandController::InitComma
@@ -1369,7 +1369,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -40,16 +40,16 @@
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -94,7 +95,8 @@ TabStripRegionView::TabStripRegionView(s
@@ -97,7 +98,8 @@ TabStripRegionView::TabStripRegionView(s
// Add and configure the TabSearchButton.
std::unique_ptr<TabSearchButton> tab_search_button;
// Add and configure the TabSearchContainer.
std::unique_ptr<TabSearchContainer> tab_search_container;
- if (browser && browser->is_type_normal()) {
+ if (browser && browser->is_type_normal() &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) {
tab_search_button = std::make_unique<TabSearchButton>(tab_strip_);
tab_search_button->SetTooltipText(
l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_SEARCH));
tab_search_container = std::make_unique<TabSearchContainer>(
tab_strip_, render_tab_search_before_tab_strip_);
tab_search_container->SetProperty(views::kCrossAxisAlignmentKey,
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -60,4 +60,8 @@

View File

@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -1898,6 +1899,10 @@ void TabStripModel::CloseTabs(base::span
@@ -1893,6 +1894,10 @@ void TabStripModel::CloseTabs(base::span
return;
}

View File

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

View File

@@ -21,7 +21,7 @@
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
#include "base/feature_list.h"
@@ -1336,7 +1337,8 @@ void HistoryBackend::InitImpl(
@@ -1312,7 +1313,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1840,6 +1840,10 @@ void BrowserView::UpdateExclusiveAccessE
@@ -1868,6 +1868,10 @@ void BrowserView::UpdateExclusiveAccessE
ExclusiveAccessBubbleHideCallback bubble_first_hide_callback,
bool notify_download,
bool force_update) {

View File

@@ -1,15 +1,15 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -368,7 +368,8 @@ void ToolbarView::Init() {
@@ -375,7 +375,8 @@ void ToolbarView::Init() {
std::unique_ptr<SidePanelToolbarButton> side_panel_button;
std::unique_ptr<SidePanelToolbarContainer> side_panel_toolbar_container;
- if (browser_view_->unified_side_panel()) {
+ if (browser_view_->unified_side_panel() &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("hide-sidepanel-button")) {
if (companion::IsCompanionFeatureEnabled()) {
side_panel_toolbar_container =
std::make_unique<SidePanelToolbarContainer>(browser_view_);
if (base::FeatureList::IsEnabled(features::kSidePanelPinning)) {
// TODO(b:299463334): Use the new SidePanelContainer which supports
// ActionItems
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -100,4 +100,8 @@

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -1015,7 +1015,11 @@ void Tab::UpdateIconVisibility() {
@@ -1041,7 +1041,11 @@ void Tab::UpdateIconVisibility() {
if (IsActive()) {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1036,6 +1040,8 @@ void Tab::UpdateIconVisibility() {
@@ -1062,6 +1066,8 @@ void Tab::UpdateIconVisibility() {
available_width -= favicon_width;
showing_close_button_ = large_enough_for_close_button;

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -459,6 +459,17 @@ void ToolbarView::Init() {
@@ -469,6 +469,17 @@ void ToolbarView::Init() {
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
show_avatar_toolbar_button = !profiles::IsManagedGuestSession();
#endif
@@ -17,7 +17,7 @@
+
avatar_->SetVisible(show_avatar_toolbar_button);
auto app_menu_button = std::make_unique<BrowserAppMenuButton>(this);
if (base::FeatureList::IsEnabled(features::kResponsiveToolbar)) {
--- a/chrome/browser/ungoogled_flag_choices.h
+++ b/chrome/browser/ungoogled_flag_choices.h
@@ -13,4 +13,16 @@ const FeatureEntry::Choice kExtensionHan

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3811,10 +3811,12 @@ const FeatureEntry::FeatureVariation kPa
@@ -4074,10 +4074,12 @@ const FeatureEntry::FeatureVariation kWe
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

View File

@@ -19,7 +19,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -151,6 +151,8 @@ static_library("common_lib") {
@@ -153,6 +153,8 @@ static_library("common_lib") {
"pref_names_util.cc",
"pref_names_util.h",
"ref_counted_util.h",
@@ -28,7 +28,7 @@
"search/instant_mojom_traits.h",
"search/instant_types.cc",
"search/instant_types.h",
@@ -259,6 +261,7 @@ static_library("common_lib") {
@@ -261,6 +263,7 @@ static_library("common_lib") {
"//components/no_state_prefetch/common",
"//components/no_state_prefetch/common:mojo_bindings",
"//components/page_load_metrics/common:common",
@@ -38,7 +38,7 @@
if (enable_supervised_users) {
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -950,6 +950,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
@@ -981,6 +981,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
// referrers instead of their ordinary behavior.
BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -55,7 +55,7 @@
// on-screen until dismissed, they are instead shown for a very long time.
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h
@@ -552,6 +552,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
@@ -561,6 +561,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers);
@@ -173,7 +173,7 @@
disallowed_extension_deps_ = [
# Components should largely not depend on //extensions. Since // extensions
# is not a component target and is linked with //chrome, depending on most
@@ -740,7 +740,7 @@ test("components_unittests") {
@@ -804,7 +804,7 @@ test("components_unittests") {
# On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -182,7 +182,7 @@
assert_no_deps = [ "//chrome/*" ]
assert_no_deps += disallowed_extension_deps_
}
@@ -1029,7 +1029,7 @@ if (use_blink) {
@@ -1090,7 +1090,7 @@ if (use_blink) {
# dependency. On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -201,7 +201,7 @@
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
#include "content/browser/browsing_topics/header_util.h"
#include "content/browser/child_process_security_policy_impl.h"
@@ -389,10 +390,10 @@ void AddAdditionalRequestHeaders(
@@ -388,10 +389,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
@@ -218,7 +218,7 @@
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -52,6 +52,7 @@
@@ -54,6 +54,7 @@
#include "build/chromeos_buildflags.h"
#include "cc/base/switches.h"
#include "cc/trees/ukm_manager.h"
@@ -226,7 +226,7 @@
#include "content/common/associated_interfaces.mojom.h"
#include "content/common/content_navigation_policy.h"
#include "content/common/content_switches_internal.h"
@@ -4338,10 +4339,13 @@ void RenderFrameImpl::WillSendRequestInt
@@ -4305,10 +4306,13 @@ void RenderFrameImpl::WillSendRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -284,12 +284,13 @@
--- a/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc
+++ b/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc
@@ -7,10 +7,12 @@
@@ -7,11 +7,13 @@
#include "base/ranges/algorithm.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/single_thread_task_runner.h"
+#include "chrome/common/referrer_sanitizer.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "net/cookies/site_for_cookies.h"
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
#include "third_party/blink/public/common/loader/loader_constants.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
@@ -297,7 +298,7 @@
#include "third_party/blink/public/platform/url_loader_throttle_provider.h"
#include "third_party/blink/public/platform/web_url_request_extra_data.h"
#include "third_party/blink/public/platform/websocket_handshake_throttle_provider.h"
@@ -148,10 +150,13 @@ void WebServiceWorkerFetchContextImpl::W
@@ -152,10 +154,13 @@ void WebServiceWorkerFetchContextImpl::W
request.SetURLRequestExtraData(std::move(url_request_extra_data));
@@ -332,8 +333,8 @@
+#include "third_party/blink/public/platform/url_conversion.h"
#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_code_cache_loader.h"
@@ -387,10 +389,13 @@ void DedicatedOrSharedWorkerFetchContext
#include "third_party/blink/public/platform/web_security_origin.h"
@@ -380,10 +382,13 @@ void DedicatedOrSharedWorkerFetchContext
if (g_rewrite_url)
request.SetUrl(g_rewrite_url(request.Url().GetString().Utf8(), false));

View File

@@ -427,7 +427,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -628,7 +628,8 @@ void TemplateURLService::IncrementUsageC
@@ -629,7 +629,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
@@ -437,7 +437,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -643,6 +644,7 @@ void TemplateURLService::ResetTemplateUR
@@ -644,6 +645,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3807,7 +3807,13 @@ const FeatureEntry::FeatureVariation kPa
@@ -4070,7 +4070,13 @@ const FeatureEntry::FeatureVariation kWe
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.

View File

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

View File

@@ -142,7 +142,7 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -98,7 +98,6 @@ source_set("browser") {
@@ -93,7 +93,6 @@ source_set("browser") {
"//components/payments/mojom",
"//components/power_monitor",
"//components/services/filesystem:lib",

View File

@@ -1,6 +1,6 @@
--- a/components/optimization_guide/core/optimization_guide_features.cc
+++ b/components/optimization_guide/core/optimization_guide_features.cc
@@ -105,7 +105,7 @@ BASE_FEATURE(kOptimizationHints,
@@ -155,7 +155,7 @@ BASE_FEATURE(kOptimizationHints,
// Enables fetching from a remote Optimization Guide Service.
BASE_FEATURE(kRemoteOptimizationGuideFetching,
"OptimizationHintsFetching",

View File

@@ -3,7 +3,7 @@
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -3820,8 +3820,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3822,8 +3822,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3835,8 +3834,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3837,8 +3836,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

View File

@@ -2,7 +2,7 @@
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -1315,7 +1315,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
@@ -1351,7 +1351,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -85,7 +85,7 @@ bool ReloadButton::GetMenuEnabled() cons
@@ -111,7 +111,7 @@ bool ReloadButton::GetMenuEnabled() cons
}
void ReloadButton::SetMenuEnabled(bool enable) {

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -523,10 +523,6 @@ int GetContentRestrictions(const Browser
@@ -524,10 +524,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -13,7 +13,7 @@
}
return content_restrictions;
}
@@ -1613,8 +1609,7 @@ bool CanSavePage(const Browser* browser)
@@ -1614,8 +1610,7 @@ bool CanSavePage(const Browser* browser)
DownloadPrefs::DownloadRestriction::ALL_FILES) {
return false;
}

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -170,12 +170,10 @@ TabStripRegionView::TabStripRegionView(s
@@ -195,12 +195,10 @@ TabStripRegionView::TabStripRegionView(s
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1030,6 +1030,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1037,6 +1037,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -10,7 +10,7 @@
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -66,6 +66,7 @@
@@ -65,6 +65,7 @@
#include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
@@ -18,7 +18,7 @@
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
#include "chrome/browser/ui/webui/version/version_ui.h"
@@ -884,6 +885,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -889,6 +890,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
}
#endif
@@ -174,7 +174,7 @@
+#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -661,6 +661,7 @@ const char kExtensionConfigureCommandsSu
@@ -666,6 +666,7 @@ const char kExtensionConfigureCommandsSu
// Add hosts here to be included in chrome://chrome-urls (about:about).
// These hosts will also be suggested by BuiltinProvider.
const char* const kChromeHostURLs[] = {

View File

@@ -1,6 +1,5 @@
## template_url_prepopulate_data.cc
# Appends search engines to the returned list of prepopulated search engines.
# Only add DDG if it hasn't already been included.
# Adds DDG to the default search engines.
#
## util.cc
# Only snyc the prepoulated search engines when initializing the database.
@@ -8,19 +7,17 @@
#
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -1333,6 +1333,9 @@ std::vector<std::unique_ptr<TemplateURLD
std::vector<std::unique_ptr<TemplateURLData>> t_urls;
for (size_t i = 0; i < num_engines; ++i)
t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(*engines[i]));
+ if (std::find(engines, engines + num_engines, &duckduckgo) == engines + num_engines) {
+ t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo));
+ }
return t_urls;
}
@@ -59,6 +59,7 @@ constexpr EngineAndTier engines_default[
{SearchEngineTier::kTopEngines, &google},
{SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &yahoo},
+ {SearchEngineTier::kTopEngines, &duckduckgo},
};
// Note, the below entries are sorted by country code, not the name in comment.
--- a/components/search_engines/util.cc
+++ b/components/search_engines/util.cc
@@ -522,7 +522,7 @@ void GetSearchProvidersUsingLoadedEngine
@@ -524,7 +524,7 @@ void GetSearchProvidersUsingLoadedEngine
const int prepopulate_resource_keyword_version =
TemplateURLPrepopulateData::GetDataVersion(prefs);

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -68,7 +68,6 @@ const char* const kBadFlags[] = {
@@ -72,7 +72,6 @@ const char* const kBadFlags[] = {
// These flags disable sandbox-related security.
sandbox::policy::switches::kDisableGpuSandbox,
sandbox::policy::switches::kDisableSeccompFilterSandbox,

View File

@@ -24,7 +24,7 @@
--- a/chrome/browser/resources/extensions/item_list.html
+++ b/chrome/browser/resources/extensions/item_list.html
@@ -107,13 +107,6 @@
@@ -106,13 +106,6 @@
<h2 class="extension-title-container">$i18n{safetyCheckAllExtensions}</h2>
</template>
</div>
@@ -109,8 +109,8 @@
<!-- tabindex is needed below because <a> without href attribute is not
focusable in sequential keyboard navigation by default. -->
<a role="menuitem" id="toggle-history-clusters"
--- a/chrome/browser/resources/ntp4/incognito_tab.html
+++ b/chrome/browser/resources/ntp4/incognito_tab.html
--- a/chrome/browser/resources/new_tab_page_incognito_guest/incognito_tab.html
+++ b/chrome/browser/resources/new_tab_page_incognito_guest/incognito_tab.html
@@ -24,9 +24,6 @@ document.querySelector('#incognitothemec
<h1>$i18n{incognitoTabHeading}</h1>
<p id="subtitle">
@@ -132,7 +132,7 @@
<cr-link-row id="captions"
class="hr"
label="$i18n{captionsTitle}"
@@ -87,11 +87,6 @@
@@ -88,11 +88,6 @@
external>
</cr-link-row>
</if>
@@ -255,12 +255,12 @@
- label="$i18n{urlKeyedAnonymizedDataCollection}"
- sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
- </settings-toggle-button>
<if expr="_google_chrome">
<if expr="not chromeos_ash">
<settings-toggle-button id="spellCheckControl"
<template is="dom-if" if="[[enablePageContentSetting_]]">
<cr-link-row id="pageContentRow"
class="hr"
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -39,15 +39,6 @@
@@ -41,15 +41,6 @@
label="$i18n{clearBrowsingData}"
sub-label="$i18n{clearBrowsingDataDescription}"
on-click="onClearBrowsingDataClick_"></cr-link-row>
@@ -273,14 +273,14 @@
- role-description="$i18n{subpageArrowRoleDescription}">
- </cr-link-row>
- </template>
<template is="dom-if" if="[[isPrivacySandboxSettings4_]]">
<cr-link-row id="thirdPartyCookiesLinkRow"
start-icon="settings:cookie"
<template is="dom-if" if="[[is3pcdRedesignEnabled_]]">
<cr-link-row id="trackingProtectionLinkRow"
start-icon="settings:visibility-off"
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -156,10 +156,3 @@
@@ -140,10 +140,3 @@
on-click="onChromeCertificatesClick_"></cr-link-row>
</template>
</if>
- <cr-link-row id="advanced-protection-program-link"
- class="hr"
@@ -316,7 +316,7 @@
</cr-icon-button>
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -708,19 +708,9 @@ void ExtensionsMenuModel::Build(Browser*
@@ -707,19 +707,9 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -393,7 +393,7 @@
// Specify the maximum message and title width explicitly.
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -894,7 +894,7 @@ const base::FeatureParam<std::string> kM
@@ -919,7 +919,7 @@ const base::FeatureParam<std::string> kM
#endif // BUILDFLAG(IS_WIN)
// Enables the Live Caption feature on supported devices.

View File

@@ -72,21 +72,16 @@ chrome/browser/resources/chromeos/accessibility/chromevox/earcons/wrap.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/wrap_edge.ogg
chrome/browser/resources/chromeos/accessibility/select_to_speak/earcons/null_selection.ogg
chrome/browser/resources/media/mei_preload/preloaded_data.pb
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/Network Share Test.lnk
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/New folder - Shortcut.lnk
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/long_name.lnk
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/options.lnk
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/regular.lnk
chrome/chrome_cleaner/test/resources/signed_dll/cleaner_test_cert.pfx
chrome/chrome_cleaner/test/resources/signed_dll/signed_empty_dll.dll
chrome/credential_provider/eventlog/gcp_eventlog_messages.mc
chrome/installer/linux/debian/repo_signing_keys.gpg
chrome/installer/test/data/SETUP.EX_
chrome/services/cups_proxy/test/data/basic_handshake.bin
chrome/test/media_router/resources/bigbuck.webm
chrome/updater/test/data/ChromiumMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.1.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/ChromiumMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.2.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/GoogleMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.1.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/GoogleMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.2.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/ProcmonConfiguration.pmc
chrome/updater/test/data/chromium_msi/{C28FCF72-BCF2-45C5-8DEF-31A74AC02012}.1.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/chromium_msi/{C28FCF72-BCF2-45C5-8DEF-31A74AC02012}.2.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/selfupdate_test_key.der
chrome/updater/test/data/signed.exe
chrome/updater/test/data/signed.exe.gz
@@ -105,6 +100,7 @@ chrome/updater/test/data/tagged_msi/GUH-multiple.msi
chrome/updater/test/data/tagged_msi/GUH-size-greater-than-max.msi
chrome/updater/test/data/tagged_msi/GUH-special-value.msi
chrome/updater/test/data/tagged_msi/GUH-untagged.msi
chrome/updater/test/data/test_installer/Testapp2Setup.exe
chromeos/ash/components/device_activity/testing/private_computing_service_test_data.binarypb
chromeos/ash/components/report/device_metrics/testing/preserved_file_test_data.binarypb
chromeos/test/data/smart_dim/20181115_example_preprocessor_config.pb
@@ -192,7 +188,7 @@ components/signin/public/base/signin_pref_names.h
components/test/data/ad_tagging/allow.zip
components/test/data/ad_tagging/bear-320x240-video-only.webm
components/test/data/ad_tagging/disallow.zip
components/test/data/autofill/ml_model/autofill_model_baseline.tflite
components/test/data/autofill/ml_model/autofill_model-br-overfit.tflite
components/test/data/browsing_topics/golden_data_model.tflite
components/test/data/crx_file/sample.zip
components/test/data/crx_file/unsigned.crx3
@@ -342,10 +338,10 @@ fuchsia_web/webengine/test/data/bear-vp8a.webm
fuchsia_web/webengine/test/data/bear-vp9-opus.webm
fuchsia_web/webengine/test/data/bear-vp9.webm
headless/test/data/protocol/emulation/resources/video.webm
ios/chrome/browser/crash_report/seed_corpuses/process_snapshot_dump_1
ios/chrome/browser/crash_report/seed_corpuses/process_snapshot_dump_2
ios/chrome/browser/crash_report/seed_corpuses/process_snapshot_dump_3
ios/chrome/browser/crash_report/seed_corpuses/process_snapshot_dump_4
ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_1
ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_2
ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_3
ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_4
ios/chrome/browser/sessions/session_restoration_web_state_list_observer.mm
ios/chrome/browser/ui/omnibox/popup/omnibox_popup_carousel_control.mm
ios/chrome/test/data/optimization_guide/additional_file_doesnt_exist.crx3
@@ -356,8 +352,10 @@ ios/chrome/test/data/sessions/session_m57.plist
ios/chrome/test/data/sessions/session_m58.plist
ios/chrome/test/data/voice/test_sound.m4a
ios/chrome/test/earl_grey/chrome_earl_grey.mm
ios/testing/data/http_server_files/bundle.pkpasses
ios/testing/data/http_server_files/generic.pkpass
ios/testing/data/http_server_files/redchair.usdz
ios/testing/data/http_server_files/semi_bundle.pkpasses
ios/testing/data/http_server_files/video_sample.mov
ios/web/navigation/navigation_item_impl_unittest.mm
ios/web/test/data/testpass.pkpass
@@ -1167,6 +1165,8 @@ net/data/fuzzer_data/parse_authority_key_identifier_fuzzer/key_identifier
net/data/fuzzer_data/parse_authority_key_identifier_fuzzer/key_identifier_and_issuer_and_serial
net/data/fuzzer_data/parse_authority_key_identifier_fuzzer/serial_only
net/data/fuzzer_data/parse_authority_key_identifier_fuzzer/url_issuer_and_serial
net/data/fuzzer_data/parse_crldp_fuzzer/crldp_issuer_as_dirname.der
net/data/fuzzer_data/parse_crldp_fuzzer/relative_name_and_reasons_and_multiple_dps.der
net/data/fuzzer_data/parse_ocsp_cert_id_fuzzer/bad_issuer_key_hash_type
net/data/fuzzer_data/parse_ocsp_cert_id_fuzzer/bad_name_hash_type
net/data/fuzzer_data/parse_ocsp_cert_id_fuzzer/bad_params
@@ -1893,10 +1893,6 @@ net/third_party/nist-pkits/crls/requireExplicitPolicy7CACRL.crl
net/third_party/nist-pkits/crls/requireExplicitPolicy7subCARE2CRL.crl
net/third_party/nist-pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl
net/third_party/nist-pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl
net/third_party/quiche/src/quiche/common/anonymous_tokens/testdata/strong_rsa_modulus2048_example.binarypb
net/third_party/quiche/src/quiche/common/anonymous_tokens/testdata/strong_rsa_modulus2048_example_2.binarypb
net/third_party/quiche/src/quiche/common/anonymous_tokens/testdata/strong_rsa_modulus3072_example.binarypb
net/third_party/quiche/src/quiche/common/anonymous_tokens/testdata/strong_rsa_modulus4096_example.binarypb
net/tools/testserver/dist/_socket.pyd
net/tools/testserver/dist/_ssl.pyd
pdf/pdfium/fuzzers/corpora/pdf_codec_tiff/not_kitty.tiff
@@ -2553,6 +2549,10 @@ third_party/angle/third_party/glmark2/src/data/models/cat.3ds
third_party/angle/third_party/glmark2/src/data/models/cube.3ds
third_party/angle/third_party/glmark2/src/data/models/horse.3ds
third_party/angle/third_party/r8/custom_d8.jar
third_party/anonymous_tokens/src/anonymous_tokens/testdata/strong_rsa_modulus2048_example.binarypb
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_cpp_ffi/fuzz/corpus/V0AdvEmpty
@@ -5101,6 +5101,8 @@ third_party/boringssl/src/fuzz/parse_certificate_fuzzer_corpus/feb6a1d3377dadf7a
third_party/boringssl/src/fuzz/parse_certificate_fuzzer_corpus/ff77dd6c362c66b593c750f51c3c0482ad091174
third_party/boringssl/src/fuzz/parse_certificate_fuzzer_corpus/ff887ccb7b1a3fc53aa53e0edb9059879fc4f8a3
third_party/boringssl/src/fuzz/parse_certificate_fuzzer_corpus/ffc5077ed0160c01651c5c8a083a9a1f1b23858a
third_party/boringssl/src/fuzz/parse_crldp_fuzzer_corpus/crldp_issuer_as_dirname.der
third_party/boringssl/src/fuzz/parse_crldp_fuzzer_corpus/relative_name_and_reasons_and_multiple_dps.der
third_party/boringssl/src/fuzz/pkcs12_corpus/04191202c1f7d978bcb3a4c1316d88b046689e31
third_party/boringssl/src/fuzz/pkcs12_corpus/7dbf598a00e4d22ac2ae1bc658fbc6596901d53f
third_party/boringssl/src/fuzz/pkcs12_corpus/aab806b45129f3284cf9598951cdd57a86e63ab5
@@ -7794,6 +7796,8 @@ third_party/dawn/third_party/dxc/tools/clang/test/Misc/Inputs/serialized-diags-s
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
third_party/dawn/third_party/dxc/tools/clang/test/Profile/Inputs/c-general.profdata.v1
third_party/dawn/third_party/gn/dxc/win_build_output/mc/include/dxc/Tracing/dxcetw/dxcetwTEMP.BIN
third_party/dawn/third_party/gn/dxc/win_build_output/mc/include/dxc/Tracing/dxcetw/dxcetw_MSG00001.bin
third_party/dawn/third_party/khronos/OpenGL-Registry/extensions/SGI/cubemap.sho
third_party/dawn/third_party/khronos/OpenGL-Registry/extensions/SGI/imaging_pipeline.sho
third_party/dawn/third_party/khronos/OpenGL-Registry/specs/es/katex/fonts/KaTeX_AMS-Regular.eot
@@ -8250,6 +8254,8 @@ third_party/freetype-testing/src/fuzzing/corpora/windowsfnt/bungeman/HangingS.fo
third_party/freetype-testing/src/fuzzing/corpora/windowsfnt/oss-fuzz/4881860298539008-integer-overflow
third_party/freetype-testing/src/fuzzing/corpora/windowsfnt/oss-fuzz/5120086263201792-timeout
third_party/google-closure-library/scripts/ci/CloseAdobeDialog.exe
third_party/google-java-format/chromium-overrides.jar
third_party/google-java-format/google-java-format.jar
third_party/gradle_wrapper/gradle/wrapper/gradle-wrapper.jar
third_party/grpc/src/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar
third_party/grpc/src/examples/php/GPBMetadata/Helloworld.php
@@ -14263,6 +14269,7 @@ third_party/rust/regex/v1/crate/src/testdata/basic.dat
third_party/rust/regex/v1/crate/tests/fowler.rs
third_party/rust/unicode_ident/v1/crate/tests/fst/xid_continue.fst
third_party/rust/unicode_ident/v1/crate/tests/fst/xid_start.fst
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
third_party/skia/modules/canvaskit/tests/assets/test.ttc
@@ -14513,7 +14520,6 @@ third_party/tflite/src/tensorflow/cc/saved_model/testdata/x_plus_y_v2_debuginfo/
third_party/tflite/src/tensorflow/cc/saved_model/testdata/x_plus_y_v2_debuginfo/variables/variables.index
third_party/tflite/src/tensorflow/compiler/aot/codegen_test_o.golden
third_party/tflite/src/tensorflow/compiler/jit/tests/opens2s_gnmt_mixed_precision.pbtxt.gz
third_party/tflite/src/tensorflow/compiler/xla/mlir/tools/mlir_bisect/tests/snapshot.mlir.pb
third_party/tflite/src/tensorflow/core/graph/regularization/testdata/bert1/saved_model.pb
third_party/tflite/src/tensorflow/core/graph/regularization/testdata/bert2/saved_model.pb
third_party/tflite/src/tensorflow/core/ir/importexport/tests/saved_model/savedmodel_v1/saved_model.pb
@@ -14986,6 +14992,7 @@ third_party/tflite/src/third_party/icu/data/icu_conversion_data.c.gz.ade
third_party/tflite/src/third_party/icu/data/icu_conversion_data.c.gz.adf
third_party/tflite/src/third_party/icu/data/icu_conversion_data.c.gz.adg
third_party/tflite/src/third_party/icu/data/icu_conversion_data.c.gz.adh
third_party/tflite/src/third_party/xla/xla/mlir/tools/mlir_bisect/tests/snapshot.mlir.pb
third_party/tflite_support/src/tensorflow_lite_support/acceleration/configuration/testdata/mobilenet_v1_1.0_224_quant.tflite
third_party/tflite_support/src/tensorflow_lite_support/acceleration/configuration/testdata/mobilenet_v1_1.0_224_quant_edgetpu.tflite
third_party/tflite_support/src/tensorflow_lite_support/custom_ops/kernel/sentencepiece/testdata/sentencepiece.model
@@ -15633,5 +15640,3 @@ v8/third_party/wasm-api/example/start.wasm
v8/third_party/wasm-api/example/table.wasm
v8/third_party/wasm-api/example/threads.wasm
v8/third_party/wasm-api/example/trap.wasm
weblayer/test/data/bear.webm
weblayer/test/data/test_audio.ogg