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 130.0.6723.58

Browse Source
This commit is contained in:
Blaise
2024-10-09 18:30:59 -05:00
parent 71bfa42ec4
commit 962eb12897
67 changed files with 1231 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
129.0.6668.100
130.0.6723.58

2
devutils/update_lists.py
View File

@@ -58,6 +58,8 @@ PRUNING_EXCLUDE_PATTERNS = [
'build/android/chromium-debug.keystore',
'third_party/icu/android/icudtl.dat',
'third_party/icu/common/icudtb.dat',
# Exclusion for rollup v4.0+
'third_party/node/node_modules/@rollup/wasm-node/dist/wasm-node/bindings_wasm_bg.wasm',
# Exclusion for performance tracing
'third_party/perfetto/src/trace_processor/importers/proto/atoms.descriptor',
# Exclusions for safe file extensions

513
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

2
patches/core/bromite/disable-fetching-field-trials.patch
View File

@@ -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
@@ -226,17 +226,7 @@ bool GetInstanceManipulations(const net:
@@ -227,17 +227,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() {

75
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
@@ -2241,7 +2241,6 @@ static_library("browser") {
@@ -2251,7 +2251,6 @@ static_library("browser") {
"//components/reporting/util:task_runner_context",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -8,7 +8,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3613,8 +3612,6 @@ static_library("browser") {
@@ -3636,8 +3635,6 @@ static_library("browser") {
"download/download_commands.h",
"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"
@@ -452,8 +451,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -478,8 +477,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)
@@ -1136,14 +1133,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1166,14 +1163,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_);
@@ -1444,26 +1433,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1485,26 +1474,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -111,7 +111,7 @@
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
subresource_filter::RulesetService*
@@ -366,9 +365,6 @@ class BrowserProcessImpl : public Browse
@@ -368,9 +367,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -131,7 +131,7 @@
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/share/share_history.h"
@@ -662,10 +661,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -645,10 +644,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
@@ -5506,10 +5506,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5512,10 +5512,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),
@@ -5561,16 +5557,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5567,16 +5563,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>(
@@ -5885,8 +5871,6 @@ bool ChromeContentBrowserClient::IsPlugi
@@ -5897,8 +5883,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
@@ -532,13 +532,6 @@ void ChromeDownloadManagerDelegate::SetD
@@ -533,13 +533,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
@@ -221,7 +221,7 @@
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -973,17 +966,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -1007,17 +1000,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;
@@ -555,13 +555,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -531,13 +531,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;
}
@@ -764,9 +764,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -740,9 +740,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
@@ -261,14 +261,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
@@ -257,14 +257,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
@@ -295,7 +295,7 @@
}
}
@@ -446,10 +439,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -442,10 +435,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -308,7 +308,7 @@
extension.erase(0, 1);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -333,13 +333,6 @@ base::FilePath DownloadTargetDeterminer:
@@ -324,13 +324,6 @@ base::FilePath DownloadTargetDeterminer:
download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
suggested_filename, sniffed_mime_type, default_filename);
@@ -322,7 +322,7 @@
// If no mime type or explicitly specified a name, don't replace file
// extension.
if (sniffed_mime_type.empty() || !suggested_filename.empty())
@@ -1364,30 +1357,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -1316,30 +1309,7 @@ DownloadFileType::DangerLevel DownloadTa
download_->HasUserGesture())
return DownloadFileType::NOT_DANGEROUS;
@@ -364,7 +364,7 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1378,9 +1377,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1379,9 +1378,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@@ -374,7 +374,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1418,42 +1414,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1419,42 +1415,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -656,7 +656,7 @@
#include "chrome/browser/sessions/exit_type_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
@@ -643,17 +642,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -646,17 +645,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -696,7 +696,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -73,6 +74,7 @@ static_library("safe_browsing") {
@@ -74,6 +75,7 @@ static_library("safe_browsing") {
"//mojo/public/cpp/system",
"//services/preferences/public/cpp",
]
@@ -704,7 +704,7 @@
if (is_android) {
deps += [
@@ -520,6 +522,7 @@ static_library("advanced_protection") {
@@ -525,6 +527,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -712,7 +712,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -539,6 +542,7 @@ source_set("metrics_collector") {
@@ -544,6 +547,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -818,7 +818,7 @@
}
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4404,7 +4404,6 @@ static_library("ui") {
@@ -4294,7 +4294,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h",
@@ -828,7 +828,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -507,32 +507,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -512,37 +512,8 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -837,6 +837,9 @@
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
- GetForBrowserContext(profile),
- profile->GetPrefs(), g_browser_process->safe_browsing_service());
site_protection::SiteProtectionMetricsObserver::CreateForWebContents(
web_contents);
-
- if (base::FeatureList::IsEnabled(
- safe_browsing::kTailoredSecurityIntegration)) {
- safe_browsing::TailoredSecurityUrlObserver::CreateForWebContents(
@@ -847,7 +850,9 @@
- safe_browsing::kSafeBrowsingAsyncRealTimeCheck) &&
- g_browser_process->safe_browsing_service()) {
- safe_browsing::AsyncCheckTracker::CreateForWebContents(
- web_contents, g_browser_process->safe_browsing_service()->ui_manager());
- web_contents, g_browser_process->safe_browsing_service()->ui_manager(),
- safe_browsing::AsyncCheckTracker::
- IsPlatformEligibleForSyncCheckerCheckAllowlist());
- }
- // SafeBrowsingTabObserver creates a ClientSideDetectionHost, which observes
- // events from PermissionRequestManager and AsyncCheckTracker in its
@@ -996,8 +1001,8 @@
-
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
std::unique_ptr<SupervisedUserVerificationPage>
CreateSupervisedUserVerificationPage(content::WebContents* web_contents) {
@@ -411,61 +324,6 @@ CreateSupervisedUserVerificationPageForB
CreateSupervisedUserVerificationPage(content::WebContents* web_contents,
@@ -415,61 +328,6 @@ CreateSupervisedUserVerificationPageForB
}
#endif
@@ -1059,7 +1064,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -572,12 +430,8 @@ void InterstitialHTMLSource::StartDataRe
@@ -576,12 +434,8 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1072,7 +1077,7 @@
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -599,12 +453,7 @@ void InterstitialHTMLSource::StartDataRe
@@ -611,12 +465,7 @@ void InterstitialHTMLSource::StartDataRe
#endif
}
@@ -1088,15 +1093,15 @@
html = interstitial_delegate.get()->GetHTMLContents();
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -107,7 +107,6 @@
@@ -109,7 +109,6 @@
#include "components/pdf/common/pdf_util.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/buildflags.h"
-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
#include "components/sampling_profiler/thread_profiler.h"
#include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
#include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
@@ -458,12 +457,8 @@ void ChromeContentRendererClient::Render
@@ -473,12 +472,8 @@ void ChromeContentRendererClient::Render
subresource_filter_ruleset_dealer_ =
std::make_unique<subresource_filter::UnverifiedRulesetDealer>();

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

2
patches/core/inox-patchset/0015-disable-update-pings.patch
View File

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

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

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

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

@@ -595,9 +595,9 @@ by default.
+ "trk:099:https://www.googleapis.com/auth/assistant-sdk-prototype";
// OAuth2 scope for access to nearby devices (fast pair) APIs.
const char kCloudPlatformProjectsOAuth2Scope[] =
- "https://www.googleapis.com/auth/cloudplatformprojects";
+ "trk:100:https://www.googleapis.com/auth/cloudplatformprojects";
const char kNearbyDevicesOAuth2Scope[] =
- "https://www.googleapis.com/auth/nearbydevices-pa";
+ "trk:100:https://www.googleapis.com/auth/nearbydevices-pa";
// OAuth2 scope for access to nearby sharing.
const char kNearbyShareOAuth2Scope[] =

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

@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
IncidentReportingService::IncidentReportingService(
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -373,7 +373,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -372,7 +372,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::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
@@ -271,6 +271,10 @@ void ClientSideDetectionService::StartCl
@@ -277,6 +277,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);
@@ -350,6 +354,7 @@ void ClientSideDetectionService::StartCl
@@ -357,6 +361,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

@@ -48,7 +48,7 @@
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
@@ -126,6 +126,9 @@ AffiliationFetcherDelegate* HashAffiliat
@@ -121,6 +121,9 @@ AffiliationFetcherDelegate* HashAffiliat
}
void HashAffiliationFetcher::StartRequest(
@@ -80,7 +80,7 @@
if (state_ == REQUESTING) {
--- a/components/update_client/update_checker.cc
+++ b/components/update_client/update_checker.cc
@@ -102,6 +102,7 @@ void UpdateCheckerImpl::CheckForUpdates(
@@ -104,6 +104,7 @@ void UpdateCheckerImpl::CheckForUpdates(
scoped_refptr<UpdateContext> context,
const base::flat_map<std::string, std::string>& additional_attributes,
UpdateCheckCallback update_check_callback) {

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
@@ -165,7 +165,8 @@ int GetIndexOfExistingTab(Browser* brows
@@ -123,7 +123,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.
@@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -855,6 +855,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -854,6 +854,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterWebSafeScheme(url::kWssScheme);
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kDataScheme);
@@ -70,7 +70,7 @@
// other origins, so we should not treat them as web safe. Remove callers of
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1034,6 +1034,8 @@ component("net") {
@@ -1048,6 +1048,8 @@ component("net") {
"url_request/referrer_policy.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -150,7 +150,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
@@ -51,6 +52,7 @@
@@ -52,6 +53,7 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -158,7 +158,7 @@
namespace net {
@@ -618,6 +620,12 @@ URLRequest::URLRequest(base::PassKey<URL
@@ -619,6 +621,12 @@ URLRequest::URLRequest(base::PassKey<URL
// Sanity check out environment.
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());

2
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
@@ -2748,24 +2748,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2757,24 +2757,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}

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

@@ -25,7 +25,7 @@
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
#include "chrome/common/bound_session_request_throttled_handler.h"
#include "net/cookies/cookie_util.h"
@@ -149,67 +145,6 @@ void GoogleURLLoaderThrottle::DetachFrom
@@ -149,71 +145,6 @@ void GoogleURLLoaderThrottle::DetachFrom
void GoogleURLLoaderThrottle::WillStartRequest(
network::ResourceRequest* request,
bool* defer) {
@@ -69,7 +69,11 @@
- is_main_frame_navigation_ =
- request->is_outermost_main_frame &&
- request->destination == network::mojom::RequestDestination::kDocument;
- sends_cookies_ = request->SendsCookies();
- // TODO(crbug.com/372169462): `request->SendsCookies()` cannot be used for now
- // because it excludes `kSameOrigin` requests.
- sends_cookies_ =
- request->credentials_mode == network::mojom::CredentialsMode::kInclude ||
- request->credentials_mode == network::mojom::CredentialsMode::kSameOrigin;
- if (sends_cookies_) {
- RequestBoundSessionStatus status = GetRequestBoundSessionStatus(
- request->url, dynamic_params_->bound_session_throttler_params);
@@ -93,7 +97,7 @@
}
void GoogleURLLoaderThrottle::WillRedirectRequest(
@@ -219,96 +154,12 @@ void GoogleURLLoaderThrottle::WillRedire
@@ -223,96 +154,12 @@ void GoogleURLLoaderThrottle::WillRedire
std::vector<std::string>* to_be_removed_headers,
net::HttpRequestHeaders* modified_headers,
net::HttpRequestHeaders* modified_cors_exempt_headers) {
@@ -546,7 +550,7 @@
bool IsGoogleHostname(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -589,11 +589,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -590,11 +590,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -670,7 +674,7 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -754,7 +754,7 @@ void PrefetchContainer::AddRedirectHop(c
@@ -849,7 +849,7 @@ void PrefetchContainer::AddRedirectHop(c
// some which are added by throttles). These aren't yet supported for
// prefetch, including browsing topics and client hints.
net::HttpRequestHeaders updated_headers;
@@ -681,7 +685,7 @@
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -495,28 +495,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -493,28 +493,6 @@ bool HasGoogleHost(const GURL& url) {
}
bool IsGoogleHost(std::string_view host) {

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -386,7 +386,6 @@ if (!is_android && !is_mac) {
@@ -394,7 +394,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -17,7 +17,7 @@
if (invoker.collect_inputs_only) {
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -96,11 +96,6 @@ group("resources") {
@@ -95,11 +95,6 @@ group("resources") {
public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
}

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

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

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

@@ -11,7 +11,7 @@
"AttributionAggregatableDebugReporting",
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -125,7 +125,7 @@ std::set<browsing_topics::Topic> GetTopi
@@ -127,7 +127,7 @@ std::set<browsing_topics::Topic> GetTopi
// static
bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -20,7 +20,7 @@
}
// static
@@ -775,7 +775,7 @@ void PrivacySandboxSettingsImpl::SetTopi
@@ -822,7 +822,7 @@ void PrivacySandboxSettingsImpl::SetTopi
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -29,7 +29,7 @@
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
@@ -844,11 +844,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
@@ -891,11 +891,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
return Status::kIncognitoProfile;
}

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

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

@@ -1,3 +1,14 @@
--- a/chrome/browser/net/default_dns_over_https_config_source.cc
+++ b/chrome/browser/net/default_dns_over_https_config_source.cc
@@ -25,7 +25,7 @@ DefaultDnsOverHttpsConfigSource::Default
if (set_up_pref_defaults) {
local_state->SetDefaultPrefValue(prefs::kDnsOverHttpsMode,
base::Value(SecureDnsConfig::ModeToString(
- net::SecureDnsMode::kAutomatic)));
+ net::SecureDnsMode::kOff)));
}
}
--- a/chrome/browser/net/dns_probe_runner.cc
+++ b/chrome/browser/net/dns_probe_runner.cc
@@ -18,7 +18,7 @@
@@ -9,17 +20,6 @@
namespace {
--- a/chrome/browser/net/stub_resolver_config_reader.cc
+++ b/chrome/browser/net/stub_resolver_config_reader.cc
@@ -125,7 +125,7 @@ StubResolverConfigReader::StubResolverCo
base::Value(ShouldEnableAsyncDns()));
local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsMode,
base::Value(SecureDnsConfig::ModeToString(
- net::SecureDnsMode::kAutomatic)));
+ net::SecureDnsMode::kOff)));
}
pref_change_registrar_.Add(prefs::kBuiltInDnsClientEnabled, pref_callback);
--- a/net/dns/public/doh_provider_entry.cc
+++ b/net/dns/public/doh_provider_entry.cc
@@ -166,30 +166,6 @@ const DohProviderEntry::List& DohProvide

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

@@ -99,7 +99,7 @@
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -470,9 +470,9 @@ content::WebUIDataSource* CreateAndAddEx
@@ -471,9 +471,9 @@ content::WebUIDataSource* CreateAndAddEx
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
source->AddBoolean(
"safetyCheckShowReviewPanel",

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

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -387,7 +387,6 @@ if (!is_android && !is_mac) {
@@ -395,7 +395,6 @@ if (!is_android && !is_mac) {
data_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -11,7 +11,7 @@
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -957,8 +956,6 @@ if (is_win) {
@@ -964,8 +963,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -22,7 +22,7 @@
# from disk image and Keystone promotion (if so enabled). It
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -785,10 +785,6 @@ static_library("browser") {
@@ -774,10 +774,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",
@@ -32,8 +32,8 @@
- "navigation_predictor/preloading_model_keyed_service_factory.h",
"navigation_predictor/search_engine_preconnector.cc",
"navigation_predictor/search_engine_preconnector.h",
"net/chrome_mojo_proxy_resolver_factory.cc",
@@ -907,10 +903,6 @@ static_library("browser") {
"net/cert_verifier_service_time_updater.cc",
@@ -897,10 +893,6 @@ static_library("browser") {
"optimization_guide/chrome_prediction_model_store.h",
"optimization_guide/model_execution/chrome_on_device_model_service_controller.cc",
"optimization_guide/model_execution/chrome_on_device_model_service_controller.h",
@@ -44,7 +44,7 @@
"optimization_guide/optimization_guide_internals_ui.cc",
"optimization_guide/optimization_guide_internals_ui.h",
"optimization_guide/optimization_guide_keyed_service.cc",
@@ -3459,10 +3451,6 @@ static_library("browser") {
@@ -3477,10 +3469,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
@@ -56,7 +56,7 @@
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4241,10 +4229,6 @@ static_library("browser") {
"//chrome/browser/new_tab_page/chrome_colors",
"//chrome/browser/on_device_translation:prefs",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resources:component_extension_resources",
- "//chrome/browser/screen_ai:prefs",
@@ -66,7 +66,7 @@
"//chrome/browser/search/background",
"//chrome/browser/smart_card",
"//chrome/browser/task_manager",
@@ -4326,9 +4310,6 @@ static_library("browser") {
@@ -4340,9 +4324,6 @@ static_library("browser") {
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/bluetooth",
"//services/device/public/cpp/hid",
@@ -76,7 +76,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4379,8 +4360,6 @@ static_library("browser") {
@@ -4399,8 +4380,6 @@ static_library("browser") {
#!is_android
if (!is_chromeos) {
sources += [
@@ -85,7 +85,7 @@
"device_notifications/device_status_icon_renderer.cc",
"device_notifications/device_status_icon_renderer.h",
"external_protocol/auto_launch_protocols_policy_handler.cc",
@@ -4397,8 +4376,6 @@ static_library("browser") {
@@ -4417,8 +4396,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",
@@ -94,15 +94,15 @@
"usb/usb_status_icon.cc",
"usb/usb_status_icon.h",
]
@@ -5118,7 +5095,6 @@ static_library("browser") {
@@ -5121,7 +5098,6 @@ static_library("browser") {
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/resources:app_icon_resources",
"//chrome/browser/scalable_iph:scalable_iph_factory",
- "//chrome/browser/screen_ai:screen_ai_dlc_installer",
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash",
"//chrome/browser/ui/ash/accessibility",
"//chrome/browser/ui/ash/annotator",
@@ -5302,7 +5278,6 @@ static_library("browser") {
"//chrome/browser/ui/ash/accelerator",
@@ -5338,7 +5314,6 @@ static_library("browser") {
"//components/webapk:proto",
"//device/vr/public/mojom:isolated_xr_service",
"//remoting/host/chromeos:features",
@@ -110,7 +110,7 @@
"//third_party/nearby:rpc_resources_proto",
"//third_party/nearby:wire_format_proto",
"//ui/chromeos",
@@ -7831,22 +7806,6 @@ static_library("browser") {
@@ -7934,22 +7909,6 @@ static_library("browser") {
}
}
@@ -135,7 +135,7 @@
sources += [
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -238,12 +238,10 @@
@@ -245,12 +245,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"
@@ -148,7 +148,7 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1300,9 +1298,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1330,9 +1328,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -170,7 +170,7 @@
// Real implementation of BrowserProcess that creates and returns the services.
class BrowserProcessImpl : public BrowserProcess,
@@ -423,9 +420,6 @@ class BrowserProcessImpl : public Browse
@@ -425,9 +422,6 @@ class BrowserProcessImpl : public Browse
// to ensure that SodaInstallerImpl gets destructed first.
std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
@@ -182,7 +182,7 @@
std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
--- a/chrome/browser/chrome_browser_interface_binders.cc
+++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -221,8 +221,6 @@
@@ -223,8 +223,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
@@ -191,7 +191,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"
@@ -845,38 +843,6 @@ void BindMediaFoundationPreferences(
@@ -858,38 +856,6 @@ void BindMediaFoundationPreferences(
}
#endif // BUILDFLAG(IS_WIN)
@@ -230,7 +230,7 @@
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// A helper class to register ChromeOS Apps API binders. This includes the logic
@@ -1073,21 +1039,6 @@ void PopulateChromeFrameBinders(
@@ -1093,21 +1059,6 @@ void PopulateChromeFrameBinders(
base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
}
@@ -263,7 +263,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
@@ -207,9 +205,6 @@ void RegisterComponentsForUpdate() {
@@ -208,9 +206,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
@@ -296,7 +296,7 @@
bool MLModelOneExecutionPerHover() {
static bool one_execution_per_hover =
@@ -421,87 +414,6 @@ void NavigationPredictor::ProcessPointer
@@ -424,87 +417,6 @@ void NavigationPredictor::ProcessPointer
}
void NavigationPredictor::OnMLModelExecutionTimerFired() {
@@ -386,7 +386,7 @@
void NavigationPredictor::SetModelScoreCallbackForTesting(
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1743,9 +1743,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1825,9 +1825,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -398,7 +398,7 @@
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -98,7 +98,6 @@
@@ -100,7 +100,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"
@@ -406,15 +406,15 @@
#include "chrome/browser/net/dns_probe_service_factory.h"
#include "chrome/browser/net/profile_network_context_service_factory.h"
#include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h"
@@ -489,7 +488,6 @@
#include "chrome/browser/new_tab_page/one_google_bar/one_google_bar_service_factory.h"
@@ -502,7 +501,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"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/serial/serial_chooser_context_factory.h"
@@ -977,7 +975,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1000,7 +998,6 @@ void ChromeBrowserMainExtraPartsProfiles
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
NavigationPredictorKeyedServiceFactory::GetInstance();
@@ -422,7 +422,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -1026,9 +1023,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1049,9 +1046,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -432,7 +432,7 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1174,13 +1168,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1204,13 +1198,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
SafetyHubMenuNotificationServiceFactory::GetInstance();
SafetyHubHatsServiceFactory::GetInstance();
@@ -448,7 +448,7 @@
search_engines::SearchEngineChoiceServiceFactory::GetInstance();
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -853,18 +853,6 @@ void ProfileImpl::DoFinalInit(CreateMode
@@ -856,18 +856,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);
@@ -477,7 +477,7 @@
#include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/delete_profile_helper.h"
@@ -1530,9 +1529,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1541,9 +1540,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -489,7 +489,7 @@
#if BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -99,7 +99,6 @@ group("resources") {
@@ -98,7 +98,6 @@ group("resources") {
if (is_mac) {
public_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -499,7 +499,7 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2010,8 +2010,6 @@ static_library("ui") {
@@ -1945,8 +1945,6 @@ static_library("ui") {
"//chrome/browser/new_tab_page/chrome_colors",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
@@ -508,7 +508,7 @@
"//chrome/browser/task_manager:impl",
"//chrome/browser/themes",
"//chrome/browser/ui/apps",
@@ -2574,7 +2572,6 @@ static_library("ui") {
@@ -2497,7 +2495,6 @@ static_library("ui") {
"//chrome/browser/policy:onc",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/scalable_iph:scalable_iph_factory",
@@ -612,7 +612,7 @@
} // namespace settings
--- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
+++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
@@ -18,8 +18,6 @@
@@ -20,8 +20,6 @@
#include "chrome/browser/browser_features.h"
#include "chrome/browser/language/language_model_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -621,7 +621,7 @@
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -314,19 +312,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -320,19 +318,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
@@ -641,7 +641,7 @@
// Enable accessibility for the top level render frame and all descendants.
// This causes AXTreeSerializer to reset and send accessibility events of
@@ -681,9 +666,6 @@ void ReadAnythingUntrustedPageHandler::S
@@ -722,9 +707,6 @@ void ReadAnythingUntrustedPageHandler::S
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
}
}
@@ -653,7 +653,7 @@
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -410,18 +410,6 @@ static_library("renderer") {
@@ -383,18 +383,6 @@ static_library("renderer") {
]
} else {
sources += [
@@ -672,7 +672,7 @@
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -435,7 +423,6 @@ static_library("renderer") {
@@ -408,7 +396,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
@@ -682,7 +682,15 @@
]
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -320,21 +320,6 @@ void ChromeRenderFrameObserver::DidCommi
@@ -69,7 +69,6 @@
#include "url/gurl.h"
#if !BUILDFLAG(IS_ANDROID)
-#include "chrome/renderer/accessibility/read_anything_app_controller.h"
#include "chrome/renderer/searchbox/searchbox_extension.h"
#endif // !BUILDFLAG(IS_ANDROID)
@@ -320,21 +319,6 @@ void ChromeRenderFrameObserver::DidCommi
}
void ChromeRenderFrameObserver::DidClearWindowObject() {
@@ -706,7 +714,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1816,9 +1816,6 @@ if (!is_android) {
@@ -1959,9 +1959,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",
@@ -716,17 +724,17 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2074,9 +2071,6 @@ if (!is_android) {
"//components/tpcd/metadata/common/proto",
"//components/user_annotations",
"//components/variations/service",
@@ -2334,9 +2331,6 @@ if (!is_android) {
"//services/network/public/proto:sct_audit_report_proto",
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
- "//services/screen_ai:test_support",
- "//services/screen_ai/public/cpp:utilities",
- "//services/screen_ai/public/mojom",
# TODO(b/287255120) : Also add this as a dependency on Android for building test code.
"//chrome/browser/enterprise/watermark:watermark_view_lib",
@@ -8148,7 +8142,6 @@ test("unit_tests") {
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -8236,7 +8230,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target.
deps += [
@@ -734,7 +742,7 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -8263,7 +8256,6 @@ test("unit_tests") {
@@ -8366,7 +8359,6 @@ test("unit_tests") {
"//services/device/public/cpp/bluetooth",
"//services/metrics/public/cpp:ukm_builders",
"//services/network:test_support",
@@ -742,18 +750,18 @@
"//services/video_effects/test:test_support",
"//third_party/crashpad/crashpad/util",
"//third_party/libaddressinput",
@@ -8592,8 +8584,6 @@ test("unit_tests") {
@@ -8683,8 +8675,6 @@ test("unit_tests") {
"//chrome/browser/push_notification",
"//chrome/browser/push_notification:test_support",
"//chrome/browser/push_notification/protos:proto",
- "//chrome/browser/screen_ai:unit_tests",
- "//chrome/browser/screen_ai/public:test_support",
"//chrome/browser/support_tool/ash:unit_tests",
"//chrome/browser/task_manager:impl",
"//chrome/browser/ui/ash",
"//chrome/browser/ui/ash:test_support",
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -405,7 +405,7 @@ source_set("lib") {
@@ -404,7 +404,7 @@ source_set("lib") {
}
}
@@ -816,7 +824,7 @@
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
--- a/components/omnibox/browser/autocomplete_classifier.cc
+++ b/components/omnibox/browser/autocomplete_classifier.cc
@@ -102,8 +102,6 @@ void AutocompleteClassifier::Classify(
@@ -94,8 +94,6 @@ void AutocompleteClassifier::Classify(
metrics::OmniboxEventProto::PageClassification page_classification,
AutocompleteMatch* match,
GURL* alternate_nav_url) {
@@ -847,7 +855,7 @@
#include "pdf/pdf_features.h"
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -316,8 +316,6 @@ source_set("unit_tests") {
@@ -339,8 +339,6 @@ source_set("unit_tests") {
"//third_party/puffin:libpuffpatch",
"//third_party/re2",
]
@@ -858,7 +866,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -804,10 +804,6 @@ if (is_apple) {
@@ -805,10 +805,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -911,7 +919,7 @@
}
--- a/third_party/devtools-frontend/src/BUILD.gn
+++ b/third_party/devtools-frontend/src/BUILD.gn
@@ -16,7 +16,6 @@ import("./third_party/typescript/typescr
@@ -16,7 +16,6 @@ import("./third_party/blink/public/publi
devtools_frontend_resources_deps = [
":favicon",
"front_end",
@@ -921,7 +929,7 @@
group("devtools_all_files") {
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
@@ -193,7 +193,6 @@ group("unittests") {
@@ -194,7 +194,6 @@ group("unittests") {
"panels/timeline:unittests",
"panels/timeline/components:unittests",
"panels/timeline/components/insights:unittests",

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -636,8 +636,6 @@ static_library("browser") {
@@ -625,8 +625,6 @@ static_library("browser") {
"internal_auth.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -11,7 +11,7 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"k_anonymity_service/k_anonymity_service_client.cc",
@@ -3837,10 +3835,6 @@ static_library("browser") {
@@ -3853,10 +3851,6 @@ static_library("browser") {
"new_tab_page/modules/modules_util.h",
"new_tab_page/modules/new_tab_page_modules.cc",
"new_tab_page/modules/new_tab_page_modules.h",
@@ -22,7 +22,7 @@
"new_tab_page/modules/v2/calendar/google_calendar_page_handler.cc",
"new_tab_page/modules/v2/calendar/google_calendar_page_handler.h",
"new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.cc",
@@ -6634,8 +6628,6 @@ static_library("browser") {
@@ -6712,8 +6706,6 @@ static_library("browser") {
if (enterprise_cloud_content_analysis) {
sources += [
@@ -31,7 +31,7 @@
"enterprise/connectors/analysis/content_analysis_delegate_base.h",
"enterprise/connectors/analysis/content_analysis_dialog.cc",
"enterprise/connectors/analysis/content_analysis_dialog.h",
@@ -6643,8 +6635,6 @@ static_library("browser") {
@@ -6721,8 +6713,6 @@ static_library("browser") {
"enterprise/connectors/analysis/content_analysis_downloads_delegate.h",
"enterprise/connectors/analysis/files_request_handler.cc",
"enterprise/connectors/analysis/files_request_handler.h",
@@ -39,8 +39,8 @@
- "enterprise/connectors/analysis/page_print_analysis_request.h",
"enterprise/connectors/analysis/request_handler_base.cc",
"enterprise/connectors/analysis/request_handler_base.h",
"enterprise/connectors/common.cc",
@@ -7249,12 +7239,6 @@ static_library("browser") {
"enterprise/connectors/reporting/browser_crash_event_router.cc",
@@ -7333,12 +7323,6 @@ static_library("browser") {
}
}
@@ -53,7 +53,7 @@
if (enable_captive_portal_detection) {
sources += [
@@ -8104,9 +8088,14 @@ static_library("browser") {
@@ -8221,9 +8205,14 @@ static_library("browser") {
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
"//components/safe_browsing/content/browser/download:download_stats",
"//components/safe_browsing/content/common:file_type_policies",
@@ -69,17 +69,17 @@
if (build_with_tflite_lib) {
sources += [
@@ -8413,7 +8402,6 @@ static_library("browser_generated_files"
@@ -8518,7 +8507,6 @@ static_library("browser_generated_files"
"//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info",
"//chrome/browser/new_tab_page/chrome_colors:generate_colors_info",
"//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings",
- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/tab_resumption:mojo_bindings",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5539,11 +5539,13 @@ ChromeContentBrowserClient::CreateThrott
@@ -5545,11 +5545,13 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -93,7 +93,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -7338,26 +7340,7 @@ ChromeContentBrowserClient::GetSafeBrows
@@ -7361,26 +7363,7 @@ ChromeContentBrowserClient::GetSafeBrows
const std::vector<std::string>& allowlist_domains) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -121,7 +121,7 @@
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -7378,11 +7361,6 @@ ChromeContentBrowserClient::GetUrlLookup
@@ -7401,11 +7384,6 @@ ChromeContentBrowserClient::GetUrlLookup
GetForProfile(profile);
}
#endif
@@ -133,10 +133,10 @@
return nullptr;
}
@@ -7394,32 +7372,7 @@ ChromeContentBrowserClient::GetAsyncChec
@@ -7417,34 +7395,7 @@ ChromeContentBrowserClient::GetAsyncChec
safe_browsing::hash_realtime_utils::HashRealTimeSelection
hash_realtime_selection,
int frame_tree_node_id) {
content::FrameTreeNodeId frame_tree_node_id) {
- content::WebContents* contents = wc_getter.Run();
- if (!contents || !safe_browsing_service_ ||
- !safe_browsing_service_->ui_manager()) {
@@ -162,7 +162,9 @@
- return nullptr;
- }
- return safe_browsing::AsyncCheckTracker::GetOrCreateForWebContents(
- contents, safe_browsing_service_->ui_manager().get());
- contents, safe_browsing_service_->ui_manager().get(),
- safe_browsing::AsyncCheckTracker::
- IsPlatformEligibleForSyncCheckerCheckAllowlist());
}
void ChromeContentBrowserClient::ReportLegacyTechEvent(
@@ -217,7 +219,7 @@
}
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -162,7 +162,6 @@ using content::DownloadManager;
@@ -163,7 +163,6 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -225,7 +227,7 @@
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -691,15 +690,6 @@ bool ChromeDownloadManagerDelegate::Shou
@@ -697,15 +696,6 @@ bool ChromeDownloadManagerDelegate::Shou
#endif
bool should_open = download_prefs_->IsAutoOpenEnabled(url, path);
@@ -241,7 +243,7 @@
return should_open;
}
@@ -1696,7 +1686,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -1729,7 +1719,6 @@ void ChromeDownloadManagerDelegate::OnDo
DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info.target_path, target_info.is_filetype_handled_safely);
@@ -249,7 +251,7 @@
}
if (ShouldBlockFile(item, target_info.danger_type)) {
MaybeReportDangerousDownloadBlocked(
@@ -1777,49 +1766,20 @@ bool ChromeDownloadManagerDelegate::IsOp
@@ -1810,49 +1799,20 @@ bool ChromeDownloadManagerDelegate::IsOp
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item,
download::DownloadDangerType danger_type) const {
@@ -303,7 +305,7 @@
default:
LOG(ERROR) << "Invalid download restriction value: "
<< static_cast<int>(download_restriction);
@@ -1838,7 +1798,6 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1871,7 +1831,6 @@ void ChromeDownloadManagerDelegate::Mayb
service->MaybeSendDangerousDownloadOpenedReport(download,
show_download_in_folder);
}
@@ -311,7 +313,7 @@
if (!download->GetAutoOpened()) {
download::DownloadContent download_content =
download::DownloadContentFromMimeType(download->GetMimeType(), false);
@@ -1846,6 +1805,7 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1879,6 +1838,7 @@ void ChromeDownloadManagerDelegate::Mayb
download->GetDangerType(), download_content, base::Time::Now(),
download->GetEndTime(), show_download_in_folder);
}
@@ -319,7 +321,7 @@
}
void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadCanceledReport(
@@ -1970,8 +1930,7 @@ void ChromeDownloadManagerDelegate::Chec
@@ -2001,8 +1961,7 @@ void ChromeDownloadManagerDelegate::Chec
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -331,7 +333,7 @@
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -985,30 +985,6 @@ void DownloadItemModel::ExecuteCommand(D
@@ -952,30 +952,6 @@ void DownloadItemModel::ExecuteCommand(D
}
TailoredWarningType DownloadItemModel::GetTailoredWarningType() const {
@@ -384,7 +386,7 @@
}
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1072,12 +1072,6 @@ void DownloadTargetDeterminer::CheckVisi
@@ -1024,12 +1024,6 @@ void DownloadTargetDeterminer::CheckVisi
bool visited_referrer_before) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
@@ -397,7 +399,7 @@
danger_level_ = GetDangerLevel(
visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
@@ -1362,14 +1356,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -1314,14 +1308,7 @@ DownloadFileType::DangerLevel DownloadTa
std::optional<base::Time>
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
@@ -707,7 +709,7 @@
void OnGotFileInfo(
--- a/chrome/browser/enterprise/connectors/common.cc
+++ b/chrome/browser/enterprise/connectors/common.cc
@@ -271,7 +271,7 @@ void ShowDownloadReviewDialog(const std:
@@ -342,7 +342,7 @@ void ShowDownloadReviewDialog(const std:
bool IsResumableUpload(const BinaryUploadService::Request& request) {
// Currently resumable upload doesn't support paste or LBUS. If one day we do,
// we should update the logic here as well.
@@ -716,9 +718,67 @@
request.cloud_or_local_settings().is_cloud_analysis() &&
request.content_analysis_request().analysis_connector() !=
enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY &&
@@ -395,57 +395,6 @@ void ReportDataMaskingEvent(
content::BrowserContext* browser_context,
extensions::api::enterprise_reporting_private::DataMaskingEvent
data_masking_event) {
- CHECK(browser_context);
-
- auto* reporting_client =
- enterprise_connectors::RealtimeReportingClientFactory::GetForProfile(
- browser_context);
- std::optional<enterprise_connectors::ReportingSettings> settings =
- reporting_client->GetReportingSettings();
- if (!settings.has_value() ||
- !base::Contains(settings->enabled_event_names,
- enterprise_connectors::kKeySensitiveDataEvent)) {
- return;
- }
-
- base::Value::Dict event;
- event.Set(extensions::SafeBrowsingPrivateEventRouter::kKeyUrl,
- data_masking_event.url);
- event.Set(extensions::SafeBrowsingPrivateEventRouter::kKeyTabUrl,
- std::move(data_masking_event.url));
- event.Set(extensions::SafeBrowsingPrivateEventRouter::kKeyEventResult,
- EventResultToString(data_masking_event.event_result));
-
- base::Value::List triggered_rule_info;
- triggered_rule_info.reserve(data_masking_event.triggered_rule_info.size());
- for (auto& rule : data_masking_event.triggered_rule_info) {
- base::Value::Dict triggered_rule;
- triggered_rule.Set(
- extensions::SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleId,
- std::move(rule.rule_id));
- triggered_rule.Set(
- extensions::SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName,
- std::move(rule.rule_name));
-
- base::Value::List matched_detectors;
- for (auto& detector : rule.matched_detectors) {
- base::Value::Dict detector_value;
- detector_value.Set(kKeyDetectorId, std::move(detector.detector_id));
- detector_value.Set(kKeyDisplayName, std::move(detector.display_name));
- detector_value.Set(kKeyDetectorType,
- DetectorTypeToString(detector.detector_type));
- matched_detectors.Append(std::move(detector_value));
- }
- triggered_rule.Set(kKeyMatchedDetectors, std::move(matched_detectors));
-
- triggered_rule_info.Append(std::move(triggered_rule));
- }
- event.Set(extensions::SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleInfo,
- std::move(triggered_rule_info));
-
- reporting_client->ReportRealtimeEvent(
- enterprise_connectors::kKeySensitiveDataEvent,
- std::move(settings.value()), std::move(event));
}
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
--- a/chrome/browser/enterprise/connectors/connectors_manager.cc
+++ b/chrome/browser/enterprise/connectors/connectors_manager.cc
@@ -413,16 +413,7 @@ std::vector<const AnalysisConfig*> Conne
@@ -317,16 +317,7 @@ std::vector<const AnalysisConfig*> Conne
}
DataRegion ConnectorsManager::GetDataRegion() const {
@@ -737,7 +797,7 @@
void ConnectorsManager::StartObservingPrefs(PrefService* pref_service) {
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
@@ -446,22 +446,7 @@ std::string ConnectorsService::GetManage
@@ -428,22 +428,7 @@ std::string ConnectorsService::GetManage
}
std::string ConnectorsService::GetRealTimeUrlCheckIdentifier() const {
@@ -756,7 +816,7 @@
- return std::string();
- }
-
- return safe_browsing::GetProfileEmail(identity_manager);
- return GetProfileEmail(identity_manager);
}
ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() {
@@ -807,13 +867,12 @@
signals.Set(device_signals::names::kBuiltInDnsClientEnabled,
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -501,18 +501,7 @@ void RealtimeReportingClient::ReportEven
@@ -501,17 +501,7 @@ void RealtimeReportingClient::ReportEven
}
std::string RealtimeReportingClient::GetProfileUserName() const {
- std::string username = identity_manager_
- ? safe_browsing::GetProfileEmail(identity_manager_)
- : std::string();
- std::string username =
- identity_manager_ ? GetProfileEmail(identity_manager_) : std::string();
-
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- if (username.empty()) {
@@ -926,85 +985,7 @@
ReportingServiceFactory::~ReportingServiceFactory() = default;
--- a/chrome/browser/enterprise/data_protection/data_protection_clipboard_utils.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_clipboard_utils.cc
@@ -36,77 +36,6 @@ namespace enterprise_data_protection {
namespace {
-void HandleFileData(
- content::WebContents* web_contents,
- enterprise_connectors::ContentAnalysisDelegate::Data dialog_data,
- content::ContentBrowserClient::IsClipboardPasteAllowedCallback callback) {
- enterprise_connectors::ContentAnalysisDelegate::CreateForFilesInWebContents(
- web_contents, std::move(dialog_data),
- base::BindOnce(
- [](content::ContentBrowserClient::IsClipboardPasteAllowedCallback
- callback,
- std::vector<base::FilePath> paths, std::vector<bool> results) {
- std::optional<content::ClipboardPasteData> clipboard_paste_data;
- bool all_blocked =
- std::all_of(results.begin(), results.end(),
- [](bool allowed) { return !allowed; });
- if (!all_blocked) {
- std::vector<base::FilePath> allowed_paths;
- allowed_paths.reserve(paths.size());
- for (size_t i = 0; i < paths.size(); ++i) {
- if (results[i]) {
- allowed_paths.emplace_back(std::move(paths[i]));
- }
- }
- clipboard_paste_data = content::ClipboardPasteData();
- clipboard_paste_data->file_paths = std::move(allowed_paths);
- }
- std::move(callback).Run(std::move(clipboard_paste_data));
- },
- std::move(callback)),
- safe_browsing::DeepScanAccessPoint::PASTE);
-}
-
-void HandleStringData(
- content::WebContents* web_contents,
- content::ClipboardPasteData clipboard_paste_data,
- enterprise_connectors::ContentAnalysisDelegate::Data dialog_data,
- content::ContentBrowserClient::IsClipboardPasteAllowedCallback callback) {
- enterprise_connectors::ContentAnalysisDelegate::CreateForWebContents(
- web_contents, std::move(dialog_data),
- base::BindOnce(
- [](content::ClipboardPasteData clipboard_paste_data,
- content::ContentBrowserClient::IsClipboardPasteAllowedCallback
- callback,
- const enterprise_connectors::ContentAnalysisDelegate::Data& data,
- enterprise_connectors::ContentAnalysisDelegate::Result& result) {
- // TODO(b/318664590): Since the `data` argument is forwarded to
- // `callback`, changing the type from `const Data&` to just `Data`
- // would avoid a copy.
-
- bool text_blocked =
- result.text_results.empty() || !result.text_results[0];
- if (text_blocked && !result.image_result) {
- std::move(callback).Run(std::nullopt);
- return;
- }
-
- if (text_blocked) {
- clipboard_paste_data.text.clear();
- clipboard_paste_data.html.clear();
- clipboard_paste_data.svg.clear();
- clipboard_paste_data.rtf.clear();
- clipboard_paste_data.custom_data.clear();
- }
- if (!result.image_result) {
- clipboard_paste_data.png.clear();
- }
-
- std::move(callback).Run(std::move(clipboard_paste_data));
- },
- std::move(clipboard_paste_data), std::move(callback)),
- safe_browsing::DeepScanAccessPoint::PASTE);
-}
bool SkipDataControlOrContentAnalysisChecks(
const content::ClipboardEndpoint& main_endpoint) {
@@ -147,41 +76,7 @@ void PasteIfAllowedByContentAnalysis(
@@ -153,41 +153,7 @@ void PasteIfAllowedByContentAnalysis(
return;
}
@@ -1044,8 +1025,8 @@
- std::move(dialog_data), std::move(callback));
- }
}
#endif // BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
void MaybeReportDataControlsPaste(const content::ClipboardEndpoint& source,
--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
@@ -68,12 +68,6 @@ void RunPendingNavigationCallback(
@@ -1061,7 +1042,7 @@
std::move(callback).Run(user_data->settings());
}
@@ -180,9 +174,7 @@ void LogVerdictSource(
@@ -176,9 +170,7 @@ void LogVerdictSource(
bool IsScreenshotAllowedByDataControls(content::BrowserContext* context,
const GURL& url) {
@@ -1234,18 +1215,18 @@
} // namespace utils
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -291,10 +291,6 @@ source_set("extensions") {
@@ -259,10 +259,6 @@ source_set("extensions") {
"api/resources_private/resources_private_api.h",
"api/runtime/chrome_runtime_api_delegate.cc",
"api/runtime/chrome_runtime_api_delegate.h",
"api/safe_browsing_private/safe_browsing_private_api.cc",
"api/safe_browsing_private/safe_browsing_private_api.h",
- "api/safe_browsing_private/safe_browsing_private_event_router.cc",
- "api/safe_browsing_private/safe_browsing_private_event_router.h",
- "api/safe_browsing_private/safe_browsing_private_event_router_factory.cc",
- "api/safe_browsing_private/safe_browsing_private_event_router_factory.h",
"api/safe_browsing_private/safe_browsing_util.cc",
"api/safe_browsing_private/safe_browsing_util.h",
"api/search/search_api.cc",
@@ -639,8 +635,6 @@ source_set("extensions") {
"api/search/search_api.h",
"api/sessions/session_id.cc",
@@ -590,8 +586,6 @@ source_set("extensions") {
"mv2_experiment_stage.h",
"navigation_extension_enabler.cc",
"navigation_extension_enabler.h",
@@ -1256,7 +1237,7 @@
"pending_extension_info.cc",
--- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -114,7 +114,6 @@ void EnsureApiBrowserContextKeyedService
@@ -112,7 +112,6 @@ void EnsureApiBrowserContextKeyedService
#endif
extensions::ProcessesAPI::GetFactoryInstance();
extensions::ReadingListEventRouter::GetFactoryInstance();
@@ -1266,7 +1247,7 @@
extensions::SettingsOverridesAPI::GetFactoryInstance();
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -318,19 +318,6 @@ void CookiesGetFunction::GetCookieListCa
@@ -333,19 +333,6 @@ void CookiesGetFunction::GetCookieListCa
}
void CookiesGetFunction::NotifyExtensionTelemetry() {
@@ -1286,7 +1267,7 @@
}
CookiesGetAllFunction::CookiesGetAllFunction() {
@@ -423,24 +410,6 @@ void CookiesGetAllFunction::GetCookieLis
@@ -439,24 +426,6 @@ void CookiesGetAllFunction::GetCookieLis
}
void CookiesGetAllFunction::NotifyExtensionTelemetry() {
@@ -1313,7 +1294,7 @@
CookiesSetFunction::CookiesSetFunction()
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -98,16 +98,8 @@ api::enterprise_reporting_private::Conte
@@ -101,16 +101,8 @@ api::enterprise_reporting_private::Conte
info.third_party_blocking_enabled = signals.third_party_blocking_enabled;
info.os_firewall = ToInfoSettingValue(signals.os_firewall);
info.system_dns_servers = std::move(signals.system_dns_servers);
@@ -1332,7 +1313,7 @@
info.enterprise_profile_id = signals.enterprise_profile_id;
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -427,30 +427,6 @@ void NotifyExtensionTelemetry(Profile* p
@@ -408,30 +408,6 @@ void NotifyExtensionTelemetry(Profile* p
const std::string& current_url,
const std::string& new_url,
const std::optional<StackTrace>& js_callstack) {
@@ -1388,7 +1369,7 @@
void Blocklist::GetMalwareIDs(const std::set<ExtensionId>& ids,
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -808,44 +808,17 @@ void ChromeExtensionsBrowserClient::Noti
@@ -816,44 +816,17 @@ void ChromeExtensionsBrowserClient::Noti
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::string& code) const {
@@ -1434,7 +1415,7 @@
}
void ChromeExtensionsBrowserClient::
@@ -854,59 +827,12 @@ void ChromeExtensionsBrowserClient::
@@ -862,59 +835,12 @@ void ChromeExtensionsBrowserClient::
const ExtensionId& extension_id,
const GURL& request_url,
const GURL& redirect_url) const {
@@ -1494,7 +1475,7 @@
}
// static
@@ -1075,7 +1001,6 @@ void ChromeExtensionsBrowserClient::GetW
@@ -1083,7 +1009,6 @@ void ChromeExtensionsBrowserClient::GetW
void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager(
content::WebContents* web_contents) const {
@@ -1770,7 +1751,7 @@
}
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -329,7 +329,7 @@ void FileSelectHelper::PerformContentAna
@@ -323,7 +323,7 @@ void FileSelectHelper::PerformContentAna
if (AbortIfWebContentsDestroyed())
return;
@@ -1779,7 +1760,7 @@
enterprise_connectors::ContentAnalysisDelegate::Data data;
if (enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
profile_, web_contents_->GetLastCommittedURL(), &data,
@@ -359,7 +359,7 @@ void FileSelectHelper::PerformContentAna
@@ -353,7 +353,7 @@ void FileSelectHelper::PerformContentAna
#endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
}
@@ -1790,7 +1771,7 @@
const enterprise_connectors::ContentAnalysisDelegate::Data& data,
--- a/chrome/browser/file_select_helper.h
+++ b/chrome/browser/file_select_helper.h
@@ -225,7 +225,7 @@ class FileSelectHelper : public base::Re
@@ -226,7 +226,7 @@ class FileSelectHelper : public base::Re
void PerformContentAnalysisIfNeeded(
std::vector<blink::mojom::FileChooserFileInfoPtr> list);
@@ -1809,7 +1790,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/file_system_access/file_system_access_dangerous_file_dialog.h"
#include "chrome/browser/ui/file_system_access/file_system_access_dialogs.h"
@@ -434,89 +433,6 @@ bool ShouldBlockAccessToPath(const base:
@@ -451,89 +450,6 @@ bool ShouldBlockAccessToPath(const base:
return true;
}
@@ -1899,7 +1880,7 @@
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
return id.empty() ? kDefaultLastPickedDirectoryKey
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
@@ -536,13 +452,7 @@ std::string_view GetGrantKeyFromGrantTyp
@@ -553,13 +469,7 @@ std::string_view GetGrantKeyFromGrantTyp
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -1914,7 +1895,7 @@
}
} // namespace
@@ -1625,7 +1535,7 @@ void ChromeFileSystemAccessPermissionCon
@@ -1672,7 +1582,7 @@ void ChromeFileSystemAccessPermissionCon
std::vector<PathInfo> entries,
content::GlobalRenderFrameHostId frame_id,
EntriesAllowedByEnterprisePolicyCallback callback) {
@@ -1923,7 +1904,7 @@
// Get WebContents pointer in order to perform enterprise content analysis.
content::WebContents* web_contents = nullptr;
if (!entries.empty()) {
@@ -1733,29 +1643,6 @@ void ChromeFileSystemAccessPermissionCon
@@ -1780,29 +1690,6 @@ void ChromeFileSystemAccessPermissionCon
std::move(callback));
}
@@ -2010,7 +1991,7 @@
NotificationHandler::Type::EXTENSION,
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -36,7 +36,6 @@
@@ -38,7 +38,6 @@
#include "chrome/browser/password_manager/profile_password_store_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -2018,7 +1999,7 @@
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/sync_service_factory.h"
@@ -1005,6 +1004,7 @@ autofill::LanguageCode ChromePasswordMan
@@ -1038,6 +1037,7 @@ autofill::LanguageCode ChromePasswordMan
return autofill::LanguageCode();
}
@@ -2026,7 +2007,7 @@
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
return safe_browsing::ChromePasswordProtectionService::
@@ -1024,6 +1024,7 @@ void ChromePasswordManagerClient::CheckS
@@ -1057,6 +1057,7 @@ void ChromePasswordManagerClient::CheckS
}
}
#endif // defined(ON_FOCUS_PING_ENABLED)
@@ -2034,7 +2015,7 @@
#if !BUILDFLAG(IS_ANDROID)
void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
@@ -1031,30 +1032,10 @@ void ChromePasswordManagerClient::MaybeR
@@ -1064,30 +1065,10 @@ void ChromePasswordManagerClient::MaybeR
bool is_federated,
const url::SchemeHostPort& federated_origin,
const std::u16string& login_user_name) const {
@@ -2065,7 +2046,7 @@
}
#endif
@@ -1778,6 +1759,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1853,6 +1834,7 @@ bool ChromePasswordManagerClient::IsPass
is_enabled = false;
}
@@ -2073,7 +2054,7 @@
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Disable password
@@ -1788,6 +1770,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1863,6 +1845,7 @@ bool ChromePasswordManagerClient::IsPass
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -2083,7 +2064,7 @@
password_manager::BrowserSavePasswordProgressLogger logger(
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -235,15 +235,9 @@ class ChromePasswordManagerClient
@@ -237,15 +237,9 @@ class ChromePasswordManagerClient
autofill::LogManager* GetLogManager() override;
void AnnotateNavigationEntry(bool has_password_field) override;
autofill::LanguageCode GetPageLanguage() const override;
@@ -2101,7 +2082,7 @@
#if !BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -411,16 +411,6 @@ void ChromePermissionsClient::OnPromptRe
@@ -408,16 +408,6 @@ void ChromePermissionsClient::OnPromptRe
PermissionRevocationRequest::ExemptOriginFromFutureRevocations(profile,
origin);
}
@@ -2234,7 +2215,7 @@
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -342,51 +342,5 @@ bool PredictionBasedPermissionUiSelector
@@ -351,51 +351,5 @@ bool PredictionBasedPermissionUiSelector
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
permissions::RequestType request_type) {
@@ -2288,7 +2269,7 @@
}
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -117,6 +117,7 @@
@@ -118,6 +118,7 @@
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
#include "components/privacy_sandbox/tracking_protection_prefs.h"
#include "components/proxy_config/proxy_policy_handler.h"
@@ -2296,7 +2277,7 @@
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -2348,8 +2349,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2361,8 +2362,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -2305,7 +2286,7 @@
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
handlers->AddHandler(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
@@ -2459,20 +2458,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2472,20 +2471,6 @@ std::unique_ptr<ConfigurationPolicyHandl
SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
@@ -2328,15 +2309,15 @@
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -279,7 +279,6 @@
@@ -283,7 +283,6 @@
#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
#include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h"
-#include "chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/tab_resumption/tab_resumption_page_handler.h"
@@ -1971,7 +1970,6 @@ void RegisterProfilePrefs(user_prefs::Pr
#include "chrome/browser/new_tab_page/promos/promo_service.h"
@@ -2055,7 +2054,6 @@ void RegisterProfilePrefs(user_prefs::Pr
media_router::RegisterProfilePrefs(registry);
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
@@ -2442,7 +2423,7 @@
// This method is virtual for testing purposes.
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -820,9 +820,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -845,9 +845,6 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance();
enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance();
#endif
@@ -2452,7 +2433,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_ANDROID)
enterprise_idle::IdleServiceFactory::GetInstance();
@@ -1143,23 +1140,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1173,23 +1170,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if !BUILDFLAG(IS_ANDROID)
ResetReportUploaderFactory::GetInstance();
#endif
@@ -2558,6 +2539,26 @@
}
scoped_refptr<network::SharedURLLoaderFactory>
--- a/chrome/browser/site_protection/site_protection_metrics_observer.cc
+++ b/chrome/browser/site_protection/site_protection_metrics_observer.cc
@@ -198,17 +198,6 @@ void SiteProtectionMetricsObserver::OnKn
SiteFamiliarityHistoryHeuristicName::kNoVisitsToAnySiteMoreThanADayAgo;
}
- if (g_browser_process->safe_browsing_service()) {
- if (auto database_manager =
- g_browser_process->safe_browsing_service()->database_manager()) {
- GURL last_committed_url = metrics_data->last_committed_url;
- database_manager->CheckUrlForHighConfidenceAllowlist(
- last_committed_url,
- base::BindOnce(&SiteProtectionMetricsObserver::LogMetrics,
- weak_factory_.GetWeakPtr(), std::move(metrics_data)));
- return;
- }
- }
LogMetrics(std::move(metrics_data),
/* url_on_safe_browsing_high_confidence_allowlist=*/false);
--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
@@ -147,15 +147,6 @@ CreateSettingsPageHelper() {
@@ -2663,7 +2664,7 @@
} // namespace
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -625,7 +625,6 @@ static_library("ui") {
@@ -598,7 +598,6 @@ static_library("ui") {
"//components/renderer_context_menu",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -2671,7 +2672,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser/db:database_manager",
@@ -3250,8 +3249,6 @@ static_library("ui") {
@@ -3214,8 +3213,6 @@ static_library("ui") {
"startup/web_app_startup_utils.h",
"tab_contents/chrome_web_contents_menu_helper.cc",
"tab_contents/chrome_web_contents_menu_helper.h",
@@ -2680,7 +2681,7 @@
"views/autofill/payments/webauthn_dialog_view.cc",
"views/autofill/payments/webauthn_dialog_view.h",
"views/close_bubble_on_tab_activation_helper.cc",
@@ -4962,8 +4959,6 @@ static_library("ui") {
@@ -4854,8 +4851,6 @@ static_library("ui") {
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
@@ -2688,7 +2689,7 @@
- "views/safe_browsing/tailored_security_unconsented_modal.h",
"views/send_tab_to_self/manage_account_devices_link_view.cc",
"views/send_tab_to_self/manage_account_devices_link_view.h",
"views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc",
"views/send_tab_to_self/send_tab_to_self_bubble.cc",
--- a/chrome/browser/ui/download/download_bubble_row_view_info.cc
+++ b/chrome/browser/ui/download/download_bubble_row_view_info.cc
@@ -10,7 +10,6 @@
@@ -2801,7 +2802,7 @@
const std::set<ContentSettingsType>
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -380,7 +380,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -393,7 +393,6 @@ void TabHelpers::AttachTabHelpers(WebCon
if (!autofill_client_provider.uses_platform_autofill()) {
ChromePasswordManagerClient::CreateForWebContents(web_contents);
}
@@ -2926,7 +2927,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/color/chrome_color_id.h"
@@ -820,9 +819,7 @@ void DownloadItemView::UpdateLabels() {
@@ -814,9 +813,7 @@ void DownloadItemView::UpdateLabels() {
deep_scanning_label_->SetVisible(mode_ ==
download::DownloadItemMode::kDeepScanning);
if (deep_scanning_label_->GetVisible()) {
@@ -2937,7 +2938,7 @@
? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
: IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
const std::u16string filename = ElidedFilename(*deep_scanning_label_);
@@ -848,11 +845,15 @@ void DownloadItemView::UpdateButtons() {
@@ -842,11 +839,15 @@ void DownloadItemView::UpdateButtons() {
}
const bool allow_open_during_deep_scan =
@@ -2953,7 +2954,7 @@
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
prompt_to_scan || allow_open_during_deep_scan);
@@ -1276,7 +1277,9 @@ void DownloadItemView::ShowContextMenuIm
@@ -1270,7 +1271,9 @@ void DownloadItemView::ShowContextMenuIm
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -2975,7 +2976,7 @@
TabDialogs::CreateForWebContents(web_contents);
--- a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc
@@ -280,8 +280,6 @@ void ProfilePickerDiceSignInProvider::On
@@ -281,8 +281,6 @@ void ProfilePickerDiceSignInProvider::On
.Then(base::BindOnce(std::move(switch_finished_callback), true));
host_->ShowScreen(contents(), BuildSigninURL(),
std::move(navigation_finished_closure));
@@ -2986,7 +2987,7 @@
DiceTabHelper::CreateForWebContents(contents());
--- a/chrome/browser/ui/views/profiles/profile_picker_force_signin_dialog_delegate.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_force_signin_dialog_delegate.cc
@@ -47,9 +47,6 @@ ProfilePickerForceSigninDialogDelegate::
@@ -48,9 +48,6 @@ ProfilePickerForceSigninDialogDelegate::
ChromePasswordManagerClient::CreateForWebContents(
web_view_->GetWebContents());
@@ -3020,16 +3021,16 @@
std::unique_ptr<RenderViewContextMenuBase>
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -434,9 +434,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -406,9 +406,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
optimization_guide_internals::kChromeUIOptimizationGuideInternalsHost) {
return &NewWebUI<OptimizationGuideInternalsUI>;
}
if (url.host_piece() == chrome::kChromeUIPredictorsHost)
return &NewWebUI<PredictorsUI>;
- if (url.host_piece() == safe_browsing::kChromeUISafeBrowsingHost)
- return &NewComponentUI<safe_browsing::SafeBrowsingUI,
- ChromeSafeBrowsingLocalStateDelegate>;
if (url.host_piece() == chrome::kChromeUISegmentationInternalsHost)
return &NewWebUI<SegmentationInternalsUI>;
if (url.host_piece() == chrome::kChromeUISignInInternalsHost)
if (url.host_piece() == chrome::kChromeUISupervisedUserPassphrasePageHost)
return &NewWebUI<ConstrainedWebDialogUI>;
if (url.host_piece() ==
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -191,10 +191,6 @@ void MaybeReportBypassAction(download::D
@@ -3251,9 +3252,9 @@
- kManagementOnPageVisitedVisibleData, &info);
- }
-
#if BUILDFLAG(IS_CHROMEOS)
if (is_get_all_screens_media_allowed_for_any_origin_) {
AddThreatProtectionPermission(kManagementScreenCaptureEvent,
if (connectors_service
->GetReportingSettings(
enterprise_connectors::ReportingConnector::SECURITY_EVENT)
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -750,7 +750,7 @@ void PrintPreviewHandler::HandleDoPrint(
@@ -3447,7 +3448,7 @@
}
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2026,9 +2026,6 @@ if (!is_android) {
@@ -2189,9 +2189,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -3457,7 +3458,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -6765,9 +6762,6 @@ test("unit_tests") {
@@ -6877,9 +6874,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -3488,7 +3489,7 @@
const base::Value::List* enabled_opt_in_events_value =
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -584,7 +584,7 @@ void ContentPasswordManagerDriver::Check
@@ -622,7 +622,7 @@ void ContentPasswordManagerDriver::Check
if (!password_manager::bad_message::CheckFrameNotPrerendering(
render_frame_host_))
return;
@@ -3515,7 +3516,7 @@
} // namespace password_manager
--- a/components/password_manager/core/browser/password_manager_client.h
+++ b/components/password_manager/core/browser/password_manager_client.h
@@ -411,9 +411,6 @@ class PasswordManagerClient {
@@ -418,9 +418,6 @@ class PasswordManagerClient {
// Returns the current best guess as to the page's display language.
virtual autofill::LanguageCode GetPageLanguage() const;
@@ -3525,7 +3526,7 @@
// Maybe triggers a hats survey that measures the user's perception of
// Autofill for passwords. When triggering happens, the survey dialog will be
@@ -425,13 +422,6 @@ class PasswordManagerClient {
@@ -432,13 +429,6 @@ class PasswordManagerClient {
virtual void TriggerUserPerceptionOfPasswordManagerSurvey(
const std::string& filling_assistance);
@@ -3579,7 +3580,7 @@
configs += [ "//build/config/compiler:wexit_time_destructors" ]
--- a/components/safe_browsing/core/browser/db/BUILD.gn
+++ b/components/safe_browsing/core/browser/db/BUILD.gn
@@ -247,8 +247,6 @@ source_set("v4_store") {
@@ -243,8 +243,6 @@ source_set("v4_store") {
sources = [
"hash_prefix_map.cc",
"hash_prefix_map.h",
@@ -3671,7 +3672,7 @@
void OhttpKeyService::Shutdown() {
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
@@ -261,17 +261,6 @@ void RealTimeUrlLookupService::MaybeLogP
@@ -267,17 +267,6 @@ void RealTimeUrlLookupService::MaybeLogP
bool request_had_cookie,
bool was_first_request,
bool sent_with_token) {

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

File diff suppressed because it is too large Load Diff

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

@@ -1,6 +1,6 @@
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -135,27 +135,11 @@
@@ -159,27 +159,11 @@
// TODO(b/343792225): Identify a way to resolve this problem and implement
// necessary changes.
"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"
@@ -2285,6 +2286,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2279,6 +2280,7 @@ void RenderViewContextMenu::AppendPageIt
}
if (CanTranslate(/*menu_logging=*/true)) {

30
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
@@ -2441,6 +2441,7 @@ static_library("browser") {
@@ -2451,6 +2451,7 @@ static_library("browser") {
"//third_party/libyuv",
"//third_party/metrics_proto",
"//third_party/re2",
@@ -19,7 +19,7 @@
"//third_party/widevine/cdm:headers",
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -178,6 +178,7 @@
@@ -177,6 +177,7 @@
#include "components/translate/core/common/translate_util.h"
#include "components/trusted_vault/features.h"
#include "components/ui_devtools/switches.h"
@@ -45,8 +45,8 @@
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -277,6 +277,7 @@ source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/snappy",
"//third_party/sqlite",
+ "//components/ungoogled:ungoogled_switches",
"//third_party/webrtc_overrides:webrtc_component",
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/bad_message.h"
@@ -3316,6 +3317,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3370,6 +3371,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -124,7 +124,7 @@
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -905,6 +906,11 @@ Document::Document(const DocumentInit& i
@@ -861,6 +862,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();
@@ -1020,6 +1026,14 @@ const Position Document::PositionAdjuste
@@ -978,6 +984,14 @@ const Position Document::PositionAdjuste
return Position::BeforeNode(*shadow_host);
}
@@ -153,7 +153,7 @@
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -549,6 +549,10 @@ class CORE_EXPORT Document : public Cont
@@ -548,6 +548,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -164,7 +164,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2567,6 +2571,9 @@ class CORE_EXPORT Document : public Cont
@@ -2556,6 +2560,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
@@ -2513,6 +2513,11 @@ DOMRectList* Element::getClientRects() {
@@ -2508,6 +2508,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2540,6 +2545,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2535,6 +2540,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -228,9 +228,9 @@
// TODO(editing-dev): We should make
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
@@ -79,6 +79,24 @@ TextMetrics::TextMetrics(const Font& fon
Update(font, direction, baseline, align, text);
@@ -93,6 +93,24 @@ const ShapeResult* ShapeWord(const TextR
}
} // namespace
+void TextMetrics::Shuffle(const double factor) {
+ // x-direction
@@ -276,7 +276,7 @@
namespace blink {
class DOMMatrixInit;
@@ -3538,8 +3541,22 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -3592,8 +3595,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
@@ -1751,6 +1751,7 @@ component("platform") {
@@ -1758,6 +1758,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
@@ -1947,6 +1947,12 @@
@@ -1991,6 +1991,12 @@
status: "experimental",
},
{

10
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
@@ -3319,6 +3319,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3373,6 +3373,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -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
@@ -2861,6 +2861,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2915,6 +2915,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
@@ -1701,7 +1701,9 @@ component("platform") {
@@ -1707,7 +1707,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -303,7 +303,7 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage
@@ -39,6 +39,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
@@ -1953,6 +1953,9 @@
@@ -1997,6 +1997,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

10
patches/extra/bromite/flag-max-connections-per-host.patch
View File

@@ -17,14 +17,14 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2132,6 +2132,7 @@ static_library("browser") {
@@ -2141,6 +2141,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
+ "//components/network_session_configurator/common",
"//components/network_time",
"//components/network_time/time_tracker",
"//components/no_state_prefetch/browser",
"//components/no_state_prefetch/common",
--- a/chrome/browser/bromite_flag_choices.h
+++ b/chrome/browser/bromite_flag_choices.h
@@ -4,4 +4,8 @@
@@ -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"
@@ -378,6 +382,18 @@ void BrowserProcessImpl::Init() {
@@ -404,6 +408,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2449,6 +2449,10 @@ const char kLogJsConsoleMessagesDescript
@@ -2477,6 +2477,10 @@ const char kLogJsConsoleMessagesDescript
"Enable logging JS console messages in system logs, please note that they "
"may contain PII.";
@@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1397,6 +1397,9 @@ extern const char kLocationBarModelOptim
@@ -1413,6 +1413,9 @@ extern const char kLocationBarModelOptim
extern const char kLogJsConsoleMessagesName[];
extern const char kLogJsConsoleMessagesDescription[];

10
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
@@ -1601,7 +1601,7 @@ void ChromeContentBrowserClient::Registe
@@ -1612,7 +1612,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
@@ -388,7 +388,7 @@ void ProfileNetworkContextService::Confi
@@ -399,7 +399,7 @@ void ProfileNetworkContextService::Confi
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -120,7 +120,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -314,14 +314,14 @@ bool HasManuallyFilledFields(const Passw
@@ -315,14 +315,14 @@ bool HasManuallyFilledFields(const Passw
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -135,8 +135,8 @@
- prefs::kCredentialsEnableAutosignin, true,
+ prefs::kCredentialsEnableAutosignin, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
PrefRegistry::NO_REGISTRATION_FLAGS);
registry->RegisterBooleanPref(
prefs::kWasAutoSignInFirstRunExperienceShown, false,
--- a/components/payments/core/payment_prefs.cc
+++ b/components/payments/core/payment_prefs.cc
@@ -11,7 +11,7 @@ namespace payments {

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

16
patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
View File

@@ -11,11 +11,11 @@ very interesting in themselves. Force them to be stored.
--- a/third_party/blink/common/mime_util/mime_util.cc
+++ b/third_party/blink/common/mime_util/mime_util.cc
@@ -83,6 +83,7 @@ static const char* const kUnsupportedTex
"text/x-csv",
"text/x-vcf",
"text/rtf",
+ "text/x-suse-ymp",
"text/comma-separated-values",
"text/csv",
"text/tab-separated-values",
@@ -86,6 +86,7 @@ constexpr auto kUnsupportedTextTypes =
"text/x-csv",
"text/x-vcf",
"text/rtf",
+ "text/x-suse-ymp",
"text/comma-separated-values",
"text/csv",
"text/tab-separated-values",

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
@@ -272,7 +272,7 @@ void DownloadPrefs::RegisterProfilePrefs
@@ -268,7 +268,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
@@ -1062,7 +1062,7 @@ class AppControllerNativeThemeObserver :
@@ -1081,7 +1081,7 @@ class AppControllerNativeThemeObserver :
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -146,6 +146,7 @@
@@ -147,6 +147,7 @@
#include "chrome/browser/ui/unload_controller.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h"
@@ -16,7 +16,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -994,20 +996,22 @@ Browser::WarnBeforeClosingResult Browser
@@ -986,20 +988,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1045,6 +1049,7 @@ bool Browser::TryToCloseWindow(
@@ -1037,6 +1041,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3156,6 +3161,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3113,6 +3118,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;
@@ -3181,6 +3238,22 @@ void Browser::InProgressDownloadResponse
@@ -3138,6 +3195,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -150,9 +150,9 @@
#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
+#include "chrome/browser/ui/simple_message_box.h"
#include "chrome/browser/ui/signin/signin_view_controller.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/unload_controller.h"
@@ -1160,12 +1161,17 @@ class Browser : public TabStripModelObse
@@ -1167,12 +1168,17 @@ class Browser : public TabStripModelObse
// Returns true if the window can close, false otherwise.
bool CanCloseWithInProgressDownloads();
@@ -170,7 +170,7 @@
// Called when the user has decided whether to proceed or not with the browser
// closure, in case the cookie migration notice was shown. |proceed_closing|
// is true if the browser can be closed.
@@ -1333,6 +1339,8 @@ class Browser : public TabStripModelObse
@@ -1338,6 +1344,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

2
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
@@ -921,10 +921,14 @@ bool HandleNewTabPageLocationOverride(
@@ -930,10 +930,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())

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

@@ -50,7 +50,7 @@
Node* inner_node = event.InnerNode();
--- a/third_party/blink/renderer/core/input/mouse_event_manager.cc
+++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc
@@ -660,8 +660,14 @@ WebInputEventResult MouseEventManager::H
@@ -665,8 +665,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

2
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"
@@ -542,6 +543,15 @@ AutocompleteController::AutocompleteCont
@@ -536,6 +537,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();

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

@@ -2,8 +2,8 @@
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -507,7 +507,9 @@ void TabHelpers::AttachTabHelpers(WebCon
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
@@ -514,7 +514,9 @@ void TabHelpers::AttachTabHelpers(WebCon
site_protection::SiteProtectionMetricsObserver::CreateForWebContents(
web_contents);
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("disable-search-engine-collection")) {
@@ -25,7 +25,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -256,14 +256,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -255,14 +255,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent() || frame->IsInFencedFrameTree())
return;
@@ -52,7 +52,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -20,6 +20,7 @@
@@ -21,6 +21,7 @@
#include "base/base64url.h"
#include "base/check_deref.h"
#include "base/check_is_test.h"
@@ -60,7 +60,7 @@
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
#include "base/debug/crash_logging.h"
@@ -214,6 +215,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
@@ -215,6 +216,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
return TemplateURL(merged_data);
}
@@ -73,7 +73,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -396,6 +403,7 @@ TemplateURLService::TemplateURLService(
@@ -397,6 +404,7 @@ TemplateURLService::TemplateURLService(
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
)
: prefs_(prefs),
@@ -81,7 +81,7 @@
search_engine_choice_service_(search_engine_choice_service),
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
@@ -509,8 +517,8 @@ bool TemplateURLService::CanAddAutogener
@@ -507,8 +515,8 @@ bool TemplateURLService::CanAddAutogener
// that may interfere with search queries). An easy heuristic for this is
// whether the user has a TemplateURL that has been manually modified (e.g.,
// renamed) connected to the same host.
@@ -92,7 +92,7 @@
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -2046,6 +2054,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2030,6 +2038,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
if (client_)
client_->SetOwner(this);
@@ -2226,6 +2236,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2210,6 +2220,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -113,7 +113,7 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -891,6 +891,8 @@ class TemplateURLService final : public
@@ -884,6 +884,8 @@ class TemplateURLService final : public
raw_ref<search_engines::SearchEngineChoiceService>
search_engine_choice_service_;

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

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

4
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
@@ -1440,7 +1440,8 @@ void BrowserCommandController::InitComma
@@ -1422,7 +1422,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -29,7 +29,7 @@
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) {
tab_search_container = std::make_unique<TabSearchContainer>(
tab_strip_->controller(), browser->tab_strip_model(),
render_tab_search_before_tab_strip_, this);
render_tab_search_before_tab_strip_, this,
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -60,4 +60,8 @@

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

@@ -1,17 +1,17 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -410,4 +410,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
@@ -450,4 +450,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
"RemovalOfIWAsFromTabCapture",
base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kClearDataOnExit, "ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT);
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -145,6 +145,7 @@ BASE_DECLARE_FEATURE(kBrowserDynamicCode
BASE_DECLARE_FEATURE(kReportPakFileIntegrity);
@@ -170,6 +170,7 @@ BASE_DECLARE_FEATURE(kReportPakFileInteg
BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
+BASE_DECLARE_FEATURE(kClearDataOnExit);
} // namespace features

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

@@ -8,17 +8,53 @@
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -2065,6 +2066,10 @@ void TabStripModel::CloseTabs(base::span
return;
}
@@ -700,6 +701,10 @@ void TabStripModel::CloseAllTabsInGroup(
+ const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("close-window-with-last-tab");
+ if (flag_value == "never" && !closing_all_ && static_cast<int>(filtered_items.size()) == count())
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));
+ if (base::CommandLine::ForCurrentProcess()->
+ GetSwitchValueASCII("close-window-with-last-tab") == "never" &&
+ !closing_all_ && count() < 2)
+ delegate()->AddTabAt(GURL(), -1, true);
+
const bool closing_all = static_cast<int>(filtered_items.size()) == count();
base::WeakPtr<TabStripModel> ref = weak_factory_.GetWeakPtr();
if (closing_all) {
WebContents* contents = GetWebContentsAt(index);
CloseTabs(base::span<WebContents* const>(&contents, 1u), close_types);
}
@@ -1051,11 +1056,15 @@ void TabStripModel::AddTab(std::unique_p
}
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);
}
@@ -1437,10 +1446,15 @@ void TabStripModel::ExecuteContextMenuCo
}
case CommandCloseTab: {
+ std::vector<int> indices = GetIndicesForCommand(context_index);
+ if (base::CommandLine::ForCurrentProcess()->
+ GetSwitchValueASCII("close-window-with-last-tab") == "never" &&
+ static_cast<int>(indices.size()) == count())
+ delegate()->AddTabAt(GURL(), -1, true);
ReentrancyCheck reentrancy_check(&reentrancy_guard_);
base::RecordAction(UserMetricsAction("TabContextMenu_CloseTab"));
- ExecuteCloseTabsByIndicesCommand(GetIndicesForCommand(context_index));
+ ExecuteCloseTabsByIndicesCommand(indices);
break;
}
--- a/chrome/browser/ungoogled_flag_choices.h
+++ b/chrome/browser/ungoogled_flag_choices.h
@@ -55,4 +55,10 @@ const FeatureEntry::Choice kOmniboxAutoc

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

@@ -11,7 +11,7 @@
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_management.h"
@@ -101,6 +102,14 @@ scoped_refptr<extensions::CrxInstaller>
@@ -102,6 +103,14 @@ scoped_refptr<extensions::CrxInstaller>
return installer;
}
@@ -26,7 +26,7 @@
bool IsExtensionDownload(const DownloadItem& download_item) {
if (download_item.GetTargetDisposition() ==
DownloadItem::TARGET_DISPOSITION_PROMPT)
@@ -109,7 +118,7 @@ bool IsExtensionDownload(const DownloadI
@@ -110,7 +119,7 @@ bool IsExtensionDownload(const DownloadI
if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
extensions::UserScript::IsURLUserScript(download_item.GetURL(),
download_item.GetMimeType())) {
@@ -50,7 +50,7 @@
bool IsExtensionDownload(const download::DownloadItem& download_item);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1265,10 +1265,12 @@ DownloadConfirmationReason DownloadTarge
@@ -1217,10 +1217,12 @@ DownloadConfirmationReason DownloadTarge
return DownloadConfirmationReason::SAVE_AS;
#if BUILDFLAG(ENABLE_EXTENSIONS)

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

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

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"
@@ -1320,7 +1321,8 @@ void HistoryBackend::InitImpl(
@@ -1328,7 +1329,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.
@@ -31,7 +31,7 @@
}
void HistoryBackend::OnMemoryPressure(
@@ -1548,6 +1550,8 @@ void HistoryBackend::AddPagesWithDetails
@@ -1555,6 +1557,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
@@ -210,7 +210,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-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
@@ -2000,6 +2000,10 @@ void BrowserView::ExitFullscreen() {
@@ -2019,6 +2019,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
@@ -1081,7 +1081,11 @@ void Tab::UpdateIconVisibility() {
@@ -1079,7 +1079,11 @@ void Tab::UpdateIconVisibility() {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1110,6 +1114,8 @@ void Tab::UpdateIconVisibility() {
@@ -1108,6 +1112,8 @@ void Tab::UpdateIconVisibility() {
!controller_->IsLockedForOnTask() &&
#endif
large_enough_for_close_button;

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
@@ -4219,10 +4219,12 @@ const FeatureEntry::FeatureVariation
@@ -4234,10 +4234,12 @@ const FeatureEntry::FeatureVariation
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

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

@@ -19,7 +19,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -160,6 +160,8 @@ static_library("common_lib") {
@@ -159,6 +159,8 @@ static_library("common_lib") {
"pref_names_util.cc",
"pref_names_util.h",
"ref_counted_util.h",
@@ -38,7 +38,7 @@
if (is_android || enable_library_cdms) {
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -966,6 +966,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
@@ -954,6 +954,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
// referrers instead of their ordinary behavior.
BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -55,7 +55,7 @@
// on-screen until dismissed, they are instead shown for a very long time.
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h
@@ -577,6 +577,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
@@ -559,6 +559,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers);
@@ -164,7 +164,7 @@
"//components/embedder_support",
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -70,7 +70,7 @@ if (is_ios) {
@@ -71,7 +71,7 @@ if (is_ios) {
# Omit Lacros because it allows //components to depend on //chrome, which in
# turn depends on //extensions.
@@ -173,7 +173,7 @@
disallowed_extension_deps_ = [
# Components should largely not depend on //extensions. Since // extensions
# is not a component target and is linked with //chrome, depending on most
@@ -868,7 +868,7 @@ test("components_unittests") {
@@ -877,7 +877,7 @@ test("components_unittests") {
# On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -182,7 +182,7 @@
assert_no_deps = [ "//chrome/*" ]
assert_no_deps += disallowed_extension_deps_
}
@@ -1161,7 +1161,7 @@ if (use_blink) {
@@ -1170,7 +1170,7 @@ if (use_blink) {
# dependency. On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -226,7 +226,7 @@
#include "content/common/associated_interfaces.mojom.h"
#include "content/common/content_navigation_policy.h"
#include "content/common/content_switches_internal.h"
@@ -4577,10 +4578,13 @@ void RenderFrameImpl::WillSendRequestInt
@@ -4649,10 +4650,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -299,7 +299,7 @@
#include "third_party/blink/public/platform/url_loader_throttle_provider.h"
#include "third_party/blink/public/platform/web_url_request_extra_data.h"
#include "third_party/blink/public/platform/websocket_handshake_throttle_provider.h"
@@ -159,10 +161,13 @@ void WebServiceWorkerFetchContextImpl::W
@@ -159,10 +161,13 @@ void WebServiceWorkerFetchContextImpl::F
request.SetURLRequestExtraData(std::move(url_request_extra_data));
@@ -335,9 +335,9 @@
#include "third_party/blink/public/platform/url_loader_throttle_provider.h"
#include "third_party/blink/public/platform/weak_wrapper_resource_load_info_notifier.h"
#include "third_party/blink/public/platform/web_security_origin.h"
@@ -383,10 +385,13 @@ void DedicatedOrSharedWorkerFetchContext
if (g_rewrite_url)
request.SetUrl(g_rewrite_url(request.Url().GetString().Utf8(), false));
@@ -388,10 +390,13 @@ void DedicatedOrSharedWorkerFetchContext
auto url_request_extra_data = base::MakeRefCounted<WebURLRequestExtraData>();
request.SetURLRequestExtraData(std::move(url_request_extra_data));
- if (!renderer_preferences_.enable_referrers) {
- request.SetReferrerString(WebString());

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

@@ -350,7 +350,7 @@
dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
(template_url->starter_pack_id() > 0)));
GURL icon_url = template_url->favicon_url();
@@ -363,12 +366,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -358,12 +361,14 @@ void SearchEnginesHandler::HandleSearchE
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
const std::u16string& keyword,
@@ -368,7 +368,7 @@
edit_controller_.reset();
}
@@ -396,6 +401,8 @@ bool SearchEnginesHandler::CheckFieldVal
@@ -391,6 +396,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,7 +377,7 @@
else
NOTREACHED_IN_MIGRATION();
@@ -415,18 +422,21 @@ void SearchEnginesHandler::HandleSearchE
@@ -410,18 +417,21 @@ void SearchEnginesHandler::HandleSearchE
if (!edit_controller_.get())
return;
@@ -427,7 +427,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -904,7 +904,8 @@ void TemplateURLService::IncrementUsageC
@@ -902,7 +902,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
@@ -437,7 +437,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -919,6 +920,7 @@ void TemplateURLService::ResetTemplateUR
@@ -917,6 +918,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;

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

4
patches/extra/ungoogled-chromium/disable-capture-all-screens.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/media/webrtc/capture_policy_utils.cc
+++ b/chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -63,46 +63,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
@@ -64,46 +64,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
base::OnceCallback<void(bool)> callback,
content::BrowserContext* context,
bool is_multi_capture_allowed_for_any_origin_on_main_profile) {
@@ -47,7 +47,7 @@
}
void CheckAllScreensMediaAllowedForIwaResultReceived(
@@ -290,58 +251,13 @@ void RegisterProfilePrefs(PrefRegistrySi
@@ -291,58 +252,13 @@ void RegisterProfilePrefs(PrefRegistrySi
void CheckGetAllScreensMediaAllowedForAnyOrigin(
content::BrowserContext* context,
base::OnceCallback<void(bool)> callback) {

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

@@ -105,8 +105,8 @@
}
void BaseFile::AnnotateWithSourceInformation(
@@ -627,32 +542,8 @@ void BaseFile::AnnotateWithSourceInforma
const GURL& referrer_url,
@@ -628,32 +543,8 @@ void BaseFile::AnnotateWithSourceInforma
const std::optional<url::Origin>& request_initiator,
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
OnAnnotationDoneCallback on_annotation_done_callback) {
- GURL authority_url = GetEffectiveAuthorityURL(source_url, referrer_url);
@@ -131,7 +131,7 @@
- authority_url, referrer_url));
-
- quarantine_service_->QuarantineFile(
- full_path_, authority_url, referrer_url, client_guid,
- full_path_, authority_url, referrer_url, request_initiator, client_guid,
- base::BindOnce(&BaseFile::OnFileQuarantined,
- weak_factory_.GetWeakPtr()));
- }
@@ -191,7 +191,7 @@
base::File::Error result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -293,37 +278,9 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -293,40 +278,9 @@ void FileSystemAccessSafeMoveHelper::Did
referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
? referrer_url
: GURL();
@@ -200,6 +200,9 @@
- quarantine::mojom::Quarantine* raw_quarantine = quarantine_remote.get();
- raw_quarantine->QuarantineFile(
- target_url.path(), authority_url, referrer_url,
- // TODO(crbug.com/351165321): Consider propagating request_initiator
- // information here.
- /*request_initiator=*/std::nullopt,
- GetContentClient()
- ->browser()
- ->GetApplicationClientGUIDForQuarantineCheck(),

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
@@ -199,7 +199,7 @@ constexpr base::FeatureParam<int> kHashP
@@ -195,7 +195,7 @@ constexpr base::FeatureParam<int> kHashP
BASE_FEATURE(kDownloadsPageReferrerUrl,
"DownloadsPageReferrerUrl",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kLogAccountEnhancedProtectionStateInProtegoPings,
"TailoredSecurityLogAccountEnhancedProtectionStateInProtegoPings",
BASE_FEATURE(kHashDatabaseOffsetMap,
"SafeBrowsingHashDatabaseOffsetMap",

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
@@ -1835,7 +1835,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
@@ -1858,7 +1858,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",

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

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

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

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

16
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
@@ -1102,6 +1102,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1115,6 +1115,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -10,15 +10,15 @@
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -58,6 +58,7 @@
@@ -49,6 +49,7 @@
#include "chrome/browser/ui/webui/policy/policy_ui.h"
#include "chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_ui.h"
#include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
+#include "chrome/browser/ui/webui/ungoogled_first_run.h"
#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"
@@ -745,6 +746,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/buildflags.h"
#include "chrome/common/chrome_features.h"
@@ -692,6 +693,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<privacy_sandbox_internals::PrivacySandboxInternalsUI>;
}

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

@@ -1,5 +1,15 @@
# 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
@@ -34,7 +34,6 @@ group("api_implementations") {
"//chrome/browser/extensions/api/downloads_internal",
"//chrome/browser/extensions/api/experimental_ai_data",
"//chrome/browser/extensions/api/font_settings",
- "//chrome/browser/extensions/api/mdns",
"//chrome/browser/extensions/api/module",
"//chrome/browser/extensions/api/networking_private",
"//chrome/browser/extensions/api/omnibox",
--- 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(

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

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

@@ -29,7 +29,6 @@
# the feedback entry in the third party cookie popup
# unneeded elements from the profile menu
# the 'Learn more' link on crashed tabs
# the new profile menu bubble
# the Third-party sign-in site settings (FedCM)
# disable LiveCaption flag by default, this also removes non-functional Live Caption checkbox from media controls
# the new feature badges
@@ -58,8 +57,8 @@
</cr-menu-selector>
-<div class="separator"></div>
-<div class="cr-nav-menu-item" id="moreExtensions">
- <iron-icon id="web-store-icon" icon="extensions-icons:web_store">
- </iron-icon>
- <cr-icon id="web-store-icon" icon="extensions-icons:web_store">
- </cr-icon>
- <span id="discover-more-text" class="cr-secondary-text"
- on-click="onMoreExtensionsClick_"
- inner-h-t-m-l="[[discoverMoreText_]]"></span>
@@ -174,18 +173,16 @@
<div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]">
<div role="alert" aria-live="polite"
inner-h-t-m-l="[[getUpdateStatusMessage_(
@@ -120,11 +120,6 @@
@@ -120,9 +120,6 @@
</div>
</template>
</if>
- <template is="dom-if" if="[[!showGetTheMostOutOfChromeSection_]]">
- <cr-link-row class="hr" id="help" on-click="onHelpClick_"
- label="$i18n{aboutGetHelpUsingChrome}"
- external></cr-link-row>
- </template>
- <cr-link-row class="hr" id="help" on-click="onHelpClick_"
- label="$i18n{aboutGetHelpUsingChrome}"
- external></cr-link-row>
<if expr="_google_chrome">
<template is="dom-if" if="[[!showGetTheMostOutOfChromeSection_]]">
<cr-link-row class="hr" id="reportIssue" on-click="onReportIssueClick_"
<cr-link-row class="hr" id="reportIssue" on-click="onReportIssueClick_"
hidden="[[!prefs.feedback_allowed.value]]"
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -41,12 +41,11 @@
@@ -240,7 +237,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
@@ -47,7 +47,7 @@
@@ -63,7 +63,7 @@
</settings-section>
<!-- TODO(crbug.com/40277421): Remove after SafetyHub launched. -->
<template is="dom-if"
@@ -249,7 +246,7 @@
<settings-section page-title="$i18n{safetyCheckSectionTitle}"
section="safetyCheck" nest-under-section="privacy"
id="safetyCheckSettingsSection">
@@ -59,7 +59,7 @@
@@ -75,7 +75,7 @@
to check that settings-safety-hub-entry-point is not visible
in the guest mode. -->
<template is="dom-if"
@@ -364,7 +361,7 @@
start-icon="settings:visibility-off"
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -243,9 +243,3 @@
@@ -235,9 +235,3 @@
</cr-link-row>
</if>
@@ -376,18 +373,18 @@
- </cr-link-row>
--- a/chrome/browser/resources/settings/search_page/search_page.html
+++ b/chrome/browser/resources/settings/search_page/search_page.html
@@ -44,11 +44,6 @@
$i18n{searchPageTitle}
<div class="secondary">
$i18n{searchEngineChoiceEntryPointSubtitle}
- <a href="$i18n{searchExplanationLearnMoreURL}"
- aria-label="$i18n{searchExplanationLearnMoreA11yLabel}"
- target="_blank">
- $i18n{learnMore}
- </a>
</div>
<template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
prefs.default_search_provider_data.template_url_data)]]">
@@ -43,11 +43,6 @@
$i18n{searchPageTitle}
<div class="secondary">
$i18n{searchEngineChoiceEntryPointSubtitle}
- <a href="$i18n{searchExplanationLearnMoreURL}"
- aria-label="$i18n{searchExplanationLearnMoreA11yLabel}"
- target="_blank">
- $i18n{learnMore}
- </a>
</div>
<template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
prefs.default_search_provider_data.template_url_data)]]">
--- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
+++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
@@ -91,7 +91,7 @@
@@ -411,7 +408,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -918,16 +918,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -924,16 +924,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -430,7 +427,7 @@
////////////////////////////////////////////////////////////////////////////////
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -642,13 +642,6 @@ void BookmarkMenuDelegate::BuildMenu(con
@@ -643,13 +643,6 @@ void BookmarkMenuDelegate::BuildMenu(con
ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
ui::SimpleMenuModel::kDefaultIconSize);
@@ -471,7 +468,7 @@
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession())
return gfx::ImageSkia();
@@ -565,12 +566,6 @@ void ProfileMenuView::BuildIdentity() {
@@ -565,16 +566,8 @@ void ProfileMenuView::BuildIdentity() {
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
std::string profile_user_display_name, profile_user_email;
@@ -482,8 +479,13 @@
- enterprise_signin::prefs::kProfileUserEmail);
-#endif
menu_title_ =
profile_user_display_name.empty()
? l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE)
- profile_user_display_name.empty()
- ? l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE)
- : base::UTF8ToUTF16(profile_user_display_name);
+ base::UTF8ToUTF16(profile_user_display_name);
// The email may be empty.
menu_subtitle_ = base::UTF8ToUTF16(
profile_user_email.empty() ? account_info.email : profile_user_email);
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -559,9 +559,6 @@ SadTabView::SadTabView(content::WebConte
@@ -519,29 +521,9 @@
void SadTabView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -651,17 +651,6 @@ void MaybeRegisterChromeFeaturePromos(
"Triggered to encourage users to try out the reading "
"mode feature.")));
- // kIPHSidePanelGenericMenuFeature:
- registry.RegisterFeature(std::move(
- FeaturePromoSpecification::CreateForToastPromo(
- feature_engagement::kIPHSidePanelGenericMenuFeature,
- kToolbarAppMenuButtonElementId, IDS_SIDE_PANEL_GENERIC_MENU_IPH,
- IDS_SIDE_PANEL_GENERIC_MENU_IPH_SCREENREADER,
- FeaturePromoSpecification::AcceleratorInfo())
- .SetBubbleArrow(HelpBubbleArrow::kTopRight)
- .SetMetadata(121, "corising@chromium.org",
- "Triggered on startup for discovery of "
- "side panel entry points in app menu.")));
// kIPHSidePanelGenericPinnableFeature:
registry.RegisterFeature(std::move(
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3397,7 +3397,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3347,7 +3347,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -552,7 +534,7 @@
html_source->AddBoolean(
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -922,7 +922,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
@@ -932,7 +932,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
#endif
// Enables the Live Caption feature on supported devices.
@@ -563,7 +545,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
@@ -845,7 +845,7 @@ void MenuItemView::SetAlerted() {
@@ -832,7 +832,7 @@ void MenuItemView::SetAlerted() {
}
bool MenuItemView::ShouldShowNewBadge() const {

1
patches/series
View File

@@ -1,3 +1,4 @@
upstream-fixes/hardware_destructive_interference_size.patch
upstream-fixes/missing-dependencies.patch
core/inox-patchset/0001-fix-building-without-safebrowsing.patch

25
patches/upstream-fixes/hardware_destructive_interference_size.patch Normal file
View File

@@ -0,0 +1,25 @@
# hardware_destructive_interference_size was added in:
# https://chromium-review.googlesource.com/c/chromium/src/+/5767325
# then partially reverted in:
# https://chromium-review.googlesource.com/c/chromium/src/+/5841144
# This reverts the remaining change
--- a/components/media_router/common/providers/cast/channel/enum_table.h
+++ b/components/media_router/common/providers/cast/channel/enum_table.h
@@ -12,7 +12,6 @@
#include <cstdint>
#include <cstring>
-#include <new>
#include <optional>
#include <ostream>
#include <string_view>
@@ -368,7 +367,8 @@ class EnumTable {
private:
#ifdef ARCH_CPU_64_BITS
- alignas(std::hardware_destructive_interference_size)
+ // Align the data on a cache line boundary.
+ alignas(64)
#endif
std::initializer_list<Entry> data_;
bool is_sorted_;

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -933,6 +933,7 @@ source_set("extensions") {
@@ -897,6 +897,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
@@ -20,7 +20,7 @@
#include <vector>
--- a/chrome/browser/ui/lens/lens_overlay_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_controller.cc
@@ -11,6 +11,7 @@
@@ -12,6 +12,7 @@
#include "base/system/sys_info.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
@@ -28,9 +28,19 @@
#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"
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -556,6 +556,7 @@ static_library("url_constants") {
@@ -554,6 +554,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 +60,7 @@
# Disallow depending on content.
--- a/components/plus_addresses/BUILD.gn
+++ b/components/plus_addresses/BUILD.gn
@@ -95,6 +95,7 @@ source_set("plus_addresses") {
@@ -101,6 +101,7 @@ source_set("plus_addresses") {
"//net",
"//services/data_decoder/public/cpp",
"//services/network/public/cpp",
@@ -60,7 +70,7 @@
public_deps = [
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -91,6 +91,7 @@ source_set("browser") {
@@ -92,6 +92,7 @@ source_set("browser") {
"//cc/animation",
"//cc/mojo_embedder",
"//cc/paint",
@@ -68,7 +78,7 @@
"//components/attribution_reporting:data_host_mojom",
"//components/attribution_reporting:mojom",
"//components/back_forward_cache:enum",
@@ -103,6 +104,7 @@ source_set("browser") {
@@ -104,6 +105,7 @@ source_set("browser") {
"//components/file_access",
"//components/filename_generation",
"//components/input",

21
pruning.list
View File

@@ -105,11 +105,13 @@ chrome/installer/test/data/SETUP.EX_
chrome/services/cups_proxy/test/data/basic_handshake.bin
chrome/test/enterprise/e2e/connector/common/demo_agent/agent.zip
chrome/test/media_router/resources/bigbuck.webm
chrome/updater/enterprise/win/google/GoogleCloudManagement.adm
chrome/updater/test/data/ChromiumMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.1.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/ChromiumMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.2.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/GoogleMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.1.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/GoogleMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.2.0.0.0/TestSystemMsiInstaller.msi
chrome/updater/test/data/ProcmonConfiguration.pmc
chrome/updater/test/data/enterprise/win/google/test_gold.adm
chrome/updater/test/data/enterprise/win/google/test_gold.adml
chrome/updater/test/data/enterprise/win/google/test_gold.admx
chrome/updater/test/data/selfupdate_test_key.der
@@ -233,6 +235,7 @@ components/test/data/feed/response.binarypb
components/test/data/history/HistoryNoDuration
components/test/data/history/HistoryNoSource
components/test/data/history/History_with_starred
components/test/data/history_embeddings/fake_search_strings_file
components/test/data/media_router/common/providers/cast/certificate/testsuite/testsuite1.pb
components/test/data/omnibox/adder.tflite
components/test/data/omnibox/on_device_head_test_deep_model.bin
@@ -60555,6 +60558,9 @@ third_party/crashpad/crashpad/snapshot/ios/testdata/crash-6605504629637120
third_party/crashpad/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8
third_party/crashpad/crashpad/util/net/testdata/binary_http_body.dat
third_party/dawn/test/tint/bug/oss-fuzz/57795.spv
third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_0000017E9E2D81A0.vs.spv
third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_000002778DE78280.cs.spv
third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_000002778F740030.fs.spv
third_party/dawn/third_party/dxc/projects/dxilconv/test/dxbc2dxil-asm/call2.dxbc
third_party/dawn/third_party/dxc/projects/dxilconv/test/dxbc2dxil-asm/cs3.dxbc
third_party/dawn/third_party/dxc/projects/dxilconv/test/dxbc2dxil-asm/cyclecounter.dxbc
@@ -61206,6 +61212,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-images.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-web-font.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/load-simple.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/loading-dt1.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/mainWasm_profile.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/many-requests.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/missing-process-data.json.gz
@@ -61239,6 +61246,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/rend
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/selector-stats.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/server-timings.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/set-timeout-long-task.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/shift-attribution.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/simple-js-program.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/slow-interaction-button-click.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/slow-interaction-keydown.json.gz
@@ -67450,10 +67458,10 @@ third_party/quic_trace/src/examples/example.json.gz
third_party/quic_trace/src/examples/example.qtr
third_party/r8/custom_d8.jar
third_party/r8/custom_r8.jar
third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/examples/hello_world.txt.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/corrupt-gz-file.bin
third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/good-file.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/multi.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/examples/hello_world.txt.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/corrupt-gz-file.bin
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/good-file.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/multi.gz
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/testdata/fowler/dat/basic.dat
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
@@ -68108,6 +68116,9 @@ third_party/tflite/src/tensorflow/core/util/tensor_bundle/testdata/old_string_te
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/saved_model.pb
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/variables/variables.index
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two_empty_tags/00000123/saved_model.pb
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two_empty_tags/00000123/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two_empty_tags/00000123/variables/variables.index
third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_gqa.tflite.bin
third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_mha.tflite.bin
third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_mqa.tflite.bin
@@ -68176,6 +68187,7 @@ third_party/tflite/src/tensorflow/lite/testdata/multi_add_flex.bin
third_party/tflite/src/tensorflow/lite/testdata/multi_signatures.bin
third_party/tflite/src/tensorflow/lite/testdata/multi_subgraphs_while.bin
third_party/tflite/src/tensorflow/lite/testdata/nested_while.bin
third_party/tflite/src/tensorflow/lite/testdata/no_signatures.bin
third_party/tflite/src/tensorflow/lite/testdata/no_subgraphs.bin
third_party/tflite/src/tensorflow/lite/testdata/segment_sum_invalid_buffer.bin
third_party/tflite/src/tensorflow/lite/testdata/softplus_flex.bin
@@ -68815,7 +68827,6 @@ third_party/win_build_output/mc/base/trace_event/etw_manifest/MSG00001.bin
third_party/win_build_output/mc/base/trace_event/etw_manifest/chrome_events_winTEMP.BIN
third_party/win_build_output/mc/chrome/common/win/MSG00409.bin
third_party/win_build_output/mc/chrome/credential_provider/eventlog/MSG00409.bin
third_party/win_build_output/mc/remoting/host/win/MSG0000d.bin
third_party/win_build_output/mc/remoting/host/win/MSG00401.bin
third_party/win_build_output/mc/remoting/host/win/MSG00402.bin
third_party/win_build_output/mc/remoting/host/win/MSG00403.bin