morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 00:14:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium 129.0.6668.58

Browse Source
This commit is contained in:
Blaise
2024-09-11 15:04:34 -05:00
parent 1b11ca4600
commit 77ed0175c9
69 changed files with 1299 additions and 1117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
128.0.6613.137
129.0.6668.58

439
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

8
patches/core/bromite/disable-fetching-field-trials.patch
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
@@ -52,7 +52,7 @@ public abstract class ChromeFeatureList
@@ -54,7 +54,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
}
/**
@@ -64,8 +64,7 @@ public abstract class ChromeFeatureList
@@ -66,8 +66,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
}
/**
@@ -77,8 +76,7 @@ public abstract class ChromeFeatureList
@@ -79,8 +78,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
}
/**
@@ -90,8 +88,7 @@ public abstract class ChromeFeatureList
@@ -92,8 +90,7 @@ public abstract class ChromeFeatureList
*/
public static double getFieldTrialParamByFeatureAsDouble(
String featureName, String paramName, double defaultValue) {

85
patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2390,7 +2390,6 @@ static_library("browser") {
@@ -2241,7 +2241,6 @@ static_library("browser") {
"//components/reporting/util:task_runner_context",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -8,7 +8,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3849,8 +3848,6 @@ static_library("browser") {
@@ -3613,8 +3612,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -19,7 +19,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -56,10 +56,6 @@ class NetworkQualityTracker;
@@ -66,10 +66,6 @@ class NetworkQualityTracker;
class SharedURLLoaderFactory;
}
@@ -27,10 +27,10 @@
-class SafeBrowsingService;
-}
-
namespace subresource_filter {
class RulesetService;
namespace signin {
class ActivePrimaryAccountsMetricsRecorder;
}
@@ -224,9 +220,6 @@ class BrowserProcess {
@@ -233,9 +229,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -42,7 +42,7 @@
virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -76,7 +76,6 @@
@@ -77,7 +77,6 @@
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
@@ -74,7 +74,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1446,26 +1435,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1444,26 +1433,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -111,7 +111,7 @@
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
subresource_filter::RulesetService*
@@ -367,9 +366,6 @@ class BrowserProcessImpl : public Browse
@@ -366,9 +365,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -131,7 +131,7 @@
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/share/share_history.h"
@@ -663,10 +662,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
@@ -5461,10 +5461,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5506,10 +5506,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),
@@ -5516,16 +5512,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5561,16 +5557,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>(
@@ -5830,8 +5816,6 @@ bool ChromeContentBrowserClient::IsPlugi
@@ -5885,8 +5871,6 @@ bool ChromeContentBrowserClient::IsPlugi
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -183,7 +183,7 @@
base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -38,21 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey
@@ -43,21 +43,6 @@ const uint8_t kFileTypePoliciesPublicKey
const char kFileTypePoliciesManifestName[] = "File Type Policies";
void LoadFileTypesFromDisk(const base::FilePath& pb_path) {
@@ -207,7 +207,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -527,13 +527,6 @@ void ChromeDownloadManagerDelegate::SetD
@@ -532,13 +532,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
@@ -221,7 +221,7 @@
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -967,17 +960,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -973,17 +966,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
@@ -295,7 +295,7 @@
}
}
@@ -444,10 +437,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -446,10 +439,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -322,7 +322,7 @@
// If no mime type or explicitly specified a name, don't replace file
// extension.
if (sniffed_mime_type.empty() || !suggested_filename.empty())
@@ -1362,30 +1355,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -1364,30 +1357,7 @@ DownloadFileType::DangerLevel DownloadTa
download_->HasUserGesture())
return DownloadFileType::NOT_DANGEROUS;
@@ -500,7 +500,7 @@
referrer_entries)));
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -704,18 +704,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -710,18 +710,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -519,7 +519,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1220,54 +1208,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1226,54 +1214,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -577,7 +577,7 @@
WebstorePrivateGetExtensionStatusFunction::
--- a/chrome/browser/extensions/blocklist_state_fetcher.cc
+++ b/chrome/browser/extensions/blocklist_state_fetcher.cc
@@ -38,23 +38,8 @@ BlocklistStateFetcher::~BlocklistStateFe
@@ -38,24 +38,8 @@ BlocklistStateFetcher::~BlocklistStateFe
void BlocklistStateFetcher::Request(const std::string& id,
RequestCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -594,8 +594,9 @@
-
- bool request_already_sent = base::Contains(callbacks_, id);
- callbacks_.insert(std::make_pair(id, std::move(callback)));
- if (request_already_sent)
- if (request_already_sent) {
- return;
- }
-
- SendRequest(id);
+ base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
@@ -603,7 +604,7 @@
}
void BlocklistStateFetcher::SendRequest(const std::string& id) {
@@ -65,8 +50,7 @@ void BlocklistStateFetcher::SendRequest(
@@ -66,8 +50,7 @@ void BlocklistStateFetcher::SendRequest(
std::string request_str;
request.SerializeToString(&request_str);
@@ -613,7 +614,7 @@
net::NetworkTrafficAnnotationTag traffic_annotation =
net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
semantics {
@@ -121,12 +105,6 @@ void BlocklistStateFetcher::SendRequest(
@@ -122,12 +105,6 @@ void BlocklistStateFetcher::SendRequest(
base::Unretained(this), fetcher));
}
@@ -719,22 +720,24 @@
}
source_set("test_support") {
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -174,93 +174,6 @@ bool SecurityStateTabHelper::UsedPolicyI
--- 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
security_state::MaliciousContentStatus
SecurityStateTabHelper::GetMaliciousContentStatus() const {
ChromeSecurityStateTabHelper::GetMaliciousContentStatus() const {
- using enum safe_browsing::SBThreatType;
-
- content::NavigationEntry* entry =
- web_contents()->GetController().GetVisibleEntry();
- if (!entry)
- if (!entry) {
- return security_state::MALICIOUS_CONTENT_STATUS_NONE;
- }
- safe_browsing::SafeBrowsingService* sb_service =
- g_browser_process->safe_browsing_service();
- if (!sb_service)
- if (!sb_service) {
- return security_state::MALICIOUS_CONTENT_STATUS_NONE;
- }
- scoped_refptr<SafeBrowsingUIManager> sb_ui_manager = sb_service->ui_manager();
- safe_browsing::SBThreatType threat_type;
- if (sb_ui_manager->IsUrlAllowlistedOrPendingForWebContents(
@@ -795,7 +798,6 @@
- case DEPRECATED_SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE:
- case SB_THREAT_TYPE_URL_BINARY_MALWARE:
- case SB_THREAT_TYPE_EXTENSION:
- case SB_THREAT_TYPE_BLOCKLISTED_RESOURCE:
- case SB_THREAT_TYPE_API_ABUSE:
- case SB_THREAT_TYPE_SUBRESOURCE_FILTER:
- case SB_THREAT_TYPE_CSD_ALLOWLIST:
@@ -814,10 +816,9 @@
- }
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -5048,7 +5048,6 @@ static_library("ui") {
@@ -4404,7 +4404,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h",
@@ -827,7 +828,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -501,32 +501,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -507,32 +507,6 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -859,7 +860,7 @@
- profile, web_contents);
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
SearchEngineTabHelper::CreateForWebContents(web_contents);
SecurityStateTabHelper::CreateForWebContents(web_contents);
if (site_engagement::SiteEngagementService::IsEnabled()) {
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -25,7 +25,6 @@
@@ -895,8 +896,8 @@
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -279,64 +279,6 @@ CreateHttpsOnlyModePage(content::WebCont
security_interstitials::https_only_mode::HttpInterstitialState{});
@@ -281,64 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont
/*use_new_interstitial=*/IsNewHttpsFirstModeInterstitialEnabled());
}
-std::unique_ptr<security_interstitials::SecurityInterstitialPage>
@@ -960,7 +961,7 @@
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
content::WebContents* web_contents) {
const GURL kRequestUrl("https://enterprise-block.example.net");
@@ -347,35 +289,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
@@ -349,35 +291,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
kRequestUrl));
}
@@ -996,7 +997,7 @@
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
std::unique_ptr<SupervisedUserVerificationPage>
CreateSupervisedUserVerificationPage(content::WebContents* web_contents) {
@@ -391,61 +304,6 @@ CreateSupervisedUserVerificationPage(con
@@ -411,61 +324,6 @@ CreateSupervisedUserVerificationPageForB
}
#endif
@@ -1058,7 +1059,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -552,12 +410,8 @@ void InterstitialHTMLSource::StartDataRe
@@ -572,12 +430,8 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1071,7 +1072,7 @@
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -576,12 +430,7 @@ void InterstitialHTMLSource::StartDataRe
@@ -599,12 +453,7 @@ void InterstitialHTMLSource::StartDataRe
#endif
}
@@ -1095,7 +1096,7 @@
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
#include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
@@ -461,12 +460,8 @@ void ChromeContentRendererClient::Render
@@ -458,12 +457,8 @@ void ChromeContentRendererClient::Render
subresource_filter_ruleset_dealer_ =
std::make_unique<subresource_filter::UnverifiedRulesetDealer>();

8
patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
View File

@@ -1,6 +1,6 @@
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
@@ -832,93 +832,6 @@ std::tuple<GURL, std::string> AutofillCr
@@ -828,93 +828,6 @@ std::tuple<GURL, std::string> AutofillCr
}
bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {
@@ -51,11 +51,11 @@
- resource_request->headers.SetHeader(kGoogEncodeResponseIfExecutable,
- "base64");
-
- // Put API key in request's header if a key exists, and the endpoint is
- // trusted by Google.
- // Add API key to the request if a key exists, and the endpoint is trusted by
- // Google.
- if (!api_key_.empty() && request_url.SchemeIs(url::kHttpsScheme) &&
- google_util::IsGoogleAssociatedDomainUrl(request_url)) {
- resource_request->headers.SetHeader(kGoogApiKey, api_key_);
- google_apis::AddAPIKeyToRequest(*resource_request, api_key_);
- }
-
- auto simple_loader = network::SimpleURLLoader::Create(

2
patches/core/inox-patchset/0021-disable-rlz.patch
View File

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

36
patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
View File

@@ -112,7 +112,7 @@ by default.
scoped_refptr<base::SequencedTaskRunner> task_runner)
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -528,7 +528,7 @@ void WebRtcLogUploader::UploadCompressed
@@ -533,7 +533,7 @@ void WebRtcLogUploader::UploadCompressed
}
})");
@@ -285,7 +285,7 @@ by default.
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -140,7 +140,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -145,7 +145,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
// Global functions -----------------------------------------------------------
@@ -416,9 +416,9 @@ by default.
GURL url(base::WideToUTF16(args[0]));
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -32,10 +32,10 @@ bool IsSourceFromAnExtension(const std::
@@ -38,10 +38,10 @@ const GURL* g_item_snippet_url_for_test_
namespace extension_urls {
} // namespace
-const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
-const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/";
@@ -699,34 +699,6 @@ by default.
const int kFinancialPort = 443;
// Ping times in 100-nanosecond intervals.
--- a/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
+++ b/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
@@ -72,9 +72,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = {
'outputContextFirst': false,
'position': '{}',
'siteSpecificScriptBase':
- 'https://ssl.gstatic.com/accessibility/javascript/ext/',
+ 'trk:242:https://ssl.gstatic.com/accessibility/javascript/ext/',
'siteSpecificScriptLoader':
- 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
+ 'trk:243:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
'sticky': false,
'typingEcho': 0,
'useIBeamCursor': cvox.ChromeVox.isMac,
--- a/ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js
+++ b/ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js
@@ -96,9 +96,9 @@ cvox.ChromeHost.prototype.init = functio
(!cvox.ApiImplementation.siteSpecificScriptLoader ||
!cvox.ApiImplementation.siteSpecificScriptBase);
cvox.ApiImplementation.siteSpecificScriptLoader =
- 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
+ 'trk:244:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
cvox.ApiImplementation.siteSpecificScriptBase =
- 'https://ssl.gstatic.com/accessibility/javascript/ext/';
+ 'trk:245:https://ssl.gstatic.com/accessibility/javascript/ext/';
if (apiPrefsChanged) {
var searchInit = prefs['siteSpecificEnhancements'] === 'true' ?
cvox.SearchLoader.init :
--- a/ui/views/examples/webview_example.cc
+++ b/ui/views/examples/webview_example.cc
@@ -28,7 +28,7 @@ void WebViewExample::CreateExampleView(V

4
patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
View File

@@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future).
kSafeBrowsingIncidentTrafficAnnotation =
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -305,11 +305,14 @@ IncidentReportingService::UploadContext:
@@ -306,11 +306,14 @@ IncidentReportingService::UploadContext:
// static
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
@@ -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
@@ -371,7 +371,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -373,7 +373,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {

2
patches/core/ungoogled-chromium/block-requests.patch
View File

@@ -48,7 +48,7 @@
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
@@ -121,6 +121,9 @@ AffiliationFetcherDelegate* HashAffiliat
@@ -126,6 +126,9 @@ AffiliationFetcherDelegate* HashAffiliat
}
void HashAffiliationFetcher::StartRequest(

8
patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
View File

@@ -35,7 +35,7 @@
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -592,7 +592,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -597,7 +597,8 @@ void AutocompleteInput::ParseForEmphasiz
// For the view-source and blob schemes, we should emphasize the host of the
// URL qualified by the view-source or blob prefix.
if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
@@ -47,7 +47,7 @@
std::u16string real_url(text.substr(after_scheme_and_colon));
--- a/components/url_formatter/url_fixer.cc
+++ b/components/url_formatter/url_fixer.cc
@@ -575,6 +575,10 @@ GURL FixupURLInternal(const std::string&
@@ -580,6 +580,10 @@ GURL FixupURLInternal(const std::string&
}
}
@@ -70,7 +70,7 @@
// other origins, so we should not treat them as web safe. Remove callers of
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1030,6 +1030,8 @@ component("net") {
@@ -1034,6 +1034,8 @@ component("net") {
"url_request/referrer_policy.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -181,7 +181,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
#include "url/url_constants.h"
@@ -592,6 +593,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -598,6 +599,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();

4
patches/core/ungoogled-chromium/disable-crash-reporter.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2707,24 +2707,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2748,24 +2748,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -29,7 +29,7 @@
if (logging::DialogsAreSuppressed())
--- a/components/crash/core/app/crashpad.cc
+++ b/components/crash/core/app/crashpad.cc
@@ -68,6 +68,12 @@ void InitializeDatabasePath(const base::
@@ -69,6 +69,12 @@ void InitializeDatabasePath(const base::
}
bool InitializeCrashpadImpl(bool initial_client,

6
patches/core/ungoogled-chromium/disable-gcm.patch
View File

@@ -2,7 +2,7 @@
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -450,6 +450,7 @@ void GCMClientImpl::StartGCM() {
@@ -451,6 +451,7 @@ void GCMClientImpl::StartGCM() {
void GCMClientImpl::InitializeMCSClient() {
DCHECK(network_connection_tracker_);
@@ -10,7 +10,7 @@
std::vector<GURL> endpoints;
endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
@@ -654,28 +655,6 @@ void GCMClientImpl::RemoveHeartbeatInter
@@ -655,28 +656,6 @@ void GCMClientImpl::RemoveHeartbeatInter
void GCMClientImpl::StartCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -39,7 +39,7 @@
}
void GCMClientImpl::OnCheckinCompleted(
@@ -732,24 +711,6 @@ void GCMClientImpl::SetGServicesSettings
@@ -733,24 +712,6 @@ void GCMClientImpl::SetGServicesSettings
void GCMClientImpl::SchedulePeriodicCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());

19
patches/core/ungoogled-chromium/disable-google-host-detection.patch
View File

@@ -192,7 +192,7 @@
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -31,111 +31,6 @@ namespace google_util {
@@ -36,111 +36,6 @@ namespace google_util {
namespace {
@@ -304,7 +304,7 @@
} // namespace
// Global functions -----------------------------------------------------------
@@ -143,12 +38,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -148,12 +43,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
bool HasGoogleSearchQueryParam(std::string_view str) {
@@ -317,7 +317,7 @@
return false;
}
@@ -159,162 +48,53 @@ std::string GetGoogleLocale(const std::s
@@ -164,162 +53,53 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
@@ -502,7 +502,7 @@
+ return false;
}
bool IsGoogleSearchResultUrl(const GURL& url) {
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 =
@@ -630,7 +630,7 @@
}
std::unique_ptr<network::SimpleURLLoader>
@@ -375,29 +336,22 @@ CreateSimpleURLLoaderWithVariationsHeade
@@ -375,34 +336,22 @@ CreateSimpleURLLoaderWithVariationsHeade
}
bool HasVariationsHeader(const network::ResourceRequest& request) {
@@ -641,7 +641,12 @@
bool GetVariationsHeader(const network::ResourceRequest& request,
std::string* out) {
- return request.cors_exempt_headers.GetHeader(kClientDataHeader, out);
- std::optional<std::string> header_value =
- request.cors_exempt_headers.GetHeader(kClientDataHeader);
- if (header_value) {
- out->swap(header_value.value());
- }
- return header_value.has_value();
+ return false;
}
@@ -665,7 +670,7 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -745,7 +745,7 @@ void PrefetchContainer::AddRedirectHop(c
@@ -754,7 +754,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;

2
patches/core/ungoogled-chromium/disable-mei-preload.patch
View File

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -382,7 +382,6 @@ if (!is_android && !is_mac) {
@@ -386,7 +386,6 @@ if (!is_android && !is_mac) {
}
data_deps += [

2
patches/core/ungoogled-chromium/disable-network-time-tracker.patch
View File

@@ -5,7 +5,7 @@
--- a/components/network_time/network_time_tracker.cc
+++ b/components/network_time/network_time_tracker.cc
@@ -274,7 +274,7 @@ void NetworkTimeTracker::UpdateNetworkTi
@@ -279,7 +279,7 @@ void NetworkTimeTracker::UpdateNetworkTi
}
bool NetworkTimeTracker::AreTimeFetchesEnabled() const {

8
patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -179,31 +179,13 @@ void WebRtcLogUploader::OnLoggingStopped
@@ -184,31 +184,13 @@ void WebRtcLogUploader::OnLoggingStopped
DCHECK(meta_data.get());
DCHECK(!upload_done_data.paths.directory.empty());
@@ -35,7 +35,7 @@
} else {
main_task_runner_->PostTask(
FROM_HERE,
@@ -220,28 +202,7 @@ void WebRtcLogUploader::PrepareMultipart
@@ -225,28 +207,7 @@ void WebRtcLogUploader::PrepareMultipart
DCHECK(!compressed_log.empty());
DCHECK(meta_data.get());
@@ -65,7 +65,7 @@
}
void WebRtcLogUploader::UploadStoredLog(
@@ -308,48 +269,6 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -313,48 +274,6 @@ void WebRtcLogUploader::LoggingStoppedDo
DCHECK(log_buffer.get());
DCHECK(!log_paths.directory.empty());
@@ -116,7 +116,7 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -111,7 +111,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -113,7 +113,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

4
patches/core/ungoogled-chromium/disable-webstore-urls.patch
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
@@ -669,12 +669,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -664,12 +664,6 @@ std::vector<url::Origin> ChromeContentBr
GetOriginsRequiringDedicatedProcess() {
std::vector<url::Origin> list;
@@ -17,7 +17,7 @@
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -302,17 +302,7 @@ bool ChromeContentVerifierDelegate::IsFr
@@ -307,17 +307,7 @@ bool ChromeContentVerifierDelegate::IsFr
// between which extensions are considered in-store.
// See https://crbug.com/766806 for details.
if (!InstallVerifier::IsFromStore(extension, context_)) {

4
patches/core/ungoogled-chromium/extensions-manifestv2.patch
View File

@@ -79,7 +79,7 @@
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
@@ -139,17 +139,6 @@ bool ManifestV2ExperimentManagerFactory:
@@ -143,17 +143,6 @@ bool ManifestV2ExperimentManagerFactory:
// Determines the current stage of the MV2 deprecation experiments.
MV2ExperimentStage CalculateCurrentExperimentStage() {
@@ -99,7 +99,7 @@
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -468,9 +468,9 @@ content::WebUIDataSource* CreateAndAddEx
@@ -470,9 +470,9 @@ content::WebUIDataSource* CreateAndAddEx
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
source->AddBoolean(
"safetyCheckShowReviewPanel",

464
patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -383,7 +383,6 @@ if (!is_android && !is_mac) {
@@ -387,7 +387,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) {
@@ -949,8 +948,6 @@ if (is_win) {
@@ -957,8 +956,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -22,7 +22,7 @@
# from disk image and Keystone promotion (if so enabled). It
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -842,10 +842,6 @@ static_library("browser") {
@@ -785,10 +785,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",
@@ -33,7 +33,7 @@
"navigation_predictor/search_engine_preconnector.cc",
"navigation_predictor/search_engine_preconnector.h",
"net/chrome_mojo_proxy_resolver_factory.cc",
@@ -964,10 +960,6 @@ static_library("browser") {
@@ -907,10 +903,6 @@ static_library("browser") {
"optimization_guide/chrome_prediction_model_store.h",
"optimization_guide/model_execution/chrome_on_device_model_service_controller.cc",
"optimization_guide/model_execution/chrome_on_device_model_service_controller.h",
@@ -44,6 +44,235 @@
"optimization_guide/optimization_guide_internals_ui.cc",
"optimization_guide/optimization_guide_internals_ui.h",
"optimization_guide/optimization_guide_keyed_service.cc",
@@ -3459,10 +3451,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
- "accessibility/ax_main_node_annotator_controller.cc",
- "accessibility/ax_main_node_annotator_controller.h",
- "accessibility/ax_main_node_annotator_controller_factory.cc",
- "accessibility/ax_main_node_annotator_controller_factory.h",
"accessibility/caption_bubble_context_browser.h",
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4241,10 +4229,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",
- "//chrome/browser/screen_ai:screen_ai_install_state",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
- "//chrome/browser/screen_ai/public:optical_character_recognizer",
"//chrome/browser/search/background",
"//chrome/browser/smart_card",
"//chrome/browser/task_manager",
@@ -4326,9 +4310,6 @@ static_library("browser") {
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/bluetooth",
"//services/device/public/cpp/hid",
- "//services/screen_ai",
- "//services/screen_ai/public/cpp:utilities",
- "//services/screen_ai/public/mojom",
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4379,8 +4360,6 @@ static_library("browser") {
#!is_android
if (!is_chromeos) {
sources += [
- "component_updater/screen_ai_component_installer.cc",
- "component_updater/screen_ai_component_installer.h",
"device_notifications/device_status_icon_renderer.cc",
"device_notifications/device_status_icon_renderer.h",
"external_protocol/auto_launch_protocols_policy_handler.cc",
@@ -4397,8 +4376,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",
- "screen_ai/screen_ai_downloader_non_chromeos.cc",
- "screen_ai/screen_ai_downloader_non_chromeos.h",
"usb/usb_status_icon.cc",
"usb/usb_status_icon.h",
]
@@ -5118,7 +5095,6 @@ static_library("browser") {
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/resources:app_icon_resources",
"//chrome/browser/scalable_iph:scalable_iph_factory",
- "//chrome/browser/screen_ai:screen_ai_dlc_installer",
"//chrome/browser/ui/ash",
"//chrome/browser/ui/ash/accessibility",
"//chrome/browser/ui/ash/annotator",
@@ -5302,7 +5278,6 @@ static_library("browser") {
"//components/webapk:proto",
"//device/vr/public/mojom:isolated_xr_service",
"//remoting/host/chromeos:features",
- "//services/screen_ai/public/cpp:metrics",
"//third_party/nearby:rpc_resources_proto",
"//third_party/nearby:wire_format_proto",
"//ui/chromeos",
@@ -7831,22 +7806,6 @@ static_library("browser") {
}
}
- if (enable_pdf) {
- sources += [
- "accessibility/pdf_ocr_controller.cc",
- "accessibility/pdf_ocr_controller.h",
- "accessibility/pdf_ocr_controller_factory.cc",
- "accessibility/pdf_ocr_controller_factory.h",
- ]
- deps += [
- "//chrome/browser/pdf",
- "//chrome/browser/pdf:pdf_pref_names",
- "//components/pdf/browser",
- "//components/pdf/browser:interceptors",
- "//extensions/common/api",
- "//pdf:features",
- ]
- }
if (enable_plugins) {
sources += [
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -238,12 +238,10 @@
#if BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
#include "chrome/browser/hid/hid_pinned_notification.h"
-#include "chrome/browser/screen_ai/screen_ai_downloader_chromeos.h"
#include "chrome/browser/usb/usb_pinned_notification.h"
#include "components/crash/core/app/crashpad.h"
#elif !BUILDFLAG(IS_ANDROID)
#include "chrome/browser/hid/hid_status_icon.h"
-#include "chrome/browser/screen_ai/screen_ai_downloader_non_chromeos.h"
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1300,9 +1298,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if !BUILDFLAG(IS_ANDROID)
- screen_ai_download_ = screen_ai::ScreenAIInstallState::Create();
-#endif
base::FilePath user_data_dir;
bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -92,9 +92,6 @@ namespace speech {
class SodaInstaller;
} // namespace speech
-namespace screen_ai {
-class ScreenAIInstallState;
-} // namespace screen_ai
// Real implementation of BrowserProcess that creates and returns the services.
class BrowserProcessImpl : public BrowserProcess,
@@ -423,9 +420,6 @@ class BrowserProcessImpl : public Browse
// to ensure that SodaInstallerImpl gets destructed first.
std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
- // Used to download Screen AI on demand and keep track of the library
- // availability.
- std::unique_ptr<screen_ai::ScreenAIInstallState> screen_ai_download_;
#endif
std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
--- a/chrome/browser/chrome_browser_interface_binders.cc
+++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -221,8 +221,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/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"
@@ -845,38 +843,6 @@ void BindMediaFoundationPreferences(
}
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
-void BindScreenAIAnnotator(
- content::RenderFrameHost* frame_host,
- mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) {
- content::BrowserContext* browser_context =
- frame_host->GetProcess()->GetBrowserContext();
-
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(browser_context)
- ->BindScreenAIAnnotator(std::move(receiver));
-}
-
-void BindScreen2xMainContentExtractor(
- content::RenderFrameHost* frame_host,
- mojo::PendingReceiver<screen_ai::mojom::Screen2xMainContentExtractor>
- receiver) {
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(
- frame_host->GetProcess()->GetBrowserContext())
- ->BindMainContentExtractor(std::move(receiver));
-}
-
-void BindVisualSuggestionsModelProvider(
- content::RenderFrameHost* frame_host,
- mojo::PendingReceiver<
- companion::visual_query::mojom::VisualSuggestionsModelProvider>
- receiver) {
- companion::visual_query::VisualQuerySuggestionsServiceFactory::GetForProfile(
- Profile::FromBrowserContext(
- frame_host->GetProcess()->GetBrowserContext()))
- ->BindModelReceiver(std::move(receiver));
-}
-#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// A helper class to register ChromeOS Apps API binders. This includes the logic
@@ -1073,21 +1039,6 @@ void PopulateChromeFrameBinders(
base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
}
- if (companion::visual_query::features::
- IsVisualQuerySuggestionsAgentEnabled()) {
- map->Add<companion::visual_query::mojom::VisualSuggestionsModelProvider>(
- base::BindRepeating(&BindVisualSuggestionsModelProvider));
- }
-
- if (features::IsPdfOcrEnabled()) {
- map->Add<screen_ai::mojom::ScreenAIAnnotator>(
- base::BindRepeating(&BindScreenAIAnnotator));
- }
-
- if (features::IsReadAnythingWithScreen2xEnabled()) {
- map->Add<screen_ai::mojom::Screen2xMainContentExtractor>(
- base::BindRepeating(&BindScreen2xMainContentExtractor));
- }
#endif
#if BUILDFLAG(IS_WIN)
--- a/chrome/browser/component_updater/registration.cc
+++ b/chrome/browser/component_updater/registration.cc
@@ -68,8 +68,6 @@
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h"
-#else
-#include "chrome/browser/component_updater/screen_ai_component_installer.h"
#endif // BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
@@ -207,9 +205,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
- ManageScreenAIComponentRegistration(cus, g_browser_process->local_state());
-#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
RegisterCommerceHeuristicsComponent(cus);
--- a/chrome/browser/navigation_predictor/navigation_predictor.cc
+++ b/chrome/browser/navigation_predictor/navigation_predictor.cc
@@ -18,8 +18,6 @@
@@ -155,6 +384,18 @@
}
void NavigationPredictor::SetModelScoreCallbackForTesting(
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1743,9 +1743,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
-#if !BUILDFLAG(IS_ANDROID)
- screen_ai::RegisterLocalStatePrefs(registry);
-#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -98,7 +98,6 @@
@@ -165,15 +406,23 @@
#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"
@@ -975,7 +974,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -489,7 +488,6 @@
#include "chrome/browser/new_tab_page/one_google_bar/one_google_bar_service_factory.h"
#include "chrome/browser/new_tab_page/promos/promo_service_factory.h"
#include "chrome/browser/payments/payment_request_display_manager_factory.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#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"
@@ -977,7 +975,6 @@ void ChromeBrowserMainExtraPartsProfiles
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
ModelTypeStoreServiceFactory::GetInstance();
NavigationPredictorKeyedServiceFactory::GetInstance();
- PreloadingModelKeyedServiceFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS_ASH)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -1024,9 +1022,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1026,9 +1023,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -183,6 +432,41 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1174,13 +1168,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
SafetyHubMenuNotificationServiceFactory::GetInstance();
SafetyHubHatsServiceFactory::GetInstance();
- if (features::IsMainNodeAnnotationsEnabled()) {
- screen_ai::AXMainNodeAnnotatorControllerFactory::GetInstance();
- }
-#if BUILDFLAG(ENABLE_PDF)
- screen_ai::PdfOcrControllerFactory::GetInstance();
-#endif // BUILDFLAG(ENABLE_PDF)
- screen_ai::ScreenAIServiceRouterFactory::EnsureFactoryBuilt();
#endif
SCTReportingServiceFactory::GetInstance();
search_engines::SearchEngineChoiceServiceFactory::GetInstance();
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -853,18 +853,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()) {
- // Create the PDF OCR controller so that it can self-activate as needed.
- screen_ai::PdfOcrControllerFactory::GetForProfile(this);
- }
-#endif // BUILDFLAG(ENABLE_PDF)
-
- if (features::IsMainNodeAnnotationsEnabled()) {
- screen_ai::AXMainNodeAnnotatorControllerFactory::GetForProfile(this);
- }
#endif // BUILDFLAG(IS_ANDROID)
// The announcement notification service might not be available for some
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -49,7 +49,6 @@
@@ -193,7 +477,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"
@@ -1542,9 +1541,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1530,9 +1529,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -213,6 +497,25 @@
]
}
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2010,8 +2010,6 @@ static_library("ui") {
"//chrome/browser/new_tab_page/chrome_colors",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/screen_ai:screen_ai_install_state",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
"//chrome/browser/task_manager:impl",
"//chrome/browser/themes",
"//chrome/browser/ui/apps",
@@ -2574,7 +2572,6 @@ static_library("ui") {
"//chrome/browser/policy:onc",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/scalable_iph:scalable_iph_factory",
- "//chrome/browser/screen_ai/public:optical_character_recognizer",
"//chrome/browser/ui/ash",
"//chrome/browser/ui/ash/accessibility",
"//chrome/browser/ui/ash/annotator",
--- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
+++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
@@ -36,11 +36,6 @@ void AccessibilityMainHandler::RegisterM
@@ -307,42 +610,23 @@
};
} // namespace settings
--- a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
@@ -61,7 +61,6 @@ std::u16string GetHelpUrlWithBoard(const
#endif
void AddAxAnnotationsSectionStrings(content::WebUIDataSource* html_source) {
-#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"mainNodeAnnotationsDownloadErrorLabel",
IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_DOWNLOAD_ERROR},
@@ -77,7 +76,6 @@ void AddAxAnnotationsSectionStrings(cont
html_source->AddBoolean(
"mainNodeAnnotationsEnabled",
base::FeatureList::IsEnabled(features::kMainNodeAnnotations));
-#endif // BULDFLAG(ENABLE_SCREEN_AI_SERVICE)
}
void AddCaptionSubpageStrings(content::WebUIDataSource* html_source) {
--- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
+++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
@@ -19,8 +19,6 @@
@@ -18,8 +18,6 @@
#include "chrome/browser/browser_features.h"
#include "chrome/browser/language/language_model_manager_factory.h"
#include "chrome/browser/pdf/pdf_viewer_stream_manager.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -309,21 +307,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -314,19 +312,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
- if (features::IsReadAnythingWithScreen2xEnabled()) {
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(
- browser_->profile())
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_)
- ->GetServiceStateAsync(
- screen_ai::ScreenAIServiceRouter::Service::kMainContentExtraction,
- base::BindOnce(
@@ -350,28 +634,27 @@
- weak_factory_.GetWeakPtr()));
- }
- if (features::IsPdfOcrEnabled()) {
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(
- browser_->profile())
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_)
- ->GetServiceStateAsync(screen_ai::ScreenAIServiceRouter::Service::kOCR,
- base::DoNothing());
- }
OnActiveWebContentsChanged();
@@ -710,9 +693,6 @@ void ReadAnythingUntrustedPageHandler::S
// Enable accessibility for the top level render frame and all descendants.
// This causes AXTreeSerializer to reset and send accessibility events of
@@ -681,9 +666,6 @@ void ReadAnythingUntrustedPageHandler::S
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
}
}
- if (features::IsPdfOcrEnabled()) {
- screen_ai::PdfOcrControllerFactory::GetForProfile(browser_->profile())->Activate();
- screen_ai::PdfOcrControllerFactory::GetForProfile(profile_)->Activate();
- }
#endif // BUILDFLAG(ENABLE_PDF)
}
void ReadAnythingUntrustedPageHandler::OnActiveAXTreeIDChanged() {
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -405,18 +405,6 @@ static_library("renderer") {
deps += [ "//chrome/common/wallet:mojo_bindings" ]
@@ -410,18 +410,6 @@ static_library("renderer") {
]
} else {
sources += [
- "accessibility/ax_tree_distiller.cc",
@@ -389,7 +672,7 @@
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -430,7 +418,6 @@ static_library("renderer") {
@@ -435,7 +423,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
@@ -421,6 +704,53 @@
}
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1816,9 +1816,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",
- "//chrome/browser/screen_ai:screen_ai_install_state",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
- "//chrome/browser/screen_ai/public:test_support",
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2074,9 +2071,6 @@ if (!is_android) {
"//components/tpcd/metadata/common/proto",
"//components/user_annotations",
"//components/variations/service",
- "//services/screen_ai:test_support",
- "//services/screen_ai/public/cpp:utilities",
- "//services/screen_ai/public/mojom",
# TODO(b/287255120) : Also add this as a dependency on Android for building test code.
"//chrome/browser/enterprise/watermark:watermark_view_lib",
@@ -8148,7 +8142,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target.
deps += [
- "../browser/screen_ai:screen_ai_install_state",
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -8263,7 +8256,6 @@ test("unit_tests") {
"//services/device/public/cpp/bluetooth",
"//services/metrics/public/cpp:ukm_builders",
"//services/network:test_support",
- "//services/screen_ai:test_support",
"//services/video_effects/test:test_support",
"//third_party/crashpad/crashpad/util",
"//third_party/libaddressinput",
@@ -8592,8 +8584,6 @@ test("unit_tests") {
"//chrome/browser/push_notification",
"//chrome/browser/push_notification:test_support",
"//chrome/browser/push_notification/protos:proto",
- "//chrome/browser/screen_ai:unit_tests",
- "//chrome/browser/screen_ai/public:test_support",
"//chrome/browser/task_manager:impl",
"//chrome/browser/ui/ash",
"//chrome/browser/ui/ash:test_support",
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -405,7 +405,7 @@ source_set("lib") {
@@ -442,6 +772,48 @@
}
python_library("fixtures") {
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -145,7 +145,6 @@ static_library("utility") {
"//chrome/common/importer:interfaces",
"//components/autofill/core/common",
"//services/proxy_resolver:lib",
- "//services/screen_ai",
]
}
--- a/chrome/utility/services.cc
+++ b/chrome/utility/services.cc
@@ -62,8 +62,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"
-#include "services/screen_ai/public/mojom/screen_ai_factory.mojom.h" // nogncheck
-#include "services/screen_ai/screen_ai_service_impl.h" // nogncheck
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -263,12 +261,6 @@ auto RunSpeechRecognitionService(
}
#endif // !BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
-#if !BUILDFLAG(IS_ANDROID)
-auto RunScreenAIServiceFactory(
- mojo::PendingReceiver<screen_ai::mojom::ScreenAIServiceFactory> receiver) {
- return std::make_unique<screen_ai::ScreenAIService>(std::move(receiver));
-}
-#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
auto RunCupsIppParser(
@@ -460,7 +452,6 @@ void RegisterMainThreadServices(mojo::Se
services.Add(RunProfileImporter);
services.Add(RunMirroringService);
services.Add(RunPassageEmbeddingsService);
- services.Add(RunScreenAIServiceFactory);
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
--- a/components/omnibox/browser/autocomplete_classifier.cc
+++ b/components/omnibox/browser/autocomplete_classifier.cc
@@ -102,8 +102,6 @@ void AutocompleteClassifier::Classify(
@@ -475,7 +847,7 @@
#include "pdf/pdf_features.h"
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -315,8 +315,6 @@ source_set("unit_tests") {
@@ -316,8 +316,6 @@ source_set("unit_tests") {
"//third_party/puffin:libpuffpatch",
"//third_party/re2",
]
@@ -486,7 +858,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -806,10 +806,6 @@ if (is_apple) {
@@ -804,10 +804,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -539,9 +911,9 @@
}
--- a/third_party/devtools-frontend/src/BUILD.gn
+++ b/third_party/devtools-frontend/src/BUILD.gn
@@ -14,7 +14,6 @@ import("./third_party/typescript/typescr
@@ -16,7 +16,6 @@ import("./third_party/typescript/typescr
devtools_frontend_resources_deps = [
":favicon",
"front_end",
- "test",
]
@@ -549,7 +921,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
@@ -190,7 +190,6 @@ group("unittests") {
@@ -193,7 +193,6 @@ group("unittests") {
"panels/timeline:unittests",
"panels/timeline/components:unittests",
"panels/timeline/components/insights:unittests",

299
patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -626,8 +626,6 @@ static_library("browser") {
@@ -636,8 +636,6 @@ static_library("browser") {
"internal_auth.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -11,7 +11,7 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"k_anonymity_service/k_anonymity_service_client.cc",
@@ -4118,10 +4116,6 @@ static_library("browser") {
@@ -3837,10 +3835,6 @@ static_library("browser") {
"new_tab_page/modules/modules_util.h",
"new_tab_page/modules/new_tab_page_modules.cc",
"new_tab_page/modules/new_tab_page_modules.h",
@@ -22,16 +22,16 @@
"new_tab_page/modules/v2/calendar/google_calendar_page_handler.cc",
"new_tab_page/modules/v2/calendar/google_calendar_page_handler.h",
"new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.cc",
@@ -6834,8 +6828,6 @@ static_library("browser") {
@@ -6634,8 +6628,6 @@ static_library("browser") {
if (enterprise_cloud_content_analysis) {
sources += [
"enterprise/connectors/analysis/analysis_service_settings.cc",
"enterprise/connectors/analysis/analysis_service_settings.h",
- "enterprise/connectors/analysis/content_analysis_delegate.cc",
- "enterprise/connectors/analysis/content_analysis_delegate.h",
"enterprise/connectors/analysis/content_analysis_delegate_base.h",
"enterprise/connectors/analysis/content_analysis_dialog.cc",
"enterprise/connectors/analysis/content_analysis_dialog.h",
@@ -6843,8 +6835,6 @@ static_library("browser") {
@@ -6643,8 +6635,6 @@ static_library("browser") {
"enterprise/connectors/analysis/content_analysis_downloads_delegate.h",
"enterprise/connectors/analysis/files_request_handler.cc",
"enterprise/connectors/analysis/files_request_handler.h",
@@ -40,7 +40,7 @@
"enterprise/connectors/analysis/request_handler_base.cc",
"enterprise/connectors/analysis/request_handler_base.h",
"enterprise/connectors/common.cc",
@@ -7534,13 +7524,6 @@ static_library("browser") {
@@ -7249,12 +7239,6 @@ static_library("browser") {
}
}
@@ -49,12 +49,11 @@
- "enterprise/data_protection/print_utils.cc",
- "enterprise/data_protection/print_utils.h",
- ]
- deps += [ "//components/enterprise/connectors" ]
- }
if (enable_captive_portal_detection) {
sources += [
@@ -8393,9 +8376,14 @@ static_library("browser") {
@@ -8104,9 +8088,14 @@ static_library("browser") {
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
"//components/safe_browsing/content/browser/download:download_stats",
"//components/safe_browsing/content/common:file_type_policies",
@@ -70,17 +69,17 @@
if (build_with_tflite_lib) {
sources += [
@@ -8673,7 +8661,6 @@ static_library("browser_generated_files"
"//chrome/browser/new_tab_page/modules/history_clusters:mojo_bindings",
"//chrome/browser/new_tab_page/modules/history_clusters/cart:mojo_bindings",
"//chrome/browser/new_tab_page/modules/history_clusters/discount:mojo_bindings",
@@ -8413,7 +8402,6 @@ static_library("browser_generated_files"
"//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info",
"//chrome/browser/new_tab_page/chrome_colors:generate_colors_info",
"//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings",
- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/tab_resumption:mojo_bindings",
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5494,11 +5494,13 @@ ChromeContentBrowserClient::CreateThrott
@@ -5539,11 +5539,13 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -94,7 +93,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -7262,26 +7264,7 @@ ChromeContentBrowserClient::GetSafeBrows
@@ -7338,26 +7340,7 @@ ChromeContentBrowserClient::GetSafeBrows
const std::vector<std::string>& allowlist_domains) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -122,7 +121,7 @@
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -7302,11 +7285,6 @@ ChromeContentBrowserClient::GetUrlLookup
@@ -7378,11 +7361,6 @@ ChromeContentBrowserClient::GetUrlLookup
GetForProfile(profile);
}
#endif
@@ -134,7 +133,7 @@
return nullptr;
}
@@ -7318,32 +7296,7 @@ ChromeContentBrowserClient::GetAsyncChec
@@ -7394,32 +7372,7 @@ ChromeContentBrowserClient::GetAsyncChec
safe_browsing::hash_realtime_utils::HashRealTimeSelection
hash_realtime_selection,
int frame_tree_node_id) {
@@ -226,7 +225,7 @@
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -686,15 +685,6 @@ bool ChromeDownloadManagerDelegate::Shou
@@ -691,15 +690,6 @@ bool ChromeDownloadManagerDelegate::Shou
#endif
bool should_open = download_prefs_->IsAutoOpenEnabled(url, path);
@@ -242,7 +241,7 @@
return should_open;
}
@@ -1686,7 +1676,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -1696,7 +1686,6 @@ void ChromeDownloadManagerDelegate::OnDo
DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info.target_path, target_info.is_filetype_handled_safely);
@@ -250,7 +249,7 @@
}
if (ShouldBlockFile(item, target_info.danger_type)) {
MaybeReportDangerousDownloadBlocked(
@@ -1767,49 +1756,20 @@ bool ChromeDownloadManagerDelegate::IsOp
@@ -1777,49 +1766,20 @@ bool ChromeDownloadManagerDelegate::IsOp
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item,
download::DownloadDangerType danger_type) const {
@@ -304,7 +303,7 @@
default:
LOG(ERROR) << "Invalid download restriction value: "
<< static_cast<int>(download_restriction);
@@ -1828,7 +1788,6 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1838,7 +1798,6 @@ void ChromeDownloadManagerDelegate::Mayb
service->MaybeSendDangerousDownloadOpenedReport(download,
show_download_in_folder);
}
@@ -312,7 +311,7 @@
if (!download->GetAutoOpened()) {
download::DownloadContent download_content =
download::DownloadContentFromMimeType(download->GetMimeType(), false);
@@ -1836,6 +1795,7 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1846,6 +1805,7 @@ void ChromeDownloadManagerDelegate::Mayb
download->GetDangerType(), download_content, base::Time::Now(),
download->GetEndTime(), show_download_in_folder);
}
@@ -320,7 +319,7 @@
}
void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadCanceledReport(
@@ -1960,8 +1920,7 @@ void ChromeDownloadManagerDelegate::Chec
@@ -1970,8 +1930,7 @@ void ChromeDownloadManagerDelegate::Chec
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -385,7 +384,7 @@
}
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1070,12 +1070,6 @@ void DownloadTargetDeterminer::CheckVisi
@@ -1072,12 +1072,6 @@ void DownloadTargetDeterminer::CheckVisi
bool visited_referrer_before) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
@@ -398,7 +397,7 @@
danger_level_ = GetDangerLevel(
visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
@@ -1360,14 +1354,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -1362,14 +1356,7 @@ DownloadFileType::DangerLevel DownloadTa
std::optional<base::Time>
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
@@ -574,7 +573,7 @@
base::TimeDelta GetIgnoreDownloadBubbleWarningDelay() {
--- a/chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
+++ b/chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
@@ -201,8 +201,6 @@ AnalysisSettings AnalysisServiceSettings
@@ -200,8 +200,6 @@ AnalysisSettings AnalysisServiceSettings
settings.block_large_files = block_large_files_;
if (is_cloud_analysis()) {
CloudAnalysisSettings cloud_settings;
@@ -594,7 +593,7 @@
#include "chrome/grit/generated_resources.h"
#include "components/enterprise/buildflags/buildflags.h"
#include "components/enterprise/common/files_scan_data.h"
@@ -1117,15 +1115,6 @@ void ContentAnalysisDelegate::AckAllRequ
@@ -1117,16 +1115,6 @@ void ContentAnalysisDelegate::AckAllRequ
void ContentAnalysisDelegate::FinishLargeDataRequestEarly(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
safe_browsing::BinaryUploadService::Result result) {
@@ -602,7 +601,8 @@
- // it wasn't added in OnGetRequestData
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests(
- request->per_profile_request(), /*access_token*/ "", /*upload_info*/
- "Skipped - Large data blocked", request->content_analysis_request());
- "Skipped - Large data blocked", /*upload_url*/ "",
- request->content_analysis_request());
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses(
- /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result),
- enterprise_connectors::ContentAnalysisResponse());
@@ -684,7 +684,7 @@
- // wasn't added in OnGetRequestData
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests(
- request->per_profile_request(), /*access_token*/ "", /*upload_info*/ "",
- request->content_analysis_request());
- /*upload_url=*/"", request->content_analysis_request());
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses(
- /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result),
- enterprise_connectors::ContentAnalysisResponse());
@@ -707,7 +707,7 @@
void OnGotFileInfo(
--- a/chrome/browser/enterprise/connectors/common.cc
+++ b/chrome/browser/enterprise/connectors/common.cc
@@ -269,7 +269,7 @@ void ShowDownloadReviewDialog(const std:
@@ -271,7 +271,7 @@ void ShowDownloadReviewDialog(const std:
bool IsResumableUpload(const BinaryUploadService::Request& request) {
// Currently resumable upload doesn't support paste or LBUS. If one day we do,
// we should update the logic here as well.
@@ -718,43 +718,30 @@
enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY &&
--- a/chrome/browser/enterprise/connectors/connectors_manager.cc
+++ b/chrome/browser/enterprise/connectors/connectors_manager.cc
@@ -431,13 +431,7 @@ std::vector<const AnalysisConfig*> Conne
@@ -413,16 +413,7 @@ std::vector<const AnalysisConfig*> Conne
}
safe_browsing::DataRegion ConnectorsManager::GetDataRegion() const {
DataRegion ConnectorsManager::GetDataRegion() const {
-#if BUILDFLAG(IS_ANDROID)
return DataRegion::NO_PREFERENCE;
-#else
- bool apply_data_region =
- prefs()->HasPrefPath(prefs::kChromeDataRegionSetting) &&
- base::FeatureList::IsEnabled(safe_browsing::kDlpRegionalizedEndpoints);
- return apply_data_region
- ? safe_browsing::ChromeDataRegionSettingToEnum(
- prefs()->GetInteger(prefs::kChromeDataRegionSetting))
- : safe_browsing::DataRegion::NO_PREFERENCE;
+ return safe_browsing::DataRegion::NO_PREFERENCE;
- return apply_data_region ? ChromeDataRegionSettingToEnum(prefs()->GetInteger(
- prefs::kChromeDataRegionSetting))
- : DataRegion::NO_PREFERENCE;
-#endif
}
void ConnectorsManager::StartObservingPrefs(PrefService* pref_service) {
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
@@ -453,37 +453,8 @@ std::optional<std::string> ConnectorsSer
return std::nullopt;
@@ -446,22 +446,7 @@ std::string ConnectorsService::GetManage
}
-safe_browsing::EnterpriseRealTimeUrlCheckMode
-ConnectorsService::GetAppliedRealTimeUrlCheck() const {
- if (!ConnectorsEnabled() ||
- !GetDmToken(prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope)
- .has_value()) {
- return safe_browsing::REAL_TIME_CHECK_DISABLED;
- }
-
- return static_cast<safe_browsing::EnterpriseRealTimeUrlCheckMode>(
- Profile::FromBrowserContext(context_)->GetPrefs()->GetInteger(
- prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode));
-}
-
std::string ConnectorsService::GetRealTimeUrlCheckIdentifier() const {
- auto dm_token =
- GetDmToken(prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope);
- auto dm_token = GetDmToken(kEnterpriseRealTimeUrlCheckScope);
- if (!dm_token) {
return std::string();
- }
@@ -773,21 +760,6 @@
}
ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() {
--- a/chrome/browser/enterprise/connectors/connectors_service.h
+++ b/chrome/browser/enterprise/connectors/connectors_service.h
@@ -88,12 +88,6 @@ class ConnectorsService : public KeyedSe
// is no token to use.
std::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
- // Returns the value to used by the enterprise real-time URL check Connector
- // if it is set and if the scope it's set at has a valid browser-profile
- // affiliation.
- safe_browsing::EnterpriseRealTimeUrlCheckMode GetAppliedRealTimeUrlCheck()
- const;
-
// Returns the profile email if real-time URL check is set for the profile,
// the device ID if it is set for the device, or an empty string if it is
// unset.
--- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc
+++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc
@@ -26,25 +26,6 @@ enum class PasswordProtectionTrigger {
@@ -954,9 +926,9 @@
ReportingServiceFactory::~ReportingServiceFactory() = default;
--- a/chrome/browser/enterprise/data_protection/data_protection_clipboard_utils.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_clipboard_utils.cc
@@ -95,77 +95,6 @@ class ClipboardObserver : public ui::Cli
content::ClipboardPasteData pending_seqno_data_;
};
@@ -36,77 +36,6 @@ namespace enterprise_data_protection {
namespace {
-void HandleFileData(
- content::WebContents* web_contents,
@@ -1032,7 +1004,7 @@
bool SkipDataControlOrContentAnalysisChecks(
const content::ClipboardEndpoint& main_endpoint) {
@@ -206,41 +135,7 @@ void PasteIfAllowedByContentAnalysis(
@@ -147,41 +76,7 @@ void PasteIfAllowedByContentAnalysis(
return;
}
@@ -1076,11 +1048,11 @@
void MaybeReportDataControlsPaste(const content::ClipboardEndpoint& source,
--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
@@ -66,12 +66,6 @@ void RunPendingNavigationCallback(
@@ -68,12 +68,6 @@ void RunPendingNavigationCallback(
auto* user_data = GetUserData(web_contents);
DCHECK(user_data);
- if (ShouldReportWatermark(user_data)) {
- if (ShouldReportSafeUrlFilteringEvents(user_data)) {
- MaybeTriggerUrlFilteringInterstitialEvent(
- web_contents, web_contents->GetLastCommittedURL(),
- /*threat_type=*/"", *user_data->rt_lookup_response());
@@ -1089,7 +1061,7 @@
std::move(callback).Run(user_data->settings());
}
@@ -177,9 +171,7 @@ void LogVerdictSource(
@@ -180,9 +174,7 @@ void LogVerdictSource(
bool IsScreenshotAllowedByDataControls(content::BrowserContext* context,
const GURL& url) {
@@ -1100,7 +1072,7 @@
}
} // namespace
@@ -202,16 +194,6 @@ void DataProtectionNavigationObserver::C
@@ -207,16 +199,6 @@ void DataProtectionNavigationObserver::C
std::move(callback).Run(UrlSettings::None());
return;
}
@@ -1117,7 +1089,7 @@
}
// static
@@ -246,35 +228,9 @@ void DataProtectionNavigationObserver::G
@@ -252,35 +234,9 @@ void DataProtectionNavigationObserver::G
web_contents->GetLastCommittedURL()));
}
@@ -1155,7 +1127,7 @@
// static
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
@@ -222,7 +222,6 @@ void ContextInfoFetcher::Fetch(ContextIn
@@ -227,7 +227,6 @@ void ContextInfoFetcher::Fetch(ContextIn
GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
info.on_print_providers =
GetAnalysisConnectorProviders(enterprise_connectors::PRINT);
@@ -1163,11 +1135,11 @@
info.on_security_event_providers = GetOnSecurityEventProviders();
info.browser_version = version_info::GetVersionNumber();
info.site_isolation_enabled =
@@ -279,11 +278,6 @@ std::vector<std::string> ContextInfoFetc
@@ -284,11 +283,6 @@ std::vector<std::string> ContextInfoFetc
return connectors_service_->GetAnalysisServiceProviderNames(connector);
}
-safe_browsing::EnterpriseRealTimeUrlCheckMode
-enterprise_connectors::EnterpriseRealTimeUrlCheckMode
-ContextInfoFetcher::GetRealtimeUrlCheckMode() {
- return connectors_service_->GetAppliedRealTimeUrlCheck();
-}
@@ -1185,19 +1157,20 @@
#include <vector>
#include "base/functional/callback_forward.h"
@@ -39,7 +40,6 @@ struct ContextInfo {
@@ -40,7 +41,6 @@ struct ContextInfo {
std::vector<std::string> on_bulk_data_entry_providers;
std::vector<std::string> on_print_providers;
std::vector<std::string> on_security_event_providers;
- safe_browsing::EnterpriseRealTimeUrlCheckMode realtime_url_check_mode;
- enterprise_connectors::EnterpriseRealTimeUrlCheckMode realtime_url_check_mode;
std::string browser_version;
safe_browsing::SafeBrowsingState safe_browsing_protection_level;
bool site_isolation_enabled;
@@ -90,7 +90,6 @@ class ContextInfoFetcher {
@@ -91,8 +91,6 @@ class ContextInfoFetcher {
std::vector<std::string> GetAnalysisConnectorProviders(
enterprise_connectors::AnalysisConnector connector);
- safe_browsing::EnterpriseRealTimeUrlCheckMode GetRealtimeUrlCheckMode();
- enterprise_connectors::EnterpriseRealTimeUrlCheckMode
- GetRealtimeUrlCheckMode();
std::vector<std::string> GetOnSecurityEventProviders();
@@ -1261,7 +1234,7 @@
} // namespace utils
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -315,10 +315,6 @@ source_set("extensions") {
@@ -291,10 +291,6 @@ source_set("extensions") {
"api/runtime/chrome_runtime_api_delegate.h",
"api/safe_browsing_private/safe_browsing_private_api.cc",
"api/safe_browsing_private/safe_browsing_private_api.h",
@@ -1272,7 +1245,7 @@
"api/safe_browsing_private/safe_browsing_util.cc",
"api/safe_browsing_private/safe_browsing_util.h",
"api/search/search_api.cc",
@@ -665,8 +661,6 @@ source_set("extensions") {
@@ -639,8 +635,6 @@ source_set("extensions") {
"mv2_experiment_stage.h",
"navigation_extension_enabler.cc",
"navigation_extension_enabler.h",
@@ -1283,7 +1256,7 @@
"pending_extension_info.cc",
--- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -115,7 +115,6 @@ void EnsureApiBrowserContextKeyedService
@@ -114,7 +114,6 @@ void EnsureApiBrowserContextKeyedService
#endif
extensions::ProcessesAPI::GetFactoryInstance();
extensions::ReadingListEventRouter::GetFactoryInstance();
@@ -1293,7 +1266,7 @@
extensions::SettingsOverridesAPI::GetFactoryInstance();
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -303,19 +303,6 @@ void CookiesGetFunction::GetCookieListCa
@@ -318,19 +318,6 @@ void CookiesGetFunction::GetCookieListCa
}
void CookiesGetFunction::NotifyExtensionTelemetry() {
@@ -1313,7 +1286,7 @@
}
CookiesGetAllFunction::CookiesGetAllFunction() {
@@ -408,24 +395,6 @@ void CookiesGetAllFunction::GetCookieLis
@@ -423,24 +410,6 @@ void CookiesGetAllFunction::GetCookieLis
}
void CookiesGetAllFunction::NotifyExtensionTelemetry() {
@@ -1340,16 +1313,16 @@
CookiesSetFunction::CookiesSetFunction()
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -93,16 +93,8 @@ api::enterprise_reporting_private::Conte
@@ -98,16 +98,8 @@ api::enterprise_reporting_private::Conte
info.third_party_blocking_enabled = signals.third_party_blocking_enabled;
info.os_firewall = ToInfoSettingValue(signals.os_firewall);
info.system_dns_servers = std::move(signals.system_dns_servers);
- switch (signals.realtime_url_check_mode) {
- case safe_browsing::REAL_TIME_CHECK_DISABLED:
- case enterprise_connectors::REAL_TIME_CHECK_DISABLED:
info.realtime_url_check_mode = extensions::api::
enterprise_reporting_private::RealtimeUrlCheckMode::kDisabled;
- break;
- case safe_browsing::REAL_TIME_CHECK_FOR_MAINFRAME_ENABLED:
- case enterprise_connectors::REAL_TIME_CHECK_FOR_MAINFRAME_ENABLED:
- info.realtime_url_check_mode = extensions::api::
- enterprise_reporting_private::RealtimeUrlCheckMode::kEnabledMainFrame;
- break;
@@ -1357,20 +1330,9 @@
info.browser_version = std::move(signals.browser_version);
info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
info.enterprise_profile_id = signals.enterprise_profile_id;
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -347,8 +347,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::kGeneratedHttpsFirstModePref] =
settings_api::PrefType::kNumber;
- (*s_allowlist)[::prefs::kSafeBrowsingEsbOptInWithFriendlierSettings] =
- settings_api::PrefType::kBoolean;
// Tracking protection page
(*s_allowlist)[::prefs::kCookieControlsMode] =
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -428,30 +428,6 @@ void NotifyExtensionTelemetry(Profile* p
@@ -427,30 +427,6 @@ void NotifyExtensionTelemetry(Profile* p
const std::string& current_url,
const std::string& new_url,
const std::optional<StackTrace>& js_callstack) {
@@ -1426,7 +1388,7 @@
void Blocklist::GetMalwareIDs(const std::set<ExtensionId>& ids,
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -807,44 +807,17 @@ void ChromeExtensionsBrowserClient::Noti
@@ -808,44 +808,17 @@ void ChromeExtensionsBrowserClient::Noti
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::string& code) const {
@@ -1472,7 +1434,7 @@
}
void ChromeExtensionsBrowserClient::
@@ -853,59 +826,12 @@ void ChromeExtensionsBrowserClient::
@@ -854,59 +827,12 @@ void ChromeExtensionsBrowserClient::
const ExtensionId& extension_id,
const GURL& request_url,
const GURL& redirect_url) const {
@@ -1532,7 +1494,7 @@
}
// static
@@ -1074,7 +1000,6 @@ void ChromeExtensionsBrowserClient::GetW
@@ -1075,7 +1001,6 @@ void ChromeExtensionsBrowserClient::GetW
void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager(
content::WebContents* web_contents) const {
@@ -1576,7 +1538,7 @@
extension_telemetry_service_verdict_handler_(
extension_prefs,
ExtensionRegistry::Get(profile),
@@ -941,17 +935,6 @@ bool ExtensionService::IsExtensionEnable
@@ -937,17 +931,6 @@ bool ExtensionService::IsExtensionEnable
return extension_registrar_.IsExtensionEnabled(extension_id);
}
@@ -1594,7 +1556,7 @@
void ExtensionService::PerformActionBasedOnExtensionTelemetryServiceVerdicts(
const Blocklist::BlocklistStateMap& blocklist_state_map) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -961,89 +944,6 @@ void ExtensionService::PerformActionBase
@@ -957,89 +940,6 @@ void ExtensionService::PerformActionBase
error_controller_->ShowErrorIfNeeded();
}
@@ -1839,15 +1801,15 @@
std::vector<blink::mojom::FileChooserFileInfoPtr> list,
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -36,7 +36,6 @@
@@ -37,7 +37,6 @@
#include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/file_system_access_dialogs.h"
#include "chrome/common/chrome_paths.h"
@@ -431,89 +430,6 @@ bool ShouldBlockAccessToPath(const base:
#include "chrome/browser/ui/file_system_access/file_system_access_dangerous_file_dialog.h"
#include "chrome/browser/ui/file_system_access/file_system_access_dialogs.h"
@@ -434,89 +433,6 @@ bool ShouldBlockAccessToPath(const base:
return true;
}
@@ -1937,7 +1899,7 @@
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
return id.empty() ? kDefaultLastPickedDirectoryKey
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
@@ -533,13 +449,7 @@ std::string_view GetGrantKeyFromGrantTyp
@@ -536,13 +452,7 @@ std::string_view GetGrantKeyFromGrantTyp
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -1952,7 +1914,7 @@
}
} // namespace
@@ -1602,7 +1512,7 @@ void ChromeFileSystemAccessPermissionCon
@@ -1625,7 +1535,7 @@ void ChromeFileSystemAccessPermissionCon
std::vector<PathInfo> entries,
content::GlobalRenderFrameHostId frame_id,
EntriesAllowedByEnterprisePolicyCallback callback) {
@@ -1961,7 +1923,7 @@
// Get WebContents pointer in order to perform enterprise content analysis.
content::WebContents* web_contents = nullptr;
if (!entries.empty()) {
@@ -1710,29 +1620,6 @@ void ChromeFileSystemAccessPermissionCon
@@ -1733,29 +1643,6 @@ void ChromeFileSystemAccessPermissionCon
std::move(callback));
}
@@ -1993,7 +1955,7 @@
const base::FilePath& path,
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
@@ -181,10 +181,6 @@ class ChromeFileSystemAccessPermissionCo
@@ -180,10 +180,6 @@ class ChromeFileSystemAccessPermissionCo
UserAction user_action,
content::GlobalRenderFrameHostId frame_id,
base::OnceCallback<void(SensitiveEntryResult)> callback) override;
@@ -2056,7 +2018,7 @@
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/sync_service_factory.h"
@@ -1008,6 +1007,7 @@ autofill::LanguageCode ChromePasswordMan
@@ -1005,6 +1004,7 @@ autofill::LanguageCode ChromePasswordMan
return autofill::LanguageCode();
}
@@ -2064,7 +2026,7 @@
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
return safe_browsing::ChromePasswordProtectionService::
@@ -1027,6 +1027,7 @@ void ChromePasswordManagerClient::CheckS
@@ -1024,6 +1024,7 @@ void ChromePasswordManagerClient::CheckS
}
}
#endif // defined(ON_FOCUS_PING_ENABLED)
@@ -2072,7 +2034,7 @@
#if !BUILDFLAG(IS_ANDROID)
void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
@@ -1034,30 +1035,10 @@ void ChromePasswordManagerClient::MaybeR
@@ -1031,30 +1032,10 @@ void ChromePasswordManagerClient::MaybeR
bool is_federated,
const url::SchemeHostPort& federated_origin,
const std::u16string& login_user_name) const {
@@ -2103,7 +2065,7 @@
}
#endif
@@ -1744,6 +1725,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1778,6 +1759,7 @@ bool ChromePasswordManagerClient::IsPass
is_enabled = false;
}
@@ -2111,7 +2073,7 @@
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Disable password
@@ -1754,6 +1736,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1788,6 +1770,7 @@ bool ChromePasswordManagerClient::IsPass
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -2326,7 +2288,7 @@
}
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -109,6 +109,7 @@
@@ -117,6 +117,7 @@
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
#include "components/privacy_sandbox/tracking_protection_prefs.h"
#include "components/proxy_config/proxy_policy_handler.h"
@@ -2334,7 +2296,7 @@
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -2329,8 +2330,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2348,8 +2349,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -2343,9 +2305,9 @@
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
handlers->AddHandler(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
@@ -2440,20 +2439,6 @@ std::unique_ptr<ConfigurationPolicyHandl
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
@@ -2459,20 +2458,6 @@ std::unique_ptr<ConfigurationPolicyHandl
SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
- handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>(
- key::kExemptDomainFileTypePairsFromFileTypeDownloadWarnings,
@@ -2366,7 +2328,7 @@
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -286,7 +286,6 @@
@@ -279,7 +279,6 @@
#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
#include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h"
@@ -2374,7 +2336,7 @@
#include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/tab_resumption/tab_resumption_page_handler.h"
@@ -1939,7 +1938,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -1971,7 +1970,6 @@ void RegisterProfilePrefs(user_prefs::Pr
media_router::RegisterProfilePrefs(registry);
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
@@ -2480,7 +2442,7 @@
// This method is virtual for testing purposes.
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -817,9 +817,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -820,9 +820,6 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance();
enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance();
#endif
@@ -2490,7 +2452,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_ANDROID)
enterprise_idle::IdleServiceFactory::GetInstance();
@@ -1141,23 +1138,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1143,23 +1140,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if !BUILDFLAG(IS_ANDROID)
ResetReportUploaderFactory::GetInstance();
#endif
@@ -2598,7 +2560,7 @@
scoped_refptr<network::SharedURLLoaderFactory>
--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
@@ -146,15 +146,6 @@ CreateSettingsPageHelper() {
@@ -147,15 +147,6 @@ CreateSettingsPageHelper() {
CreateChromeSettingsPageHelper();
}
@@ -2614,7 +2576,7 @@
} // namespace
std::unique_ptr<SSLBlockingPage>
@@ -177,10 +168,6 @@ ChromeSecurityBlockingPageFactory::Creat
@@ -178,10 +169,6 @@ ChromeSecurityBlockingPageFactory::Creat
Profile::FromBrowserContext(web_contents->GetBrowserContext()));
state->DidDisplayErrorPage(cert_error);
@@ -2625,7 +2587,7 @@
auto controller_client = std::make_unique<SSLErrorControllerClient>(
web_contents, ssl_info, cert_error, request_url,
std::move(metrics_helper), CreateSettingsPageHelper());
@@ -243,10 +230,6 @@ ChromeSecurityBlockingPageFactory::Creat
@@ -244,10 +231,6 @@ ChromeSecurityBlockingPageFactory::Creat
const GURL& request_url,
const net::SSLInfo& ssl_info,
const std::string& mitm_software_name) {
@@ -2636,7 +2598,7 @@
auto page = std::make_unique<MITMSoftwareBlockingPage>(
web_contents, cert_error, request_url,
/*can_show_enhanced_protection_message=*/true, ssl_info,
@@ -266,10 +249,6 @@ ChromeSecurityBlockingPageFactory::Creat
@@ -267,10 +250,6 @@ ChromeSecurityBlockingPageFactory::Creat
int cert_error,
const GURL& request_url,
const net::SSLInfo& ssl_info) {
@@ -2701,7 +2663,7 @@
} // namespace
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -622,7 +622,6 @@ static_library("ui") {
@@ -625,7 +625,6 @@ static_library("ui") {
"//components/renderer_context_menu",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -2709,7 +2671,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser/db:database_manager",
@@ -3892,8 +3891,6 @@ static_library("ui") {
@@ -3250,8 +3249,6 @@ static_library("ui") {
"startup/web_app_startup_utils.h",
"tab_contents/chrome_web_contents_menu_helper.cc",
"tab_contents/chrome_web_contents_menu_helper.h",
@@ -2718,7 +2680,7 @@
"views/autofill/payments/webauthn_dialog_view.cc",
"views/autofill/payments/webauthn_dialog_view.h",
"views/close_bubble_on_tab_activation_helper.cc",
@@ -5614,8 +5611,6 @@ static_library("ui") {
@@ -4962,8 +4959,6 @@ static_library("ui") {
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
@@ -2796,7 +2758,7 @@
void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
--- a/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc
+++ b/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc
@@ -51,7 +51,6 @@
@@ -52,7 +52,6 @@
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/common/features.h"
@@ -2804,7 +2766,7 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "ui/base/l10n/l10n_util.h"
@@ -357,21 +356,6 @@ UnusedSitePermissionsService::UnusedSite
@@ -358,21 +357,6 @@ UnusedSitePermissionsService::UnusedSite
base::Unretained(this)));
}
@@ -2826,7 +2788,7 @@
bool migration_completed = pref_change_registrar_->prefs()->GetBoolean(
safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted);
@@ -1027,9 +1011,7 @@ bool UnusedSitePermissionsService::IsUnu
@@ -1028,9 +1012,7 @@ bool UnusedSitePermissionsService::IsUnu
bool UnusedSitePermissionsService::
IsAbusiveNotificationAutoRevocationEnabled() {
@@ -2839,7 +2801,7 @@
const std::set<ContentSettingsType>
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -383,7 +383,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -380,7 +380,6 @@ void TabHelpers::AttachTabHelpers(WebCon
if (!autofill_client_provider.uses_platform_autofill()) {
ChromePasswordManagerClient::CreateForWebContents(web_contents);
}
@@ -2879,13 +2841,17 @@
}
} // namespace
@@ -189,70 +173,16 @@ void DownloadBubbleContentsView::Process
@@ -189,74 +173,16 @@ void DownloadBubbleContentsView::Process
const ContentId& id,
DownloadItemWarningData::DeepScanTrigger trigger,
base::optional_ref<const std::string> password) {
- if (DownloadUIModel* model = GetDownloadModel(id); model) {
- LogDeepScanEvent(model->GetDownloadItem(),
- safe_browsing::DeepScanEvent::kPromptAccepted);
- DownloadItemWarningData::AddWarningActionEvent(
- model->GetDownloadItem(),
- DownloadItemWarningData::WarningSurface::BUBBLE_SUBPAGE,
- DownloadItemWarningData::WarningAction::ACCEPT_DEEP_SCAN);
- safe_browsing::DownloadProtectionService::UploadForConsumerDeepScanning(
- model->GetDownloadItem(), trigger, password);
- }
@@ -3009,7 +2975,7 @@
TabDialogs::CreateForWebContents(web_contents);
--- a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc
@@ -255,8 +255,6 @@ void ProfilePickerDiceSignInProvider::On
@@ -280,8 +280,6 @@ void ProfilePickerDiceSignInProvider::On
.Then(base::BindOnce(std::move(switch_finished_callback), true));
host_->ShowScreen(contents(), BuildSigninURL(),
std::move(navigation_finished_closure));
@@ -3020,7 +2986,7 @@
DiceTabHelper::CreateForWebContents(contents());
--- a/chrome/browser/ui/views/profiles/profile_picker_force_signin_dialog_delegate.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_force_signin_dialog_delegate.cc
@@ -46,9 +46,6 @@ ProfilePickerForceSigninDialogDelegate::
@@ -47,9 +47,6 @@ ProfilePickerForceSigninDialogDelegate::
ChromePasswordManagerClient::CreateForWebContents(
web_view_->GetWebContents());
@@ -3054,7 +3020,7 @@
std::unique_ptr<RenderViewContextMenuBase>
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -456,9 +456,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -434,9 +434,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
}
if (url.host_piece() == chrome::kChromeUIPredictorsHost)
return &NewWebUI<PredictorsUI>;
@@ -3229,11 +3195,11 @@
}
void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
@@ -753,15 +629,6 @@ void DownloadsDOMHandler::DeepScan(const
@@ -753,18 +629,6 @@ void DownloadsDOMHandler::DeepScan(const
return;
}
- if (DownloadItemWarningData::IsEncryptedArchive(download)) {
- if (DownloadItemWarningData::IsTopLevelEncryptedArchive(download)) {
- // For encrypted archives, we need a password from the user. We will request
- // this in the download bubble.
- PromptForScanningInBubble(GetWebUIWebContents(), download);
@@ -3242,10 +3208,13 @@
-
- LogDeepScanEvent(download,
- safe_browsing::DeepScanEvent::kPromptAcceptedFromWebUI);
- DownloadItemWarningData::AddWarningActionEvent(
- download, DownloadItemWarningData::WarningSurface::DOWNLOADS_PAGE,
- DownloadItemWarningData::WarningAction::ACCEPT_DEEP_SCAN);
DownloadItemModel model(download);
DownloadCommands commands(model.GetWeakPtr());
commands.ExecuteCommand(DownloadCommands::DEEP_SCAN);
@@ -797,12 +664,6 @@ void DownloadsDOMHandler::ReviewDangerou
@@ -800,12 +664,6 @@ void DownloadsDOMHandler::ReviewDangerou
return;
}
@@ -3267,7 +3236,7 @@
- enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext(
- Profile::FromWebUI(web_ui()))
- ->GetAppliedRealTimeUrlCheck() !=
- safe_browsing::REAL_TIME_CHECK_DISABLED;
- enterprise_connectors::REAL_TIME_CHECK_DISABLED;
+ false;
if (cloud_legacy_tech_report_enabled) {
@@ -3277,7 +3246,7 @@
}
- if (connectors_service->GetAppliedRealTimeUrlCheck() !=
- safe_browsing::REAL_TIME_CHECK_DISABLED) {
- enterprise_connectors::REAL_TIME_CHECK_DISABLED) {
- AddThreatProtectionPermission(kManagementOnPageVisitedEvent,
- kManagementOnPageVisitedVisibleData, &info);
- }
@@ -3375,8 +3344,8 @@
safe_browsing_setting_current = "no_protection";
- }
std::string friendlier_safe_browsing_settings_enabled =
(base::FeatureList::IsEnabled(
std::string client_channel =
std::string(version_info::GetChannelString(chrome::GetChannel()));
--- a/chrome/browser/webshare/share_service_impl.cc
+++ b/chrome/browser/webshare/share_service_impl.cc
@@ -17,7 +17,9 @@
@@ -3478,7 +3447,7 @@
}
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2019,9 +2019,6 @@ if (!is_android) {
@@ -2026,9 +2026,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -3488,7 +3457,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -6942,9 +6939,6 @@ test("unit_tests") {
@@ -6765,9 +6762,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -3498,8 +3467,8 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:mock_password_protection",
"//components/safe_browsing/content/browser/web_ui",
--- a/components/enterprise/connectors/reporting/reporting_service_settings.cc
+++ b/components/enterprise/connectors/reporting/reporting_service_settings.cc
--- a/components/enterprise/connectors/core/reporting_service_settings.cc
+++ b/components/enterprise/connectors/core/reporting_service_settings.cc
@@ -44,16 +44,6 @@ ReportingServiceSettings::ReportingServi
else
DVLOG(1) << "Enabled event name list contains a non string value!";
@@ -3629,6 +3598,16 @@
#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
#include "components/safe_browsing/core/browser/db/v4_store.pb.h"
#include "components/safe_browsing/core/common/proto/webui.pb.h"
--- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
+++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
@@ -27,7 +27,6 @@
#include "services/network/public/mojom/url_response_head.mojom.h"
using base::Time;
-using enum safe_browsing::ExtendedReportingLevel;
namespace {
--- a/components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_service.h
+++ b/components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_service.h
@@ -12,6 +12,7 @@
@@ -3664,7 +3643,7 @@
}
GURL GetKeyFetchingUrl() {
@@ -403,25 +396,9 @@ void OhttpKeyService::MaybeStartServerTr
@@ -407,25 +400,9 @@ void OhttpKeyService::MaybeStartServerTr
}
void OhttpKeyService::PopulateKeyFromPref() {
@@ -3692,7 +3671,7 @@
void OhttpKeyService::Shutdown() {
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
@@ -253,17 +253,6 @@ void RealTimeUrlLookupService::MaybeLogP
@@ -261,17 +261,6 @@ void RealTimeUrlLookupService::MaybeLogP
bool request_had_cookie,
bool was_first_request,
bool sent_with_token) {

579
patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
View File

File diff suppressed because it is too large Load Diff

2
patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
View File

@@ -1,6 +1,6 @@
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -133,27 +133,11 @@
@@ -135,27 +135,11 @@
// TODO(b/343792225): Identify a way to resolve this problem and implement
// necessary changes.
"google": {

4
patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
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
@@ -172,6 +172,7 @@
@@ -174,6 +174,7 @@
#include "components/supervised_user/core/browser/supervised_user_preferences.h"
#include "components/supervised_user/core/browser/supervised_user_service.h"
#include "components/supervised_user/core/browser/supervised_user_url_filter.h"
@@ -9,7 +9,7 @@
#include "components/translate/core/browser/translate_download_manager.h"
#include "components/translate/core/browser/translate_manager.h"
#include "components/translate/core/browser/translate_prefs.h"
@@ -2282,6 +2283,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2285,6 +2286,7 @@ void RenderViewContextMenu::AppendPageIt
}
if (CanTranslate(/*menu_logging=*/true)) {

38
patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
View File

@@ -9,7 +9,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2584,6 +2584,7 @@ static_library("browser") {
@@ -2441,6 +2441,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
@@ -171,6 +171,7 @@
@@ -178,6 +178,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
@@ -271,6 +271,7 @@ source_set("browser") {
@@ -277,6 +277,7 @@ source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/sqlite",
@@ -54,7 +54,7 @@
"//tools/v8_context_snapshot:buildflags",
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -78,6 +78,7 @@
@@ -79,6 +79,7 @@
#include "components/services/storage/public/cpp/quota_error_or.h"
#include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
#include "components/tracing/common/tracing_switches.h"
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/bad_message.h"
@@ -3216,6 +3217,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3314,6 +3315,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -489,6 +490,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -494,6 +495,10 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kEnableWebGPUDeveloperFeatures, true},
{wrf::EnableWebGPUExperimentalFeatures, switches::kEnableUnsafeWebGPU,
true},
@@ -124,7 +124,7 @@
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -916,6 +917,11 @@ Document::Document(const DocumentInit& i
@@ -905,6 +906,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();
@@ -1031,6 +1037,14 @@ const Position Document::PositionAdjuste
@@ -1020,6 +1026,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
@@ -552,6 +552,10 @@ class CORE_EXPORT Document : public Cont
@@ -549,6 +549,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -164,7 +164,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2574,6 +2578,9 @@ class CORE_EXPORT Document : public Cont
@@ -2567,6 +2571,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
@@ -2439,6 +2439,11 @@ DOMRectList* Element::getClientRects() {
@@ -2513,6 +2513,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2466,6 +2471,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2540,6 +2545,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
@@ -1607,6 +1607,12 @@ DOMRectList* Range::getClientRects() con
@@ -1649,6 +1649,12 @@ DOMRectList* Range::getClientRects() con
Vector<gfx::QuadF> quads;
GetBorderAndTextQuads(quads);
@@ -213,7 +213,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -1614,7 +1620,11 @@ DOMRect* Range::getBoundingClientRect()
@@ -1656,7 +1662,11 @@ DOMRect* Range::getBoundingClientRect()
// TODO(crbug.com/1499981): This should be removed once synchronized scrolling
// impact is understood.
SyncScrollAttemptHeuristic::DidAccessScrollOffset();
@@ -266,7 +266,7 @@
const TextDirection&,
--- 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
@@ -219,6 +219,9 @@ class Isolate;
@@ -221,6 +221,9 @@ class Isolate;
class Value;
} // namespace v8
@@ -276,7 +276,7 @@
namespace blink {
class DOMMatrixInit;
@@ -3512,8 +3515,22 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -3538,8 +3541,22 @@ TextMetrics* BaseRenderingContext2D::mea
const CanvasRenderingContext2DState& state = GetState();
TextDirection direction = ToTextDirection(state.GetDirection(), canvas);
@@ -303,10 +303,10 @@
void BaseRenderingContext2D::SnapshotStateForFilter() {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1747,6 +1747,7 @@ component("platform") {
"//cc/mojo_embedder",
@@ -1751,6 +1751,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection:language_detection",
+ "//components/ungoogled:ungoogled_switches",
"//components/viz/client",
"//components/viz/common",
@@ -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
@@ -1848,6 +1848,12 @@
@@ -1947,6 +1947,12 @@
status: "experimental",
},
{

12
patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
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
@@ -3219,6 +3219,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3317,6 +3317,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
@@ -494,6 +494,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -499,6 +499,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
@@ -2835,6 +2835,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2861,6 +2861,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
@@ -1699,7 +1699,9 @@ component("platform") {
@@ -1701,7 +1701,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -303,7 +303,7 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
@@ -37,6 +37,8 @@ class PLATFORM_EXPORT StaticBitmapImage
@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage
StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
@@ -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
@@ -1854,6 +1854,9 @@
@@ -1953,6 +1953,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

12
patches/extra/bromite/flag-max-connections-per-host.patch
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
@@ -2282,6 +2282,7 @@ static_library("browser") {
@@ -2132,6 +2132,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -64,7 +64,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
@@ -109,6 +111,7 @@
@@ -110,6 +112,7 @@
#include "components/metrics/metrics_service.h"
#include "components/metrics_services_manager/metrics_services_manager.h"
#include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -72,7 +72,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/os_crypt/async/browser/os_crypt_async.h"
#include "components/permissions/permissions_client.h"
@@ -141,6 +144,7 @@
@@ -143,6 +146,7 @@
#include "extensions/common/constants.h"
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -80,7 +80,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
@@ -380,6 +384,18 @@ void BrowserProcessImpl::Init() {
@@ -378,6 +382,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -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
@@ -2369,6 +2369,10 @@ const char kLogJsConsoleMessagesDescript
@@ -2449,6 +2449,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
@@ -1356,6 +1356,9 @@ extern const char kLocationBarModelOptim
@@ -1397,6 +1397,9 @@ extern const char kLocationBarModelOptim
extern const char kLogJsConsoleMessagesName[];
extern const char kLogJsConsoleMessagesDescription[];

6
patches/extra/inox-patchset/0006-modify-default-prefs.patch
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
@@ -1601,7 +1601,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -23,7 +23,7 @@
// used for mapping the command-line flags).
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -381,7 +381,7 @@ void ProfileNetworkContextService::Confi
@@ -388,7 +388,7 @@ void ProfileNetworkContextService::Confi
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -67,7 +67,7 @@
</cr-dialog>
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -95,7 +95,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -97,7 +97,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(

2
patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
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
@@ -1671,11 +1671,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1665,11 +1665,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {

2
patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
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
@@ -285,7 +285,7 @@ bool GetTLSServerEndPointChannelBinding(
@@ -281,7 +281,7 @@ bool GetTLSServerEndPointChannelBinding(
}
// RSA keys created by CreateKeyAndSelfSignedCert will be of this length.

4
patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
View File

@@ -8,9 +8,9 @@
#include "base/observer_list.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -81,9 +82,12 @@ bool BookmarkTabHelper::ShouldShowBookma
@@ -79,9 +80,12 @@ bool BookmarkTabHelper::ShouldShowBookma
const bool has_saved_tab_groups =
stg_service && (stg_service->model()->Count() > 0);
tab_group_service && !tab_group_service->GetAllGroups().empty();
+ const std::string flag_value =
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("bookmark-bar-ntp");

18
patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
View File

@@ -1,14 +1,14 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -145,6 +145,7 @@
#include "chrome/browser/ui/ui_features.h"
@@ -146,6 +146,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"
+#include "chrome/browser/ui/views/message_box_dialog.h"
#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"
@@ -551,6 +552,7 @@ Browser::Browser(const CreateParams& par
@@ -552,6 +553,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
@@ -994,20 +996,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1039,6 +1043,7 @@ bool Browser::TryToCloseWindow(
@@ -1045,6 +1049,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3085,6 +3090,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3156,6 +3161,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;
@@ -3110,6 +3167,22 @@ void Browser::InProgressDownloadResponse
@@ -3181,6 +3238,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -152,7 +152,7 @@
#include "chrome/browser/ui/signin/signin_view_controller.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/unload_controller.h"
@@ -1174,12 +1175,17 @@ class Browser : public TabStripModelObse
@@ -1160,12 +1161,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.
@@ -1347,6 +1353,8 @@ class Browser : public TabStripModelObse
@@ -1333,6 +1339,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

6
patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -909,10 +909,14 @@ bool HandleNewTabPageLocationOverride(
@@ -921,10 +921,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())
@@ -28,7 +28,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -223,6 +223,7 @@ std::string GetCombinedOriginListValue(c
@@ -228,6 +228,7 @@ std::string GetCombinedOriginListValue(c
command_line.GetSwitchValueASCII(command_line_switch);
const std::string new_value =
flags_storage.GetOriginListFlag(internal_entry_name);
@@ -36,7 +36,7 @@
return CombineAndSanitizeOriginLists(existing_value, new_value);
}
@@ -461,6 +462,7 @@ void FlagsState::SetOriginListFlag(const
@@ -466,6 +467,7 @@ void FlagsState::SetOriginListFlag(const
const std::string& value,
FlagsStorage* flags_storage) {
const std::string new_value =

6
patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch
View File

@@ -12,8 +12,8 @@
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -20,6 +20,8 @@
namespace blink {
namespace features {
namespace blink::features {
+BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
+
@@ -50,7 +50,7 @@
Node* inner_node = event.InnerNode();
--- a/third_party/blink/renderer/core/input/mouse_event_manager.cc
+++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc
@@ -650,8 +650,14 @@ WebInputEventResult MouseEventManager::H
@@ -660,8 +660,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

2
patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch
View File

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

2
patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -637,5 +637,7 @@ bool BrowserFrame::RegenerateFrameOnThem
@@ -638,5 +638,7 @@ bool BrowserFrame::RegenerateFrameOnThem
}
bool BrowserFrame::IsIncognitoBrowser() const {

6
patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
View File

@@ -41,7 +41,7 @@
#include "base/feature_list.h"
#include "base/format_macros.h"
#include "base/functional/bind.h"
@@ -530,6 +531,15 @@ AutocompleteController::AutocompleteCont
@@ -542,6 +543,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -91,7 +91,7 @@
if (minimal_changes)
--- a/components/url_formatter/url_fixer.cc
+++ b/components/url_formatter/url_fixer.cc
@@ -9,6 +9,8 @@
@@ -14,6 +14,8 @@
#include <string_view>
#include "base/check_op.h"
@@ -100,7 +100,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/i18n/char_iterator.h"
@@ -620,6 +622,8 @@ GURL FixupURLInternal(const std::string&
@@ -625,6 +627,8 @@ GURL FixupURLInternal(const std::string&
FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
if (chrome_url && !parts.host.is_valid())

18
patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
View File

@@ -2,16 +2,16 @@
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -501,7 +501,9 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -507,7 +507,9 @@ void TabHelpers::AttachTabHelpers(WebCon
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("disable-search-engine-collection")) {
SearchEngineTabHelper::CreateForWebContents(web_contents);
+ }
SecurityStateTabHelper::CreateForWebContents(web_contents);
if (site_engagement::SiteEngagementService::IsEnabled()) {
site_engagement::SiteEngagementService::Helper::CreateForWebContents(
web_contents,
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -12,4 +12,8 @@
@@ -52,7 +52,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -15,6 +15,7 @@
@@ -20,6 +20,7 @@
#include "base/base64url.h"
#include "base/check_deref.h"
#include "base/check_is_test.h"
@@ -60,7 +60,7 @@
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
#include "base/debug/crash_logging.h"
@@ -209,6 +210,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
@@ -214,6 +215,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
return TemplateURL(merged_data);
}
@@ -73,7 +73,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -391,6 +398,7 @@ TemplateURLService::TemplateURLService(
@@ -396,6 +403,7 @@ TemplateURLService::TemplateURLService(
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
)
: prefs_(prefs),
@@ -92,7 +92,7 @@
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -2049,6 +2057,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2046,6 +2054,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
if (client_)
client_->SetOwner(this);
@@ -2231,6 +2241,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2226,6 +2236,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -114,8 +114,8 @@
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -891,6 +891,8 @@ class TemplateURLService final : public
raw_ptr<search_engines::SearchEngineChoiceService>
search_engine_choice_service_ = nullptr;
raw_ref<search_engines::SearchEngineChoiceService>
search_engine_choice_service_;
+ bool should_autocollect_; // Whether search engines should be auto-collected
+

8
patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -11,6 +11,7 @@
@@ -16,6 +16,7 @@
#include <memory>
#include <utility>
@@ -8,7 +8,7 @@
#include "base/debug/alias.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
@@ -693,6 +694,8 @@ void Tab::OnGestureEvent(ui::GestureEven
@@ -702,6 +703,8 @@ void Tab::OnGestureEvent(ui::GestureEven
}
std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
@@ -19,7 +19,7 @@
}
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -14,6 +14,7 @@
@@ -19,6 +19,7 @@
#include <utility>
#include <vector>
@@ -27,7 +27,7 @@
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
@@ -1822,6 +1823,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -1827,6 +1828,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

6
patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1432,7 +1432,8 @@ void BrowserCommandController::InitComma
@@ -1440,7 +1440,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -17,10 +17,10 @@
#include "chrome/browser/ui/views/frame/tab_strip_region_view.h"
+#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
@@ -112,7 +113,8 @@ TabStripRegionView::TabStripRegionView(s
@@ -115,7 +116,8 @@ TabStripRegionView::TabStripRegionView(s
// Add and configure the TabSearchContainer.
std::unique_ptr<TabSearchContainer> tab_search_container;

4
patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch
View File

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -224,6 +224,7 @@ std::string GetCombinedOriginListValue(c
@@ -229,6 +229,7 @@ std::string GetCombinedOriginListValue(c
const std::string new_value =
flags_storage.GetOriginListFlag(internal_entry_name);
if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value;
@@ -19,7 +19,7 @@
return CombineAndSanitizeOriginLists(existing_value, new_value);
}
@@ -463,6 +464,7 @@ void FlagsState::SetOriginListFlag(const
@@ -468,6 +469,7 @@ void FlagsState::SetOriginListFlag(const
FlagsStorage* flags_storage) {
const std::string new_value =
internal_name == "custom-ntp" ? value :

16
patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch
View File

@@ -1,17 +1,17 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -378,4 +378,5 @@ BASE_FEATURE(kBrowserDynamicCodeDisabled
base::FEATURE_DISABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_WIN)
@@ -410,4 +410,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
"RemovalOfIWAsFromTabCapture",
base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kClearDataOnExit, "ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT);
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -133,6 +133,7 @@ BASE_DECLARE_FEATURE(kWebUsbDeviceDetect
#if BUILDFLAG(IS_WIN)
BASE_DECLARE_FEATURE(kBrowserDynamicCodeDisabled);
#endif
@@ -145,6 +145,7 @@ BASE_DECLARE_FEATURE(kBrowserDynamicCode
BASE_DECLARE_FEATURE(kReportPakFileIntegrity);
BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
+BASE_DECLARE_FEATURE(kClearDataOnExit);
} // namespace features

4
patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -12,6 +12,7 @@
@@ -17,6 +17,7 @@
#include <unordered_map>
#include <utility>
@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -2063,6 +2064,10 @@ void TabStripModel::CloseTabs(base::span
@@ -2065,6 +2066,10 @@ void TabStripModel::CloseTabs(base::span
return;
}

2
patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
View File

@@ -50,7 +50,7 @@
bool IsExtensionDownload(const download::DownloadItem& download_item);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1263,10 +1263,12 @@ DownloadConfirmationReason DownloadTarge
@@ -1265,10 +1265,12 @@ DownloadConfirmationReason DownloadTarge
return DownloadConfirmationReason::SAVE_AS;
#if BUILDFLAG(ENABLE_EXTENSIONS)

4
patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
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
@@ -1251,6 +1251,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1276,6 +1276,8 @@ WindowOpenDisposition NavigationPolicyTo
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:
@@ -41,7 +41,7 @@
return ui::mojom::WindowOpenDisposition::NEW_POPUP;
case WindowOpenDisposition::NEW_WINDOW:
return ui::mojom::WindowOpenDisposition::NEW_WINDOW;
@@ -68,6 +71,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
@@ -67,6 +70,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
return true;
case ui::mojom::WindowOpenDisposition::NEW_POPUP:
*out = WindowOpenDisposition::NEW_POPUP;

4
patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
View File

@@ -13,7 +13,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
@@ -10,6 +10,7 @@
@@ -15,6 +15,7 @@
#include <utility>
#include <vector>
@@ -21,7 +21,7 @@
#include "base/lazy_instance.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/safe_conversions.h"
@@ -312,6 +313,13 @@ IDNConversionResult IDNToUnicodeWithAdju
@@ -317,6 +318,13 @@ IDNConversionResult IDNToUnicodeWithAdju
host16.reserve(host.length());
host16.insert(host16.end(), host.begin(), host.end());

4
patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1950,6 +1950,10 @@ void BrowserView::ExitFullscreen() {
@@ -2000,6 +2000,10 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateExclusiveAccessBubble(
const ExclusiveAccessBubbleParams& params,
ExclusiveAccessBubbleHideCallback first_hide_callback) {
@@ -23,7 +23,7 @@
+
// Kiosk mode is a fullscreen experience, which makes the exit UI
// inappropriate.
return !chrome::IsRunningInAppMode();
return !IsRunningInAppMode();
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -112,4 +112,8 @@

12
patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
View File

@@ -1,9 +1,9 @@
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -1068,7 +1068,11 @@ void Tab::UpdateIconVisibility() {
if (IsActive()) {
@@ -1081,7 +1081,11 @@ void Tab::UpdateIconVisibility() {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-tab-close-buttons")) {
+ showing_close_button_ = false;
+ } else {
@@ -12,10 +12,10 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1093,6 +1097,8 @@ void Tab::UpdateIconVisibility() {
}
showing_close_button_ = large_enough_for_close_button;
@@ -1110,6 +1114,8 @@ void Tab::UpdateIconVisibility() {
!controller_->IsLockedForOnTask() &&
#endif
large_enough_for_close_button;
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-tab-close-buttons"))
+ showing_close_button_ = false;
if (showing_close_button_) {

4
patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
View File

@@ -40,8 +40,8 @@
bool enable_updated_grease_by_policy = true;
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -21,6 +21,7 @@ namespace blink {
namespace features {
@@ -21,6 +21,7 @@
namespace blink::features {
BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT);

2
patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch
View File

@@ -31,7 +31,7 @@
data, container_policy);
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -22,6 +22,7 @@ namespace features {
@@ -22,6 +22,7 @@ namespace blink::features {
BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT);

4
patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
View File

@@ -38,7 +38,7 @@
BrowserRootView::~BrowserRootView() {
// It's possible to destroy the browser while a drop is active. In this case,
@@ -329,7 +344,7 @@ bool BrowserRootView::OnMouseWheel(const
@@ -325,7 +340,7 @@ bool BrowserRootView::OnMouseWheel(const
// Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
// disable it if the latter feature is enabled.
@@ -49,7 +49,7 @@
// tabstrip, or the empty space beside the tabstrip.
--- a/chrome/browser/ui/views/frame/browser_root_view.h
+++ b/chrome/browser/ui/views/frame/browser_root_view.h
@@ -162,6 +162,8 @@ class BrowserRootView : public views::in
@@ -157,6 +157,8 @@ class BrowserRootView : public views::in
int scroll_remainder_x_ = 0;
int scroll_remainder_y_ = 0;

2
patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
View File

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

2
patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch
View File

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

18
patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch
View File

@@ -28,7 +28,7 @@
"search/instant_mojom_traits.h",
"search/instant_types.cc",
"search/instant_types.h",
@@ -274,6 +276,7 @@ static_library("common_lib") {
@@ -275,6 +277,7 @@ static_library("common_lib") {
"//components/no_state_prefetch/common:mojo_bindings",
"//components/page_load_metrics/common:common",
"//components/pdf/common:constants",
@@ -38,7 +38,7 @@
if (is_android || enable_library_cdms) {
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -982,6 +982,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
@@ -966,6 +966,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
// referrers instead of their ordinary behavior.
BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -55,7 +55,7 @@
// on-screen until dismissed, they are instead shown for a very long time.
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h
@@ -594,6 +594,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
@@ -577,6 +577,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers);
@@ -164,7 +164,7 @@
"//components/embedder_support",
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -69,7 +69,7 @@ if (is_ios) {
@@ -70,7 +70,7 @@ if (is_ios) {
# Omit Lacros because it allows //components to depend on //chrome, which in
# turn depends on //extensions.
@@ -173,7 +173,7 @@
disallowed_extension_deps_ = [
# Components should largely not depend on //extensions. Since // extensions
# is not a component target and is linked with //chrome, depending on most
@@ -853,7 +853,7 @@ test("components_unittests") {
@@ -868,7 +868,7 @@ test("components_unittests") {
# On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -182,7 +182,7 @@
assert_no_deps = [ "//chrome/*" ]
assert_no_deps += disallowed_extension_deps_
}
@@ -1145,7 +1145,7 @@ if (use_blink) {
@@ -1161,7 +1161,7 @@ if (use_blink) {
# dependency. On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -226,7 +226,7 @@
#include "content/common/associated_interfaces.mojom.h"
#include "content/common/content_navigation_policy.h"
#include "content/common/content_switches_internal.h"
@@ -4548,10 +4549,13 @@ void RenderFrameImpl::WillSendRequestInt
@@ -4577,10 +4578,13 @@ void RenderFrameImpl::WillSendRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -246,7 +246,7 @@
void RenderFrameImpl::DidLoadResourceFromMemoryCache(
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -315,6 +315,7 @@ static_library("content_shell_lib") {
@@ -313,6 +313,7 @@ static_library("content_shell_lib") {
"//base:base_static",
"//build:chromeos_buildflags",
"//cc/base",
@@ -355,7 +355,7 @@
WebVector<std::unique_ptr<URLLoaderThrottle>>
--- a/tools/v8_context_snapshot/BUILD.gn
+++ b/tools/v8_context_snapshot/BUILD.gn
@@ -83,6 +83,7 @@ if (use_v8_context_snapshot) {
@@ -87,6 +87,7 @@ if (use_v8_context_snapshot) {
sources = [ "v8_context_snapshot_generator.cc" ]
deps = [

2
patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch
View File

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

2
patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch
View File

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

8
patches/extra/ungoogled-chromium/disable-download-quarantine.patch
View File

@@ -2,7 +2,7 @@
--- a/components/download/internal/common/base_file.cc
+++ b/components/download/internal/common/base_file.cc
@@ -23,7 +23,6 @@
@@ -28,7 +28,6 @@
#include "components/download/public/common/download_interrupt_reasons_utils.h"
#include "components/download/public/common/download_item.h"
#include "components/download/public/common/download_stats.h"
@@ -10,7 +10,7 @@
#include "crypto/secure_hash.h"
#if BUILDFLAG(IS_ANDROID)
@@ -526,94 +525,10 @@ DownloadInterruptReason BaseFile::Publis
@@ -531,94 +530,10 @@ DownloadInterruptReason BaseFile::Publis
}
#endif // BUILDFLAG(IS_ANDROID)
@@ -105,7 +105,7 @@
}
void BaseFile::AnnotateWithSourceInformation(
@@ -622,32 +537,8 @@ void BaseFile::AnnotateWithSourceInforma
@@ -627,32 +542,8 @@ void BaseFile::AnnotateWithSourceInforma
const GURL& referrer_url,
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
OnAnnotationDoneCallback on_annotation_done_callback) {
@@ -142,7 +142,7 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -114,7 +114,6 @@ source_set("browser") {
@@ -118,7 +118,6 @@ source_set("browser") {
"//components/payments/mojom",
"//components/power_monitor",
"//components/services/filesystem:lib",

2
patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
View File

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

2
patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch
View File

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

4
patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
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
@@ -3835,8 +3835,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3836,8 +3836,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3850,8 +3849,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3851,8 +3850,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

2
patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
View File

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

4
patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -554,11 +554,6 @@ int GetContentRestrictions(const Browser
@@ -559,11 +559,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -14,7 +14,7 @@
}
return content_restrictions;
}
@@ -1717,8 +1712,7 @@ bool CanSavePage(const Browser* browser)
@@ -1735,8 +1730,7 @@ bool CanSavePage(const Browser* browser)
DownloadPrefs::DownloadRestriction::ALL_FILES) {
return false;
}

6
patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -201,12 +201,10 @@ TabStripRegionView::TabStripRegionView(s
@@ -204,12 +204,10 @@ TabStripRegionView::TabStripRegionView(s
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@@ -15,7 +15,7 @@
reserved_grab_handle_space_ =
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2059,8 +2059,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2069,8 +2069,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 "
@@ -2071,7 +2069,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2081,7 +2079,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}

6
patches/extra/ungoogled-chromium/first-run-page.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1106,6 +1106,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1102,6 +1102,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -10,7 +10,7 @@
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -57,6 +57,7 @@
@@ -58,6 +58,7 @@
#include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
@@ -18,7 +18,7 @@
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
#include "chrome/browser/ui/webui/version/version_ui.h"
@@ -774,6 +775,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -745,6 +746,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<privacy_sandbox_internals::PrivacySandboxInternalsUI>;
}

2
patches/extra/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch
View File

@@ -39,4 +39,4 @@
- device_lister_->DiscoverNewDevices();
}
} // namespace media_router
void DnsSdDeviceLister::OnPermissionRejected() {

6
patches/extra/ungoogled-chromium/keep-expired-flags.patch
View File

@@ -1,6 +1,6 @@
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -25,6 +25,7 @@
@@ -30,6 +30,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -8,7 +8,7 @@
#include "components/flags_ui/feature_entry.h"
#include "components/flags_ui/flags_storage.h"
#include "components/flags_ui/flags_ui_switches.h"
@@ -654,13 +655,17 @@ void FlagsState::GetFlagFeatureEntries(
@@ -659,13 +660,17 @@ void FlagsState::GetFlagFeatureEntries(
int current_platform = GetCurrentPlatform();
for (const FeatureEntry& entry : feature_entries_) {
@@ -27,7 +27,7 @@
base::Value::List supported_platforms;
AddOsStrings(entry.supported_platforms, &supported_platforms);
@@ -1064,6 +1069,7 @@ bool FlagsState::IsSupportedFeature(cons
@@ -1069,6 +1074,7 @@ bool FlagsState::IsSupportedFeature(cons
if (!entry.InternalNameMatches(name))
continue;
if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))

4
patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
View File

@@ -3,7 +3,7 @@
#
--- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc
@@ -528,7 +528,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
@@ -522,7 +522,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",
@@ -14,7 +14,7 @@
// users to certain starter pack engines.
--- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/search_engine_countries-inc.cc
@@ -36,6 +36,7 @@ constexpr EngineAndTier engines_default[
@@ -41,6 +41,7 @@ constexpr EngineAndTier engines_default[
{SearchEngineTier::kTopEngines, &google},
{SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &yahoo},

58
patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
View File

@@ -13,6 +13,9 @@
# the Google account line from the Payment methods page
# Safety check section on the settings page
# Privacy guide promo on the privacy page
# the 'Learn more' link on the performance page for memory saver
# the 'Learn more' link on the performance page for inactive tabs
# the 'Learn more' link on the performance page for preloading
# Google sign-in and Anonymized Data Collection sections
# help bubble for the removed data collection section
# Privacy guide section on the privacy page
@@ -113,9 +116,9 @@
- $i18n{openTabsMenuItem}
- <cr-ripple></cr-ripple>
- </a>
<template is="dom-if" if="[[productSpecificationsListsEnabled_]]">
<template is="dom-if" if="[[compareHistoryEnabled_]]">
<a id="productSpecificationsLists" role="menuitem"
href="/productSpecificationsLists"
href="/comparisonTables"
--- a/chrome/browser/resources/new_tab_page_incognito_guest/incognito_tab.html
+++ b/chrome/browser/resources/new_tab_page_incognito_guest/incognito_tab.html
@@ -24,9 +24,6 @@ document.querySelector('#incognitothemec
@@ -273,6 +276,37 @@
if (!this.privacyGuidePromoWasShown_) {
this.privacyGuideBrowserProxy_.incrementPromoImpressionCount();
this.privacyGuidePromoWasShown_ = true;
--- a/chrome/browser/resources/settings/performance_page/memory_page.html
+++ b/chrome/browser/resources/settings/performance_page/memory_page.html
@@ -7,7 +7,6 @@
pref="{{prefs.performance_tuning.high_efficiency_mode.state}}"
label="$i18n{memorySaverModeLabel}"
sub-label="$i18n{memorySaverModeDescription}"
- learn-more-url="$i18n{memorySaverLearnMoreUrl}"
numeric-unchecked-values="[[numericUncheckedValues_]]"
numeric-checked-value="[[numericCheckedValue_]]">
</settings-toggle-button>
--- a/chrome/browser/resources/settings/performance_page/performance_page.html
+++ b/chrome/browser/resources/settings/performance_page/performance_page.html
@@ -11,8 +11,6 @@
on-change="onDiscardRingChange_"
pref="{{prefs.performance_tuning.discard_ring_treatment.enabled}}"
label="$i18n{discardRingTreatmentEnabledLabel}"
- sub-label-with-link="
- $i18n{discardRingTreatmentEnabledDescriptionWithLearnLink}"
on-sub-label-link-clicked="onDiscardRingTreatmentLearnMoreLinkClick_">
</settings-toggle-button>
<cr-link-row
--- a/chrome/browser/resources/settings/performance_page/speed_page.html
+++ b/chrome/browser/resources/settings/performance_page/speed_page.html
@@ -15,7 +15,6 @@
pref="{{prefs.net.network_prediction_options}}"
label="$i18n{preloadingPageTitle}"
sub-label="$i18n{preloadingToggleSummary}"
- learn-more-url="$i18n{preloadingLearnMoreUrl}"
numeric-unchecked-values="[[numericUncheckedValues_]]"
numeric-checked-value="[[networkPredictionOptionsEnum_.STANDARD]]"
on-change="onPreloadingStateChange_">
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
@@ -24,7 +24,7 @@
@@ -318,7 +352,7 @@
on-click="onClearBrowsingDataClick_"></cr-link-row>
- <template is="dom-if" if="[[isPrivacyGuideAvailable]]">
- <cr-link-row id="privacyGuideLinkRow" class="hr"
- start-icon="settings20:wind-rose"
- start-icon="privacy20:signpost"
- label="$i18n{privacyGuideLabel}"
- sub-label="$i18n{privacyGuideSublabel}"
- on-click="onPrivacyGuideClick_"
@@ -330,7 +364,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
@@ -213,9 +213,3 @@
@@ -243,9 +243,3 @@
</cr-link-row>
</if>
@@ -362,7 +396,7 @@
<slot name="subpage-title-extra"></slot>
- <template is="dom-if" if="[[learnMoreUrl]]">
+ <template is="dom-if" if="[[false]]">
<cr-icon-button iron-icon="cr:help-outline" dir="ltr"
<cr-icon-button iron-icon="cr:help-outline" suppress-rtl-flip
aria-label="[[getLearnMoreAriaLabel_(pageTitle)]]"
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
--- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
@@ -377,7 +411,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -909,16 +909,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -918,16 +918,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -412,7 +446,7 @@
chrome::BookmarkFolderIconType::kNormal, ui::kColorMenuIcon);
--- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
+++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
@@ -217,14 +217,7 @@ void CookieControlsContentView::SetEnfor
@@ -213,14 +213,7 @@ void CookieControlsContentView::SetEnfor
}
void CookieControlsContentView::SetFeedbackSectionVisibility(bool visible) {
@@ -437,7 +471,7 @@
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession())
return gfx::ImageSkia();
@@ -567,12 +568,6 @@ void ProfileMenuView::BuildIdentity() {
@@ -565,12 +566,6 @@ void ProfileMenuView::BuildIdentity() {
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
std::string profile_user_display_name, profile_user_email;
@@ -487,7 +521,7 @@
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -637,17 +637,6 @@ void MaybeRegisterChromeFeaturePromos(
@@ -651,17 +651,6 @@ void MaybeRegisterChromeFeaturePromos(
"Triggered to encourage users to try out the reading "
"mode feature.")));
@@ -507,7 +541,7 @@
registry.RegisterFeature(std::move(
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3380,7 +3380,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3397,7 +3397,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -518,7 +552,7 @@
html_source->AddBoolean(
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -912,7 +912,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
@@ -922,7 +922,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
#endif
// Enables the Live Caption feature on supported devices.
@@ -529,7 +563,7 @@
// getDisplayMedia captures. Note: This flag does not control if the "Share this
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -837,7 +837,7 @@ void MenuItemView::SetAlerted() {
@@ -845,7 +845,7 @@ void MenuItemView::SetAlerted() {
}
bool MenuItemView::ShouldShowNewBadge() const {

18
patches/upstream-fixes/missing-dependencies.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -942,6 +942,7 @@ source_set("extensions") {
@@ -933,6 +933,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
@@ -18,9 +18,19 @@
#include <optional>
#include <utility>
#include <vector>
--- a/chrome/browser/ui/lens/lens_overlay_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_controller.cc
@@ -11,6 +11,7 @@
#include "base/system/sys_info.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
+#include "base/task/thread_pool.h"
#include "chrome/browser/feedback/show_feedback_page.h"
#include "chrome/browser/lens/core/mojom/geometry.mojom.h"
#include "chrome/browser/lens/core/mojom/overlay_object.mojom.h"
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -605,6 +605,7 @@ static_library("url_constants") {
@@ -556,6 +556,7 @@ static_library("url_constants") {
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
"//components/password_manager/content/common",
"//components/safe_browsing/core/common",
@@ -30,7 +40,7 @@
}
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -88,6 +88,7 @@ source_set("browser") {
@@ -91,6 +91,7 @@ source_set("browser") {
"//cc/animation",
"//cc/mojo_embedder",
"//cc/paint",
@@ -38,7 +48,7 @@
"//components/attribution_reporting:data_host_mojom",
"//components/attribution_reporting:mojom",
"//components/back_forward_cache:enum",
@@ -100,6 +101,7 @@ source_set("browser") {
@@ -103,6 +104,7 @@ source_set("browser") {
"//components/file_access",
"//components/filename_generation",
"//components/input",

69
pruning.list
View File

@@ -332,10 +332,10 @@ components/test/data/web_package/24_responses.wbn
components/test/data/web_package/hello_b2.wbn
components/test/data/web_package/mixed_absolute_relative_urls.wbn
components/test/data/web_package/simple_b2.wbn
components/test/data/web_package/simple_b2_signed.swbn
components/test/data/web_package/simple_b2_signed_ecdsa_p256_sha256.swbn
components/test/data/web_package/simple_b2_signed_tampered.swbn
components/test/data/web_package/simple_b2_signed_v2.swbn
components/test/data/web_package/simple_b2_signed_v2_ecdsa_p256.swbn
components/test/data/web_package/simple_b2_signed_v2_ed25519.swbn
components/test/data/web_package/simple_b2_signed_v2_tampered.swbn
components/test/data/webp_transcode/test_small.tiff
components/zucchini/fuzzers/testdata/imposed_ensemble_matcher_fuzzer/seed.asciipb
components/zucchini/fuzzers/testdata/new_eventlog_provider.dll
@@ -55790,6 +55790,7 @@ third_party/afl/src/testcases/images/jxr/not_kitty.jxr
third_party/afl/src/testcases/images/tiff/not_kitty.tiff
third_party/afl/src/testcases/multimedia/h264/small_movie.mp4
third_party/afl/src/testcases/others/pcap/small_capture.pcap
third_party/android_build_tools/gradle_wrapper/gradle/wrapper/gradle-wrapper.jar
third_party/android_build_tools/lint/custom_lint.jar
third_party/angle/samples/multi_texture/basemap.tga
third_party/angle/samples/multi_texture/lightmap.tga
@@ -60394,8 +60395,6 @@ third_party/catapult/telemetry/telemetry/internal/testing/bear.webm
third_party/catapult/telemetry/telemetry/internal/testing/jebgalgnebhfojomionfpkfelancnnkf.crx
third_party/catapult/telemetry/telemetry/internal/testing/screen_3_frames.mov
third_party/catapult/telemetry/telemetry/internal/testing/vid.mp4
third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/_api_implementation.so
third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/pyext/_message.so
third_party/catapult/third_party/gsutil/gslib/tests/test_data/favicon.ico.gz
third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.p12
third_party/catapult/third_party/gsutil/gslib/vendored/oauth2client/tests/data/key.json.enc
@@ -61199,6 +61198,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lant
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/progressive-app/trace.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/redirect/trace.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/render-blocking/trace.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/typescript-angular/trace.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-layout-small-recalc.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-profile.cpuprofile.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-recalc-style.json.gz
@@ -61223,6 +61223,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/netw
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/node-fibonacci-website.cpuprofile.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/non-composited-animation.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/one-second-interaction.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/over-20-invalidations-per-event.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/parser-blocking-after-paint.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/postmessage-initiators.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/primary-page-frame.json.gz
@@ -61236,6 +61237,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/relo
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/render-blocking-body.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/render-blocking-in-iframe.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/selector-stats.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/server-timings.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/set-timeout-long-task.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/simple-js-program.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/slow-interaction-button-click.json.gz
@@ -61620,7 +61622,6 @@ third_party/glslang/src/Test/remap.invalid-spirv-2.spv
third_party/glslang/src/Test/remap.literal64.everything.spv
third_party/glslang/src/Test/remap.literal64.none.spv
third_party/google-closure-library/scripts/ci/CloseAdobeDialog.exe
third_party/gradle_wrapper/gradle/wrapper/gradle-wrapper.jar
third_party/grpc/src/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar
third_party/grpc/src/examples/php/GPBMetadata/Helloworld.php
third_party/grpc/src/examples/php/route_guide/GPBMetadata/RouteGuide.php
@@ -67376,6 +67377,7 @@ third_party/pdfium/testing/resources/gray.jp2
third_party/pdfium/testing/resources/hint_table_102p.bin
third_party/pdfium/testing/resources/pixel/bug_1236805.in
third_party/pdfium/testing/resources/pixel/bug_1388_2.in
third_party/pdfium/testing/resources/pixel/bug_358039783.in
third_party/pdfium/testing/resources/pixel/bug_527174.in
third_party/pdfium/testing/resources/pixel/bug_591137.in
third_party/pdfium/testing/resources/pixel/xfa_specific/bug_1258_1.in
@@ -67448,18 +67450,21 @@ third_party/quic_trace/src/examples/example.json.gz
third_party/quic_trace/src/examples/example.qtr
third_party/r8/custom_d8.jar
third_party/r8/custom_r8.jar
third_party/rust/chromium_crates_io/vendor/cxx-1.0.124/.cache/clangd/index/cxx.h.8C3971A07B37C20E.idx
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/testdata/fowler/dat/basic.dat
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/crash-cd33b13df59ea9d74503986f9d32a270dd43cc04
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/minimized-from-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/slow-unit-3ab758ea520027fefd3f00e1384d9aeef155739e
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/slow-unit-5345fccadf3812c53c3ccc7af5aa2741b7b2106c
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/slow-unit-6bd643eec330166e4ada91da2d3f284268481085
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/slow-unit-93c73a43581f205f9aaffd9c17e52b34b17becd0
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/slow-unit-9ca9cc9929fee1fcbb847a78384effb8b98ea18a
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/slow-unit-b8a052f4254802edbe5f569b6ce6e9b6c927e9d6
third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/examples/hello_world.txt.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/corrupt-gz-file.bin
third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/good-file.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/multi.gz
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/testdata/fowler/dat/basic.dat
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-cd33b13df59ea9d74503986f9d32a270dd43cc04
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/minimized-from-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-3ab758ea520027fefd3f00e1384d9aeef155739e
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-5345fccadf3812c53c3ccc7af5aa2741b7b2106c
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-6bd643eec330166e4ada91da2d3f284268481085
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-93c73a43581f205f9aaffd9c17e52b34b17becd0
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-9ca9cc9929fee1fcbb847a78384effb8b98ea18a
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-b8a052f4254802edbe5f569b6ce6e9b6c927e9d6
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_dense_crash-9486fb7c8a93b12c12a62166b43d31640c0208a9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_dense_minimized-from-9486fb7c8a93b12c12a62166b43d31640c0208a9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_sparse_crash-0da59c0434eaf35e5a6b470fa9244bb79c72b000
@@ -68103,6 +68108,9 @@ third_party/tflite/src/tensorflow/core/util/tensor_bundle/testdata/old_string_te
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/saved_model.pb
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/variables/variables.index
third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_gqa.tflite.bin
third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_mha.tflite.bin
third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_mqa.tflite.bin
third_party/tflite/src/tensorflow/lite/experimental/acceleration/compatibility/gpu_compatibility.bin
third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/data/chair_224_224_3.jpeg
third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/data/city_224_224_3.jpeg
@@ -68952,31 +68960,6 @@ tools/origin_trials/eftest.key
tools/origin_trials/eftest2.key
tools/win/ChromeDebug/ChromeDebug/Key.snk
tools/win/ChromeDebug/LowLevel/Key.snk
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/alert_modal.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/alert_nonmodal.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/button.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/check_off.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/check_on.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/editable_text.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/invalid_keypress.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/link.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/list_item.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/listbox.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/long_desc.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/math.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_close.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_enter.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_exit.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_open.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_select.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/page_finish_loading.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/page_start_loading.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/recover_focus.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/selection.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/selection_reverse.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/skip.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/wrap.ogg
ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/wrap_edge.ogg
ui/accessibility/fuzz_corpus/ax_table_fuzzer_seed.bin
ui/display/util/fuzz_corpus/eve
ui/display/util/fuzz_corpus/hdr