Update to Chromium 125.0.6422.60

This commit is contained in:
Blaise
2024-05-08 19:52:04 -05:00
parent 7fb6cc3d81
commit 168c744dcf
60 changed files with 1197 additions and 1023 deletions

View File

@@ -1 +1 @@
124.0.6367.207
125.0.6422.60

File diff suppressed because it is too large Load Diff

View File

@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -50,7 +50,7 @@ public abstract class ChromeFeatureList
@@ -51,7 +51,7 @@ public abstract class ChromeFeatureList
* |kFeaturesExposedToJava| in chrome/browser/flags/android/chrome_feature_list.cc
*/
public static String getFieldTrialParamByFeature(String featureName, String paramName) {
@@ -19,7 +19,7 @@ Subject: Disable fetching of all field trials
}
/**
@@ -62,8 +62,7 @@ public abstract class ChromeFeatureList
@@ -63,8 +63,7 @@ public abstract class ChromeFeatureList
*/
public static boolean getFieldTrialParamByFeatureAsBoolean(
String featureName, String paramName, boolean defaultValue) {
@@ -29,7 +29,7 @@ Subject: Disable fetching of all field trials
}
/**
@@ -75,8 +74,7 @@ public abstract class ChromeFeatureList
@@ -76,8 +75,7 @@ public abstract class ChromeFeatureList
*/
public static int getFieldTrialParamByFeatureAsInt(
String featureName, String paramName, int defaultValue) {
@@ -39,7 +39,7 @@ Subject: Disable fetching of all field trials
}
/**
@@ -88,8 +86,7 @@ public abstract class ChromeFeatureList
@@ -89,8 +87,7 @@ public abstract class ChromeFeatureList
*/
public static double getFieldTrialParamByFeatureAsDouble(
String featureName, String paramName, double defaultValue) {

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2378,7 +2378,6 @@ static_library("browser") {
@@ -2425,7 +2425,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",
@@ -3773,8 +3772,6 @@ static_library("browser") {
@@ -3829,8 +3828,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -30,7 +30,7 @@
namespace subresource_filter {
class RulesetService;
}
@@ -219,9 +215,6 @@ class BrowserProcess {
@@ -222,9 +218,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -42,7 +42,7 @@
virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -73,7 +73,6 @@
@@ -75,7 +75,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"
@@ -50,7 +50,7 @@
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -446,8 +445,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -452,8 +451,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)
@@ -1118,14 +1115,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1122,14 +1119,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_);
@@ -1391,26 +1380,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1429,26 +1418,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -103,15 +103,15 @@
created_subresource_filter_ruleset_service_ = true;
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -196,7 +196,6 @@ class BrowserProcessImpl : public Browse
@@ -197,7 +197,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> manager) override;
#endif
StatusTray* status_tray() override;
- safe_browsing::SafeBrowsingService* safe_browsing_service() override;
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
@@ -356,9 +355,6 @@ class BrowserProcessImpl : public Browse
subresource_filter::RulesetService*
@@ -360,9 +359,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -131,7 +131,7 @@
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/share/share_history.h"
@@ -639,10 +638,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -641,10 +640,6 @@ void ChromeBrowsingDataRemoverDelegate::
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -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
@@ -5091,10 +5091,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5169,10 +5169,6 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
handle, handle->GetWebContents()->GetBrowserContext()));
@@ -155,7 +155,7 @@
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
@@ -5146,16 +5142,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5224,16 +5220,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -172,7 +172,7 @@
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
throttles.push_back(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
@@ -5448,8 +5434,6 @@ bool ChromeContentBrowserClient::IsPlugi
@@ -5534,8 +5520,6 @@ bool ChromeContentBrowserClient::IsPlugi
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -207,7 +207,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -502,13 +502,6 @@ void ChromeDownloadManagerDelegate::SetD
@@ -504,13 +504,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
@@ -221,7 +221,7 @@
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -924,17 +917,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -933,17 +926,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
@@ -241,7 +241,7 @@
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -114,7 +114,7 @@ class DownloadItemModelData : public bas
@@ -119,7 +119,7 @@ class DownloadItemModelData : public bas
// Danger level of the file determined based on the file type and whether
// there was a user action associated with the download.
@@ -250,7 +250,7 @@
// Whether the download is currently being revived.
bool is_being_revived_ = false;
@@ -531,13 +531,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -535,13 +535,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -267,7 +267,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -714,9 +714,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -748,9 +748,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -364,7 +364,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"
@@ -1380,9 +1379,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1378,9 +1377,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@@ -374,7 +374,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1420,42 +1416,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1418,42 +1414,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -500,7 +500,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
@@ -731,18 +731,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -692,18 +692,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -519,7 +519,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1255,54 +1243,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1202,54 +1190,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -655,7 +655,7 @@
#include "chrome/browser/sessions/exit_type_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
@@ -643,17 +642,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -640,17 +639,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -703,7 +703,7 @@
if (is_android) {
deps += [ "//chrome/browser/password_manager/android:utils" ]
@@ -505,6 +507,7 @@ static_library("advanced_protection") {
@@ -506,6 +508,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -711,7 +711,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -524,6 +527,7 @@ source_set("metrics_collector") {
@@ -525,6 +528,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -817,7 +817,7 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -5251,7 +5251,6 @@ static_library("ui") {
@@ -5327,7 +5327,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",
@@ -827,7 +827,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -483,22 +483,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -486,22 +486,6 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -973,14 +973,14 @@
bool IsDeletingHistoryAllowed();
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -280,68 +280,6 @@ CreateHttpsOnlyModePage(content::WebCont
@@ -275,69 +275,6 @@ CreateHttpsOnlyModePage(content::WebCont
security_interstitials::https_only_mode::HttpInterstitialState{});
}
-std::unique_ptr<security_interstitials::SecurityInterstitialPage>
-CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) {
- safe_browsing::SBThreatType threat_type =
- safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
- safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
- GURL request_url("http://example.com");
- std::string url_param;
- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url",
@@ -996,15 +996,16 @@
- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type",
- &type_param)) {
- if (type_param == "malware") {
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
- } else if (type_param == "phishing") {
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_PHISHING;
- } else if (type_param == "unwanted") {
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_UNWANTED;
- } else if (type_param == "clientside_phishing") {
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING;
- threat_type =
- safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING;
- } else if (type_param == "billing") {
- threat_type = safe_browsing::SB_THREAT_TYPE_BILLING;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_BILLING;
- }
- }
- auto* primary_main_frame = web_contents->GetPrimaryMainFrame();
@@ -1042,7 +1043,7 @@
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
content::WebContents* web_contents) {
const GURL kRequestUrl("https://enterprise-block.example.net");
@@ -352,94 +290,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
@@ -348,95 +285,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
kRequestUrl));
}
@@ -1060,7 +1061,8 @@
- resource.url = kRequestUrl;
- resource.is_subresource = false;
- resource.is_subframe = false;
- resource.threat_type = safe_browsing::SB_THREAT_TYPE_MANAGED_POLICY_WARN;
- resource.threat_type =
- safe_browsing::SBThreatType::SB_THREAT_TYPE_MANAGED_POLICY_WARN;
- resource.render_process_id = primary_main_frame_id.child_id;
- resource.render_frame_token = primary_main_frame->GetFrameToken().value();
- resource.threat_source =
@@ -1079,7 +1081,7 @@
-std::unique_ptr<TestSafeBrowsingBlockingPageQuiet>
-CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
- safe_browsing::SBThreatType threat_type =
- safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
- safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
- GURL request_url("http://example.com");
- std::string url_param;
- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url",
@@ -1093,15 +1095,15 @@
- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type",
- &type_param)) {
- if (type_param == "malware") {
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
- } else if (type_param == "phishing") {
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_PHISHING;
- } else if (type_param == "unwanted") {
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_UNWANTED;
- } else if (type_param == "billing") {
- threat_type = safe_browsing::SB_THREAT_TYPE_BILLING;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_BILLING;
- } else if (type_param == "giant") {
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
- threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
- is_giant_webview = true;
- }
- }
@@ -1137,7 +1139,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -546,12 +396,8 @@ void InterstitialHTMLSource::StartDataRe
@@ -543,12 +391,8 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1150,7 +1152,7 @@
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -566,16 +412,12 @@ void InterstitialHTMLSource::StartDataRe
@@ -563,12 +407,7 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
}
@@ -1159,28 +1161,22 @@
- CreateSafeBrowsingQuietBlockingPage(web_contents);
- html = blocking_page->GetHTML();
- interstitial_delegate = std::move(blocking_page);
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
- } else if (path_without_query == "/supervised_user") {
+ if (path_without_query == "/supervised_user") {
html = GetSupervisedUserInterstitialHTML(path);
+ } else
#endif
- } else if (interstitial_delegate.get()) {
+ if (interstitial_delegate.get()) {
} else if (interstitial_delegate.get()) {
html = interstitial_delegate.get()->GetHTMLContents();
} else {
html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -103,7 +103,6 @@
#include "components/pdf/common/constants.h"
@@ -106,7 +106,6 @@
#include "components/pdf/common/pdf_util.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/buildflags.h"
-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
#include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
@@ -467,12 +466,8 @@ void ChromeContentRendererClient::Render
@@ -465,12 +464,8 @@ void ChromeContentRendererClient::Render
subresource_filter_ruleset_dealer_ =
std::make_unique<subresource_filter::UnverifiedRulesetDealer>();

View File

@@ -1,6 +1,6 @@
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -150,10 +150,10 @@ const size_t kMaxHostLength = 4096;
@@ -151,10 +151,10 @@ const size_t kMaxHostLength = 4096;
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -13,4 +13,4 @@
+ 0x00, 0x00, 0x00, 0x01};
// True if |hostname| ends with either ".local" or ".local.".
bool ResemblesMulticastDNSName(base::StringPiece hostname) {
bool ResemblesMulticastDNSName(std::string_view hostname) {

View File

@@ -2,7 +2,7 @@
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -459,14 +459,6 @@ group("gn_all") {
@@ -460,14 +460,6 @@ group("gn_all") {
deps += [ "//chromeos:chromeos_unittests" ]
}

View File

@@ -112,7 +112,7 @@ by default.
scoped_refptr<base::SequencedTaskRunner> task_runner)
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -523,7 +523,7 @@ void WebRtcLogUploader::UploadCompressed
@@ -525,7 +525,7 @@ void WebRtcLogUploader::UploadCompressed
}
})");
@@ -178,7 +178,7 @@ by default.
base::ToLowerASCII(bdict_file));
--- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
+++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
@@ -42,7 +42,7 @@ const char* kUpdateBrowserRedirectUrl =
@@ -44,7 +44,7 @@ const char* kUpdateBrowserRedirectUrl =
#else
// The URL to be used to re-install Chrome when auto-update failed for
// too long.
@@ -227,7 +227,7 @@ by default.
--- a/chrome/installer/setup/google_chrome_behaviors.cc
+++ b/chrome/installer/setup/google_chrome_behaviors.cc
@@ -37,7 +37,7 @@ namespace installer {
@@ -36,7 +36,7 @@ namespace installer {
namespace {
constexpr std::wstring_view kUninstallSurveyUrl(
@@ -366,7 +366,7 @@ by default.
+const char kSecurityOrigin[] = "trk:220:https://translate.googleapis.com/";
// The feature is explicitly disabled on Webview and Weblayer.
// TODO(crbug.com/1292622): Enable the feature on Webview.
// TODO(crbug.com/40819484): Enable the feature on Webview.
--- a/components/variations/variations_url_constants.cc
+++ b/components/variations/variations_url_constants.cc
@@ -8,7 +8,7 @@ namespace variations {
@@ -380,7 +380,7 @@ by default.
"http://clientservices.googleapis.com/chrome-variations/seed";
--- a/content/browser/speech/network_speech_recognition_engine_impl.cc
+++ b/content/browser/speech/network_speech_recognition_engine_impl.cc
@@ -34,7 +34,7 @@ namespace content {
@@ -35,7 +35,7 @@ namespace content {
namespace {
const char kWebServiceBaseUrl[] =
@@ -416,7 +416,7 @@ by default.
GURL url(base::WideToUTF16(args[0]));
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -30,10 +30,10 @@ bool IsSourceFromAnExtension(const std::
@@ -32,10 +32,10 @@ bool IsSourceFromAnExtension(const std::
namespace extension_urls {

View File

@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
IncidentReportingService::IncidentReportingService(
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -333,7 +333,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -371,7 +371,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {

View File

@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -245,6 +245,10 @@ void ClientSideDetectionService::StartCl
@@ -249,6 +249,10 @@ void ClientSideDetectionService::StartCl
return;
}
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
std::string request_data;
request->SerializeToString(&request_data);
@@ -326,6 +330,7 @@ void ClientSideDetectionService::StartCl
@@ -330,6 +334,7 @@ void ClientSideDetectionService::StartCl
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIInfoSingleton::GetInstance()),
std::move(request), access_token));

View File

@@ -48,8 +48,8 @@
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
@@ -53,6 +53,9 @@ HashAffiliationFetcher::HashAffiliationF
HashAffiliationFetcher::~HashAffiliationFetcher() = default;
@@ -121,6 +121,9 @@ AffiliationFetcherDelegate* HashAffiliat
}
void HashAffiliationFetcher::StartRequest(
+ const std::vector<FacetURI>& a, RequestInfo b) {}
@@ -60,14 +60,14 @@
requested_facet_uris_ = facet_uris;
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.h
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.h
@@ -22,6 +22,7 @@ class HashAffiliationFetcher : public Af
@@ -37,6 +37,7 @@ class HashAffiliationFetcher : public Af
// AffiliationFetcherInterface
void StartRequest(const std::vector<FacetURI>& facet_uris,
RequestInfo request_info) override;
+ void DeadStartRequest(const std::vector<FacetURI>& a, RequestInfo b);
// AffiliationFetcherInterface
const std::vector<FacetURI>& GetRequestedFacetURIs() const override;
// Builds the URL for the Affiliation API's lookup method.
--- a/components/assist_ranker/ranker_url_fetcher.cc
+++ b/components/assist_ranker/ranker_url_fetcher.cc
@@ -31,6 +31,7 @@ bool RankerURLFetcher::Request(

View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetI
@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI
if (base::IsStringASCII(scheme) &&
(ProfileIOData::IsHandledProtocol(scheme) ||
base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
@@ -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
@@ -836,6 +836,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -825,6 +825,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
@@ -988,6 +988,8 @@ component("net") {
@@ -996,6 +996,8 @@ component("net") {
"url_request/referrer_policy.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -181,7 +181,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
#include "url/url_constants.h"
@@ -561,6 +562,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -577,6 +578,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();
@@ -191,17 +191,6 @@
context->set_job_factory(std::move(job_factory));
if (cookie_deprecation_label_.has_value()) {
--- a/url/url_constants.cc
+++ b/url/url_constants.cc
@@ -42,6 +42,8 @@ const char kMailToScheme[] = "mailto";
const char16_t kMailToScheme16[] = u"mailto";
const char kTelScheme[] = "tel";
const char16_t kTelScheme16[] = u"tel";
+const char kTraceScheme[] = "trk";
+const char16_t kTraceScheme16[] = u"trk";
const char kUrnScheme[] = "urn";
const char16_t kUrnScheme16[] = u"urn";
const char kUuidInPackageScheme[] = "uuid-in-package";
--- a/url/url_constants.h
+++ b/url/url_constants.h
@@ -45,6 +45,8 @@ inline constexpr char kMailToScheme[] =

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2514,24 +2514,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2548,24 +2548,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -44,18 +44,18 @@
const base::FilePath& exe_path,
--- a/components/gwp_asan/client/gwp_asan.cc
+++ b/components/gwp_asan/client/gwp_asan.cc
@@ -239,6 +239,11 @@ bool IsMutuallyExclusiveFeatureAllowed(c
@@ -241,6 +241,11 @@ bool IsMutuallyExclusiveFeatureAllowed(c
// Exported for testing.
GWP_ASAN_EXPORT std::optional<AllocatorSettings> GetAllocatorSettings(
+ const base::Feature& a, bool b, const char* c) {
+ const base::Feature& a, bool b) {
+ return std::nullopt;
+}
+[[maybe_unused]]
+std::optional<AllocatorSettings> DeadGetAllocatorSettings(
const base::Feature& feature,
bool boost_sampling,
const char* process_type) {
bool boost_sampling) {
if (!base::FeatureList::IsEnabled(feature))
--- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
@@ -748,8 +748,6 @@ void CrashpadClient::CrashWithoutDump(co

View File

@@ -521,7 +521,7 @@
- const base::StringPiece hostname = url.host_piece();
- if (registry_length == 0 || registry_length == std::string::npos ||
- registry_length >= hostname.length()) {
- return std::optional<std::string>();
- return std::nullopt;
- }
-
- // Removes the tld and the preceding dot.
@@ -533,12 +533,11 @@
-
- if (!base::EndsWith(hostname_minus_registry, ".google",
- base::CompareCase::INSENSITIVE_ASCII)) {
- return std::optional<std::string>();
return std::nullopt;
- }
-
- return std::string(hostname_minus_registry.substr(
- 0, hostname_minus_registry.length() - strlen(".google")));
+ return std::optional<std::string>();
}
bool IsGoogleHostname(const GURL& url) {

View File

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -369,7 +369,6 @@ if (!is_android && !is_mac) {
@@ -372,7 +372,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -1215,7 +1214,6 @@ if (is_win) {
@@ -1218,7 +1217,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_library",
":widevine_cdm_library",

View File

@@ -11,7 +11,7 @@
"AttributionReportingTriggerContextId",
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -123,7 +123,7 @@ std::set<browsing_topics::Topic> GetTopi
@@ -125,7 +125,7 @@ std::set<browsing_topics::Topic> GetTopi
// static
bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -20,7 +20,7 @@
}
// static
@@ -744,7 +744,7 @@ void PrivacySandboxSettingsImpl::SetTopi
@@ -757,7 +757,7 @@ void PrivacySandboxSettingsImpl::SetTopi
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -29,7 +29,7 @@
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
@@ -813,11 +813,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
@@ -826,11 +826,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
return Status::kIncognitoProfile;
}

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -175,31 +175,13 @@ void WebRtcLogUploader::OnLoggingStopped
@@ -176,31 +176,13 @@ void WebRtcLogUploader::OnLoggingStopped
DCHECK(meta_data.get());
DCHECK(!upload_done_data.paths.directory.empty());
@@ -35,7 +35,7 @@
} else {
main_task_runner_->PostTask(
FROM_HERE,
@@ -216,28 +198,7 @@ void WebRtcLogUploader::PrepareMultipart
@@ -217,28 +199,7 @@ void WebRtcLogUploader::PrepareMultipart
DCHECK(!compressed_log.empty());
DCHECK(meta_data.get());
@@ -65,7 +65,7 @@
}
void WebRtcLogUploader::UploadStoredLog(
@@ -303,48 +264,6 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -305,48 +266,6 @@ void WebRtcLogUploader::LoggingStoppedDo
DCHECK(log_buffer.get());
DCHECK(!log_paths.directory.empty());
@@ -116,7 +116,7 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -100,7 +100,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -107,7 +107,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

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
@@ -707,12 +707,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -720,12 +720,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
@@ -363,12 +363,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
@@ -361,12 +361,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
// Enable DNS over HTTPS (DoH).
BASE_FEATURE(kDnsOverHttps,
"DnsOverHttps",
@@ -15,7 +15,7 @@
// 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
@@ -165,30 +165,6 @@ const DohProviderEntry::List& DohProvide
@@ -166,30 +166,6 @@ const DohProviderEntry::List& DohProvide
/*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
LoggingLevel::kNormal),
new DohProviderEntry(

View File

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -934,8 +934,6 @@ if (is_win) {
@@ -937,8 +937,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
@@ -847,10 +847,6 @@ static_library("browser") {
@@ -853,10 +853,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",
@@ -25,7 +25,7 @@
"navigation_predictor/search_engine_preconnector.cc",
"navigation_predictor/search_engine_preconnector.h",
"net/chrome_mojo_proxy_resolver_factory.cc",
@@ -963,10 +959,6 @@ static_library("browser") {
@@ -969,10 +965,6 @@ static_library("browser") {
"optimization_guide/chrome_prediction_model_store.h",
"optimization_guide/model_execution/chrome_on_device_model_service_controller.cc",
"optimization_guide/model_execution/chrome_on_device_model_service_controller.h",
@@ -52,14 +52,14 @@
}
-base::TimeDelta MLModelExecutionTimerInterval() {
- static int timer_interval = base::GetFieldTrialParamByFeatureAsInt(
- blink::features::kPreloadingHeuristicsMLModel, "timer_interval", 100);
- static int timer_interval =
- blink::features::kPreloadingModelTimerInterval.Get();
- return base::Milliseconds(timer_interval);
-}
bool MaySendTraffic() {
// TODO(b/290223353): Due to concerns about the amount of traffic this feature
@@ -363,69 +356,6 @@ void NavigationPredictor::ProcessPointer
@@ -364,71 +357,6 @@ void NavigationPredictor::ProcessPointer
}
void NavigationPredictor::OnMLModelExecutionTimerFired() {
@@ -104,12 +104,14 @@
- inputs.percent_vertical_distance =
- static_cast<int>(anchor.ratio_distance_root_top * 100);
-
- inputs.is_same_origin = anchor.is_same_host;
- inputs.is_same_host = anchor.is_same_host;
- auto to_timedelta = [this](std::optional<base::TimeTicks> ts) {
- return ts.has_value() ? NowTicks() - ts.value() : base::TimeDelta();
- };
- inputs.entered_viewport_to_left_viewport =
- to_timedelta(anchor.entered_viewport_timestamp);
- // TODO(329691634): Using the real viewport entry time for
- // `entered_viewport_to_left_viewport` produces low quality results.
- // We could remove it from the model, if we can't get this to be useful.
- inputs.entered_viewport_to_left_viewport = base::TimeDelta();
- inputs.hover_dwell_time = to_timedelta(anchor.pointer_over_timestamp);
- inputs.pointer_hovering_over_count = anchor.pointer_hovering_over_count;
- if (model_score_callback_) {
@@ -139,7 +141,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"
@@ -933,7 +932,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -931,7 +930,6 @@ void ChromeBrowserMainExtraPartsProfiles
#endif
ModelTypeStoreServiceFactory::GetInstance();
NavigationPredictorKeyedServiceFactory::GetInstance();
@@ -147,7 +149,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -980,9 +978,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -978,9 +976,6 @@ void ChromeBrowserMainExtraPartsProfiles
}
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -167,7 +169,7 @@
#include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/delete_profile_helper.h"
@@ -1545,9 +1544,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1543,9 +1542,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -315,10 +317,10 @@
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.h"
@@ -206,15 +204,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -214,15 +212,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
highlightGranularity);
}
@@ -336,7 +338,7 @@
}
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -407,7 +407,7 @@ source_set("lib") {
@@ -405,7 +405,7 @@ source_set("lib") {
}
}
@@ -379,7 +381,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -773,10 +773,6 @@ if (is_apple) {
@@ -766,10 +766,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
@@ -635,8 +635,6 @@ static_library("browser") {
@@ -639,8 +639,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",
"k_anonymity_service/k_anonymity_service_client.cc",
@@ -3789,9 +3787,6 @@ static_library("browser") {
@@ -3845,9 +3843,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",
@@ -4100,10 +4095,6 @@ static_library("browser") {
@@ -4159,10 +4154,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",
@@ -31,16 +31,16 @@
- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.h",
"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/modules/v2/tab_resumption/tab_resumption_page_handler.cc",
@@ -4581,7 +4572,6 @@ static_library("browser") {
"new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.cc",
@@ -4644,7 +4635,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",
- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/tab_resumption:mojo_bindings",
"//chrome/browser/policy:path_parser",
@@ -6423,10 +6413,6 @@ static_library("browser") {
@@ -6497,10 +6487,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",
@@ -7992,9 +7978,14 @@ static_library("browser") {
@@ -8006,9 +7992,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
@@ -5124,11 +5124,13 @@ ChromeContentBrowserClient::CreateThrott
@@ -5202,11 +5202,13 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -83,7 +83,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -6957,26 +6959,7 @@ ChromeContentBrowserClient::GetSafeBrows
@@ -7030,26 +7032,7 @@ ChromeContentBrowserClient::GetSafeBrows
const std::vector<std::string>& allowlist_domains) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -111,7 +111,7 @@
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -6997,11 +6980,6 @@ ChromeContentBrowserClient::GetUrlLookup
@@ -7070,11 +7053,6 @@ ChromeContentBrowserClient::GetUrlLookup
GetForProfile(profile);
}
#endif
@@ -123,7 +123,7 @@
return nullptr;
}
@@ -7013,32 +6991,7 @@ ChromeContentBrowserClient::GetAsyncChec
@@ -7086,32 +7064,7 @@ ChromeContentBrowserClient::GetAsyncChec
safe_browsing::hash_realtime_utils::HashRealTimeSelection
hash_realtime_selection,
int frame_tree_node_id) {
@@ -196,9 +196,16 @@
break;
case DownloadCommands::RETRY:
RetryDownload(model.get(), command);
@@ -386,6 +374,4 @@ DownloadBubbleUIController::GetWeakPtr()
}
void DownloadBubbleUIController::SetDeepScanNoticeSeen() {
- profile_->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingAutomaticDeepScanningIPHSeen, true);
}
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -149,7 +149,6 @@ using content::DownloadManager;
@@ -151,7 +151,6 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -206,7 +213,7 @@
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -645,15 +644,6 @@ bool ChromeDownloadManagerDelegate::Shou
@@ -655,15 +654,6 @@ bool ChromeDownloadManagerDelegate::Shou
#endif
bool should_open = download_prefs_->IsAutoOpenEnabled(url, path);
@@ -222,7 +229,7 @@
return should_open;
}
@@ -1633,7 +1623,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -1640,7 +1630,6 @@ void ChromeDownloadManagerDelegate::OnDo
DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info.target_path, target_info.is_filetype_handled_safely);
@@ -230,7 +237,7 @@
}
if (ShouldBlockFile(item, target_info.danger_type)) {
MaybeReportDangerousDownloadBlocked(
@@ -1714,59 +1703,6 @@ bool ChromeDownloadManagerDelegate::IsOp
@@ -1721,53 +1710,6 @@ bool ChromeDownloadManagerDelegate::IsOp
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item,
download::DownloadDangerType danger_type) const {
@@ -245,12 +252,6 @@
- if (IsDangerTypeBlocked(danger_type))
- return true;
-
- // TODO(crbug/1061111): Move this into IsDangerTypeBlocked once the UX is
- // ready.
- if (danger_type ==
- download::DOWNLOAD_DANGER_TYPE_BLOCKED_UNSUPPORTED_FILETYPE)
- return true;
-
- bool file_type_dangerous =
- (item && DownloadItemModel(item).GetDangerLevel() !=
- DownloadFileType::NOT_DANGEROUS);
@@ -290,7 +291,7 @@
return false;
}
@@ -1781,7 +1717,6 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1782,7 +1724,6 @@ void ChromeDownloadManagerDelegate::Mayb
service->MaybeSendDangerousDownloadOpenedReport(download,
show_download_in_folder);
}
@@ -298,15 +299,15 @@
if (!download->GetAutoOpened()) {
download::DownloadContent download_content =
download::DownloadContentFromMimeType(download->GetMimeType(), false);
@@ -1789,6 +1724,7 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1790,6 +1731,7 @@ void ChromeDownloadManagerDelegate::Mayb
download->GetDangerType(), download_content, base::Time::Now(),
download->GetEndTime(), show_download_in_folder);
}
+#endif
}
void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
@@ -1846,8 +1782,7 @@ void ChromeDownloadManagerDelegate::Chec
void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadCanceledReport(
@@ -1880,8 +1822,7 @@ void ChromeDownloadManagerDelegate::Chec
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -318,7 +319,7 @@
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -910,30 +910,6 @@ void DownloadItemModel::ExecuteCommand(D
@@ -960,30 +960,6 @@ void DownloadItemModel::ExecuteCommand(D
}
TailoredWarningType DownloadItemModel::GetTailoredWarningType() const {
@@ -498,7 +499,7 @@
- // We add the request here in case we never actually uploaded anything, so it
- // wasn't added in OnGetRequestData
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests(
- request->per_profile_request(), /*access_token*/ "",
- request->per_profile_request(), /*access_token*/ "", /*upload_info*/ "",
- request->content_analysis_request());
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses(
- /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result),
@@ -522,7 +523,7 @@
void OnGotFileInfo(
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
@@ -452,37 +452,8 @@ std::optional<std::string> ConnectorsSer
@@ -453,37 +453,8 @@ std::optional<std::string> ConnectorsSer
return std::nullopt;
}
@@ -663,29 +664,32 @@
const base::Value::List* enabled_opt_in_events_value =
--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
@@ -49,20 +49,6 @@ void RunPendingNavigationCallback(
@@ -65,12 +65,6 @@ void RunPendingNavigationCallback(
auto* user_data = GetUserData(web_contents);
DCHECK(user_data);
- // TODO: Move this logic out of this class and into DataProtectionPageUserData
- if (!user_data->watermark_text().empty() && user_data->rt_lookup_response() &&
- !user_data->rt_lookup_response()->threat_info().empty() &&
- user_data->rt_lookup_response()->threat_info(0).verdict_type() ==
- safe_browsing::RTLookupResponse::ThreatInfo::SAFE) {
- // For warn/block+watermark verdicts, a security event is reported as part
- // of the interstitial page appearing. For SAFE verdicts no interstitial is
- // shown, so the report indicating a watermark was shown to the user must be
- // done separately here.
- if (ShouldReportWatermark(user_data)) {
- MaybeTriggerUrlFilteringInterstitialEvent(
- web_contents, web_contents->GetLastCommittedURL(),
- /*threat_type=*/"", *user_data->rt_lookup_response());
- }
-
std::move(callback).Run(user_data->watermark_text());
std::move(callback).Run(user_data->settings());
}
@@ -218,16 +204,6 @@ void DataProtectionNavigationObserver::C
std::move(callback).Run(std::string());
@@ -161,9 +155,7 @@ void LogVerdictSource(
bool IsScreenshotAllowedByDataControls(content::BrowserContext* context,
const GURL& url) {
- auto* rules =
- data_controls::RulesServiceFactory::GetForBrowserContext(context);
- return rules ? !rules->BlockScreenshots(url) : true;
+ return true;
}
} // namespace
@@ -186,16 +178,6 @@ void DataProtectionNavigationObserver::C
std::move(callback).Run(UrlSettings::None());
return;
}
-
@@ -701,24 +705,45 @@
}
// static
@@ -245,14 +221,7 @@ void DataProtectionNavigationObserver::G
return;
}
@@ -228,35 +210,9 @@ void DataProtectionNavigationObserver::G
GetPageFromWebContents(web_contents), identifier,
IsScreenshotAllowedByDataControls(profile, url));
- auto* lookup_service = safe_browsing::
- ChromeEnterpriseRealTimeUrlLookupServiceFactory::GetForProfile(profile);
- if (lookup_service && web_contents->GetLastCommittedURL().is_valid()) {
- DoStringLookup(lookup_service, web_contents->GetLastCommittedURL(),
- GetIdentifier(profile), std::move(callback), web_contents);
- auto* lookup_service =
- g_lookup_service
- ? g_lookup_service
- : safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory::
- GetForProfile(profile);
- if (lookup_service) {
- auto lookup_callback = base::BindOnce(
- [](const std::string& identifier,
- DataProtectionNavigationObserver::Callback callback,
- base::WeakPtr<content::WebContents> web_contents,
- std::unique_ptr<safe_browsing::RTLookupResponse> response) {
- if (web_contents) {
- DataProtectionPageUserData::UpdateRTLookupResponse(
- GetPageFromWebContents(web_contents.get()), identifier,
- std::move(response));
- auto* user_data = GetUserData(web_contents.get());
- DCHECK(user_data);
- std::move(callback).Run(user_data->settings());
- }
- },
- std::move(identifier), std::move(callback), web_contents->GetWeakPtr());
-
- DoLookup(lookup_service, web_contents->GetLastCommittedURL(),
- GetIdentifier(profile), std::move(lookup_callback), web_contents);
- } else {
std::move(callback).Run(std::string());
ud = GetUserData(web_contents);
DCHECK(ud);
std::move(callback).Run(ud->settings());
- }
}
DataProtectionNavigationObserver::DataProtectionNavigationObserver(
// static
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
@@ -221,7 +221,6 @@ void ContextInfoFetcher::Fetch(ContextIn
@@ -222,7 +222,6 @@ void ContextInfoFetcher::Fetch(ContextIn
GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
info.on_print_providers =
GetAnalysisConnectorProviders(enterprise_connectors::PRINT);
@@ -726,7 +751,7 @@
info.on_security_event_providers = GetOnSecurityEventProviders();
info.browser_version = version_info::GetVersionNumber();
info.site_isolation_enabled =
@@ -278,11 +277,6 @@ std::vector<std::string> ContextInfoFetc
@@ -279,11 +278,6 @@ std::vector<std::string> ContextInfoFetc
return connectors_service_->GetAnalysisServiceProviderNames(connector);
}
@@ -824,7 +849,7 @@
} // namespace utils
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -313,10 +313,6 @@ static_library("extensions") {
@@ -315,10 +315,6 @@ static_library("extensions") {
"api/runtime/chrome_runtime_api_delegate.h",
"api/safe_browsing_private/safe_browsing_private_api.cc",
"api/safe_browsing_private/safe_browsing_private_api.h",
@@ -835,7 +860,7 @@
"api/safe_browsing_private/safe_browsing_util.cc",
"api/safe_browsing_private/safe_browsing_util.h",
"api/search/search_api.cc",
@@ -655,8 +651,6 @@ static_library("extensions") {
@@ -657,8 +653,6 @@ static_library("extensions") {
"menu_manager_factory.h",
"navigation_extension_enabler.cc",
"navigation_extension_enabler.h",
@@ -903,7 +928,7 @@
CookiesSetFunction::CookiesSetFunction()
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -92,16 +92,8 @@ api::enterprise_reporting_private::Conte
@@ -93,16 +93,8 @@ api::enterprise_reporting_private::Conte
info.third_party_blocking_enabled = signals.third_party_blocking_enabled;
info.os_firewall = ToInfoSettingValue(signals.os_firewall);
info.system_dns_servers = std::move(signals.system_dns_servers);
@@ -922,7 +947,7 @@
info.enterprise_profile_id = signals.enterprise_profile_id;
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -341,8 +341,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -343,8 +343,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::kGeneratedHttpsFirstModePref] =
settings_api::PrefType::kNumber;
@@ -1087,9 +1112,9 @@
#include "chrome/browser/extensions/installed_loader.h"
-#include "chrome/browser/extensions/omaha_attributes_handler.h"
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "chrome/browser/extensions/permissions/permissions_updater.h"
#include "chrome/browser/extensions/profile_util.h"
@@ -233,7 +232,6 @@ void ExtensionService::BlocklistExtensio
@@ -229,7 +228,6 @@ void ExtensionService::BlocklistExtensio
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
extension_prefs_);
@@ -1097,7 +1122,7 @@
}
void ExtensionService::GreylistExtensionForTest(
@@ -241,7 +239,6 @@ void ExtensionService::GreylistExtension
@@ -237,7 +235,6 @@ void ExtensionService::GreylistExtension
const BitMapBlocklistState& state) {
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(extension_id, state,
extension_prefs_);
@@ -1105,7 +1130,7 @@
}
bool ExtensionService::OnExternalExtensionUpdateUrlFound(
@@ -409,9 +406,6 @@ ExtensionService::ExtensionService(
@@ -405,9 +402,6 @@ ExtensionService::ExtensionService(
safe_browsing_verdict_handler_(extension_prefs,
ExtensionRegistry::Get(profile),
this),
@@ -1115,7 +1140,7 @@
extension_telemetry_service_verdict_handler_(
extension_prefs,
ExtensionRegistry::Get(profile),
@@ -944,17 +938,6 @@ bool ExtensionService::IsExtensionEnable
@@ -940,17 +934,6 @@ bool ExtensionService::IsExtensionEnable
return extension_registrar_.IsExtensionEnabled(extension_id);
}
@@ -1133,7 +1158,7 @@
void ExtensionService::PerformActionBasedOnExtensionTelemetryServiceVerdicts(
const Blocklist::BlocklistStateMap& blocklist_state_map) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -964,89 +947,6 @@ void ExtensionService::PerformActionBase
@@ -960,89 +943,6 @@ void ExtensionService::PerformActionBase
error_controller_->ShowErrorIfNeeded();
}
@@ -1354,8 +1379,8 @@
-#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"
@@ -426,90 +425,6 @@ bool ShouldBlockAccessToPath(const base:
#include "chrome/grit/generated_resources.h"
@@ -426,89 +425,6 @@ bool ShouldBlockAccessToPath(const base:
return true;
}
@@ -1419,7 +1444,6 @@
- case Result::POTENTIALLY_UNWANTED:
- case Result::BLOCKED_PASSWORD_PROTECTED:
- case Result::BLOCKED_TOO_LARGE:
- case Result::BLOCKED_UNSUPPORTED_FILE_TYPE:
- case Result::DANGEROUS_ACCOUNT_COMPROMISE:
- case Result::BLOCKED_SCAN_FAILED:
- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
@@ -1446,7 +1470,7 @@
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
return id.empty() ? kDefaultLastPickedDirectoryKey
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
@@ -529,13 +444,7 @@ std::string_view GetGrantKeyFromGrantTyp
@@ -528,13 +444,7 @@ std::string_view GetGrantKeyFromGrantTyp
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -1461,7 +1485,7 @@
}
} // namespace
@@ -1693,29 +1602,6 @@ void ChromeFileSystemAccessPermissionCon
@@ -1701,29 +1611,6 @@ void ChromeFileSystemAccessPermissionCon
std::move(callback));
}
@@ -1556,7 +1580,7 @@
#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"
@@ -898,6 +897,7 @@ autofill::LanguageCode ChromePasswordMan
@@ -910,6 +909,7 @@ autofill::LanguageCode ChromePasswordMan
return autofill::LanguageCode();
}
@@ -1564,7 +1588,7 @@
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
return safe_browsing::ChromePasswordProtectionService::
@@ -917,6 +917,7 @@ void ChromePasswordManagerClient::CheckS
@@ -929,6 +929,7 @@ void ChromePasswordManagerClient::CheckS
}
}
#endif // defined(ON_FOCUS_PING_ENABLED)
@@ -1572,7 +1596,7 @@
#if !BUILDFLAG(IS_ANDROID)
void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
@@ -924,28 +925,10 @@ void ChromePasswordManagerClient::MaybeR
@@ -936,28 +937,10 @@ void ChromePasswordManagerClient::MaybeR
bool is_federated,
const url::Origin& federated_origin,
const std::u16string& login_user_name) const {
@@ -1601,7 +1625,7 @@
}
#endif
@@ -1565,6 +1548,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1605,6 +1588,7 @@ bool ChromePasswordManagerClient::IsPass
is_enabled = false;
}
@@ -1609,7 +1633,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
@@ -1575,6 +1559,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1615,6 +1599,7 @@ bool ChromePasswordManagerClient::IsPass
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -1619,7 +1643,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
@@ -233,6 +233,7 @@ class ChromePasswordManagerClient
@@ -235,6 +235,7 @@ class ChromePasswordManagerClient
void AnnotateNavigationEntry(bool has_password_field) override;
autofill::LanguageCode GetPageLanguage() const override;
@@ -1627,7 +1651,7 @@
safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
const override;
@@ -240,6 +241,7 @@ class ChromePasswordManagerClient
@@ -242,6 +243,7 @@ class ChromePasswordManagerClient
void CheckSafeBrowsingReputation(const GURL& form_action,
const GURL& frame_url) override;
#endif
@@ -1637,7 +1661,7 @@
#if !BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -393,16 +393,6 @@ void ChromePermissionsClient::OnPromptRe
@@ -394,16 +394,6 @@ void ChromePermissionsClient::OnPromptRe
PermissionRevocationRequest::ExemptOriginFromFutureRevocations(profile,
origin);
}
@@ -1822,7 +1846,7 @@
}
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -108,6 +108,7 @@
@@ -107,6 +107,7 @@
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
#include "components/privacy_sandbox/tracking_protection_prefs.h"
#include "components/proxy_config/proxy_policy_handler.h"
@@ -1830,7 +1854,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"
@@ -2234,8 +2235,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2240,8 +2241,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -1839,7 +1863,7 @@
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
handlers->AddHandler(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
@@ -2332,20 +2331,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2338,20 +2337,6 @@ std::unique_ptr<ConfigurationPolicyHandl
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
@@ -1862,15 +1886,15 @@
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -281,7 +281,6 @@
#include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
@@ -277,7 +277,6 @@
#include "chrome/browser/new_tab_page/modules/file_suggestion/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"
-#include "chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/tab_resumption/tab_resumption_page_handler.h"
#include "chrome/browser/new_tab_page/promos/promo_service.h"
#include "chrome/browser/policy/developer_tools_policy_handler.h"
@@ -1915,7 +1914,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -1965,7 +1964,6 @@ void RegisterProfilePrefs(user_prefs::Pr
media_router::RegisterProfilePrefs(registry);
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
@@ -1880,7 +1904,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
@@ -784,9 +784,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -782,9 +782,6 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
#endif
@@ -1890,7 +1914,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_ANDROID)
enterprise_idle::IdleServiceFactory::GetInstance();
@@ -1101,23 +1098,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1099,23 +1096,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if !BUILDFLAG(IS_ANDROID)
ResetReportUploaderFactory::GetInstance();
#endif
@@ -2101,7 +2125,7 @@
} // namespace
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -598,7 +598,6 @@ static_library("ui") {
@@ -611,7 +611,6 @@ static_library("ui") {
"//components/renderer_context_menu",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -2109,7 +2133,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser/db:database_manager",
@@ -4127,8 +4126,6 @@ static_library("ui") {
@@ -4182,8 +4181,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",
@@ -2118,7 +2142,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",
@@ -5798,8 +5795,6 @@ static_library("ui") {
@@ -5874,8 +5871,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",
@@ -2137,6 +2161,42 @@
#include "chrome/browser/ui/color/chrome_color_id.h"
#include "chrome/browser/ui/download/download_item_mode.h"
#include "chrome/grit/generated_resources.h"
@@ -366,11 +365,5 @@ void DownloadBubbleRowViewInfo::Reset()
}
bool DownloadBubbleRowViewInfo::ShouldShowDeepScanNotice() const {
- return model_->GetDangerType() ==
- download::DOWNLOAD_DANGER_TYPE_PROMPT_FOR_SCANNING &&
- safe_browsing::IsEnhancedProtectionEnabled(
- *model_->profile()->GetPrefs()) &&
- base::FeatureList::IsEnabled(
- safe_browsing::kDeepScanningPromptRemoval);
- ;
+ return false;
}
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -112,20 +112,6 @@ void RecordWebsiteStateAtApiRequest(hist
void CheckUrlForAllowlistAndRecordMetric(
const GURL& url,
history::HistoryLastVisitResult result) {
- if (!g_browser_process->safe_browsing_service() ||
- !g_browser_process->safe_browsing_service()->database_manager()) {
- RecordWebsiteStateAtApiRequest(result, std::nullopt);
- return;
- }
- g_browser_process->safe_browsing_service()
- ->database_manager()
- ->CheckUrlForHighConfidenceAllowlist(
- url, "RT" /*realtime*/,
- base::BindOnce(
- [](history::HistoryLastVisitResult result, bool on_allowlist) {
- RecordWebsiteStateAtApiRequest(result, on_allowlist);
- },
- result));
}
} // namespace
--- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
+++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
@@ -16,6 +16,7 @@
@@ -2165,7 +2225,7 @@
void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -373,7 +373,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -375,7 +375,6 @@ void TabHelpers::AttachTabHelpers(WebCon
if (!autofill_client_provider.uses_platform_autofill()) {
ChromePasswordManagerClient::CreateForWebContents(web_contents);
}
@@ -2183,7 +2243,29 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_element_identifiers.h"
@@ -165,66 +164,16 @@ void DownloadBubbleContentsView::Process
@@ -40,21 +39,6 @@ namespace {
void MaybeSendDownloadReport(content::BrowserContext* browser_context,
download::DownloadItem* download) {
- if (download->GetURL().is_empty() || browser_context->IsOffTheRecord()) {
- return;
- }
-
- safe_browsing::SafeBrowsingService* service =
- g_browser_process->safe_browsing_service();
- if (!service) {
- return;
- }
-
- service->SendDownloadReport(download,
- safe_browsing::ClientSafeBrowsingReportRequest::
- DANGEROUS_DOWNLOAD_RECOVERY,
- /*did_proceed=*/true,
- /*show_download_in_folder=*/std::nullopt);
}
} // namespace
@@ -189,69 +173,16 @@ void DownloadBubbleContentsView::Process
const ContentId& id,
DownloadItemWarningData::DeepScanTrigger trigger,
base::optional_ref<const std::string> password) {
@@ -2227,9 +2309,11 @@
-
- protection_service->CancelChecksForDownload(item);
-
- content::BrowserContext* browser_context =
- content::DownloadItemUtils::GetBrowserContext(item);
- DownloadCoreService* download_core_service =
- DownloadCoreServiceFactory::GetForBrowserContext(
- content::DownloadItemUtils::GetBrowserContext(item));
- DownloadCoreServiceFactory::GetForBrowserContext(browser_context);
-
- DCHECK(download_core_service);
- ChromeDownloadManagerDelegate* delegate =
- download_core_service->GetDownloadManagerDelegate();
@@ -2242,6 +2326,7 @@
- safe_browsing::DownloadCheckResult::PROMPT_FOR_LOCAL_PASSWORD_SCANNING);
- } else if (command == DownloadCommands::BYPASS_DEEP_SCANNING) {
- LogLocalDecryptionEvent(safe_browsing::DeepScanEvent::kPromptBypassed);
- MaybeSendDownloadReport(browser_context, item);
- delegate->CheckClientDownloadDone(
- item->GetId(), safe_browsing::DownloadCheckResult::UNKNOWN);
- } else {
@@ -2250,38 +2335,6 @@
}
bool DownloadBubbleContentsView::IsEncryptedArchive(const ContentId& id) {
--- a/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc
+++ b/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc
@@ -792,29 +792,6 @@ void DownloadToolbarButtonView::ShowIphP
return;
}
#endif
-
- // Notify users that we're removing the ESB deep scanning
- // prompt. Users should only see the prompt if:
- // - They're not incognito, since we don't want to imply deep scans
- // happen incognito
- // - They're ESB users, since this isn't relevant to SSB users
- // - They didn't opt-in with the friendlier settings strings, since
- // then they should know this is possible.
- // - chrome://settings/security currently shows the friendlier
- // settings strings, so that clicking "Settings" on the IPH would
- // show them strings saying this is possible.
- if (!profile->IsOffTheRecord() &&
- safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs()) &&
- !profile->GetPrefs()->GetBoolean(
- prefs::kSafeBrowsingEsbOptInWithFriendlierSettings) &&
- base::FeatureList::IsEnabled(
- safe_browsing::kFriendlierSafeBrowsingSettingsEnhancedProtection) &&
- browser_->window()->MaybeShowFeaturePromo(
- feature_engagement::kIPHDeepScanPromptRemovalFeature)) {
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingAutomaticDeepScanningIPHSeen, true);
- return;
- }
}
void DownloadToolbarButtonView::OnPartialViewClosed() {
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -38,7 +38,6 @@
@@ -2292,7 +2345,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"
@@ -817,9 +816,7 @@ void DownloadItemView::UpdateLabels() {
@@ -824,9 +823,7 @@ void DownloadItemView::UpdateLabels() {
deep_scanning_label_->SetVisible(mode_ ==
download::DownloadItemMode::kDeepScanning);
if (deep_scanning_label_->GetVisible()) {
@@ -2303,7 +2356,7 @@
? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
: IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
const std::u16string filename = ElidedFilename(*deep_scanning_label_);
@@ -845,11 +842,15 @@ void DownloadItemView::UpdateButtons() {
@@ -852,11 +849,15 @@ void DownloadItemView::UpdateButtons() {
}
const bool allow_open_during_deep_scan =
@@ -2319,7 +2372,7 @@
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
prompt_to_scan || allow_open_during_deep_scan);
@@ -1274,7 +1275,9 @@ void DownloadItemView::ShowContextMenuIm
@@ -1280,7 +1281,9 @@ void DownloadItemView::ShowContextMenuIm
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -2375,7 +2428,7 @@
std::unique_ptr<RenderViewContextMenuBase>
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -485,9 +485,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -470,9 +470,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
}
if (url.host_piece() == chrome::kChromeUIPredictorsHost)
return &NewWebUI<PredictorsUI>;
@@ -2579,7 +2632,7 @@
// DownloadsDOMHandler, private: --------------------------------------------
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -1112,12 +1112,6 @@ base::Value::Dict ManagementUIHandler::G
@@ -1101,12 +1101,6 @@ base::Value::Dict ManagementUIHandler::G
&info);
}
@@ -2717,7 +2770,7 @@
std::move(callback),
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -729,7 +729,6 @@ const char* const kChromeHostURLs[] = {
@@ -725,7 +725,6 @@ const char* const kChromeHostURLs[] = {
kChromeUISuggestInternalsHost,
#endif
kChromeUINTPTilesInternalsHost,
@@ -2727,20 +2780,22 @@
kChromeUITabSearchHost,
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1929,8 +1929,6 @@ if (!is_android) {
@@ -1924,9 +1924,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection",
- "//components/safe_browsing/content/browser:client_side_detection_images_cache",
- "//components/safe_browsing/content/browser:client_side_detection_service",
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -6957,8 +6955,6 @@ test("unit_tests") {
@@ -6986,9 +6983,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection",
- "//components/safe_browsing/content/browser:client_side_detection_images_cache",
- "//components/safe_browsing/content/browser:client_side_detection_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:mock_password_protection",
@@ -2780,7 +2835,7 @@
# These two flags are equivalent, but `enable_print_content_analysis` still
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -540,7 +540,7 @@ void ContentPasswordManagerDriver::Check
@@ -558,7 +558,7 @@ void ContentPasswordManagerDriver::Check
if (!password_manager::bad_message::CheckFrameNotPrerendering(
render_frame_host_))
return;
@@ -2791,7 +2846,7 @@
}
--- a/components/password_manager/core/browser/password_manager_client.h
+++ b/components/password_manager/core/browser/password_manager_client.h
@@ -397,11 +397,14 @@ class PasswordManagerClient {
@@ -405,11 +405,14 @@ class PasswordManagerClient {
// Returns the current best guess as to the page's display language.
virtual autofill::LanguageCode GetPageLanguage() const;
@@ -2826,8 +2881,8 @@
+# }
--- a/components/safe_browsing/content/common/safe_browsing.mojom
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
@@ -159,7 +159,6 @@ interface PhishingDetector {
mojo_base.mojom.ByteString request_proto);
@@ -158,7 +158,6 @@ interface PhishingDetector {
mojo_base.mojom.ProtoWrapper? request);
};
-[EnableIf=full_safe_browsing]
@@ -2869,30 +2924,32 @@
+++ b/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service.cc
@@ -11,7 +11,6 @@
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_utils.h"
#include "components/safe_browsing/core/browser/utils/backoff_operator.h"
#include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/safe_browsing/core/common/utils.h"
#include "google_apis/google_api_keys.h"
#include "net/base/net_errors.h"
@@ -110,15 +109,7 @@ constexpr net::NetworkTrafficAnnotationT
@@ -110,17 +109,7 @@ constexpr net::NetworkTrafficAnnotationT
)");
bool IsEnabled(PrefService* 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.
- // |stored_permanent_country| as nullopt. |latest_country| is passed through
- // as null because it is not used.
- return safe_browsing::hash_realtime_utils::DetermineHashRealTimeSelection(
- /*is_off_the_record=*/false, pref_service,
- /*stored_permanent_country=*/std::nullopt) ==
- /*stored_permanent_country=*/std::nullopt,
- /*latest_country=*/std::nullopt) ==
- safe_browsing::hash_realtime_utils::HashRealTimeSelection::
- kHashRealTimeService;
+ return false;
}
GURL GetKeyFetchingUrl() {
@@ -367,25 +358,9 @@ void OhttpKeyService::MaybeStartServerTr
@@ -369,25 +358,9 @@ void OhttpKeyService::MaybeStartServerTr
}
void OhttpKeyService::PopulateKeyFromPref() {

View File

@@ -7,7 +7,7 @@
- "name": "Google",
- "keyword": "google.com",
- "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_alldp.ico",
- "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
- "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:language}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
- "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:clientCacheTimeToLive}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
- "image_url": "{google:baseSearchByImageURL}upload",
- "image_translate_url": "{google:baseSearchByImageURL}upload?filtertype=tr&{imageTranslateSourceLocale}{imageTranslateTargetLocale}",

View File

@@ -1,15 +1,15 @@
# 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
@@ -167,6 +167,7 @@
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/strings/grit/components_strings.h"
#include "components/supervised_user/core/common/buildflags.h"
@@ -172,6 +172,7 @@
#include "components/supervised_user/core/browser/supervised_user_preferences.h"
#include "components/supervised_user/core/browser/supervised_user_service.h"
#include "components/supervised_user/core/browser/supervised_user_url_filter.h"
+#include "components/translate/core/common/translate_switches.h"
#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"
@@ -2199,6 +2200,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2206,6 +2207,7 @@ void RenderViewContextMenu::AppendPageIt
menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
if (CanTranslate(/*menu_logging=*/true)) {

View File

@@ -9,7 +9,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2562,6 +2562,7 @@ static_library("browser") {
@@ -2615,6 +2615,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
@@ -169,6 +169,7 @@
@@ -170,6 +170,7 @@
#include "components/translate/core/common/translate_util.h"
#include "components/trusted_vault/features.h"
#include "components/ui_devtools/switches.h"
@@ -44,7 +44,7 @@
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -250,6 +250,7 @@ source_set("browser") {
@@ -252,6 +252,7 @@ source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/sqlite",
@@ -54,7 +54,7 @@
"//tools/v8_context_snapshot:buildflags",
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -77,6 +77,7 @@
@@ -78,6 +78,7 @@
#include "components/services/storage/public/cpp/quota_error_or.h"
#include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
#include "components/tracing/common/tracing_switches.h"
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/bad_message.h"
@@ -3440,6 +3441,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3449,6 +3450,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -73,7 +73,7 @@
switches::kForceGpuMemAvailableMb,
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -106,6 +106,7 @@ target(link_target_type, "child") {
@@ -105,6 +105,7 @@ target(link_target_type, "child") {
"//third_party/blink/public/common:buildflags",
"//third_party/blink/public/strings",
"//third_party/ced",
@@ -83,7 +83,7 @@
"//ui/events/blink",
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -39,6 +39,7 @@
@@ -40,6 +40,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"
@@ -508,6 +509,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -498,6 +499,10 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kEnableWebGPUDeveloperFeatures, true},
{wrf::EnableWebGPUExperimentalFeatures, switches::kEnableUnsafeWebGPU,
true},
@@ -124,7 +124,7 @@
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -934,6 +935,11 @@ Document::Document(const DocumentInit& i
@@ -932,6 +933,11 @@ Document::Document(const DocumentInit& i
TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this),
TRACE_EVENT_FLAG_FLOW_OUT);
DCHECK(agent_);
@@ -136,7 +136,7 @@
if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) &&
features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) {
script_runner_delayer_->Activate();
@@ -1046,6 +1052,14 @@ const Position Document::PositionAdjuste
@@ -1047,6 +1053,14 @@ const Position Document::PositionAdjuste
return Position::BeforeNode(*shadow_host);
}
@@ -153,7 +153,7 @@
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -532,6 +532,10 @@ class CORE_EXPORT Document : public Cont
@@ -539,6 +539,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -164,7 +164,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2533,6 +2537,9 @@ class CORE_EXPORT Document : public Cont
@@ -2566,6 +2570,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -176,7 +176,7 @@
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2344,6 +2344,11 @@ DOMRectList* Element::getClientRects() {
@@ -2413,6 +2413,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2371,6 +2376,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2440,6 +2445,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -266,7 +266,7 @@
const TextDirection&,
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -78,6 +78,9 @@
@@ -83,6 +83,9 @@
#include "ui/gfx/geometry/quad_f.h"
#include "ui/gfx/geometry/skia_conversions.h"
@@ -276,7 +276,7 @@
namespace blink {
BASE_FEATURE(kDisableCanvasOverdrawOptimization,
@@ -3166,8 +3169,22 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -3205,8 +3208,22 @@ TextMetrics* BaseRenderingContext2D::mea
const CanvasRenderingContext2DState& state = GetState();
TextDirection direction = ToTextDirection(state.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
@@ -1716,6 +1716,7 @@ component("platform") {
@@ -1733,6 +1733,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
@@ -1781,6 +1781,12 @@
@@ -1746,6 +1746,12 @@
status: "experimental",
},
{

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
@@ -3443,6 +3443,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3452,6 +3452,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
@@ -513,6 +513,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -503,6 +503,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -65,15 +65,7 @@ approach to change color components.
};
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -68,6 +68,7 @@
#include "third_party/blink/renderer/platform/graphics/image_data_buffer.h"
#include "third_party/blink/renderer/platform/graphics/memory_managed_paint_recorder.h"
#include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
+#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
#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"
@@ -2492,6 +2493,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2530,6 +2530,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -85,7 +77,7 @@ approach to change color components.
return image_data;
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1669,7 +1669,9 @@ component("platform") {
@@ -1686,7 +1686,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -322,7 +314,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
@@ -1787,6 +1787,9 @@
@@ -1752,6 +1752,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
@@ -2278,6 +2278,7 @@ static_library("browser") {
@@ -2323,6 +2323,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -49,12 +49,13 @@ with limited CPU/memory resources and it is disabled by default.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -21,11 +21,13 @@
@@ -21,12 +21,14 @@
#include "base/functional/callback.h"
#include "base/functional/callback_helpers.h"
#include "base/location.h"
+#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/path_service.h"
@@ -63,7 +64,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"
@@ -104,6 +106,7 @@
@@ -107,6 +109,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 +72,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/os_crypt/async/browser/os_crypt_async.h"
#include "components/permissions/permissions_client.h"
@@ -135,6 +138,7 @@
@@ -140,6 +143,7 @@
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "net/log/net_log.h"
@@ -79,7 +80,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"
@@ -377,6 +381,18 @@ void BrowserProcessImpl::Init() {
@@ -383,6 +387,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -100,9 +101,9 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2333,6 +2333,10 @@ const char kUndoAutofillDescription[] =
"Allows reverting Autofill filling operations. Replaces Clear Form "
"functionality";
@@ -2244,6 +2244,10 @@ const char kLogJsConsoleMessagesDescript
"Enable logging JS console messages in system logs, please note that they "
"may contain PII.";
+const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
+const char kMaxConnectionsPerHostDescription[] =
@@ -113,9 +114,9 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1330,6 +1330,9 @@ extern const char kLogJsConsoleMessagesD
extern const char kUndoAutofillName[];
extern const char kUndoAutofillDescription[];
@@ -1297,6 +1297,9 @@ extern const char kLocationBarModelOptim
extern const char kLogJsConsoleMessagesName[];
extern const char kLogJsConsoleMessagesDescription[];
+extern const char kMaxConnectionsPerHostName[];
+extern const char kMaxConnectionsPerHostDescription[];

View File

@@ -12,7 +12,7 @@
void BackgroundModeManager::RegisterProfile(Profile* profile) {
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1483,7 +1483,7 @@ void ChromeContentBrowserClient::Registe
@@ -1520,7 +1520,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -23,7 +23,7 @@
// used for mapping the command-line flags).
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -381,7 +381,7 @@ void ProfileNetworkContextService::Updat
@@ -428,7 +428,7 @@ void ProfileNetworkContextService::Updat
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -67,7 +67,7 @@
</cr-dialog>
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -84,7 +84,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -91,7 +91,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
@@ -98,7 +98,7 @@
prefs::kAutofillPaymentCvcStorage, true,
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -490,7 +490,7 @@ bool DoesBookmarkContainWords(const std:
@@ -491,7 +491,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
@@ -94,7 +94,7 @@ void CookieSettings::RegisterProfilePref
@@ -93,7 +93,7 @@ void CookieSettings::RegisterProfilePref
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(
prefs::kCookieControlsMode,
@@ -120,7 +120,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -254,14 +254,14 @@ base::CallbackListSubscription AddSyncEn
@@ -269,14 +269,14 @@ void MaybeNudgeToUpdateGMSCoreWhenSaving
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -184,33 +184,8 @@ struct NewTabURLDetails {
@@ -179,33 +179,8 @@ struct NewTabURLDetails {
const GURL local_url(default_is_google
? chrome::kChromeUINewTabPageURL
: chrome::kChromeUINewTabPageThirdPartyURL);

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
@@ -1651,11 +1651,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1647,11 +1647,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {

View File

@@ -12,7 +12,7 @@ it as hidden as it was before?
--- a/net/cert/x509_util.cc
+++ b/net/cert/x509_util.cc
@@ -286,7 +286,7 @@ bool GetTLSServerEndPointChannelBinding(
@@ -299,7 +299,7 @@ bool GetTLSServerEndPointChannelBinding(
}
// RSA keys created by CreateKeyAndSelfSignedCert will be of this length.

View File

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

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -139,6 +139,8 @@
@@ -142,6 +142,8 @@
#include "chrome/browser/ui/tabs/tab_utils.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/browser/ui/unload_controller.h"
@@ -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"
@@ -481,6 +483,7 @@ Browser::Browser(const CreateParams& par
@@ -491,6 +493,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),
@@ -33,7 +33,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -2951,6 +2956,62 @@ bool Browser::CanCloseWithInProgressDown
@@ -2968,6 +2973,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;
@@ -2969,6 +3030,22 @@ void Browser::InProgressDownloadResponse
@@ -2986,6 +3047,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"
@@ -1130,12 +1131,17 @@ class Browser : public TabStripModelObse
@@ -1169,12 +1170,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 HandleBeforeClose().
@@ -1305,6 +1311,8 @@ class Browser : public TabStripModelObse
@@ -1342,6 +1348,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
@@ -880,10 +880,14 @@ bool HandleNewTabPageLocationOverride(
@@ -881,10 +881,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())

View File

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -205,6 +205,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe
@@ -199,6 +199,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe
"AutofillSendUnidentifiedKeyAfterFill",
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
@@ -648,8 +648,14 @@ WebInputEventResult MouseEventManager::H
@@ -649,8 +649,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

View File

@@ -41,7 +41,7 @@
#include "base/feature_list.h"
#include "base/format_macros.h"
#include "base/functional/bind.h"
@@ -408,6 +409,15 @@ AutocompleteController::AutocompleteCont
@@ -418,6 +419,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -79,7 +79,7 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/functional/callback.h"
@@ -644,6 +645,9 @@ void SearchProvider::Run(bool query_is_p
@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_p
}
void SearchProvider::DoHistoryQuery(bool minimal_changes) {

View File

@@ -25,18 +25,6 @@
return false;
return true;
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -358,7 +358,8 @@ void LocationBarView::Init() {
params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
params.types_enabled.push_back(PageActionIconType::kClickToCall);
- params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator);
+ if (!base::FeatureList::IsEnabled(kDisableQRGenerator))
+ params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator);
if (base::FeatureList::IsEnabled(kWebOTPCrossDevice))
params.types_enabled.push_back(PageActionIconType::kSmsRemoteFetcher);
params.types_enabled.push_back(PageActionIconType::kManagePasswords);
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -64,4 +64,8 @@

View File

@@ -1,5 +1,17 @@
# Add flag to disable automatic search engine collection
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -486,7 +486,9 @@ void TabHelpers::AttachTabHelpers(WebCon
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("disable-search-engine-collection")) {
SearchEngineTabHelper::CreateForWebContents(web_contents);
+ }
SecurityStateTabHelper::CreateForWebContents(web_contents);
if (site_engagement::SiteEngagementService::IsEnabled()) {
site_engagement::SiteEngagementService::Helper::CreateForWebContents(
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -12,4 +12,8 @@
@@ -13,7 +25,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -257,14 +257,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -256,14 +256,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent() || frame->IsInFencedFrameTree())
return;
@@ -69,7 +81,7 @@
search_engine_choice_service_(search_engine_choice_service),
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
@@ -520,8 +528,8 @@ bool TemplateURLService::CanAddAutogener
@@ -527,8 +535,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 +92,7 @@
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -1912,6 +1920,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -1926,6 +1934,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -89,7 +101,7 @@
if (client_)
client_->SetOwner(this);
@@ -2087,6 +2097,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2101,6 +2111,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1389,7 +1389,8 @@ void BrowserCommandController::InitComma
@@ -1415,7 +1415,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -55,7 +55,7 @@
@@ -60,4 +60,8 @@
"Clear data on exit",
"Clears all browsing data on exit. ungoogled-chromium flag",
kOsDesktop, FEATURE_VALUE_TYPE(browsing_data::features::kClearDataOnExit)},
kOsDesktop, FEATURE_VALUE_TYPE(features::kClearDataOnExit)},
+ {"remove-tabsearch-button",
+ "Remove Tabsearch Button",
+ "Removes the tabsearch button from the tabstrip. ungoogled-chromium flag",

View File

@@ -1,13 +1,31 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -422,4 +422,5 @@ BASE_FEATURE(kWebUsbDeviceDetection,
"WebUsbDeviceDetection",
base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kClearDataOnExit, "ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT);
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -157,6 +157,7 @@ BASE_DECLARE_FEATURE(kUseOsCryptAsyncFor
BASE_DECLARE_FEATURE(kWebUsbDeviceDetection);
+BASE_DECLARE_FEATURE(kClearDataOnExit);
} // namespace features
#endif // CHROME_BROWSER_BROWSER_FEATURES_H_
--- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
@@ -29,6 +29,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "components/browsing_data/core/browsing_data_policies_utils.h"
+#include "components/browsing_data/core/features.h"
#include "components/browsing_data/core/pref_names.h"
#include "components/keep_alive_registry/keep_alive_types.h"
#include "components/keep_alive_registry/scoped_keep_alive.h"
@@ -19,6 +19,7 @@
#include "base/task/task_traits.h"
#include "base/values.h"
#include "build/build_config.h"
+#include "chrome/browser/browser_features.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
@@ -147,6 +148,21 @@ class BrowsingDataRemoverObserver
#endif
};
@@ -35,7 +53,7 @@
browsing_data::prefs::kClearBrowsingDataOnExitList);
- if (!data_types.empty() &&
+ bool cdoe = base::FeatureList::IsEnabled(browsing_data::features::kClearDataOnExit);
+ bool cdoe = base::FeatureList::IsEnabled(features::kClearDataOnExit);
+ if (cdoe || (!data_types.empty() &&
IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
- profile_, browsing_data::prefs::kClearBrowsingDataOnExitList))) {
@@ -63,26 +81,5 @@
+ {"clear-data-on-exit",
+ "Clear data on exit",
+ "Clears all browsing data on exit. ungoogled-chromium flag",
+ kOsDesktop, FEATURE_VALUE_TYPE(browsing_data::features::kClearDataOnExit)},
+ kOsDesktop, FEATURE_VALUE_TYPE(features::kClearDataOnExit)},
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/browsing_data/core/features.cc
+++ b/components/browsing_data/core/features.cc
@@ -7,6 +7,8 @@
#include "build/build_config.h"
namespace browsing_data::features {
+BASE_FEATURE(kClearDataOnExit, "ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT);
+
BASE_FEATURE(kEnableBrowsingDataLifetimeManager,
"BrowsingDataLifetimeManager",
base::FEATURE_ENABLED_BY_DEFAULT);
--- a/components/browsing_data/core/features.h
+++ b/components/browsing_data/core/features.h
@@ -8,6 +8,7 @@
#include "base/feature_list.h"
namespace browsing_data::features {
+BASE_DECLARE_FEATURE(kClearDataOnExit);
// Enable BrowsingDataLifetimeManager that periodically delete browsing data as
// defined by the BrowsingDataLifetime policy.

View File

@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -1981,6 +1982,10 @@ void TabStripModel::CloseTabs(base::span
@@ -2088,6 +2089,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
@@ -1254,6 +1254,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1252,6 +1252,8 @@ WindowOpenDisposition NavigationPolicyTo
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

View File

@@ -16,7 +16,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/feature_engagement/public/event_constants.h"
@@ -533,6 +535,17 @@ void ExtensionsToolbarContainer::AnchorA
@@ -528,6 +530,17 @@ void ExtensionsToolbarContainer::AnchorA
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
anchor_view && anchor_view->GetVisible() ? anchor_view
: GetExtensionsButton());
@@ -34,7 +34,7 @@
widget->Show();
}
@@ -941,6 +954,9 @@ void ExtensionsToolbarContainer::UpdateC
@@ -936,6 +949,9 @@ void ExtensionsToolbarContainer::UpdateC
}
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {

View File

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

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -1069,7 +1069,11 @@ void Tab::UpdateIconVisibility() {
@@ -1070,7 +1070,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;
@@ -1094,6 +1098,8 @@ void Tab::UpdateIconVisibility() {
@@ -1095,6 +1099,8 @@ void Tab::UpdateIconVisibility() {
}
showing_close_button_ = large_enough_for_close_button;

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3816,10 +3816,12 @@ const FeatureEntry::FeatureVariation kDe
@@ -3919,10 +3919,12 @@ const FeatureEntry::FeatureVariation kDe
#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
@@ -156,6 +156,8 @@ static_library("common_lib") {
@@ -159,6 +159,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",
@@ -264,6 +266,7 @@ static_library("common_lib") {
@@ -268,6 +270,7 @@ static_library("common_lib") {
"//components/no_state_prefetch/common:mojo_bindings",
"//components/page_load_metrics/common:common",
"//components/pdf/common:constants",
@@ -38,7 +38,7 @@
if (is_android || enable_library_cdms) {
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -998,6 +998,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
@@ -990,6 +990,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
@@ -592,6 +592,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
@@ -601,6 +601,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers);
@@ -152,8 +152,8 @@
+#endif // CHROME_COMMON_REFERRER_SANITIZER_H_
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -359,8 +359,7 @@ source_set("lib") {
"//base/third_party/dynamic_annotations",
@@ -357,8 +357,7 @@ source_set("lib") {
"//base",
"//build:branding_buildflags",
"//build:chromeos_buildflags",
- "//chrome/common:constants",
@@ -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
@@ -832,7 +832,7 @@ test("components_unittests") {
@@ -839,7 +839,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_
}
@@ -1113,7 +1113,7 @@ if (use_blink) {
@@ -1124,7 +1124,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 "components/viz/host/host_frame_sink_manager.h"
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
#include "content/browser/browsing_topics/header_util.h"
@@ -398,10 +399,10 @@ void AddAdditionalRequestHeaders(
@@ -385,10 +386,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
@@ -56,6 +56,7 @@
@@ -55,6 +55,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"
@@ -4544,10 +4545,13 @@ void RenderFrameImpl::WillSendRequestInt
@@ -4542,10 +4543,13 @@ void RenderFrameImpl::WillSendRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -246,8 +246,8 @@
void RenderFrameImpl::DidLoadResourceFromMemoryCache(
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -299,6 +299,7 @@ static_library("content_shell_lib") {
"//base/third_party/dynamic_annotations",
@@ -280,6 +280,7 @@ static_library("content_shell_lib") {
"//base:base_static",
"//build:chromeos_buildflags",
"//cc/base",
+ "//chrome/common",

View File

@@ -35,7 +35,7 @@
// https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html.
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -150,11 +150,6 @@ const size_t kMaxHostLength = 4096;
@@ -151,11 +151,6 @@ const size_t kMaxHostLength = 4096;
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -45,9 +45,9 @@
- 0x00, 0x00, 0x00, 0x01};
-
// True if |hostname| ends with either ".local" or ".local.".
bool ResemblesMulticastDNSName(base::StringPiece hostname) {
bool ResemblesMulticastDNSName(std::string_view hostname) {
return hostname.ends_with(".local") || hostname.ends_with(".local.");
@@ -1351,33 +1346,10 @@ int HostResolverManager::StartIPv6Reacha
@@ -1388,33 +1383,10 @@ int HostResolverManager::StartIPv6Reacha
return OK;
}

View File

@@ -427,7 +427,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -848,7 +848,8 @@ void TemplateURLService::IncrementUsageC
@@ -862,7 +862,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());
@@ -863,6 +864,7 @@ void TemplateURLService::ResetTemplateUR
@@ -877,6 +878,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
@@ -3812,7 +3812,13 @@ const FeatureEntry::FeatureVariation kDe
@@ -3915,7 +3915,13 @@ const FeatureEntry::FeatureVariation kDe
// 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
@@ -96,7 +96,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -103,7 +103,7 @@ void RegisterBrowserUserPrefs(user_prefs
false);
#endif
registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,

View File

@@ -1,9 +1,25 @@
--- a/chrome/browser/media/webrtc/capture_policy_utils.cc
+++ b/chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -141,69 +141,12 @@ void RegisterProfilePrefs(PrefRegistrySi
@@ -241,89 +241,13 @@ void RegisterProfilePrefs(PrefRegistrySi
}
bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) {
-// TODO(b/40272166): Implement for Lacros.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- policy::MultiScreenCapturePolicyService* multi_capture_policy_service =
- policy::MultiScreenCapturePolicyServiceFactory::GetForBrowserContext(
- context);
- if (!multi_capture_policy_service) {
- return false;
- }
-
- if (multi_capture_policy_service->GetAllowListSize() > 0u) {
- return true;
- }
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
-// TODO(b/329064666): Remove the checks below once the pivot to IWAs is
-// complete.
-#if BUILDFLAG(IS_CHROMEOS)
- Profile* profile = Profile::FromBrowserContext(context);
- if (!profile) {
@@ -37,36 +53,40 @@
-#endif
}
bool IsGetAllScreensMediaAllowed(content::BrowserContext* context,
const GURL& url) {
-#if BUILDFLAG(IS_CHROMEOS)
void CheckGetAllScreensMediaAllowed(content::BrowserContext* context,
const GURL& url,
base::OnceCallback<void(bool)> callback) {
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
- Profile* profile = Profile::FromBrowserContext(context);
- if (!profile) {
- return false;
- std::move(callback).Run(false);
- return;
- }
-
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
- // To ensure that a user is informed at login time that capturing of all
- // screens can happen (for privacy reasons), this API is only available on
- // primary profiles.
- if (!profile->IsMainProfile()) {
- return false;
- std::move(callback).Run(false);
- return;
- }
-#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
-
- HostContentSettingsMap* host_content_settings_map =
- HostContentSettingsMapFactory::GetForProfile(profile);
- if (!host_content_settings_map) {
- return false;
-#if BUILDFLAG(IS_CHROMEOS)
- crosapi::mojom::MultiCaptureService* multi_capture_service =
- GetMultiCaptureService();
- if (multi_capture_service) {
- multi_capture_service->IsMultiCaptureAllowed(
- url, base::BindOnce(&IsGetAllScreensMediaAllowedForIwaResultReceived,
- std::move(callback), std::move(url), context));
- } else {
- // If the multi capture service is not available with the required version,
- // fall back to the original flow using the deprecated policy.
- IsGetAllScreensMediaAllowedForIwaResultReceived(
- std::move(callback), std::move(url), context, /*result=*/false);
- }
- ContentSetting auto_accept_enabled =
- host_content_settings_map->GetContentSetting(
- url, url, ContentSettingsType::ALL_SCREEN_CAPTURE);
- return auto_accept_enabled == ContentSetting::CONTENT_SETTING_ALLOW;
-#else
- // This API is currently only available on ChromeOS and Linux.
return false;
-#endif
std::move(callback).Run(false);
-#endif // BUILDFLAG(IS_CHROMEOS)
}
#if !BUILDFLAG(IS_ANDROID)

View File

@@ -142,7 +142,7 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -97,7 +97,6 @@ source_set("browser") {
@@ -96,7 +96,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
@@ -53,7 +53,7 @@ BASE_FEATURE(kOptimizationHints,
@@ -54,7 +54,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
@@ -3868,8 +3868,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3869,8 +3869,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3883,8 +3882,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3884,8 +3883,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
@@ -1733,7 +1733,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
@@ -1792,7 +1792,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -534,11 +534,6 @@ int GetContentRestrictions(const Browser
@@ -535,11 +535,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -14,7 +14,7 @@
}
return content_restrictions;
}
@@ -1664,8 +1659,7 @@ bool CanSavePage(const Browser* browser)
@@ -1682,8 +1677,7 @@ bool CanSavePage(const Browser* browser)
DownloadPrefs::DownloadRestriction::ALL_FILES) {
return false;
}

View File

@@ -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
@@ -61,6 +61,7 @@
@@ -63,6 +63,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"
@@ -837,6 +838,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -809,6 +810,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<privacy_sandbox_internals::PrivacySandboxInternalsUI>;
}
@@ -169,7 +169,7 @@
+#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -673,6 +673,7 @@ const char kExtensionConfigureCommandsSu
@@ -671,6 +671,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

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

View File

@@ -45,7 +45,7 @@
--- a/chrome/browser/resources/extensions/sidebar.html
+++ b/chrome/browser/resources/extensions/sidebar.html
@@ -71,14 +71,3 @@
<paper-ripple></paper-ripple>
<cr-ripple></cr-ripple>
</a>
</iron-selector>
-<div>
@@ -56,12 +56,12 @@
- <span id="discover-more-text" class="cr-secondary-text"
- on-click="onMoreExtensionsClick_"
- inner-h-t-m-l="[[discoverMoreText_]]"></span>
- <paper-ripple></paper-ripple>
- <cr-ripple></cr-ripple>
- </div>
-</div>
--- a/chrome/browser/resources/extensions/sidebar.ts
+++ b/chrome/browser/resources/extensions/sidebar.ts
@@ -51,21 +51,11 @@ export class ExtensionsSidebarElement ex
@@ -50,21 +50,11 @@ export class ExtensionsSidebarElement ex
* displayed.
*/
selectedPath_: String,
@@ -83,7 +83,7 @@
/**
* The ID of the listener on |navigation|. Stored so that the
@@ -121,13 +111,6 @@ export class ExtensionsSidebarElement ex
@@ -120,13 +110,6 @@ export class ExtensionsSidebarElement ex
}
}
@@ -101,14 +101,14 @@
+++ b/chrome/browser/resources/history/side_bar.html
@@ -87,13 +87,6 @@
$i18n{historyMenuItem}
<paper-ripple></paper-ripple>
<cr-ripple></cr-ripple>
</a>
- <a id="syncedTabs" role="menuitem" href="/syncedTabs"
- class="page-item cr-nav-menu-item"
- path="syncedTabs" on-click="onItemClick_">
- <iron-icon icon="cr:phonelink"></iron-icon>
- $i18n{openTabsMenuItem}
- <paper-ripple></paper-ripple>
- <cr-ripple></cr-ripple>
- </a>
<!-- tabindex is needed below because <a> without href attribute is not
focusable in sequential keyboard navigation by default. -->
@@ -150,16 +150,18 @@
<template is="dom-if" if="[[!captionSettingsOpensExternally_]]">
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -120,9 +120,6 @@
@@ -120,11 +120,6 @@
</div>
</template>
</if>
- <cr-link-row class="hr" id="help" on-click="onHelpClick_"
- label="$i18n{aboutGetHelpUsingChrome}"
- external></cr-link-row>
- <template is="dom-if" if="[[!showGetTheMostOutOfChromeSection_]]">
- <cr-link-row class="hr" id="help" on-click="onHelpClick_"
- label="$i18n{aboutGetHelpUsingChrome}"
- external></cr-link-row>
- </template>
<if expr="_google_chrome">
<cr-link-row class="hr" id="reportIssue" on-click="onReportIssueClick_"
hidden="[[!prefs.feedback_allowed.value]]"
<template is="dom-if" if="[[!showGetTheMostOutOfChromeSection_]]">
<cr-link-row class="hr" id="reportIssue" on-click="onReportIssueClick_"
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -30,11 +30,11 @@
@@ -180,7 +182,7 @@
<div class="separator"></div>
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -428,8 +428,8 @@ export class SettingsAppearancePageEleme
@@ -412,8 +412,8 @@ export class SettingsAppearancePageEleme
return;
}
@@ -190,7 +192,7 @@
switch (this.systemTheme_) {
case SystemTheme.GTK:
i18nId = 'gtkTheme';
@@ -441,11 +441,8 @@ export class SettingsAppearancePageEleme
@@ -425,11 +425,8 @@ export class SettingsAppearancePageEleme
i18nId = 'classicTheme';
break;
}
@@ -205,7 +207,7 @@
/** @return Whether applied theme is set by policy. */
--- a/chrome/browser/resources/settings/autofill_page/payments_section.html
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
@@ -94,11 +94,6 @@
@@ -95,11 +95,6 @@
</div>
</template>
@@ -240,16 +242,16 @@
import '../safety_hub/safety_hub_entry_point.js';
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
@@ -13,7 +13,7 @@
padding-inline-start: 0;
}
@@ -21,7 +21,7 @@
</style>
-<if expr="not is_chromeos">
+<if expr="False">
<!-- Signout is not supported yet on lacros, https://crbug.com/1217645 -->
<settings-toggle-button id="signinAllowedToggle"
class="hr"
@@ -51,12 +51,6 @@
<cr-radio-group id="chromeSigninUserChoiceRadioGroup"
class="hr radio-group-content"
hidden="[[!chromeSigninUserChoiceInfo_.shouldShowSettings]]"
@@ -90,12 +90,6 @@
</settings-toggle-button>
</if><!-- not chromeos -->
</if><!-- _google_chrome -->
@@ -264,9 +266,9 @@
class="hr"
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -187,10 +187,6 @@ export class SettingsPersonalizationOpti
this.addWebUiListener('metrics-reporting-change', setMetricsReportingPref);
this.browserProxy_.getMetricsReporting().then(setMetricsReportingPref);
@@ -214,10 +214,6 @@ export class SettingsPersonalizationOpti
'chrome-signin-user-choice-info-change',
this.setChromeSigninUserChoiceInfo_.bind(this));
// </if>
-
- this.registerHelpBubble(
@@ -295,12 +297,11 @@
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
@@ -173,10 +173,3 @@
sub-label="$i18n{chromeCertificatesDescription}"
on-click="onChromeCertificatesClick_"></cr-link-row>
@@ -214,9 +214,3 @@
</cr-link-row>
</if>
- <cr-link-row id="advanced-protection-program-link"
- class="hr"
- <cr-link-row id="advanced-protection-program-link" class="hr"
- label="$i18n{advancedProtectionProgramTitle}"
- sub-label="$i18n{advancedProtectionProgramDesc}"
- on-click="onAdvancedProtectionProgramLinkClick_"
@@ -333,7 +334,7 @@
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -850,19 +850,9 @@ void ExtensionsMenuModel::Build(Browser*
@@ -857,19 +857,9 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -386,7 +387,7 @@
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -181,6 +181,7 @@ void ProfileMenuView::BuildMenu() {
@@ -187,6 +187,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -394,9 +395,9 @@
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession())
return gfx::ImageSkia();
@@ -565,15 +566,7 @@ void ProfileMenuView::BuildIdentity() {
@@ -578,15 +579,7 @@ void ProfileMenuView::BuildIdentity() {
ui::ImageModel::FromImage(account_info.account_image),
badge_image_model, menu_title_, menu_subtitle_, management_label_);
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled(
- switches::ExplicitBrowserSigninPhase::kExperimental) &&
@@ -410,10 +411,10 @@
+ menu_title_ = std::u16string();
// The email may be empty.
menu_subtitle_ = base::UTF8ToUTF16(account_info.email);
management_label_ = std::u16string();
std::u16string management_label;
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -555,9 +555,6 @@ SadTabView::SadTabView(content::WebConte
@@ -559,9 +559,6 @@ SadTabView::SadTabView(content::WebConte
auto* actions_container =
container->AddChildView(std::make_unique<views::FlexLayoutView>());
actions_container->SetCrossAxisAlignment(views::LayoutAlignment::kCenter);
@@ -423,7 +424,7 @@
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -650,22 +647,6 @@ void SadTabView::AttachToWebView() {
@@ -654,22 +651,6 @@ void SadTabView::AttachToWebView() {
}
}
@@ -448,8 +449,8 @@
// Specify the maximum message and title width explicitly.
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -947,7 +947,7 @@ const base::FeatureParam<std::string> kM
#endif // BUILDFLAG(IS_WIN)
@@ -938,7 +938,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
base::FEATURE_DISABLED_BY_DEFAULT);
// Enables the Live Caption feature on supported devices.
-BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_ENABLED_BY_DEFAULT);
@@ -459,7 +460,7 @@
// getDisplayMedia captures. Note: This flag does not control if the "Share this
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -823,7 +823,7 @@ void MenuItemView::SetAlerted() {
@@ -824,7 +824,7 @@ void MenuItemView::SetAlerted() {
}
bool MenuItemView::ShouldShowNewBadge() const {

View File

@@ -1303,6 +1303,7 @@ net/data/ssl/certificates/client-nokey.p12
net/data/ssl/certificates/client-null-password.p12
net/data/ssl/certificates/client.p12
net/data/ssl/certificates/client_1.pk8
net/data/ssl/certificates/client_1_u16_password.p12
net/data/ssl/certificates/client_2.pk8
net/data/ssl/certificates/client_3.pk8
net/data/ssl/certificates/client_4.pk8
@@ -7310,6 +7311,7 @@ third_party/dawn/third_party/webgpu-cts/src/resources/cache/webgpu/shader/execut
third_party/dawn/third_party/webgpu-cts/src/resources/cache/webgpu/shader/execution/cosh.bin
third_party/dawn/third_party/webgpu-cts/src/resources/cache/webgpu/shader/execution/cross.bin
third_party/dawn/third_party/webgpu-cts/src/resources/cache/webgpu/shader/execution/degrees.bin
third_party/dawn/third_party/webgpu-cts/src/resources/cache/webgpu/shader/execution/derivatives.bin
third_party/dawn/third_party/webgpu-cts/src/resources/cache/webgpu/shader/execution/determinant.bin
third_party/dawn/third_party/webgpu-cts/src/resources/cache/webgpu/shader/execution/distance.bin
third_party/dawn/third_party/webgpu-cts/src/resources/cache/webgpu/shader/execution/dot.bin
@@ -7392,6 +7394,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-last-cluster-max-duration.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-multiple-frames.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-single-frame.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/extension-tracks-and-marks.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/fenced-frame-fledge.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/forced-layouts-and-no-gpu.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/generic-about-tracing.json.gz
@@ -7451,6 +7454,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-with-commit.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-sockets.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/wrong-main-frame-bug.json.gz
third_party/devtools-frontend/src/test/e2e/resources/media/corrupt.webm
third_party/devtools-frontend/src/test/e2e/resources/media/fisch.webm
third_party/devtools-frontend/src/test/e2e/resources/network/webbundle.wbn
@@ -10970,6 +10974,7 @@ third_party/icu/source/data/in/coll/ucadata-unihan.icu
third_party/icu/source/data/in/nfc.nrm
third_party/icu/source/data/in/nfkc.nrm
third_party/icu/source/data/in/nfkc_cf.nrm
third_party/icu/source/data/in/nfkc_scf.nrm
third_party/icu/source/data/in/pnames.icu
third_party/icu/source/data/in/ubidi.icu
third_party/icu/source/data/in/ucase.icu
@@ -13461,6 +13466,7 @@ third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/comp
third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/rtcp_packet_with_no_sender_report.bin
third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/sender_report_with_report_block.bin
third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/sender_report_without_report_block.bin
third_party/openscreen/src/osp/impl/quic/certificates/openscreen.key
third_party/openscreen/src/test/data/cast/common/certificate/testsuite/testsuite1.pb
third_party/openscreen/src/test/data/cast/receiver/channel/auth_challenge.pb
third_party/openscreen/src/test/data/cast/receiver/channel/auth_response.pb
@@ -13586,6 +13592,7 @@ third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Struct.php
third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Timestamp.php
third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Type.php
third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Wrappers.php
third_party/protobuf/php/tests/generated_previous/GPBMetadata/ProtoPrevious/TestPreviouslyUnreservedMessage.php
third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string
third_party/protobuf/src/google/protobuf/testdata/golden_message
third_party/protobuf/src/google/protobuf/testdata/golden_message_maps
@@ -13624,17 +13631,17 @@ third_party/quic_trace/src/examples/example.json.gz
third_party/quic_trace/src/examples/example.qtr
third_party/r8/custom_d8.jar
third_party/r8/custom_r8.jar
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/testdata/fowler/dat/basic.dat
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/crash-cd33b13df59ea9d74503986f9d32a270dd43cc04
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/minimized-from-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/slow-unit-3ab758ea520027fefd3f00e1384d9aeef155739e
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/slow-unit-5345fccadf3812c53c3ccc7af5aa2741b7b2106c
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/slow-unit-6bd643eec330166e4ada91da2d3f284268481085
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/slow-unit-93c73a43581f205f9aaffd9c17e52b34b17becd0
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/slow-unit-9ca9cc9929fee1fcbb847a78384effb8b98ea18a
third_party/rust/chromium_crates_io/vendor/regex-1.10.3/tests/fuzz/testdata/slow-unit-b8a052f4254802edbe5f569b6ce6e9b6c927e9d6
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/testdata/fowler/dat/basic.dat
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/crash-cd33b13df59ea9d74503986f9d32a270dd43cc04
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/minimized-from-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/slow-unit-3ab758ea520027fefd3f00e1384d9aeef155739e
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/slow-unit-5345fccadf3812c53c3ccc7af5aa2741b7b2106c
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/slow-unit-6bd643eec330166e4ada91da2d3f284268481085
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/slow-unit-93c73a43581f205f9aaffd9c17e52b34b17becd0
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/slow-unit-9ca9cc9929fee1fcbb847a78384effb8b98ea18a
third_party/rust/chromium_crates_io/vendor/regex-1.10.4/tests/fuzz/testdata/slow-unit-b8a052f4254802edbe5f569b6ce6e9b6c927e9d6
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.6/tests/fuzz/testdata/deserialize_dense_crash-9486fb7c8a93b12c12a62166b43d31640c0208a9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.6/tests/fuzz/testdata/deserialize_dense_minimized-from-9486fb7c8a93b12c12a62166b43d31640c0208a9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.6/tests/fuzz/testdata/deserialize_sparse_crash-0da59c0434eaf35e5a6b470fa9244bb79c72b000
@@ -14713,6 +14720,7 @@ third_party/webgpu-cts/src/src/resources/cache/webgpu/shader/execution/cos.bin
third_party/webgpu-cts/src/src/resources/cache/webgpu/shader/execution/cosh.bin
third_party/webgpu-cts/src/src/resources/cache/webgpu/shader/execution/cross.bin
third_party/webgpu-cts/src/src/resources/cache/webgpu/shader/execution/degrees.bin
third_party/webgpu-cts/src/src/resources/cache/webgpu/shader/execution/derivatives.bin
third_party/webgpu-cts/src/src/resources/cache/webgpu/shader/execution/determinant.bin
third_party/webgpu-cts/src/src/resources/cache/webgpu/shader/execution/distance.bin
third_party/webgpu-cts/src/src/resources/cache/webgpu/shader/execution/dot.bin