Update to Chromium 132.0.6834.83

This commit is contained in:
Blaise
2025-01-08 14:03:54 -06:00
parent ce13975ff3
commit 984d79fb6e
75 changed files with 1608 additions and 57287 deletions

View File

@@ -1 +1 @@
131.0.6778.264
132.0.6834.83

View File

@@ -28,6 +28,8 @@ sys.path.pop(0)
# Encoding for output files
_ENCODING = 'UTF-8'
# pylint: disable=line-too-long
# NOTE: Include patterns have precedence over exclude patterns
# pathlib.Path.match() paths to include in binary pruning
PRUNING_INCLUDE_PATTERNS = [
@@ -59,6 +61,7 @@ PRUNING_EXCLUDE_PATTERNS = [
'third_party/icu/android/icudtl.dat',
'third_party/icu/common/icudtb.dat',
# Exclusion for rollup v4.0+
'third_party/devtools-frontend/src/node_modules/@rollup/wasm-node/dist/wasm-node/bindings_wasm_bg.wasm',
'third_party/node/node_modules/@rollup/wasm-node/dist/wasm-node/bindings_wasm_bg.wasm',
# Exclusion for performance tracing
'third_party/perfetto/src/trace_processor/importers/proto/atoms.descriptor',
@@ -110,6 +113,8 @@ DOMAIN_EXCLUDE_PREFIXES = [
'third_party/blink/renderer/core/dom/document.cc',
]
# pylint: enable=line-too-long
# pathlib.Path.match() patterns to include in domain substitution
DOMAIN_INCLUDE_PATTERNS = [
'*.h', '*.hh', '*.hpp', '*.hxx', '*.cc', '*.cpp', '*.cxx', '*.c', '*.h', '*.json', '*.js',
@@ -257,7 +262,7 @@ def compute_lists_proc(path, source_tree, search_regex):
symlink_set = set()
if path.is_file():
relative_path = path.relative_to(source_tree)
if not any(cpath in str(relative_path.as_posix()) for cpath in CONTINGENT_PATHS):
if not any(str(relative_path.as_posix()).startswith(cpath) for cpath in CONTINGENT_PATHS):
if path.is_symlink():
try:
resolved_relative_posix = path.resolve().relative_to(source_tree).as_posix()

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
@@ -56,7 +56,7 @@ public abstract class ChromeFeatureList
@@ -55,7 +55,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
}
/**
@@ -68,8 +68,7 @@ public abstract class ChromeFeatureList
@@ -67,8 +67,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
}
/**
@@ -81,8 +80,7 @@ public abstract class ChromeFeatureList
@@ -80,8 +79,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
}
/**
@@ -94,8 +92,7 @@ public abstract class ChromeFeatureList
@@ -93,8 +91,7 @@ public abstract class ChromeFeatureList
*/
public static double getFieldTrialParamByFeatureAsDouble(
String featureName, String paramName, double defaultValue) {
@@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials
/**
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -227,17 +227,7 @@ bool GetInstanceManipulations(const net:
@@ -225,17 +225,7 @@ bool GetInstanceManipulations(const net:
// Variations seed fetching is only enabled in official Chrome builds, if a URL
// is specified on the command line, and for testing.
bool IsFetchingEnabled() {

View File

@@ -1,14 +1,14 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2249,7 +2249,6 @@ static_library("browser") {
@@ -2247,7 +2247,6 @@ static_library("browser") {
"//components/reporting/util:task_runner_context",
"//components/resources",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection",
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/notification_content_detection",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3641,8 +3640,6 @@ static_library("browser") {
@@ -3615,8 +3614,6 @@ static_library("browser") {
"download/download_commands.cc",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@@ -1167,14 +1164,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1162,14 +1159,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_);
@@ -1479,26 +1468,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1474,26 +1463,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -123,7 +123,7 @@
subresource_filter_ruleset_service_;
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -72,7 +72,6 @@
@@ -73,7 +73,6 @@
#include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/reading_list/reading_list_model_factory.h"
@@ -131,7 +131,7 @@
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engine_choice/search_engine_choice_service_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -647,10 +646,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -662,10 +661,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
@@ -5513,10 +5513,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5518,10 +5518,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),
@@ -5571,16 +5567,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5576,16 +5572,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>(
@@ -5901,8 +5887,6 @@ bool ChromeContentBrowserClient::IsPlugi
@@ -5898,8 +5884,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
@@ -534,13 +534,6 @@ void ChromeDownloadManagerDelegate::SetD
@@ -531,13 +531,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
@@ -221,7 +221,7 @@
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -1062,17 +1055,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -1060,17 +1053,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
@@ -250,7 +250,7 @@
// Whether the download is currently being revived.
bool is_being_revived_ = false;
@@ -501,13 +501,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -498,13 +498,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;
}
@@ -710,9 +710,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -707,9 +707,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -279,7 +279,7 @@
return !download_->IsSavePackageDownload() &&
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -257,14 +257,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
@@ -258,14 +258,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
@@ -295,7 +295,7 @@
}
}
@@ -442,10 +435,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -443,10 +436,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -322,14 +322,52 @@
// If no mime type or explicitly specified a name, don't replace file
// extension.
if (sniffed_mime_type.empty() || !suggested_filename.empty())
@@ -1316,30 +1309,7 @@ DownloadFileType::DangerLevel DownloadTa
download_->HasUserGesture())
return DownloadFileType::NOT_DANGEROUS;
@@ -1290,68 +1283,7 @@ DownloadFileType::DangerLevel DownloadTa
PriorVisitsToReferrer visits) const {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- DownloadFileType::DangerLevel danger_level =
- safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel(
- virtual_path_.BaseName(), download_->GetURL(),
- GetProfile()->GetPrefs());
- policy::DownloadRestriction download_restriction =
- static_cast<policy::DownloadRestriction>(
- GetProfile()->GetPrefs()->GetInteger(
- policy::policy_prefs::kDownloadRestrictions));
-
- // If the user has has been prompted or will be, assume that the user has
- // approved the download. A programmatic download is considered safe unless it
- // contains malware.
- bool user_approved_path =
- !download_->GetForcedFilePath().empty() &&
- // Drag and drop download paths are not approved by the user. See
- // https://crbug.com/1513639
- download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP;
- if (HasPromptedForPath() ||
- confirmation_reason_ != DownloadConfirmationReason::NONE ||
- user_approved_path) {
- // If the "DownloadRestrictions" enterprise policy explicitly disallows the
- // download, don't let the user gesture bypass the dangerous verdict.
- if ((download_restriction == policy::DownloadRestriction::DANGEROUS_FILES ||
- download_restriction ==
- policy::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES) &&
- danger_level != DownloadFileType::NOT_DANGEROUS) {
- return DownloadFileType::DANGEROUS;
- }
- return DownloadFileType::NOT_DANGEROUS;
- }
-
- // User-initiated extension downloads from pref-whitelisted sources are not
- // considered dangerous.
- if (download_->HasUserGesture() &&
- download_crx_util::IsTrustedExtensionDownload(GetProfile(), *download_)) {
- return DownloadFileType::NOT_DANGEROUS;
- }
-
- // Anything the user has marked auto-open is OK if it's user-initiated.
- if (download_prefs_->IsAutoOpenEnabled(download_->GetURL(), virtual_path_) &&
- download_->HasUserGesture())
- return DownloadFileType::NOT_DANGEROUS;
-
- // A danger level of ALLOW_ON_USER_GESTURE is used to label potentially
- // dangerous file types that have a high frequency of legitimate use. We would
@@ -364,7 +402,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"
@@ -1379,9 +1378,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1376,9 +1375,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@@ -374,7 +412,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1419,42 +1415,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1416,42 +1412,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -500,7 +538,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
@@ -709,18 +709,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -708,18 +708,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -519,7 +557,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1204,54 +1192,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1203,54 +1191,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -648,7 +686,7 @@
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -95,7 +95,6 @@
@@ -96,7 +96,6 @@
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
#include "chrome/browser/reading_list/reading_list_model_factory.h"
#include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
@@ -656,7 +694,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"
@@ -616,17 +615,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -634,17 +633,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -696,7 +734,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -76,6 +77,7 @@ static_library("safe_browsing") {
@@ -77,6 +78,7 @@ static_library("safe_browsing") {
"//mojo/public/cpp/system",
"//services/preferences/public/cpp",
]
@@ -704,7 +742,7 @@
if (is_android) {
deps += [
@@ -536,6 +538,7 @@ static_library("advanced_protection") {
@@ -548,6 +550,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -712,7 +750,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -555,6 +558,7 @@ source_set("metrics_collector") {
@@ -567,6 +570,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -722,7 +760,7 @@
source_set("test_support") {
--- a/chrome/browser/ssl/chrome_security_state_tab_helper.cc
+++ b/chrome/browser/ssl/chrome_security_state_tab_helper.cc
@@ -179,93 +179,5 @@ bool ChromeSecurityStateTabHelper::UsedP
@@ -179,92 +179,5 @@ bool ChromeSecurityStateTabHelper::UsedP
security_state::MaliciousContentStatus
ChromeSecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -810,15 +848,14 @@
- // These threat types are not currently associated with
- // interstitials, and thus resources with these threat types are
- // not ever whitelisted or pending whitelisting.
- NOTREACHED_IN_MIGRATION();
- break;
- NOTREACHED();
- }
- }
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4065,7 +4065,6 @@ static_library("ui") {
@@ -4014,7 +4014,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",
@@ -828,7 +865,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -512,37 +512,8 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -507,37 +507,8 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -966,7 +1003,7 @@
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
content::WebContents* web_contents) {
const GURL kRequestUrl("https://enterprise-block.example.net");
@@ -367,35 +309,6 @@ std::unique_ptr<ManagedProfileRequiredPa
@@ -366,35 +308,6 @@ std::unique_ptr<ManagedProfileRequiredPa
kRequestUrl));
}
@@ -1002,7 +1039,7 @@
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
std::unique_ptr<SupervisedUserVerificationPageForYouTube>
CreateSupervisedUserVerificationPageForYouTube(
@@ -432,61 +345,6 @@ CreateSupervisedUserVerificationPageForB
@@ -431,61 +344,6 @@ CreateSupervisedUserVerificationPageForB
}
#endif
@@ -1064,7 +1101,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -593,12 +451,8 @@ void InterstitialHTMLSource::StartDataRe
@@ -592,12 +450,8 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1077,7 +1114,7 @@
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -630,12 +484,7 @@ void InterstitialHTMLSource::StartDataRe
@@ -629,12 +483,7 @@ void InterstitialHTMLSource::StartDataRe
#endif
}
@@ -1093,7 +1130,7 @@
html = interstitial_delegate.get()->GetHTMLContents();
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -111,7 +111,6 @@
@@ -110,7 +110,6 @@
#include "components/pdf/common/pdf_util.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/buildflags.h"
@@ -1101,7 +1138,7 @@
#include "components/sampling_profiler/process_type.h"
#include "components/sampling_profiler/thread_profiler.h"
#include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
@@ -483,12 +482,8 @@ void ChromeContentRendererClient::Render
@@ -480,12 +479,8 @@ void ChromeContentRendererClient::Render
thread->AddObserver(fingerprinting_protection_ruleset_dealer_.get());
}

View File

@@ -57,7 +57,7 @@
}
// http://crbug.com/165634
@@ -677,25 +663,6 @@ void WebstoreInstaller::UpdateDownloadPr
@@ -678,25 +664,6 @@ void WebstoreInstaller::UpdateDownloadPr
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!crx_installer_.get());

View File

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

View File

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

View File

@@ -167,7 +167,7 @@ by default.
DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -274,7 +274,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -273,7 +273,7 @@ GURL SpellcheckHunspellDictionary::GetDi
DCHECK(!bdict_file.empty());
static const char kDownloadServerUrl[] =
@@ -189,7 +189,7 @@ by default.
bool g_upgrade_bubble_is_showing = false;
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -71,17 +71,17 @@ namespace {
@@ -72,17 +72,17 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -236,17 +236,6 @@ by default.
// Launches the url directly with the user's default handler for |url|.
bool NavigateToUrlWithHttps(const std::wstring& url) {
--- a/chromecast/crash/linux/minidump_uploader.cc
+++ b/chromecast/crash/linux/minidump_uploader.cc
@@ -40,7 +40,7 @@ namespace {
const char kProductName[] = "Eureka";
-const char kCrashServerProduction[] = "https://clients2.google.com/cr/report";
+const char kCrashServerProduction[] = "trk:305:https://clients2.google.com/cr/report";
const char kVirtualChannel[] = "virtual-channel";
--- a/chromeos/ash/components/geolocation/simple_geolocation_provider.h
+++ b/chromeos/ash/components/geolocation/simple_geolocation_provider.h
@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(CHROMEOS_ASH_COMP
@@ -432,7 +421,7 @@ by default.
const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
--- a/google_apis/gaia/gaia_constants.cc
+++ b/google_apis/gaia/gaia_constants.cc
@@ -14,166 +14,166 @@ const char kChromeSource[] = "ChromiumBr
@@ -14,169 +14,169 @@ const char kChromeSource[] = "ChromiumBr
const char kUnexpectedServiceResponse[] = "UnexpectedServiceResponse";
// OAuth scopes.
@@ -500,6 +489,10 @@ by default.
- "https://www.googleapis.com/auth/peopleapi.readwrite";
+ "trk:115:https://www.googleapis.com/auth/peopleapi.readwrite";
// OAuth2 scope for read-write access to contacts.
-const char kContactsOAuth2Scope[] = "https://www.googleapis.com/auth/contacts";
+const char kContactsOAuth2Scope[] = "trk:117:https://www.googleapis.com/auth/contacts";
// OAuth2 scope for access to the people API person's locale preferences
// (read-only).
const char kProfileLanguageReadOnlyOAuth2Scope[] =

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
@@ -373,7 +373,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -382,7 +382,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingServiceImpl::RegisterAllDelayedAnalysis() {

View File

@@ -38,7 +38,7 @@
collection_error_info_.ClearError();
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -281,6 +281,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -280,6 +280,7 @@ GURL SpellcheckHunspellDictionary::GetDi
}
void SpellcheckHunspellDictionary::DownloadDictionary(GURL url) {
@@ -80,7 +80,7 @@
if (state_ == REQUESTING) {
--- a/components/update_client/update_checker.cc
+++ b/components/update_client/update_checker.cc
@@ -104,6 +104,7 @@ void UpdateCheckerImpl::CheckForUpdates(
@@ -103,6 +103,7 @@ void UpdateCheckerImpl::CheckForUpdates(
scoped_refptr<UpdateContext> context,
const base::flat_map<std::string, std::string>& additional_attributes,
UpdateCheckCallback update_check_callback) {

View File

@@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -860,6 +860,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -939,6 +939,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
@@ -1053,6 +1053,8 @@ component("net") {
@@ -1054,6 +1054,8 @@ component("net") {
"url_request/referrer_policy.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -158,7 +158,7 @@
namespace net {
@@ -637,6 +639,12 @@ URLRequest::URLRequest(base::PassKey<URL
@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey<URL
// Sanity check out environment.
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
@@ -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"
@@ -598,6 +599,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -603,6 +604,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();

View File

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

View File

@@ -117,7 +117,7 @@
def quote_and_wrap_text(text, width=79, prefix=' "', suffix='"'):
--- a/components/domain_reliability/google_configs.cc
+++ b/components/domain_reliability/google_configs.cc
@@ -11,551 +11,6 @@
@@ -11,552 +11,6 @@
namespace domain_reliability {
@@ -466,6 +466,7 @@
- {"recaptcha.net", true, false, false},
- {"stackdriver.com", true, false, false},
- {"staging.via.google", true, false, false},
- {"usercontent.google.com", true, false, false},
- {"waze.com", true, false, false},
- {"withgoogle.com", true, false, false},
- {"youtu.be", true, false, false},
@@ -669,7 +670,7 @@
std::unique_ptr<const DomainReliabilityConfig> MaybeGetGoogleConfig(
const std::string& hostname) {
bool is_www_subdomain =
@@ -565,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
@@ -566,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
std::unique_ptr<const DomainReliabilityConfig> config;
std::unique_ptr<const DomainReliabilityConfig> superdomain_config;
@@ -693,7 +694,7 @@
if (config) {
DCHECK(config->origin.host() == hostname);
return config;
@@ -600,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
@@ -601,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
GetAllGoogleConfigsForTesting() {
std::vector<std::unique_ptr<const DomainReliabilityConfig>> configs_out;

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/webui/suggest_internals/suggest_internals_handler.cc
+++ b/chrome/browser/ui/webui/suggest_internals/suggest_internals_handler.cc
@@ -66,9 +66,6 @@ void SuggestInternalsHandler::OnSuggestR
@@ -66,9 +66,6 @@ void SuggestInternalsHandler::OnRequestC
suggest_internals::mojom::Request::New();
mojom_request->id = request_id;
mojom_request->url = request->url;
@@ -11,7 +11,7 @@
- mojom_request->data[variations::kClientDataHeader] = variations_header;
mojom_request->data[request->method] = request->url.spec();
mojom_request->status = suggest_internals::mojom::RequestStatus::kCreated;
page_->OnSuggestRequestCreated(std::move(mojom_request));
page_->OnRequestCreated(std::move(mojom_request));
--- a/chrome/common/google_url_loader_throttle.cc
+++ b/chrome/common/google_url_loader_throttle.cc
@@ -24,10 +24,6 @@
@@ -495,23 +495,10 @@
return false;
}
--- a/components/page_load_metrics/browser/page_load_metrics_util.cc
+++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
@@ -285,9 +285,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
}
bool IsGoogleSearchHostname(const GURL& url) {
- std::optional<std::string> result =
- page_load_metrics::GetGoogleHostnamePrefix(url);
- return result && result.value() == "www";
+ return false;
}
bool IsProbablyGoogleSearchUrl(const GURL& url) {
--- a/components/page_load_metrics/common/page_load_metrics_util.cc
+++ b/components/page_load_metrics/common/page_load_metrics_util.cc
@@ -25,38 +25,7 @@ const int kExtraBufferTimerDelayMillis =
} // namespace
--- a/components/page_load_metrics/google/browser/google_url_util.cc
+++ b/components/page_load_metrics/google/browser/google_url_util.cc
@@ -14,39 +14,7 @@
namespace page_load_metrics {
std::optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
- const size_t registry_length =
@@ -536,8 +523,9 @@
- const std::string_view hostname_minus_registry =
- hostname.substr(0, hostname.length() - (registry_length + 1));
-
- if (hostname_minus_registry == "google")
- if (hostname_minus_registry == "google") {
- return std::string("");
- }
-
- if (!base::EndsWith(hostname_minus_registry, ".google",
- base::CompareCase::INSENSITIVE_ASCII)) {
@@ -549,6 +537,17 @@
}
bool IsGoogleHostname(const GURL& url) {
@@ -54,9 +22,7 @@ bool IsGoogleHostname(const GURL& url) {
}
bool IsGoogleSearchHostname(const GURL& url) {
- std::optional<std::string> result =
- page_load_metrics::GetGoogleHostnamePrefix(url);
- return result && result.value() == "www";
+ return false;
}
bool IsProbablyGoogleSearchUrl(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -612,11 +612,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -675,7 +674,7 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -974,7 +974,7 @@ void PrefetchContainer::AddRedirectHop(c
@@ -988,7 +988,7 @@ void PrefetchContainer::AddRedirectHop(c
// some which are added by throttles). These aren't yet supported for
// prefetch, including browsing topics and client hints.
net::HttpRequestHeaders updated_headers;

View File

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -374,7 +374,6 @@ if (!is_android && !is_mac) {
@@ -371,7 +371,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -1213,7 +1212,6 @@ if (is_win) {
@@ -1210,7 +1209,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_binaries",
":widevine_cdm_library",
@@ -25,7 +25,7 @@
if (is_chrome_branded) {
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -95,11 +95,6 @@ group("resources") {
@@ -94,11 +94,6 @@ group("resources") {
public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
}

View File

@@ -11,7 +11,7 @@
"AttributionAggregatableDebugReporting",
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -129,7 +129,7 @@ std::set<browsing_topics::Topic> GetTopi
@@ -131,7 +131,7 @@ std::set<browsing_topics::Topic> GetTopi
// static
bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -20,7 +20,7 @@
}
// static
@@ -851,7 +851,7 @@ void PrivacySandboxSettingsImpl::SetTopi
@@ -853,7 +853,7 @@ void PrivacySandboxSettingsImpl::SetTopi
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -29,7 +29,7 @@
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
@@ -937,11 +937,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
@@ -939,11 +939,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
return Status::kIncognitoProfile;
}
@@ -50,5 +50,5 @@
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
const base::FeatureParam<std::string>
kPrivacySandboxAggregationServiceTrustedServerUrlAwsParam{
BASE_FEATURE(kPrivacySandboxAggregationServiceFilteringIds,
"PrivacySandboxAggregationServiceFilteringIds",

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

View File

@@ -55,7 +55,7 @@
DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT),
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -126,12 +126,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
@@ -125,12 +125,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
// Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
BASE_FEATURE(kDnsOverHttpsUpgrade,
"DnsOverHttpsUpgrade",

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/chrome_browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/chrome_browser_context_keyed_service_factories.cc
@@ -22,7 +22,6 @@
@@ -19,7 +19,6 @@
#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
#include "chrome/browser/extensions/install_tracker_factory.h"
#include "chrome/browser/extensions/install_verifier_factory.h"
@@ -8,8 +8,8 @@
#include "chrome/browser/extensions/menu_manager_factory.h"
#include "chrome/browser/extensions/permissions/permissions_updater.h"
#include "chrome/browser/extensions/plugin_manager.h"
@@ -49,7 +48,6 @@ void EnsureChromeBrowserContextKeyedServ
extensions::IncognitoConnectability::EnsureFactoryBuilt();
@@ -43,7 +42,6 @@ void EnsureChromeBrowserContextKeyedServ
extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
extensions::InstallTrackerFactory::GetInstance();
extensions::InstallVerifierFactory::GetInstance();
- extensions::ManifestV2ExperimentManager::GetFactory();
@@ -102,7 +102,7 @@
return MV2ExperimentStage::kNone;
}
@@ -198,30 +182,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
@@ -198,19 +182,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
// Returns true if legacy extensions should be disabled, looking at both
// experiment stage and global state.
bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) {
@@ -111,28 +111,17 @@
- return false;
- }
-
- if (base::FeatureList::IsEnabled(
- extensions_features::kAllowLegacyMV2Extensions)) {
- // The user explicitly set the flag to allow legacy MV2 extensions. It's
- // important we retain this functionality so that developers of MV2
- // extensions used by enterprises can continue developing (and testing)
- // them for as long as the ExtensionManifestV2Availability enterprise policy
- // is supported.
return false;
- }
-
- // Check the experiment stage to determine if extensions should be disabled.
- switch (stage) {
- case MV2ExperimentStage::kNone:
- case MV2ExperimentStage::kWarning:
- return false;
return false;
- case MV2ExperimentStage::kDisableWithReEnable:
- case MV2ExperimentStage::kUnsupported:
- return true;
- }
}
// Returns true if the user is allowed to re-enable disabled extensions in the
// Returns true if the given `stage` is one in which extension enablement should
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -471,9 +471,9 @@ content::WebUIDataSource* CreateAndAddEx

View File

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -375,7 +375,6 @@ if (!is_android && !is_mac) {
@@ -372,7 +372,6 @@ if (!is_android && !is_mac) {
data_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -11,7 +11,7 @@
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -944,8 +943,6 @@ if (is_win) {
@@ -941,8 +940,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -20,7 +20,7 @@
# This image is used to badge the lock icon in the
# authentication dialogs, such as those used for installation
# from disk image and Keystone promotion (if so enabled). It
@@ -1217,7 +1214,6 @@ if (is_win) {
@@ -1214,7 +1211,6 @@ if (is_win) {
":swiftshader_binaries",
":widevine_cdm_library",
"//chrome/browser/resources/media/mei_preload:component_bundle",
@@ -30,7 +30,7 @@
if (is_chrome_branded) {
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -759,10 +759,6 @@ static_library("browser") {
@@ -760,10 +760,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_metrics_document_data.h",
"navigation_predictor/navigation_predictor_preconnect_client.cc",
"navigation_predictor/navigation_predictor_preconnect_client.h",
@@ -41,7 +41,7 @@
"net/cert_verifier_service_time_updater.cc",
"net/cert_verifier_service_time_updater.h",
"net/chrome_mojo_proxy_resolver_factory.cc",
@@ -3487,10 +3483,6 @@ static_library("browser") {
@@ -3465,10 +3461,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
@@ -52,8 +52,8 @@
"accessibility/caption_bubble_context_browser.h",
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4228,10 +4220,6 @@ static_library("browser") {
"//chrome/browser/on_device_translation:prefs",
@@ -4201,10 +4193,6 @@ static_library("browser") {
"//chrome/browser/new_tab_page/chrome_colors",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resources:component_extension_resources",
- "//chrome/browser/screen_ai:prefs",
@@ -63,7 +63,7 @@
"//chrome/browser/search/background",
"//chrome/browser/smart_card",
"//chrome/browser/task_manager",
@@ -4355,9 +4343,6 @@ static_library("browser") {
@@ -4334,9 +4322,6 @@ static_library("browser") {
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/bluetooth",
"//services/device/public/cpp/hid",
@@ -73,7 +73,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4446,8 +4431,6 @@ static_library("browser") {
@@ -4427,8 +4412,6 @@ static_library("browser") {
#!is_android
if (!is_chromeos) {
sources += [
@@ -82,7 +82,7 @@
"device_notifications/device_status_icon_renderer.cc",
"device_notifications/device_status_icon_renderer.h",
"external_protocol/auto_launch_protocols_policy_handler.cc",
@@ -4464,8 +4447,6 @@ static_library("browser") {
@@ -4445,8 +4428,6 @@ static_library("browser") {
"policy/chrome_browser_cloud_management_register_watcher.h",
"policy/file_selection_dialogs_policy_handler.cc",
"policy/file_selection_dialogs_policy_handler.h",
@@ -91,7 +91,7 @@
"usb/usb_status_icon.cc",
"usb/usb_status_icon.h",
]
@@ -5189,7 +5170,6 @@ static_library("browser") {
@@ -5191,7 +5172,6 @@ static_library("browser") {
"//chrome/browser/policy:onc",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/resources:app_icon_resources",
@@ -99,7 +99,7 @@
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash/accelerator",
"//chrome/browser/ui/ash/accessibility",
@@ -5411,7 +5391,6 @@ static_library("browser") {
@@ -5415,7 +5395,6 @@ static_library("browser") {
"//components/webapk:proto",
"//device/vr/public/mojom:isolated_xr_service",
"//remoting/host/chromeos:features",
@@ -107,8 +107,8 @@
"//third_party/nearby:rpc_resources_proto",
"//third_party/nearby:wire_format_proto",
"//ui/chromeos",
@@ -8013,22 +7992,6 @@ static_library("browser") {
}
@@ -8029,23 +8008,6 @@ static_library("browser") {
]
}
- if (enable_pdf) {
@@ -121,6 +121,7 @@
- deps += [
- "//chrome/browser/pdf",
- "//chrome/browser/pdf:pdf_pref_names",
- "//chrome/browser/ui/pdf",
- "//components/pdf/browser",
- "//components/pdf/browser:interceptors",
- "//extensions/common/api",
@@ -145,7 +146,7 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1331,9 +1329,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1326,9 +1324,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -179,7 +180,7 @@
std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
--- a/chrome/browser/chrome_browser_interface_binders.cc
+++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -225,8 +225,6 @@
@@ -222,8 +222,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
@@ -188,7 +189,7 @@
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
@@ -864,27 +862,6 @@ void BindMediaFoundationPreferences(
@@ -734,27 +732,6 @@ void BindMediaFoundationPreferences(
}
#endif // BUILDFLAG(IS_WIN)
@@ -214,16 +215,14 @@
-}
-#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// A helper class to register ChromeOS Apps API binders. This includes the logic
@@ -1088,15 +1065,6 @@ void PopulateChromeFrameBinders(
void PopulateChromeFrameBinders(
mojo::BinderMapWithContext<content::RenderFrameHost*>* map,
@@ -883,13 +860,6 @@ void PopulateChromeFrameBinders(
base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
}
- if (features::IsPdfOcrEnabled()) {
- map->Add<screen_ai::mojom::ScreenAIAnnotator>(
- base::BindRepeating(&BindScreenAIAnnotator));
- }
- map->Add<screen_ai::mojom::ScreenAIAnnotator>(
- base::BindRepeating(&BindScreenAIAnnotator));
-
- if (features::IsReadAnythingWithScreen2xEnabled()) {
- map->Add<screen_ai::mojom::Screen2xMainContentExtractor>(
@@ -232,9 +231,28 @@
#endif
#if BUILDFLAG(IS_WIN)
--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
@@ -529,16 +529,6 @@ void ChromeContentBrowserClient::
std::move(receiver), render_frame_host);
},
&render_frame_host));
-#if BUILDFLAG(ENABLE_PDF)
- associated_registry.AddInterface<pdf::mojom::PdfHost>(base::BindRepeating(
- [](content::RenderFrameHost* render_frame_host,
- mojo::PendingAssociatedReceiver<pdf::mojom::PdfHost> receiver) {
- pdf::PDFDocumentHelper::BindPdfHost(
- std::move(receiver), render_frame_host,
- std::make_unique<ChromePDFDocumentHelperClient>());
- },
- &render_frame_host));
-#endif // BUILDFLAG(ENABLE_PDF)
#if !BUILDFLAG(IS_ANDROID)
associated_registry.AddInterface<search::mojom::EmbeddedSearchConnector>(
base::BindRepeating(
--- a/chrome/browser/component_updater/registration.cc
+++ b/chrome/browser/component_updater/registration.cc
@@ -71,8 +71,6 @@
@@ -72,8 +72,6 @@
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h"
@@ -243,7 +261,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
@@ -222,9 +220,6 @@ void RegisterComponentsForUpdate() {
@@ -221,9 +219,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
@@ -264,19 +282,18 @@
#include "chrome/browser/preloading/preloading_prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "components/no_state_prefetch/browser/no_state_prefetch_manager.h"
@@ -107,11 +105,6 @@ base::TimeDelta MLModelExecutionTimerSta
return base::Milliseconds(timer_start_delay);
@@ -106,10 +104,6 @@ base::TimeDelta MLModelExecutionTimerSta
blink::features::kPreloadingModelTimerStartDelay.Get());
}
-base::TimeDelta MLModelExecutionTimerInterval() {
- static int timer_interval =
- blink::features::kPreloadingModelTimerInterval.Get();
- return base::Milliseconds(timer_interval);
- return base::Milliseconds(
- blink::features::kPreloadingModelTimerInterval.Get());
-}
bool MLModelOneExecutionPerHover() {
static bool one_execution_per_hover =
@@ -424,87 +417,6 @@ void NavigationPredictor::ProcessPointer
return blink::features::kPreloadingModelOneExecutionPerHover.Get();
@@ -420,87 +414,6 @@ void NavigationPredictor::ProcessPointer
}
void NavigationPredictor::OnMLModelExecutionTimerFired() {
@@ -364,9 +381,29 @@
}
void NavigationPredictor::SetModelScoreCallbackForTesting(
--- a/chrome/browser/pdf/pdf_extension_util.cc
+++ b/chrome/browser/pdf/pdf_extension_util.cc
@@ -104,7 +104,6 @@ void AddPdfViewerStrings(base::Value::Di
{"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90},
{"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180},
{"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270},
- {"searchifyInProgress", IDS_PDF_SEARCHIFY_IN_PROGRESS},
{"thumbnailPageAriaLabel", IDS_PDF_THUMBNAIL_PAGE_ARIA_LABEL},
{"tooltipAttachments", IDS_PDF_TOOLTIP_ATTACHMENTS},
{"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
--- a/chrome/browser/prefs/BUILD.gn
+++ b/chrome/browser/prefs/BUILD.gn
@@ -262,7 +262,6 @@ source_set("impl") {
} else {
deps += [
"//chrome/browser/promos:utils",
- "//chrome/browser/screen_ai:prefs",
"//chrome/browser/search/background",
"//chrome/browser/search_engine_choice",
"//chrome/browser/search_engines",
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1900,9 +1900,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1863,9 +1863,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -378,7 +415,7 @@
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -359,7 +359,6 @@ source_set("profiles_extra_parts_impl")
@@ -298,7 +298,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/feedback",
"//chrome/browser/hid",
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
@@ -388,15 +425,15 @@
"//chrome/browser/search_engine_choice",
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -102,7 +102,6 @@
@@ -104,7 +104,6 @@
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
#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"
@@ -493,7 +492,6 @@
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
@@ -497,7 +496,6 @@
#include "chrome/browser/new_tab_page/promos/promo_service_factory.h"
#include "chrome/browser/payments/payment_request_display_manager_factory.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
@@ -404,15 +441,15 @@
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/serial/serial_chooser_context_factory.h"
@@ -962,7 +960,6 @@ void ChromeBrowserMainExtraPartsProfiles
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
NavigationPredictorKeyedServiceFactory::GetInstance();
@@ -982,7 +980,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
net::ServerCertificateDatabaseServiceFactory::GetInstance();
#endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
- PreloadingModelKeyedServiceFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -1011,9 +1008,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1031,9 +1028,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -422,7 +459,7 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1158,13 +1152,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1178,13 +1172,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
SafetyHubMenuNotificationServiceFactory::GetInstance();
SafetyHubHatsServiceFactory::GetInstance();
@@ -438,24 +475,22 @@
if (ash::features::IsScannerEnabled()) {
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -826,26 +826,6 @@ void ProfileImpl::DoFinalInit(CreateMode
@@ -843,24 +843,6 @@ void ProfileImpl::DoFinalInit(CreateMode
// The password settings service needs to start listening to settings
// changes from Google Mobile Services, as early as possible.
PasswordManagerSettingsServiceFactory::GetForProfile(this);
-#else
-
-#if BUILDFLAG(ENABLE_PDF)
- if (features::IsPdfOcrEnabled()) {
- bool pcf_ocr_may_be_needed = true;
- bool pcf_ocr_may_be_needed = true;
-#if BUILDFLAG(IS_CHROMEOS)
- // `PdfOcrControllerFactory` is not needed in the not-signed-in profile of
- // ChromeOS as no user navigation to PDFs is possible there.
- pcf_ocr_may_be_needed = IsSignedIn();
- // `PdfOcrControllerFactory` is not needed in the not-signed-in profile of
- // ChromeOS as no user navigation to PDFs is possible there.
- pcf_ocr_may_be_needed = IsSignedIn();
-#endif
- // Create the PDF OCR controller so that it can self-activate as needed.
- if (pcf_ocr_may_be_needed) {
- screen_ai::PdfOcrControllerFactory::GetForProfile(this);
- }
- // Create the PDF OCR controller so that it can self-activate as needed.
- if (pcf_ocr_may_be_needed) {
- screen_ai::PdfOcrControllerFactory::GetForProfile(this);
- }
-#endif // BUILDFLAG(ENABLE_PDF)
-
@@ -475,7 +510,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"
@@ -1495,9 +1494,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1494,9 +1493,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -487,7 +522,7 @@
#if BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -98,7 +98,6 @@ group("resources") {
@@ -97,7 +97,6 @@ group("resources") {
if (is_mac) {
public_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -495,9 +530,22 @@
]
}
--- a/chrome/browser/resources/pdf/pdf_viewer.html
+++ b/chrome/browser/resources/pdf/pdf_viewer.html
@@ -89,10 +89,6 @@
@current-type-changed="${this.onBrushTypeChanged_}">
</viewer-side-panel>` : ''}
</if>
- <cr-toast id="searchifyProgress">
- <div class="spinner"></div>
- <span>$i18n{searchifyInProgress}</span>
- </cr-toast>
</div>
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1728,8 +1728,6 @@ static_library("ui") {
@@ -1673,8 +1673,6 @@ static_library("ui") {
"//chrome/browser/reading_list",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
@@ -506,7 +554,7 @@
"//chrome/browser/smart_card:smart_card",
"//chrome/browser/tab_group_sync:utils",
"//chrome/browser/task_manager:impl",
@@ -2395,7 +2393,6 @@ static_library("ui") {
@@ -2347,7 +2345,6 @@ static_library("ui") {
"//chrome/browser/nearby_sharing/logging:util",
"//chrome/browser/policy:onc",
"//chrome/browser/push_notification:push_notification",
@@ -619,31 +667,41 @@
#include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
@@ -328,19 +326,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -370,26 +368,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
- if (features::IsReadAnythingWithScreen2xEnabled()) {
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_)
- ->GetServiceStateAsync(
- screen_ai::ScreenAIServiceRouter::Service::kMainContentExtraction,
- base::BindOnce(
- &ReadAnythingUntrustedPageHandler::OnScreenAIServiceInitialized,
- weak_factory_.GetWeakPtr()));
- }
- if (features::IsPdfOcrEnabled()) {
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_)
- ->GetServiceStateAsync(screen_ai::ScreenAIServiceRouter::Service::kOCR,
- base::DoNothing());
- if (use_screen_ai_service_) {
- if (features::IsReadAnythingWithScreen2xEnabled()) {
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_)
- ->GetServiceStateAsync(
- screen_ai::ScreenAIServiceRouter::Service::kMainContentExtraction,
- base::BindOnce(&ReadAnythingUntrustedPageHandler::
- OnScreenAIServiceInitialized,
- weak_factory_.GetWeakPtr()));
- }
-#if BUILDFLAG(ENABLE_PDF)
- // PDF searchify feature adds OCR text to images while loading the PDF, so
- // warming up the OCR service is not needed.
- if (!base::FeatureList::IsEnabled(chrome_pdf::features::kPdfSearchify)) {
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_)
- ->GetServiceStateAsync(
- screen_ai::ScreenAIServiceRouter::Service::kOCR,
- base::DoNothing());
- }
-#endif // BUILDFLAG(ENABLE_PDF)
- }
// Enable accessibility for the top level render frame and all descendants.
// This causes AXTreeSerializer to reset and send accessibility events of
@@ -729,9 +714,6 @@ void ReadAnythingUntrustedPageHandler::S
@@ -805,12 +783,6 @@ void ReadAnythingUntrustedPageHandler::S
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
}
}
- if (features::IsPdfOcrEnabled()) {
- // PDF searchify feature adds OCR text to images while loading the PDF, so
- // activating PDF OCR is not needed.
- if (use_screen_ai_service_ &&
- !base::FeatureList::IsEnabled(chrome_pdf::features::kPdfSearchify)) {
- screen_ai::PdfOcrControllerFactory::GetForProfile(profile_)->Activate();
- }
#endif // BUILDFLAG(ENABLE_PDF)
@@ -651,26 +709,26 @@
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -384,18 +384,6 @@ static_library("renderer") {
@@ -379,18 +379,6 @@ static_library("renderer") {
]
} else {
sources += [
- "accessibility/ax_tree_distiller.cc",
- "accessibility/ax_tree_distiller.h",
- "accessibility/read_aloud_app_model.cc",
- "accessibility/read_aloud_app_model.h",
- "accessibility/read_aloud_traversal_utils.cc",
- "accessibility/read_aloud_traversal_utils.h",
- "accessibility/read_anything_app_controller.cc",
- "accessibility/read_anything_app_controller.h",
- "accessibility/read_anything_app_model.cc",
- "accessibility/read_anything_app_model.h",
- "accessibility/read_anything_node_utils.cc",
- "accessibility/read_anything_node_utils.h",
- "accessibility/read_anything/read_aloud_app_model.cc",
- "accessibility/read_anything/read_aloud_app_model.h",
- "accessibility/read_anything/read_aloud_traversal_utils.cc",
- "accessibility/read_anything/read_aloud_traversal_utils.h",
- "accessibility/read_anything/read_anything_app_controller.cc",
- "accessibility/read_anything/read_anything_app_controller.h",
- "accessibility/read_anything/read_anything_app_model.cc",
- "accessibility/read_anything/read_anything_app_model.h",
- "accessibility/read_anything/read_anything_node_utils.cc",
- "accessibility/read_anything/read_anything_node_utils.h",
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -409,7 +397,6 @@ static_library("renderer") {
@@ -404,7 +392,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
@@ -684,7 +742,7 @@
#include "url/gurl.h"
#if !BUILDFLAG(IS_ANDROID)
-#include "chrome/renderer/accessibility/read_anything_app_controller.h"
-#include "chrome/renderer/accessibility/read_anything/read_anything_app_controller.h"
#include "chrome/renderer/searchbox/searchbox_extension.h"
#endif // !BUILDFLAG(IS_ANDROID)
@@ -712,7 +770,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1922,9 +1922,6 @@ if (!is_android) {
@@ -1967,9 +1967,6 @@ if (!is_android) {
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/safe_browsing:advanced_protection",
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -722,7 +780,15 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2316,9 +2313,6 @@ if (!is_android) {
@@ -2008,7 +2005,6 @@ if (!is_android) {
"//chrome/browser/ui/omnibox",
"//chrome/browser/ui/page_action:icon_type",
"//chrome/browser/ui/page_info",
- "//chrome/browser/ui/pdf",
"//chrome/browser/ui/permission_bubble:browser_tests",
"//chrome/browser/ui/prefs:browser_tests",
"//chrome/browser/ui/qrcode_generator:browser_tests",
@@ -2369,9 +2365,6 @@ if (!is_android) {
"//services/network/public/proto:sct_audit_report_proto",
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
@@ -732,7 +798,7 @@
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -7742,7 +7736,6 @@ test("unit_tests") {
@@ -7813,7 +7806,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target.
deps += [
@@ -740,7 +806,7 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -7893,7 +7886,6 @@ test("unit_tests") {
@@ -7959,7 +7951,6 @@ test("unit_tests") {
"//services/device/public/cpp/bluetooth",
"//services/metrics/public/cpp:ukm_builders",
"//services/network:test_support",
@@ -748,7 +814,7 @@
"//services/video_effects/test:test_support",
"//third_party/crashpad/crashpad/util",
"//third_party/libaddressinput",
@@ -8335,7 +8327,6 @@ test("unit_tests") {
@@ -8399,7 +8390,6 @@ test("unit_tests") {
"//chrome/browser/nearby_sharing/contacts:unit_tests",
"//chrome/browser/nearby_sharing/local_device_data:unit_tests",
"//chrome/browser/policy:unit_tests",
@@ -789,7 +855,7 @@
--- a/chrome/utility/services.cc
+++ b/chrome/utility/services.cc
@@ -62,8 +62,6 @@
@@ -60,8 +60,6 @@
#include "services/passage_embeddings/passage_embeddings_service.h"
#include "services/proxy_resolver/proxy_resolver_factory_impl.h" // nogncheck
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
@@ -798,7 +864,7 @@
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -263,12 +261,6 @@ auto RunSpeechRecognitionService(
@@ -260,12 +258,6 @@ auto RunSpeechRecognitionService(
}
#endif // !BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -811,7 +877,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
auto RunCupsIppParser(
@@ -460,7 +452,6 @@ void RegisterMainThreadServices(mojo::Se
@@ -467,7 +459,6 @@ void RegisterMainThreadServices(mojo::Se
services.Add(RunProfileImporter);
services.Add(RunMirroringService);
services.Add(RunPassageEmbeddingsService);
@@ -830,16 +896,6 @@
DCHECK(!inside_classify_);
base::AutoReset<bool> reset(&inside_classify_, true);
AutocompleteInput input(text, page_classification, *scheme_classifier_);
--- a/components/pdf/renderer/BUILD.gn
+++ b/components/pdf/renderer/BUILD.gn
@@ -44,7 +44,6 @@ static_library("renderer") {
"//pdf:pdf_view_web_plugin",
"//printing/buildflags",
"//services/screen_ai/buildflags",
- "//services/screen_ai/public/cpp:metrics",
"//skia",
"//third_party/blink/public:blink",
"//third_party/icu",
--- a/components/pdf/renderer/pdf_accessibility_tree_builder.cc
+++ b/components/pdf/renderer/pdf_accessibility_tree_builder.cc
@@ -9,7 +9,6 @@
@@ -850,6 +906,15 @@
#include "components/strings/grit/components_strings.h"
#include "pdf/accessibility_structs.h"
#include "pdf/pdf_features.h"
@@ -910,8 +909,6 @@ ui::AXNodeData* PdfAccessibilityTreeBuil
wrapper_node->relative_bounds.bounds = gfx::RectF(position, gfx::SizeF(1, 1));
ui::AXNodeData* text_node = CreateStaticTextNode();
- text_node->SetNameChecked(l10n_util::GetStringUTF8(
- start ? IDS_PDF_OCR_RESULT_BEGIN : IDS_PDF_OCR_RESULT_END));
text_node->relative_bounds.bounds = wrapper_node->relative_bounds.bounds;
wrapper_node->child_ids.push_back(text_node->id);
return wrapper_node;
--- a/components/pdf/renderer/pdf_view_web_plugin_client.cc
+++ b/components/pdf/renderer/pdf_view_web_plugin_client.cc
@@ -204,34 +204,6 @@ PdfViewWebPluginClient::CreateAssociated
@@ -925,7 +990,7 @@
};
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -339,8 +339,6 @@ source_set("unit_tests") {
@@ -341,8 +341,6 @@ source_set("unit_tests") {
"//third_party/puffin:libpuffpatch",
"//third_party/re2",
]
@@ -936,7 +1001,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -807,10 +807,6 @@ if (is_apple) {
@@ -808,10 +808,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -947,9 +1012,19 @@
if (v8_use_external_startup_data) {
public_deps += [ "//v8" ]
if (use_v8_context_snapshot) {
--- a/pdf/accessibility.cc
+++ b/pdf/accessibility.cc
@@ -47,7 +47,6 @@ void GetAccessibilityInfo(PDFiumEngine*
page_info.page_index = page_index;
page_info.bounds = page->rect();
page_info.char_count = char_count;
- page_info.is_searchified = page->IsPageSearchified();
chars.resize(page_info.char_count);
for (uint32_t i = 0; i < char_count; ++i) {
--- a/pdf/pdf_view_web_plugin.cc
+++ b/pdf/pdf_view_web_plugin.cc
@@ -1204,11 +1204,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
@@ -1303,11 +1303,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
if (accessibility_state_ == AccessibilityState::kPending)
LoadAccessibility();
@@ -961,7 +1036,7 @@
if (!full_frame_)
return;
@@ -2061,7 +2056,7 @@ void PdfViewWebPlugin::EnableAccessibili
@@ -2243,7 +2238,7 @@ void PdfViewWebPlugin::EnableAccessibili
SkBitmap PdfViewWebPlugin::GetImageForOcr(int32_t page_index,
int32_t page_object_index) {
@@ -969,8 +1044,8 @@
+ return SkBitmap();
}
#if BUILDFLAG(ENABLE_PDF_INK2)
@@ -2641,19 +2636,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
void PdfViewWebPlugin::HandleAccessibilityAction(
@@ -2780,19 +2775,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
return;
}
@@ -992,7 +1067,7 @@
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -2617,7 +2617,7 @@ void PDFiumEngine::HandleLongPress(const
@@ -2660,7 +2660,7 @@ void PDFiumEngine::HandleLongPress(const
SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) {
DCHECK(PageIndexInBounds(page_index));
@@ -1053,7 +1128,7 @@
group("devtools_all_files") {
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
@@ -194,7 +194,6 @@ group("unittests") {
@@ -193,7 +193,6 @@ group("unittests") {
"panels/timeline:unittests",
"panels/timeline/components:unittests",
"panels/timeline/components/insights:unittests",

View File

@@ -1,7 +1,7 @@
# Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -174,6 +174,7 @@
@@ -171,6 +171,7 @@
#include "components/supervised_user/core/browser/supervised_user_preferences.h"
#include "components/supervised_user/core/browser/supervised_user_service.h"
#include "components/supervised_user/core/browser/supervised_user_url_filter.h"
@@ -9,7 +9,7 @@
#include "components/translate/core/browser/translate_download_manager.h"
#include "components/translate/core/browser/translate_manager.h"
#include "components/translate/core/browser/translate_prefs.h"
@@ -2282,6 +2283,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2275,6 +2276,7 @@ void RenderViewContextMenu::AppendPageIt
}
if (CanTranslate(/*menu_logging=*/true)) {

View File

@@ -9,7 +9,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2456,6 +2456,7 @@ static_library("browser") {
@@ -2451,6 +2451,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
@@ -178,6 +178,7 @@
@@ -180,6 +180,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
@@ -277,6 +277,7 @@ source_set("browser") {
@@ -281,6 +281,7 @@ source_set("browser") {
"//third_party/re2",
"//third_party/snappy",
"//third_party/sqlite",
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/bad_message.h"
@@ -3348,6 +3349,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3346,6 +3347,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
@@ -105,6 +105,7 @@ target(link_target_type, "child") {
@@ -106,6 +106,7 @@ target(link_target_type, "child") {
"//third_party/blink/public/common:buildflags",
"//third_party/blink/public/strings",
"//third_party/ced",
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -500,6 +501,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -496,6 +497,10 @@ void SetRuntimeFeaturesFromCommandLine(c
true},
{wrf::EnableWebAudioBypassOutputBufferingOptOut,
blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
@@ -124,7 +124,7 @@
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -849,6 +850,11 @@ Document::Document(const DocumentInit& i
@@ -853,6 +854,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();
@@ -966,6 +972,14 @@ const Position Document::PositionAdjuste
@@ -972,6 +978,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
@@ -547,6 +547,10 @@ class CORE_EXPORT Document : public Cont
@@ -551,6 +551,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -161,10 +161,10 @@
+ double GetNoiseFactorX();
+ double GetNoiseFactorY();
+
AtomicString visibilityState() const;
V8VisibilityState visibilityState() const;
String visibilityStateAsString() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2554,6 +2558,9 @@ class CORE_EXPORT Document : public Cont
@@ -2608,6 +2612,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
@@ -2528,6 +2528,11 @@ DOMRectList* Element::getClientRects() {
@@ -2529,6 +2529,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2555,6 +2560,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2556,6 +2561,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -200,7 +200,7 @@
--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
@@ -1649,6 +1649,12 @@ DOMRectList* Range::getClientRects() con
@@ -1620,6 +1620,12 @@ DOMRectList* Range::getClientRects() con
Vector<gfx::QuadF> quads;
GetBorderAndTextQuads(quads);
@@ -213,7 +213,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -1656,7 +1662,11 @@ DOMRect* Range::getBoundingClientRect()
@@ -1627,7 +1633,11 @@ DOMRect* Range::getBoundingClientRect()
// TODO(crbug.com/1499981): This should be removed once synchronized scrolling
// impact is understood.
SyncScrollAttemptHeuristic::DidAccessScrollOffset();
@@ -228,7 +228,7 @@
// TODO(editing-dev): We should make
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
@@ -103,6 +103,24 @@ const ShapeResult* ShapeWord(const TextR
@@ -102,6 +102,24 @@ const ShapeResult* ShapeWord(const TextR
}
} // namespace
@@ -255,7 +255,7 @@
const TextBaseline& baseline,
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
@@ -101,6 +101,8 @@ class CORE_EXPORT TextMetrics final : pu
@@ -103,6 +103,8 @@ class CORE_EXPORT TextMetrics final : pu
float x_position_;
};
@@ -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
@@ -223,6 +223,9 @@ class Isolate;
@@ -224,6 +224,9 @@ class Isolate;
class Value;
} // namespace v8
@@ -276,7 +276,7 @@
namespace blink {
class DOMMatrixInit;
@@ -3608,8 +3611,22 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -3638,8 +3641,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
@@ -1765,6 +1765,7 @@ component("platform") {
@@ -1767,6 +1767,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection:language_detection",
@@ -338,7 +338,7 @@
#include "third_party/blink/renderer/platform/wtf/vector.h"
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2013,6 +2013,12 @@
@@ -2026,6 +2026,12 @@
depends_on: ["FindDecomposedInShortText"],
},
{

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
@@ -3351,6 +3351,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3349,6 +3349,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -44,7 +44,7 @@ approach to change color components.
switches::kForceGpuMemAvailableMb,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -505,6 +505,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -501,6 +501,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -65,7 +65,7 @@ approach to change color components.
};
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -2921,6 +2921,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2917,6 +2917,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -77,7 +77,7 @@ approach to change color components.
return image_data;
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1712,7 +1712,9 @@ component("platform") {
@@ -1714,7 +1714,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -314,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
@@ -2019,6 +2019,9 @@
@@ -2032,6 +2032,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
@@ -2143,6 +2143,7 @@ static_library("browser") {
@@ -2140,6 +2140,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2522,6 +2522,10 @@ const char kLogJsConsoleMessagesDescript
@@ -2492,6 +2492,10 @@ const char kLogJsConsoleMessagesDescript
"Enable logging JS console messages in system logs, please note that they "
"may contain PII.";
@@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1426,6 +1426,9 @@ extern const char kLocationBarModelOptim
@@ -1413,6 +1413,9 @@ extern const char kLocationBarModelOptim
extern const char kLogJsConsoleMessagesName[];
extern const char kLogJsConsoleMessagesDescription[];

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
@@ -1581,7 +1581,7 @@ void ChromeContentBrowserClient::Registe
@@ -1579,7 +1579,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
@@ -474,7 +474,7 @@ void ProfileNetworkContextService::Confi
@@ -500,7 +500,7 @@ void ProfileNetworkContextService::Confi
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -45,7 +45,7 @@
// Enum representing possible values of the Preload Pages opt-in state. These
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -308,7 +308,7 @@ const char Profile::kProfileKey[] = "__P
@@ -316,7 +316,7 @@ const char Profile::kProfileKey[] = "__P
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
@@ -56,7 +56,7 @@
registry->RegisterStringPref(
--- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
+++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
@@ -34,7 +34,7 @@
@@ -33,7 +33,7 @@
</cr-button>
</div>
<div slot="footer">
@@ -120,7 +120,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -319,7 +319,7 @@ bool HasManuallyFilledFields(const Passw
@@ -317,7 +317,7 @@ bool HasManuallyFilledFields(const Passw
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -129,7 +129,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
#if BUILDFLAG(IS_IOS)
// Deprecated pref in profile prefs.
@@ -327,7 +327,7 @@ void PasswordManager::RegisterProfilePre
@@ -325,7 +325,7 @@ void PasswordManager::RegisterProfilePre
false);
#endif // BUILDFLAG(IS_IOS)
registry->RegisterBooleanPref(

View File

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

View File

@@ -11,7 +11,7 @@ very interesting in themselves. Force them to be stored.
--- a/third_party/blink/common/mime_util/mime_util.cc
+++ b/third_party/blink/common/mime_util/mime_util.cc
@@ -86,6 +86,7 @@ constexpr auto kUnsupportedTextTypes =
@@ -87,6 +87,7 @@ constexpr auto kUnsupportedTextTypes =
"text/x-csv",
"text/x-vcf",
"text/rtf",

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
@@ -281,7 +281,7 @@ bool GetTLSServerEndPointChannelBinding(
@@ -280,7 +280,7 @@ bool GetTLSServerEndPointChannelBinding(
}
// RSA keys created by CreateKeyAndSelfSignedCert will be of this length.

View File

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

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -146,6 +146,7 @@
@@ -145,6 +145,7 @@
#include "chrome/browser/ui/unload_controller.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h"
@@ -8,7 +8,7 @@
#include "chrome/browser/ui/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"
@@ -550,6 +551,7 @@ Browser::Browser(const CreateParams& par
@@ -574,6 +575,7 @@ Browser::Browser(const CreateParams& par
omit_from_session_restore_(params.omit_from_session_restore),
should_trigger_session_restore_(params.should_trigger_session_restore),
cancel_download_confirmation_state_(NOT_PROMPTED),
@@ -16,7 +16,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -988,20 +990,22 @@ Browser::WarnBeforeClosingResult Browser
@@ -1012,20 +1014,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1039,6 +1043,7 @@ bool Browser::TryToCloseWindow(
@@ -1063,6 +1067,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3122,6 +3127,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3173,6 +3178,58 @@ bool Browser::CanCloseWithInProgressDown
return false;
}
@@ -119,7 +119,7 @@
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
if (cancel_downloads) {
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
@@ -3147,6 +3204,22 @@ void Browser::InProgressDownloadResponse
@@ -3198,6 +3255,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -144,7 +144,7 @@
void Browser::CookieMigrationNoticeResponse(bool proceed_closing) {
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -31,6 +31,7 @@
@@ -32,6 +32,7 @@
#include "chrome/browser/ui/browser_navigator_params.h"
#include "chrome/browser/ui/browser_window/public/browser_window_interface.h"
#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
@@ -152,7 +152,7 @@
#include "chrome/browser/ui/signin/signin_view_controller.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
@@ -1180,12 +1181,17 @@ class Browser : public TabStripModelObse
@@ -1185,12 +1186,17 @@ class Browser : public TabStripModelObse
// Returns true if the window can close, false otherwise.
bool CanCloseWithInProgressDownloads();
@@ -170,7 +170,7 @@
// Called when the user has decided whether to proceed or not with the browser
// closure, in case the cookie migration notice was shown. |proceed_closing|
// is true if the browser can be closed.
@@ -1351,6 +1357,8 @@ class Browser : public TabStripModelObse
@@ -1356,6 +1362,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
@@ -937,10 +937,14 @@ bool HandleNewTabPageLocationOverride(
@@ -930,10 +930,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())

View File

@@ -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
@@ -684,8 +684,14 @@ WebInputEventResult MouseEventManager::H
@@ -687,8 +687,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -640,5 +640,7 @@ bool BrowserFrame::RegenerateFrameOnThem
@@ -637,5 +637,7 @@ bool BrowserFrame::RegenerateFrameOnThem
}
bool BrowserFrame::IsIncognitoBrowser() const {
@@ -10,7 +10,7 @@
}
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -55,6 +55,7 @@
@@ -56,6 +56,7 @@
#include "ui/base/webui/jstemplate_builder.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/color/color_provider.h"
@@ -18,7 +18,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -427,7 +428,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -429,7 +430,9 @@ void NTPResourceCache::CreateNewTabIncog
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
// Colors.

View File

@@ -41,7 +41,7 @@
#include "base/feature_list.h"
#include "base/format_macros.h"
#include "base/functional/bind.h"
@@ -536,6 +537,15 @@ AutocompleteController::AutocompleteCont
@@ -537,6 +538,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"
@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_p
@@ -631,6 +632,9 @@ void SearchProvider::Run(bool query_is_p
}
void SearchProvider::DoHistoryQuery(bool minimal_changes) {

View File

@@ -30,17 +30,17 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/sharing_message/features.cc
+++ b/components/sharing_message/features.cc
@@ -17,3 +17,5 @@ const base::FeatureParam<int> kSharingPu
@@ -7,3 +7,5 @@
#include "build/build_config.h"
const base::FeatureParam<int> kSharingPulseDeltaAndroidHours = {
&kSharingMatchPulseInterval, "SharingPulseDeltaAndroidHours", 24};
BASE_FEATURE(kClickToCall, "ClickToCall", base::FEATURE_DISABLED_BY_DEFAULT);
+
+BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT);
--- a/components/sharing_message/features.h
+++ b/components/sharing_message/features.h
@@ -26,4 +26,5 @@ extern const base::FeatureParam<int> kSh
// backgrounded. Such devices cannot be marked stale aggressively.
extern const base::FeatureParam<int> kSharingPulseDeltaAndroidHours;
@@ -10,4 +10,5 @@
BASE_DECLARE_FEATURE(kClickToCall);
+BASE_DECLARE_FEATURE(kDisableQRGenerator);
#endif // COMPONENTS_SHARING_MESSAGE_FEATURES_H_

View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -514,7 +514,9 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -509,7 +509,9 @@ void TabHelpers::AttachTabHelpers(WebCon
site_protection::SiteProtectionMetricsObserver::CreateForWebContents(
web_contents);
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
@@ -60,7 +60,7 @@
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
#include "base/debug/crash_logging.h"
@@ -215,6 +216,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
@@ -193,6 +194,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
return TemplateURL(merged_data);
}
@@ -73,7 +73,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -397,6 +404,7 @@ TemplateURLService::TemplateURLService(
@@ -375,6 +382,7 @@ TemplateURLService::TemplateURLService(
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
)
: prefs_(prefs),
@@ -81,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),
@@ -507,8 +515,8 @@ bool TemplateURLService::CanAddAutogener
@@ -485,8 +493,8 @@ bool TemplateURLService::CanAddAutogener
// that may interfere with search queries). An easy heuristic for this is
// whether the user has a TemplateURL that has been manually modified (e.g.,
// renamed) connected to the same host.
@@ -92,7 +92,7 @@
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -2039,6 +2047,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2034,6 +2042,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
if (client_)
client_->SetOwner(this);
@@ -2219,6 +2229,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2212,6 +2222,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -113,7 +113,7 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -895,6 +895,8 @@ class TemplateURLService final : public
@@ -898,6 +898,8 @@ class TemplateURLService final : public
raw_ref<search_engines::SearchEngineChoiceService>
search_engine_choice_service_;

View File

@@ -27,7 +27,7 @@
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
@@ -1831,6 +1832,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -1835,6 +1836,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1424,7 +1424,8 @@ void BrowserCommandController::InitComma
@@ -1420,7 +1420,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -20,16 +20,14 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
@@ -115,7 +116,8 @@ TabStripRegionView::TabStripRegionView(s
// Add and configure the TabSearchContainer.
@@ -119,6 +120,7 @@ TabStripRegionView::TabStripRegionView(s
std::unique_ptr<TabSearchContainer> tab_search_container;
- if (browser && browser->is_type_normal()) {
+ if (browser && browser->is_type_normal() &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) {
std::unique_ptr<ProductSpecificationsButton> product_specifications_button;
if (browser &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button") &&
(browser->GetType() == BrowserWindowInterface::Type::TYPE_NORMAL)) {
tab_search_container = std::make_unique<TabSearchContainer>(
tab_strip_->controller(), browser->tab_strip_model(),
render_tab_search_before_tab_strip_, this,
tab_strip_->controller(), browser->GetTabStripModel(),
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -60,4 +60,8 @@

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -392,4 +392,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
@@ -372,4 +372,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
"RemovalOfIWAsFromTabCapture",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -8,7 +8,7 @@
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -151,6 +151,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
@@ -145,6 +145,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
// module, e.g.
// //chrome/browser/<foo_module>/features.h
//
@@ -48,7 +48,7 @@
uint64_t GetOriginTypeMask(const base::Value::List& data_types) {
uint64_t result = 0;
for (const auto& data_type : data_types) {
@@ -314,9 +330,10 @@ void ChromeBrowsingDataLifetimeManager::
@@ -313,9 +329,10 @@ void ChromeBrowsingDataLifetimeManager::
const base::Value::List& data_types = profile_->GetPrefs()->GetList(
browsing_data::prefs::kClearBrowsingDataOnExitList);
@@ -61,7 +61,7 @@
profile_->GetPrefs()->SetBoolean(
browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
auto* remover = profile_->GetBrowsingDataRemover();
@@ -327,8 +344,8 @@ void ChromeBrowsingDataLifetimeManager::
@@ -326,8 +343,8 @@ void ChromeBrowsingDataLifetimeManager::
DCHECK(keep_browser_alive);
#endif
remover->RemoveAndReply(base::Time(), base::Time::Max(),

View File

@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -696,6 +697,10 @@ void TabStripModel::CloseAllTabsInGroup(
@@ -709,6 +710,10 @@ void TabStripModel::CloseAllTabsInGroup(
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));
@@ -19,7 +19,7 @@
WebContents* contents = GetWebContentsAt(index);
CloseTabs(base::span<WebContents* const>(&contents, 1u), close_types);
}
@@ -1047,11 +1052,15 @@ void TabStripModel::AddTab(std::unique_p
@@ -1060,11 +1065,15 @@ void TabStripModel::AddTab(std::unique_p
}
void TabStripModel::CloseSelectedTabs() {
@@ -38,7 +38,7 @@
TabCloseTypes::CLOSE_CREATE_HISTORICAL_TAB |
TabCloseTypes::CLOSE_USER_GESTURE);
}
@@ -1800,9 +1809,13 @@ TabStripModel::GetGroupsDestroyedFromRem
@@ -1811,9 +1820,13 @@ TabStripModel::GetGroupsDestroyedFromRem
void TabStripModel::ExecuteCloseTabsByIndices(
base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
uint32_t close_types) {

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
@@ -1223,6 +1223,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1221,6 +1221,8 @@ WindowOpenDisposition NavigationPolicyTo
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

View File

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -202,7 +202,8 @@ class SSLClientSocketImpl::SSLContext {
@@ -201,7 +201,8 @@ class SSLClientSocketImpl::SSLContext {
SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback);
SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */);

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2039,6 +2039,10 @@ void BrowserView::ExitFullscreen() {
@@ -2034,6 +2034,10 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateExclusiveAccessBubble(
const ExclusiveAccessBubbleParams& params,
ExclusiveAccessBubbleHideCallback first_hide_callback) {

View File

@@ -3,7 +3,7 @@
@@ -1080,7 +1080,11 @@ void Tab::UpdateIconVisibility() {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#endif // BUILDFLAG(IS_CHROMEOS)
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-tab-close-buttons")) {
+ showing_close_button_ = false;
+ } else {

View File

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/embedder_support/user_agent_utils.cc
+++ b/components/embedder_support/user_agent_utils.cc
@@ -143,6 +143,8 @@ const std::string& GetWindowsPlatformVer
@@ -146,6 +146,8 @@ const std::string& GetWindowsPlatformVer
// TODO(crbug.com/1330890): Remove this method along with policy.
bool ShouldReduceUserAgentMinorVersion(
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@@ -20,7 +20,7 @@
return ((user_agent_reduction !=
UserAgentReductionEnterprisePolicyState::kForceDisabled &&
base::FeatureList::IsEnabled(
@@ -166,6 +168,8 @@ bool ShouldReduceUserAgentMinorVersion(
@@ -169,6 +171,8 @@ bool ShouldReduceUserAgentMinorVersion(
// sending unified platform for the user agent string.
bool ShouldSendUserAgentUnifiedPlatform(
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@@ -29,7 +29,7 @@
#if BUILDFLAG(IS_ANDROID)
return ShouldReduceUserAgentMinorVersion(user_agent_reduction) &&
base::FeatureList::IsEnabled(
@@ -456,6 +460,8 @@ blink::UserAgentMetadata GetUserAgentMet
@@ -511,6 +515,8 @@ blink::UserAgentMetadata GetUserAgentMet
blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service,
bool only_low_entropy_ch) {

View File

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/client_hints/client_hints.cc
+++ b/content/browser/client_hints/client_hints.cc
@@ -840,6 +840,8 @@ void UpdateNavigationRequestClientUaHead
@@ -824,6 +824,8 @@ void UpdateNavigationRequestClientUaHead
net::HttpRequestHeaders* headers,
const std::optional<GURL>& request_url) {
DCHECK(frame_tree_node);
@@ -20,7 +20,7 @@
if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) {
return;
}
@@ -861,6 +863,8 @@ void AddRequestClientHintsHeaders(
@@ -845,6 +847,8 @@ void AddRequestClientHintsHeaders(
FrameTreeNode* frame_tree_node,
const blink::ParsedPermissionsPolicy& container_policy,
const std::optional<GURL>& request_url) {

View File

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

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4237,10 +4237,12 @@ const FeatureEntry::FeatureVariation
@@ -4342,10 +4342,12 @@ const FeatureEntry::FeatureVariation kSe
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

View File

@@ -19,7 +19,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -161,6 +161,7 @@
@@ -162,6 +162,7 @@
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/header_util.h"
#include "services/network/public/cpp/is_potentially_trustworthy.h"
@@ -44,7 +44,7 @@
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -133,6 +133,7 @@
@@ -132,6 +132,7 @@
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/not_implemented_url_loader_factory.h"
@@ -52,7 +52,7 @@
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
@@ -4656,10 +4657,13 @@ void RenderFrameImpl::FinalizeRequestInt
@@ -4647,10 +4648,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -111,7 +111,7 @@
"request_mode.cc",
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -17,6 +17,14 @@
@@ -16,6 +16,14 @@
#include "url/origin.h"
namespace network::features {
@@ -128,7 +128,7 @@
// ignore Accept-CH response headers for a site that is specified in the
--- a/services/network/public/cpp/features.h
+++ b/services/network/public/cpp/features.h
@@ -17,6 +17,10 @@ class Origin;
@@ -18,6 +18,10 @@ class Origin;
} // namespace url
namespace network::features {

View File

@@ -47,7 +47,7 @@
// True if |hostname| ends with either ".local" or ".local.".
bool ResemblesMulticastDNSName(std::string_view hostname) {
return hostname.ends_with(".local") || hostname.ends_with(".local.");
@@ -1430,33 +1425,10 @@ int HostResolverManager::StartIPv6Reacha
@@ -1426,33 +1421,10 @@ int HostResolverManager::StartIPv6Reacha
return OK;
}

View File

@@ -370,14 +370,14 @@
}
@@ -433,6 +438,8 @@ bool SearchEnginesHandler::CheckFieldVal
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
else if (field_name.compare(kQueryUrlField) == 0)
} else if (field_name.compare(kQueryUrlField) == 0) {
is_valid = edit_controller_->IsURLValid(field_value);
+ else if (field_name.compare(kSuggestionsUrlField) == 0)
+ } else if (field_name.compare(kSuggestionsUrlField) == 0) {
+ is_valid = edit_controller_->IsSuggestionsURLValid(field_value);
else
NOTREACHED_IN_MIGRATION();
@@ -452,18 +459,21 @@ void SearchEnginesHandler::HandleSearchE
} else {
NOTREACHED();
}
@@ -453,18 +460,21 @@ void SearchEnginesHandler::HandleSearchE
if (!edit_controller_.get())
return;
@@ -427,7 +427,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -902,7 +902,8 @@ void TemplateURLService::IncrementUsageC
@@ -883,7 +883,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());
@@ -917,6 +918,7 @@ void TemplateURLService::ResetTemplateUR
@@ -898,6 +899,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
@@ -4233,7 +4233,13 @@ const FeatureEntry::FeatureVariation
@@ -4338,7 +4338,13 @@ const FeatureEntry::FeatureVariation kSe
// 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/media/webrtc/capture_policy_utils.cc
+++ b/chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -64,46 +64,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
@@ -60,36 +60,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
base::OnceCallback<void(bool)> callback,
content::BrowserContext* context,
bool is_multi_capture_allowed_for_any_origin_on_main_profile) {
@@ -16,24 +16,14 @@
- // complete.
- Profile* profile = Profile::FromBrowserContext(context);
- if (!profile) {
- std::move(callback).Run(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()) {
- std::move(callback).Run(false);
- return;
- }
-#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
-
- HostContentSettingsMap* host_content_settings_map =
- HostContentSettingsMapFactory::GetForProfile(profile);
- if (!host_content_settings_map) {
std::move(callback).Run(false);
- std::move(callback).Run(false);
- return;
- }
- ContentSettingsForOneType content_settings =
@@ -47,7 +37,7 @@
}
void CheckAllScreensMediaAllowedForIwaResultReceived(
@@ -291,58 +252,13 @@ void RegisterProfilePrefs(PrefRegistrySi
@@ -263,43 +234,13 @@ void RegisterProfilePrefs(PrefRegistrySi
void CheckGetAllScreensMediaAllowedForAnyOrigin(
content::BrowserContext* context,
base::OnceCallback<void(bool)> callback) {
@@ -72,21 +62,6 @@
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) {
- std::move(callback).Run(false);
- return;
- }
- // 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()) {
- std::move(callback).Run(false);
- return;
- }
-#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
-
-#if BUILDFLAG(IS_CHROMEOS)
- crosapi::mojom::MultiCaptureService* multi_capture_service =
- GetMultiCaptureService();
@@ -105,4 +80,4 @@
-#endif // BUILDFLAG(IS_CHROMEOS)
}
#if !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_SCREEN_CAPTURE)

View File

@@ -0,0 +1,38 @@
--- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
+++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
@@ -144,35 +144,6 @@ bool AreNewChromeLabsExperimentsAvailabl
}
bool IsChromeLabsEnabled() {
- // Always early out on the stable channel regardless of other conditions.
- if (chrome::GetChannel() == version_info::Channel::STABLE) {
- return false;
- }
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- variations::switches::kEnableBenchmarking)) {
- return true;
- }
- // Could be null in unit tests.
- if (!g_browser_process->local_state()) {
- return false;
- }
- if (g_browser_process->local_state()->GetInteger(
- chrome_labs_prefs::kChromeLabsActivationThreshold) ==
- chrome_labs_prefs::kChromeLabsActivationThresholdDefaultValue) {
- g_browser_process->local_state()->SetInteger(
- chrome_labs_prefs::kChromeLabsActivationThreshold,
- base::RandInt(1, 100));
- }
-
- // The percentage of users that should see the feature.
- const int kChromeLabsActivationPercentage = 99;
-
- if (force_activation_for_testing ||
- g_browser_process->local_state()->GetInteger(
- chrome_labs_prefs::kChromeLabsActivationThreshold) <=
- kChromeLabsActivationPercentage) {
- return true;
- }
return false;
}

View File

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

View File

@@ -1,6 +1,6 @@
--- a/components/safe_browsing/core/common/features.cc
+++ b/components/safe_browsing/core/common/features.cc
@@ -207,7 +207,7 @@ constexpr base::FeatureParam<int> kHashP
@@ -211,7 +211,7 @@ constexpr base::FeatureParam<int> kHashP
BASE_FEATURE(kDownloadsPageReferrerUrl,
"DownloadsPageReferrerUrl",

View File

@@ -13,7 +13,7 @@
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -261,5 +261,5 @@ TemplateURLService* ChromeLocationBarMod
@@ -255,5 +255,5 @@ TemplateURLService* ChromeLocationBarMod
// static
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {

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
@@ -3852,8 +3852,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3848,8 +3848,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3867,8 +3866,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3863,8 +3862,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
@@ -1933,7 +1933,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
@@ -1982,7 +1982,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",

View File

@@ -2,12 +2,12 @@
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -111,7 +111,7 @@ bool ReloadButton::GetMenuEnabled() cons
@@ -113,7 +113,7 @@ bool ReloadButton::GetMenuEnabled() cons
}
void ReloadButton::SetMenuEnabled(bool enable) {
- menu_enabled_ = enable;
+ menu_enabled_ = true;
UpdateAccessibleHasPopup();
}
void ReloadButton::OnMouseExited(const ui::MouseEvent& event) {

View File

@@ -14,8 +14,8 @@
}
return content_restrictions;
}
@@ -1751,8 +1746,7 @@ bool CanSavePage(const Browser* browser)
DownloadPrefs::DownloadRestriction::ALL_FILES) {
@@ -1748,8 +1743,7 @@ bool CanSavePage(const Browser* browser)
policy::DownloadRestriction::ALL_FILES) {
return false;
}
- return !browser->is_type_devtools() &&

View File

@@ -1,21 +1,21 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -205,12 +205,10 @@ TabStripRegionView::TabStripRegionView(s
@@ -219,12 +219,10 @@ TabStripRegionView::TabStripRegionView(s
new_tab_button_->GetViewAccessibility().SetName(
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_LINUX)
// The New Tab Button can be middle-clicked on Linux.
new_tab_button_->SetTriggerableEventFlags(
new_tab_button_->GetTriggerableEventFlags() |
ui::EF_MIDDLE_MOUSE_BUTTON);
-#endif
}
reserved_grab_handle_space_ =
if (features::IsTabstripComboButtonEnabled()) {
tab_search_container_ = AddChildView(std::move(tab_search_container));
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2073,8 +2073,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2077,8 +2077,6 @@ void TabStrip::NewTabButtonPressed(const
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {
@@ -24,7 +24,7 @@
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
CHECK(clipboard)
<< "Clipboard instance is not available, cannot proceed with "
@@ -2085,7 +2083,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2089,7 +2087,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1111,6 +1111,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1118,6 +1118,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -10,7 +10,7 @@
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -39,6 +39,7 @@
@@ -45,6 +45,7 @@
#include "chrome/browser/ui/webui/signin_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"
@@ -243,6 +244,7 @@ void RegisterChromeWebUIConfigs() {
@@ -254,6 +255,7 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<SiteEngagementUIConfig>());
map.AddWebUIConfig(std::make_unique<SyncInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<TranslateInternalsUIConfig>());

View File

@@ -2,14 +2,14 @@
--- a/chrome/browser/extensions/api/BUILD.gn
+++ b/chrome/browser/extensions/api/BUILD.gn
@@ -36,7 +36,6 @@ group("api_implementations") {
"//chrome/browser/extensions/api/experimental_ai_data",
@@ -38,7 +38,6 @@ group("api_implementations") {
"//chrome/browser/extensions/api/extension_action",
"//chrome/browser/extensions/api/font_settings",
"//chrome/browser/extensions/api/idltest",
- "//chrome/browser/extensions/api/mdns",
"//chrome/browser/extensions/api/module",
"//chrome/browser/extensions/api/networking_private",
"//chrome/browser/extensions/api/omnibox",
"//chrome/browser/extensions/api/notifications",
--- a/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
+++ b/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
@@ -40,37 +40,22 @@ DnsSdDeviceLister::DnsSdDeviceLister(

View File

@@ -3,7 +3,7 @@
#
--- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc
@@ -373,7 +373,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
@@ -325,7 +325,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",

View File

@@ -33,25 +33,24 @@
# disable LiveCaption flag by default, this also removes non-functional Live Caption checkbox from media controls
# the new feature badges
--- a/chrome/browser/resources/extensions/item_list.html
+++ b/chrome/browser/resources/extensions/item_list.html
@@ -115,13 +115,6 @@
</div>
</template>
--- a/chrome/browser/resources/extensions/item_list.html.ts
+++ b/chrome/browser/resources/extensions/item_list.html.ts
@@ -30,12 +30,6 @@ export function getHtml(this: Extensions
</extensions-mv2-deprecation-panel>
</div>` : ''}
- <div id="no-items" class="empty-list-message"
- hidden$="[[!shouldShowEmptyItemsMessage_(
- apps.length, extensions.length)]]">
- <span on-click="onNoExtensionsClick_">
- ?hidden="${!this.shouldShowEmptyItemsMessage_()}">
- <span @click="${this.onNoExtensionsClick_}">
- $i18nRaw{noExtensionsOrApps}
- </span>
- </div>
<div id="no-search-results" class="empty-list-message"
hidden$="[[!shouldShowEmptySearchMessage_(
shownAppsCount_, shownExtensionsCount_, apps, extensions)]]">
--- a/chrome/browser/resources/extensions/sidebar.html
+++ b/chrome/browser/resources/extensions/sidebar.html
@@ -24,12 +24,3 @@
?hidden="${!this.shouldShowEmptySearchMessage_()}">
<span>$i18n{noSearchResults}</span>
--- a/chrome/browser/resources/extensions/sidebar.html.ts
+++ b/chrome/browser/resources/extensions/sidebar.html.ts
@@ -33,16 +33,6 @@ export function getHtml(this: Extensions
<cr-ripple></cr-ripple>
</a>
</cr-menu-selector>
@@ -61,12 +60,24 @@
- </cr-icon>
- <span id="discover-more-text" class="cr-secondary-text"
- @click="${this.onMoreExtensionsClick_}"
- .innerHTML="${this.computeDiscoverMoreText_()}"></span>
- .innerHTML="${this.computeDiscoverMoreText_()}">
- </span>
- <cr-ripple></cr-ripple>
-</div>
<!--_html_template_end_-->`;
// clang-format on
}
--- a/chrome/browser/resources/extensions/sidebar.ts
+++ b/chrome/browser/resources/extensions/sidebar.ts
@@ -111,13 +111,6 @@ export class ExtensionsSidebarElement ex
@@ -8,7 +8,6 @@ import './icons.html.js';
import type {CrMenuSelector} from 'chrome://resources/cr_elements/cr_menu_selector/cr_menu_selector.js';
import {I18nMixinLit} from 'chrome://resources/cr_elements/i18n_mixin_lit.js';
import {assert} from 'chrome://resources/js/assert.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
import {CrLitElement} from 'chrome://resources/lit/v3_0/lit.rollup.js';
import type {PropertyValues} from 'chrome://resources/lit/v3_0/lit.rollup.js';
@@ -111,13 +110,6 @@ export class ExtensionsSidebarElement ex
}
}
@@ -79,7 +90,7 @@
- }
}
// Exported to be used in the autogenerated Lit template file
declare global {
--- a/chrome/browser/resources/history/side_bar.html
+++ b/chrome/browser/resources/history/side_bar.html
@@ -88,13 +88,6 @@
@@ -293,7 +304,7 @@
<div id="chromeSigninUserChoiceSetting" class="hr cr-row" role="group"
hidden="[[!chromeSigninUserChoiceInfo_.shouldShowSettings]]"
aria-label="$i18n{chromeSigninChoiceTitle}">
@@ -91,12 +91,6 @@
@@ -90,12 +90,6 @@
</settings-toggle-button>
</if><!-- not chromeos -->
</if><!-- _google_chrome -->
@@ -339,7 +350,7 @@
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
@@ -235,9 +235,3 @@
@@ -241,9 +241,3 @@
</cr-link-row>
</if>
@@ -365,7 +376,7 @@
prefs.default_search_provider_data.template_url_data)]]">
--- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
+++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
@@ -91,7 +91,7 @@
@@ -86,7 +86,7 @@
</template>
<h1 class="cr-title-text">[[pageTitle]]</h1>
<slot name="subpage-title-extra"></slot>
@@ -376,7 +387,7 @@
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
--- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
@@ -365,7 +365,6 @@ void RecentTabsSubMenuModel::Build() {
@@ -367,7 +367,6 @@ void RecentTabsSubMenuModel::Build() {
AddSeparator(ui::NORMAL_SEPARATOR);
history_separator_index_ = GetItemCount() - 1;
BuildLocalEntries();
@@ -386,7 +397,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -934,16 +934,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -933,16 +933,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -405,7 +416,7 @@
////////////////////////////////////////////////////////////////////////////////
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -671,13 +671,6 @@ void BookmarkMenuDelegate::BuildMenu(con
@@ -813,13 +813,6 @@ void BookmarkMenuDelegate::BuildMenu(con
ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
ui::SimpleMenuModel::kDefaultIconSize);
@@ -438,7 +449,7 @@
void CookieControlsContentView::AddDescriptionRow() {
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -211,6 +211,7 @@ void ProfileMenuView::BuildMenu() {
@@ -219,6 +219,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -446,7 +457,7 @@
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession())
return gfx::ImageSkia();
@@ -571,16 +572,8 @@ void ProfileMenuView::BuildIdentity() {
@@ -579,16 +580,8 @@ void ProfileMenuView::BuildIdentity() {
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
std::string profile_user_display_name, profile_user_email;
@@ -466,17 +477,17 @@
profile_user_email.empty() ? account_info.email : profile_user_email);
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -562,9 +562,6 @@ SadTabView::SadTabView(content::WebConte
auto* actions_container =
container->AddChildView(std::make_unique<views::FlexLayoutView>());
actions_container->SetCrossAxisAlignment(views::LayoutAlignment::kCenter);
@@ -574,9 +574,6 @@ SadTabView::SadTabView(content::WebConte
// There is currently no good way to handle kEnd alignment for a single
// element.
actions_container->SetLayoutManagerUseConstrainedSpace(false);
-
- EnableHelpLink(actions_container);
-
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -657,22 +654,6 @@ void SadTabView::AttachToWebView() {
@@ -669,22 +666,6 @@ void SadTabView::AttachToWebView() {
}
}
@@ -501,7 +512,7 @@
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3467,7 +3467,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3436,7 +3436,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -512,7 +523,7 @@
html_source->AddBoolean(
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -908,7 +908,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
@@ -865,7 +865,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
#endif
// Enables the Live Caption feature on supported devices.

View File

@@ -107,3 +107,4 @@ extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch
extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
extra/ungoogled-chromium/enable-extra-locales.patch
extra/ungoogled-chromium/disable-chromelabs.patch

View File

@@ -13,7 +13,7 @@
#include <optional>
#include <ostream>
#include <string_view>
@@ -368,7 +367,8 @@ class EnumTable {
@@ -366,7 +365,8 @@ class EnumTable {
private:
#ifdef ARCH_CPU_64_BITS

View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -883,6 +883,7 @@ source_set("extensions") {
@@ -877,6 +877,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
@@ -20,7 +20,7 @@
#include <vector>
--- a/chrome/browser/ui/lens/lens_overlay_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_controller.cc
@@ -14,6 +14,7 @@
@@ -15,6 +15,7 @@
#include "base/system/sys_info.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
@@ -60,7 +60,7 @@
# Disallow depending on content.
--- a/components/plus_addresses/BUILD.gn
+++ b/components/plus_addresses/BUILD.gn
@@ -111,6 +111,7 @@ source_set("plus_addresses") {
@@ -126,6 +126,7 @@ source_set("plus_addresses") {
"//net",
"//services/data_decoder/public/cpp",
"//services/network/public/cpp",
@@ -70,7 +70,7 @@
public_deps = [
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -105,6 +105,7 @@ source_set("browser") {
@@ -106,6 +106,7 @@ source_set("browser") {
"//components/file_access",
"//components/filename_generation",
"//components/input",

55481
pruning.list

File diff suppressed because it is too large Load Diff

View File

@@ -32,7 +32,6 @@ solutions = [
"managed": False,
"custom_deps": {
"UC_OUT/third_party/angle/third_party/VK-GL-CTS/src": None,
"UC_OUT/third_party/instrumented_libs": None,
},
"custom_vars": {
"checkout_configuration": "small",
@@ -237,22 +236,39 @@ def clone(args): # pylint: disable=too-many-branches, too-many-locals, too-many-
# Match removals for the tarball:
# https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipe_modules/chromium/resources/export_tarball.py
remove_dirs = (
(args.output / 'base' / 'tracing' / 'test' / 'data'),
(args.output / 'chrome' / 'test' / 'data'),
(args.output / 'components' / 'test' / 'data'),
(args.output / 'content' / 'test' / 'data'),
(args.output / 'courgette' / 'testdata'),
(args.output / 'extensions' / 'test' / 'data'),
(args.output / 'media' / 'test' / 'data'),
(args.output / 'native_client' / 'src' / 'trusted' / 'service_runtime' / 'testdata'),
(args.output / 'testing' / 'libfuzzer' / 'fuzzers' / 'wasm_corpus'),
(args.output / 'third_party' / 'blink' / 'perf_tests'),
(args.output / 'third_party' / 'blink' / 'tools'),
(args.output / 'third_party' / 'blink' / 'web_tests'),
(args.output / 'third_party' / 'breakpad' / 'breakpad' / 'src' / 'processor' / 'testdata'),
(args.output / 'third_party' / 'catapult' / 'tracing' / 'test_data'),
(args.output / 'third_party' / 'dawn' / 'test'),
(args.output / 'third_party' / 'expat' / 'src' / 'testdata'),
(args.output / 'third_party' / 'harfbuzz-ng' / 'src' / 'test'),
(args.output / 'third_party' / 'hunspell' / 'tests'),
(args.output / 'third_party' / 'hunspell_dictionaries'),
(args.output / 'third_party' / 'jdk' / 'current'),
(args.output / 'third_party' / 'jdk' / 'extras'),
(args.output / 'third_party' / 'liblouis' / 'src' / 'tests' / 'braille-specs'),
(args.output / 'third_party' / 'llvm' / 'llvm' / 'test'),
(args.output / 'third_party' / 'ots' / 'src' / 'tests' / 'fonts'),
(args.output / 'third_party' / 'rust-src' / 'src' / 'gcc' / 'gcc' / 'testsuite'),
(args.output / 'third_party' / 'rust-src' / 'src' / 'llvm-project' / 'clang' / 'test'),
(args.output / 'third_party' / 'rust-src' / 'src' / 'llvm-project' / 'llvm' / 'test'),
(args.output / 'third_party' / 'screen-ai' / 'linux' / 'resources'),
(args.output / 'third_party' / 'sqlite' / 'src' / 'test'),
(args.output / 'third_party' / 'swiftshader' / 'tests' / 'regres'),
(args.output / 'third_party' / 'test_fonts' / 'test_fonts'),
(args.output / 'third_party' / 'xdg-utils' / 'tests'),
(args.output / 'tools' / 'perf' / 'testdata'),
(args.output / 'v8' / 'test'),
)
keep_files = (
@@ -285,7 +301,8 @@ def clone(args): # pylint: disable=too-many-branches, too-many-locals, too-many-
path.rmdir()
for path in sorted(args.output.rglob('*'), key=lambda l: len(str(l)), reverse=True):
if not path.is_symlink() and '.git' not in path.parts:
if path.is_file() and ('out' in path.parts or path.name.startswith('ChangeLog')):
if path.is_file() and (('out' in path.parts and 'node_modules' not in path.parts)
or path.name.startswith('ChangeLog')):
try:
path.unlink()
except PermissionError:

View File

@@ -20,37 +20,41 @@ from _common import ENCODING, get_logger, add_common_params
CONTINGENT_PATHS = (
# Overridable git sources
'third_party/angle/third_party/VK-GL-CTS/src/',
'third_party/instrumented_libs/',
# CIPD sources
'buildtools/linux64/',
'buildtools/reclient/',
'third_party/apache-linux/',
'third_party/checkstyle/',
'third_party/dawn/third_party/ninja/',
'third_party/dawn/tools/golang/',
'third_party/devtools-frontend/src/third_party/esbuild/',
'third_party/google-java-format/',
'third_party/libei/',
'third_party/ninja/',
'third_party/screen-ai/',
'third_party/siso/',
'third_party/openscreen/src/third_party/ninja/',
'third_party/updater/chrome_linux64/',
'third_party/updater/chromium_linux64/',
'tools/luci-go/',
'tools/resultdb/',
'tools/skia_goldctl/linux/',
# GCS sources
'base/tracing/test/data',
'build/linux/debian_bullseye_amd64-sysroot/',
'build/linux/debian_bullseye_i386-sysroot/',
'buildtools/linux64-format/',
'third_party/blink/renderer/core/css/perftest_data/',
'third_party/js_code_coverage/',
'third_party/llvm-build/Release+Asserts/',
'third_party/openscreen/src/buildtools/linux64/format/',
# other
'third_party/depot_tools/external_bin/',
# lite tarball paths:
# https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipes/publish_tarball.py
'android_webview/',
'buildtools/reclient/',
'chromecast/',
'native_client/',
'native_client_sdk/',
'third_party/android_platform/',
'third_party/apache-linux/',
'third_party/blink/manual_tests/',
'third_party/blink/perf_tests/',
'third_party/catapult/third_party/vinn/third_party/v8/',
'third_party/instrumented_libs/',
'third_party/llvm/',
'third_party/llvm-build/',
'third_party/llvm-build-tools/',
'third_party/node/linux/',
'third_party/opus/tests/resources/',
'third_party/rust-src/',
'third_party/rust-toolchain/',
'third_party/subresource-filter-ruleset/data',
'third_party/test_fonts/test_fonts',
'third_party/tfhub_models/testdata/',
'tools/perf/page_sets/maps_perf_test/dataset/',
'third_party/webgl/',
)