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

merge: update to ungoogled-chromium 136.0.7103.59

Browse Source
This commit is contained in:
jj
2025-05-02 12:14:27 +00:00
parent e4695268b8 a106e2c693
commit ccfb3b8365
70 changed files with 2609 additions and 2256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
135.0.7049.95
136.0.7103.59

888
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

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

@@ -51,11 +51,16 @@ Subject: Disable fetching of all field trials
/**
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -222,17 +222,7 @@ bool GetInstanceManipulations(const net:
@@ -224,22 +224,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() {
-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableVariationsSeedFetch)) {
return false;
- }
-#else
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kVariationsServerURL) &&
- !g_should_fetch_for_testing) {
@@ -64,9 +69,8 @@ Subject: Disable fetching of all field trials
- << switches::kVariationsServerURL << " specified.";
- return false;
- }
-#endif
-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
- return true;
+ return false;
}
// Returns the already downloaded first run seed, and clear the seed from the

37
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
@@ -3648,8 +3648,6 @@ static_library("browser") {
@@ -3685,8 +3685,6 @@ static_library("browser") {
"download/download_commands.cc",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -11,7 +11,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5405,10 +5405,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5467,10 +5467,6 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
handle, handle->GetWebContents()->GetBrowserContext()));
@@ -94,7 +94,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1418,42 +1414,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1430,44 +1426,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -105,8 +105,10 @@
- base::BindOnce(&DownloadsAcceptDangerFunction::DangerPromptCallback, this,
- download_id));
- // DownloadDangerPrompt deletes itself
- if (on_prompt_created_ && !on_prompt_created_->is_null())
- if (on_prompt_created_ && !on_prompt_created_->is_null()) {
- std::move(*on_prompt_created_).Run(prompt);
- on_prompt_created_ = nullptr;
- }
- // Function finishes in DangerPromptCallback().
-}
-
@@ -235,7 +237,7 @@
std::unique_ptr<std::string> response_body);
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -8,6 +8,7 @@ import("//components/safe_browsing/build
@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
import("//extensions/buildflags/buildflags.gni")
static_library("safe_browsing") {
@@ -243,15 +245,15 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -75,6 +76,7 @@ static_library("safe_browsing") {
@@ -73,6 +74,7 @@ static_library("safe_browsing") {
"//mojo/public/cpp/system",
"//services/preferences/public/cpp",
]
+ }
if (is_android) {
deps += [
@@ -553,6 +555,7 @@ static_library("advanced_protection") {
# Note: is_android is not equivalent to safe_browsing_mode == 2.
# Sources and dependencies added to this block must not depend on anything
@@ -564,6 +566,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -259,7 +261,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -572,6 +575,7 @@ source_set("metrics_collector") {
@@ -583,6 +586,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -312,7 +314,7 @@
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -113,7 +113,6 @@
@@ -112,7 +112,6 @@
#include "components/pdf/common/pdf_util.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/buildflags.h"
@@ -320,16 +322,3 @@
#include "components/sampling_profiler/process_type.h"
#include "components/sampling_profiler/thread_profiler.h"
#include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
@@ -484,12 +483,8 @@ void ChromeContentRendererClient::Render
thread->AddObserver(fingerprinting_protection_ruleset_dealer_.get());
}
- phishing_model_setter_ =
- std::make_unique<safe_browsing::PhishingModelSetterImpl>();
-
thread->AddObserver(chrome_observer_.get());
thread->AddObserver(subresource_filter_ruleset_dealer_.get());
- thread->AddObserver(phishing_model_setter_.get());
blink::WebScriptController::RegisterExtension(
extensions_v8::LoadTimesExtension::Get());

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

@@ -1,6 +1,6 @@
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
@@ -888,93 +888,6 @@ std::tuple<GURL, std::string> AutofillCr
@@ -890,93 +890,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
@@ -114,7 +114,7 @@ base::TimeDelta Configurator::UpdateDela
@@ -115,7 +115,7 @@ base::TimeDelta Configurator::UpdateDela
std::vector<GURL> Configurator::UpdateUrl() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

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

@@ -2,11 +2,11 @@
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -479,14 +479,6 @@ group("gn_all") {
deps += [ "//chromeos:chromeos_unittests" ]
@@ -477,14 +477,6 @@ group("gn_all") {
]
}
- if (is_chromeos_ash || is_mac || is_win) {
- if (is_chromeos || is_mac || is_win) {
- deps += [
- "//rlz:rlz_id",
- "//rlz:rlz_lib",
@@ -19,11 +19,11 @@
deps += [
--- a/rlz/buildflags/buildflags.gni
+++ b/rlz/buildflags/buildflags.gni
@@ -7,7 +7,7 @@ import("//build/config/chromeos/ui_mode.
@@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni"
# Whether we are using the rlz library or not. Platforms like Android send
# rlz codes for searches but do not use the library.
-enable_rlz_support = is_win || is_apple || is_chromeos_ash
-enable_rlz_support = is_win || is_apple || is_chromeos
+enable_rlz_support = false
declare_args() {

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

@@ -90,7 +90,7 @@ by default.
// once per machine.
--- a/chrome/browser/extensions/install_signer.cc
+++ b/chrome/browser/extensions/install_signer.cc
@@ -64,7 +64,7 @@ const int kSignatureFormatVersion = 2;
@@ -63,7 +63,7 @@ const int kSignatureFormatVersion = 2;
const size_t kSaltBytes = 32;
const char kBackendUrl[] =
@@ -405,7 +405,7 @@ by default.
GURL url(base::WideToUTF16(args[0]));
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -39,10 +39,10 @@ const GURL* g_item_snippet_url_for_test_
@@ -38,11 +38,11 @@ const GURL* g_item_snippet_url_for_test_
} // namespace
@@ -415,7 +415,9 @@ by default.
+const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/";
const char kChromeWebstoreUpdateURL[] =
- "https://clients2.google.com/service/update2/crx";
-const char kChromeWebstoreApiURL[] = "https://chromewebstore.googleapis.com/";
+ "trk:05:https://clients2.google.com/service/update2/crx";
+const char kChromeWebstoreApiURL[] = "trk:07:https://chromewebstore.googleapis.com/";
const char kAppMenuUtmSource[] = "ext_app_menu";
const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
@@ -683,7 +685,7 @@ by default.
--- a/rlz/lib/lib_values.cc
+++ b/rlz/lib/lib_values.cc
@@ -40,7 +40,7 @@ const char kSetDccResponseVariable[] = "
@@ -45,7 +45,7 @@ const char kSetDccResponseVariable[] = "
//
const char kFinancialPingPath[] = "/tools/pso/ping";

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

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

@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -316,6 +316,10 @@ void ClientSideDetectionService::StartCl
@@ -324,6 +324,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);
@@ -398,6 +402,7 @@ void ClientSideDetectionService::StartCl
@@ -406,6 +410,7 @@ void ClientSideDetectionService::StartCl
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIInfoSingleton::GetInstance()),
std::move(request), access_token));

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

@@ -8,7 +8,7 @@
# Dev tools attempts to download css data
--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
@@ -318,6 +318,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
@@ -307,6 +307,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
@@ -48,23 +48,25 @@
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
@@ -127,6 +127,9 @@ AffiliationFetcherDelegate* HashAffiliat
@@ -137,6 +137,10 @@ AffiliationFetcherDelegate* HashAffiliat
}
void HashAffiliationFetcher::StartRequest(
+ const std::vector<FacetURI>& a, RequestInfo b) {}
+ const std::vector<FacetURI>& a, RequestInfo b,
+ base::OnceCallback<void(FetchResult)> c) {}
+[[maybe_unused]]
+void HashAffiliationFetcher::DeadStartRequest(
const std::vector<FacetURI>& facet_uris,
RequestInfo request_info) {
requested_facet_uris_ = facet_uris;
RequestInfo request_info,
base::OnceCallback<void(FetchResult)> result_callback) {
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.h
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.h
@@ -37,6 +37,7 @@ class HashAffiliationFetcher : public Af
// AffiliationFetcherInterface
void StartRequest(const std::vector<FacetURI>& facet_uris,
RequestInfo request_info) override;
+ void DeadStartRequest(const std::vector<FacetURI>& a, RequestInfo b);
@@ -40,6 +40,8 @@ class HashAffiliationFetcher : public Af
const std::vector<FacetURI>& facet_uris,
RequestInfo request_info,
base::OnceCallback<void(FetchResult)> result_callback) override;
+ void DeadStartRequest(const std::vector<FacetURI>& a, RequestInfo b,
+ base::OnceCallback<void(FetchResult)> c);
const std::vector<FacetURI>& GetRequestedFacetURIs() const override;
// Builds the URL for the Affiliation API's lookup method.
@@ -80,7 +82,7 @@
if (state_ == REQUESTING) {
--- a/components/update_client/update_checker.cc
+++ b/components/update_client/update_checker.cc
@@ -103,6 +103,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) {

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

@@ -70,10 +70,10 @@
// other origins, so we should not treat them as web safe. Remove callers of
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1073,6 +1073,8 @@ component("net") {
"url_request/referrer_policy.h",
@@ -1081,6 +1081,8 @@ component("net") {
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
"url_request/storage_access_status_cache.h",
+ "url_request/trk_protocol_handler.cc",
+ "url_request/trk_protocol_handler.h",
"url_request/url_request.cc",
@@ -150,7 +150,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
@@ -54,6 +55,7 @@
@@ -55,6 +56,7 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -158,7 +158,7 @@
namespace net {
@@ -642,6 +644,12 @@ URLRequest::URLRequest(base::PassKey<URL
@@ -653,6 +655,12 @@ URLRequest::URLRequest(base::PassKey<URL
// Sanity check out environment.
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
@@ -173,7 +173,7 @@
return NetLogURLRequestConstructorParams(url, priority_,
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -49,6 +49,7 @@
@@ -50,6 +50,7 @@
#include "net/socket/network_binding_client_socket_factory.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/url_request/static_http_user_agent_settings.h"
@@ -181,7 +181,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
#include "url/url_constants.h"
@@ -596,6 +597,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -597,6 +598,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2708,24 +2708,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2714,24 +2714,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -44,7 +44,7 @@
const base::FilePath& exe_path,
--- a/components/gwp_asan/client/gwp_asan.cc
+++ b/components/gwp_asan/client/gwp_asan.cc
@@ -321,6 +321,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
@@ -323,6 +323,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
// Exported for testing.
GWP_ASAN_EXPORT std::optional<AllocatorSettings> GetAllocatorSettings(

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

@@ -3,7 +3,7 @@
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -247,62 +247,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -250,62 +250,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
network::mojom::CredentialsMode credentials_mode,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";

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

@@ -565,7 +565,7 @@
bool IsProbablyGoogleSearchUrl(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -614,10 +614,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -615,10 +615,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -681,13 +681,13 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -990,7 +990,7 @@ void PrefetchContainer::AddRedirectHop(c
@@ -999,7 +999,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;
- std::vector<std::string> headers_to_remove = {variations::kClientDataHeader};
+ std::vector<std::string> headers_to_remove;
updated_headers.SetHeader("Sec-Purpose",
updated_headers.SetHeader(blink::kSecPurposeHeaderName,
GetSecPurposeHeaderValue(redirect_info.new_url));
--- a/net/base/url_util.cc

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -368,7 +368,6 @@ if (!is_android && !is_mac) {
@@ -372,7 +372,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
"//third_party/widevine/cdm",
]
@@ -1198,7 +1197,6 @@ if (is_win) {
@@ -1202,7 +1201,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_binaries",
":widevine_cdm_library",
@@ -25,7 +25,7 @@
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -87,11 +87,6 @@ group("resources") {
@@ -88,11 +88,6 @@ group("resources") {
public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
}
@@ -35,5 +35,5 @@
- ]
- }
if (is_win || is_mac || is_linux || is_chromeos_ash) {
public_deps += [ "connectors_internals:resources" ]
if (is_win || is_mac || is_linux || is_chromeos) {
public_deps += [

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

@@ -1,6 +1,6 @@
--- a/components/browsing_data/content/browsing_data_model.cc
+++ b/components/browsing_data/content/browsing_data_model.cc
@@ -1002,12 +1002,6 @@ void BrowsingDataModel::PopulateFromDisk
@@ -998,12 +998,6 @@ void BrowsingDataModel::PopulateFromDisk
base::FeatureList::IsEnabled(network::features::kSharedStorageAPI);
bool is_shared_dictionary_enabled = base::FeatureList::IsEnabled(
network::features::kCompressionDictionaryTransportBackend);
@@ -13,7 +13,7 @@
base::RepeatingClosure completion =
base::BindRepeating([](const base::OnceClosure&) {},
@@ -1044,27 +1038,7 @@ void BrowsingDataModel::PopulateFromDisk
@@ -1040,27 +1034,7 @@ void BrowsingDataModel::PopulateFromDisk
base::BindOnce(&OnSharedDictionaryUsageLoaded, this, completion));
}
@@ -43,7 +43,7 @@
storage_partition_->GetCdmStorageDataModel()->GetUsagePerAllStorageKeys(
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -131,7 +131,7 @@ std::set<browsing_topics::Topic> GetTopi
@@ -134,7 +134,7 @@ std::set<browsing_topics::Topic> GetTopi
// static
bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -52,7 +52,7 @@
}
// static
@@ -850,7 +850,7 @@ void PrivacySandboxSettingsImpl::SetTopi
@@ -861,7 +861,7 @@ void PrivacySandboxSettingsImpl::SetTopi
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -61,7 +61,7 @@
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
@@ -936,11 +936,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
@@ -947,11 +947,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
return Status::kIncognitoProfile;
}
@@ -164,7 +164,7 @@
// static
--- a/content/browser/interest_group/ad_auction_service_impl.cc
+++ b/content/browser/interest_group/ad_auction_service_impl.cc
@@ -214,11 +214,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
@@ -191,11 +191,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
void AdAuctionServiceImpl::CreateMojoService(
RenderFrameHost* render_frame_host,
mojo::PendingReceiver<blink::mojom::AdAuctionService> receiver) {
@@ -178,7 +178,7 @@
void AdAuctionServiceImpl::JoinInterestGroup(
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1482,38 +1482,7 @@ void StoragePartitionImpl::Initialize(
@@ -1483,38 +1483,7 @@ void StoragePartitionImpl::Initialize(
bucket_manager_ = std::make_unique<BucketManager>(this);
@@ -217,7 +217,7 @@
GeneratedCodeCacheSettings settings =
GetContentClient()->browser()->GetGeneratedCodeCacheSettings(
@@ -1542,8 +1511,6 @@ void StoragePartitionImpl::Initialize(
@@ -1543,8 +1512,6 @@ void StoragePartitionImpl::Initialize(
font_access_manager_ = FontAccessManager::Create();
@@ -226,7 +226,7 @@
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
if (is_in_memory()) {
@@ -1567,11 +1534,6 @@ void StoragePartitionImpl::Initialize(
@@ -1568,11 +1535,6 @@ void StoragePartitionImpl::Initialize(
std::make_unique<SharedStorageHeaderObserver>(this);
}
@@ -240,7 +240,7 @@
void StoragePartitionImpl::OnStorageServiceDisconnected() {
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3888,12 +3888,6 @@ void WebContentsImpl::Init(const WebCont
@@ -3949,12 +3949,6 @@ void WebContentsImpl::Init(const WebCont
DateTimeChooser::CreateDateTimeChooser(this);
#endif

2
patches/core/ungoogled-chromium/disable-untraceable-urls.patch
View File

@@ -13,7 +13,7 @@
// wininet implementation.
--- a/rlz/lib/lib_values.cc
+++ b/rlz/lib/lib_values.cc
@@ -40,7 +40,6 @@ const char kSetDccResponseVariable[] = "
@@ -45,7 +45,6 @@ const char kSetDccResponseVariable[] = "
//
const char kFinancialPingPath[] = "/tools/pso/ping";

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

@@ -116,7 +116,7 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -113,7 +113,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -114,7 +114,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc
@@ -131,17 +131,6 @@ void ExtensionInfoGenerator::FillExtensi
@@ -132,17 +132,6 @@ void ExtensionInfoGenerator::FillExtensi
info.controlled_info.emplace();
info.controlled_info->text =
l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE);
@@ -20,7 +20,7 @@
bool is_enabled = state == developer::ExtensionState::kEnabled;
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -318,31 +318,7 @@ bool ExtensionManagement::IsAllowedManif
@@ -317,31 +317,7 @@ bool ExtensionManagement::IsAllowedManif
int manifest_version,
const std::string& extension_id,
Manifest::Type manifest_type) {
@@ -46,13 +46,13 @@
- auto installation_mode =
- GetInstallationMode(extension_id, /*update_url=*/std::string());
- return manifest_version >= 3 ||
- installation_mode == INSTALLATION_FORCED ||
- installation_mode == INSTALLATION_RECOMMENDED;
- installation_mode == ManagedInstallationMode::kForced ||
- installation_mode == ManagedInstallationMode::kRecommended;
- }
}
bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
@@ -363,26 +339,8 @@ bool ExtensionManagement::IsExemptFromMV
@@ -362,26 +338,8 @@ bool ExtensionManagement::IsExemptFromMV
return false;
}
@@ -71,8 +71,8 @@
- // installed extension only.
- auto installation_mode =
- GetInstallationMode(extension_id, /*update_url=*/std::string());
- return installation_mode == INSTALLATION_FORCED ||
- installation_mode == INSTALLATION_RECOMMENDED;
- return installation_mode == ManagedInstallationMode::kForced ||
- installation_mode == ManagedInstallationMode::kRecommended;
- }
-
- return false;
@@ -126,15 +126,15 @@
// Returns true if the given `stage` is one in which extension enablement should
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -477,7 +477,7 @@ content::WebUIDataSource* CreateAndAddEx
@@ -481,7 +481,7 @@ content::WebUIDataSource* CreateAndAddEx
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
source->AddBoolean(
"safetyHubThreeDotDetails",
- base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails));
+ false);
// TODO(crbug.com/392777363): Clean these up with non-placeholder values.
#if BUILDFLAG(IS_ANDROID)
source->AddResourcePath("images/product_logo.png",
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -96,13 +96,6 @@ bool IsManifestSupported(int manifest_ve

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

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -370,7 +370,6 @@ if (!is_android && !is_mac) {
@@ -374,7 +374,6 @@ if (!is_android && !is_mac) {
data_deps += [
"//chrome/browser/resources/media/mei_preload:component",
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
@@ -11,7 +11,7 @@
"//third_party/widevine/cdm",
]
@@ -929,8 +928,6 @@ if (is_win) {
@@ -933,8 +932,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -20,7 +20,7 @@
# This image is used to badge the lock icon in the
# authentication dialogs, such as those used for installation
# from disk image and Keystone promotion (if so enabled). It
@@ -1203,7 +1200,6 @@ if (is_win) {
@@ -1207,7 +1204,6 @@ if (is_win) {
":widevine_cdm_library",
"//chrome/browser/resources/media/mei_preload:component_bundle",
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle",
@@ -30,7 +30,7 @@
if (is_chrome_branded) {
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -755,10 +755,6 @@ static_library("browser") {
@@ -765,10 +765,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",
@@ -38,10 +38,10 @@
- "navigation_predictor/preloading_model_keyed_service.h",
- "navigation_predictor/preloading_model_keyed_service_factory.cc",
- "navigation_predictor/preloading_model_keyed_service_factory.h",
"navigation_predictor/search_engine_preconnector_keyed_service_factory.cc",
"navigation_predictor/search_engine_preconnector_keyed_service_factory.h",
"net/cert_verifier_service_time_updater.cc",
"net/cert_verifier_service_time_updater.h",
"net/chrome_mojo_proxy_resolver_factory.cc",
@@ -3514,10 +3510,6 @@ static_library("browser") {
@@ -3549,10 +3545,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
@@ -52,7 +52,16 @@
"accessibility/caption_bubble_context_browser.h",
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4250,10 +4242,6 @@ static_library("browser") {
@@ -4268,8 +4260,6 @@ static_library("browser") {
"//chrome/app:command_ids",
"//chrome/app/theme:chrome_unscaled_resources_grit",
"//chrome/app/vector_icons",
- "//chrome/browser/accessibility/tree_fixing:prefs",
- "//chrome/browser/accessibility/tree_fixing:service",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/link_capturing",
"//chrome/browser/autofill_ai:util",
@@ -4291,10 +4281,6 @@ static_library("browser") {
"//chrome/browser/new_tab_page/chrome_colors",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resources:component_extension_resources",
@@ -63,7 +72,7 @@
"//chrome/browser/search/background",
"//chrome/browser/smart_card",
"//chrome/browser/themes",
@@ -4378,9 +4366,6 @@ static_library("browser") {
@@ -4419,9 +4405,6 @@ static_library("browser") {
"//components/webauthn/core/browser",
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/hid",
@@ -73,7 +82,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4475,8 +4460,6 @@ static_library("browser") {
@@ -4516,8 +4499,6 @@ static_library("browser") {
sources += [
"accessibility/soda_installer_impl.cc",
"accessibility/soda_installer_impl.h",
@@ -82,7 +91,7 @@
"device_identity/device_oauth2_token_store_desktop.cc",
"device_identity/device_oauth2_token_store_desktop.h",
"device_notifications/device_status_icon_renderer.cc",
@@ -4515,8 +4498,6 @@ static_library("browser") {
@@ -4556,8 +4537,6 @@ static_library("browser") {
"profiles/profile_activity_metrics_recorder.h",
"profiles/profile_list_desktop.cc",
"profiles/profile_list_desktop.h",
@@ -91,7 +100,7 @@
"signin/force_signin_verifier.cc",
"signin/force_signin_verifier.h",
"signin/signin_manager.cc",
@@ -5317,7 +5298,6 @@ static_library("browser") {
@@ -5359,7 +5338,6 @@ static_library("browser") {
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/resources:app_icon_resources",
@@ -99,7 +108,7 @@
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash/accelerator",
"//chrome/browser/ui/ash/accessibility",
@@ -5581,7 +5561,6 @@ static_library("browser") {
@@ -5623,7 +5601,6 @@ static_library("browser") {
"//remoting/host/chromeos:browser_interop",
"//remoting/host/chromeos:features",
"//services/device/public/cpp/geolocation",
@@ -107,7 +116,7 @@
"//third_party/nearby:rpc_resources_proto",
"//third_party/nearby:wire_format_proto",
"//ui/chromeos",
@@ -7803,12 +7782,6 @@ static_library("browser") {
@@ -7850,12 +7827,6 @@ static_library("browser") {
}
if (enable_pdf) {
@@ -120,6 +129,17 @@
deps += [
"//chrome/browser/pdf",
"//chrome/browser/pdf:pdf_pref_names",
--- a/chrome/browser/accessibility/tree_fixing/BUILD.gn
+++ b/chrome/browser/accessibility/tree_fixing/BUILD.gn
@@ -60,8 +60,6 @@ source_set("internal") {
deps = [
"//base",
"//chrome/browser/profiles:profile",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
"//content/public/browser:browser",
- "//services/screen_ai/public/mojom:mojom",
]
}
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -249,12 +249,10 @@
@@ -135,7 +155,7 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1347,9 +1345,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1359,9 +1357,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -354,7 +374,7 @@
{"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -281,21 +281,6 @@ void PredictionBasedPermissionUiSelector
@@ -282,21 +282,6 @@ void PredictionBasedPermissionUiSelector
if (inner_text.size() > kPageContentMaxLength) {
inner_text.resize(kPageContentMaxLength);
}
@@ -378,7 +398,7 @@
VLOG(1) << "[PermissionsAIv1] The page's contnet too short or empty";
--- a/chrome/browser/prefs/BUILD.gn
+++ b/chrome/browser/prefs/BUILD.gn
@@ -266,7 +266,6 @@ source_set("impl") {
@@ -267,7 +267,6 @@ source_set("impl") {
} else {
deps += [
"//chrome/browser/promos:utils",
@@ -388,7 +408,7 @@
"//chrome/browser/search_engines",
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1793,9 +1793,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1792,9 +1792,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -400,7 +420,15 @@
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -301,7 +301,6 @@ source_set("profiles_extra_parts_impl")
@@ -294,7 +294,6 @@ source_set("profiles_extra_parts_impl")
]
} else {
deps += [
- "//chrome/browser/accessibility/tree_fixing:service",
"//chrome/browser/apps/app_service",
"//chrome/browser/autofill",
"//chrome/browser/contextual_cueing",
@@ -302,7 +301,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/feedback",
"//chrome/browser/hid",
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
@@ -410,15 +438,15 @@
"//chrome/browser/search_engine_choice",
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -98,7 +98,6 @@
@@ -102,7 +102,6 @@
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
#include "chrome/browser/navigation_predictor/search_engine_preconnector.h"
#include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h"
#include "chrome/browser/net/dns_probe_service_factory.h"
#include "chrome/browser/net/profile_network_context_service_factory.h"
#include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h"
@@ -314,7 +313,6 @@
@@ -322,7 +321,6 @@
#include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
#include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
@@ -426,7 +454,7 @@
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/search/instant_service_factory.h"
@@ -995,7 +993,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1005,7 +1003,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
net::ServerCertificateDatabaseServiceFactory::GetInstance();
#endif
@@ -434,7 +462,7 @@
#if BUILDFLAG(IS_CHROMEOS)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -1047,9 +1044,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1057,9 +1054,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -444,7 +472,7 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1113,13 +1107,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1123,13 +1117,6 @@ void ChromeBrowserMainExtraPartsProfiles
policy::UserPolicySigninServiceFactory::GetInstance();
#endif
PolicyBlocklistFactory::GetInstance();
@@ -458,7 +486,7 @@
PredictionServiceFactory::GetInstance();
predictors::AutocompleteActionPredictorFactory::GetInstance();
predictors::LoadingPredictorFactory::GetInstance();
@@ -1205,13 +1192,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1215,13 +1202,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
SafetyHubMenuNotificationServiceFactory::GetInstance();
SafetyHubHatsServiceFactory::GetInstance();
@@ -472,6 +500,28 @@
#endif
#if BUILDFLAG(IS_CHROMEOS)
if (ash::features::IsScannerEnabled()) {
@@ -1331,7 +1311,6 @@ void ChromeBrowserMainExtraPartsProfiles
TrackingProtectionSettingsFactory::GetInstance();
translate::TranslateRankerFactory::GetInstance();
#if !BUILDFLAG(IS_ANDROID)
- tree_fixing::AXTreeFixingServicesRouterFactory::GetInstance();
TriggeredProfileResetterFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -221,11 +221,6 @@ void OffTheRecordProfileImpl::Init() {
// AccessibilityLabelsService has a default prefs behavior in incognito.
AccessibilityLabelsService::InitOffTheRecordPrefs(this);
-#if !BUILDFLAG(IS_ANDROID)
- // To avoid using any server-side tree fixing service, it is disabled in
- // Incognito profiles.
- tree_fixing::InitOffTheRecordPrefs(this);
-#endif // !BUILDFLAG(IS_ANDROID)
// The ad service might not be available for some irregular profiles, like the
// System Profile.
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -846,24 +846,6 @@ void ProfileImpl::DoFinalInit(CreateMode
@@ -509,7 +559,7 @@
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/delete_profile_helper.h"
#include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
@@ -1507,9 +1506,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1508,9 +1507,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -521,7 +571,7 @@
#if BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -90,7 +90,6 @@ group("resources") {
@@ -91,7 +91,6 @@ group("resources") {
if (is_mac) {
public_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -531,9 +581,9 @@
--- a/chrome/browser/resources/pdf/pdf_viewer.html
+++ b/chrome/browser/resources/pdf/pdf_viewer.html
@@ -91,10 +91,6 @@
@current-type-changed="${this.onBrushTypeChanged_}">
</viewer-side-panel>` : ''}
@@ -94,10 +94,6 @@ import {AnnotationMode} from './constant
</cr-page-selector>
` : ''}
</if>
- <cr-toast id="searchifyProgress">
- <div class="spinner"></div>
@@ -544,8 +594,8 @@
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1703,8 +1703,6 @@ static_library("ui") {
"//chrome/browser/reading_list",
@@ -1716,8 +1716,6 @@ static_library("ui") {
"//chrome/browser/regional_capabilities",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/screen_ai:screen_ai_install_state",
@@ -553,7 +603,7 @@
"//chrome/browser/smart_card:smart_card",
"//chrome/browser/tab_group_sync:utils",
"//chrome/browser/themes",
@@ -2373,7 +2371,6 @@ static_library("ui") {
@@ -2397,7 +2395,6 @@ static_library("ui") {
"//chrome/browser/policy:onc",
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification:push_notification",
@@ -688,7 +738,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
@@ -20,8 +20,6 @@
@@ -21,8 +21,6 @@
#include "chrome/browser/browser_features.h"
#include "chrome/browser/language/language_model_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -697,7 +747,7 @@
#include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
@@ -370,24 +368,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -371,24 +369,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
@@ -722,7 +772,7 @@
// Enable accessibility for the top level render frame and all descendants.
// This causes AXTreeSerializer to reset and send accessibility events of
@@ -824,12 +804,6 @@ void ReadAnythingUntrustedPageHandler::S
@@ -842,12 +822,6 @@ void ReadAnythingUntrustedPageHandler::S
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
}
}
@@ -737,7 +787,7 @@
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -370,18 +370,6 @@ static_library("renderer") {
@@ -371,18 +371,6 @@ static_library("renderer") {
]
} else {
sources += [
@@ -756,7 +806,7 @@
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -395,7 +383,6 @@ static_library("renderer") {
@@ -396,7 +384,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
@@ -766,7 +816,7 @@
]
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -68,7 +68,6 @@
@@ -69,7 +69,6 @@
#include "url/gurl.h"
#if !BUILDFLAG(IS_ANDROID)
@@ -774,7 +824,7 @@
#include "chrome/renderer/searchbox/searchbox_extension.h"
#endif // !BUILDFLAG(IS_ANDROID)
@@ -316,21 +315,6 @@ void ChromeRenderFrameObserver::DidCommi
@@ -321,21 +320,6 @@ void ChromeRenderFrameObserver::DidCommi
}
void ChromeRenderFrameObserver::DidClearWindowObject() {
@@ -798,7 +848,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2136,9 +2136,6 @@ if (!is_android) {
@@ -2187,9 +2187,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",
@@ -808,7 +858,7 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2543,9 +2540,6 @@ if (!is_android) {
@@ -2592,9 +2589,6 @@ if (!is_android) {
"//services/network/public/proto:sct_audit_report_proto",
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
@@ -818,7 +868,7 @@
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -8033,7 +8027,6 @@ test("unit_tests") {
@@ -8121,7 +8115,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target.
deps += [
@@ -826,7 +876,15 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -8176,7 +8169,6 @@ test("unit_tests") {
@@ -8156,7 +8149,6 @@ test("unit_tests") {
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/resources:component_extension_resources_grit",
"//chrome/browser/resources/new_tab_page_instant:resources_grit",
- "//chrome/browser/screen_ai:unit_tests",
"//chrome/browser/search/background",
"//chrome/browser/search/background:constants",
"//chrome/browser/search_engine_choice:unit_tests",
@@ -8265,7 +8257,6 @@ test("unit_tests") {
"//components/webapps/browser",
"//services/metrics/public/cpp:ukm_builders",
"//services/network:test_support",
@@ -834,14 +892,6 @@
"//services/video_effects/test:test_support",
"//third_party/crashpad/crashpad/util",
"//third_party/libaddressinput",
@@ -8616,7 +8608,6 @@ test("unit_tests") {
"//chrome/browser/nearby_sharing/contacts:unit_tests",
"//chrome/browser/nearby_sharing/local_device_data:unit_tests",
"//chrome/browser/policy:unit_tests",
- "//chrome/browser/screen_ai:unit_tests",
"//chrome/browser/smart_card:unit_tests",
"//chrome/browser/support_tool/ash:unit_tests",
"//chrome/browser/ui/ash:unit_tests",
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -408,7 +408,7 @@ source_set("lib") {
@@ -865,7 +915,7 @@
python_library("fixtures") {
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -145,7 +145,6 @@ static_library("utility") {
@@ -144,7 +144,6 @@ static_library("utility") {
"//chrome/common/importer:interfaces",
"//components/autofill/core/common",
"//services/proxy_resolver:lib",
@@ -875,7 +925,7 @@
--- a/chrome/utility/services.cc
+++ b/chrome/utility/services.cc
@@ -60,8 +60,6 @@
@@ -59,8 +59,6 @@
#include "services/passage_embeddings/passage_embeddings_service.h"
#include "services/proxy_resolver/proxy_resolver_factory_impl.h" // nogncheck
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
@@ -884,7 +934,7 @@
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -262,12 +260,6 @@ auto RunSpeechRecognitionService(
@@ -258,12 +256,6 @@ auto RunSpeechRecognitionService(
}
#endif // !BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -895,9 +945,9 @@
-}
-#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
auto RunCupsIppParser(
@@ -471,7 +463,6 @@ void RegisterMainThreadServices(mojo::Se
@@ -465,7 +457,6 @@ void RegisterMainThreadServices(mojo::Se
services.Add(RunProfileImporter);
services.Add(RunMirroringService);
services.Add(RunPassageEmbeddingsService);
@@ -907,7 +957,7 @@
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
--- a/components/omnibox/browser/autocomplete_classifier.cc
+++ b/components/omnibox/browser/autocomplete_classifier.cc
@@ -110,8 +110,6 @@ void AutocompleteClassifier::Classify(
@@ -122,8 +122,6 @@ void AutocompleteClassifier::Classify(
metrics::OmniboxEventProto::PageClassification page_classification,
AutocompleteMatch* match,
GURL* alternate_nav_url) {
@@ -918,7 +968,7 @@
AutocompleteInput input(text, page_classification, *scheme_classifier_);
--- a/components/pdf/renderer/pdf_accessibility_tree.cc
+++ b/components/pdf/renderer/pdf_accessibility_tree.cc
@@ -535,20 +535,6 @@ void PdfAccessibilityTree::SetAccessibil
@@ -537,20 +537,6 @@ void PdfAccessibilityTree::SetAccessibil
std::move(chars), std::move(page_objects)));
}
@@ -930,8 +980,8 @@
- content::RenderAccessibility* render_accessibility =
- render_frame() ? render_frame()->GetRenderAccessibility() : nullptr;
- bool screen_reader_mode =
- (render_accessibility &&
- render_accessibility->GetAXMode().has_mode(ui::AXMode::kScreenReader));
- (render_accessibility && render_accessibility->GetAXMode().has_mode(
- ui::AXMode::kExtendedProperties));
- base::UmaHistogramBoolean(
- "Accessibility.ScreenAI.Searchify.ScreenReaderModeEnabled",
- screen_reader_mode);
@@ -1033,7 +1083,7 @@
};
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -339,8 +339,6 @@ source_set("unit_tests") {
@@ -341,8 +341,6 @@ source_set("unit_tests") {
"//third_party/puffin:libpuffpatch",
"//third_party/re2",
]
@@ -1044,7 +1094,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -814,10 +814,6 @@ if (is_apple) {
@@ -820,10 +820,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -1067,7 +1117,7 @@
page_objects.links = page->GetLinkInfo(text_runs);
--- a/pdf/pdf_view_web_plugin.cc
+++ b/pdf/pdf_view_web_plugin.cc
@@ -1326,11 +1326,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
@@ -1348,11 +1348,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
if (accessibility_state_ == AccessibilityState::kPending)
LoadAccessibility();
@@ -1079,7 +1129,7 @@
if (!full_frame_)
return;
@@ -2326,7 +2321,7 @@ void PdfViewWebPlugin::EnableAccessibili
@@ -2446,7 +2441,7 @@ void PdfViewWebPlugin::EnableAccessibili
SkBitmap PdfViewWebPlugin::GetImageForOcr(int32_t page_index,
int32_t page_object_index) {
@@ -1088,7 +1138,7 @@
}
void PdfViewWebPlugin::HandleAccessibilityAction(
@@ -2847,19 +2842,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
@@ -2973,19 +2968,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
return;
}
@@ -1110,7 +1160,7 @@
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -2715,7 +2715,7 @@ void PDFiumEngine::HandleLongPress(const
@@ -2696,7 +2696,7 @@ void PDFiumEngine::HandleLongPress(const
SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) {
DCHECK(PageIndexInBounds(page_index));
@@ -1171,7 +1221,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
@@ -211,7 +211,6 @@ group("unittests") {
@@ -213,7 +213,6 @@ group("unittests") {
"panels/timeline:unittests",
"panels/timeline/components:unittests",
"panels/timeline/components/insights:unittests",

269
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
@@ -606,8 +606,6 @@ static_library("browser") {
@@ -608,8 +608,6 @@ static_library("browser") {
"infobars/simple_alert_infobar_creator.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -11,15 +11,15 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"k_anonymity_service/k_anonymity_service_client.cc",
@@ -2284,7 +2282,6 @@ static_library("browser") {
@@ -2313,7 +2311,6 @@ static_library("browser") {
"//components/resources",
"//components/safe_browsing/content/browser",
"//components/safe_browsing/content/browser:safe_browsing_service",
- "//components/safe_browsing/content/browser/notification_content_detection",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser",
@@ -3854,10 +3851,6 @@ static_library("browser") {
"//components/safe_browsing/content/common/proto:download_file_types_proto",
@@ -3892,10 +3889,6 @@ static_library("browser") {
"new_tab_page/modules/modules_switches.h",
"new_tab_page/modules/new_tab_page_modules.cc",
"new_tab_page/modules/new_tab_page_modules.h",
@@ -30,38 +30,7 @@
"new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc",
"new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h",
"new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc",
@@ -6576,14 +6569,11 @@ static_library("browser") {
deps += [ "//components/enterprise/idle" ]
}
- if (enterprise_cloud_content_analysis || is_android ||
- safe_browsing_mode == 1) {
sources += [
"enterprise/connectors/common.cc",
"enterprise/connectors/common.h",
]
deps += [ "//components/enterprise/connectors/core" ]
- }
if (enterprise_cloud_content_analysis) {
sources += [
@@ -8114,9 +8104,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",
- "//components/safe_browsing/content/common/proto:download_file_types_proto",
+ # "//components/safe_browsing/content/common/proto:download_file_types_proto",
]
}
+ # Use download_file_types_proto regardless of safe_browsing_mode, for
+ # now...
+ deps += [
+ "//components/safe_browsing/content/common/proto:download_file_types_proto",
+ ]
if (build_with_tflite_lib) {
sources += [
@@ -8423,7 +8418,6 @@ static_library("browser_generated_files"
@@ -8468,7 +8461,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",
@@ -69,7 +38,7 @@
"//chrome/browser/new_tab_page/modules/v2/authentication: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",
@@ -8905,8 +8899,6 @@ static_library("test_support") {
@@ -8954,8 +8946,6 @@ static_library("test_support") {
"//components/reporting/util:status",
"//components/reporting/util:status_macros",
"//components/reporting/util:task_runner_context",
@@ -203,7 +172,7 @@
#include "content/public/browser/download_item_utils.h"
namespace {
@@ -111,17 +110,6 @@ std::string ElapsedTimeToSecondsString(b
@@ -107,17 +106,6 @@ std::string ElapsedTimeToSecondsString(b
return base::NumberToString(elapsed_time.InSeconds());
}
@@ -221,7 +190,7 @@
// Produces a string consisting of comma-separated action events, each of which
// consists of the surface, action, and relative timestamp (ms) separated by
@@ -248,49 +236,21 @@ DownloadWarningHatsProductSpecificData::
@@ -244,49 +232,21 @@ DownloadWarningHatsProductSpecificData::
return psd;
}
@@ -271,7 +240,7 @@
return psd;
}
@@ -482,40 +442,7 @@ bool CanShowDownloadWarningHatsSurvey(do
@@ -478,40 +438,7 @@ bool CanShowDownloadWarningHatsSurvey(do
std::optional<std::string> MaybeGetDownloadWarningHatsTrigger(
DownloadWarningHatsType survey_type) {
@@ -325,7 +294,7 @@
analysis_config_->supported_tags[0].max_file_size;
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -39,8 +39,6 @@
@@ -40,8 +40,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h"
#include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
@@ -347,7 +316,7 @@
std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel()
--- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
+++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
@@ -166,57 +166,12 @@ void FilesRequestHandler::FileRequestCal
@@ -172,70 +172,12 @@ void FilesRequestHandler::FileRequestCal
}
bool FilesRequestHandler::UploadDataImpl() {
@@ -368,6 +337,19 @@
- base::BindOnce(&FilesRequestHandler::CreateFileOpeningJob,
- weak_ptr_factory_.GetWeakPtr(), std::move(tasks)));
-
- switch (AccessPointToEnterpriseConnector(access_point_)) {
- case enterprise_connectors::FILE_ATTACHED:
- base::UmaHistogramCustomCounts(kFileAttachCount, paths_.size(), 1, 1000,
- 100);
- break;
- case enterprise_connectors::FILE_TRANSFER:
- base::UmaHistogramCustomCounts(kFileTransferCount, paths_.size(), 1,
- 1000, 100);
- break;
- default:
- break;
- }
-
- return true;
- }
-
@@ -405,7 +387,7 @@
void FilesRequestHandler::OnGotFileInfo(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
size_t index,
@@ -265,15 +220,6 @@ void FilesRequestHandler::OnGotFileInfo(
@@ -284,15 +226,6 @@ void FilesRequestHandler::OnGotFileInfo(
void FilesRequestHandler::FinishRequestEarly(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
safe_browsing::BinaryUploadService::Result result) {
@@ -509,7 +491,7 @@
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
@@ -190,20 +190,7 @@ void RealtimeReportingClient::SetProfile
@@ -188,20 +188,7 @@ void RealtimeReportingClient::SetProfile
}
std::string RealtimeReportingClient::GetProfileUserName() {
@@ -630,7 +612,7 @@
ReportingServiceFactory::~ReportingServiceFactory() = default;
--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
@@ -183,9 +183,7 @@ void LogVerdictSource(
@@ -193,9 +193,7 @@ void LogVerdictSource(
bool IsScreenshotAllowedByDataControls(content::BrowserContext* context,
const GURL& url) {
@@ -661,7 +643,7 @@
bool site_isolation_enabled;
--- a/chrome/browser/enterprise/signals/signals_utils.cc
+++ b/chrome/browser/enterprise/signals/signals_utils.cc
@@ -33,24 +33,6 @@ bool IsURLBlocked(const GURL& url, Polic
@@ -33,38 +33,11 @@ bool IsURLBlocked(const GURL& url, Polic
} // namespace
@@ -683,10 +665,8 @@
- }
-}
-
std::optional<bool> GetThirdPartyBlockingEnabled(PrefService* local_state) {
bool GetBuiltInDnsClientEnabled(PrefService* local_state) {
DCHECK(local_state);
#if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -65,15 +47,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ
return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled);
}
@@ -704,7 +684,7 @@
return IsURLBlocked(GURL("https://remotedesktop.google.com"), service) ||
--- a/chrome/browser/enterprise/signals/signals_utils.h
+++ b/chrome/browser/enterprise/signals/signals_utils.h
@@ -19,12 +19,6 @@ std::optional<bool> GetThirdPartyBlockin
@@ -17,12 +17,6 @@ namespace utils {
bool GetBuiltInDnsClientEnabled(PrefService* local_state);
@@ -719,7 +699,7 @@
} // namespace utils
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -679,8 +679,6 @@ source_set("extensions") {
@@ -705,8 +705,6 @@ source_set("extensions") {
"mv2_deprecation_impact_checker.h",
"navigation_extension_enabler.cc",
"navigation_extension_enabler.h",
@@ -730,8 +710,8 @@
"permissions_based_management_policy_provider.cc",
--- 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
@@ -100,16 +100,8 @@ api::enterprise_reporting_private::Conte
info.third_party_blocking_enabled = signals.third_party_blocking_enabled;
@@ -99,16 +99,8 @@ api::enterprise_reporting_private::Conte
signals.chrome_remote_desktop_app_blocked;
info.os_firewall = ToInfoSettingValue(signals.os_firewall);
info.system_dns_servers = std::move(signals.system_dns_servers);
- switch (signals.realtime_url_check_mode) {
@@ -773,7 +753,7 @@
void Blocklist::GetMalwareIDs(const std::set<ExtensionId>& ids,
--- a/chrome/browser/extensions/chrome_extension_system.cc
+++ b/chrome/browser/extensions/chrome_extension_system.cc
@@ -450,8 +450,6 @@ void ChromeExtensionSystem::InstallUpdat
@@ -454,8 +454,6 @@ void ChromeExtensionSystem::InstallUpdat
void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes(
const std::string& extension_id,
const base::Value::Dict& attributes) {
@@ -782,9 +762,19 @@
}
bool ChromeExtensionSystem::FinishDelayedInstallationIfReady(
--- a/chrome/browser/extensions/extension_allowlist_factory.cc
+++ b/chrome/browser/extensions/extension_allowlist_factory.cc
@@ -45,7 +45,6 @@ ExtensionAllowlistFactory::ExtensionAllo
DependsOn(ExtensionPrefsFactory::GetInstance());
DependsOn(ExtensionRegistrarFactory::GetInstance());
DependsOn(ExtensionRegistryFactory::GetInstance());
- DependsOn(safe_browsing::SafeBrowsingMetricsCollectorFactory::GetInstance());
}
ExtensionAllowlistFactory::~ExtensionAllowlistFactory() = default;
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -55,7 +55,6 @@
@@ -57,7 +57,6 @@
#include "chrome/browser/extensions/installed_loader.h"
#include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
#include "chrome/browser/extensions/mv2_experiment_stage.h"
@@ -792,9 +782,9 @@
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/extensions/permissions/permissions_updater.h"
#include "chrome/browser/extensions/profile_util.h"
@@ -403,10 +402,6 @@ ExtensionService::ExtensionService(
install_directory,
unpacked_install_directory)),
@@ -218,10 +217,6 @@ ExtensionService::ExtensionService(
this,
component_loader_.get())),
extension_registrar_(ExtensionRegistrar::Get(profile)),
- omaha_attributes_handler_(extension_prefs,
- ExtensionRegistry::Get(profile),
@@ -802,9 +792,9 @@
- extension_registrar_),
force_installed_tracker_(registry_, profile_),
force_installed_metrics_(registry_, profile_, &force_installed_tracker_),
corrupted_extension_reinstaller_(profile_),
@@ -749,17 +744,6 @@ bool ExtensionService::IsExtensionEnable
return extension_registrar_->IsExtensionEnabled(extension_id);
corrupted_extension_reinstaller_(
@@ -451,17 +446,6 @@ bool ExtensionService::UninstallExtensio
transient_extension_id, reason, error, std::move(done_callback));
}
-void ExtensionService::PerformActionBasedOnOmahaAttributes(
@@ -813,7 +803,7 @@
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- omaha_attributes_handler_.PerformActionBasedOnOmahaAttributes(extension_id,
- attributes);
- allowlist_.PerformActionBasedOnOmahaAttributes(extension_id, attributes);
- allowlist_->PerformActionBasedOnOmahaAttributes(extension_id, attributes);
- // Show an error for the newly blocklisted extension.
- error_controller_->ShowErrorIfNeeded();
-}
@@ -823,7 +813,7 @@
DCHECK_CURRENTLY_ON(BrowserThread::UI);
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -30,7 +30,6 @@
@@ -28,7 +28,6 @@
#include "chrome/browser/extensions/extension_telemetry_service_verdict_handler.h"
#include "chrome/browser/extensions/forced_extensions/force_installed_metrics.h"
#include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h"
@@ -831,7 +821,7 @@
#include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
#include "chrome/browser/profiles/profile_manager_observer.h"
#include "chrome/browser/upgrade_detector/upgrade_observer.h"
@@ -303,10 +302,6 @@ class ExtensionService : public Extensio
@@ -252,10 +251,6 @@ class ExtensionService : public Extensio
void RemoveDisableReasonAndMaybeEnable(const std::string& extension_id,
disable_reason::DisableReason reason);
@@ -842,7 +832,7 @@
// Performs action based on verdicts received from the Extension Telemetry
// server. Currently, these verdicts are limited to off-store extensions.
void PerformActionBasedOnExtensionTelemetryServiceVerdicts(
@@ -715,8 +710,6 @@ class ExtensionService : public Extensio
@@ -553,8 +548,6 @@ class ExtensionService : public Extensio
// Helper to register and unregister extensions.
raw_ptr<ExtensionRegistrar> extension_registrar_ = nullptr;
@@ -1008,7 +998,7 @@
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -475,55 +475,5 @@ bool PredictionBasedPermissionUiSelector
@@ -462,55 +462,5 @@ bool PredictionBasedPermissionUiSelector
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
permissions::RequestType request_type) {
@@ -1066,7 +1056,7 @@
}
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -2459,8 +2459,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2489,8 +2489,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -1085,7 +1075,7 @@
#include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h"
@@ -2032,7 +2031,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -2029,7 +2028,6 @@ void RegisterProfilePrefs(user_prefs::Pr
MicrosoftFilesPageHandler::RegisterProfilePrefs(registry);
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
@@ -1093,9 +1083,19 @@
ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
OutlookCalendarPageHandler::RegisterProfilePrefs(registry);
PinnedTabCodec::RegisterProfilePrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -839,7 +839,6 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance();
#endif
enterprise_connectors::ConnectorsServiceFactory::GetInstance();
- enterprise_connectors::ReportingEventRouterFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
BUILDFLAG(IS_WIN)
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -92,13 +92,6 @@ static_library("safe_browsing") {
@@ -93,13 +93,6 @@ static_library("safe_browsing") {
allow_circular_includes_from += [ "//chrome/browser/ash/file_manager" ]
}
@@ -1163,7 +1163,7 @@
} // namespace safe_browsing
--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
@@ -71,32 +71,7 @@ RealTimeUrlLookupServiceFactory::~RealTi
@@ -72,32 +72,7 @@ RealTimeUrlLookupServiceFactory::~RealTi
std::unique_ptr<KeyedService>
RealTimeUrlLookupServiceFactory::BuildServiceInstanceForBrowserContext(
content::BrowserContext* context) const {
@@ -1198,7 +1198,7 @@
scoped_refptr<network::SharedURLLoaderFactory>
--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
@@ -125,15 +125,6 @@ CreateSettingsPageHelper() {
@@ -123,15 +123,6 @@ CreateSettingsPageHelper() {
CreateChromeSettingsPageHelper();
}
@@ -1214,9 +1214,9 @@
} // namespace
std::unique_ptr<SSLBlockingPage>
@@ -156,10 +147,6 @@ ChromeSecurityBlockingPageFactory::Creat
Profile::FromBrowserContext(web_contents->GetBrowserContext()));
state->DidDisplayErrorPage(cert_error);
@@ -149,10 +140,6 @@ ChromeSecurityBlockingPageFactory::Creat
web_contents, request_url,
overridable ? "ssl_overridable" : "ssl_nonoverridable", overridable));
- LogSafeBrowsingSecuritySensitiveAction(
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
@@ -1225,7 +1225,7 @@
auto controller_client = std::make_unique<SSLErrorControllerClient>(
web_contents, ssl_info, cert_error, request_url,
std::move(metrics_helper), CreateSettingsPageHelper());
@@ -224,10 +211,6 @@ ChromeSecurityBlockingPageFactory::Creat
@@ -217,10 +204,6 @@ ChromeSecurityBlockingPageFactory::Creat
const std::string& mitm_software_name) {
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -1236,7 +1236,7 @@
auto page = std::make_unique<MITMSoftwareBlockingPage>(
web_contents, cert_error, request_url,
/*can_show_enhanced_protection_message=*/true, ssl_info,
@@ -247,10 +230,6 @@ ChromeSecurityBlockingPageFactory::Creat
@@ -240,10 +223,6 @@ ChromeSecurityBlockingPageFactory::Creat
int cert_error,
const GURL& request_url,
const net::SSLInfo& ssl_info) {
@@ -1249,7 +1249,7 @@
/*can_show_enhanced_protection_message=*/true, ssl_info,
--- a/chrome/browser/ssl/ssl_error_controller_client.cc
+++ b/chrome/browser/ssl/ssl_error_controller_client.cc
@@ -92,8 +92,6 @@ void SSLErrorControllerClient::GoBack()
@@ -80,8 +80,6 @@ void SSLErrorControllerClient::GoBack()
void SSLErrorControllerClient::Proceed() {
content::WebContents* const web_contents = this->web_contents();
@@ -1260,7 +1260,7 @@
// certificate. So, when users click proceed on an interstitial, move the tab
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4547,8 +4547,6 @@ static_library("ui") {
@@ -4558,8 +4558,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",
@@ -1269,21 +1269,6 @@
"views/select_audio_output/select_audio_output_dialog.cc",
"views/select_audio_output/select_audio_output_dialog.h",
"views/select_audio_output/select_audio_output_views.cc",
--- a/chrome/browser/ui/download/download_bubble_row_view_info.cc
+++ b/chrome/browser/ui/download/download_bubble_row_view_info.cc
@@ -9,11 +9,11 @@
#include "chrome/browser/download/download_ui_safe_browsing_util.h"
#include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
#include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
-#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
#include "chrome/browser/ui/color/chrome_color_id.h"
#include "chrome/browser/ui/download/download_item_mode.h"
#include "chrome/grit/generated_resources.h"
#include "components/download/public/common/download_danger_type.h"
+#include "components/enterprise/buildflags/buildflags.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/common/features.h"
#include "components/safe_browsing/core/common/proto/csd.pb.h"
--- a/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc
+++ b/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc
@@ -52,7 +52,6 @@
@@ -1294,7 +1279,7 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "ui/base/l10n/l10n_util.h"
@@ -370,34 +369,6 @@ UnusedSitePermissionsService::UnusedSite
@@ -371,34 +370,6 @@ UnusedSitePermissionsService::UnusedSite
base::Unretained(this)));
#endif // BUILDFLAG(IS_ANDROID)
@@ -1329,7 +1314,7 @@
bool migration_completed = pref_change_registrar_->prefs()->GetBoolean(
safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted);
@@ -1054,9 +1025,7 @@ bool UnusedSitePermissionsService::IsUnu
@@ -1056,9 +1027,7 @@ bool UnusedSitePermissionsService::IsUnu
bool UnusedSitePermissionsService::
IsAbusiveNotificationAutoRevocationEnabled() {
@@ -1357,8 +1342,8 @@
#include "components/plus_addresses/grit/plus_addresses_strings.h"
#include "components/safe_browsing/core/common/features.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/saved_tab_groups/public/features.h"
#include "components/strings/grit/components_strings.h"
#include "components/tab_collections/public/tab_interface.h"
#include "components/vector_icons/vector_icons.h"
@@ -140,57 +139,6 @@ void ToastService::RegisterToasts(
.Build());
@@ -1416,7 +1401,7 @@
- .Build());
- }
if (tab_groups::IsTabGroupsSaveV2Enabled()) {
if (data_sharing::features::IsDataSharingFunctionalityEnabled()) {
// Current tab has been removed from the group.
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
@@ -1597,69 +1582,21 @@
kChromeUISyncInternalsHost,
#if !BUILDFLAG(IS_ANDROID)
kChromeUITabSearchHost,
--- a/chrome/renderer/url_loader_throttle_provider_impl.cc
+++ b/chrome/renderer/url_loader_throttle_provider_impl.cc
@@ -175,25 +175,6 @@ URLLoaderThrottleProviderImpl::CreateThr
DCHECK(!is_frame_resource ||
type_ == blink::URLLoaderThrottleProviderType::kFrame);
- if (!is_frame_resource) {
- if (pending_safe_browsing_) {
- safe_browsing_.Bind(std::move(pending_safe_browsing_));
- }
-#if BUILDFLAG(ENABLE_EXTENSIONS)
- if (pending_extension_web_request_reporter_) {
- extension_web_request_reporter_.Bind(
- std::move(pending_extension_web_request_reporter_));
- }
-
- auto throttle = std::make_unique<safe_browsing::RendererURLLoaderThrottle>(
- safe_browsing_.get(), local_frame_token,
- extension_web_request_reporter_.get());
-#else
- auto throttle = std::make_unique<safe_browsing::RendererURLLoaderThrottle>(
- safe_browsing_.get(), local_frame_token);
-#endif // BUILDFLAG(ENABLE_EXTENSIONS)
- throttles.emplace_back(std::move(throttle));
- }
if (fingerprinting_protection_filter::features::
IsFingerprintingProtectionFeatureEnabled()) {
--- a/chrome/renderer/websocket_handshake_throttle_provider_impl.cc
+++ b/chrome/renderer/websocket_handshake_throttle_provider_impl.cc
@@ -58,15 +58,5 @@ WebSocketHandshakeThrottleProviderImpl::
scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-#if BUILDFLAG(ENABLE_EXTENSIONS)
- if (pending_extension_web_request_reporter_) {
- extension_web_request_reporter_.Bind(
- std::move(pending_extension_web_request_reporter_));
- }
- return std::make_unique<
- safe_browsing::WebSocketSBExtensionsHandshakeThrottle>(
- extension_web_request_reporter_.get());
-#else
return nullptr;
-#endif
}
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2399,8 +2399,6 @@ if (!is_android) {
@@ -2449,7 +2449,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection_images_cache",
- "//components/safe_browsing/content/browser:client_side_detection_service",
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -6696,8 +6694,6 @@ test("unit_tests") {
@@ -6771,7 +6770,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection_images_cache",
- "//components/safe_browsing/content/browser:client_side_detection_service",
"//components/safe_browsing/content/browser/notification_content_detection",
"//components/safe_browsing/content/browser/notification_content_detection:test_utils",
"//components/safe_browsing/content/browser/password_protection",
@@ -1714,23 +1651,6 @@
}
} // namespace password_manager
--- a/components/safe_browsing/content/common/proto/BUILD.gn
+++ b/components/safe_browsing/content/common/proto/BUILD.gn
@@ -5,8 +5,12 @@
import("//components/safe_browsing/buildflags.gni")
import("//third_party/protobuf/proto_library.gni")
-if (safe_browsing_mode != 0) {
+# Although this was gated on safe_browsing_mode != 0, a considerable amount
+# of source code that relies on the types included in download_file_types.pb.h
+# is not gated on BUILDFLAG(SAFE_BROWSING_AVAILABLE). This is far less
+# invasive than the alternative.
+# if (safe_browsing_mode != 0) {
proto_library("download_file_types_proto") {
sources = [ "download_file_types.proto" ]
}
-}
+# }
--- a/components/safe_browsing/content/common/safe_browsing.mojom
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
@@ -146,7 +146,6 @@ interface PhishingDetector {
@@ -1792,7 +1712,7 @@
#include "components/safe_browsing/core/common/utils.h"
#include "google_apis/google_api_keys.h"
#include "net/base/net_errors.h"
@@ -117,21 +116,7 @@ constexpr net::NetworkTrafficAnnotationT
@@ -114,21 +113,7 @@ constexpr net::NetworkTrafficAnnotationT
bool IsEnabled(PrefService* pref_service,
std::optional<std::string> country,
bool are_background_lookups_allowed) {
@@ -1815,7 +1735,7 @@
}
GURL GetKeyFetchingUrl() {
@@ -422,25 +407,9 @@ void OhttpKeyService::MaybeStartServerTr
@@ -403,25 +388,9 @@ void OhttpKeyService::MaybeStartServerTr
}
void OhttpKeyService::PopulateKeyFromPref() {
@@ -1841,6 +1761,17 @@
}
void OhttpKeyService::Shutdown() {
--- a/components/safe_browsing/core/browser/realtime/chrome_enterprise_url_lookup_service.cc
+++ b/components/safe_browsing/core/browser/realtime/chrome_enterprise_url_lookup_service.cc
@@ -135,7 +135,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe
bool ChromeEnterpriseRealTimeUrlLookupService::CanCheckSafeBrowsingDb() const {
// Check database if safe browsing is enabled.
- return safe_browsing::IsSafeBrowsingEnabled(*pref_service_);
+ return false;
}
bool ChromeEnterpriseRealTimeUrlLookupService::
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
@@ -284,17 +284,6 @@ void RealTimeUrlLookupService::MaybeLogP
@@ -1863,7 +1794,7 @@
void RealTimeUrlLookupService::MaybeFillReferringWebApk(
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
@@ -613,17 +613,6 @@ std::unique_ptr<RTLookupRequest> RealTim
@@ -614,17 +614,6 @@ std::unique_ptr<RTLookupRequest> RealTim
request->set_report_type(is_sampled_report ? RTLookupRequest::SAMPLED_REPORT
: RTLookupRequest::FULL_REPORT);
request->set_frame_type(RTLookupRequest::MAIN_FRAME);
@@ -2021,7 +1952,7 @@
void SSLBlockingPageBase::PopulateEnhancedProtectionMessage(
--- a/components/sync_preferences/common_syncable_prefs_database.cc
+++ b/components/sync_preferences/common_syncable_prefs_database.cc
@@ -320,9 +320,6 @@ constexpr auto kCommonSyncablePrefsAllow
@@ -322,9 +322,6 @@ constexpr auto kCommonSyncablePrefsAllow
{plus_addresses::prefs::kLastPlusAddressFillingTime,
{syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES,
PrefSensitivity::kNone, MergeBehavior::kNone}},
@@ -2109,7 +2040,7 @@
void DidFileSkipQuarantine(base::File::Error result);
--- a/extensions/browser/extension_registrar.cc
+++ b/extensions/browser/extension_registrar.cc
@@ -740,103 +740,27 @@ void ExtensionRegistrar::UnblockAllExten
@@ -747,103 +747,27 @@ void ExtensionRegistrar::UnblockAllExten
void ExtensionRegistrar::OnBlocklistStateRemoved(
const std::string& extension_id) {

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

File diff suppressed because it is too large Load Diff

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

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

59
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
@@ -2498,6 +2498,7 @@ static_library("browser") {
@@ -2530,6 +2530,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
@@ -179,6 +179,7 @@
@@ -181,6 +181,7 @@
#include "components/translate/core/common/translate_util.h"
#include "components/trusted_vault/features.h"
#include "components/ui_devtools/switches.h"
@@ -44,7 +44,7 @@
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -291,6 +291,7 @@ source_set("browser") {
@@ -294,6 +294,7 @@ source_set("browser") {
"//third_party/re2",
"//third_party/snappy",
"//third_party/sqlite",
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "components/viz/host/host_frame_sink_manager.h"
@@ -3412,6 +3413,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3493,6 +3494,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -488,6 +489,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -485,6 +486,10 @@ void SetRuntimeFeaturesFromCommandLine(c
true},
{wrf::EnableWebAudioBypassOutputBufferingOptOut,
blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
@@ -124,7 +124,7 @@
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
@@ -867,6 +868,11 @@ Document::Document(const DocumentInit& i
@@ -869,6 +870,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();
@@ -993,6 +999,14 @@ const Position Document::PositionAdjuste
@@ -995,6 +1001,14 @@ const Position Document::PositionAdjuste
return Position::BeforeNode(*shadow_host);
}
@@ -153,7 +153,7 @@
selector_query_cache_ = MakeGarbageCollected<SelectorQueryCache>();
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -555,6 +555,10 @@ class CORE_EXPORT Document : public Cont
@@ -558,6 +558,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -164,7 +164,7 @@
V8VisibilityState visibilityState() const;
String visibilityStateAsString() const;
bool IsPageVisible() const;
@@ -2644,6 +2648,9 @@ class CORE_EXPORT Document : public Cont
@@ -2704,6 +2708,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
@@ -2666,6 +2666,11 @@ DOMRectList* Element::getClientRects() {
@@ -2836,6 +2836,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2693,6 +2698,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2863,6 +2868,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -200,7 +200,7 @@
--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
@@ -1632,6 +1632,12 @@ DOMRectList* Range::getClientRects() con
@@ -1634,6 +1634,12 @@ DOMRectList* Range::getClientRects() con
Vector<gfx::QuadF> quads;
GetBorderAndTextQuads(quads);
@@ -213,7 +213,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -1639,7 +1645,11 @@ DOMRect* Range::getBoundingClientRect()
@@ -1641,7 +1647,11 @@ DOMRect* Range::getBoundingClientRect()
// TODO(crbug.com/1499981): This should be removed once synchronized scrolling
// impact is understood.
SyncScrollAttemptHeuristic::DidAccessScrollOffset();
@@ -228,7 +228,7 @@
// TODO(editing-dev): We should make
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
@@ -107,6 +107,24 @@ const ShapeResult* ShapeWord(const TextR
@@ -106,6 +106,24 @@ const ShapeResult* ShapeWord(const TextR
}
} // namespace
@@ -255,7 +255,7 @@
const V8CanvasTextBaseline::Enum baseline,
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
@@ -112,6 +112,8 @@ class CORE_EXPORT TextMetrics final : pu
@@ -111,6 +111,8 @@ class CORE_EXPORT TextMetrics final : pu
float x_position_;
};
@@ -266,19 +266,19 @@
const TextDirection& direction,
--- 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
@@ -235,6 +235,9 @@ class Isolate;
class Value;
} // namespace v8
@@ -103,6 +103,9 @@
// https://github.com/include-what-you-use/include-what-you-use/issues/1122
// IWYU pragma: no_include "base/numerics/clamped_math.h"
+#include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h"
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
+
namespace blink {
class DOMMatrixInit;
@@ -3763,12 +3766,25 @@ TextMetrics* BaseRenderingContext2D::mea
TextDirection direction = ToTextDirection(
state.GetDirection(), GetCanvasRenderingContextHost(), computed_style);
constexpr char kDefaultFont[] = "10px sans-serif";
@@ -1182,13 +1185,26 @@ TextMetrics* BaseRenderingContext2D::mea
TextDirection direction =
ToTextDirection(state.GetDirection(), host, computed_style);
- return MakeGarbageCollected<TextMetrics>(
- font, direction, state.GetTextBaseline().AsEnum(),
@@ -286,8 +286,9 @@
+ TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(
+ font, direction, GetState().GetTextBaseline().AsEnum(),
+ GetState().GetTextAlign().AsEnum(), text,
RuntimeEnabledFeatures::CanvasTextNgEnabled()
? &GetCanvasRenderingContextHost()->GetPlainTextPainter()
RuntimeEnabledFeatures::CanvasTextNgEnabled(
host->GetTopExecutionContext())
? &host->GetPlainTextPainter()
: nullptr);
+
+ // Scale text metrics if enabled
@@ -304,10 +305,10 @@
+ return text_metrics;
}
void BaseRenderingContext2D::SnapshotStateForFilter() {
String BaseRenderingContext2D::lang() const {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1772,6 +1772,7 @@ component("platform") {
@@ -1784,6 +1784,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection:language_detection",
@@ -335,15 +336,15 @@
@@ -35,6 +35,7 @@
#include "base/compiler_specific.h"
#include "base/memory/ptr_util.h"
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
#include "third_party/blink/renderer/platform/image-encoders/image_encoder_utils.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/wtf/text/base64.h"
#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkSurface.h"
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2080,6 +2080,12 @@
status: "experimental",
@@ -2092,6 +2092,12 @@
status: "stable",
},
{
+ name: "FingerprintingClientRectsNoise",

40
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
@@ -3415,6 +3415,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3496,6 +3496,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -44,7 +44,7 @@ approach to change color components.
switches::kForceGpuMemAvailableMb,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -493,6 +493,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -490,6 +490,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -65,7 +65,7 @@ approach to change color components.
};
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -2967,6 +2967,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -508,6 +508,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
@@ -1717,7 +1717,9 @@ component("platform") {
@@ -1729,7 +1729,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -101,27 +101,17 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
@@ -34,6 +34,8 @@
#include "base/compiler_specific.h"
#include "base/memory/ptr_util.h"
+#include "base/rand_util.h"
+#include "base/logging.h"
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/wtf/text/base64.h"
@@ -141,6 +143,11 @@ bool ImageDataBuffer::EncodeImageInterna
const SkPixmap& pixmap) const {
DCHECK(is_valid_);
@@ -130,6 +130,10 @@ base::span<const uint8_t> ImageDataBuffe
bool ImageDataBuffer::EncodeImage(const ImageEncodingMimeType mime_type,
const double& quality,
Vector<unsigned char>* encoded_image) const {
+ if (RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
+ // shuffle subchannel color data within the pixmap
+ StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
+ }
+
if (mime_type == kMimeTypeJpeg) {
SkJpegEncoder::Options options;
options.fQuality = ImageEncoder::ComputeJpegQuality(quality);
return ImageEncoder::Encode(encoded_image, pixmap_, mime_type, quality);
}
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
@@ -4,6 +4,8 @@
@@ -147,8 +137,8 @@ approach to change color components.
#include "ui/gfx/geometry/skia_conversions.h"
#include "v8/include/v8.h"
@@ -115,4 +119,154 @@ void StaticBitmapImage::DrawHelper(cc::P
WebCoreClampingModeToSkiaRectConstraint(draw_options.clamping_mode));
@@ -114,4 +118,154 @@ void StaticBitmapImage::DrawHelper(cc::P
ToSkiaRectConstraint(draw_options.clamping_mode));
}
+// set the component to maximum-delta if it is >= maximum, or add to existing color component (color + delta)
@@ -304,7 +294,7 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
@@ -39,6 +39,8 @@ class PLATFORM_EXPORT StaticBitmapImage
@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage
StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
@@ -315,7 +305,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
@@ -2086,6 +2086,9 @@
@@ -2098,6 +2098,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

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

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2177,6 +2177,7 @@ static_library("browser") {
@@ -2205,6 +2205,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2453,6 +2453,10 @@ const char kMantisFeatureKeyDescription[
@@ -2536,6 +2536,10 @@ const char kMantisFeatureKeyDescription[
"Feature key to use the Mantis feature on ChromeOS.";
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -115,7 +115,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
@@ -1417,6 +1417,9 @@ extern const char kMantisFeatureKeyName[
@@ -1465,6 +1465,9 @@ extern const char kMantisFeatureKeyName[
extern const char kMantisFeatureKeyDescription[];
#endif // IS_CHROMEOS

30
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
@@ -1553,7 +1553,7 @@ void ChromeContentBrowserClient::Registe
@@ -1558,7 +1558,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
@@ -503,7 +503,7 @@ void ProfileNetworkContextService::Confi
@@ -529,7 +529,7 @@ void ProfileNetworkContextService::Confi
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -56,7 +56,7 @@
</cr-dialog>
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -96,7 +96,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -97,7 +97,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
@@ -67,27 +67,27 @@
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
@@ -21,7 +21,7 @@ namespace prefs {
@@ -29,7 +29,7 @@ constexpr char kAutofillRanQuasiDuplicat
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
registry->RegisterBooleanPref(
- prefs::kAutofillProfileEnabled, true,
+ prefs::kAutofillProfileEnabled, false,
- kAutofillProfileEnabled, true,
+ kAutofillProfileEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kAutofillLastVersionDeduped, 0,
@@ -30,7 +30,7 @@ void RegisterProfilePrefs(user_prefs::Pr
prefs::kAutofillHasSeenIban, false,
kAutofillLastVersionDeduped, 0,
@@ -38,7 +38,7 @@ void RegisterProfilePrefs(user_prefs::Pr
kAutofillHasSeenIban, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
- prefs::kAutofillCreditCardEnabled, true,
+ prefs::kAutofillCreditCardEnabled, false,
- kAutofillCreditCardEnabled, true,
+ kAutofillCreditCardEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kAutofillPaymentCvcStorage, true,
kAutofillPaymentCvcStorage, true,
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -487,7 +487,7 @@ bool DoesBookmarkContainWords(const std:
@@ -456,7 +456,7 @@ bool DoesBookmarkContainWords(const std:
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -109,7 +109,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -389,7 +389,7 @@ bool HasManuallyFilledFields(const Passw
@@ -411,7 +411,7 @@ void RecordProvisionalSaveFailure(
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -118,7 +118,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
#if BUILDFLAG(IS_IOS)
// Deprecated pref in profile prefs.
@@ -397,7 +397,7 @@ void PasswordManager::RegisterProfilePre
@@ -419,7 +419,7 @@ void PasswordManager::RegisterProfilePre
false);
#endif // BUILDFLAG(IS_IOS)
registry->RegisterBooleanPref(

12
patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch
View File

@@ -1,15 +1,17 @@
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -303,6 +303,12 @@ if (is_linux || is_chromeos) {
# These files have a suspicious comparison.
# TODO fix this and re-enable this warning.
"-Wno-sign-compare",
@@ -295,6 +295,14 @@ if (is_linux || is_chromeos) {
"suid/process_util_linux.c",
"suid/sandbox.c",
]
+
+ cflags = [
+ "-fPIE",
+ ]
+
+ ldflags = [
+ "-pie",
]
+ ]
}
}

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
@@ -1071,7 +1071,7 @@ class AppControllerNativeThemeObserver :
@@ -1072,7 +1072,7 @@ class AppControllerNativeThemeObserver :
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

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

@@ -1,14 +1,14 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -143,6 +143,7 @@
@@ -142,6 +142,7 @@
#include "chrome/browser/ui/unload_controller.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h"
+#include "chrome/browser/ui/views/message_box_dialog.h"
#include "chrome/browser/ui/views/status_bubble_views.h"
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -578,6 +579,7 @@ Browser::Browser(const CreateParams& par
@@ -586,6 +587,7 @@ Browser::Browser(const CreateParams& par
omit_from_session_restore_(params.omit_from_session_restore),
should_trigger_session_restore_(params.should_trigger_session_restore),
cancel_download_confirmation_state_(NOT_PROMPTED),
@@ -16,7 +16,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -1031,20 +1033,22 @@ Browser::WarnBeforeClosingResult Browser
@@ -1049,20 +1051,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1082,6 +1086,7 @@ bool Browser::TryToCloseWindow(
@@ -1100,6 +1104,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3302,6 +3307,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3408,6 +3413,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;
@@ -3327,6 +3384,22 @@ void Browser::InProgressDownloadResponse
@@ -3433,6 +3490,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -152,7 +152,7 @@
#include "chrome/browser/ui/signin/signin_view_controller.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
@@ -1189,12 +1190,17 @@ class Browser : public TabStripModelObse
@@ -1216,12 +1217,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.
@@ -1363,6 +1369,8 @@ class Browser : public TabStripModelObse
@@ -1394,6 +1400,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

4
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
@@ -929,10 +929,14 @@ bool HandleNewTabPageLocationOverride(
@@ -934,10 +934,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())
@@ -36,7 +36,7 @@
return CombineAndSanitizeOriginLists(existing_value, new_value);
}
@@ -482,6 +483,7 @@ void FlagsState::SetOriginListFlag(const
@@ -484,6 +485,7 @@ void FlagsState::SetOriginListFlag(const
const std::string& value,
FlagsStorage* flags_storage) {
const std::string new_value =

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

@@ -66,7 +66,7 @@
#include "third_party/blink/public/platform/web_input_event_result.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_drag_event_init.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_pointer_event_init.h"
@@ -681,8 +682,14 @@ WebInputEventResult MouseEventManager::H
@@ -656,8 +657,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

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

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

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"
@@ -537,6 +538,15 @@ AutocompleteController::AutocompleteCont
@@ -544,6 +545,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,7 +2,7 @@
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -531,7 +531,9 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -541,7 +541,9 @@ void TabHelpers::AttachTabHelpers(WebCon
profile, web_contents);
#endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
@@ -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
@@ -251,14 +251,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -256,14 +256,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent() || frame->IsInFencedFrameTree())
return;
@@ -58,10 +58,10 @@
#include "base/check_is_test.h"
+#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/containers/fixed_flat_map.h"
#include "base/containers/flat_map.h"
#include "base/debug/crash_logging.h"
@@ -290,6 +291,12 @@ bool IsAccountDataActive(const TemplateU
return false;
@@ -309,6 +310,12 @@ std::string_view SyncChangeTypeToHistogr
NOTREACHED();
}
+bool ShouldAutocollect() {
@@ -73,7 +73,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -470,6 +477,7 @@ TemplateURLService::TemplateURLService(
@@ -489,6 +496,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::RepeatingClosure& dsp_change_callback)
: prefs_(prefs),
@@ -81,7 +81,7 @@
search_engine_choice_service_(search_engine_choice_service),
prepopulate_data_resolver_(prepopulate_data_resolver),
search_terms_data_(std::move(search_terms_data)),
@@ -573,8 +581,8 @@ bool TemplateURLService::CanAddAutogener
@@ -592,8 +600,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(
@@ -2266,6 +2274,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2316,6 +2324,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
if (client_) {
client_->SetOwner(this);
}
@@ -2448,6 +2458,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2498,6 +2508,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
@@ -893,6 +893,8 @@ class TemplateURLService final : public
@@ -895,6 +895,8 @@ class TemplateURLService final : public
raw_ref<TemplateURLPrepopulateData::Resolver> prepopulate_data_resolver_;

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

@@ -8,8 +8,8 @@
#include "base/debug/alias.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
@@ -719,6 +720,13 @@ void Tab::OnGestureEvent(ui::GestureEven
event->SetHandled();
@@ -726,6 +727,13 @@ void Tab::HideHover(TabStyle::HideHoverS
DeprecatedLayoutImmediately();
}
+std::u16string Tab::GetRenderedTooltipText(const gfx::Point& p) const {
@@ -42,7 +42,7 @@
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
@@ -1888,6 +1889,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -1923,6 +1924,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

28
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
@@ -1447,7 +1447,8 @@ void BrowserCommandController::InitComma
@@ -1487,7 +1487,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -10,6 +10,16 @@
command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH,
enable_tab_search_commands);
command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE,
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -5069,6 +5069,7 @@ void BrowserView::AddedToWidget() {
toolbar_->Init();
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button"))
if (GetIsNormalType()) {
if (features::HasTabSearchToolbarButton()) {
tab_search_bubble_host_ = std::make_unique<TabSearchBubbleHost>(
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -4,6 +4,7 @@
@@ -26,8 +36,8 @@
if (browser &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button") &&
(browser->GetType() == BrowserWindowInterface::Type::TYPE_NORMAL)) {
if (features::IsTabstripComboButtonEnabled() &&
ShouldShowNewTabButton(browser)) {
if (features::IsTabSearchMoving() &&
!features::HasTabSearchToolbarButton() &&
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -60,4 +60,8 @@
@@ -39,3 +49,15 @@
+ "Removes the tabsearch button from the tabstrip. ungoogled-chromium flag",
+ kOsDesktop, SINGLE_VALUE_TYPE("remove-tabsearch-button")},
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -436,7 +436,8 @@ BASE_FEATURE(kTabstripComboButton,
base::FEATURE_DISABLED_BY_DEFAULT);
bool IsTabSearchMoving() {
- return base::FeatureList::IsEnabled(features::kTabstripComboButton);
+ return base::FeatureList::IsEnabled(features::kTabstripComboButton) &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button");
}
const base::FeatureParam<bool> kTabstripComboButtonHasBackground{

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

@@ -19,7 +19,7 @@
return CombineAndSanitizeOriginLists(existing_value, new_value);
}
@@ -484,6 +485,7 @@ void FlagsState::SetOriginListFlag(const
@@ -486,6 +487,7 @@ void FlagsState::SetOriginListFlag(const
FlagsStorage* flags_storage) {
const std::string new_value =
internal_name == "custom-ntp" ? value :

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

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

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -18,6 +18,7 @@
@@ -19,6 +19,7 @@
#include "base/check.h"
#include "base/check_op.h"
@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/flat_map.h"
#include "base/containers/span.h"
@@ -957,6 +958,10 @@ void TabStripModel::CloseAllTabsInGroup(
@@ -987,6 +988,10 @@ void TabStripModel::CloseAllTabsInGroup(
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));
@@ -19,7 +19,7 @@
CloseTabs({GetWebContentsAt(index)}, close_types);
}
@@ -2205,9 +2210,13 @@ TabStripModel::GetGroupsDestroyedFromRem
@@ -2276,9 +2281,13 @@ TabStripModel::GetGroupsDestroyedFromRem
void TabStripModel::ExecuteCloseTabsByIndices(
base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
uint32_t close_types) {

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"
@@ -103,6 +104,14 @@ scoped_refptr<extensions::CrxInstaller>
@@ -97,6 +98,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)
@@ -111,7 +120,7 @@ bool IsExtensionDownload(const DownloadI
@@ -105,7 +114,7 @@ bool IsExtensionDownload(const DownloadI
if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
extensions::UserScript::IsURLUserScript(download_item.GetURL(),
download_item.GetMimeType())) {
@@ -69,7 +69,7 @@
// Don't prompt for file types that are marked for opening automatically.
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -284,6 +284,13 @@ bool ExtensionManagement::IsInstallation
@@ -283,6 +283,13 @@ bool ExtensionManagement::IsInstallation
bool ExtensionManagement::IsOffstoreInstallAllowed(
const GURL& url,
const GURL& referrer_url) const {

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
@@ -1207,6 +1207,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1208,6 +1208,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"
@@ -1369,7 +1370,8 @@ void HistoryBackend::InitImpl(
@@ -1338,7 +1339,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.
@@ -31,7 +31,7 @@
}
void HistoryBackend::OnMemoryPressure(
@@ -1597,6 +1599,8 @@ void HistoryBackend::AddPagesWithDetails
@@ -1561,6 +1563,8 @@ void HistoryBackend::AddPagesWithDetails
}
bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const {

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
@@ -2161,6 +2161,10 @@ void BrowserView::ExitFullscreen() {
@@ -2220,6 +2220,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
@@ -1141,7 +1141,11 @@ void Tab::UpdateIconVisibility() {
@@ -1156,7 +1156,11 @@ void Tab::UpdateIconVisibility() {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1170,6 +1174,8 @@ void Tab::UpdateIconVisibility() {
@@ -1185,6 +1189,8 @@ void Tab::UpdateIconVisibility() {
!controller_->IsLockedForOnTask() &&
#endif
large_enough_for_close_button;

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

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/embedder_support/user_agent_utils.cc
+++ b/components/embedder_support/user_agent_utils.cc
@@ -142,6 +142,8 @@ const std::string& GetWindowsPlatformVer
@@ -160,6 +160,8 @@ const std::string& GetWindowsPlatformVer
// TODO(crbug.com/1330890): Remove this method along with policy.
bool ShouldReduceUserAgentMinorVersion(
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@@ -20,7 +20,7 @@
return ((user_agent_reduction !=
UserAgentReductionEnterprisePolicyState::kForceDisabled &&
base::FeatureList::IsEnabled(
@@ -165,6 +167,8 @@ bool ShouldReduceUserAgentMinorVersion(
@@ -183,6 +185,8 @@ bool ShouldReduceUserAgentMinorVersion(
// sending unified platform for the user agent string.
bool ShouldSendUserAgentUnifiedPlatform(
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@@ -29,7 +29,7 @@
#if BUILDFLAG(IS_ANDROID)
return ShouldReduceUserAgentMinorVersion(user_agent_reduction) &&
base::FeatureList::IsEnabled(
@@ -446,6 +450,8 @@ blink::UserAgentMetadata GetUserAgentMet
@@ -612,6 +616,8 @@ blink::UserAgentMetadata GetUserAgentMet
blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service,
bool only_low_entropy_ch) {

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

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/client_hints/client_hints.cc
+++ b/content/browser/client_hints/client_hints.cc
@@ -826,6 +826,8 @@ void UpdateNavigationRequestClientUaHead
@@ -821,6 +821,8 @@ void UpdateNavigationRequestClientUaHead
net::HttpRequestHeaders* headers,
const std::optional<GURL>& request_url) {
DCHECK(frame_tree_node);
@@ -20,7 +20,7 @@
if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) {
return;
}
@@ -847,6 +849,8 @@ void AddRequestClientHintsHeaders(
@@ -842,6 +844,8 @@ void AddRequestClientHintsHeaders(
FrameTreeNode* frame_tree_node,
const network::ParsedPermissionsPolicy& container_policy,
const std::optional<GURL>& request_url) {
@@ -70,15 +70,15 @@
ua_data->SetBrandVersionList(metadata.brand_version_list);
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
@@ -51,6 +51,7 @@
@@ -52,6 +52,7 @@
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/client_hints/client_hints.h"
#include "third_party/blink/public/common/device_memory/approximated_device_memory.h"
+#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/switches.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
#include "third_party/blink/public/mojom/loader/request_context_frame_type.mojom-blink.h"
#include "third_party/blink/public/platform/modules/service_worker/web_service_worker_network_provider.h"
@@ -502,6 +503,8 @@ void FrameFetchContext::ModifyRequestFor
@@ -504,6 +505,8 @@ void FrameFetchContext::ModifyRequestFor
void FrameFetchContext::AddClientHintsIfNecessary(
const std::optional<float> resource_width,
ResourceRequest& request) {

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

@@ -6,9 +6,9 @@
#include "base/check_op.h"
+#include "base/command_line.h"
#include "base/containers/adapters.h"
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
@@ -173,6 +174,18 @@ DragOperation GetDropEffect(const ui::Dr
@@ -175,6 +176,18 @@ DragOperation GetDropEffect(const ui::Dr
return DragOperation::kMove;
}
@@ -27,7 +27,7 @@
} // namespace
BrowserRootView::DropInfo::DropInfo() = default;
@@ -185,7 +198,9 @@ BrowserRootView::DropInfo::~DropInfo() {
@@ -187,7 +200,9 @@ BrowserRootView::DropInfo::~DropInfo() {
BrowserRootView::BrowserRootView(BrowserView* browser_view,
views::Widget* widget)
@@ -38,7 +38,7 @@
BrowserRootView::~BrowserRootView() {
// It's possible to destroy the browser while a drop is active. In this case,
@@ -325,7 +340,7 @@ bool BrowserRootView::OnMouseWheel(const
@@ -327,7 +342,7 @@ bool BrowserRootView::OnMouseWheel(const
// Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
// disable it if the latter feature is enabled.

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

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

4
patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch
View File

@@ -86,7 +86,7 @@
// Feature declarations and associated constants (feature params, et cetera)
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -3861,6 +3861,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3857,6 +3857,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -95,7 +95,7 @@
return WebGLAny(script_state,
String(ContextGL()->GetString(GL_RENDERER)));
}
@@ -3876,6 +3878,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3872,6 +3874,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

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

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

@@ -19,7 +19,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -165,6 +165,7 @@
@@ -166,6 +166,7 @@
#include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy_features.h"
@@ -27,7 +27,7 @@
#include "services/network/public/cpp/resource_request_body.h"
#include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h"
#include "services/network/public/cpp/url_loader_completion_status.h"
@@ -383,10 +384,10 @@ void AddAdditionalRequestHeaders(
@@ -385,10 +386,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
@@ -44,15 +44,15 @@
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -135,6 +135,7 @@
#include "services/metrics/public/cpp/ukm_source_id.h"
@@ -136,6 +136,7 @@
#include "services/network/public/cpp/content_decoding_interceptor.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/not_implemented_url_loader_factory.h"
+#include "services/network/public/cpp/referrer_sanitizer.h"
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
@@ -4650,10 +4651,13 @@ void RenderFrameImpl::FinalizeRequestInt
@@ -4656,10 +4657,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -100,7 +100,7 @@
--- a/services/network/public/cpp/BUILD.gn
+++ b/services/network/public/cpp/BUILD.gn
@@ -151,6 +151,8 @@ component("cpp") {
@@ -119,6 +119,8 @@ component("cpp") {
"private_network_access_check_result.cc",
"private_network_access_check_result.h",
"record_ontransfersizeupdate_utils.h",
@@ -132,13 +132,13 @@
} // namespace url
namespace network::features {
+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kMinimalReferrers);
+COMPONENT_EXPORT(NETWORK_CPP_FLAGS_AND_SWITCHES) BASE_DECLARE_FEATURE(kMinimalReferrers);
+
+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kNoCrossOriginReferrers);
+COMPONENT_EXPORT(NETWORK_CPP_FLAGS_AND_SWITCHES) BASE_DECLARE_FEATURE(kNoCrossOriginReferrers);
+
COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kBlockAcceptClientHints);
// Note: Do not use BASE_DECLARE_FEATURE_PARAM macro as this is called only once
COMPONENT_EXPORT(NETWORK_CPP_FLAGS_AND_SWITCHES)
BASE_DECLARE_FEATURE(kBlockAcceptClientHints);
--- /dev/null
+++ b/services/network/public/cpp/referrer_sanitizer.cc
@@ -0,0 +1,49 @@
@@ -268,8 +268,8 @@
+#include "services/network/public/cpp/referrer_sanitizer.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
#include "third_party/blink/public/common/features.h"
@@ -23,6 +24,7 @@
#include "third_party/blink/public/common/loader/loader_constants.h"
@@ -22,6 +23,7 @@
#include "third_party/blink/public/platform/modules/service_worker/web_service_worker_provider_context.h"
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/resource_load_info_notifier_wrapper.h"
@@ -277,7 +277,7 @@
#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"
@@ -389,10 +391,13 @@ void DedicatedOrSharedWorkerFetchContext
@@ -342,10 +344,13 @@ void DedicatedOrSharedWorkerFetchContext
auto url_request_extra_data = base::MakeRefCounted<WebURLRequestExtraData>();
request.SetURLRequestExtraData(std::move(url_request_extra_data));

2
patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
View File

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

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

@@ -123,7 +123,7 @@
--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
@@ -67,6 +67,15 @@ bool EditSearchEngineController::IsURLVa
@@ -69,6 +69,15 @@ bool EditSearchEngineController::IsURLVa
.is_valid();
}
@@ -139,7 +139,7 @@
bool EditSearchEngineController::IsKeywordValid(
const std::u16string& keyword_input) const {
std::u16string keyword_input_trimmed(
@@ -91,10 +100,12 @@ bool EditSearchEngineController::IsKeywo
@@ -93,10 +102,12 @@ bool EditSearchEngineController::IsKeywo
void EditSearchEngineController::AcceptAddOrEdit(
const std::u16string& title_input,
const std::u16string& keyword_input,
@@ -153,7 +153,7 @@
TemplateURLService* template_url_service =
TemplateURLServiceFactory::GetForProfile(profile_);
@@ -122,7 +133,8 @@ void EditSearchEngineController::AcceptA
@@ -124,7 +135,8 @@ void EditSearchEngineController::AcceptA
} else {
// Adding or modifying an entry via the Delegate.
edit_keyword_delegate_->OnEditedKeyword(template_url_, title_input,
@@ -271,7 +271,7 @@
bool CanEdit(const TemplateURL* url) const;
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -203,21 +203,25 @@ void TemplateURLTableModel::Remove(size_
@@ -206,21 +206,25 @@ void TemplateURLTableModel::Remove(size_
void TemplateURLTableModel::Add(size_t index,
const std::u16string& short_name,
const std::u16string& keyword,
@@ -302,7 +302,7 @@
DCHECK(index <= RowCount());
DCHECK(!url.empty());
TemplateURL* template_url = GetTemplateURL(index);
@@ -226,7 +230,8 @@ void TemplateURLTableModel::ModifyTempla
@@ -229,7 +233,8 @@ void TemplateURLTableModel::ModifyTempla
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
template_url->SupportsReplacement(
template_url_service_->search_terms_data()));
@@ -428,7 +428,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -975,7 +975,8 @@ void TemplateURLService::IncrementUsageC
@@ -1006,7 +1006,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
@@ -438,7 +438,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -990,6 +991,7 @@ void TemplateURLService::ResetTemplateUR
@@ -1021,6 +1022,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -448,7 +448,7 @@
syncer::kSeparateLocalAndAccountSearchEngines)
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -341,7 +341,8 @@ class TemplateURLService final : public
@@ -342,7 +342,8 @@ class TemplateURLService final : public
void ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,

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

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

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

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

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

@@ -142,7 +142,7 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -127,7 +127,6 @@ source_set("browser") {
@@ -129,7 +129,6 @@ source_set("browser") {
"//components/performance_manager/scenario_api",
"//components/power_monitor",
"//components/services/filesystem:lib",

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

@@ -7,5 +7,5 @@
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kDownloadTailoredWarnings,
"DownloadTailoredWarnings",
BASE_FEATURE(kDownloadWarningSurvey,
"DownloadWarningSurvey",

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
@@ -1919,7 +1919,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
@@ -2060,7 +2060,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
@@ -558,11 +558,6 @@ int GetContentRestrictions(const Browser
@@ -557,11 +557,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;
}
@@ -1723,8 +1718,7 @@ bool CanSavePage(const Browser* browser)
@@ -1712,8 +1707,7 @@ bool CanSavePage(const Browser* browser)
policy::DownloadRestriction::ALL_FILES) {
return false;
}

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

@@ -15,7 +15,7 @@
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2130,8 +2130,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2185,8 +2185,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 "
@@ -2142,7 +2140,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2197,7 +2195,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}

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

@@ -8,7 +8,7 @@
#include "components/variations/field_trial_config/field_trial_util.h"
#include "components/variations/variations_associated_data.h"
#include "components/variations/variations_switches.h"
@@ -681,14 +682,19 @@ void FlagsState::GetFlagFeatureEntries(
@@ -686,14 +687,19 @@ void FlagsState::GetFlagFeatureEntries(
int current_platform = GetCurrentPlatform();
for (const FeatureEntry& entry : feature_entries_) {
@@ -29,7 +29,7 @@
base::Value::List supported_platforms;
AddOsStrings(entry.supported_platforms, &supported_platforms);
@@ -1097,7 +1103,9 @@ bool FlagsState::IsSupportedFeature(cons
@@ -1102,7 +1108,9 @@ bool FlagsState::IsSupportedFeature(cons
continue;
}
if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) {

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

@@ -1,9 +1,8 @@
# Disables Site search Starter Pack
# Adds DDG to the default search engines.
#
--- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc
@@ -314,7 +314,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
@@ -326,7 +326,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",
@@ -12,13 +11,3 @@
// Enables an informational IPH message at the bottom of the Omnibox directing
// users to certain starter pack engines.
--- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/search_engine_countries-inc.cc
@@ -41,6 +41,7 @@ constexpr EngineAndTier engines_default[
{SearchEngineTier::kTopEngines, &google},
{SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &yahoo},
+ {SearchEngineTier::kTopEngines, &duckduckgo},
};
// Note, the below entries are sorted by country code, not the name in comment.

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

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

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

@@ -34,7 +34,7 @@
--- a/chrome/app/settings_chromium_strings.grdp
+++ b/chrome/app/settings_chromium_strings.grdp
@@ -367,13 +367,13 @@
@@ -364,13 +364,13 @@
<!-- Performance Page -->
<message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
@@ -53,7 +53,7 @@
<!-- Languages Page -->
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1183,7 +1183,7 @@
@@ -1211,7 +1211,7 @@
Active site
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP" desc="Help text shown on the second tab of the tab discarding exception list add dialog. Explains how to use the filter format to add an exclusion rule to the list.">
@@ -62,7 +62,7 @@
</message>
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
Power
@@ -1207,7 +1207,7 @@
@@ -1235,7 +1235,7 @@
Inactive tabs appearance
</message>
<message name="IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK" desc="Label for a performance settings toggle description that controls whether the inactive tab UI is shown. Also contains a link to the help center article.">
@@ -71,7 +71,7 @@
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_TITLE" desc="Title for the link row that points to tab hover preview card apperance settings.">
Tab hover preview card appearance
@@ -1219,7 +1219,7 @@
@@ -1247,7 +1247,7 @@
Performance issue alerts
</message>
<message name="IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION" desc="Label for a performance settings toggle that controls whether performance intervention notifications should be shown and link to learn more about performance issue alerts.">
@@ -177,9 +177,9 @@
<cr-link-row id="captions"
class="hr"
label="$i18n{captionsTitle}"
@@ -85,11 +85,6 @@
external>
</cr-link-row>
@@ -97,11 +97,6 @@
</settings-toggle-button>
</template>
</if>
- <cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
- on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
@@ -221,7 +221,7 @@
hidden="[[!prefs.feedback_allowed.value]]"
--- a/chrome/browser/resources/settings/autofill_page/payments_section.html
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
@@ -89,11 +89,6 @@
@@ -81,11 +81,6 @@
</div>
</template>
@@ -254,7 +254,7 @@
import '../privacy_page/privacy_page.js';
import '../safety_hub/safety_hub_entry_point.js';
import '../autofill_page/autofill_page.js';
@@ -280,7 +279,6 @@ export class SettingsBasicPageElement ex
@@ -277,7 +276,6 @@ export class SettingsBasicPageElement ex
this.showPrivacyGuidePromo_ = false;
return;
}
@@ -288,7 +288,7 @@
<cr-link-row id="historySearchRow"
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -206,10 +206,6 @@ export class SettingsPersonalizationOpti
@@ -201,10 +201,6 @@ export class SettingsPersonalizationOpti
'chrome-signin-user-choice-info-change',
this.setChromeSigninUserChoiceInfo_.bind(this));
// </if>
@@ -301,7 +301,7 @@
// <if expr="chromeos_ash">
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -48,15 +48,6 @@
@@ -53,15 +53,6 @@
label="$i18n{clearBrowsingData}"
sub-label="$i18n{clearBrowsingDataDescription}"
on-click="onClearBrowsingDataClick_"></cr-link-row>
@@ -345,7 +345,7 @@
prefs.default_search_provider_data.template_url_data)]]">
--- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
+++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
@@ -86,7 +86,7 @@
@@ -94,7 +94,7 @@
</template>
<h1 class="cr-title-text">[[pageTitle]]</h1>
<slot name="subpage-title-extra"></slot>
@@ -366,7 +366,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -959,16 +959,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -971,16 +971,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -420,7 +420,7 @@
void CookieControlsContentView::AddDescriptionRow() {
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -223,6 +223,7 @@ void ProfileMenuView::BuildMenu() {
@@ -224,6 +224,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -428,7 +428,7 @@
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession()) {
return gfx::ImageSkia();
@@ -645,16 +646,8 @@ void ProfileMenuView::BuildIdentity() {
@@ -646,16 +647,8 @@ void ProfileMenuView::BuildIdentity() {
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
std::string profile_user_display_name, profile_user_email;
@@ -458,7 +458,7 @@
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -673,22 +670,6 @@ void SadTabView::AttachToWebView() {
@@ -677,22 +674,6 @@ void SadTabView::AttachToWebView() {
}
}
@@ -483,7 +483,7 @@
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -920,40 +920,20 @@ void AddPerformanceStrings(content::WebU
@@ -928,40 +928,20 @@ void AddPerformanceStrings(content::WebU
IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
{"performanceInterventionEnabledLabel",
IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
@@ -533,7 +533,7 @@
html_source->AddString(
"tabDiscardTimerFiveMinutes",
@@ -999,11 +979,6 @@ void AddPerformanceStrings(content::WebU
@@ -1007,11 +987,6 @@ void AddPerformanceStrings(content::WebU
base::NumberToString16(
performance_manager::user_tuning::BatterySaverModeManager::
kLowBatteryThresholdPercent)));
@@ -545,7 +545,7 @@
html_source->AddString("discardRingTreatmentLearnMoreUrl",
chrome::kDiscardRingTreatmentLearnMoreUrl);
@@ -3465,7 +3440,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3475,7 +3450,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -556,7 +556,7 @@
html_source->AddBoolean(
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -632,13 +632,7 @@ SettingsUI::SettingsUI(content::WebUI* w
@@ -640,13 +640,7 @@ SettingsUI::SettingsUI(content::WebUI* w
auto* optimization_guide_service =
OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
for (auto [key, name] : optimization_guide_features) {
@@ -573,7 +573,7 @@
is_any_ai_feature_enabled |= glic_enabled;
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -838,7 +838,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
@@ -863,7 +863,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
base::FEATURE_DISABLED_BY_DEFAULT);
// Enables the Live Caption feature on supported devices.

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

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

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -931,6 +931,7 @@ source_set("extensions") {
@@ -957,6 +957,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
@@ -40,9 +40,9 @@
public_deps = [
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -109,6 +109,7 @@ source_set("browser") {
"//components/file_access",
@@ -111,6 +111,7 @@ source_set("browser") {
"//components/filename_generation",
"//components/fingerprinting_protection_filter/interventions/common:features",
"//components/input",
+ "//components/lens:buildflags",
"//components/language/core/common",

2233
pruning.list
View File

File diff suppressed because it is too large Load Diff

4
utils/prune_binaries.py
View File

@@ -18,8 +18,12 @@ from _common import ENCODING, get_logger, add_common_params
# List of paths to prune if they exist, excluded from domain_substitution and pruning lists
# These allow the lists to be compatible between cloned, tarball, and lite tarball sources
CONTINGENT_PATHS = (
# checkout_configuration != "small"
'third_party/jetstream/',
'third_party/speedometer/',
# CIPD sources
'buildtools/linux64/',
'components/variations/test_data/cipd/',
'third_party/checkstyle/cipd/',
'third_party/dawn/third_party/ninja/',
'third_party/dawn/tools/golang/',