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 133.0.6943.53

Browse Source
This commit is contained in:
Blaise
2025-01-28 11:24:46 -06:00
parent fc1a6e889f
commit e9d134265c
86 changed files with 3421 additions and 2467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
132.0.6834.159
133.0.6943.53

927
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

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

98
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
@@ -2247,7 +2247,6 @@ static_library("browser") {
@@ -2231,7 +2231,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/notification_content_detection",
"//components/safe_browsing/content/browser/password_protection",
@@ -3615,8 +3614,6 @@ static_library("browser") {
@@ -3581,8 +3580,6 @@ static_library("browser") {
"download/download_commands.cc",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -50,7 +50,7 @@
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -479,8 +478,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -476,8 +475,6 @@ void BrowserProcessImpl::StartTearDown()
#endif
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@@ -1162,14 +1159,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1159,14 +1156,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -74,7 +74,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1474,26 +1463,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1468,26 +1457,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -123,7 +123,7 @@
subresource_filter_ruleset_service_;
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -73,7 +73,6 @@
@@ -70,7 +70,6 @@
#include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/reading_list/reading_list_model_factory.h"
@@ -131,7 +131,7 @@
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engine_choice/search_engine_choice_service_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -662,10 +661,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -660,10 +659,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
@@ -5518,10 +5518,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5391,10 +5391,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),
@@ -5576,16 +5572,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5449,16 +5445,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>(
@@ -5898,8 +5884,6 @@ bool ChromeContentBrowserClient::IsPlugi
@@ -5754,8 +5740,6 @@ bool ChromeContentBrowserClient::IsPlugi
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -207,7 +207,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -531,13 +531,6 @@ void ChromeDownloadManagerDelegate::SetD
@@ -530,13 +530,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
@@ -221,7 +221,7 @@
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -1060,17 +1053,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -1058,17 +1051,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
@@ -250,7 +250,7 @@
// Whether the download is currently being revived.
bool is_being_revived_ = false;
@@ -498,13 +498,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -502,13 +502,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -267,7 +267,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -707,9 +707,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -711,9 +711,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -279,7 +279,7 @@
return !download_->IsSavePackageDownload() &&
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -258,14 +258,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
@@ -256,14 +256,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
@@ -295,7 +295,7 @@
}
}
@@ -443,10 +436,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -441,10 +434,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -402,9 +402,9 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1376,9 +1375,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1378,9 +1377,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() = default;
-DownloadsAcceptDangerFunction::OnPromptCreatedCallback*
- DownloadsAcceptDangerFunction::on_prompt_created_ = nullptr;
@@ -412,7 +412,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1416,42 +1412,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1418,42 +1414,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -455,7 +455,7 @@
+ download_item->ValidateDangerousDownload();
}
DownloadsShowFunction::DownloadsShowFunction() {}
DownloadsShowFunction::DownloadsShowFunction() = default;
--- a/chrome/browser/extensions/api/downloads/downloads_api.h
+++ b/chrome/browser/extensions/api/downloads/downloads_api.h
@@ -13,7 +13,6 @@
@@ -557,7 +557,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1203,54 +1191,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1205,54 +1193,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -742,7 +742,7 @@
if (is_android) {
deps += [
@@ -548,6 +550,7 @@ static_library("advanced_protection") {
@@ -547,6 +549,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -750,7 +750,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -567,6 +570,7 @@ source_set("metrics_collector") {
@@ -566,6 +569,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -853,19 +853,9 @@
- }
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4014,7 +4014,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h",
- "views/download/download_danger_prompt_views.cc",
"views/download/download_in_progress_dialog_view.cc",
"views/download/download_in_progress_dialog_view.h",
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -507,37 +507,8 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -493,37 +493,8 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -903,6 +893,16 @@
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
SearchEngineTabHelper::CreateForWebContents(web_contents);
if (site_engagement::SiteEngagementService::IsEnabled()) {
--- a/chrome/browser/ui/views/download/BUILD.gn
+++ b/chrome/browser/ui/views/download/BUILD.gn
@@ -24,7 +24,6 @@ source_set("download") {
"bubble/download_bubble_started_animation_views.h",
"bubble/download_dialog_view.cc",
"bubble/download_dialog_view.h",
- "download_danger_prompt_views.cc",
"download_in_progress_dialog_view.cc",
"download_in_progress_dialog_view.h",
"download_item_view.cc",
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -25,7 +25,6 @@
@@ -938,7 +938,7 @@
#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
@@ -289,64 +289,6 @@ CreateHttpsOnlyModePage(content::WebCont
@@ -292,65 +292,6 @@ CreateHttpsOnlyModePage(content::WebCont
/*use_new_interstitial=*/IsNewHttpsFirstModeInterstitialEnabled());
}
@@ -976,8 +976,9 @@
- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
- resource.url = request_url;
- resource.threat_type = threat_type;
- resource.render_process_id = primary_main_frame_id.child_id;
- resource.render_frame_token = primary_main_frame->GetFrameToken().value();
- resource.rfh_locator = UnsafeResourceLocator::CreateForRenderFrameToken(
- primary_main_frame_id.child_id,
- primary_main_frame->GetFrameToken().value());
- resource.threat_source =
- g_browser_process->safe_browsing_service()
- ->database_manager()
@@ -1003,7 +1004,7 @@
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
content::WebContents* web_contents) {
const GURL kRequestUrl("https://enterprise-block.example.net");
@@ -366,35 +308,6 @@ std::unique_ptr<ManagedProfileRequiredPa
@@ -370,36 +311,6 @@ std::unique_ptr<ManagedProfileRequiredPa
kRequestUrl));
}
@@ -1021,8 +1022,9 @@
- resource.url = kRequestUrl;
- resource.threat_type =
- safe_browsing::SBThreatType::SB_THREAT_TYPE_MANAGED_POLICY_WARN;
- resource.render_process_id = primary_main_frame_id.child_id;
- resource.render_frame_token = primary_main_frame->GetFrameToken().value();
- resource.rfh_locator = UnsafeResourceLocator::CreateForRenderFrameToken(
- primary_main_frame_id.child_id,
- primary_main_frame->GetFrameToken().value());
- resource.threat_source =
- g_browser_process->safe_browsing_service()
- ->database_manager()
@@ -1039,7 +1041,7 @@
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
std::unique_ptr<SupervisedUserVerificationPageForYouTube>
CreateSupervisedUserVerificationPageForYouTube(
@@ -431,61 +344,6 @@ CreateSupervisedUserVerificationPageForB
@@ -436,63 +347,6 @@ CreateSupervisedUserVerificationPageForB
}
#endif
@@ -1051,8 +1053,9 @@
- std::string url_param;
- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url",
- &url_param)) {
- if (GURL(url_param).is_valid())
- if (GURL(url_param).is_valid()) {
- request_url = GURL(url_param);
- }
- }
- std::string type_param;
- bool is_giant_webview = false;
@@ -1077,8 +1080,9 @@
- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
- resource.url = request_url;
- resource.threat_type = threat_type;
- resource.render_process_id = primary_main_frame_id.child_id;
- resource.render_frame_token = primary_main_frame->GetFrameToken().value();
- resource.rfh_locator = UnsafeResourceLocator::CreateForRenderFrameToken(
- primary_main_frame_id.child_id,
- primary_main_frame->GetFrameToken().value());
- resource.threat_source =
- g_browser_process->safe_browsing_service()
- ->database_manager()
@@ -1101,7 +1105,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -592,12 +450,8 @@ void InterstitialHTMLSource::StartDataRe
@@ -601,12 +455,8 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1114,7 +1118,7 @@
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -629,12 +483,7 @@ void InterstitialHTMLSource::StartDataRe
@@ -638,12 +488,7 @@ void InterstitialHTMLSource::StartDataRe
#endif
}
@@ -1138,7 +1142,7 @@
#include "components/sampling_profiler/process_type.h"
#include "components/sampling_profiler/thread_profiler.h"
#include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
@@ -480,12 +479,8 @@ void ChromeContentRendererClient::Render
@@ -477,12 +476,8 @@ void ChromeContentRendererClient::Render
thread->AddObserver(fingerprinting_protection_ruleset_dealer_.get());
}

2
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
@@ -893,93 +893,6 @@ std::tuple<GURL, std::string> AutofillCr
@@ -874,93 +874,6 @@ std::tuple<GURL, std::string> AutofillCr
}
bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {

2
patches/core/inox-patchset/0005-disable-default-extensions.patch
View File

@@ -10,7 +10,7 @@
extension_misc::kAssessmentAssistantExtensionId,
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -409,11 +409,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -414,11 +414,6 @@ void ComponentLoader::AddWebStoreApp() {
return;
}
#endif

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

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

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

@@ -156,7 +156,7 @@ by default.
--- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc
@@ -192,7 +192,7 @@ const int64_t DownloadFeedback::kMaxUplo
@@ -178,7 +178,7 @@ const int64_t DownloadFeedback::kMaxUplo
// static
const char DownloadFeedback::kSbFeedbackURL[] =
@@ -274,7 +274,7 @@ by default.
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -145,7 +145,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -151,7 +151,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
// Global functions -----------------------------------------------------------
@@ -304,7 +304,7 @@ by default.
"https://history.google.com/history/api/lookup?client=audio";
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -68,7 +68,7 @@ const int ClientSideDetectionService::kN
@@ -70,7 +70,7 @@ const int ClientSideDetectionService::kN
const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
const char ClientSideDetectionService::kClientReportPhishingUrl[] =
@@ -337,7 +337,7 @@ by default.
base::Value::Dict dict;
--- a/components/translate/core/browser/translate_url_fetcher.cc
+++ b/components/translate/core/browser/translate_url_fetcher.cc
@@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const
@@ -98,6 +98,7 @@ bool TranslateURLFetcher::Request(const
if (!extra_request_header_.empty())
resource_request->headers.AddHeaderFromString(extra_request_header_);
@@ -394,7 +394,7 @@ by default.
WebAuthRequestSecurityChecker(const WebAuthRequestSecurityChecker&) = delete;
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -91,7 +91,7 @@ GURL GetStartupURL() {
@@ -85,7 +85,7 @@ GURL GetStartupURL() {
#else
const base::CommandLine::StringVector& args = command_line->GetArgs();
if (args.empty())
@@ -638,7 +638,7 @@ by default.
const char kFeedOAuth2Scope[] = "https://www.googleapis.com/auth/googlenow";
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -24,6 +24,7 @@
@@ -25,6 +25,7 @@
namespace {
// Gaia service constants

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
@@ -306,11 +306,14 @@ IncidentReportingService::UploadContext:
@@ -304,11 +304,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
@@ -382,7 +382,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -383,7 +383,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingServiceImpl::RegisterAllDelayedAnalysis() {

4
patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
View File

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

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

@@ -8,7 +8,7 @@
# Dev tools attempts to download css data
--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
@@ -289,6 +289,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
@@ -290,6 +290,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
@@ -28,7 +28,7 @@
// via the feature params.
--- a/chrome/browser/search/background/ntp_background_service.cc
+++ b/chrome/browser/search/background/ntp_background_service.cc
@@ -97,6 +97,7 @@ void NtpBackgroundService::Shutdown() {
@@ -96,6 +96,7 @@ void NtpBackgroundService::Shutdown() {
}
void NtpBackgroundService::FetchCollectionInfo() {

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

@@ -23,7 +23,7 @@
url.SchemeIs(dom_distiller::kDomDistillerScheme))
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -123,7 +123,8 @@ int GetIndexOfExistingTab(Browser* brows
@@ -124,7 +124,8 @@ int GetIndexOfExistingTab(Browser* brows
// RewriteURLIfNecessary removes the "view-source:" scheme which could lead
// to incorrect matching, so ensure that the target and the candidate are
// either both view-source:, or neither is.
@@ -35,7 +35,7 @@
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -572,7 +572,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -568,7 +568,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
@@ -580,6 +580,10 @@ GURL FixupURLInternal(const std::string&
@@ -607,6 +607,10 @@ GURL FixupURLInternal(const std::string&
}
}
@@ -56,7 +56,7 @@
+ }
+
// We handle the file scheme separately.
if (scheme == url::kFileScheme)
if (scheme == url::kFileScheme) {
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -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
@@ -1054,6 +1054,8 @@ component("net") {
@@ -1065,6 +1065,8 @@ component("net") {
"url_request/referrer_policy.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",

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
@@ -2737,24 +2737,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2702,24 +2702,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
@@ -69,6 +69,12 @@ void InitializeDatabasePath(const base::
@@ -68,6 +68,12 @@ void InitializeDatabasePath(const base::
}
bool InitializeCrashpadImpl(bool initial_client,

1003
patches/core/ungoogled-chromium/disable-domain-reliability.patch
View File

File diff suppressed because it is too large Load Diff

5
patches/core/ungoogled-chromium/disable-gaia.patch
View File

@@ -3,7 +3,7 @@
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -294,61 +294,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -251,62 +251,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
network::mojom::CredentialsMode credentials_mode,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -61,7 +61,8 @@
- url_loader_factory_.get(),
- base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete,
- base::Unretained(this)),
- kMaxMessageSize);
- // Limit to 1 MiB.
- 1024 * 1024);
}
// static

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
@@ -451,6 +451,7 @@ void GCMClientImpl::StartGCM() {
@@ -449,6 +449,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();
@@ -655,28 +656,6 @@ void GCMClientImpl::RemoveHeartbeatInter
@@ -653,28 +654,6 @@ void GCMClientImpl::RemoveHeartbeatInter
void GCMClientImpl::StartCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -39,7 +39,7 @@
}
void GCMClientImpl::OnCheckinCompleted(
@@ -733,24 +712,6 @@ void GCMClientImpl::SetGServicesSettings
@@ -731,24 +710,6 @@ void GCMClientImpl::SetGServicesSettings
void GCMClientImpl::SchedulePeriodicCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());

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

@@ -197,7 +197,7 @@
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -36,111 +36,6 @@ namespace google_util {
@@ -36,117 +36,6 @@ namespace google_util {
namespace {
@@ -207,8 +207,9 @@
-
-// Removes a single trailing dot if present in |host|.
-void StripTrailingDot(std::string_view* host) {
- if (base::EndsWith(*host, "."))
- if (base::EndsWith(*host, ".")) {
- host->remove_suffix(1);
- }
-}
-
-// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
@@ -229,8 +230,9 @@
- net::registry_controlled_domains::GetCanonicalHostRegistryLength(
- host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
- net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
- if ((tld_length == 0) || (tld_length == std::string::npos))
- if ((tld_length == 0) || (tld_length == std::string::npos)) {
- return false;
- }
-
- // Removes the tld and the preceding dot.
- std::string_view host_minus_tld =
@@ -240,11 +242,13 @@
- // Remove the trailing dot from tld if present, as for Google domains it's the
- // same page.
- StripTrailingDot(&tld);
- if (!allowed_tlds.contains(tld))
- if (!allowed_tlds.contains(tld)) {
- return false;
- }
-
- if (base::EqualsCaseInsensitiveASCII(host_minus_tld, domain_in_lower_case))
- if (base::EqualsCaseInsensitiveASCII(host_minus_tld, domain_in_lower_case)) {
- return true;
- }
-
- if (subdomain_permission == ALLOW_SUBDOMAIN) {
- std::string dot_domain = base::StrCat({".", domain_in_lower_case});
@@ -271,8 +275,9 @@
-bool IsCanonicalHostGoogleHostname(std::string_view canonical_host,
- SubdomainPermission subdomain_permission) {
- const GURL& base_url(CommandLineGoogleBaseURL());
- if (base_url.is_valid() && (canonical_host == base_url.host_piece()))
- if (base_url.is_valid() && (canonical_host == base_url.host_piece())) {
- return true;
- }
-
- static constexpr auto google_tlds =
- base::MakeFixedFlatSet<std::string_view>({GOOGLE_TLD_LIST});
@@ -293,8 +298,9 @@
-// Google subdomains for google search, and an HTTP or HTTPS scheme. Requires
-// |url| to use the standard port for its scheme (80 for HTTP, 443 for HTTPS).
-bool IsGoogleSearchSubdomainUrl(const GURL& url) {
- if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS))
- if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS)) {
- return false;
- }
-
- std::string_view host(url.host_piece());
- StripTrailingDot(&host);
@@ -309,20 +315,21 @@
} // namespace
// Global functions -----------------------------------------------------------
@@ -148,12 +43,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -154,13 +43,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
bool HasGoogleSearchQueryParam(std::string_view str) {
- url::Component query(0, static_cast<int>(str.length())), key, value;
- while (url::ExtractQueryKeyValue(str, &query, &key, &value)) {
- std::string_view key_str = str.substr(key.begin, key.len);
- if (key_str == "q" || key_str == "as_q" || key_str == "imgurl")
- if (key_str == "q" || key_str == "as_q" || key_str == "imgurl") {
- return true;
- }
- }
return false;
}
@@ -164,162 +53,53 @@ std::string GetGoogleLocale(const std::s
@@ -171,170 +53,53 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
@@ -336,20 +343,24 @@
- // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
- // like "google.com./". https://crbug.com/720295.
- const size_t last_dot = google_hostname.find_last_of('.');
- if (last_dot == std::string::npos)
- if (last_dot == std::string::npos) {
- return std::string();
- }
- std::string_view country_code = google_hostname.substr(last_dot + 1);
- // Assume the com TLD implies the US.
- if (country_code == "com")
- if (country_code == "com") {
- return "us";
- }
- // Google uses the Unicode Common Locale Data Repository (CLDR), and the CLDR
- // code for the UK is "gb".
- if (country_code == "uk")
- if (country_code == "uk") {
- return "gb";
- }
- // Catalonia does not have a CLDR country code, since it's a region in Spain,
- // so use Spain instead.
- if (country_code == "cat")
- if (country_code == "cat") {
- return "es";
- }
- return std::string(country_code);
+ return "nolocale";
}
@@ -376,8 +387,9 @@
- if (current_switch_value != *switch_value) {
- *switch_value = current_switch_value;
- *base_url = url_formatter::FixupURL(*switch_value, std::string());
- if (!base_url->is_valid() || base_url->has_query() || base_url->has_ref())
- if (!base_url->is_valid() || base_url->has_query() || base_url->has_ref()) {
- *base_url = GURL();
- }
- }
+ *base_url = GURL();
return *base_url;
@@ -433,8 +445,9 @@
- // Make sure the path is a known search path.
- std::string_view path(url.path_piece());
- bool is_home_page_base = IsPathHomePageBase(path);
- if (!is_home_page_base && path != "/search" && path != "/imgres")
- if (!is_home_page_base && path != "/search" && path != "/imgres") {
- return false;
- }
-
- // Check for query parameter in URL parameter and hash fragment, depending on
- // the path type.
@@ -452,11 +465,13 @@
}
bool IsGoogleAssociatedDomainUrl(const GURL& url) {
- if (IsGoogleDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS))
- if (IsGoogleDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS)) {
- return true;
- }
-
- if (IsYoutubeDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS))
- if (IsYoutubeDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS)) {
- return true;
- }
-
- // Some domains don't have international TLD extensions, so testing for them
- // is very straightforward.
@@ -476,9 +491,8 @@
- ".ytimg.com",
- };
- const std::string host = url.host();
- for (size_t i = 0; i < std::size(kSuffixesToSetHeadersFor); ++i) {
- if (base::EndsWith(host, kSuffixesToSetHeadersFor[i],
- base::CompareCase::INSENSITIVE_ASCII)) {
- for (auto* i : kSuffixesToSetHeadersFor) {
- if (base::EndsWith(host, i, base::CompareCase::INSENSITIVE_ASCII)) {
- return true;
- }
- }
@@ -487,9 +501,10 @@
- static const char* kHostsToSetHeadersFor[] = {
- "googleweblight.com",
- };
- for (size_t i = 0; i < std::size(kHostsToSetHeadersFor); ++i) {
- if (base::EqualsCaseInsensitiveASCII(host, kHostsToSetHeadersFor[i]))
- for (auto* i : kHostsToSetHeadersFor) {
- if (base::EqualsCaseInsensitiveASCII(host, i)) {
- return true;
- }
- }
-
return false;
@@ -550,7 +565,7 @@
bool IsProbablyGoogleSearchUrl(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -612,11 +612,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -609,11 +609,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -565,7 +580,7 @@
bool TemplateURLRef::ExtractSearchTermsFromURL(
--- a/components/variations/net/variations_http_headers.cc
+++ b/components/variations/net/variations_http_headers.cc
@@ -33,10 +33,6 @@
@@ -31,10 +31,6 @@
namespace variations {
@@ -576,7 +591,7 @@
namespace {
// The result of checking whether a request to a URL should have variations
@@ -114,16 +110,6 @@ URLValidationResult GetUrlValidationResu
@@ -112,16 +108,6 @@ URLValidationResult GetUrlValidationResu
return URLValidationResult::kShouldAppend;
}
@@ -593,12 +608,10 @@
// Returns true if the request is sent from a Google web property, i.e. from a
// first-party context.
//
@@ -250,30 +236,7 @@ class VariationsHeaderHelper {
@@ -248,28 +234,7 @@ class VariationsHeaderHelper {
VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
- AppendOmniboxOnDeviceSuggestionsHeaderIfNeeded(url, resource_request_);
-
- // Note the criteria for attaching client experiment headers:
- // 1. We only transmit to Google owned domains which can evaluate
- // experiments.
@@ -625,7 +638,7 @@
}
private:
@@ -338,8 +301,6 @@ void RemoveVariationsHeaderIfNeeded(
@@ -334,8 +299,6 @@ void RemoveVariationsHeaderIfNeeded(
const net::RedirectInfo& redirect_info,
const network::mojom::URLResponseHead& response_head,
std::vector<std::string>* to_be_removed_headers) {
@@ -634,7 +647,7 @@
}
std::unique_ptr<network::SimpleURLLoader>
@@ -375,34 +336,22 @@ CreateSimpleURLLoaderWithVariationsHeade
@@ -371,29 +334,22 @@ CreateSimpleURLLoaderWithVariationsHeade
}
bool HasVariationsHeader(const network::ResourceRequest& request) {
@@ -664,11 +677,6 @@
void UpdateCorsExemptHeaderForVariations(
network::mojom::NetworkContextParams* params) {
- params->cors_exempt_header_list.push_back(kClientDataHeader);
-
- if (base::FeatureList::IsEnabled(kReportOmniboxOnDeviceSuggestionsHeader)) {
- params->cors_exempt_header_list.push_back(
- kOmniboxOnDeviceSuggestionsHeader);
- }
}
} // namespace variations

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

@@ -7,25 +7,25 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -371,7 +371,6 @@ if (!is_android && !is_mac) {
@@ -372,7 +372,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
- "//chrome/browser/resources/media/mei_preload:component",
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -1210,7 +1209,6 @@ if (is_win) {
@@ -1212,7 +1211,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_binaries",
":widevine_cdm_library",
- "//chrome/browser/resources/media/mei_preload:component_bundle",
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle",
]
if (is_chrome_branded) {
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -94,11 +94,6 @@ group("resources") {
@@ -90,11 +90,6 @@ group("resources") {
public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
}

19
patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
View File

@@ -7,8 +7,8 @@
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kAttributionAggregatableDebugReporting,
"AttributionAggregatableDebugReporting",
BASE_FEATURE(kAttributionAggregatableNamedBudgets,
"AttributionAggregatableNamedBudgets",
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -131,7 +131,7 @@ std::set<browsing_topics::Topic> GetTopi
@@ -20,7 +20,7 @@
}
// static
@@ -853,7 +853,7 @@ void PrivacySandboxSettingsImpl::SetTopi
@@ -851,7 +851,7 @@ void PrivacySandboxSettingsImpl::SetTopi
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -29,7 +29,7 @@
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
@@ -939,11 +939,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
@@ -937,11 +937,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
return Status::kIncognitoProfile;
}
@@ -41,14 +41,3 @@
}
PrivacySandboxSettingsImpl::Status
--- a/content/browser/aggregation_service/aggregation_service_features.cc
+++ b/content/browser/aggregation_service/aggregation_service_features.cc
@@ -8,7 +8,7 @@ namespace content {
BASE_FEATURE(kPrivacySandboxAggregationService,
"PrivacySandboxAggregationService",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kPrivacySandboxAggregationServiceFilteringIds,
"PrivacySandboxAggregationServiceFilteringIds",

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

@@ -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
@@ -114,7 +114,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

15
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
@@ -675,12 +675,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -677,12 +677,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
@@ -307,17 +307,7 @@ bool ChromeContentVerifierDelegate::IsFr
@@ -305,17 +305,7 @@ bool ChromeContentVerifierDelegate::IsFr
// between which extensions are considered in-store.
// See https://crbug.com/766806 for details.
if (!InstallVerifier::IsFromStore(extension, context_)) {
@@ -175,3 +175,14 @@
return true;
case ExtensionFetch::CREDENTIALS_OAUTH2_TOKEN:
fetch->oauth2_attempt_count++;
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -67,8 +67,6 @@ GURL AppendUtmSource(const GURL& url, st
GURL GetWebstoreExtensionsCategoryURL() {
GURL base_url = GetNewWebstoreLaunchURL();
- CHECK_EQ(base_url.path_piece(), "/")
- << "GURL::Resolve() won't work with a URL with a path.";
return base_url.Resolve("category/extensions");
}

64
patches/core/ungoogled-chromium/doh-changes.patch
View File

@@ -22,40 +22,40 @@
--- a/net/dns/public/doh_provider_entry.cc
+++ b/net/dns/public/doh_provider_entry.cc
@@ -166,30 +166,6 @@ const DohProviderEntry::List& DohProvide
/*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
LoggingLevel::kNormal),
new DohProviderEntry(
- "Google",
- MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(
- DohProviderGoogle, base::FEATURE_ENABLED_BY_DEFAULT),
- {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888",
- "2001:4860:4860::8844"},
- /*dns_over_tls_hostnames=*/
- {"dns.google", "dns.google.com", "8888.google"},
- "https://dns.google/dns-query{?dns}",
- /*ui_name=*/"Google (Public DNS)",
- "https://developers.google.com/speed/public-dns/"
- /*privacy_policy=*/"privacy",
- /*display_globally=*/true, /*display_countries=*/{},
- LoggingLevel::kExtra),
- new DohProviderEntry(
- "GoogleDns64",
- MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(
- DohProviderGoogleDns64, base::FEATURE_ENABLED_BY_DEFAULT),
- {"2001:4860:4860::64", "2001:4860:4860::6464"},
- /*dns_over_tls_hostnames=*/{"dns64.dns.google"},
- "https://dns64.dns.google/dns-query{?dns}",
- /*ui_name=*/"", /*privacy_policy=*/"",
- /*display_globally=*/false,
- /*display_countries=*/{}, LoggingLevel::kNormal),
- new DohProviderEntry(
"Iij",
MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(
DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT),
@@ -171,30 +171,6 @@ const DohProviderEntry::List& DohProvide
/*display_globally=*/false,
/*display_countries=*/{"EE", "DE"},
LoggingLevel::kNormal},
- {"Google",
- MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderGoogle,
- base::FEATURE_ENABLED_BY_DEFAULT),
- {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"},
- /*dns_over_tls_hostnames=*/
- {"dns.google", "dns.google.com", "8888.google"},
- "https://dns.google/dns-query{?dns}",
- /*ui_name=*/"Google (Public DNS)",
- "https://developers.google.com/speed/public-dns/"
- /*privacy_policy=*/"privacy",
- /*display_globally=*/true,
- /*display_countries=*/{},
- LoggingLevel::kExtra},
- {"GoogleDns64",
- MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderGoogleDns64,
- base::FEATURE_ENABLED_BY_DEFAULT),
- {"2001:4860:4860::64", "2001:4860:4860::6464"},
- /*dns_over_tls_hostnames=*/{"dns64.dns.google"},
- "https://dns64.dns.google/dns-query{?dns}",
- /*ui_name=*/"",
- /*privacy_policy=*/"",
- /*display_globally=*/false,
- /*display_countries=*/{},
- LoggingLevel::kNormal},
{"Iij",
MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderIij,
base::FEATURE_ENABLED_BY_DEFAULT),
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -125,12 +125,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
@@ -124,12 +124,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
// Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
BASE_FEATURE(kDnsOverHttpsUpgrade,
"DnsOverHttpsUpgrade",

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

@@ -1,21 +1,23 @@
--- a/chrome/browser/extensions/chrome_browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/chrome_browser_context_keyed_service_factories.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
#include "chrome/browser/extensions/install_tracker_factory.h"
#include "chrome/browser/extensions/install_verifier_factory.h"
-#include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
#include "chrome/browser/extensions/menu_manager_factory.h"
#include "chrome/browser/extensions/permissions/permissions_updater.h"
#include "chrome/browser/extensions/plugin_manager.h"
@@ -43,7 +42,6 @@ void EnsureChromeBrowserContextKeyedServ
extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
extensions::InstallTrackerFactory::GetInstance();
extensions::InstallVerifierFactory::GetInstance();
- extensions::ManifestV2ExperimentManager::GetFactory();
extensions::MenuManagerFactory::GetInstance();
extensions::PermissionsUpdater::EnsureAssociatedFactoryBuilt();
#if BUILDFLAG(ENABLE_PLUGINS)
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -575,17 +575,6 @@ void ExtensionInfoGenerator::CreateExten
info->controlled_info.emplace();
info->controlled_info->text =
l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE);
- } else {
- // Create Safety Hub information for any non-enterprise extension.
- developer::SafetyCheckWarningReason warning_reason =
- ExtensionSafetyCheckUtils::GetSafetyCheckWarningReason(extension,
- profile);
- if (warning_reason != developer::SafetyCheckWarningReason::kNone) {
- info->safety_check_warning_reason = warning_reason;
- info->safety_check_text =
- ExtensionSafetyCheckUtils::GetSafetyCheckWarningStrings(
- warning_reason, state);
- }
}
bool is_enabled = state == developer::ExtensionState::kEnabled;
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -310,31 +310,7 @@ bool ExtensionManagement::IsAllowedManif
@@ -77,9 +79,27 @@
}
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
--- a/chrome/browser/extensions/keyed_services/chrome_browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/keyed_services/chrome_browser_context_keyed_service_factories.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
#include "chrome/browser/extensions/install_tracker_factory.h"
#include "chrome/browser/extensions/install_verifier_factory.h"
-#include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
#include "chrome/browser/extensions/menu_manager_factory.h"
#include "chrome/browser/extensions/permissions/permissions_updater.h"
#include "chrome/browser/extensions/plugin_manager.h"
@@ -43,7 +42,6 @@ void EnsureChromeBrowserContextKeyedServ
extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
extensions::InstallTrackerFactory::GetInstance();
extensions::InstallVerifierFactory::GetInstance();
- extensions::ManifestV2ExperimentManager::GetFactory();
extensions::MenuManagerFactory::GetInstance();
extensions::PermissionsUpdater::EnsureAssociatedFactoryBuilt();
#if BUILDFLAG(ENABLE_PLUGINS)
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
@@ -143,22 +143,6 @@ bool ManifestV2ExperimentManagerFactory:
@@ -144,22 +144,6 @@ bool ManifestV2ExperimentManagerFactory:
// Determines the current stage of the MV2 deprecation experiments.
MV2ExperimentStage CalculateCurrentExperimentStage() {
@@ -102,7 +122,7 @@
return MV2ExperimentStage::kNone;
}
@@ -198,19 +182,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
@@ -199,19 +183,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
// Returns true if legacy extensions should be disabled, looking at both
// experiment stage and global state.
bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) {
@@ -124,12 +144,9 @@
// Returns true if the given `stage` is one in which extension enablement should
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -471,9 +471,9 @@ content::WebUIDataSource* CreateAndAddEx
@@ -462,7 +462,7 @@ content::WebUIDataSource* CreateAndAddEx
base::FeatureList::IsEnabled(
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
source->AddBoolean(
"safetyCheckShowReviewPanel",
- base::FeatureList::IsEnabled(features::kSafetyCheckExtensions));
+ false);
source->AddBoolean("safetyHubShowReviewPanel",
- base::FeatureList::IsEnabled(features::kSafetyHub));
+ false);

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

@@ -3,15 +3,15 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -372,7 +372,6 @@ if (!is_android && !is_mac) {
@@ -374,7 +374,6 @@ if (!is_android && !is_mac) {
data_deps += [
"//chrome/browser/resources/media/mei_preload:component",
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component",
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -941,8 +940,6 @@ if (is_win) {
@@ -943,8 +942,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -20,17 +20,17 @@
# This image is used to badge the lock icon in the
# authentication dialogs, such as those used for installation
# from disk image and Keystone promotion (if so enabled). It
@@ -1214,7 +1211,6 @@ if (is_win) {
":swiftshader_binaries",
@@ -1217,7 +1214,6 @@ if (is_win) {
":widevine_cdm_library",
"//chrome/browser/resources/media/mei_preload:component_bundle",
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle",
- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component_bundle",
]
if (is_chrome_branded) {
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -760,10 +760,6 @@ static_library("browser") {
@@ -727,10 +727,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_metrics_document_data.h",
"navigation_predictor/navigation_predictor_preconnect_client.cc",
"navigation_predictor/navigation_predictor_preconnect_client.h",
@@ -41,7 +41,7 @@
"net/cert_verifier_service_time_updater.cc",
"net/cert_verifier_service_time_updater.h",
"net/chrome_mojo_proxy_resolver_factory.cc",
@@ -3465,10 +3461,6 @@ static_library("browser") {
@@ -3450,10 +3446,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
@@ -52,7 +52,7 @@
"accessibility/caption_bubble_context_browser.h",
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4201,10 +4193,6 @@ static_library("browser") {
@@ -4180,10 +4172,6 @@ static_library("browser") {
"//chrome/browser/new_tab_page/chrome_colors",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resources:component_extension_resources",
@@ -62,8 +62,8 @@
- "//chrome/browser/screen_ai/public:optical_character_recognizer",
"//chrome/browser/search/background",
"//chrome/browser/smart_card",
"//chrome/browser/task_manager",
@@ -4334,9 +4322,6 @@ static_library("browser") {
"//chrome/browser/themes",
@@ -4314,9 +4302,6 @@ static_library("browser") {
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/bluetooth",
"//services/device/public/cpp/hid",
@@ -73,7 +73,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4427,8 +4412,6 @@ static_library("browser") {
@@ -4411,8 +4396,6 @@ static_library("browser") {
#!is_android
if (!is_chromeos) {
sources += [
@@ -82,7 +82,7 @@
"device_notifications/device_status_icon_renderer.cc",
"device_notifications/device_status_icon_renderer.h",
"external_protocol/auto_launch_protocols_policy_handler.cc",
@@ -4445,8 +4428,6 @@ static_library("browser") {
@@ -4429,8 +4412,6 @@ static_library("browser") {
"policy/chrome_browser_cloud_management_register_watcher.h",
"policy/file_selection_dialogs_policy_handler.cc",
"policy/file_selection_dialogs_policy_handler.h",
@@ -91,15 +91,15 @@
"usb/usb_status_icon.cc",
"usb/usb_status_icon.h",
]
@@ -5191,7 +5172,6 @@ static_library("browser") {
"//chrome/browser/policy:onc",
@@ -5157,7 +5138,6 @@ static_library("browser") {
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/resources:app_icon_resources",
- "//chrome/browser/screen_ai:screen_ai_dlc_installer",
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash/accelerator",
"//chrome/browser/ui/ash/accessibility",
@@ -5415,7 +5395,6 @@ static_library("browser") {
@@ -5375,7 +5355,6 @@ static_library("browser") {
"//components/webapk:proto",
"//device/vr/public/mojom:isolated_xr_service",
"//remoting/host/chromeos:features",
@@ -107,33 +107,22 @@
"//third_party/nearby:rpc_resources_proto",
"//third_party/nearby:wire_format_proto",
"//ui/chromeos",
@@ -8029,23 +8008,6 @@ static_library("browser") {
]
@@ -7995,12 +7974,6 @@ static_library("browser") {
}
- if (enable_pdf) {
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",
- "//chrome/browser/ui/pdf",
- "//components/pdf/browser",
- "//components/pdf/browser:interceptors",
- "//extensions/common/api",
- "//pdf:features",
- ]
- }
if (enable_plugins) {
sources += [
deps += [
"//chrome/browser/pdf",
"//chrome/browser/pdf:pdf_pref_names",
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -246,12 +246,10 @@
@@ -243,12 +243,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"
@@ -146,7 +135,7 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1326,9 +1324,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1320,9 +1318,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -180,7 +169,7 @@
std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
--- a/chrome/browser/chrome_browser_interface_binders.cc
+++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -222,8 +222,6 @@
@@ -221,8 +221,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
@@ -189,7 +178,7 @@
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
@@ -734,27 +732,6 @@ void BindMediaFoundationPreferences(
@@ -735,27 +733,6 @@ void BindMediaFoundationPreferences(
}
#endif // BUILDFLAG(IS_WIN)
@@ -217,7 +206,7 @@
void PopulateChromeFrameBinders(
mojo::BinderMapWithContext<content::RenderFrameHost*>* map,
@@ -883,13 +860,6 @@ void PopulateChromeFrameBinders(
@@ -893,13 +870,6 @@ void PopulateChromeFrameBinders(
base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
}
@@ -231,25 +220,6 @@
#endif
#if BUILDFLAG(IS_WIN)
--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
@@ -529,16 +529,6 @@ void ChromeContentBrowserClient::
std::move(receiver), render_frame_host);
},
&render_frame_host));
-#if BUILDFLAG(ENABLE_PDF)
- associated_registry.AddInterface<pdf::mojom::PdfHost>(base::BindRepeating(
- [](content::RenderFrameHost* render_frame_host,
- mojo::PendingAssociatedReceiver<pdf::mojom::PdfHost> receiver) {
- pdf::PDFDocumentHelper::BindPdfHost(
- std::move(receiver), render_frame_host,
- std::make_unique<ChromePDFDocumentHelperClient>());
- },
- &render_frame_host));
-#endif // BUILDFLAG(ENABLE_PDF)
#if !BUILDFLAG(IS_ANDROID)
associated_registry.AddInterface<search::mojom::EmbeddedSearchConnector>(
base::BindRepeating(
--- a/chrome/browser/component_updater/registration.cc
+++ b/chrome/browser/component_updater/registration.cc
@@ -72,8 +72,6 @@
@@ -261,7 +231,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
@@ -221,9 +219,6 @@ void RegisterComponentsForUpdate() {
@@ -227,9 +225,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
@@ -291,9 +261,9 @@
- blink::features::kPreloadingModelTimerInterval.Get());
-}
bool MLModelOneExecutionPerHover() {
return blink::features::kPreloadingModelOneExecutionPerHover.Get();
@@ -420,87 +414,6 @@ void NavigationPredictor::ProcessPointer
base::TimeDelta MLModelMaxHoverTime() {
return blink::features::kPreloadingModelMaxHoverTime.Get();
@@ -416,80 +410,6 @@ void NavigationPredictor::ProcessPointer
}
void NavigationPredictor::OnMLModelExecutionTimerFired() {
@@ -364,14 +334,7 @@
- base::BindOnce(&NavigationPredictor::OnPreloadingHeuristicsModelDone,
- weak_ptr_factory_.GetWeakPtr(), anchor.target_url));
-
- // TODO(crbug.com/40278151): In its current form, the model does not seem to
- // ever increase in confidence when dwelling on an anchor, which makes
- // repeated executions wasteful. So we only do one execution per mouse over.
- // As we iterate on the model, multiple executions may become useful, but we
- // need to take care to not produce a large amount of redundant predictions
- // (as seen in crbug.com/338200075 ).
- if (!MLModelOneExecutionPerHover() &&
- inputs.hover_dwell_time < MLModelMaxHoverTime() &&
- if (inputs.hover_dwell_time < MLModelMaxHoverTime() &&
- !ml_model_execution_timer_.IsRunning()) {
- ml_model_execution_timer_.Start(
- FROM_HERE, MLModelExecutionTimerInterval(),
@@ -393,7 +356,7 @@
{"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
--- a/chrome/browser/prefs/BUILD.gn
+++ b/chrome/browser/prefs/BUILD.gn
@@ -262,7 +262,6 @@ source_set("impl") {
@@ -263,7 +263,6 @@ source_set("impl") {
} else {
deps += [
"//chrome/browser/promos:utils",
@@ -403,7 +366,7 @@
"//chrome/browser/search_engines",
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1863,9 +1863,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1961,9 +1961,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -415,7 +378,7 @@
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -298,7 +298,6 @@ source_set("profiles_extra_parts_impl")
@@ -300,7 +300,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/feedback",
"//chrome/browser/hid",
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
@@ -425,7 +388,7 @@
"//chrome/browser/search_engine_choice",
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -104,7 +104,6 @@
@@ -103,7 +103,6 @@
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -433,7 +396,7 @@
#include "chrome/browser/net/dns_probe_service_factory.h"
#include "chrome/browser/net/profile_network_context_service_factory.h"
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
@@ -497,7 +496,6 @@
@@ -503,7 +502,6 @@
#include "chrome/browser/new_tab_page/promos/promo_service_factory.h"
#include "chrome/browser/payments/payment_request_display_manager_factory.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
@@ -441,7 +404,7 @@
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/serial/serial_chooser_context_factory.h"
@@ -982,7 +980,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -995,7 +993,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
net::ServerCertificateDatabaseServiceFactory::GetInstance();
#endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
@@ -449,7 +412,7 @@
#if BUILDFLAG(IS_CHROMEOS)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -1031,9 +1028,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1047,9 +1044,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -459,7 +422,7 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1178,13 +1172,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1200,13 +1194,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
SafetyHubMenuNotificationServiceFactory::GetInstance();
SafetyHubHatsServiceFactory::GetInstance();
@@ -475,7 +438,7 @@
if (ash::features::IsScannerEnabled()) {
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -843,24 +843,6 @@ void ProfileImpl::DoFinalInit(CreateMode
@@ -829,24 +829,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);
@@ -507,10 +470,10 @@
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
#include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/delete_profile_helper.h"
@@ -1494,9 +1493,6 @@ void ProfileManager::DoFinalInitForServi
#include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
@@ -1493,9 +1492,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -522,7 +485,7 @@
#if BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -97,7 +97,6 @@ group("resources") {
@@ -93,7 +93,6 @@ group("resources") {
if (is_mac) {
public_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -532,7 +495,7 @@
--- a/chrome/browser/resources/pdf/pdf_viewer.html
+++ b/chrome/browser/resources/pdf/pdf_viewer.html
@@ -89,10 +89,6 @@
@@ -91,10 +91,6 @@
@current-type-changed="${this.onBrushTypeChanged_}">
</viewer-side-panel>` : ''}
</if>
@@ -545,7 +508,7 @@
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1673,8 +1673,6 @@ static_library("ui") {
@@ -1681,8 +1681,6 @@ static_library("ui") {
"//chrome/browser/reading_list",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
@@ -553,15 +516,46 @@
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
"//chrome/browser/smart_card:smart_card",
"//chrome/browser/tab_group_sync:utils",
"//chrome/browser/task_manager:impl",
@@ -2347,7 +2345,6 @@ static_library("ui") {
"//chrome/browser/nearby_sharing/logging:util",
"//chrome/browser/themes",
@@ -2361,7 +2359,6 @@ static_library("ui") {
"//chrome/browser/policy:onc",
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification:push_notification",
- "//chrome/browser/screen_ai/public:optical_character_recognizer",
"//chrome/browser/ui/ash/accessibility",
"//chrome/browser/ui/ash/app_access",
"//chrome/browser/ui/ash/arc",
--- a/chrome/browser/ui/pdf/BUILD.gn
+++ b/chrome/browser/ui/pdf/BUILD.gn
@@ -6,7 +6,6 @@ import("//pdf/features.gni")
import("//services/screen_ai/buildflags/features.gni")
assert(enable_pdf)
-assert(enable_screen_ai_service)
source_set("pdf") {
sources = [
@@ -16,7 +15,6 @@ source_set("pdf") {
deps = [
"//chrome/browser/download",
"//chrome/browser/pdf",
- "//chrome/browser/screen_ai:screen_ai_install_state",
"//chrome/browser/ui/tab_contents",
"//chrome/browser/ui/user_education",
"//chrome/common",
--- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
@@ -103,10 +103,4 @@ void ChromePDFDocumentHelperClient::SetP
void ChromePDFDocumentHelperClient::OnSearchifyStarted(
content::WebContents* contents) {
- // TODO(crbug.com/360803943): Add test.
- // Show the promo only when ScreenAI component is available and OCR can be
- // done.
- if (screen_ai::ScreenAIInstallState::GetInstance()->IsComponentAvailable()) {
- MaybeShowFeaturePromo(contents);
- }
}
--- 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
@@ -626,7 +620,7 @@
void AccessibilityMainHandler::HandleGetScreenReaderState(
--- a/chrome/browser/ui/webui/settings/accessibility_main_handler.h
+++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.h
@@ -21,8 +21,7 @@ namespace settings {
@@ -20,8 +20,7 @@ namespace settings {
// Settings handler for the main accessibility settings page,
// chrome://settings/accessibility.
class AccessibilityMainHandler
@@ -636,7 +630,7 @@
public:
AccessibilityMainHandler();
~AccessibilityMainHandler() override;
@@ -34,9 +33,6 @@ class AccessibilityMainHandler
@@ -33,9 +32,6 @@ class AccessibilityMainHandler
void OnJavascriptAllowed() override;
void OnJavascriptDisallowed() override;
@@ -646,7 +640,7 @@
private:
void HandleGetScreenReaderState(const base::Value::List& args);
@@ -53,9 +49,6 @@ class AccessibilityMainHandler
@@ -52,9 +48,6 @@ class AccessibilityMainHandler
base::CallbackListSubscription accessibility_subscription_;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -667,7 +661,7 @@
#include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
@@ -370,26 +368,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -364,26 +362,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
@@ -694,7 +688,7 @@
// Enable accessibility for the top level render frame and all descendants.
// This causes AXTreeSerializer to reset and send accessibility events of
@@ -805,12 +783,6 @@ void ReadAnythingUntrustedPageHandler::S
@@ -808,12 +786,6 @@ void ReadAnythingUntrustedPageHandler::S
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
}
}
@@ -709,7 +703,7 @@
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -379,18 +379,6 @@ static_library("renderer") {
@@ -377,18 +377,6 @@ static_library("renderer") {
]
} else {
sources += [
@@ -728,7 +722,7 @@
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -404,7 +392,6 @@ static_library("renderer") {
@@ -402,7 +390,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
@@ -770,7 +764,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1967,9 +1967,6 @@ if (!is_android) {
@@ -2019,9 +2019,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",
@@ -780,15 +774,15 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2008,7 +2005,6 @@ if (!is_android) {
@@ -2060,7 +2057,6 @@ if (!is_android) {
"//chrome/browser/ui/omnibox",
"//chrome/browser/ui/page_action:icon_type",
"//chrome/browser/ui/page_info",
- "//chrome/browser/ui/pdf",
"//chrome/browser/ui/permission_bubble:browser_tests",
"//chrome/browser/ui/prefs:browser_tests",
"//chrome/browser/ui/qrcode_generator:browser_tests",
@@ -2369,9 +2365,6 @@ if (!is_android) {
"//chrome/browser/ui/promos:utils",
@@ -2422,9 +2418,6 @@ if (!is_android) {
"//services/network/public/proto:sct_audit_report_proto",
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
@@ -798,7 +792,7 @@
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -7813,7 +7806,6 @@ test("unit_tests") {
@@ -7911,7 +7904,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target.
deps += [
@@ -806,7 +800,7 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -7959,7 +7951,6 @@ test("unit_tests") {
@@ -8060,7 +8052,6 @@ test("unit_tests") {
"//services/device/public/cpp/bluetooth",
"//services/metrics/public/cpp:ukm_builders",
"//services/network:test_support",
@@ -814,7 +808,7 @@
"//services/video_effects/test:test_support",
"//third_party/crashpad/crashpad/util",
"//third_party/libaddressinput",
@@ -8399,7 +8390,6 @@ test("unit_tests") {
@@ -8495,7 +8486,6 @@ test("unit_tests") {
"//chrome/browser/nearby_sharing/contacts:unit_tests",
"//chrome/browser/nearby_sharing/local_device_data:unit_tests",
"//chrome/browser/policy:unit_tests",
@@ -824,7 +818,7 @@
"//chrome/browser/ui/views/crostini:unit_tests",
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -404,7 +404,7 @@ source_set("lib") {
@@ -406,7 +406,7 @@ source_set("lib") {
}
}
@@ -887,7 +881,7 @@
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
--- a/components/omnibox/browser/autocomplete_classifier.cc
+++ b/components/omnibox/browser/autocomplete_classifier.cc
@@ -96,8 +96,6 @@ void AutocompleteClassifier::Classify(
@@ -110,8 +110,6 @@ void AutocompleteClassifier::Classify(
metrics::OmniboxEventProto::PageClassification page_classification,
AutocompleteMatch* match,
GURL* alternate_nav_url) {
@@ -896,6 +890,29 @@
DCHECK(!inside_classify_);
base::AutoReset<bool> reset(&inside_classify_, true);
AutocompleteInput input(text, page_classification, *scheme_classifier_);
--- a/components/pdf/renderer/pdf_accessibility_tree.cc
+++ b/components/pdf/renderer/pdf_accessibility_tree.cc
@@ -536,20 +536,6 @@ void PdfAccessibilityTree::SetAccessibil
std::move(chars), std::move(page_objects)));
}
-void PdfAccessibilityTree::OnHasSearchifyText() {
- // TODO(crbug.com/360803943): Look into if `render_frame()` can be null, why
- // it is assumed to be not null in `SetOcrCompleteStatus()`, and create a
- // better distinction between `render_frame()` and `render_frame_`.
- // TODO(accessibility): remove this dependency.
- content::RenderAccessibility* render_accessibility =
- render_frame() ? render_frame()->GetRenderAccessibility() : nullptr;
- bool screen_reader_mode =
- (render_accessibility &&
- render_accessibility->GetAXMode().has_mode(ui::AXMode::kScreenReader));
- base::UmaHistogramBoolean(
- "Accessibility.ScreenAI.Searchify.ScreenReaderModeEnabled",
- screen_reader_mode);
-}
void PdfAccessibilityTree::DoSetAccessibilityPageInfo(
const chrome_pdf::AccessibilityPageInfo& page_info,
--- a/components/pdf/renderer/pdf_accessibility_tree_builder.cc
+++ b/components/pdf/renderer/pdf_accessibility_tree_builder.cc
@@ -9,7 +9,6 @@
@@ -990,7 +1007,7 @@
};
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -341,8 +341,6 @@ source_set("unit_tests") {
@@ -339,8 +339,6 @@ source_set("unit_tests") {
"//third_party/puffin:libpuffpatch",
"//third_party/re2",
]
@@ -1001,7 +1018,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -808,10 +808,6 @@ if (is_apple) {
@@ -803,10 +803,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -1024,7 +1041,7 @@
for (uint32_t i = 0; i < char_count; ++i) {
--- a/pdf/pdf_view_web_plugin.cc
+++ b/pdf/pdf_view_web_plugin.cc
@@ -1303,11 +1303,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
@@ -1297,11 +1297,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
if (accessibility_state_ == AccessibilityState::kPending)
LoadAccessibility();
@@ -1067,7 +1084,7 @@
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -2660,7 +2660,7 @@ void PDFiumEngine::HandleLongPress(const
@@ -2659,7 +2659,7 @@ void PDFiumEngine::HandleLongPress(const
SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) {
DCHECK(PageIndexInBounds(page_index));
@@ -1076,16 +1093,6 @@
}
bool PDFiumEngine::GetPrintScaling() {
--- a/services/passage_embeddings/passage_embeddings_service.cc
+++ b/services/passage_embeddings/passage_embeddings_service.cc
@@ -6,7 +6,6 @@
#include "base/files/file.h"
#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
-#include "services/passage_embeddings/passage_embedder.h"
namespace passage_embeddings {
--- a/services/passage_embeddings/passage_embeddings_service.h
+++ b/services/passage_embeddings/passage_embeddings_service.h
@@ -11,7 +11,6 @@
@@ -1098,7 +1105,7 @@
class PassageEmbeddingsService : public mojom::PassageEmbeddingsService {
--- a/services/screen_ai/buildflags/features.gni
+++ b/services/screen_ai/buildflags/features.gni
@@ -7,14 +7,13 @@ import("//build/config/sanitizers/saniti
@@ -6,14 +6,13 @@ import("//build/config/sanitizers/saniti
declare_args() {
# Screen AI service is only supported on desktop platforms.

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@@ -1,7 +1,7 @@
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -159,27 +159,11 @@
// TODO(b/343792225): Identify a way to resolve this problem and implement
@@ -156,27 +156,11 @@
// TODO(crbug.com/343792225): Identify a way to resolve this problem and implement
// necessary changes.
"google": {
- "name": "Google",

2
patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
View File

@@ -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"
@@ -2275,6 +2276,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2259,6 +2260,7 @@ void RenderViewContextMenu::AppendPageIt
}
if (CanTranslate(/*menu_logging=*/true)) {

34
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
@@ -2451,6 +2451,7 @@ static_library("browser") {
@@ -2440,6 +2440,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
@@ -180,6 +180,7 @@
@@ -182,6 +182,7 @@
#include "components/translate/core/common/translate_util.h"
#include "components/trusted_vault/features.h"
#include "components/ui_devtools/switches.h"
@@ -44,7 +44,7 @@
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -281,6 +281,7 @@ source_set("browser") {
@@ -282,6 +282,7 @@ source_set("browser") {
"//third_party/re2",
"//third_party/snappy",
"//third_party/sqlite",
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/bad_message.h"
@@ -3346,6 +3347,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3353,6 +3354,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -73,7 +73,7 @@
switches::kForceGpuMemAvailableMb,
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -106,6 +106,7 @@ target(link_target_type, "child") {
@@ -109,6 +109,7 @@ target(link_target_type, "child") {
"//third_party/blink/public/common:buildflags",
"//third_party/blink/public/strings",
"//third_party/ced",
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -496,6 +497,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -491,6 +492,10 @@ void SetRuntimeFeaturesFromCommandLine(c
true},
{wrf::EnableWebAudioBypassOutputBufferingOptOut,
blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
@@ -124,7 +124,7 @@
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -853,6 +854,11 @@ Document::Document(const DocumentInit& i
@@ -863,6 +864,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();
@@ -972,6 +978,14 @@ const Position Document::PositionAdjuste
@@ -982,6 +988,14 @@ const Position Document::PositionAdjuste
return Position::BeforeNode(*shadow_host);
}
@@ -164,7 +164,7 @@
V8VisibilityState visibilityState() const;
String visibilityStateAsString() const;
bool IsPageVisible() const;
@@ -2608,6 +2612,9 @@ class CORE_EXPORT Document : public Cont
@@ -2632,6 +2636,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
@@ -2529,6 +2529,11 @@ DOMRectList* Element::getClientRects() {
@@ -2659,6 +2659,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2556,6 +2561,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2686,6 +2691,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
@@ -1620,6 +1620,12 @@ DOMRectList* Range::getClientRects() con
@@ -1617,6 +1617,12 @@ DOMRectList* Range::getClientRects() con
Vector<gfx::QuadF> quads;
GetBorderAndTextQuads(quads);
@@ -213,7 +213,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -1627,7 +1633,11 @@ DOMRect* Range::getBoundingClientRect()
@@ -1624,7 +1630,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
@@ -224,6 +224,9 @@ class Isolate;
@@ -223,6 +223,9 @@ class Isolate;
class Value;
} // namespace v8
@@ -276,7 +276,7 @@
namespace blink {
class DOMMatrixInit;
@@ -3638,8 +3641,22 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -3718,8 +3721,22 @@ TextMetrics* BaseRenderingContext2D::mea
const CanvasRenderingContext2DState& state = GetState();
TextDirection direction = ToTextDirection(state.GetDirection(), canvas);
@@ -303,7 +303,7 @@
void BaseRenderingContext2D::SnapshotStateForFilter() {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1767,6 +1767,7 @@ component("platform") {
@@ -1771,6 +1771,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection:language_detection",
@@ -338,7 +338,7 @@
#include "third_party/blink/renderer/platform/wtf/vector.h"
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2026,6 +2026,12 @@
@@ -2022,6 +2022,12 @@
depends_on: ["FindDecomposedInShortText"],
},
{

14
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
@@ -3349,6 +3349,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3356,6 +3356,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
@@ -501,6 +501,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -496,6 +496,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
@@ -2917,6 +2917,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2969,6 +2969,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
@@ -1714,7 +1714,9 @@ component("platform") {
@@ -1715,7 +1715,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -110,7 +110,7 @@ approach to change color components.
#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
@@ -146,6 +148,11 @@ bool ImageDataBuffer::EncodeImageInterna
@@ -147,6 +149,11 @@ bool ImageDataBuffer::EncodeImageInterna
const SkPixmap& pixmap) const {
DCHECK(is_valid_);
@@ -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
@@ -39,6 +39,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
@@ -2032,6 +2032,9 @@
@@ -2028,6 +2028,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

16
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
@@ -2140,6 +2140,7 @@ static_library("browser") {
@@ -2121,6 +2121,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -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"
@@ -405,6 +409,18 @@ void BrowserProcessImpl::Init() {
@@ -402,6 +406,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -101,9 +101,9 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2492,6 +2492,10 @@ const char kLogJsConsoleMessagesDescript
"Enable logging JS console messages in system logs, please note that they "
"may contain PII.";
@@ -2502,6 +2502,10 @@ const char kMantisFeatureKeyDescription[
"Feature key to use the Mantis feature on ChromeOS.";
#endif // BUILDFLAG(IS_CHROMEOS)
+const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
+const char kMaxConnectionsPerHostDescription[] =
@@ -114,9 +114,9 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1413,6 +1413,9 @@ extern const char kLocationBarModelOptim
extern const char kLogJsConsoleMessagesName[];
extern const char kLogJsConsoleMessagesDescription[];
@@ -1434,6 +1434,9 @@ extern const char kMantisFeatureKeyName[
extern const char kMantisFeatureKeyDescription[];
#endif // IS_CHROMEOS
+extern const char kMaxConnectionsPerHostName[];
+extern const char kMaxConnectionsPerHostDescription[];

2
patches/extra/debian/disable/google-api-warning.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -154,10 +154,6 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -156,10 +156,6 @@ void AddInfoBarsIfNecessary(Browser* bro
infobars::ContentInfoBarManager* infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(web_contents);

18
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
@@ -1579,7 +1579,7 @@ void ChromeContentBrowserClient::Registe
@@ -1556,7 +1556,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
@@ -500,7 +500,7 @@ void ProfileNetworkContextService::Confi
@@ -510,7 +510,7 @@ void ProfileNetworkContextService::Confi
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -45,7 +45,7 @@
// Enum representing possible values of the Preload Pages opt-in state. These
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -316,7 +316,7 @@ const char Profile::kProfileKey[] = "__P
@@ -318,7 +318,7 @@ const char Profile::kProfileKey[] = "__P
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
@@ -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(
@@ -78,7 +78,7 @@
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
@@ -40,7 +40,7 @@ int GetSyncTransportOptInBitFieldForAcco
@@ -21,7 +21,7 @@ namespace prefs {
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
registry->RegisterBooleanPref(
@@ -87,7 +87,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kAutofillLastVersionDeduped, 0,
@@ -49,7 +49,7 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -30,7 +30,7 @@ void RegisterProfilePrefs(user_prefs::Pr
prefs::kAutofillHasSeenIban, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
@@ -98,7 +98,7 @@
prefs::kAutofillPaymentCvcStorage, true,
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -492,7 +492,7 @@ bool DoesBookmarkContainWords(const std:
@@ -421,7 +421,7 @@ bool DoesBookmarkContainWords(const std:
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -120,7 +120,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -317,7 +317,7 @@ bool HasManuallyFilledFields(const Passw
@@ -331,7 +331,7 @@ bool HasManuallyFilledFields(const Passw
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -129,7 +129,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
#if BUILDFLAG(IS_IOS)
// Deprecated pref in profile prefs.
@@ -325,7 +325,7 @@ void PasswordManager::RegisterProfilePre
@@ -339,7 +339,7 @@ void PasswordManager::RegisterProfilePre
false);
#endif // BUILDFLAG(IS_IOS)
registry->RegisterBooleanPref(

2
patches/extra/inox-patchset/0008-restore-classic-ntp.patch
View File

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

2
patches/extra/inox-patchset/0013-disable-missing-key-warning.patch
View File

@@ -9,4 +9,4 @@
- new GoogleApiKeysInfoBarDelegate())));
}
GoogleApiKeysInfoBarDelegate::GoogleApiKeysInfoBarDelegate()
GoogleApiKeysInfoBarDelegate::GoogleApiKeysInfoBarDelegate() = default;

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
@@ -1687,11 +1687,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1686,11 +1686,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/prefs-always-prompt-for-download-directory-by-defaul.patch
View File

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

2
patches/extra/iridium-browser/updater-disable-auto-update.patch
View File

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

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

@@ -8,7 +8,7 @@
#include "base/observer_list.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -78,9 +79,12 @@ bool BookmarkTabHelper::ShouldShowBookma
@@ -87,9 +88,12 @@ bool BookmarkTabHelper::ShouldShowBookma
const bool has_saved_tab_groups =
tab_group_service && !tab_group_service->GetAllGroups().empty();

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

@@ -8,7 +8,7 @@
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -574,6 +575,7 @@ Browser::Browser(const CreateParams& par
@@ -580,6 +581,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),
@@ -1012,20 +1014,22 @@ Browser::WarnBeforeClosingResult Browser
@@ -1041,20 +1043,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1063,6 +1067,7 @@ bool Browser::TryToCloseWindow(
@@ -1092,6 +1096,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3173,6 +3178,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3278,6 +3283,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;
@@ -3198,6 +3255,22 @@ void Browser::InProgressDownloadResponse
@@ -3303,6 +3360,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);

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
@@ -930,10 +930,14 @@ bool HandleNewTabPageLocationOverride(
@@ -935,10 +935,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
@@ -228,6 +228,7 @@ std::string GetCombinedOriginListValue(c
@@ -226,6 +226,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);
}
@@ -466,6 +467,7 @@ void FlagsState::SetOriginListFlag(const
@@ -464,6 +465,7 @@ void FlagsState::SetOriginListFlag(const
const std::string& value,
FlagsStorage* flags_storage) {
const std::string new_value =

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

@@ -33,7 +33,7 @@
//
--- a/third_party/blink/renderer/core/editing/selection_controller.cc
+++ b/third_party/blink/renderer/core/editing/selection_controller.cc
@@ -1435,10 +1435,14 @@ FrameSelection& SelectionController::Sel
@@ -1434,10 +1434,14 @@ FrameSelection& SelectionController::Sel
}
bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) {
@@ -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
@@ -687,8 +687,14 @@ WebInputEventResult MouseEventManager::H
@@ -681,8 +681,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
@@ -78,6 +78,7 @@ class FrameGrabHandle : public views::Vi
@@ -83,6 +83,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.

4
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
@@ -641,5 +641,7 @@ bool BrowserFrame::RegenerateFrameOnThem
}
bool BrowserFrame::IsIncognitoBrowser() const {
@@ -18,7 +18,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -429,7 +430,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -437,7 +438,9 @@ void NTPResourceCache::CreateNewTabIncog
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
// Colors.

12
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"
@@ -537,6 +538,15 @@ AutocompleteController::AutocompleteCont
@@ -536,6 +537,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -59,7 +59,7 @@
// so their async requests can be kicked off before waiting a few milliseconds
--- a/components/omnibox/browser/history_url_provider.cc
+++ b/components/omnibox/browser/history_url_provider.cc
@@ -488,6 +488,9 @@ void HistoryURLProvider::Start(const Aut
@@ -490,6 +490,9 @@ void HistoryURLProvider::Start(const Aut
if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
matches_.push_back(what_you_typed_match);
@@ -79,7 +79,7 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/functional/callback.h"
@@ -631,6 +632,9 @@ void SearchProvider::Run(bool query_is_p
@@ -628,6 +629,9 @@ void SearchProvider::Run(bool query_is_p
}
void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -100,12 +100,12 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/i18n/char_iterator.h"
@@ -625,6 +627,8 @@ GURL FixupURLInternal(const std::string&
@@ -655,6 +657,8 @@ GURL FixupURLInternal(const std::string&
FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
if (chrome_url && !parts.host.is_valid())
if (chrome_url && !parts.host.is_valid()) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") ||
+ base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome"))
url.append(kChromeUIDefaultHost);
}
FixupPort(trimmed, parts.port, &url);
FixupPath(trimmed, parts.path, &url);

6
patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch
View File

@@ -12,11 +12,11 @@
// static
bool QRCodeGeneratorBubbleController::IsGeneratorAvailable(const GURL& url) {
- if (!url.SchemeIsHTTPOrHTTPS())
+ if (!url.SchemeIsHTTPOrHTTPS() || base::FeatureList::IsEnabled(kDisableQRGenerator))
- if (!url.SchemeIsHTTPOrHTTPS()) {
+ if (!url.SchemeIsHTTPOrHTTPS() || base::FeatureList::IsEnabled(kDisableQRGenerator)) {
return false;
}
// Check policy.
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -64,4 +64,8 @@

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -509,7 +509,9 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -495,7 +495,9 @@ void TabHelpers::AttachTabHelpers(WebCon
site_protection::SiteProtectionMetricsObserver::CreateForWebContents(
web_contents);
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
@@ -52,7 +52,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -19,6 +19,7 @@
@@ -20,6 +20,7 @@
#include "base/base64url.h"
#include "base/check_deref.h"
#include "base/check_is_test.h"
@@ -60,8 +60,8 @@
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
#include "base/debug/crash_logging.h"
@@ -193,6 +194,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
return TemplateURL(merged_data);
@@ -209,6 +210,12 @@ std::unique_ptr<TemplateURL> UpdateExist
std::move(account_data));
}
+bool ShouldAutocollect() {
@@ -73,35 +73,35 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -375,6 +382,7 @@ TemplateURLService::TemplateURLService(
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
)
@@ -388,6 +395,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::RepeatingClosure& dsp_change_callback)
: prefs_(prefs),
+ should_autocollect_(true),
search_engine_choice_service_(search_engine_choice_service),
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
@@ -485,8 +493,8 @@ bool TemplateURLService::CanAddAutogener
@@ -487,8 +495,8 @@ bool TemplateURLService::CanAddAutogener
// that may interfere with search queries). An easy heuristic for this is
// whether the user has a TemplateURL that has been manually modified (e.g.,
// renamed) connected to the same host.
- return !url.is_valid() || url.host().empty() ||
- CanAddAutogeneratedKeywordForHost(url.host());
- CanAddAutogeneratedKeywordForHost(url.host());
+ return should_autocollect_ && (!url.is_valid() || url.host().empty() ||
+ CanAddAutogeneratedKeywordForHost(url.host()));
+ CanAddAutogeneratedKeywordForHost(url.host()));
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -2034,6 +2042,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2108,6 +2116,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
+ should_autocollect_ = ShouldAutocollect();
+
if (client_)
if (client_) {
client_->SetOwner(this);
@@ -2212,6 +2222,9 @@ void TemplateURLService::ChangeToLoadedS
}
@@ -2290,6 +2300,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -109,11 +109,11 @@
+ return false;
+
const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
if (!urls)
if (!urls) {
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -898,6 +898,8 @@ class TemplateURLService final : public
@@ -911,6 +911,8 @@ class TemplateURLService final : public
raw_ref<search_engines::SearchEngineChoiceService>
search_engine_choice_service_;

31
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
@@ -16,6 +16,7 @@
@@ -12,6 +12,7 @@
#include <memory>
#include <utility>
@@ -8,18 +8,33 @@
#include "base/debug/alias.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
@@ -703,6 +704,8 @@ void Tab::OnGestureEvent(ui::GestureEven
@@ -709,6 +710,13 @@ void Tab::OnGestureEvent(ui::GestureEven
event->SetHandled();
}
std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
+std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
+ if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("tab-hover-cards") == "tooltip")
+ return GetTooltipText(data_.title, GetAlertStateToShow(data_.alert_state));
// Tab hover cards replace tooltips for tabs.
return std::u16string();
}
+ // Tab hover cards replace tooltips for tabs.
+ return std::u16string();
+}
+
// This function updates the accessible name for the tab whenever any of the
// parameters that influence the accessible name change. It ultimately calls
// BrowserView::GetAccessibleTabLabel to get the updated accessible name.
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -89,6 +89,7 @@ class Tab : public gfx::AnimationDelegat
void OnMouseEntered(const ui::MouseEvent& event) override;
void OnMouseExited(const ui::MouseEvent& event) override;
void OnGestureEvent(ui::GestureEvent* event) override;
+ std::u16string GetTooltipText(const gfx::Point& p) const override;
gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override;
void PaintChildren(const views::PaintInfo& info) override;
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -19,6 +19,7 @@
@@ -15,6 +15,7 @@
#include <utility>
#include <vector>
@@ -27,7 +42,7 @@
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
@@ -1835,6 +1836,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -1841,6 +1842,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

10
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
@@ -1420,7 +1420,8 @@ void BrowserCommandController::InitComma
@@ -1450,7 +1450,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -20,14 +20,14 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
@@ -119,6 +120,7 @@ TabStripRegionView::TabStripRegionView(s
std::unique_ptr<TabSearchContainer> tab_search_container;
@@ -127,6 +128,7 @@ TabStripRegionView::TabStripRegionView(s
std::unique_ptr<TabStripComboButton> tab_strip_combo_button;
std::unique_ptr<ProductSpecificationsButton> product_specifications_button;
if (browser &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button") &&
(browser->GetType() == BrowserWindowInterface::Type::TYPE_NORMAL)) {
tab_search_container = std::make_unique<TabSearchContainer>(
tab_strip_->controller(), browser->GetTabStripModel(),
if (features::IsTabstripComboButtonEnabled() &&
ShouldShowNewTabButton(browser)) {
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -60,4 +60,8 @@

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
@@ -229,6 +229,7 @@ std::string GetCombinedOriginListValue(c
@@ -227,6 +227,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);
}
@@ -468,6 +469,7 @@ void FlagsState::SetOriginListFlag(const
@@ -466,6 +467,7 @@ void FlagsState::SetOriginListFlag(const
FlagsStorage* flags_storage) {
const std::string new_value =
internal_name == "custom-ntp" ? value :

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -372,4 +372,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
@@ -352,4 +352,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
"RemovalOfIWAsFromTabCapture",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -8,7 +8,7 @@
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -145,6 +145,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
@@ -136,6 +136,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
// module, e.g.
// //chrome/browser/<foo_module>/features.h
//

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

@@ -1,14 +1,14 @@
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -17,6 +17,7 @@
#include <unordered_map>
#include <utility>
@@ -18,6 +18,7 @@
#include "base/check.h"
#include "base/check_op.h"
+#include "base/command_line.h"
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -709,6 +710,10 @@ void TabStripModel::CloseAllTabsInGroup(
#include "base/containers/span.h"
@@ -725,6 +726,10 @@ void TabStripModel::CloseAllTabsInGroup(
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));
@@ -16,29 +16,10 @@
+ GetSwitchValueASCII("close-window-with-last-tab") == "never" &&
+ !closing_all_ && count() < 2)
+ delegate()->AddTabAt(GURL(), -1, true);
WebContents* contents = GetWebContentsAt(index);
CloseTabs(base::span<WebContents* const>(&contents, 1u), close_types);
}
@@ -1060,11 +1065,15 @@ void TabStripModel::AddTab(std::unique_p
CloseTabs({GetWebContentsAt(index)}, close_types);
}
void TabStripModel::CloseSelectedTabs() {
- ReentrancyCheck reentrancy_check(&reentrancy_guard_);
-
const ui::ListSelectionModel::SelectedIndices& sel =
selection_model_.selected_indices();
- CloseTabs(GetWebContentsesByIndices(std::vector<int>(sel.begin(), sel.end())),
+ std::vector<int> sel_vec(sel.begin(), sel.end());
+ if (base::CommandLine::ForCurrentProcess()->
+ GetSwitchValueASCII("close-window-with-last-tab") == "never" &&
+ !closing_all_ && static_cast<int>(sel_vec.size()) == count())
+ delegate()->AddTabAt(GURL(), -1, true);
+ ReentrancyCheck reentrancy_check(&reentrancy_guard_);
+ CloseTabs(GetWebContentsesByIndices(sel_vec),
TabCloseTypes::CLOSE_CREATE_HISTORICAL_TAB |
TabCloseTypes::CLOSE_USER_GESTURE);
}
@@ -1811,9 +1820,13 @@ TabStripModel::GetGroupsDestroyedFromRem
@@ -1864,9 +1869,13 @@ TabStripModel::GetGroupsDestroyedFromRem
void TabStripModel::ExecuteCloseTabsByIndices(
base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
uint32_t close_types) {

4
patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch
View File

@@ -21,7 +21,7 @@
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
#include "base/feature_list.h"
@@ -1328,7 +1329,8 @@ void HistoryBackend::InitImpl(
@@ -1368,7 +1369,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.
@@ -31,7 +31,7 @@
}
void HistoryBackend::OnMemoryPressure(
@@ -1555,6 +1557,8 @@ void HistoryBackend::AddPagesWithDetails
@@ -1600,6 +1602,8 @@ void HistoryBackend::AddPagesWithDetails
}
bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const {

2
patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch
View File

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

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

@@ -21,7 +21,7 @@
#include "base/lazy_instance.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/safe_conversions.h"
@@ -317,6 +318,13 @@ IDNConversionResult IDNToUnicodeWithAdju
@@ -319,6 +320,13 @@ IDNConversionResult IDNToUnicodeWithAdju
host16.reserve(host.length());
host16.insert(host16.end(), host.begin(), host.end());

8
patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
View File

@@ -3,16 +3,16 @@
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -123,7 +123,8 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -124,7 +124,8 @@ void AddInfoBarsIfNecessary(Browser* bro
}
// Web apps should not display the session restore bubble (crbug.com/1264121)
- if (!is_web_app && HasPendingUncleanExit(browser->profile()))
- if (!is_web_app && HasPendingUncleanExit(browser->profile())) {
+ if (!is_web_app && HasPendingUncleanExit(browser->profile()) &&
+ !startup_command_line.HasSwitch("hide-crashed-bubble"))
+ !startup_command_line.HasSwitch("hide-crashed-bubble")) {
SessionCrashedBubble::ShowIfNotOffTheRecordProfile(
browser, /*skip_tab_checking=*/false);
}
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -28,4 +28,8 @@

6
patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch
View File

@@ -16,7 +16,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/feature_engagement/public/event_constants.h"
@@ -537,6 +539,17 @@ void ExtensionsToolbarContainer::AnchorA
@@ -544,6 +546,17 @@ void ExtensionsToolbarContainer::AnchorA
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
anchor_view && anchor_view->GetVisible() ? anchor_view
: GetExtensionsButton());
@@ -34,7 +34,7 @@
widget->Show();
}
@@ -923,6 +936,9 @@ void ExtensionsToolbarContainer::UpdateC
@@ -943,6 +956,9 @@ void ExtensionsToolbarContainer::UpdateC
}
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
@@ -43,7 +43,7 @@
+
// The container (and extensions-menu button) should not be visible if we have
// no extensions.
if (!HasAnyExtensions())
if (!HasAnyExtensions()) {
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -104,4 +104,8 @@

2
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
@@ -2034,6 +2034,10 @@ void BrowserView::ExitFullscreen() {
@@ -2033,6 +2033,10 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateExclusiveAccessBubble(
const ExclusiveAccessBubbleParams& params,
ExclusiveAccessBubbleHideCallback first_hide_callback) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -1080,7 +1080,11 @@ void Tab::UpdateIconVisibility() {
@@ -1145,7 +1145,11 @@ void Tab::UpdateIconVisibility() {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1109,6 +1113,8 @@ void Tab::UpdateIconVisibility() {
@@ -1174,6 +1178,8 @@ void Tab::UpdateIconVisibility() {
!controller_->IsLockedForOnTask() &&
#endif
large_enough_for_close_button;

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

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

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

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

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

@@ -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
@@ -157,6 +157,8 @@ class BrowserRootView : public views::in
@@ -159,6 +159,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
@@ -481,6 +481,17 @@ void ToolbarView::Init() {
@@ -495,6 +495,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
@@ -4342,10 +4342,12 @@ const FeatureEntry::FeatureVariation kSe
@@ -4340,10 +4340,12 @@ const FeatureEntry::FeatureVariation kMe
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

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

@@ -19,7 +19,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -162,6 +162,7 @@
@@ -161,6 +161,7 @@
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/header_util.h"
#include "services/network/public/cpp/is_potentially_trustworthy.h"
@@ -52,7 +52,7 @@
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
@@ -4647,10 +4648,13 @@ void RenderFrameImpl::FinalizeRequestInt
@@ -4650,10 +4651,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -111,7 +111,7 @@
"request_mode.cc",
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -16,6 +16,14 @@
@@ -15,6 +15,14 @@
#include "url/origin.h"
namespace network::features {
@@ -138,7 +138,7 @@
+
COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kBlockAcceptClientHints);
COMPONENT_EXPORT(NETWORK_CPP)
// Note: Do not use BASE_DECLARE_FEATURE_PARAM macro as this is called only once
--- /dev/null
+++ b/services/network/public/cpp/referrer_sanitizer.cc
@@ -0,0 +1,49 @@

45
patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
View File

@@ -123,7 +123,7 @@
--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
@@ -67,6 +67,15 @@ bool EditSearchEngineController::IsURLVa
@@ -69,6 +69,15 @@ bool EditSearchEngineController::IsURLVa
.is_valid();
}
@@ -139,7 +139,7 @@
bool EditSearchEngineController::IsKeywordValid(
const std::u16string& keyword_input) const {
std::u16string keyword_input_trimmed(
@@ -89,10 +98,12 @@ bool EditSearchEngineController::IsKeywo
@@ -93,10 +102,12 @@ bool EditSearchEngineController::IsKeywo
void EditSearchEngineController::AcceptAddOrEdit(
const std::u16string& title_input,
const std::u16string& keyword_input,
@@ -153,7 +153,7 @@
TemplateURLService* template_url_service =
TemplateURLServiceFactory::GetForProfile(profile_);
@@ -120,7 +131,8 @@ void EditSearchEngineController::AcceptA
@@ -124,7 +135,8 @@ void EditSearchEngineController::AcceptA
} else {
// Adding or modifying an entry via the Delegate.
edit_keyword_delegate_->OnEditedKeyword(template_url_, title_input,
@@ -174,7 +174,7 @@
+ const std::string& suggestions_url) = 0;
protected:
virtual ~EditSearchEngineControllerDelegate() {}
virtual ~EditSearchEngineControllerDelegate() = default;
@@ -54,6 +55,8 @@ class EditSearchEngineController {
// character results in a valid url.
bool IsURLValid(const std::string& url_input) const;
@@ -196,9 +196,9 @@
// already owned by the TemplateURLService.
--- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
@@ -24,23 +24,27 @@ KeywordEditorController::KeywordEditorCo
KeywordEditorController::~KeywordEditorController() {
}
@@ -23,23 +23,27 @@ KeywordEditorController::KeywordEditorCo
KeywordEditorController::~KeywordEditorController() = default;
-int KeywordEditorController::AddTemplateURL(const std::u16string& title,
- const std::u16string& keyword,
@@ -232,15 +232,16 @@
DCHECK(!url.empty());
const std::optional<size_t> index =
table_model_->IndexOfTemplateURL(template_url);
@@ -52,10 +56,12 @@ void KeywordEditorController::ModifyTemp
@@ -51,11 +55,13 @@ void KeywordEditorController::ModifyTemp
// Don't do anything if the entry didn't change.
if ((template_url->short_name() == title) &&
- (template_url->keyword() == keyword) && (template_url->url() == url))
- (template_url->keyword() == keyword) && (template_url->url() == url)) {
+ (template_url->keyword() == keyword) &&
+ (template_url->url() == url) &&
+ (template_url->suggestions_url() == suggestions_url))
+ (template_url->suggestions_url() == suggestions_url)) {
return;
}
- table_model_->ModifyTemplateURL(index.value(), title, keyword, url);
+ table_model_->ModifyTemplateURL(index.value(), title, keyword, url, suggestions_url);
@@ -270,7 +271,7 @@
bool CanEdit(const TemplateURL* url) const;
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -200,21 +200,25 @@ void TemplateURLTableModel::Remove(size_
@@ -201,21 +201,25 @@ void TemplateURLTableModel::Remove(size_
void TemplateURLTableModel::Add(size_t index,
const std::u16string& short_name,
const std::u16string& keyword,
@@ -301,7 +302,7 @@
DCHECK(index <= RowCount());
DCHECK(!url.empty());
TemplateURL* template_url = GetTemplateURL(index);
@@ -223,7 +227,8 @@ void TemplateURLTableModel::ModifyTempla
@@ -224,7 +228,8 @@ void TemplateURLTableModel::ModifyTempla
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
template_url->SupportsReplacement(
template_url_service_->search_terms_data()));
@@ -350,7 +351,7 @@
dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
(template_url->starter_pack_id() > 0)));
GURL icon_url = template_url->favicon_url();
@@ -400,12 +403,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -401,12 +404,14 @@ void SearchEnginesHandler::HandleSearchE
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
const std::u16string& keyword,
@@ -358,17 +359,17 @@
+ const std::string& url,
+ const std::string& suggestions_url) {
DCHECK(!url.empty());
if (template_url)
if (template_url) {
- list_controller_.ModifyTemplateURL(template_url, title, keyword, url);
+ list_controller_.ModifyTemplateURL(template_url, title, keyword, url,
+ suggestions_url);
else
} else {
- list_controller_.AddTemplateURL(title, keyword, url);
+ list_controller_.AddTemplateURL(title, keyword, url, suggestions_url);
}
edit_controller_.reset();
}
@@ -433,6 +438,8 @@ bool SearchEnginesHandler::CheckFieldVal
@@ -436,6 +441,8 @@ bool SearchEnginesHandler::CheckFieldVal
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
} else if (field_name.compare(kQueryUrlField) == 0) {
is_valid = edit_controller_->IsURLValid(field_value);
@@ -377,9 +378,9 @@
} else {
NOTREACHED();
}
@@ -453,18 +460,21 @@ void SearchEnginesHandler::HandleSearchE
if (!edit_controller_.get())
@@ -458,18 +465,21 @@ void SearchEnginesHandler::HandleSearchE
return;
}
- CHECK_EQ(3U, args.size());
+ CHECK_EQ(4U, args.size());
@@ -427,7 +428,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -883,7 +883,8 @@ void TemplateURLService::IncrementUsageC
@@ -892,7 +892,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
@@ -437,7 +438,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -898,6 +899,7 @@ void TemplateURLService::ResetTemplateUR
@@ -907,6 +908,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -447,7 +448,7 @@
}
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -318,7 +318,8 @@ class TemplateURLService final : public
@@ -324,7 +324,8 @@ class TemplateURLService final : public
void ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,

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
@@ -4338,7 +4338,13 @@ const FeatureEntry::FeatureVariation kSe
@@ -4336,7 +4336,13 @@ const FeatureEntry::FeatureVariation kMe
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.

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

@@ -1,11 +1,11 @@
--- 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,
- blink::kWebRTCIPHandlingDefault);
+ blink::kWebRTCIPHandlingDisableNonProxiedUdp);
registry->RegisterListPref(prefs::kWebRTCIPHandlingUrl, base::Value::List());
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

8
patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch
View File

@@ -3,8 +3,8 @@
--- a/chrome/browser/media/router/discovery/dial/dial_registry.cc
+++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc
@@ -155,10 +155,6 @@ void DialRegistry::StartPeriodicDiscover
return;
@@ -160,10 +160,6 @@ void DialRegistry::StartPeriodicDiscover
}
dial_ = CreateDialService();
- DoDiscovery();
@@ -14,9 +14,9 @@
// Always send the current device list with the next discovery request. This
// may not be necessary, but is done to match previous behavior.
++registry_generation_;
@@ -175,8 +171,6 @@ void DialRegistry::StopPeriodicDiscovery
if (!dial_)
@@ -181,8 +177,6 @@ void DialRegistry::StopPeriodicDiscovery
return;
}
- repeating_timer_->Stop();
- repeating_timer_.reset();

20
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
@@ -28,7 +28,6 @@
@@ -29,7 +29,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)
@@ -534,94 +533,10 @@ DownloadInterruptReason BaseFile::Publis
@@ -535,94 +534,10 @@ DownloadInterruptReason BaseFile::Publis
}
#endif // BUILDFLAG(IS_ANDROID)
@@ -100,12 +100,12 @@
- OnFileQuarantined(quarantine::SetInternetZoneIdentifierDirectly(
- full_path_, source_url, referrer_url));
-#else // !BUILDFLAG(IS_WIN)
- CHECK(false) << "In-process quarantine service should not have failed.";
- NOTREACHED() << "In-process quarantine service should not have failed.";
-#endif // !BUILDFLAG(IS_WIN)
}
void BaseFile::AnnotateWithSourceInformation(
@@ -631,32 +546,8 @@ void BaseFile::AnnotateWithSourceInforma
@@ -632,32 +547,8 @@ void BaseFile::AnnotateWithSourceInforma
const std::optional<url::Origin>& request_initiator,
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
@@ -119,7 +119,6 @@ source_set("browser") {
@@ -118,7 +118,6 @@ source_set("browser") {
"//components/payments/mojom",
"//components/power_monitor",
"//components/services/filesystem:lib",
@@ -152,15 +152,15 @@
"//components/services/storage/dom_storage:local_storage_proto",
--- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
@@ -14,7 +14,6 @@
@@ -13,7 +13,6 @@
#include "base/task/thread_pool.h"
#include "base/thread_annotations.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
-#include "components/services/quarantine/quarantine.h"
#include "content/browser/file_system_access/features.h"
#include "content/browser/file_system_access/file_system_access_error.h"
#include "content/public/browser/content_browser_client.h"
@@ -230,22 +229,9 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -229,22 +228,9 @@ void FileSystemAccessSafeMoveHelper::Did
// not exist anymore. In case of error, the source file URL will point to a
// valid filesystem location.
base::OnceCallback<void(base::File::Error)> result_callback;
@@ -183,7 +183,7 @@
manager_->DoFileSystemOperation(
FROM_HERE, &storage::FileSystemOperationRunner::Move,
std::move(result_callback), source_url(), dest_url(), options_,
@@ -262,7 +248,6 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -261,7 +247,6 @@ void FileSystemAccessSafeMoveHelper::Did
void FileSystemAccessSafeMoveHelper::DidFileDoQuarantine(
const storage::FileSystemURL& target_url,
const GURL& referrer_url,
@@ -191,7 +191,7 @@
base::File::Error result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -293,40 +278,9 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -292,40 +277,9 @@ void FileSystemAccessSafeMoveHelper::Did
referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
? referrer_url
: GURL();

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

@@ -1,11 +1,11 @@
--- a/components/safe_browsing/core/common/features.cc
+++ b/components/safe_browsing/core/common/features.cc
@@ -211,7 +211,7 @@ constexpr base::FeatureParam<int> kHashP
@@ -117,7 +117,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints,
BASE_FEATURE(kDownloadsPageReferrerUrl,
"DownloadsPageReferrerUrl",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kEnterprisePasswordReuseUiRefresh,
"EnterprisePasswordReuseUiRefresh",
BASE_FEATURE(kDownloadTailoredWarnings,
"DownloadTailoredWarnings",

6
patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch
View File

@@ -2,18 +2,18 @@
--- a/chrome/browser/ui/status_bubble.h
+++ b/chrome/browser/ui/status_bubble.h
@@ -18,7 +18,7 @@ class GURL;
@@ -17,7 +17,7 @@ class GURL;
class StatusBubble {
public:
// On hover, expand status bubble to fit long URL after this delay.
- static const int kExpandHoverDelayMS = 1600;
+ static const int kExpandHoverDelayMS = 0;
virtual ~StatusBubble() {}
virtual ~StatusBubble() = default;
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -255,5 +255,5 @@ TemplateURLService* ChromeLocationBarMod
@@ -266,5 +266,5 @@ TemplateURLService* ChromeLocationBarMod
// static
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {

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

4
patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch
View File

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

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

@@ -1,21 +1,21 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -219,12 +219,10 @@ TabStripRegionView::TabStripRegionView(s
new_tab_button_->GetViewAccessibility().SetName(
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
@@ -231,12 +231,10 @@ TabStripRegionView::TabStripRegionView(s
new_tab_button_->GetViewAccessibility().SetName(
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
-#if BUILDFLAG(IS_LINUX)
// The New Tab Button can be middle-clicked on Linux.
new_tab_button_->SetTriggerableEventFlags(
new_tab_button_->GetTriggerableEventFlags() |
ui::EF_MIDDLE_MOUSE_BUTTON);
// The New Tab Button can be middle-clicked on Linux.
new_tab_button_->SetTriggerableEventFlags(
new_tab_button_->GetTriggerableEventFlags() |
ui::EF_MIDDLE_MOUSE_BUTTON);
-#endif
}
}
if (features::IsTabstripComboButtonEnabled()) {
tab_search_container_ = AddChildView(std::move(tab_search_container));
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2077,8 +2077,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2083,8 +2083,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 "
@@ -2089,7 +2087,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2095,7 +2093,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}

8
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
@@ -1118,6 +1118,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1117,6 +1117,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -10,7 +10,7 @@
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -45,6 +45,7 @@
@@ -44,6 +44,7 @@
#include "chrome/browser/ui/webui/signin_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
@@ -18,7 +18,7 @@
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
#include "chrome/browser/ui/webui/version/version_ui.h"
@@ -254,6 +255,7 @@ void RegisterChromeWebUIConfigs() {
@@ -249,6 +250,7 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<SiteEngagementUIConfig>());
map.AddWebUIConfig(std::make_unique<SyncInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<TranslateInternalsUIConfig>());
@@ -175,7 +175,7 @@
+#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -75,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view
@@ -71,6 +71,7 @@ bool IsSystemWebUIHost(std::string_view
// These hosts will also be suggested by BuiltinProvider.
base::span<const base::cstring_view> ChromeURLHosts() {
static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({

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

@@ -1,19 +1,9 @@
# Fix building with enable_service_discovery=false and enable_mds=false
--- a/chrome/browser/extensions/api/BUILD.gn
+++ b/chrome/browser/extensions/api/BUILD.gn
@@ -38,7 +38,6 @@ group("api_implementations") {
"//chrome/browser/extensions/api/extension_action",
"//chrome/browser/extensions/api/font_settings",
"//chrome/browser/extensions/api/idltest",
- "//chrome/browser/extensions/api/mdns",
"//chrome/browser/extensions/api/module",
"//chrome/browser/extensions/api/networking_private",
"//chrome/browser/extensions/api/notifications",
--- a/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
+++ b/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
@@ -40,37 +40,22 @@ DnsSdDeviceLister::DnsSdDeviceLister(
DnsSdDeviceLister::~DnsSdDeviceLister() {}
DnsSdDeviceLister::~DnsSdDeviceLister() = default;
void DnsSdDeviceLister::Discover() {
-#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)

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

@@ -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"
@@ -659,13 +660,17 @@ void FlagsState::GetFlagFeatureEntries(
@@ -657,13 +658,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);
@@ -1069,6 +1074,7 @@ bool FlagsState::IsSupportedFeature(cons
@@ -1064,6 +1069,7 @@ bool FlagsState::IsSupportedFeature(cons
if (!entry.InternalNameMatches(name))
continue;
if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))

2
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
@@ -325,7 +325,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
@@ -326,7 +326,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",

2
patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
View File

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

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

@@ -1,4 +1,6 @@
# Removes in order:
# 'Learn more' links on the performance page
# more 'Learn more' links on the performance page
# link to Chrome store on the extensions page when empty
# link to Chrome store in extensions page sidebar
# 'Tabs from other devices' entry on the History page sidebar
@@ -13,9 +15,6 @@
# 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
@@ -30,9 +29,58 @@
# unneeded elements from the profile menu
# the 'Learn more' link on crashed tabs
# the Third-party sign-in site settings (FedCM)
# non-functional AI options
# disable LiveCaption flag by default, this also removes non-functional Live Caption checkbox from media controls
# the new feature badges
--- a/chrome/app/settings_chromium_strings.grdp
+++ b/chrome/app/settings_chromium_strings.grdp
@@ -369,13 +369,13 @@
<!-- Performance Page -->
<message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
- Chromium frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Chromium fast. Your inactive tabs automatically become active again when you go back to them. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" id="learn-more" aria-description="$2"&gt;</ph>Learn more about Memory Saver<ph name="END_LINK">&lt;/a&gt;</ph>
+ Chromium frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Chromium fast. Your inactive tabs automatically become active again when you go back to them.
</message>
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the energy saver mode setting">
- Chromium conserves battery power by limiting background activity and visual effects, such as smooth scrolling and video frame rates. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" id="learn-more" aria-description="$2"&gt;</ph>Learn more about Energy Saver<ph name="END_LINK">&lt;/a&gt;</ph>
+ Chromium conserves battery power by limiting background activity and visual effects, such as smooth scrolling and video frame rates.
</message>
<message name="IDS_SETTINGS_PERFORMANCE_PRELOAD_TOGGLE_SUMMARY" desc="Summary for the preload pages setting">
- Chromium preloads pages which makes browsing and searching faster. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" id="learn-more" aria-description="$2"&gt;</ph>Learn more about preload pages<ph name="END_LINK">&lt;/a&gt;</ph>
+ Chromium preloads pages which makes browsing and searching faster.
</message>
<!-- Languages Page -->
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1183,7 +1183,7 @@
Active site
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP" desc="Help text shown on the second tab of the tab discarding exception list add dialog. Explains how to use the filter format to add an exclusion rule to the list.">
- Sites you add will always stay active and memory won't be freed up from them. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;</ph>Learn more about keeping specific sites active<ph name="END_LINK">&lt;/a&gt;</ph>
+ Sites you add will always stay active and memory won't be freed up from them.
</message>
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
Power
@@ -1207,7 +1207,7 @@
Inactive tabs appearance
</message>
<message name="IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK" desc="Label for a performance settings toggle description that controls whether the inactive tab UI is shown. Also contains a link to the help center article.">
- A dotted circle appears around site icons. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" aria-description="$2"&gt;</ph>Learn more about inactive tabs<ph name="END_LINK">&lt;/a&gt;</ph>
+ A dotted circle appears around site icons.
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_TITLE" desc="Title for the link row that points to tab hover preview card apperance settings.">
Tab hover preview card appearance
@@ -1219,7 +1219,7 @@
Performance issue alerts
</message>
<message name="IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION" desc="Label for a performance settings toggle that controls whether performance intervention notifications should be shown and link to learn more about performance issue alerts.">
- Get notifications that suggest ways to improve detected performance issues. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" aria-description="$2"&gt;</ph>Learn more about performance issue alerts<ph name="END_LINK">&lt;/a&gt;</ph>
+ Get notifications that suggest ways to improve detected performance issues.
</message>
<!-- Languages Page -->
--- a/chrome/browser/resources/extensions/item_list.html.ts
+++ b/chrome/browser/resources/extensions/item_list.html.ts
@@ -30,12 +30,6 @@ export function getHtml(this: Extensions
@@ -193,7 +241,7 @@
<div class="separator"></div>
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -521,15 +521,11 @@ export class SettingsAppearancePageEleme
@@ -503,15 +503,11 @@ export class SettingsAppearancePageEleme
i18nId = 'classicTheme';
break;
}
@@ -226,16 +274,7 @@
<template is="dom-if"
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -63,7 +63,7 @@
</settings-section>
<!-- TODO(crbug.com/40277421): Remove after SafetyHub launched. -->
<template is="dom-if"
- if="[[showSafetyCheckPage_(pageVisibility.safetyCheck)]]" restamp>
+ if="[[false]]" restamp>
<settings-section page-title="$i18n{safetyCheckSectionTitle}"
section="safetyCheck" nest-under-section="privacy"
id="safetyCheckSettingsSection">
@@ -75,7 +75,7 @@
@@ -65,7 +65,7 @@
to check that settings-safety-hub-entry-point is not visible
in the guest mode. -->
<template is="dom-if"
@@ -246,15 +285,15 @@
section="safetyHubEntryPoint" nest-under-section="privacy"
--- a/chrome/browser/resources/settings/basic_page/basic_page.ts
+++ b/chrome/browser/resources/settings/basic_page/basic_page.ts
@@ -12,7 +12,6 @@ import 'chrome://resources/cr_elements/c
import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
@@ -11,7 +11,6 @@ import 'chrome://resources/cr_elements/c
import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
import '../ai_page/ai_page.js';
import '../appearance_page/appearance_page.js';
-import '../privacy_page/privacy_guide/privacy_guide_promo.js';
import '../privacy_page/privacy_page.js';
import '../safety_check_page/safety_check_page.js';
import '../safety_hub/safety_hub_entry_point.js';
@@ -270,7 +269,6 @@ export class SettingsBasicPageElement ex
import '../autofill_page/autofill_page.js';
@@ -272,7 +271,6 @@ export class SettingsBasicPageElement ex
this.showPrivacyGuidePromo_ = false;
return;
}
@@ -262,37 +301,6 @@
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 @@
@@ -314,12 +322,12 @@
- label="$i18n{urlKeyedAnonymizedDataCollection}"
- sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
- </settings-toggle-button>
<template is="dom-if" if="[[enablePageContentSetting_]]">
<cr-link-row id="pageContentRow"
class="hr"
<template is="dom-if" if="[[shouldShowHistorySearchControl_(
showHistorySearchControl_, enableAiSettingsPageRefresh_)]]" restamp>
<cr-link-row id="historySearchRow"
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -229,10 +229,6 @@ export class SettingsPersonalizationOpti
@@ -205,10 +205,6 @@ export class SettingsPersonalizationOpti
'chrome-signin-user-choice-info-change',
this.setChromeSigninUserChoiceInfo_.bind(this));
// </if>
@@ -345,9 +353,9 @@
- role-description="$i18n{subpageArrowRoleDescription}">
- </cr-link-row>
- </template>
<template is="dom-if" if="[[is3pcdRedesignEnabled_]]">
<cr-link-row id="trackingProtectionLinkRow"
start-icon="settings:visibility-off"
<cr-link-row id="thirdPartyCookiesLinkRow"
start-icon="privacy:cookie"
class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -241,9 +241,3 @@
@@ -397,7 +405,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -933,16 +933,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -964,16 +964,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -416,20 +424,19 @@
////////////////////////////////////////////////////////////////////////////////
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -813,13 +813,6 @@ void BookmarkMenuDelegate::BuildMenu(con
ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
ui::SimpleMenuModel::kDefaultIconSize);
- menu->AppendMenuItem(
- IDC_SHOW_BOOKMARK_SIDE_PANEL,
- l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
- bookmarks_side_panel_icon);
- if (!parent->children().empty()) {
- menu->AppendSeparator();
- }
}
const ui::ImageModel folder_icon = chrome::GetBookmarkFolderIcon(
chrome::BookmarkFolderIconType::kNormal, ui::kColorMenuIcon);
@@ -1119,12 +1119,4 @@ void BookmarkMenuDelegate::BuildOtherNod
ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
ui::SimpleMenuModel::kDefaultIconSize);
- menu->AppendMenuItem(
- IDC_SHOW_BOOKMARK_SIDE_PANEL,
- l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
- bookmarks_side_panel_icon);
- if (!other_node->children().empty()) {
- menu->AppendSeparator();
- other_node_menu_separator_ = menu->GetSubmenu()->children().back().get();
- }
}
--- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
+++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
@@ -213,14 +213,7 @@ void CookieControlsContentView::SetEnfor
@@ -449,15 +456,15 @@
void CookieControlsContentView::AddDescriptionRow() {
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -219,6 +219,7 @@ void ProfileMenuView::BuildMenu() {
@@ -231,6 +231,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
+ return gfx::ImageSkia();
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession())
if (profile->IsOffTheRecord() || profile->IsGuestSession()) {
return gfx::ImageSkia();
@@ -579,16 +580,8 @@ void ProfileMenuView::BuildIdentity() {
@@ -659,16 +660,8 @@ void ProfileMenuView::BuildIdentity() {
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
std::string profile_user_display_name, profile_user_email;
@@ -487,7 +494,7 @@
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -669,22 +666,6 @@ void SadTabView::AttachToWebView() {
@@ -673,22 +670,6 @@ void SadTabView::AttachToWebView() {
}
}
@@ -512,7 +519,7 @@
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3436,7 +3436,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3441,7 +3441,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -521,9 +528,26 @@
base::CommandLine& cmd = *base::CommandLine::ForCurrentProcess();
html_source->AddBoolean(
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -625,13 +625,7 @@ SettingsUI::SettingsUI(content::WebUI* w
auto* optimization_guide_service =
OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
for (auto [key, name] : optimization_guide_features) {
- const bool visible = optimization_guide_service &&
- optimization_guide_service->IsSettingVisible(key);
- html_source->AddBoolean(name, visible);
-
- // The main toggle is visible only if at least one of the sub toggles is
- // visible.
- is_any_ai_feature_enabled |= visible;
+ html_source->AddBoolean(name, false);
}
html_source->AddBoolean("showAdvancedFeaturesMainControl",
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -865,7 +865,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
@@ -872,7 +872,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
#endif
// Enables the Live Caption feature on supported devices.
@@ -534,7 +558,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
@@ -836,7 +836,7 @@ void MenuItemView::SetAlerted() {
@@ -860,7 +860,7 @@ void MenuItemView::SetAlerted() {
}
bool MenuItemView::ShouldShowNewBadge() const {

2
patches/upstream-fixes/glue_core_pools.patch
View File

@@ -3,7 +3,7 @@
# This removes the remaining references needed to build
--- a/base/allocator/partition_allocator/partition_alloc.gni
+++ b/base/allocator/partition_allocator/partition_alloc.gni
@@ -193,9 +193,6 @@ declare_args() {
@@ -194,9 +194,6 @@ declare_args() {
force_enable_raw_ptr_exclusion = false
}

2
patches/upstream-fixes/hardware_destructive_interference_size.patch
View File

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

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

@@ -1,46 +1,16 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -877,6 +877,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
+ "//components/safe_browsing/content/common/proto:download_file_types_proto",
"//components/safe_browsing/core/browser/db:database_manager",
"//components/safe_browsing/core/common",
"//components/safe_browsing/core/common:safe_browsing_prefs",
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/browser_commands.h"
#include <memory>
+#include <numeric>
#include <optional>
#include <utility>
#include <vector>
--- a/chrome/browser/ui/lens/lens_overlay_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_controller.cc
@@ -15,6 +15,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/browser/ui/webui/searchbox/searchbox_handler.cc
+++ b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
@@ -6,6 +6,7 @@
#include "base/base64.h"
#include "base/base64url.h"
+#include "base/containers/contains.h"
#include "build/branding_buildflags.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_process.h"
@@ -885,6 +885,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
+ "//components/safe_browsing/content/common/proto:download_file_types_proto",
"//components/safe_browsing/core/browser/db:database_manager",
"//components/safe_browsing/core/common",
"//components/safe_browsing/core/common:safe_browsing_prefs",
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -555,6 +555,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",
@@ -50,7 +20,7 @@
}
--- a/components/component_updater/installer_policies/BUILD.gn
+++ b/components/component_updater/installer_policies/BUILD.gn
@@ -45,6 +45,7 @@ static_library("installer_policies_no_co
@@ -47,6 +47,7 @@ static_library("installer_policies_no_co
"//components/update_client",
"//mojo/public/cpp/base:protobuf_support",
"//services/network/public/cpp",
@@ -60,7 +30,7 @@
# Disallow depending on content.
--- a/components/plus_addresses/BUILD.gn
+++ b/components/plus_addresses/BUILD.gn
@@ -126,6 +126,7 @@ source_set("plus_addresses") {
@@ -127,6 +127,7 @@ source_set("plus_addresses") {
"//net",
"//services/data_decoder/public/cpp",
"//services/network/public/cpp",
@@ -70,14 +40,14 @@
public_deps = [
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -106,6 +106,7 @@ source_set("browser") {
@@ -104,6 +104,7 @@ source_set("browser") {
"//components/file_access",
"//components/filename_generation",
"//components/input",
+ "//components/lens:buildflags",
"//components/language_detection/content/common",
"//components/link_header_util",
"//components/metrics",
"//components/metrics:single_sample_metrics",
--- a/services/passage_embeddings/BUILD.gn
+++ b/services/passage_embeddings/BUILD.gn
@@ -31,6 +31,7 @@ source_set("passage_embeddings") {
@@ -85,10 +55,10 @@
deps = [
+ "//components/optimization_guide:machine_learning_tflite_buildflags",
"//components/history_embeddings",
"//services/passage_embeddings/public/mojom",
"//third_party/sentencepiece:sentencepiece",
@@ -39,7 +40,6 @@ source_set("passage_embeddings") {
"//third_party/sentencepiece:sentencepiece_proto",
@@ -38,7 +39,6 @@ source_set("passage_embeddings") {
if (build_with_tflite_lib) {
deps += [

1121
pruning.list
View File

File diff suppressed because it is too large Load Diff