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 chromium 142.0.7444.59 (#363)

Browse Source
This commit is contained in:
wukko
2025-10-31 01:02:10 +06:00
committed by GitHub
parent e0995b8b42 83a38925d8
commit 0366b01487
163 changed files with 2162 additions and 1563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
141.0.7390.122
142.0.7444.59

4
devutils/update_lists.py
View File

@@ -70,8 +70,8 @@ PRUNING_EXCLUDE_PATTERNS = [
'third_party/node/node_modules/@rollup/wasm-node/dist/wasm-node/bindings_wasm_bg.wasm',
# Exclusion for performance tracing
'third_party/perfetto/src/trace_processor/importers/proto/atoms.descriptor',
# Exclusion for jiff
'third_party/rust/chromium_crates_io/vendor/jiff-tzdb-v0_1/concatenated-zoneinfo.dat',
# Exclusion for zoneinfo64
'third_party/rust/chromium_crates_io/vendor/zoneinfo64-v0_2/src/data/zoneinfo64.res',
# Exclusions for safe file extensions
'*.avif',
'*.ttf',

492
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

20
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
@@ -3802,8 +3802,6 @@ static_library("browser") {
@@ -3801,8 +3801,6 @@ static_library("browser") {
"download/download_auto_open_policy_handler.cc",
"download/download_auto_open_policy_handler.h",
"download/download_commands.cc",
@@ -11,7 +11,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
+++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
@@ -390,10 +390,6 @@ void CreateAndAddChromeThrottlesForNavig
@@ -393,10 +393,6 @@ void CreateAndAddChromeThrottlesForNavig
registry.AddThrottle(std::make_unique<PolicyBlocklistNavigationThrottle>(
registry, handle.GetWebContents()->GetBrowserContext()));
@@ -84,7 +84,7 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1379,9 +1378,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1382,9 +1381,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() = default;
@@ -94,7 +94,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1431,44 +1427,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1434,44 +1430,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DownloadsFunctionName::kDownloadsFunctionAcceptDanger);
@@ -180,7 +180,7 @@
class DownloadsShowFunction : public ExtensionFunction {
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -701,18 +701,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -706,18 +706,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -201,7 +201,7 @@
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
--- a/chrome/browser/extensions/blocklist_state_fetcher.cc
+++ b/chrome/browser/extensions/blocklist_state_fetcher.cc
@@ -75,8 +75,7 @@ void BlocklistStateFetcher::SendRequest(
@@ -78,8 +78,7 @@ void BlocklistStateFetcher::SendRequest(
std::string request_str;
request.SerializeToString(&request_str);
@@ -211,7 +211,7 @@
net::NetworkTrafficAnnotationTag traffic_annotation =
net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
semantics {
@@ -131,12 +130,6 @@ void BlocklistStateFetcher::SendRequest(
@@ -134,12 +133,6 @@ void BlocklistStateFetcher::SendRequest(
base::Unretained(this), fetcher));
}
@@ -245,7 +245,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -80,6 +81,7 @@ static_library("safe_browsing") {
@@ -81,6 +82,7 @@ static_library("safe_browsing") {
"//services/metrics/public/cpp:ukm_builders",
"//services/preferences/public/cpp",
]
@@ -253,7 +253,7 @@
if (enable_extensions) {
deps += [ "//chrome/browser/ui/web_applications" ]
@@ -612,6 +614,7 @@ static_library("advanced_protection") {
@@ -614,6 +616,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -261,7 +261,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -631,6 +634,7 @@ source_set("metrics_collector") {
@@ -633,6 +636,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]

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

@@ -2,7 +2,7 @@
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -469,14 +469,6 @@ group("gn_all") {
@@ -458,14 +458,6 @@ group("gn_all") {
]
}

12
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
@@ -63,7 +63,7 @@ const int kSignatureFormatVersion = 2;
@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2;
const size_t kSaltBytes = 32;
const char kBackendUrl[] =
@@ -112,7 +112,7 @@ by default.
scoped_refptr<base::SequencedTaskRunner> task_runner)
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -531,7 +531,7 @@ void WebRtcLogUploader::UploadCompressed
@@ -530,7 +530,7 @@ void WebRtcLogUploader::UploadCompressed
}
})");
@@ -252,7 +252,7 @@ by default.
// Mime type to create a directory.
--- a/components/feedback/feedback_uploader.cc
+++ b/components/feedback/feedback_uploader.cc
@@ -39,7 +39,7 @@ constexpr base::FilePath::CharType kFeed
@@ -40,7 +40,7 @@ constexpr base::FilePath::CharType kFeed
FILE_PATH_LITERAL("Feedback Reports");
constexpr char kFeedbackPostUrl[] =
@@ -263,7 +263,7 @@ by default.
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -152,7 +152,7 @@ BASE_FEATURE(kIsViewerGoogleSearchUrl,
@@ -150,7 +150,7 @@ BASE_FEATURE(kIsViewerGoogleSearchUrl, b
// Global functions -----------------------------------------------------------
@@ -274,7 +274,7 @@ by default.
url::Component query(0, static_cast<int>(str.length())), key, value;
--- a/components/history/core/browser/web_history_service.cc
+++ b/components/history/core/browser/web_history_service.cc
@@ -43,13 +43,13 @@ namespace history {
@@ -44,13 +44,13 @@ namespace history {
namespace {
const char kHistoryQueryHistoryUrl[] =
@@ -369,7 +369,7 @@ by default.
--- a/content/browser/webauth/webauth_request_security_checker.h
+++ b/content/browser/webauth/webauth_request_security_checker.h
@@ -90,9 +90,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
@@ -85,9 +85,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
// Legacy App IDs, which google.com origins are allowed to assert for
// compatibility reasons.
static constexpr char kGstaticAppId[] =

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

@@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future).
kSafeBrowsingIncidentTrafficAnnotation =
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -303,11 +303,14 @@ IncidentReportingService::UploadContext:
@@ -302,11 +302,14 @@ IncidentReportingService::UploadContext:
// static
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {

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

@@ -19,15 +19,15 @@ This prevents trk:148 (phishing) and trk:149 (malware).
+#if 1
+ if (!callback.is_null())
+ callback.Run(GURL(request->url()), false);
+ std::move(callback).Run(GURL(request->url()), false, std::nullopt, std::nullopt);
+#else
std::string request_data;
request->SerializeToString(&request_data);
@@ -362,6 +366,7 @@ void ClientSideDetectionService::StartCl
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIInfoSingleton::GetInstance()),
std::move(request), access_token));
@@ -363,6 +367,7 @@ void ClientSideDetectionService::StartCl
&WebUIContentInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIContentInfoSingleton::GetInstance()),
std::move(request), access_token));
+#endif
}

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

@@ -58,7 +58,7 @@
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
@@ -128,6 +128,10 @@ HashAffiliationFetcher::~HashAffiliation
@@ -129,6 +129,10 @@ HashAffiliationFetcher::~HashAffiliation
}
void HashAffiliationFetcher::StartRequest(

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

@@ -23,7 +23,7 @@
url.SchemeIs(dom_distiller::kDomDistillerScheme))
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -132,7 +132,8 @@ int GetIndexOfExistingTab(Browser* brows
@@ -137,7 +137,8 @@ int GetIndexOfExistingTab(BrowserWindowI
// RewriteURLIfNecessary removes the "view-source:" scheme which could lead
// to incorrect matching, so ensure that the target and the candidate are
// either both view-source:, or neither is.
@@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -958,6 +958,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -957,6 +957,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterWebSafeScheme(url::kWssScheme);
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kDataScheme);
@@ -70,7 +70,7 @@
// other origins, so we should not treat them as web safe. Remove callers of
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1123,6 +1123,8 @@ component("net") {
@@ -1128,6 +1128,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",
@@ -158,7 +158,7 @@
namespace net {
@@ -653,6 +655,12 @@ URLRequest::URLRequest(base::PassKey<URL
@@ -650,6 +652,12 @@ URLRequest::URLRequest(base::PassKey<URL
// Sanity check out environment.
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
@@ -169,8 +169,8 @@
+ }
+
context->url_requests()->insert(this);
net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] {
return NetLogURLRequestConstructorParams(url, priority_,
net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE,
[&](NetLogCaptureMode capture_mode) {
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -55,6 +55,7 @@

6
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
@@ -2844,24 +2844,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2790,24 +2790,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -34,7 +34,7 @@
bool InitializeCrashpadImpl(bool initial_client,
+ const std::string& a, const std::string& b, const base::FilePath& c,
+ const std::vector<std::string>& d, bool e) {
+ const std::vector<std::string>& d, bool e, const std::vector<base::FilePath>& f) {
+ return false;
+}
+[[maybe_unused]]
@@ -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
@@ -345,6 +345,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
@@ -344,6 +344,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
// Exported for testing.
GWP_ASAN_EXPORT std::optional<AllocatorSettings> GetAllocatorSettings(

4
patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
View File

@@ -2,7 +2,7 @@
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -295,7 +295,7 @@ bool DomDistillerViewerSource::ShouldSer
@@ -296,7 +296,7 @@ bool DomDistillerViewerSource::ShouldSer
std::string DomDistillerViewerSource::GetContentSecurityPolicy(
network::mojom::CSPDirectiveName directive) {
if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
@@ -24,7 +24,7 @@
.english :lang(zh) {display: none}
--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
@@ -211,7 +211,7 @@ function maybeSetWebFont() {
@@ -402,7 +402,7 @@ function maybeSetWebFont() {
}
const e = document.createElement('link');

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
@@ -232,61 +232,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -236,61 +236,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
network::mojom::CredentialsMode credentials_mode,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";

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

@@ -314,8 +314,8 @@
-
} // namespace
BASE_FEATURE(kIsViewerGoogleSearchUrl,
@@ -155,13 +44,6 @@ BASE_FEATURE(kIsViewerGoogleSearchUrl,
BASE_FEATURE(kIsViewerGoogleSearchUrl, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -153,13 +42,6 @@ BASE_FEATURE(kIsViewerGoogleSearchUrl, b
const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
bool HasGoogleSearchQueryParam(std::string_view str) {
@@ -329,7 +329,7 @@
return false;
}
@@ -172,175 +54,53 @@ std::string GetGoogleLocale(const std::s
@@ -170,175 +52,53 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
@@ -570,7 +570,7 @@
bool IsProbablyGoogleSearchUrl(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -609,10 +609,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -610,10 +610,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -689,9 +689,9 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -777,7 +777,7 @@ void PrefetchContainer::AddRedirectHop(c
// some which are added by throttles). These aren't yet supported for
@@ -713,7 +713,7 @@ void PrefetchContainer::AddRedirectHop(c
// prefetch, including browsing topics and client hints.
// TODO(crbug.com/441612842): Support User-Agent overrides.
net::HttpRequestHeaders updated_headers;
- std::vector<std::string> headers_to_remove = {variations::kClientDataHeader};
+ std::vector<std::string> headers_to_remove;
@@ -700,7 +700,7 @@
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -538,28 +538,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -550,28 +550,6 @@ bool HasGoogleHost(const GURL& url) {
}
bool IsGoogleHost(std::string_view host) {

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -367,7 +367,6 @@ if (!is_android && !is_mac) {
@@ -369,7 +369,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//components/webapps/isolated_web_apps/preload:component",
"//third_party/widevine/cdm",
]
@@ -1181,7 +1180,6 @@ if (is_win) {
@@ -1185,7 +1184,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
@@ -106,11 +106,6 @@ group("resources") {
@@ -107,11 +107,6 @@ group("resources") {
]
}

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

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

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

@@ -3,7 +3,7 @@
@@ -991,12 +991,6 @@ void BrowsingDataModel::PopulateFromDisk
base::FeatureList::IsEnabled(network::features::kSharedStorageAPI);
bool is_shared_dictionary_enabled = base::FeatureList::IsEnabled(
network::features::kCompressionDictionaryTransportBackend);
network::features::kCompressionDictionaryTransport);
- bool is_interest_group_enabled =
- base::FeatureList::IsEnabled(network::features::kInterestGroupStorage);
- bool is_attribution_reporting_enabled = base::FeatureList::IsEnabled(
@@ -175,7 +175,7 @@
void AdAuctionServiceImpl::JoinInterestGroup(
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1484,38 +1484,7 @@ void StoragePartitionImpl::Initialize(
@@ -1505,38 +1505,7 @@ void StoragePartitionImpl::Initialize(
bucket_manager_ = std::make_unique<BucketManager>(this);
@@ -214,7 +214,7 @@
GeneratedCodeCacheSettings settings =
GetContentClient()->browser()->GetGeneratedCodeCacheSettings(
@@ -1544,8 +1513,6 @@ void StoragePartitionImpl::Initialize(
@@ -1565,8 +1534,6 @@ void StoragePartitionImpl::Initialize(
font_access_manager_ = FontAccessManager::Create();
@@ -223,7 +223,7 @@
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
if (is_in_memory()) {
@@ -1569,11 +1536,6 @@ void StoragePartitionImpl::Initialize(
@@ -1590,11 +1557,6 @@ void StoragePartitionImpl::Initialize(
std::make_unique<SharedStorageHeaderObserver>(this);
}
@@ -237,7 +237,7 @@
void StoragePartitionImpl::ResetSessionStorageConnections() {
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4192,12 +4192,6 @@ void WebContentsImpl::Init(const WebCont
@@ -4210,12 +4210,6 @@ void WebContentsImpl::Init(const WebCont
DateTimeChooser::CreateDateTimeChooser(this);
#endif

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

@@ -2,7 +2,7 @@
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -311,7 +311,7 @@ FinancialPing::PingResponse FinancialPin
@@ -308,7 +308,7 @@ FinancialPing::PingResponse FinancialPin
response->clear();
std::string url =

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

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

14
patches/core/ungoogled-chromium/disable-webstore-urls.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -677,12 +677,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -681,12 +681,6 @@ std::vector<url::Origin> ChromeContentBr
GetOriginsRequiringDedicatedProcess() {
std::vector<url::Origin> list;
@@ -17,7 +17,7 @@
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -303,17 +303,7 @@ bool ChromeContentVerifierDelegate::IsFr
@@ -306,17 +306,7 @@ bool ChromeContentVerifierDelegate::IsFr
// between which extensions are considered in-store.
// See https://crbug.com/766806 for details.
if (!InstallVerifier::IsFromStore(extension, context_)) {
@@ -38,7 +38,7 @@
}
--- a/chrome/browser/extensions/extension_migrator.cc
+++ b/chrome/browser/extensions/extension_migrator.cc
@@ -19,7 +19,9 @@ namespace extensions {
@@ -22,7 +22,9 @@ namespace extensions {
ExtensionMigrator::ExtensionMigrator(Profile* profile,
const std::string& old_id,
const std::string& new_id)
@@ -49,7 +49,7 @@
ExtensionMigrator::~ExtensionMigrator() = default;
@@ -31,7 +33,7 @@ void ExtensionMigrator::StartLoading() {
@@ -34,7 +36,7 @@ void ExtensionMigrator::StartLoading() {
if (should_have_extension) {
base::Value::Dict entry;
entry.Set(ExternalProviderImpl::kExternalUpdateUrl,
@@ -126,7 +126,7 @@
return update_url;
}
@@ -366,10 +352,6 @@ void ExtensionDownloader::DoStartAllPend
@@ -360,10 +346,6 @@ void ExtensionDownloader::DoStartAllPend
AddToFetches(fetches_preparing, std::move(task));
pending_tasks_.clear();
@@ -137,7 +137,7 @@
}
void ExtensionDownloader::SetIdentityManager(
@@ -830,20 +812,6 @@ void ExtensionDownloader::HandleManifest
@@ -824,20 +806,6 @@ void ExtensionDownloader::HandleManifest
update.second->info);
}
@@ -158,7 +158,7 @@
ExtensionIdSet extension_ids_with_errors;
for (const auto& failure : failures)
extension_ids_with_errors.insert(failure.first.id);
@@ -1423,11 +1391,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -1417,11 +1385,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:

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

@@ -55,10 +55,10 @@
base::FEATURE_ENABLED_BY_DEFAULT),
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -108,12 +108,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
@@ -92,12 +92,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
// Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
BASE_FEATURE(kDnsOverHttpsUpgrade,
"DnsOverHttpsUpgrade",
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
- base::FEATURE_ENABLED_BY_DEFAULT

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -867,19 +867,6 @@ void ExtensionInfoGenerator::FillExtensi
@@ -870,19 +870,6 @@ void ExtensionInfoGenerator::FillExtensi
toolbar_actions_model->IsActionPinned(extension.id());
}
@@ -22,7 +22,7 @@
// `CanUploadAsAccountExtension` should already check for the feature flag
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -348,31 +348,7 @@ bool ExtensionManagement::IsAllowedManif
@@ -362,31 +362,7 @@ bool ExtensionManagement::IsAllowedManif
int manifest_version,
const std::string& extension_id,
Manifest::Type manifest_type) {
@@ -54,7 +54,7 @@
}
bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
@@ -393,26 +369,8 @@ bool ExtensionManagement::IsExemptFromMV
@@ -407,26 +383,8 @@ bool ExtensionManagement::IsExemptFromMV
return false;
}
@@ -83,7 +83,7 @@
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
@@ -145,17 +145,6 @@ bool ManifestV2ExperimentManagerFactory:
@@ -148,17 +148,6 @@ bool ManifestV2ExperimentManagerFactory:
// Determines the current stage of the MV2 deprecation experiments.
MV2ExperimentStage CalculateCurrentExperimentStage() {
@@ -101,7 +101,7 @@
return MV2ExperimentStage::kWarning;
}
@@ -189,18 +178,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
@@ -192,18 +181,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
// Returns true if legacy extensions should be disabled, looking at both
// experiment stage and global state.
bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) {

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

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -368,7 +368,6 @@ if (!is_android && !is_mac) {
@@ -370,7 +370,6 @@ if (!is_android && !is_mac) {
data_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -11,7 +11,7 @@
"//components/webapps/isolated_web_apps/preload:component",
"//third_party/widevine/cdm",
]
@@ -937,8 +936,6 @@ if (is_win) {
@@ -940,8 +939,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
@@ -1185,7 +1182,6 @@ if (is_win) {
@@ -1189,7 +1186,6 @@ if (is_win) {
":swiftshader_binaries",
":widevine_cdm_library",
"//chrome/browser/resources/media/mei_preload:component_bundle",
@@ -30,7 +30,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -793,10 +793,6 @@ static_library("browser") {
@@ -760,10 +760,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_metrics_document_data.h",
"navigation_predictor/navigation_predictor_preconnect_client.cc",
"navigation_predictor/navigation_predictor_preconnect_client.h",
@@ -41,7 +41,7 @@
"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",
@@ -3686,10 +3682,6 @@ static_library("browser") {
@@ -3698,10 +3694,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
@@ -52,7 +52,7 @@
"accessibility/caption_bubble_context_browser.h",
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4345,8 +4337,6 @@ static_library("browser") {
@@ -4330,8 +4322,6 @@ static_library("browser") {
"//chrome/app:command_ids",
"//chrome/app/theme:chrome_unscaled_resources_grit",
"//chrome/app/vector_icons",
@@ -61,7 +61,7 @@
"//chrome/browser/actor",
"//chrome/browser/actor:impl",
"//chrome/browser/actor/ui",
@@ -4373,10 +4363,6 @@ static_library("browser") {
@@ -4364,10 +4354,6 @@ static_library("browser") {
"//chrome/browser/performance_manager/user_tuning",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resource_coordinator",
@@ -69,18 +69,18 @@
- "//chrome/browser/screen_ai:screen_ai_install_state",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
- "//chrome/browser/screen_ai/public:optical_character_recognizer",
"//chrome/browser/search/background",
"//chrome/browser/sharing_hub",
"//chrome/browser/smart_card",
@@ -4421,7 +4407,6 @@ static_library("browser") {
"//chrome/browser/themes",
@@ -4440,7 +4426,6 @@ static_library("browser") {
"//chrome/browser/ui/webui/access_code_cast",
"//chrome/browser/ui/webui/actor_internals",
"//chrome/browser/ui/webui/app_service_internals",
- "//chrome/browser/ui/webui/autofill_ml_internals",
"//chrome/browser/ui/webui/color_pipeline_internals",
"//chrome/browser/ui/webui/infobar_internals",
"//chrome/browser/ui/webui/infobar_internals:impl",
@@ -4551,9 +4536,6 @@ static_library("browser") {
"//chrome/browser/ui/webui/commerce",
"//chrome/browser/ui/webui/commerce:impl",
@@ -4530,9 +4515,6 @@ static_library("browser") {
"//components/webauthn/core/browser",
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/hid",
@@ -90,7 +90,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4714,8 +4696,6 @@ static_library("browser") {
@@ -4725,8 +4707,6 @@ static_library("browser") {
sources += [
"accessibility/soda_installer_impl.cc",
"accessibility/soda_installer_impl.h",
@@ -98,8 +98,8 @@
- "component_updater/screen_ai_component_installer.h",
"device_identity/device_oauth2_token_store_desktop.cc",
"device_identity/device_oauth2_token_store_desktop.h",
"device_notifications/device_status_icon_renderer.cc",
@@ -4771,8 +4751,6 @@ static_library("browser") {
"download/bubble/download_bubble_accessible_alerts_map.cc",
@@ -4780,8 +4760,6 @@ static_library("browser") {
"profiles/profile_activity_metrics_recorder.h",
"profiles/profile_list_desktop.cc",
"profiles/profile_list_desktop.h",
@@ -108,7 +108,7 @@
"signin/force_signin_verifier.cc",
"signin/force_signin_verifier.h",
"signin/signin_manager.cc",
@@ -5568,7 +5546,6 @@ static_library("browser") {
@@ -5595,7 +5573,6 @@ static_library("browser") {
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification",
"//chrome/browser/resources:app_icon_resources",
@@ -116,7 +116,7 @@
"//chrome/browser/sharesheet",
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash/accelerator",
@@ -5831,7 +5808,6 @@ static_library("browser") {
@@ -5860,7 +5837,6 @@ static_library("browser") {
"//remoting/host/chromeos:browser_interop",
"//remoting/host/chromeos:features",
"//services/device/public/cpp/geolocation",
@@ -153,7 +153,7 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1381,9 +1379,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1459,9 +1457,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -235,9 +235,9 @@
#endif
#if BUILDFLAG(IS_WIN)
--- a/chrome/browser/chrome_browser_interface_binders_webui.cc
+++ b/chrome/browser/chrome_browser_interface_binders_webui.cc
@@ -810,8 +810,6 @@ void PopulateChromeWebUIFrameBinders(
--- a/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
+++ b/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
@@ -487,8 +487,6 @@ void PopulateChromeWebUIFrameBindersPart
::mojom::app_service_internals::AppServiceInternalsPageHandler,
AppServiceInternalsUI>(map);
@@ -372,22 +372,24 @@
void NavigationPredictor::SetModelScoreCallbackForTesting(
--- a/chrome/browser/pdf/pdf_extension_util.cc
+++ b/chrome/browser/pdf/pdf_extension_util.cc
@@ -111,7 +111,6 @@ void AddPdfViewerStrings(base::Value::Di
@@ -121,7 +121,6 @@ base::Value::Dict GetPdfViewerStrings()
{"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90},
{"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180},
{"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270},
- {"searchifyInProgress", IDS_PDF_SEARCHIFY_IN_PROGRESS},
{"sidebarLabel", IDS_PDF_SIDEBAR_LABEL},
{"thumbnailPageAriaLabel", IDS_PDF_THUMBNAIL_PAGE_ARIA_LABEL},
{"tooltipAttachments", IDS_PDF_TOOLTIP_ATTACHMENTS},
{"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
--- a/chrome/browser/permissions/BUILD.gn
+++ b/chrome/browser/permissions/BUILD.gn
@@ -44,10 +44,6 @@ source_set("permissions") {
@@ -42,12 +42,8 @@ source_set("permissions") {
"prediction_service/language_detection_observer.h",
"prediction_service/passage_embedder_delegate.cc",
"prediction_service/passage_embedder_delegate.h",
- "prediction_service/permissions_ai_ui_selector.cc",
- "prediction_service/permissions_ai_ui_selector.h",
"prediction_service/permissions_aiv1_handler.cc",
"prediction_service/permissions_aiv1_handler.h",
- "prediction_service/prediction_based_permission_ui_selector.cc",
- "prediction_service/prediction_based_permission_ui_selector.h",
- "prediction_service/prediction_model_handler_provider.cc",
- "prediction_service/prediction_model_handler_provider.h",
"prediction_service/prediction_service_factory.cc",
@@ -395,11 +397,11 @@
"prediction_service/prediction_service_request.cc",
--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -474,8 +474,6 @@ ChromePermissionsClient::CreatePermissio
@@ -472,8 +472,6 @@ ChromePermissionsClient::CreatePermissio
#endif
selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
Profile::FromBrowserContext(browser_context)));
- selectors.emplace_back(std::make_unique<PredictionBasedPermissionUiSelector>(
- selectors.emplace_back(std::make_unique<PermissionsAiUiSelector>(
- Profile::FromBrowserContext(browser_context)));
return selectors;
}
@@ -425,9 +427,9 @@
PermissionUmaUtil::RecordPassageEmbedderMetadataValid(false);
return nullptr;
}
--- a/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
@@ -857,7 +857,7 @@ void PredictionBasedPermissionUiSelector
--- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
@@ -857,7 +857,7 @@ void PermissionsAiUiSelector::ExecuteOnD
ModelExecutionData model_data) {
VLOG(1) << "[PermissionsAI] ExecuteOnDeviceAivXModel";
PredictionModelHandlerProvider* prediction_model_handler_provider =
@@ -438,7 +440,7 @@
model_data.request_metadata.request_type;
--- a/chrome/browser/prefs/BUILD.gn
+++ b/chrome/browser/prefs/BUILD.gn
@@ -297,7 +297,6 @@ source_set("impl") {
@@ -304,7 +304,6 @@ source_set("impl") {
"//chrome/browser/actor/ui",
"//chrome/browser/contextual_cueing",
"//chrome/browser/promos:utils",
@@ -448,7 +450,7 @@
"//chrome/browser/search_engines",
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1914,9 +1914,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1971,9 +1971,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -460,25 +462,25 @@
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -324,7 +324,6 @@ source_set("profiles_extra_parts_impl")
@@ -336,7 +336,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",
@@ -332,7 +331,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/badging",
@@ -345,7 +344,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/feedback",
"//chrome/browser/hid",
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
"//chrome/browser/search",
"//chrome/browser/search/background",
"//chrome/browser/search_engine_choice",
"//chrome/browser/themes",
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -111,7 +111,6 @@
@@ -115,7 +115,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"
@@ -486,7 +488,7 @@
#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"
@@ -342,7 +341,6 @@
@@ -349,7 +348,6 @@
#include "chrome/browser/prefs/persistent_renderer_prefs_manager_factory.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
#include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
@@ -494,15 +496,15 @@
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/search/instant_service_factory.h"
@@ -1060,7 +1058,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1072,7 +1070,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
net::ServerCertificateDatabaseServiceFactory::GetInstance();
#endif
- PreloadingModelKeyedServiceFactory::GetInstance();
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
HistorySyncOptinServiceFactory::GetInstance();
ProfileManagementDisclaimerServiceFactory::GetInstance();
#endif
@@ -1109,9 +1106,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1122,9 +1119,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -512,21 +514,15 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1191,13 +1185,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1204,7 +1198,6 @@ void ChromeBrowserMainExtraPartsProfiles
policy::UserPolicySigninServiceFactory::GetInstance();
#endif
PolicyBlocklistFactory::GetInstance();
- if (base::FeatureList::IsEnabled(
- permissions::features::kPermissionOnDeviceNotificationPredictions) ||
- base::FeatureList::IsEnabled(
- permissions::features::kPermissionOnDeviceGeolocationPredictions) ||
- base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) {
- PredictionModelHandlerProviderFactory::GetInstance();
- }
- PredictionModelHandlerProviderFactory::GetInstance();
PredictionServiceFactory::GetInstance();
predictors::AutocompleteActionPredictorFactory::GetInstance();
predictors::LoadingPredictorFactory::GetInstance();
@@ -1279,10 +1266,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1287,10 +1280,6 @@ void ChromeBrowserMainExtraPartsProfiles
SafetyHubMenuNotificationServiceFactory::GetInstance();
#if !BUILDFLAG(IS_ANDROID)
SafetyHubHatsServiceFactory::GetInstance();
@@ -537,7 +533,7 @@
#endif
#if BUILDFLAG(IS_CHROMEOS)
if (ash::features::IsScannerEnabled()) {
@@ -1403,7 +1386,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1414,7 +1403,6 @@ void ChromeBrowserMainExtraPartsProfiles
TrackingProtectionSettingsFactory::GetInstance();
translate::TranslateRankerFactory::GetInstance();
#if !BUILDFLAG(IS_ANDROID)
@@ -576,14 +572,14 @@
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -51,7 +51,6 @@
#include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
#include "chrome/browser/buildflags.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/delete_profile_helper.h"
#include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
@@ -1486,9 +1485,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1487,9 +1486,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -595,7 +591,7 @@
#if BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -109,7 +109,6 @@ group("resources") {
@@ -110,7 +110,6 @@ group("resources") {
if (is_mac) {
public_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -618,7 +614,7 @@
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1430,8 +1430,6 @@ static_library("ui") {
@@ -1469,8 +1469,6 @@ static_library("ui") {
"//chrome/browser/regional_capabilities",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
@@ -627,7 +623,7 @@
"//chrome/browser/smart_card",
"//chrome/browser/tab_group_sync:utils",
"//chrome/browser/themes",
@@ -2191,7 +2189,6 @@ static_library("ui") {
@@ -2227,7 +2225,6 @@ static_library("ui") {
"//chrome/browser/policy:onc",
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification",
@@ -635,7 +631,7 @@
"//chrome/browser/ui/ash/accessibility",
"//chrome/browser/ui/ash/app_access",
"//chrome/browser/ui/ash/arc",
@@ -4638,7 +4635,6 @@ static_library("ui") {
@@ -4685,7 +4682,6 @@ static_library("ui") {
# c/b/ui/passwords/passwords_model_delegate.h, passwords_client_ui_delegate.h.
"//chrome/browser/ui/webauthn:impl",
"//chrome/browser/ui/webui/app_service_internals",
@@ -688,7 +684,7 @@
--- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
@@ -25,7 +25,6 @@ class ChromePDFDocumentHelperClient : pu
void OnSaveURL(content::WebContents* contents) override;
void OnSaveURL() override;
void SetPluginCanSave(content::RenderFrameHost* render_frame_host,
bool can_save) override;
- void OnSearchifyStarted(content::RenderFrameHost* render_frame_host) override;
@@ -697,7 +693,7 @@
std::vector<base::CallbackListSubscription> tab_subscriptions_;
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -746,39 +746,6 @@ void MaybeRegisterChromeFeaturePromos(
@@ -752,39 +752,6 @@ void MaybeRegisterChromeFeaturePromos(
.SetBubbleIcon(kLightbulbOutlineIcon)
.SetBubbleTitleText(IDS_PASSWORD_MANAGER_IPH_CREATE_SHORTCUT_TITLE)));
@@ -739,7 +735,7 @@
registry.RegisterFeature(std::move(
--- a/chrome/browser/ui/webui/BUILD.gn
+++ b/chrome/browser/ui/webui/BUILD.gn
@@ -59,7 +59,6 @@ source_set("configs") {
@@ -60,7 +60,6 @@ source_set("configs") {
"//chrome/browser/ui/webui/access_code_cast",
"//chrome/browser/ui/webui/actor_internals",
"//chrome/browser/ui/webui/app_service_internals",
@@ -749,7 +745,7 @@
"//chrome/browser/ui/webui/new_tab_footer",
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -297,7 +297,6 @@ void RegisterChromeWebUIConfigs() {
@@ -298,7 +298,6 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<actor::ui::ActorOverlayUIConfig>());
map.AddWebUIConfig(std::make_unique<ActorInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<AppServiceInternalsUIConfig>());
@@ -862,7 +858,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"
@@ -325,14 +323,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -302,14 +300,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
@@ -880,7 +876,7 @@
--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
@@ -46,7 +46,7 @@ declare_args() {
enable_chrome_notifications = is_mac || is_win || is_linux || is_fuchsia
enable_chrome_notifications = is_mac || is_win || is_linux
# Enables inclusion of glic in the build.
- enable_glic = is_mac || is_win || is_linux
@@ -890,7 +886,7 @@
# It is enableable separately to facilitate testing.
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -340,18 +340,6 @@ static_library("renderer") {
@@ -346,18 +346,6 @@ static_library("renderer") {
]
} else {
sources += [
@@ -909,7 +905,7 @@
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -367,7 +355,6 @@ static_library("renderer") {
@@ -373,7 +361,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
@@ -919,14 +915,14 @@
]
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -72,7 +72,6 @@
@@ -73,7 +73,6 @@
#include "url/gurl.h"
#if !BUILDFLAG(IS_ANDROID)
-#include "chrome/renderer/accessibility/read_anything/read_anything_app_controller.h"
#include "chrome/renderer/actor/journal.h"
#include "chrome/renderer/actor/page_stability_monitor.h"
#include "chrome/renderer/actor/tool_executor.h"
#include "chrome/renderer/searchbox/searchbox_extension.h"
@@ -325,20 +324,6 @@ void ChromeRenderFrameObserver::DidCommi
}
@@ -950,7 +946,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2405,9 +2405,6 @@ if (!is_android) {
@@ -2463,9 +2463,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",
@@ -960,7 +956,7 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2847,8 +2844,6 @@ if (!is_android) {
@@ -2914,8 +2911,6 @@ if (!is_android) {
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
"//services/preferences/tracked:features",
@@ -969,7 +965,7 @@
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -8504,7 +8499,6 @@ test("unit_tests") {
@@ -8555,7 +8550,6 @@ test("unit_tests") {
#
# TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
deps += [
@@ -977,7 +973,7 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -8537,7 +8531,6 @@ test("unit_tests") {
@@ -8591,7 +8585,6 @@ test("unit_tests") {
"//chrome/browser/profile_resetter:fake_profile_resetter",
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/resources/new_tab_page_instant:resources_grit",
@@ -1027,7 +1023,7 @@
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -268,12 +266,6 @@ auto RunSpeechRecognitionService(
@@ -266,12 +264,6 @@ auto RunSpeechRecognitionService(
}
#endif // !BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -1038,9 +1034,9 @@
-}
-#endif
#if BUILDFLAG(IS_CHROMEOS)
auto RunCupsIppParser(
@@ -476,7 +468,6 @@ void RegisterMainThreadServices(mojo::Se
#if (BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) && \
!BUILDFLAG(IS_ANDROID)) || \
@@ -467,7 +459,6 @@ void RegisterMainThreadServices(mojo::Se
services.Add(RunProfileImporter);
services.Add(RunMirroringService);
services.Add(RunPassageEmbeddingsService);
@@ -1050,8 +1046,8 @@
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -617,7 +617,6 @@ test("components_unittests") {
"//components/media_router/common/providers/cast/channel:unit_tests",
@@ -622,7 +622,6 @@ test("components_unittests") {
"//components/one_time_tokens/core/browser:unit_tests",
"//components/page_info:unit_tests",
"//components/permissions:unit_tests",
- "//components/permissions/prediction_service:unit_tests",
@@ -1060,21 +1056,55 @@
"//components/security_interstitials/content:unit_tests",
--- a/components/autofill/core/browser/autofill_field.cc
+++ b/components/autofill/core/browser/autofill_field.cc
@@ -24,7 +24,6 @@
@@ -25,7 +25,6 @@
#include "components/autofill/core/browser/field_type_utils.h"
#include "components/autofill/core/browser/field_types.h"
#include "components/autofill/core/browser/heuristic_source.h"
-#include "components/autofill/core/browser/ml_model/field_classification_model_handler.h"
#include "components/autofill/core/browser/proto/api_v1.pb.h"
#include "components/autofill/core/browser/proto/server.pb.h"
#include "components/autofill/core/common/autofill_constants.h"
#include "components/autofill/core/common/autofill_features.h"
--- a/components/autofill/core/browser/foundations/autofill_manager.cc
+++ b/components/autofill/core/browser/foundations/autofill_manager.cc
@@ -909,26 +909,6 @@ void AutofillManager::LogCurrentFieldTyp
@@ -137,8 +137,6 @@ struct AutofillManager::AsyncContext {
std::vector<FormData> forms;
std::vector<RegexPredictions> regex_predictions;
- std::vector<ModelPredictions> autofill_predictions;
- std::vector<ModelPredictions> password_manager_predictions;
GeoIpCountryCode country_code;
LanguageCode current_page_language;
std::unique_ptr<BufferingLogManager> log_manager;
@@ -718,13 +716,6 @@ void AutofillManager::ParseFormsAsyncCom
}
}
- if (!context.autofill_predictions.empty()) {
- context.autofill_predictions[i].ApplyTo(form_structure->fields());
- }
- if (!context.password_manager_predictions.empty()) {
- context.password_manager_predictions[i].ApplyTo(
- form_structure->fields());
- }
if (!context.regex_predictions.empty()) {
context.regex_predictions[i].ApplyTo(form_structure->fields());
}
@@ -843,10 +834,8 @@ void AutofillManager::RunMlModels(
}));
switch (source) {
case HeuristicSource::kAutofillMachineLearning:
- context.autofill_predictions = std::move(model_predictions);
break;
case HeuristicSource::kPasswordManagerMachineLearning:
- context.password_manager_predictions = std::move(model_predictions);
break;
case HeuristicSource::kRegexes:
NOTREACHED();
@@ -968,26 +957,6 @@ void AutofillManager::LogCurrentFieldTyp
void AutofillManager::SubscribeToMlModelChanges(
FieldClassificationModelHandler& handler,
optimization_guide::proto::OptimizationTarget optimization_target) {
- switch (optimization_target) {
FieldClassificationModelHandler& handler) {
- switch (handler.optimization_target()) {
- case optimization_guide::proto::OptimizationTarget::
- OPTIMIZATION_TARGET_AUTOFILL_FIELD_CLASSIFICATION:
- if (!autofill_model_change_subscription_) {
@@ -1099,7 +1129,7 @@
} // namespace autofill
--- a/components/omnibox/browser/autocomplete_classifier.cc
+++ b/components/omnibox/browser/autocomplete_classifier.cc
@@ -131,8 +131,6 @@ void AutocompleteClassifier::Classify(
@@ -136,8 +136,6 @@ void AutocompleteClassifier::Classify(
metrics::OmniboxEventProto::PageClassification page_classification,
AutocompleteMatch* match,
GURL* alternate_nav_url) {
@@ -1140,7 +1170,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -835,10 +835,6 @@ if (is_apple) {
@@ -831,10 +831,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -1208,18 +1238,18 @@
- }
}
#else
CHECK(params->safety_assets->which() ==
CHECK(!params->safety_assets || params->safety_assets->which() ==
--- a/services/on_device_model/on_device_model.gni
+++ b/services/on_device_model/on_device_model.gni
@@ -15,7 +15,6 @@ declare_args() {
# Constraint code is disabled on platforms where the on-device model does not
# run due to binary size.
enable_constraints = is_win || is_mac || is_linux || is_ios || is_cbx
- enable_ml_internal = build_with_internal_optimization_guide &&
- (is_win || is_mac || is_linux || is_ios || is_cbx)
+ enable_ml_internal = false
use_chromeos_model_service = is_chrome_branded && is_cbx
@@ -14,7 +14,7 @@ declare_args() {
declare_args() {
# The on device model service is only enabled on a subset of platforms.
# Exclude it on other platforms due to binary size.
- use_on_device_model_service = is_win || is_mac || is_linux || is_ios || is_cbx
+ use_on_device_model_service = false
}
declare_args() {
--- a/services/on_device_model/safety/BUILD.gn
+++ b/services/on_device_model/safety/BUILD.gn
@@ -4,42 +4,6 @@
@@ -1307,7 +1337,7 @@
}
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
@@ -210,7 +210,6 @@ group("unittests") {
@@ -213,7 +213,6 @@ group("unittests") {
"panels/timeline:unittests",
"panels/timeline/components:unittests",
"panels/timeline/components/insights:unittests",

247
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
@@ -631,8 +631,6 @@ static_library("browser") {
@@ -598,8 +598,6 @@ static_library("browser") {
"idle/idle_detection_permission_context.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -11,7 +11,7 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"k_anonymity_service/k_anonymity_service_client.cc",
@@ -2384,7 +2382,6 @@ static_library("browser") {
@@ -2393,7 +2391,6 @@ static_library("browser") {
"//components/resources",
"//components/safe_browsing/content/browser",
"//components/safe_browsing/content/browser:safe_browsing_service",
@@ -19,7 +19,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/content/common/proto:download_file_types_proto",
@@ -4004,10 +4001,6 @@ static_library("browser") {
@@ -4005,10 +4002,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,7 +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",
@@ -8716,7 +8709,6 @@ static_library("browser_generated_files"
@@ -8643,7 +8636,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",
@@ -38,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",
@@ -9211,8 +9203,6 @@ static_library("test_support") {
@@ -9132,8 +9124,6 @@ static_library("test_support") {
"//components/reporting/util:status",
"//components/reporting/util:status_macros",
"//components/reporting/util:task_runner_context",
@@ -144,6 +144,17 @@
default:
LOG(ERROR) << "Invalid download restriction value: "
<< static_cast<int>(download_restriction);
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -94,8 +94,6 @@ using DangerUiPattern = DownloadUIModel:
using download::DownloadItem;
using InsecureDownloadStatus = download::DownloadItem::InsecureDownloadStatus;
using safe_browsing::DownloadFileType;
-using ReportThreatDetailsResult =
- safe_browsing::PingManager::ReportThreatDetailsResult;
using TailoredVerdict = safe_browsing::ClientDownloadResponse::TailoredVerdict;
using TailoredWarningType = DownloadUIModel::TailoredWarningType;
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1378,14 +1378,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -283,7 +294,7 @@
base::TimeDelta GetIgnoreDownloadBubbleWarningDelay() {
--- a/chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
+++ b/chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
@@ -201,8 +201,6 @@ AnalysisSettings AnalysisServiceSettings
@@ -246,8 +246,6 @@ AnalysisSettings AnalysisServiceSettings
settings.block_large_files = block_large_files_;
if (is_cloud_analysis()) {
CloudAnalysisSettings cloud_settings;
@@ -294,7 +305,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
@@ -41,8 +41,6 @@
@@ -40,8 +40,6 @@
#include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_factory.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"
@@ -387,18 +398,22 @@
void FilesRequestHandler::OnGotFileInfo(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
size_t index,
@@ -283,15 +225,6 @@ void FilesRequestHandler::OnGotFileInfo(
@@ -283,19 +225,6 @@ void FilesRequestHandler::OnGotFileInfo(
void FilesRequestHandler::FinishRequestEarly(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
safe_browsing::BinaryUploadService::Result result) {
- // We add the request here in case we never actually uploaded anything, so it
- // wasn't added in OnGetRequestData
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests(
- request->per_profile_request(), /*access_token*/ "", /*upload_info*/ "",
- /*upload_url=*/"", request->content_analysis_request());
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses(
- /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result),
- enterprise_connectors::ContentAnalysisResponse());
- safe_browsing::WebUIContentInfoSingleton::GetInstance()
- ->AddToDeepScanRequests(request->per_profile_request(),
- /*access_token*/ "", /*upload_info*/ "",
- /*upload_url=*/"",
- request->content_analysis_request());
- safe_browsing::WebUIContentInfoSingleton::GetInstance()
- ->AddToDeepScanResponses(
- /*token=*/"",
- safe_browsing::BinaryUploadService::ResultToString(result),
- enterprise_connectors::ContentAnalysisResponse());
-
request->FinishRequest(result,
enterprise_connectors::ContentAnalysisResponse());
@@ -551,7 +566,7 @@
--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
@@ -202,9 +202,7 @@ void LogVerdictSource(
@@ -185,9 +185,7 @@ void LogVerdictSource(
bool IsScreenshotAllowedByDataControls(content::BrowserContext* context,
const GURL& url) {
@@ -562,6 +577,28 @@
}
} // namespace
--- a/chrome/browser/enterprise/data_protection/data_protection_url_lookup_service.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_url_lookup_service.cc
@@ -67,8 +67,7 @@ DataProtectionUrlLookupServiceFactory::
// static
DataProtectionUrlLookupServiceFactory*
DataProtectionUrlLookupServiceFactory::GetInstance() {
- static base::NoDestructor<DataProtectionUrlLookupServiceFactory> instance;
- return instance.get();
+ return nullptr;
}
// static
--- a/chrome/browser/enterprise/data_protection/data_protection_url_lookup_service.h
+++ b/chrome/browser/enterprise/data_protection/data_protection_url_lookup_service.h
@@ -50,7 +50,6 @@ class DataProtectionUrlLookupServiceFact
private:
DataProtectionUrlLookupServiceFactory();
~DataProtectionUrlLookupServiceFactory() override;
- friend base::NoDestructor<DataProtectionUrlLookupServiceFactory>;
// BrowserContextKeyedServiceFactory:
std::unique_ptr<KeyedService> BuildServiceInstanceForBrowserContext(
--- a/chrome/browser/enterprise/signals/context_info_fetcher.h
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.h
@@ -6,6 +6,7 @@
@@ -582,20 +619,7 @@
bool site_isolation_enabled;
--- a/chrome/browser/enterprise/signals/profile_signals_collector.cc
+++ b/chrome/browser/enterprise/signals/profile_signals_collector.cc
@@ -45,12 +45,8 @@ ProfileSignalsCollector::ProfileSignalsC
PolicyBlocklistFactory::GetForBrowserContext(profile)),
profile_prefs_(profile->GetPrefs()),
policy_manager_(profile->GetCloudPolicyManager()),
- connectors_service_(
- enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext(
- profile)),
profile_id_service_(
enterprise::ProfileIdServiceFactory::GetForProfile(profile)) {
- CHECK(connectors_service_);
CHECK(policy_blocklist_service_);
CHECK(profile_id_service_);
}
@@ -68,12 +64,8 @@ void ProfileSignalsCollector::GetProfile
@@ -70,12 +70,8 @@ void ProfileSignalsCollector::GetProfile
signal_response.chrome_remote_desktop_app_blocked =
device_signals::GetChromeRemoteDesktopAppBlocked(
policy_blocklist_service_);
@@ -610,7 +634,7 @@
signal_response.profile_id = profile_id_service_->GetProfileId();
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -411,8 +411,6 @@ source_set("extensions") {
@@ -407,8 +407,6 @@ source_set("extensions") {
"mv2_deprecation_impact_checker.cc",
"mv2_deprecation_impact_checker.h",
"mv2_experiment_stage.h",
@@ -640,7 +664,7 @@
info.enterprise_profile_id = signals.enterprise_profile_id;
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -381,8 +381,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -382,8 +382,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::kGeneratedHttpsFirstModePref] =
settings_api::PrefType::kNumber;
@@ -651,7 +675,7 @@
--- a/chrome/browser/extensions/blocklist.cc
+++ b/chrome/browser/extensions/blocklist.cc
@@ -190,21 +190,8 @@ Blocklist* Blocklist::Get(content::Brows
@@ -193,21 +193,8 @@ Blocklist* Blocklist::Get(content::Brows
void Blocklist::GetBlocklistedIDs(const std::set<ExtensionId>& ids,
GetBlocklistedIDsCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -675,7 +699,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
@@ -461,8 +461,6 @@ void ChromeExtensionSystem::InstallUpdat
@@ -464,8 +464,6 @@ void ChromeExtensionSystem::InstallUpdat
void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes(
const std::string& extension_id,
const base::Value::Dict& attributes) {
@@ -686,7 +710,7 @@
} // namespace extensions
--- a/chrome/browser/extensions/chrome_extensions_browser_client_non_android.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client_non_android.cc
@@ -31,8 +31,6 @@ void ChromeExtensionsBrowserClient::Init
@@ -34,8 +34,6 @@ void ChromeExtensionsBrowserClient::Init
// Must occur after g_browser_process is initialized.
user_script_listener_ = std::make_unique<UserScriptListener>();
@@ -697,7 +721,7 @@
ProcessManagerDelegate*
--- a/chrome/browser/extensions/extension_allowlist_factory.cc
+++ b/chrome/browser/extensions/extension_allowlist_factory.cc
@@ -45,7 +45,6 @@ ExtensionAllowlistFactory::ExtensionAllo
@@ -48,7 +48,6 @@ ExtensionAllowlistFactory::ExtensionAllo
DependsOn(ExtensionPrefsFactory::GetInstance());
DependsOn(ExtensionRegistrarFactory::GetInstance());
DependsOn(ExtensionRegistryFactory::GetInstance());
@@ -707,7 +731,7 @@
ExtensionAllowlistFactory::~ExtensionAllowlistFactory() = default;
--- a/chrome/browser/extensions/extension_safety_check_utils.cc
+++ b/chrome/browser/extensions/extension_safety_check_utils.cc
@@ -262,9 +262,6 @@ developer::SafetyCheckWarningReason GetS
@@ -265,9 +265,6 @@ developer::SafetyCheckWarningReason GetS
top_warning_reason =
developer::SafetyCheckWarningReason::kNoPrivacyPractice;
@@ -727,7 +751,7 @@
#include "chrome/browser/extensions/permissions/permissions_updater.h"
#include "chrome/browser/extensions/profile_util.h"
#include "chrome/browser/extensions/sync/extension_sync_service.h"
@@ -212,9 +211,6 @@ ExtensionService::ExtensionService(
@@ -218,9 +217,6 @@ ExtensionService::ExtensionService(
extension_telemetry_service_verdict_handler_(extension_prefs,
registry_,
extension_registrar_),
@@ -737,10 +761,10 @@
force_installed_tracker_(registry_, profile_),
force_installed_metrics_(registry_, profile_, &force_installed_tracker_),
corrupted_extension_reinstaller_(
@@ -402,11 +398,6 @@ void ExtensionService::LoadExtensionsFro
<< "--load-extension is not allowed in Google Chrome, ignoring.";
return;
}
@@ -407,11 +403,6 @@ void ExtensionService::LoadExtensionsFro
<< "--load-extension is not allowed in Google Chrome, ignoring.";
return;
#else // BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_CHROMEOS)
- if (safe_browsing::IsEnhancedProtectionEnabled(*profile_->GetPrefs())) {
- VLOG(1) << "--load-extension is not allowed for users opted into "
- << "Enhanced Safe Browsing, ignoring.";
@@ -749,7 +773,7 @@
if (ShouldBlockCommandLineExtension(*profile_)) {
// TODO(crbug.com/401529219): Deprecate this restriction once
// --load-extension removal on Chrome builds is fully launched.
@@ -461,17 +452,6 @@ void ExtensionService::LoadSigninProfile
@@ -467,17 +458,6 @@ void ExtensionService::LoadSigninProfile
}
#endif
@@ -799,7 +823,7 @@
ForceInstalledTracker force_installed_tracker_;
--- a/chrome/browser/extensions/extension_telemetry_service_verdict_handler.cc
+++ b/chrome/browser/extensions/extension_telemetry_service_verdict_handler.cc
@@ -73,14 +73,12 @@ void ExtensionTelemetryServiceVerdictHan
@@ -76,14 +76,12 @@ void ExtensionTelemetryServiceVerdictHan
blocklist_prefs::SetExtensionTelemetryServiceBlocklistState(
extension_id, BitMapBlocklistState::NOT_BLOCKLISTED,
extension_prefs_);
@@ -816,7 +840,7 @@
break;
--- a/chrome/browser/extensions/safe_browsing_verdict_handler.cc
+++ b/chrome/browser/extensions/safe_browsing_verdict_handler.cc
@@ -120,7 +120,6 @@ void SafeBrowsingVerdictHandler::UpdateB
@@ -123,7 +123,6 @@ void SafeBrowsingVerdictHandler::UpdateB
blocklist_.Remove(id);
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
id, BitMapBlocklistState::NOT_BLOCKLISTED, extension_prefs_);
@@ -824,7 +848,7 @@
UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.UnblacklistInstalled",
extension->location());
}
@@ -134,7 +133,6 @@ void SafeBrowsingVerdictHandler::UpdateB
@@ -137,7 +136,6 @@ void SafeBrowsingVerdictHandler::UpdateB
blocklist_.Insert(extension);
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_);
@@ -832,7 +856,7 @@
UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlacklistInstalled",
extension->location());
}
@@ -158,7 +156,6 @@ void SafeBrowsingVerdictHandler::UpdateG
@@ -161,7 +159,6 @@ void SafeBrowsingVerdictHandler::UpdateG
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
extension->id(), BitMapBlocklistState::NOT_BLOCKLISTED,
extension_prefs_);
@@ -840,7 +864,7 @@
UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Enabled",
extension->location());
}
@@ -178,7 +175,6 @@ void SafeBrowsingVerdictHandler::UpdateG
@@ -181,7 +178,6 @@ void SafeBrowsingVerdictHandler::UpdateG
blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state);
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
extension->id(), bitmap_greylist_state, extension_prefs_);
@@ -850,7 +874,7 @@
}
--- a/chrome/browser/notifications/persistent_notification_handler.cc
+++ b/chrome/browser/notifications/persistent_notification_handler.cc
@@ -314,24 +314,6 @@ void PersistentNotificationHandler::Disa
@@ -315,24 +315,6 @@ void PersistentNotificationHandler::Disa
NotificationPermissionContext::UpdatePermission(profile, origin,
CONTENT_SETTING_BLOCK);
#endif
@@ -875,7 +899,7 @@
}
void PersistentNotificationHandler::OpenSettings(Profile* profile,
@@ -384,42 +366,6 @@ void PersistentNotificationHandler::OnMa
@@ -403,42 +385,6 @@ void PersistentNotificationHandler::OnMa
Profile* profile,
bool did_show_warning,
bool did_user_unsubscribe) {
@@ -920,11 +944,20 @@
#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -778,38 +778,8 @@ void PlatformNotificationServiceImpl::Up
@@ -778,47 +778,8 @@ void PlatformNotificationServiceImpl::Up
std::unique_ptr<PersistentNotificationMetadata> persistent_metadata,
bool should_show_warning,
std::optional<std::string> serialized_content_detection_metadata) {
- if (base::FeatureList::IsEnabled(
- safe_browsing::kAutoRevokeSuspiciousNotification) &&
- should_show_warning) {
- // This service might be missing for incognito profiles and in tests.
- if (auto* service =
- NotificationsEngagementServiceFactory::GetForProfile(profile_)) {
- service->RecordNotificationSuspicious(notification.origin_url());
- }
- }
- if (base::FeatureList::IsEnabled(
- safe_browsing::kReportNotificationContentDetectionData)) {
- content::PlatformNotificationContext::WriteResourcesResultCallback
- callback = base::BindOnce(
@@ -1058,11 +1091,11 @@
}
void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
--- a/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
@@ -708,83 +708,6 @@ bool PredictionBasedPermissionUiSelector
--- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
@@ -718,76 +718,6 @@ bool PermissionsAiUiSelector::ShouldHold
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse(
permissions::RequestType request_type) {
- const bool is_msbb_enabled = profile_->GetPrefs()->GetBoolean(
- unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
@@ -1128,15 +1161,8 @@
- }
-
-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- bool use_ondevice_tflite = false;
- if (request_type == permissions::RequestType::kNotifications) {
- use_ondevice_tflite = base::FeatureList::IsEnabled(
- permissions::features::kPermissionOnDeviceNotificationPredictions);
- } else if (request_type == permissions::RequestType::kGeolocation) {
- use_ondevice_tflite = base::FeatureList::IsEnabled(
- permissions::features::kPermissionOnDeviceGeolocationPredictions);
- }
- if (use_ondevice_tflite) {
- if (request_type == permissions::RequestType::kNotifications ||
- request_type == permissions::RequestType::kGeolocation) {
- VLOG(1) << "[CPSS] GetPredictionTypeToUse CPSSv1";
- return PredictionSource::kOnDeviceCpssV1Model;
- }
@@ -1146,7 +1172,7 @@
return PredictionSource::kNoCpssModel;
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -2515,8 +2515,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2544,8 +2544,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -1157,7 +1183,7 @@
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -284,7 +284,6 @@
@@ -285,7 +285,6 @@
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
#include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h"
#include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h"
@@ -1165,7 +1191,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"
@@ -2167,7 +2166,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -2225,7 +2224,6 @@ void RegisterProfilePrefs(user_prefs::Pr
NewTabFooterUI::RegisterProfilePrefs(registry);
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
@@ -1175,7 +1201,7 @@
promos_utils::RegisterProfilePrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -879,9 +879,7 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -889,9 +889,7 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::TelomereEventRouterFactory::GetInstance();
}
#endif
@@ -1214,9 +1240,20 @@
- : nullptr);
+ nullptr);
}
--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
@@ -148,7 +148,7 @@ export class SettingsPrivacyPageIndexEle
enableSafeBrowsingSubresourceFilter_: {
type: Boolean,
value: () => {
- return loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter');
+ return false;
},
},
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -83,9 +83,6 @@ static_library("safe_browsing") {
@@ -84,9 +84,6 @@ static_library("safe_browsing") {
]
}
@@ -1226,7 +1263,7 @@
# Note: is_android is not equivalent to safe_browsing_mode == 2.
# Sources and dependencies added to this block must not depend on anything
@@ -105,13 +102,6 @@ static_library("safe_browsing") {
@@ -106,13 +103,6 @@ static_library("safe_browsing") {
allow_circular_includes_from += [ "//chrome/browser/ash/file_manager" ]
}
@@ -1284,7 +1321,7 @@
namespace settings_api = extensions::api::settings_private;
@@ -21,28 +20,10 @@ GeneratedSecuritySettingsBundlePref::Gen
@@ -21,37 +20,10 @@ GeneratedSecuritySettingsBundlePref::Gen
Profile* profile)
: profile_(profile) {
user_prefs_registrar_.Init(profile->GetPrefs());
@@ -1307,13 +1344,22 @@
- selection != static_cast<int>(SecuritySettingsBundleSetting::ENHANCED)) {
- return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH;
- }
-
- // Update Security Settings Bundle preference to match selection.
- profile_->GetPrefs()->SetInteger(prefs::kSecuritySettingsBundle, selection);
-
- if (selection == static_cast<int>(SecuritySettingsBundleSetting::ENHANCED)) {
- SetSafeBrowsingState(profile_->GetPrefs(),
- SafeBrowsingState::ENHANCED_PROTECTION);
- } else {
- SetSafeBrowsingState(profile_->GetPrefs(),
- SafeBrowsingState::STANDARD_PROTECTION);
- }
-
return extensions::settings_private::SetPrefResult::SUCCESS;
}
@@ -52,17 +33,8 @@ GeneratedSecuritySettingsBundlePref::Get
@@ -61,17 +33,8 @@ GeneratedSecuritySettingsBundlePref::Get
pref_object.key = kGeneratedSecuritySettingsBundlePref;
pref_object.type = extensions::api::settings_private::PrefType::kNumber;
@@ -1378,7 +1424,7 @@
- profile),
- SafeBrowsingNavigationObserverManagerFactory::GetForBrowserContext(
- profile),
- WebUIInfoSingleton::GetInstance());
- WebUIContentInfoSingleton::GetInstance());
}
scoped_refptr<network::SharedURLLoaderFactory>
@@ -1435,7 +1481,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
@@ -80,8 +80,6 @@ void SSLErrorControllerClient::GoBack()
@@ -81,8 +81,6 @@ void SSLErrorControllerClient::GoBack()
void SSLErrorControllerClient::Proceed() {
content::WebContents* const web_contents = this->web_contents();
@@ -1446,7 +1492,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
@@ -4185,8 +4185,6 @@ static_library("ui") {
@@ -4231,8 +4231,6 @@ static_library("ui") {
"views/safe_browsing/password_reuse_modal_warning_dialog.h",
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
@@ -1542,14 +1588,14 @@
--- a/chrome/browser/ui/toasts/toast_service.cc
+++ b/chrome/browser/ui/toasts/toast_service.cc
@@ -35,7 +35,6 @@
#include "components/plus_addresses/core/browser/grit/plus_addresses_strings.h"
#include "components/plus_addresses/core/common/features.h"
#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/strings/grit/components_strings.h"
#include "components/tabs/public/tab_interface.h"
#include "components/vector_icons/vector_icons.h"
@@ -145,57 +144,6 @@ void ToastService::RegisterToasts(
@@ -144,57 +143,6 @@ void ToastService::RegisterToasts(
.Build());
}
@@ -1801,7 +1847,7 @@
kChromeUITabSearchHost,
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2707,7 +2707,6 @@ if (!is_android) {
@@ -2774,7 +2774,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -1809,7 +1855,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -7175,7 +7174,6 @@ test("unit_tests") {
@@ -7225,7 +7224,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -1880,7 +1926,7 @@
#if BUILDFLAG(IS_WIN)
#include "components/device_signals/core/common/win/win_types.h"
@@ -256,10 +255,7 @@ struct ProfileSignalsResponse : BaseSign
@@ -261,10 +260,7 @@ struct ProfileSignalsResponse : BaseSign
bool built_in_dns_client_enabled;
bool chrome_remote_desktop_app_blocked;
@@ -1893,7 +1939,7 @@
--- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
+++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
@@ -258,18 +258,12 @@ void ChromeProfileRequestGenerator::OnAg
@@ -265,18 +265,12 @@ void ChromeProfileRequestGenerator::OnAg
profile_signals.built_in_dns_client_enabled);
profile_signals_report->set_chrome_remote_desktop_app_blocked(
profile_signals.chrome_remote_desktop_app_blocked);
@@ -2032,7 +2078,7 @@
} // namespace password_manager
--- a/components/safe_browsing/content/common/safe_browsing.mojom
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
@@ -170,7 +170,6 @@ interface PhishingDetector {
@@ -172,7 +172,6 @@ interface PhishingDetector {
// Interface for setting a phishing model. This is scoped to an entire
// RenderProcess.
@@ -2091,7 +2137,7 @@
#include "components/safe_browsing/core/common/utils.h"
#include "google_apis/google_api_keys.h"
#include "net/base/net_errors.h"
@@ -114,21 +113,7 @@ constexpr net::NetworkTrafficAnnotationT
@@ -115,21 +114,7 @@ constexpr net::NetworkTrafficAnnotationT
bool IsEnabled(PrefService* pref_service,
std::optional<std::string> country,
bool are_background_lookups_allowed) {
@@ -2114,7 +2160,7 @@
}
GURL GetKeyFetchingUrl() {
@@ -403,25 +388,9 @@ void OhttpKeyService::MaybeStartServerTr
@@ -404,25 +389,9 @@ void OhttpKeyService::MaybeStartServerTr
}
void OhttpKeyService::PopulateKeyFromPref() {
@@ -2142,7 +2188,7 @@
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
@@ -142,7 +142,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe
@@ -149,7 +149,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe
bool ChromeEnterpriseRealTimeUrlLookupService::CanCheckSafeBrowsingDb() const {
// Check database if safe browsing is enabled.
@@ -2153,7 +2199,7 @@
bool ChromeEnterpriseRealTimeUrlLookupService::
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
@@ -249,17 +249,6 @@ void RealTimeUrlLookupService::MaybeLogP
@@ -254,17 +254,6 @@ void RealTimeUrlLookupService::MaybeLogP
bool request_had_cookie,
bool was_first_request,
bool sent_with_token) {
@@ -2204,7 +2250,7 @@
#include "components/safe_browsing/core/common/proto/csd.pb.h"
--- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
+++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
@@ -405,7 +405,6 @@ void TailoredSecurityService::MaybeNotif
@@ -406,7 +406,6 @@ void TailoredSecurityService::MaybeNotif
RecordEnabledNotificationResult(
TailoredSecurityNotificationResult::kHistoryNotSynced);
}
@@ -2212,7 +2258,7 @@
return;
}
@@ -415,7 +414,6 @@ void TailoredSecurityService::MaybeNotif
@@ -416,7 +415,6 @@ void TailoredSecurityService::MaybeNotif
RecordEnabledNotificationResult(
TailoredSecurityNotificationResult::kSafeBrowsingControlledByPolicy);
}
@@ -2287,7 +2333,7 @@
if (sync_observer_) {
--- a/components/safe_browsing/core/browser/web_ui/safe_browsing_ui_util.cc
+++ b/components/safe_browsing/core/browser/web_ui/safe_browsing_ui_util.cc
@@ -300,20 +300,7 @@ std::string SerializeHitReport(const Hit
@@ -306,20 +306,7 @@ std::string SerializeHitReport(const Hit
}
hit_report_dict.Set("threat_source", std::move(threat_source));
std::string extended_reporting_level;
@@ -2354,7 +2400,7 @@
void SSLBlockingPageBase::PopulateEnhancedProtectionMessage(
--- a/components/sync_preferences/common_syncable_prefs_database.cc
+++ b/components/sync_preferences/common_syncable_prefs_database.cc
@@ -328,9 +328,6 @@ constexpr auto kCommonSyncablePrefsAllow
@@ -344,9 +344,6 @@ constexpr auto kCommonSyncablePrefsAllow
{plus_addresses::prefs::kLastPlusAddressFillingTime,
{syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES,
PrefSensitivity::kNone, MergeBehavior::kNone}},
@@ -2487,7 +2533,7 @@
return RespondNow(Error(std::move(error)));
--- a/extensions/browser/api/web_request/extension_web_request_event_router.cc
+++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc
@@ -1022,14 +1022,6 @@ int WebRequestEventRouter::OnBeforeReque
@@ -1025,14 +1025,6 @@ int WebRequestEventRouter::OnBeforeReque
DCHECK(action.redirect_url);
OnDNRActionMatched(browser_context, *request, action);
*new_url = GetNewUrl(action.redirect_url.value(), browser_context);
@@ -2518,7 +2564,7 @@
}
--- a/extensions/browser/extension_registrar.cc
+++ b/extensions/browser/extension_registrar.cc
@@ -789,103 +789,27 @@ void ExtensionRegistrar::UnblockAllExten
@@ -789,120 +789,27 @@ void ExtensionRegistrar::UnblockAllExten
void ExtensionRegistrar::OnBlocklistStateRemoved(
const std::string& extension_id) {
@@ -2574,6 +2620,19 @@
- extension_prefs_);
- RemoveDisableReasonAndMaybeEnable(extension_id,
- disable_reason::DISABLE_GREYLIST);
-
- // A user can enable and disable a force-installed extension while it is
- // greylisted. If a user disables an extension while greylisted, the
- // extension gets a DISABLE_USER_ACTION disable reason assigned to it. So
- // remove the DISABLE_USER_ACTION disable reason as well when a
- // force-installed extension gets "un-greylisted" to allow the extension
- // to be re-enabled.
- const Extension* extension = registry_->GetInstalledExtension(extension_id);
- if (extension && extension_system_->management_policy()->MustRemainEnabled(
- extension, nullptr)) {
- RemoveDisableReasonAndMaybeEnable(extension_id,
- disable_reason::DISABLE_USER_ACTION);
- }
}
void ExtensionRegistrar::OnGreylistStateAdded(const std::string& extension_id,
@@ -2618,7 +2677,11 @@
const BitMapBlocklistState& state) {
- blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(extension_id, state,
- extension_prefs_);
- OnGreylistStateAdded(extension_id, state);
- if (state == BitMapBlocklistState::NOT_BLOCKLISTED) {
- OnGreylistStateRemoved(extension_id);
- } else {
- OnGreylistStateAdded(extension_id, state);
- }
}
void ExtensionRegistrar::OnUnpackedExtensionReloadFailed(

44
patches/core/ungoogled-chromium/move-js-optimizer-unfamiliar-sites.patch Normal file
View File

@@ -0,0 +1,44 @@
# This was added to the safebrowsing prefs in
# https://chromium-review.googlesource.com/c/chromium/src/+/6898756
# Move it to content_settings since we remove safebrowsing prefs
--- a/chrome/browser/content_settings/generated_javascript_optimizer_pref.cc
+++ b/chrome/browser/content_settings/generated_javascript_optimizer_pref.cc
@@ -11,6 +11,7 @@
#include "chrome/common/extensions/api/settings_private.h"
#include "components/content_settings/core/common/features.h"
#include "components/prefs/pref_service.h"
+#include "components/content_settings/core/common/pref_names.h"
using extensions::api::settings_private::Enforcement;
using extensions::api::settings_private::PrefObject;
--- a/chrome/browser/site_protection/site_familiarity_utils.cc
+++ b/chrome/browser/site_protection/site_familiarity_utils.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/site_protection/site_familiarity_utils.h"
#include "components/content_settings/core/common/features.h"
+#include "components/content_settings/core/common/pref_names.h"
#include "components/prefs/pref_service.h"
#include "content/public/common/content_features.h"
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
@@ -88,6 +88,7 @@ void PrefProvider::RegisterProfilePrefs(
ContentSettingsPattern::kContentSettingsPatternVersion);
registry->RegisterBooleanPref(prefs::kInContextCookieControlsOpened, false);
registry->RegisterBooleanPref(kGeolocationMigrateExceptionsPref, false);
+ registry->RegisterBooleanPref(prefs::kJavascriptOptimizerBlockedForUnfamiliarSites, false);
WebsiteSettingsRegistry* website_settings =
WebsiteSettingsRegistry::GetInstance();
--- a/components/content_settings/core/common/pref_names.h
+++ b/components/content_settings/core/common/pref_names.h
@@ -267,6 +267,8 @@ inline constexpr char kDesktopSiteWindow
"desktop_site.window_setting";
#endif
+inline constexpr char kJavascriptOptimizerBlockedForUnfamiliarSites[] =
+ "safebrowsing.javascript_optimizer_blocked_for_unfamiliar_sites";
} // namespace prefs
#endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_PREF_NAMES_H_

2
patches/core/ungoogled-chromium/remove-f1-shortcut.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/accelerator_table.cc
+++ b/chrome/browser/ui/accelerator_table.cc
@@ -132,7 +132,6 @@ const AcceleratorMapping kAcceleratorMap
@@ -133,7 +133,6 @@ const AcceleratorMapping kAcceleratorMap
{ui::VKEY_OEM_PLUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_PLUS},
{ui::VKEY_ADD, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_PLUS},

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

File diff suppressed because it is too large Load Diff

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

@@ -9,7 +9,7 @@
#include "components/translate/core/browser/translate_download_manager.h"
#include "components/translate/core/browser/translate_manager.h"
#include "components/translate/core/browser/translate_prefs.h"
@@ -2192,6 +2193,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2240,6 +2241,7 @@ void RenderViewContextMenu::AppendPageIt
}
if (CanTranslate(/*menu_logging=*/true)) {
@@ -47,7 +47,7 @@
request_pending_ = true;
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -821,8 +821,9 @@ void TranslateManager::FilterIsTranslate
@@ -829,8 +829,9 @@ void TranslateManager::FilterIsTranslate
TriggerDecision::kDisabledOffline);
}
@@ -61,7 +61,7 @@
// settings syncs and we don't want to turn off translate everywhere else.
--- a/components/translate/core/browser/translate_ranker_impl.cc
+++ b/components/translate/core/browser/translate_ranker_impl.cc
@@ -157,12 +157,9 @@ TranslateRankerImpl::TranslateRankerImpl
@@ -152,12 +152,9 @@ TranslateRankerImpl::TranslateRankerImpl
ukm::UkmRecorder* ukm_recorder)
: ukm_recorder_(ukm_recorder),
is_uma_logging_enabled_(false),
@@ -77,7 +77,7 @@
if (is_query_enabled_ || is_enforcement_enabled_) {
model_loader_ = std::make_unique<assist_ranker::RankerModelLoaderImpl>(
base::BindRepeating(&ValidateModel),
@@ -236,6 +233,8 @@ bool TranslateRankerImpl::ShouldOfferTra
@@ -231,6 +228,8 @@ bool TranslateRankerImpl::ShouldOfferTra
// (or become False).
const bool kDefaultResponse = true;

16
patches/extra/brave/chrome-importer-files.patch
View File

@@ -189,7 +189,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+} // namespace
--- /dev/null
+++ b/chrome/common/importer/chrome_importer_utils.cc
@@ -0,0 +1,241 @@
@@ -0,0 +1,243 @@
+/* Copyright (c) 2019 The Brave Authors, 2025 imput. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -235,7 +235,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ base::ReadFileToString(preference_path, &preference_content);
+
+ std::optional<base::Value::Dict> preference =
+ base::JSONReader::ReadDict(preference_content);
+ base::JSONReader::ReadDict(preference_content,
+ base::JSON_PARSE_CHROMIUM_EXTENSIONS);
+ if (!preference) {
+ return std::nullopt;
+ }
@@ -335,7 +336,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ std::string local_state_content;
+ base::ReadFileToString(local_state_path, &local_state_content);
+ std::optional<base::Value::Dict> local_state_dict =
+ base::JSONReader::ReadDict(local_state_content);
+ base::JSONReader::ReadDict(local_state_content,
+ base::JSON_PARSE_CHROMIUM_EXTENSIONS);
+ if (!local_state_dict)
+ return profiles;
+
@@ -2733,7 +2735,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+#endif // BRAVE_UTILITY_IMPORTER_BRAVE_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_
--- /dev/null
+++ b/chrome/utility/importer/chrome_importer.cc
@@ -0,0 +1,435 @@
@@ -0,0 +1,437 @@
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -2822,7 +2824,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ std::string local_state_content;
+ base::ReadFileToString(local_state_path, &local_state_content);
+ std::optional<base::Value::Dict> local_state =
+ base::JSONReader::ReadDict(local_state_content);
+ base::JSONReader::ReadDict(local_state_content,
+ base::JSON_PARSE_CHROMIUM_EXTENSIONS);
+ if (!local_state) {
+ return false;
+ }
@@ -3006,7 +3009,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ base::ReadFileToString(copy_bookmark_file.copied_file_path(),
+ &bookmarks_content);
+ std::optional<base::Value::Dict> bookmark_dict =
+ base::JSONReader::ReadDict(bookmarks_content);
+ base::JSONReader::ReadDict(bookmarks_content,
+ base::JSON_PARSE_CHROMIUM_EXTENSIONS);
+ if (!bookmark_dict)
+ return;
+

20
patches/extra/brave/custom-importer.patch
View File

@@ -244,7 +244,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
}
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -4260,6 +4260,9 @@ inline constexpr char kServiceWorkerToCo
@@ -4266,6 +4266,9 @@ inline constexpr char kServiceWorkerToCo
inline constexpr char kSharedWorkerBlobURLFixEnabled[] =
"worker.shared_worker_blob_url_fix_enabled";
@@ -256,7 +256,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
inline constexpr char kClearWindowNameForNewBrowsingContextGroup[] =
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -1161,6 +1161,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -1164,6 +1164,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::prefs::kImportDialogSearchEngine] =
settings_api::PrefType::kBoolean;
@@ -275,7 +275,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h"
#include "chrome/browser/ui/webui/settings/on_startup_handler.h"
#include "chrome/browser/ui/webui/settings/password_manager_handler.h"
@@ -202,6 +203,7 @@ void SettingsUI::RegisterProfilePrefs(
@@ -201,6 +202,7 @@ void SettingsUI::RegisterProfilePrefs(
registry->RegisterBooleanPref(prefs::kImportDialogHistory, true);
registry->RegisterBooleanPref(prefs::kImportDialogSavedPasswords, true);
registry->RegisterBooleanPref(prefs::kImportDialogSearchEngine, true);
@@ -283,7 +283,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
}
SettingsUI::SettingsUI(content::WebUI* web_ui)
@@ -231,7 +233,7 @@ SettingsUI::SettingsUI(content::WebUI* w
@@ -230,7 +232,7 @@ SettingsUI::SettingsUI(content::WebUI* w
AddSettingsPageUIHandler(std::make_unique<DownloadsHandler>(profile));
AddSettingsPageUIHandler(std::make_unique<ExtensionControlHandler>());
AddSettingsPageUIHandler(std::make_unique<FontHandler>(profile));
@@ -294,7 +294,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if BUILDFLAG(IS_WIN)
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -893,6 +893,8 @@ void AddImportDataStrings(content::WebUI
@@ -900,6 +900,8 @@ void AddImportDataStrings(content::WebUI
{"importHistory", IDS_SETTINGS_IMPORT_HISTORY_CHECKBOX},
{"importFavorites", IDS_SETTINGS_IMPORT_FAVORITES_CHECKBOX},
{"importPasswords", IDS_SETTINGS_IMPORT_PASSWORDS_CHECKBOX},
@@ -319,7 +319,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</div>
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1203,6 +1203,10 @@ static_library("ui") {
@@ -1237,6 +1237,10 @@ static_library("ui") {
"webui/settings/accessibility_main_handler.h",
"webui/settings/appearance_handler.cc",
"webui/settings/appearance_handler.h",
@@ -330,7 +330,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"webui/settings/browser_lifetime_handler.cc",
"webui/settings/browser_lifetime_handler.h",
"webui/settings/captions_handler.cc",
@@ -1355,6 +1359,13 @@ static_library("ui") {
@@ -1391,6 +1395,13 @@ static_library("ui") {
]
}
@@ -459,7 +459,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "components/mirroring/service/mirroring_service.h"
#include "services/passage_embeddings/passage_embeddings_service.h"
#include "services/proxy_resolver/proxy_resolver_factory_impl.h" // nogncheck
@@ -146,6 +148,13 @@ static_assert(BUILDFLAG(ENABLE_PRINTING)
@@ -144,6 +146,13 @@ static_assert(BUILDFLAG(ENABLE_PRINTING)
namespace {
@@ -473,7 +473,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
auto RunFilePatcher(mojo::PendingReceiver<patch::mojom::FilePatcher> receiver) {
return std::make_unique<patch::FilePatcherImpl>(std::move(receiver));
}
@@ -465,6 +474,7 @@ void RegisterMainThreadServices(mojo::Se
@@ -456,6 +465,7 @@ void RegisterMainThreadServices(mojo::Se
services.Add(ContentBookmarkParser);
#if !BUILDFLAG(IS_ANDROID)
@@ -583,7 +583,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// entire group has been collected and is ready to be written to the profile.
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11122,6 +11122,15 @@ Check your passwords anytime in <ph name
@@ -11171,6 +11171,15 @@ Check your passwords anytime in <ph name
Microsoft Edge
</message>
</if>

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

@@ -9,7 +9,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2599,6 +2599,7 @@ static_library("browser") {
@@ -2609,6 +2609,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
@@ -188,6 +188,7 @@
@@ -191,6 +191,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
@@ -299,6 +299,7 @@ source_set("browser") {
@@ -302,6 +302,7 @@ source_set("browser") {
"//third_party/re2",
"//third_party/snappy",
"//third_party/sqlite",
@@ -54,7 +54,7 @@
"//tools/v8_context_snapshot:buildflags",
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -83,6 +83,7 @@
@@ -84,6 +84,7 @@
#include "components/services/storage/public/cpp/quota_error_or.h"
#include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
#include "components/tracing/common/tracing_switches.h"
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "components/viz/host/host_frame_sink_manager.h"
@@ -3541,6 +3542,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3591,6 +3592,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"
@@ -484,6 +485,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -483,6 +484,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"
@@ -1084,6 +1085,11 @@ Document::Document(const DocumentInit& i
@@ -1087,6 +1088,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();
@@ -1221,6 +1227,14 @@ const Position Document::PositionAdjuste
@@ -1224,6 +1230,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
@@ -572,6 +572,10 @@ class CORE_EXPORT Document : public Cont
@@ -574,6 +574,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;
@@ -2783,6 +2787,9 @@ class CORE_EXPORT Document : public Cont
@@ -2795,6 +2799,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -176,7 +176,7 @@
// - ScriptSchedulingType::kInOrder
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -3133,6 +3133,11 @@ DOMRectList* Element::getClientRects() {
@@ -3190,6 +3190,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -3160,6 +3165,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -3217,6 +3222,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -276,7 +276,7 @@
namespace blink {
class MemoryManagedPaintCanvas;
@@ -1245,13 +1248,26 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -1252,13 +1255,26 @@ TextMetrics* BaseRenderingContext2D::mea
TextDirection direction =
ToTextDirection(state.GetDirection(), host, computed_style);
@@ -308,7 +308,7 @@
String BaseRenderingContext2D::lang() const {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1814,6 +1814,7 @@ component("platform") {
@@ -1815,6 +1815,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection",
@@ -343,7 +343,7 @@
#include "third_party/skia/include/core/SkImage.h"
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2309,6 +2309,12 @@
@@ -2344,6 +2344,12 @@
status: "stable",
},
{

14
patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
View File

@@ -34,7 +34,7 @@ approach to change color components.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3544,6 +3544,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3594,6 +3594,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -44,7 +44,7 @@ approach to change color components.
switches::kForceHighContrast,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -489,6 +489,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -488,6 +488,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
@@ -555,6 +555,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -558,6 +558,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
@@ -1756,7 +1756,9 @@ component("platform") {
@@ -1757,7 +1757,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -292,7 +292,7 @@ approach to change color components.
// Methods overridden by all sub-classes
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
@@ -14,6 +14,8 @@
@@ -13,6 +13,8 @@
#include <stdio.h> // Needed by jpeglib.h
#include "jpeglib.h" // for JPEG_MAX_DIMENSION
@@ -301,7 +301,7 @@ approach to change color components.
#include "third_party/libwebp/src/src/webp/encode.h" // for WEBP_MAX_DIMENSION
namespace blink {
@@ -43,6 +45,10 @@ bool ImageEncoder::Encode(Vector<unsigne
@@ -44,6 +46,10 @@ bool ImageEncoder::Encode(Vector<unsigne
const SkPixmap& src,
ImageEncodingMimeType mime_type,
double quality) {
@@ -314,7 +314,7 @@ approach to change color components.
SkJpegEncoder::Options options;
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2315,6 +2315,9 @@
@@ -2350,6 +2350,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
@@ -2276,6 +2276,7 @@ static_library("browser") {
@@ -2283,6 +2283,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
@@ -2654,6 +2654,10 @@ const char kLogJsConsoleMessagesDescript
@@ -2671,6 +2671,10 @@ const char kLogJsConsoleMessagesDescript
"Enable logging JS console messages in system logs, please note that they "
"may contain PII.";
@@ -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
@@ -1555,6 +1555,9 @@ extern const char kLockTopControlsOnLarg
@@ -1567,6 +1567,9 @@ extern const char kLockTopControlsOnLarg
extern const char kLogJsConsoleMessagesName[];
extern const char kLogJsConsoleMessagesDescription[];

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

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

12
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
@@ -1462,7 +1462,7 @@ void ChromeContentBrowserClient::Registe
@@ -1439,7 +1439,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
@@ -621,7 +621,7 @@ void ProfileNetworkContextService::Confi
@@ -598,7 +598,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
@@ -121,7 +121,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -125,7 +125,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
@@ -76,7 +76,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterIntegerPref(
kAutofillLastVersionDeduped, 0,
@@ -40,7 +40,7 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -43,7 +43,7 @@ void RegisterProfilePrefs(user_prefs::Pr
kAutofillHasSeenIban, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
@@ -109,7 +109,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -512,7 +512,7 @@ void HandleFailedLoginDetectionForPasswo
@@ -522,7 +522,7 @@ bool HasManuallyFilledPassword(const Pas
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.
@@ -520,7 +520,7 @@ void PasswordManager::RegisterProfilePre
@@ -530,7 +530,7 @@ void PasswordManager::RegisterProfilePre
false);
#endif // BUILDFLAG(IS_IOS)
registry->RegisterBooleanPref(

7
patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1581,27 +1581,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1589,30 +1589,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {
@@ -16,12 +16,15 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
-
- if (base::FeatureList::IsEnabled(features::kBookmarksImportOnFirstRun) &&
- !master_prefs_->import_bookmarks_dict.empty()) {
- first_run::StartBookmarksImportFromDict(
- first_run::StartBookmarkImportFromDict(
- profile, std::move(master_prefs_->import_bookmarks_dict));
- }
-
-#if BUILDFLAG(ENABLE_EXTENSIONS)
- if (base::FeatureList::IsEnabled(features::kInitialExternalExtensions)) {
- profile->GetPrefs()->SetString(
- extensions::pref_names::kInitialInstallProviderName,
- std::move(master_prefs_->initial_extensions_provider_name));
- // Store the initial extension IDs into the profile's prefs so that
- // InitialExternalExtensionLoader can later pick them up.
- profile->GetPrefs()->SetList(

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

4
patches/extra/ungoogled-chromium/add-credits.patch
View File

@@ -41,7 +41,7 @@
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/tools/licenses/licenses.py
+++ b/tools/licenses/licenses.py
@@ -1015,6 +1015,16 @@ def GenerateCredits(file_template_file,
@@ -1026,6 +1026,16 @@ def GenerateCredits(file_template_file,
entries.append(
MetadataToTemplateEntry(chromium_license_metadata, entry_template))
@@ -58,7 +58,7 @@
entries_by_name = {}
for path in third_party_dirs:
try:
@@ -1059,8 +1069,8 @@ def GenerateCredits(file_template_file,
@@ -1062,8 +1072,8 @@ def GenerateCredits(file_template_file,
reciprocal_template = codecs.open(reciprocal_template_file,
encoding='utf-8').read()
reciprocal_contents = EvaluateTemplate(reciprocal_template, {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -139,6 +139,7 @@
@@ -142,6 +142,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h"
#include "chrome/browser/ui/views/frame/multi_contents_view.h"
@@ -8,7 +8,7 @@
#include "chrome/browser/ui/views/status_bubble_views.h"
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
#include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h"
@@ -611,6 +612,7 @@ Browser::Browser(const CreateParams& par
@@ -630,6 +631,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),
@@ -993,20 +995,22 @@ Browser::WarnBeforeClosingResult Browser
@@ -1015,20 +1017,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1044,6 +1048,7 @@ bool Browser::TryToCloseWindow(
@@ -1080,6 +1084,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3494,6 +3499,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3555,6 +3560,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;
@@ -3519,6 +3576,22 @@ void Browser::InProgressDownloadResponse
@@ -3580,6 +3637,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -145,14 +145,14 @@
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -33,6 +33,7 @@
#include "chrome/browser/ui/browser_window/public/browser_window_interface.h"
#include "chrome/browser/ui/browser_window/public/desktop_browser_window_capabilities_delegate.h"
#include "chrome/browser/ui/browser_window_deleter.h"
#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
+#include "chrome/browser/ui/simple_message_box.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/unload_controller.h"
@@ -1150,12 +1151,17 @@ class Browser : public TabStripModelObse
@@ -1157,12 +1158,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.
@@ -1341,6 +1347,8 @@ class Browser : public TabStripModelObse
@@ -1343,6 +1349,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -839,11 +839,15 @@ bool HandleNewTabPageLocationOverride(
@@ -834,11 +834,15 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord()) {

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

@@ -41,7 +41,7 @@
#include "third_party/blink/public/common/input/web_menu_source_type.h"
#include "third_party/blink/public/platform/web_input_event_result.h"
#include "third_party/blink/renderer/core/annotation/annotation_agent_impl.h"
@@ -1437,10 +1438,14 @@ FrameSelection& SelectionController::Sel
@@ -1441,10 +1442,14 @@ FrameSelection& SelectionController::Sel
}
bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) {

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

@@ -1,9 +1,9 @@
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -723,5 +723,7 @@ bool BrowserFrame::RegenerateFrameOnThem
--- a/chrome/browser/ui/views/frame/browser_widget.cc
+++ b/chrome/browser/ui/views/frame/browser_widget.cc
@@ -680,5 +680,7 @@ bool BrowserWidget::RegenerateFrameOnThe
}
bool BrowserFrame::IsIncognitoBrowser() const {
bool BrowserWidget::IsIncognitoBrowser() const {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("enable-incognito-themes"))
+ return false;
return browser_view_->browser()->profile()->IsIncognitoProfile();
@@ -18,7 +18,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -389,7 +390,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -392,7 +393,9 @@ void NTPResourceCache::CreateNewTabIncog
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
// Colors.

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"
@@ -570,6 +571,15 @@ AutocompleteController::AutocompleteCont
@@ -572,6 +573,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();

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

@@ -36,14 +36,14 @@
+BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT);
+
BASE_FEATURE(kClickToCall, "ClickToCall", base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kClickToCall, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kMobilePromoOnDesktop,
BASE_FEATURE(kMobilePromoOnDesktop, base::FEATURE_DISABLED_BY_DEFAULT);
--- a/components/sharing_message/features.h
+++ b/components/sharing_message/features.h
@@ -18,4 +18,5 @@ extern const char kMobilePromoOnDesktopP
// Parameter of `kMobilePromoOnDesktop` for showing the iOS push notification.
extern const char kMobilePromoOnDesktopNotificationParam[];
@@ -34,4 +34,5 @@ MobilePromoOnDesktopPromoType MobileProm
// notification arm, false otherwise.
bool IsMobilePromoOnDesktopNotificationsEnabled();
+BASE_DECLARE_FEATURE(kDisableQRGenerator);
#endif // COMPONENTS_SHARING_MESSAGE_FEATURES_H_

2
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
@@ -560,7 +560,9 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -567,7 +567,9 @@ void TabHelpers::AttachTabHelpers(WebCon
profile, web_contents);
#endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);

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

@@ -42,7 +42,7 @@
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
@@ -1998,6 +1999,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -2003,6 +2004,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1609,7 +1609,8 @@ void BrowserCommandController::InitComma
@@ -1633,7 +1633,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -20,7 +20,7 @@
#include "base/feature_list.h"
#include "base/metrics/field_trial_params.h"
#include "base/time/time.h"
@@ -707,6 +708,10 @@ static std::string GetCountryCode() {
@@ -613,6 +614,10 @@ static std::string GetCountryCode() {
}
bool HasTabSearchToolbarButton() {
@@ -33,7 +33,7 @@
base::FeatureList::IsEnabled(
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -5182,6 +5182,7 @@ void BrowserView::AddedToWidget() {
@@ -5088,6 +5088,7 @@ void BrowserView::AddedToWidget() {
toolbar_->Init();

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

@@ -1,14 +1,14 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -368,4 +368,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
"RemovalOfIWAsFromTabCapture",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -313,4 +313,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
// show both in Chrome Tabs and Windows.
BASE_FEATURE(kRemovalOfIWAsFromTabCapture, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kClearDataOnExit, "ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT);
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -125,6 +125,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
@@ -126,6 +126,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
// module, e.g.
// //chrome/browser/<foo_module>/features.h
//

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

@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/flat_map.h"
#include "base/containers/span.h"
@@ -1171,6 +1172,10 @@ void TabStripModel::CloseAllTabsInGroup(
@@ -1174,6 +1175,10 @@ void TabStripModel::CloseAllTabsInGroup(
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));

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

@@ -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
@@ -312,6 +312,13 @@ bool ExtensionManagement::IsInstallation
@@ -326,6 +326,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
@@ -1200,6 +1200,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1199,6 +1199,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"
@@ -1341,7 +1342,8 @@ void HistoryBackend::InitImpl(
@@ -1346,7 +1347,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.
@@ -31,7 +31,7 @@
}
void HistoryBackend::OnMemoryPressure(
@@ -1570,6 +1572,8 @@ void HistoryBackend::AddPagesWithDetails
@@ -1583,6 +1585,8 @@ void HistoryBackend::AddPagesWithDetails
}
bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const {

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

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

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

@@ -8,15 +8,15 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
@@ -35,6 +36,7 @@
@@ -34,6 +35,7 @@
#include "chrome/browser/ui/views/frame/toolbar_button_provider.h"
#include "chrome/browser/ui/views/side_panel/side_panel_ui.h"
#include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h"
#include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/feature_engagement/public/event_constants.h"
@@ -548,6 +550,17 @@ void ExtensionsToolbarContainer::AnchorA
@@ -547,6 +549,17 @@ void ExtensionsToolbarContainer::AnchorA
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
anchor_view && anchor_view->GetVisible() ? anchor_view
: GetExtensionsButton());
@@ -34,7 +34,7 @@
widget->Show();
}
@@ -964,6 +977,9 @@ void ExtensionsToolbarContainer::UpdateC
@@ -949,6 +962,9 @@ void ExtensionsToolbarContainer::UpdateC
}
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() 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
@@ -2116,6 +2116,10 @@ void BrowserView::ExitFullscreen() {
@@ -1969,6 +1969,10 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateExclusiveAccessBubble(
const ExclusiveAccessBubbleParams& params,
ExclusiveAccessBubbleHideCallback first_hide_callback) {

6
patches/extra/ungoogled-chromium/add-flag-to-increase-incognito-storage-quota.patch
View File

@@ -11,9 +11,9 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/storage/browser/quota/quota_features.cc
+++ b/storage/browser/quota/quota_features.cc
@@ -41,5 +41,9 @@ BASE_FEATURE(kStaticStorageQuota,
"StaticStorageQuota",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -37,5 +37,9 @@ constexpr base::FeatureParam<double> kSh
// A kill switch for the new reported quota being a static value.
BASE_FEATURE(kStaticStorageQuota, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kIncreaseIncognitoStorageQuota,
+ "IncreaseIncognitoStorageQuota",

8
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
@@ -823,6 +823,8 @@ void UpdateNavigationRequestClientUaHead
@@ -824,6 +824,8 @@ void UpdateNavigationRequestClientUaHead
net::HttpRequestHeaders* headers,
const std::optional<GURL>& request_url) {
DCHECK(frame_tree_node);
@@ -20,7 +20,7 @@
if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) {
return;
}
@@ -854,6 +856,8 @@ void AddRequestClientHintsHeaders(
@@ -855,6 +857,8 @@ void AddRequestClientHintsHeaders(
FrameTreeNode* frame_tree_node,
const network::ParsedPermissionsPolicy& container_policy,
FrameTreeNode* ftn_for_devtools_override) {
@@ -75,10 +75,10 @@
#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/permissions_policy/document_policy_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"
@@ -528,6 +529,8 @@ void FrameFetchContext::ModifyRequestFor
@@ -611,6 +612,8 @@ void FrameFetchContext::ModifyRequestFor
void FrameFetchContext::AddClientHintsIfNecessary(
const std::optional<float> resource_width,
ResourceRequest& request) {

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
@@ -4121,6 +4121,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -4153,6 +4153,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -95,7 +95,7 @@
return WebGLAny(script_state,
String(ContextGL()->GetString(GL_RENDERER)));
}
@@ -4136,6 +4138,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -4168,6 +4170,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
@@ -4922,10 +4922,12 @@ const FeatureEntry::FeatureVariation kNt
@@ -4993,10 +4993,12 @@ const FeatureEntry::FeatureVariation kSe
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

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

@@ -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"
@@ -392,10 +393,10 @@ void AddAdditionalRequestHeaders(
@@ -398,10 +399,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
@@ -44,7 +44,7 @@
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -135,6 +135,7 @@
@@ -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"
@@ -52,7 +52,7 @@
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
@@ -4523,10 +4524,13 @@ void RenderFrameImpl::FinalizeRequestInt
@@ -4522,10 +4523,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());

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

@@ -19,9 +19,9 @@
+BASE_FEATURE(kSetIpv6ProbeFalse, "SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT);
+
BASE_FEATURE(AlpsForHttp2, base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kAlpsForHttp2, base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(AvoidH2Reprioritization, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kAvoidH2Reprioritization, base::FEATURE_DISABLED_BY_DEFAULT);
--- a/net/base/features.h
+++ b/net/base/features.h
@@ -21,6 +21,8 @@
@@ -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.");
@@ -1496,33 +1491,10 @@ int HostResolverManager::StartIPv6Reacha
@@ -1493,33 +1488,10 @@ int HostResolverManager::StartIPv6Reacha
return OK;
}
@@ -68,7 +68,7 @@
- base::BindOnce(&HostResolverManager::FinishIPv6ReachabilityCheck,
- weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
- if (rv != ERR_IO_PENDING) {
- SetLastIPv6ProbeResult((rv == OK) ? true : false);
- SetLastIPv6ProbeResult(rv == OK);
- rv = OK;
- }
- cached = false;

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

@@ -334,7 +334,7 @@
void ReloadIcon(size_t index);
--- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
+++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
@@ -49,6 +49,7 @@ namespace {
@@ -51,6 +51,7 @@ namespace {
const char kSearchEngineField[] = "searchEngine";
const char kKeywordField[] = "keyword";
const char kQueryUrlField[] = "queryUrl";
@@ -342,7 +342,7 @@
// Dummy number used for indicating that a new search engine is added.
const int kNewSearchEngineIndex = -1;
@@ -255,6 +256,8 @@ base::Value::Dict SearchEnginesHandler::
@@ -257,6 +258,8 @@ base::Value::Dict SearchEnginesHandler::
Profile* profile = Profile::FromWebUI(web_ui());
dict.Set("url",
template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
@@ -351,7 +351,7 @@
dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
(template_url->starter_pack_id() > 0)));
GURL icon_url = template_url->favicon_url();
@@ -418,12 +421,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -423,12 +426,14 @@ void SearchEnginesHandler::HandleSearchE
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
const std::u16string& keyword,
@@ -369,7 +369,7 @@
}
edit_controller_.reset();
@@ -453,6 +458,8 @@ bool SearchEnginesHandler::CheckFieldVal
@@ -458,6 +463,8 @@ bool SearchEnginesHandler::CheckFieldVal
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
} else if (field_name.compare(kQueryUrlField) == 0) {
is_valid = edit_controller_->IsURLValid(field_value);
@@ -378,7 +378,7 @@
} else {
NOTREACHED();
}
@@ -475,18 +482,21 @@ void SearchEnginesHandler::HandleSearchE
@@ -480,18 +487,21 @@ void SearchEnginesHandler::HandleSearchE
return;
}

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
@@ -4918,7 +4918,13 @@ const FeatureEntry::FeatureVariation kNt
@@ -4989,7 +4989,13 @@ const FeatureEntry::FeatureVariation kSe
// 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
@@ -133,7 +133,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -137,7 +137,7 @@ void RegisterBrowserUserPrefs(user_prefs
false);
#endif
registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,

2
patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch
View File

@@ -29,7 +29,7 @@
--- a/components/omnibox/browser/featured_search_provider.cc
+++ b/components/omnibox/browser/featured_search_provider.cc
@@ -290,20 +290,10 @@ void FeaturedSearchProvider::AddFeatured
@@ -294,20 +294,10 @@ void FeaturedSearchProvider::AddFeatured
for (TemplateURL* turl : turls) {
if (turl->starter_pack_id() > 0 &&
turl->is_active() == TemplateURLData::ActiveStatus::kTrue) {

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

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

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

@@ -1,6 +1,6 @@
--- a/components/download/public/common/download_features.cc
+++ b/components/download/public/common/download_features.cc
@@ -44,7 +44,7 @@ BASE_FEATURE(kRefreshExpirationDate,
@@ -38,7 +38,7 @@ BASE_FEATURE(kRefreshExpirationDate, bas
BASE_FEATURE(kDisplayInitiatorOrigin,
"DownloadsDisplayInitiatorOrigin",
@@ -8,4 +8,4 @@
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kDownloadNotificationServiceUnifiedAPI,
"DownloadNotificationServiceUnifiedAPI",
#if BUILDFLAG(IS_ANDROID)

4
patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch
View File

@@ -1,9 +1,9 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -60,7 +60,7 @@ BASE_FEATURE(kBookmarkTriggerForPrefetch
@@ -49,7 +49,7 @@ BASE_FEATURE(kBookmarkTriggerForPrefetch
// On builds where CT is enabled, this flag is also used as an emergency kill
// switch.
BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling,
"CertificateTransparencyAskBeforeEnabling",
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#if true
base::FEATURE_ENABLED_BY_DEFAULT);

6
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
@@ -629,11 +629,6 @@ int GetContentRestrictions(const Browser
@@ -628,11 +628,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;
}
@@ -1992,8 +1987,7 @@ bool CanSavePage(const Browser* browser)
@@ -2007,8 +2002,7 @@ bool CanSavePage(const Browser* browser)
policy::DownloadRestriction::ALL_FILES) {
return false;
}
@@ -62,7 +62,7 @@
// These lists are lazily initialized below and are leaked on shutdown to
--- a/content/public/common/url_utils.cc
+++ b/content/public/common/url_utils.cc
@@ -33,11 +33,7 @@ bool HasWebUIOrigin(const url::Origin& o
@@ -41,11 +41,7 @@ bool HasWebUIOrigin(const url::Origin& o
}
bool IsSavableURL(const GURL& url) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -304,12 +304,10 @@ TabStripRegionView::TabStripRegionView(s
@@ -302,12 +302,10 @@ TabStripRegionView::TabStripRegionView(s
new_tab_button_->GetViewAccessibility().SetName(
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
@@ -15,7 +15,7 @@
reserved_grab_handle_space_ =
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2269,8 +2269,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2274,8 +2274,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 "
@@ -2281,7 +2279,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2286,7 +2284,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}

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

@@ -2,12 +2,12 @@
#
--- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc
@@ -291,7 +291,7 @@ BASE_FEATURE(kOmniboxSiteSearch, "Omnibo
@@ -261,7 +261,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
BASE_FEATURE(kOmniboxSiteSearch, DISABLED);
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",
- enable_if(!IS_ANDROID && !IS_IOS));
+ base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(kStarterPackExpansion, enable_if(!IS_ANDROID && !IS_IOS));
+BASE_FEATURE(kStarterPackExpansion, base::FEATURE_DISABLED_BY_DEFAULT);
// Enables an informational IPH message at the bottom of the Omnibox directing
// users to certain starter pack engines.

101
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
@@ -401,13 +401,13 @@ Chromium understands forms better and ca
@@ -359,13 +359,13 @@ Chromium understands forms better and ca
<!-- 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
@@ -1067,7 +1067,7 @@
@@ -1075,7 +1075,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
@@ -1091,7 +1091,7 @@
@@ -1099,7 +1099,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
@@ -1103,7 +1103,7 @@
@@ -1111,7 +1111,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.">
@@ -154,9 +154,9 @@
}
declare global {
--- a/chrome/browser/resources/history/side_bar.html
+++ b/chrome/browser/resources/history/side_bar.html
@@ -11,13 +11,6 @@
--- a/chrome/browser/resources/history/side_bar.html.ts
+++ b/chrome/browser/resources/history/side_bar.html.ts
@@ -22,13 +22,6 @@ export function getHtml(this: HistorySid
$i18n{historyMenuItem}
<cr-ripple></cr-ripple>
</a>
@@ -282,7 +282,7 @@
<settings-toggle-button id="spellCheckControl"
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -199,10 +199,6 @@ export class SettingsPersonalizationOpti
@@ -205,10 +205,6 @@ export class SettingsPersonalizationOpti
'chrome-signin-user-choice-info-change',
this.setChromeSigninUserChoiceInfo_.bind(this));
// </if>
@@ -295,25 +295,25 @@
// <if expr="is_chromeos">
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -39,15 +39,6 @@
label="$i18n{clearBrowsingData}"
sub-label="$i18n{clearBrowsingDataDescription}"
on-click="onClearBrowsingDataClick_"></cr-link-row>
- <template is="dom-if" if="[[isPrivacyGuideAvailable]]">
- <cr-link-row id="privacyGuideLinkRow" class="hr"
- start-icon="privacy20:signpost"
- label="$i18n{privacyGuideLabel}"
- sub-label="$i18n{privacyGuideSublabel}"
- on-click="onPrivacyGuideClick_"
- role-description="$i18n{subpageArrowRoleDescription}">
- </cr-link-row>
- </template>
<cr-link-row id="thirdPartyCookiesLinkRow"
start-icon="privacy:cookie"
class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
@@ -23,15 +23,6 @@
label="$i18n{clearBrowsingData}"
sub-label="$i18n{clearBrowsingDataDescription}"
on-click="onClearBrowsingDataClick_"></cr-link-row>
- <template is="dom-if" if="[[isPrivacyGuideAvailable]]">
- <cr-link-row id="privacyGuideLinkRow" class="hr"
- start-icon="privacy20:signpost"
- label="$i18n{privacyGuideLabel}"
- sub-label="$i18n{privacyGuideSublabel}"
- on-click="onPrivacyGuideClick_"
- role-description="$i18n{subpageArrowRoleDescription}">
- </cr-link-row>
- </template>
<cr-link-row id="thirdPartyCookiesLinkRow"
start-icon="privacy:cookie"
class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
@@ -8,7 +8,6 @@ import '../basic_page/basic_page.js';
@@ -7,7 +7,6 @@ import '/shared/settings/prefs/prefs.js'
import '../safety_hub/safety_hub_entry_point.js';
import '../settings_page/settings_section.js';
import '../settings_shared.css.js';
@@ -321,9 +321,9 @@
import './privacy_page.js';
import {PrefsMixin} from '/shared/settings/prefs/prefs_mixin.js';
@@ -158,13 +157,6 @@ export class SettingsPrivacyPageIndexEle
@@ -248,13 +247,6 @@ export class SettingsPrivacyPageIndexEle
private getDefaultViews_(): string[] {
const defaultViews = ['old'];
const defaultViews = ['privacy'];
- if (this.isPrivacyGuideAvailable) {
- defaultViews.push('privacyGuidePromo');
@@ -335,17 +335,29 @@
return defaultViews;
}
@@ -335,7 +327,6 @@ export class SettingsPrivacyPageIndexEle
@@ -386,19 +378,7 @@ export class SettingsPrivacyPageIndexEle
}
private updatePrivacyGuidePromoVisibility_() {
- if (!this.isPrivacyGuideAvailable || this.prefs === undefined ||
- this.getPref('privacy_guide.viewed').value ||
- this.privacyGuideBrowserProxy_.getPromoImpressionCount() >=
- MAX_PRIVACY_GUIDE_PROMO_IMPRESSION ||
- this.currentRoute !== routes.PRIVACY) {
this.showPrivacyGuidePromo_ = false;
return;
}
- return;
- }
- this.showPrivacyGuidePromo_ = true;
if (!this.privacyGuidePromoWasShown_) {
this.privacyGuideBrowserProxy_.incrementPromoImpressionCount();
this.privacyGuidePromoWasShown_ = true;
- if (!this.privacyGuidePromoWasShown_) {
- this.privacyGuideBrowserProxy_.incrementPromoImpressionCount();
- this.privacyGuidePromoWasShown_ = true;
- }
}
}
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -113,13 +113,6 @@
@@ -115,13 +115,6 @@
<div class="cr-row first">
<h2 class="cr-title-text">$i18n{advancedPageTitle}</h2>
</div>
@@ -359,7 +371,7 @@
<template is="dom-if" if="[[!enableHttpsFirstModeNewSettings_]]" restamp>
<settings-toggle-button id="httpsOnlyModeToggle"
pref="{{prefs.generated.https_first_mode_enabled}}"
@@ -170,9 +163,3 @@
@@ -172,10 +165,4 @@
on-click="onManageCertificatesClick_" external>
</cr-link-row>
@@ -369,6 +381,7 @@
- on-click="onAdvancedProtectionProgramLinkClick_"
- external>
- </cr-link-row>
</settings-subpage>
--- a/chrome/browser/resources/settings/search_page/search_page.html
+++ b/chrome/browser/resources/settings/search_page/search_page.html
@@ -42,12 +42,6 @@
@@ -397,7 +410,7 @@
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
--- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
@@ -369,7 +369,6 @@ void RecentTabsSubMenuModel::Build() {
@@ -373,7 +373,6 @@ void RecentTabsSubMenuModel::Build() {
AddSeparator(ui::NORMAL_SEPARATOR);
history_separator_index_ = GetItemCount() - 1;
BuildLocalEntries();
@@ -407,7 +420,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -960,16 +960,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -965,16 +965,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -496,7 +509,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
@@ -972,40 +972,20 @@ void AddPerformanceStrings(content::WebU
@@ -979,40 +979,20 @@ void AddPerformanceStrings(content::WebU
IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
{"performanceInterventionEnabledLabel",
IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
@@ -546,7 +559,7 @@
html_source->AddString(
"tabDiscardTimerFiveMinutes",
@@ -1051,11 +1031,6 @@ void AddPerformanceStrings(content::WebU
@@ -1058,11 +1038,6 @@ void AddPerformanceStrings(content::WebU
base::NumberToString16(
performance_manager::user_tuning::BatterySaverModeManager::
kLowBatteryThresholdPercent)));
@@ -560,7 +573,7 @@
chrome::kDiscardRingTreatmentLearnMoreUrl);
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -576,27 +576,20 @@ SettingsUI::SettingsUI(content::WebUI* w
@@ -590,27 +590,20 @@ SettingsUI::SettingsUI(content::WebUI* w
->UserIsActivePasswordChangeUser()},
};
@@ -594,12 +607,12 @@
html_source->AddBoolean(
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -773,7 +773,7 @@ BASE_FEATURE(OnDeviceWebSpeech,
);
@@ -787,7 +787,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
BASE_FEATURE(kOnDeviceWebSpeechGeminiNano, base::FEATURE_DISABLED_BY_DEFAULT);
// Enables the Live Caption feature on supported devices.
-BASE_FEATURE(LiveCaption, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(LiveCaption, base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(kLiveCaption, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kLiveCaption, base::FEATURE_DISABLED_BY_DEFAULT);
// Logs a DumpWithoutCrashing() call each time the Speech On-Device API (SODA)
// fails to load. Used to diagnose issues when rolling out new versions of the

6
patches/helium/core/add-component-l10n-support.patch
View File

@@ -51,7 +51,7 @@
namespace errors = extensions::manifest_errors;
namespace keys = extensions::manifest_keys;
@@ -113,6 +118,19 @@ std::optional<base::Value::Dict> LoadMes
@@ -114,6 +119,19 @@ std::optional<base::Value::Dict> LoadMes
return dictionary;
}
@@ -71,7 +71,7 @@
// Localizes manifest value of string type for a given key.
bool LocalizeManifestValue(const std::string& key,
const extensions::MessageBundle& messages,
@@ -360,13 +378,16 @@ bool LocalizeManifest(const extensions::
@@ -361,13 +379,16 @@ bool LocalizeManifest(const extensions::
bool LocalizeExtension(const base::FilePath& extension_path,
base::Value::Dict* manifest,
GzippedMessagesPermission gzip_permission,
@@ -90,7 +90,7 @@
gzip_permission, error));
if (!message_bundle && !error->empty())
@@ -504,6 +525,42 @@ extensions::MessageBundle* LoadMessageCa
@@ -505,6 +526,42 @@ extensions::MessageBundle* LoadMessageCa
return extensions::MessageBundle::Create(catalogs, error);
}

6
patches/helium/core/add-component-managed-schema-support.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
+++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
@@ -94,9 +94,11 @@ class ManagedValueStoreCache::ExtensionT
@@ -97,9 +97,11 @@ class ManagedValueStoreCache::ExtensionT
// Loads the schemas of the |extensions| and passes a ComponentMap to
// Register().
@@ -13,7 +13,7 @@
raw_ptr<Profile> profile_;
policy::PolicyDomain policy_domain_;
@@ -175,6 +177,22 @@ bool ManagedValueStoreCache::ExtensionTr
@@ -178,6 +180,22 @@ bool ManagedValueStoreCache::ExtensionTr
return extension->manifest()->FindPath(manifest_keys::kStorageManagedSchema);
}
@@ -36,7 +36,7 @@
// static
void ManagedValueStoreCache::ExtensionTracker::LoadSchemasOnFileTaskRunner(
ExtensionSet extensions,
@@ -199,14 +217,21 @@ void ManagedValueStoreCache::ExtensionTr
@@ -202,14 +220,21 @@ void ManagedValueStoreCache::ExtensionTr
content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE, base::BindOnce(&ExtensionTracker::Register, self,

16
patches/helium/core/add-default-browser-reject-button.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -1416,6 +1416,11 @@ inline constexpr char kExtensionCommands
@@ -1407,6 +1407,11 @@ inline constexpr char kExtensionCommands
inline constexpr char kPluginsAlwaysOpenPdfExternally[] =
"plugins.always_open_pdf_externally";
@@ -25,7 +25,7 @@
registry->RegisterIntegerPref(prefs::kPdfInfoBarTimesShown, 0);
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -208,6 +208,11 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -211,6 +211,11 @@ void AddInfoBarsIfNecessary(BrowserWindo
return;
}
@@ -39,9 +39,9 @@
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
--- a/components/infobars/core/confirm_infobar_delegate.h
+++ b/components/infobars/core/confirm_infobar_delegate.h
@@ -81,6 +81,8 @@ class ConfirmInfoBarDelegate : public in
// custom layout to show the link text before the button.
virtual bool ShouldShowLinkBeforeButton() const;
@@ -84,6 +84,8 @@ class ConfirmInfoBarDelegate : public in
// on the infobar.
virtual int GetLinkSpacingWhenPositionedBeforeButton() const;
+ virtual bool OkButtonShouldAlwaysLead() const;
+
@@ -50,8 +50,8 @@
// Defaults to true.
--- a/components/infobars/core/confirm_infobar_delegate.cc
+++ b/components/infobars/core/confirm_infobar_delegate.cc
@@ -67,6 +67,10 @@ bool ConfirmInfoBarDelegate::ShouldShowL
return false;
@@ -71,6 +71,10 @@ int ConfirmInfoBarDelegate::GetLinkSpaci
return 0;
}
+bool ConfirmInfoBarDelegate::OkButtonShouldAlwaysLead() const {
@@ -119,7 +119,7 @@
raw_ptr<Profile> profile_;
--- a/chrome/browser/ui/views/infobars/confirm_infobar.cc
+++ b/chrome/browser/ui/views/infobars/confirm_infobar.cc
@@ -123,7 +123,9 @@ void ConfirmInfoBar::Layout(PassKey) {
@@ -126,7 +126,9 @@ void ConfirmInfoBar::Layout(PassKey) {
}
if constexpr (!views::PlatformStyle::kIsOkButtonLeading) {

2
patches/helium/core/add-disable-ech-flag.patch
View File

@@ -31,7 +31,7 @@
#include "base/containers/to_vector.h"
#include "base/feature_list.h"
#include "base/functional/bind.h"
@@ -249,6 +250,10 @@ network::mojom::SSLConfigPtr SSLConfigSe
@@ -263,6 +264,10 @@ network::mojom::SSLConfigPtr SSLConfigSe
config->ech_enabled = ech_enabled_.GetValue();

2
patches/helium/core/add-helium-versioning.patch
View File

@@ -162,7 +162,7 @@
background-color: var(--background-color);
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -358,15 +358,15 @@ bool HandleCreditsSwitch(const base::Com
@@ -367,15 +367,15 @@ bool HandleCreditsSwitch(const base::Com
bool HandleVersionSwitches(const base::CommandLine& command_line) {
#if !BUILDFLAG(IS_MAC)
if (command_line.HasSwitch(switches::kProductVersion)) {

2
patches/helium/core/add-middle-click-autoscroll-flag.patch
View File

@@ -49,7 +49,7 @@
BASE_FEATURE(kRemoveClientHints, "RemoveClientHints", base::FEATURE_DISABLED_BY_DEFAULT);
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -1902,9 +1902,9 @@ void WebView::ApplyWebPreferences(const
@@ -1905,9 +1905,9 @@ void WebView::ApplyWebPreferences(const
prefs.default_maximum_page_scale_factor);
#endif

28
patches/helium/core/add-native-bangs.patch
View File

@@ -678,7 +678,7 @@
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -1685,6 +1685,8 @@ bool TemplateURL::IsBetterThanConflictin
@@ -1693,6 +1693,8 @@ bool TemplateURL::IsBetterThanConflictin
: base::Time(),
// Prefer engines that CANNOT be auto-replaced.
!engine->safe_for_autoreplace(),
@@ -689,7 +689,7 @@
// Favor prepopulated engines over other auto-generated engines.
--- a/components/search_engines/template_url.h
+++ b/components/search_engines/template_url.h
@@ -842,6 +842,8 @@ class TemplateURL {
@@ -847,6 +847,8 @@ class TemplateURL {
starter_pack_id() == template_url_starter_pack_data::kAiMode;
}
@@ -724,7 +724,7 @@
COMPONENT_EXPORT(HELIUM) GURL GetDummyURL();
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -1959,6 +1959,9 @@ void AddPrivacyStrings(content::WebUIDat
@@ -1973,6 +1973,9 @@ void AddPrivacyStrings(content::WebUIDat
{"heliumServicesToggle", IDS_SETTINGS_HELIUM_SERVICES_TOGGLE},
{"heliumServicesToggleDescription",
IDS_SETTINGS_HELIUM_SERVICES_TOGGLE_DESCRIPTION},
@@ -736,7 +736,7 @@
{"heliumExtProxyToggleDescription",
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1937,6 +1937,12 @@
@@ -1945,6 +1945,12 @@
<message name="IDS_SETTINGS_HELIUM_SERVICES_EXT_PROXY_TOGGLE_DESCRIPTION" desc="Description of the toggle for enabling/disabling of downloading and proxying extensions">
When enabled, Helium will proxy extension downloads and updates to protect your privacy. When disabled, downloading and updating extensions will not work.
</message>
@@ -751,7 +751,7 @@
</message>
--- a/chrome/browser/resources/settings/privacy_page/services_page.html
+++ b/chrome/browser/resources/settings/privacy_page/services_page.html
@@ -49,6 +49,11 @@
@@ -50,6 +50,11 @@
label="$i18n{heliumExtProxyToggle}"
sub-label="$i18n{heliumExtProxyToggleDescription}">
</settings-toggle-button>
@@ -765,7 +765,7 @@
</template>
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -204,6 +204,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -208,6 +208,7 @@ void RegisterBrowserUserPrefs(user_prefs
{
registry->RegisterBooleanPref(prefs::kHeliumServicesEnabled, true);
@@ -775,7 +775,7 @@
registry->RegisterBooleanPref(prefs::kHeliumDidOnboarding, false);
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -356,6 +356,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -357,6 +357,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::prefs::kHeliumExtProxyEnabled] =
settings_api::PrefType::kBoolean;
@@ -796,9 +796,9 @@
} // namespace prefs
#endif // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_
--- a/components/omnibox/browser/omnibox_edit_model.cc
+++ b/components/omnibox/browser/omnibox_edit_model.cc
@@ -826,6 +826,17 @@ bool OmniboxEditModel::AcceptKeyword(
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -840,6 +840,17 @@ bool OmniboxEditModel::AcceptKeyword(
controller_->StopAutocomplete(/*clear_result=*/false);
@@ -816,7 +816,7 @@
is_keyword_hint_ = false;
keyword_mode_entry_method_ = entry_method;
if (original_user_text_with_keyword_.empty()) {
@@ -868,9 +879,6 @@ bool OmniboxEditModel::AcceptKeyword(
@@ -882,9 +893,6 @@ bool OmniboxEditModel::AcceptKeyword(
}
base::RecordAction(base::UserMetricsAction("AcceptedKeywordHint"));
@@ -826,7 +826,7 @@
EmitEnteredKeywordModeHistogram(entry_method, turl, !user_text_.empty());
return true;
}
@@ -1522,7 +1530,13 @@ void OmniboxEditModel::InternalSetUserTe
@@ -1543,7 +1551,13 @@ void OmniboxEditModel::InternalSetUserTe
std::u16string OmniboxEditModel::MaybeStripKeyword(
const std::u16string& text) const {
@@ -841,9 +841,9 @@
? AutocompleteInput::SplitReplacementStringFromInput(text, false)
: text;
}
@@ -2780,10 +2794,12 @@ bool OmniboxEditModel::MaybeAcceptKeywor
if (!AllowKeywordSpaceTriggering())
@@ -2756,10 +2770,12 @@ bool OmniboxEditModel::MaybeAcceptKeywor
return false;
}
+ std::u16string new_keyword = base::ToLowerASCII(
+ AutocompleteInput::SplitKeywordFromInput(new_text, false, nullptr));

2
patches/helium/core/add-update-channel-flag.patch
View File

@@ -90,7 +90,7 @@
"Configures the frame rate the browser is throttled to when Energy Saver is enabled. Helium flag.",
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -300,6 +300,8 @@ static_library("browser") {
@@ -264,6 +264,8 @@ static_library("browser") {
"btm/btm_browser_signin_detector_factory.h",
"btm/stateful_bounce_counter.cc",
"btm/stateful_bounce_counter.h",

10
patches/helium/core/add-updater-preference.patch
View File

@@ -86,7 +86,7 @@ TODO: guard services_page.html with is_mac
registrar.Add(prefs::kHeliumServicesEnabled, observer);
--- a/chrome/browser/resources/settings/privacy_page/services_page.html
+++ b/chrome/browser/resources/settings/privacy_page/services_page.html
@@ -61,6 +61,13 @@
@@ -62,6 +62,13 @@
sub-label="$i18n{heliumSpellcheckToggleDescription}">
</settings-toggle-button>
</if>
@@ -102,7 +102,7 @@ TODO: guard services_page.html with is_mac
</template>
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -1969,6 +1969,10 @@ void AddPrivacyStrings(content::WebUIDat
@@ -1983,6 +1983,10 @@ void AddPrivacyStrings(content::WebUIDat
IDS_SETTINGS_HELIUM_SERVICES_EXT_PROXY_TOGGLE},
{"heliumExtProxyToggleDescription",
IDS_SETTINGS_HELIUM_SERVICES_EXT_PROXY_TOGGLE_DESCRIPTION},
@@ -115,7 +115,7 @@ TODO: guard services_page.html with is_mac
IDS_SETTINGS_HELIUM_SERVICES_OVERRIDE_DESCRIPTION},
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -366,6 +366,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -367,6 +367,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::prefs::kHeliumSpellcheckEnabled] =
settings_api::PrefType::kBoolean;
@@ -126,7 +126,7 @@ TODO: guard services_page.html with is_mac
(*s_allowlist)[::prefs::kHeliumServicesConsented] =
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -215,6 +215,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -219,6 +219,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kHeliumServicesOrigin, "");
registry->RegisterBooleanPref(prefs::kHeliumDidOnboarding, false);
registry->RegisterBooleanPref(prefs::kHeliumServicesConsented, false);
@@ -136,7 +136,7 @@ TODO: guard services_page.html with is_mac
registry->RegisterBooleanPref(
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1949,6 +1949,12 @@
@@ -1957,6 +1957,12 @@
<message name="IDS_SETTINGS_HELIUM_SERVICES_SPELLCHECK_TOGGLE_DESCRIPTION" desc="Description of the for enabling/disabling of downloading spellcheck files">
Helium will fetch dictionary files used for spell checking when requested. When disabled, spell checking will not work.
</message>

14
patches/helium/core/clean-context-menu.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1106,11 +1106,6 @@ void RenderViewContextMenu::InitMenu() {
@@ -1127,11 +1127,6 @@ void RenderViewContextMenu::InitMenu() {
AppendSpellingAndSearchSuggestionItems();
}
@@ -12,7 +12,7 @@
if (editable) {
AppendOtherEditableItems();
}
@@ -2166,7 +2161,6 @@ void RenderViewContextMenu::AppendPageIt
@@ -2214,7 +2209,6 @@ void RenderViewContextMenu::AppendPageIt
IDS_CONTENT_CONTEXT_SAVEPAGEAS);
menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
AppendLiveCaptionItem();
@@ -20,9 +20,9 @@
if (IsRegionSearchEnabled()) {
AppendRegionSearchItem();
}
@@ -2295,8 +2289,7 @@ void RenderViewContextMenu::AppendMediaR
@@ -2343,8 +2337,7 @@ void RenderViewContextMenu::AppendMediaR
void RenderViewContextMenu::AppendReadingModeItem() {
void RenderViewContextMenu::AppendReadAnythingItem() {
// Show Read Anything option if it's not already open in the side panel.
- if (GetBrowser() && GetBrowser()->is_type_normal() &&
- !IsReadAnythingEntryShowing(GetBrowser())) {
@@ -30,7 +30,7 @@
menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPEN_IN_READING_MODE,
IDS_CONTENT_CONTEXT_READING_MODE);
}
@@ -3567,10 +3560,12 @@ void RenderViewContextMenu::ExecuteComma
@@ -3620,10 +3613,12 @@ void RenderViewContextMenu::ExecuteComma
}
void RenderViewContextMenu::AddSpellCheckServiceItem(bool is_checked) {
@@ -43,7 +43,7 @@
if (is_checked) {
menu_model_.AddCheckItemWithStringId(
IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE,
@@ -3947,6 +3942,8 @@ bool RenderViewContextMenu::IsVideoFrame
@@ -4000,6 +3995,8 @@ bool RenderViewContextMenu::IsVideoFrame
bool RenderViewContextMenu::AppendQRCodeGeneratorItem(bool for_image,
bool draw_icon,
bool add_separator) {
@@ -54,7 +54,7 @@
}
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
@@ -308,6 +308,7 @@ void BrowserTabStripModelDelegate::AddTo
@@ -310,6 +310,7 @@ void BrowserTabStripModelDelegate::AddTo
}
bool BrowserTabStripModelDelegate::SupportsReadLater() {

20
patches/helium/core/disable-ad-topics-and-etc.patch
View File

@@ -1,20 +1,20 @@
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -490,7 +490,7 @@ BASE_FEATURE(kUpdateRequestForCorsRedire
@@ -421,7 +421,7 @@ BASE_FEATURE(kUpdateRequestForCorsRedire
// https://github.com/patcg-individual-drafts/topics
// Kill switch for the Topics API.
BASE_FEATURE(kBrowsingTopics,
"BrowsingTopics",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(kBrowsingTopics, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kBrowsingTopics, base::FEATURE_DISABLED_BY_DEFAULT);
// Enable the shared storage API. Note that enabling this feature does not
// automatically expose this API to the web, it only allows the element to be
@@ -574,7 +574,7 @@ BASE_FEATURE(kSharedStorageTransactional
@@ -500,7 +500,7 @@ BASE_FEATURE(kSharedStorageTransactional
// Kill switch for the Interest Group API, i.e. if disabled, the
// API exposure will be disabled regardless of the OT config.
BASE_FEATURE(kInterestGroupStorage,
"InterestGroupStorage",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(kInterestGroupStorage, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kInterestGroupStorage, base::FEATURE_DISABLED_BY_DEFAULT);
// TODO(crbug.com/40176812): Adjust these limits in response to usage.
BASE_FEATURE_PARAM(int,
kInterestGroupStorageMaxOwners,

2
patches/helium/core/disable-fedcm-bubble.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc
+++ b/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc
@@ -1279,6 +1279,9 @@ gfx::Rect FedCmAccountSelectionView::Get
@@ -1272,6 +1272,9 @@ gfx::Rect FedCmAccountSelectionView::Get
void FedCmAccountSelectionView::ShouldShowDialog(bool& should_show) {
if (dialog_type_ == DialogType::BUBBLE) {

2
patches/helium/core/disable-live-caption-completely.patch
View File

@@ -1,6 +1,6 @@
--- a/components/live_caption/caption_util.cc
+++ b/components/live_caption/caption_util.cc
@@ -127,6 +127,7 @@ std::optional<ui::CaptionStyle> GetCapti
@@ -125,6 +125,7 @@ std::optional<ui::CaptionStyle> GetCapti
}
bool IsLiveCaptionFeatureSupported() {

2
patches/helium/core/disable-touch-ui.patch
View File

@@ -1,6 +1,6 @@
--- a/ui/base/pointer/touch_ui_controller.cc
+++ b/ui/base/pointer/touch_ui_controller.cc
@@ -175,13 +175,7 @@ void TouchUiController::TouchUiScoperFor
@@ -177,13 +177,7 @@ void TouchUiController::TouchUiScoperFor
// static
TouchUiController* TouchUiController::Get() {
static base::NoDestructor<TouchUiController> instance([] {

14
patches/helium/core/disable-update-toast.patch
View File

@@ -1,11 +1,11 @@
--- a/chrome/browser/ui/ui_features.cc
+++ b/chrome/browser/ui/ui_features.cc
@@ -724,7 +724,7 @@ bool HasTabSearchToolbarButton() {
@@ -627,7 +627,7 @@ bool HasTabSearchToolbarButton() {
return is_tab_search_moving;
}
BASE_FEATURE(kNonMilestoneUpdateToast,
"NonMilestoneUpdateToast",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(kNonMilestoneUpdateToast, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kNonMilestoneUpdateToast, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kBookmarkTabGroupConversion, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kBookmarkTabGroupConversion,
"BookmarkTabGroupConversion",

13
patches/helium/core/enable-parallel-downloading.patch
View File

@@ -1,14 +1,17 @@
--- a/components/download/public/common/download_features.cc
+++ b/components/download/public/common/download_features.cc
@@ -11,11 +11,7 @@ namespace features {
@@ -9,13 +9,7 @@
namespace download {
namespace features {
BASE_FEATURE(kParallelDownloading,
"ParallelDownloading",
-BASE_FEATURE(kParallelDownloading,
-#if BUILDFLAG(IS_ANDROID)
base::FEATURE_ENABLED_BY_DEFAULT
- base::FEATURE_ENABLED_BY_DEFAULT
-#else
- base::FEATURE_DISABLED_BY_DEFAULT
-#endif
);
-);
+BASE_FEATURE(kParallelDownloading, base::FEATURE_ENABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
BASE_FEATURE(kBackoffInDownloading, base::FEATURE_DISABLED_BY_DEFAULT);

13
patches/helium/core/enable-tab-hover-cards.patch
View File

@@ -1,16 +1,17 @@
--- a/chrome/browser/ui/ui_features.cc
+++ b/chrome/browser/ui/ui_features.cc
@@ -317,12 +317,7 @@ BASE_FEATURE(kTabGroupMenuMoreEntryPoint
@@ -285,13 +285,7 @@ bool IsTabGroupMenuMoreEntryPointsEnable
// Enables preview images in tab-hover cards.
// https://crbug.com/928954
BASE_FEATURE(kTabHoverCardImages,
"TabHoverCardImages",
-BASE_FEATURE(kTabHoverCardImages,
-#if BUILDFLAG(IS_MAC)
- base::FEATURE_DISABLED_BY_DEFAULT
-#else
- base::FEATURE_ENABLED_BY_DEFAULT
-#endif
-);
+ base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kTabHoverCardImages, base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kTabGroupHoverCards, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kTabModalUsesDesktopWidget,
"TabModalUsesDesktopWidget",

12
patches/helium/core/enable-tab-search-toolbar-button.patch
View File

@@ -23,16 +23,16 @@
if (tab_search_action.has_value()) {
--- a/chrome/browser/ui/ui_features.cc
+++ b/chrome/browser/ui/ui_features.cc
@@ -671,7 +671,7 @@ BASE_FEATURE(kTabStripBrowserApi,
@@ -577,7 +577,7 @@ BASE_FEATURE(kByDateHistoryInSidePanel,
BASE_FEATURE(kTabstripComboButton,
"TabstripComboButton",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kTabStripBrowserApi, base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(kTabstripComboButton, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kTabstripComboButton, base::FEATURE_ENABLED_BY_DEFAULT);
// This serves as a "kill-switch" for migrating the Tab Search feature to be a
// toolbar button for non-ChromeOS users in the US.
@@ -707,6 +707,8 @@ bool HasTabSearchToolbarButton() {
@@ -612,6 +612,8 @@ bool HasTabSearchToolbarButton() {
return false;
}

6
patches/helium/core/exclude-irrelevant-flags.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -13311,11 +13311,278 @@ const FeatureEntry kFeatureEntries[] = {
@@ -13399,11 +13399,278 @@ const FeatureEntry kFeatureEntries[] = {
// AboutFlagsHistogramTest unit test to verify this process).
};
@@ -280,7 +280,7 @@
FlagsStateSingleton(const FlagsStateSingleton&) = delete;
FlagsStateSingleton& operator=(const FlagsStateSingleton&) = delete;
~FlagsStateSingleton() override = default;
@@ -13334,7 +13601,7 @@ class FlagsStateSingleton : public flags
@@ -13422,7 +13689,7 @@ class FlagsStateSingleton : public flags
void RestoreDefaultState() {
flags_state_ =
@@ -289,7 +289,7 @@
}
private:
@@ -13659,7 +13926,7 @@ base::span<const FeatureEntry> GetFeatur
@@ -13747,7 +14014,7 @@ base::span<const FeatureEntry> GetFeatur
!entries_for_testing->empty()) {
return *entries_for_testing;
}

2
patches/helium/core/flags-setup.patch
View File

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

8
patches/helium/core/hide-avatar-via-toolbar-prefs.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -229,6 +229,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -230,6 +230,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
(*s_allowlist)[::prefs::kSplitViewDragAndDropEnabled] =
settings_api::PrefType::kBoolean;
@@ -13,7 +13,7 @@
(*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
--- a/chrome/browser/ui/actions/chrome_action_id.h
+++ b/chrome/browser/ui/actions/chrome_action_id.h
@@ -554,6 +554,7 @@
@@ -558,6 +558,7 @@
#define TOOLBAR_PINNABLE_ACTION_IDS \
E(kActionHome, IDC_HOME) \
E(kActionForward, IDC_FORWARD) \
@@ -23,7 +23,7 @@
E(kActionShowPasswordManager, IDC_SHOW_PASSWORD_MANAGER) \
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -119,6 +119,9 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -123,6 +123,9 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
pref_registration_flags);
@@ -211,7 +211,7 @@
PrefService* prefs() const;
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -1341,6 +1341,10 @@ inline constexpr char kSplitViewDragAndD
@@ -1332,6 +1332,10 @@ inline constexpr char kSplitViewDragAndD
inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
"browser.split_view_drag_and_drop_nudge_used_count";

12
patches/helium/core/hide-extensions-via-toolbar-prefs.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -232,6 +232,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -233,6 +233,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
// Custom toolbar button settings.
(*s_allowlist)[::prefs::kShowAvatarButton] =
settings_api::PrefType::kBoolean;
@@ -11,7 +11,7 @@
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
--- a/chrome/browser/ui/actions/chrome_action_id.h
+++ b/chrome/browser/ui/actions/chrome_action_id.h
@@ -555,6 +555,7 @@
@@ -559,6 +559,7 @@
E(kActionHome, IDC_HOME) \
E(kActionForward, IDC_FORWARD) \
E(kActionAvatar, IDC_SHOW_AVATAR_MENU) \
@@ -21,7 +21,7 @@
E(kActionShowPasswordManager, IDC_SHOW_PASSWORD_MANAGER) \
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -121,6 +121,8 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -125,6 +125,8 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(
prefs::kShowAvatarButton, true);
@@ -56,7 +56,7 @@
void PinnedToolbarActionsModel::MaybeMigrateExistingPinnedStates() {
--- a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
+++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
@@ -553,7 +553,9 @@ void ExtensionsToolbarContainer::AnchorA
@@ -552,7 +552,9 @@ void ExtensionsToolbarContainer::AnchorA
// Fix the position of widgets. Without this fix, extension-installed-bubble
// and extension-uninstall-dialog may be out of the window border on Linux.
@@ -67,7 +67,7 @@
{
views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser_)
->toolbar_button_provider()->GetAppMenuButton();
@@ -977,7 +979,9 @@ void ExtensionsToolbarContainer::UpdateC
@@ -962,7 +964,9 @@ void ExtensionsToolbarContainer::UpdateC
}
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
@@ -221,7 +221,7 @@
PrefService* prefs() const;
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -1345,6 +1345,10 @@ inline constexpr char kSplitViewDragAndD
@@ -1336,6 +1336,10 @@ inline constexpr char kSplitViewDragAndD
// toolbar.
inline constexpr char kShowAvatarButton[] = "helium.browser.show_avatar_button";

2
patches/helium/core/increase-incognito-storage-quota.patch
View File

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/storage/browser/quota/quota_features.cc
+++ b/storage/browser/quota/quota_features.cc
@@ -43,7 +43,7 @@ BASE_FEATURE(kStaticStorageQuota,
@@ -39,7 +39,7 @@ BASE_FEATURE(kStaticStorageQuota, base::
BASE_FEATURE(kIncreaseIncognitoStorageQuota,
"IncreaseIncognitoStorageQuota",

10
patches/helium/core/infinite-tab-freezing.patch
View File

@@ -1,11 +1,11 @@
--- a/components/performance_manager/features.cc
+++ b/components/performance_manager/features.cc
@@ -248,7 +248,7 @@ BASE_FEATURE(kRecordFreezingEligibilityU
@@ -222,7 +222,7 @@ BASE_FEATURE(kFreezingFollowsDiscardOptO
BASE_FEATURE(kInfiniteTabsFreezing,
"InfiniteTabsFreezing",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kRecordFreezingEligibilityUKM, base::FEATURE_ENABLED_BY_DEFAULT);
-BASE_FEATURE(kInfiniteTabsFreezing, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kInfiniteTabsFreezing, base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE_PARAM(int,
kInfiniteTabsFreezing_NumProtectedTabs,

14
patches/helium/core/keyboard-shortcuts.patch
View File

@@ -15,7 +15,7 @@
#define IDC_VISIT_DESKTOP_OF_LRU_USER_5 34083
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -1509,6 +1509,11 @@ inline constexpr char kPageColorsBlockLi
@@ -1493,6 +1493,11 @@ inline constexpr char kPageColorsBlockLi
inline constexpr char kPrefersDefaultScrollbarStyles[] =
"settings.a11y.prefers_default_scrollbar_styles";
@@ -29,7 +29,7 @@
// asking the user to set up automatic updates when Keystone promotion is
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -142,6 +142,8 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -146,6 +146,8 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, false);
@@ -40,7 +40,7 @@
registry->RegisterBooleanPref(policy::policy_prefs::kHideWebStoreIcon, false);
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -387,7 +387,9 @@ bool BrowserCommandController::IsReserve
@@ -388,7 +388,9 @@ bool BrowserCommandController::IsReserve
command_id == IDC_NEW_INCOGNITO_WINDOW || command_id == IDC_NEW_TAB ||
command_id == IDC_NEW_WINDOW || command_id == IDC_RESTORE_TAB ||
command_id == IDC_SELECT_NEXT_TAB ||
@@ -51,7 +51,7 @@
}
void BrowserCommandController::TabStateChanged() {
@@ -1143,6 +1145,14 @@ bool BrowserCommandController::ExecuteCo
@@ -1160,6 +1162,14 @@ bool BrowserCommandController::ExecuteCo
case IDC_DUPLICATE_TARGET_TAB:
DuplicateKeyboardFocusedTab(browser_);
break;
@@ -66,7 +66,7 @@
// Hosted App commands
case IDC_COPY_URL:
CopyURL(browser_, browser_->tab_strip_model()->GetActiveWebContents());
@@ -1888,6 +1898,12 @@ void BrowserCommandController::UpdateCom
@@ -1912,6 +1922,12 @@ void BrowserCommandController::UpdateCom
bool dev_tools_enabled = DevToolsWindow::AllowDevToolsFor(
profile(), browser_->tab_strip_model()->GetActiveWebContents());
@@ -81,7 +81,7 @@
dev_tools_enabled);
--- a/chrome/browser/ui/accelerator_table.cc
+++ b/chrome/browser/ui/accelerator_table.cc
@@ -268,8 +268,10 @@ const AcceleratorMapping kDevToolsAccele
@@ -269,8 +269,10 @@ const AcceleratorMapping kDevToolsAccele
{ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS},
{ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
IDC_DEV_TOOLS_CONSOLE},
@@ -142,7 +142,7 @@
"G", IDC_FIND_NEXT, VIRTKEY, CONTROL
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -581,6 +581,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -584,6 +584,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
(*s_allowlist)[::prefs::kCaretBrowsingEnabled] =
settings_api::PrefType::kBoolean;

2
patches/helium/core/mitigate-fingerprinting-audio-context.patch
View File

@@ -237,7 +237,7 @@ https://github.com/uazo/cromite/blob/b2824377/build/patches/AudioBuffer-Analyser
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -585,7 +585,6 @@
@@ -599,7 +599,6 @@
// AudioContext.playoutStats interface.
// https://chromestatus.com/feature/5172818344148992
name: "AudioContextPlayoutStats",

24
patches/helium/core/mitigate-fingerprinting-canvas.patch
View File

@@ -21,12 +21,12 @@
#endif /* CHROME_BROWSER_HELIUM_FLAG_ENTRIES_H_ */
--- a/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc
+++ b/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc
@@ -12,13 +12,13 @@ namespace fingerprinting_protection_inte
@@ -10,13 +10,13 @@ namespace fingerprinting_protection_inte
// Whether the canvas interventions should be enabled that add noise to the
// readback values.
BASE_FEATURE(kCanvasNoise,
"CanvasNoise",
- base::FeatureState::FEATURE_DISABLED_BY_DEFAULT);
+ base::FeatureState::FEATURE_ENABLED_BY_DEFAULT);
-BASE_FEATURE(kCanvasNoise, base::FeatureState::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kCanvasNoise, base::FeatureState::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE_PARAM(bool,
kCanvasNoiseInRegularMode,
@@ -35,13 +35,13 @@
- false);
+ true);
bool IsCanvasInterventionsEnabledForIncognitoState(bool is_incognito) {
if (is_incognito) {
// [Experimental] Whether readback of canvases should be blocked.
BASE_FEATURE(kBlockCanvasReadback,
--- a/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc
+++ b/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc
@@ -132,17 +132,6 @@ bool CanvasInterventionsHelper::MaybeNoi
static_cast<int>(high_entropy_canvas_op_types),
canvas_op_exclusive_max);
@@ -157,17 +157,6 @@ bool CanvasInterventionsHelper::MaybeNoi
GetContextTypeForMetrics(execution_context)}),
static_cast<int>(high_entropy_canvas_op_types), canvas_op_exclusive_max);
- AuditsIssue::ReportUserReidentificationCanvasNoisedIssue(
- CaptureSourceLocation(execution_context), execution_context);
@@ -57,8 +57,8 @@
base::TimeDelta elapsed_time = base::TimeTicks::Now() - start_time;
UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(kNoiseDurationMetricName,
@@ -150,9 +139,6 @@ bool CanvasInterventionsHelper::MaybeNoi
base::Milliseconds(50), 50);
@@ -175,9 +164,6 @@ bool CanvasInterventionsHelper::MaybeNoi
base::Milliseconds(100), 100);
UMA_HISTOGRAM_COUNTS_1M(kCanvasSizeMetricName,
pixmap_to_noise.width() * pixmap_to_noise.height());
- UseCounter::Count(execution_context, WebFeature::kCanvasReadbackNoise);

39
patches/helium/core/onboarding-page.patch
View File

@@ -23,7 +23,7 @@
#endif // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -201,6 +201,8 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -205,6 +205,8 @@ void RegisterBrowserUserPrefs(user_prefs
{
registry->RegisterBooleanPref(prefs::kHeliumServicesEnabled, true);
registry->RegisterStringPref(prefs::kHeliumServicesOrigin, "");
@@ -34,7 +34,7 @@
registry->RegisterBooleanPref(
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -57,6 +57,7 @@
@@ -58,6 +58,7 @@
#include "chrome/common/chrome_version.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/webui_url_constants.h"
@@ -42,7 +42,7 @@
#include "components/custom_handlers/protocol_handler_registry.h"
#include "components/prefs/pref_service.h"
#include "components/privacy_sandbox/privacy_sandbox_features.h"
@@ -480,6 +481,15 @@ StartupBrowserCreatorImpl::DetermineStar
@@ -488,6 +489,15 @@ StartupBrowserCreatorImpl::DetermineStar
LaunchResult launch_result =
tabs.empty() ? LaunchResult::kNormally : LaunchResult::kWithGivenUrls;
@@ -60,7 +60,7 @@
whats_new::LogStartupType(whats_new::StartupType::kIneligible);
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1206,6 +1206,10 @@
@@ -1216,6 +1216,10 @@
"META": {"sizes": {"includes": [30],}},
"includes": [7480],
},
@@ -73,7 +73,7 @@
# START ios/ section.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -8694,6 +8694,7 @@ static_library("browser_generated_files"
@@ -8621,6 +8621,7 @@ static_library("browser_generated_files"
"//chrome/browser/v8_compile_hints/proto",
"//chrome/browser/web_applications/mojom:mojom_web_apps_enum",
"//chrome/common/request_header_integrity:buildflags",
@@ -83,7 +83,7 @@
"//components/webui/chrome_urls/mojom:mojo_bindings",
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -463,11 +463,13 @@ template("chrome_extra_paks") {
@@ -468,11 +468,13 @@ template("chrome_extra_paks") {
if (!is_android && !is_chromeos) {
sources += [
"$root_gen_dir/chrome/intro_resources.pak",
@@ -109,7 +109,7 @@
#if !BUILDFLAG(IS_ANDROID)
--- a/chrome/common/webui_url_constants.h
+++ b/chrome/common/webui_url_constants.h
@@ -595,6 +595,8 @@ inline constexpr char kChromeUIProfilePi
@@ -597,6 +597,8 @@ inline constexpr char kChromeUIProfilePi
inline constexpr char kChromeUIProfilePickerStartupQuery[] = "startup";
inline constexpr char kChromeUIProfilePickerGlicQuery[] = "glic";
inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/";
@@ -120,7 +120,7 @@
"chrome://history-sync-optin/";
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -162,6 +162,10 @@ static_library("ui") {
@@ -164,6 +164,10 @@ static_library("ui") {
"webui/net_internals/net_internals_ui.h",
"webui/ntp_tiles_internals_ui.cc",
"webui/ntp_tiles_internals_ui.h",
@@ -141,7 +141,7 @@
#include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
#include "chrome/browser/ui/webui/policy/policy_ui.h"
#include "chrome/browser/ui/webui/predictors/predictors_ui.h"
@@ -415,6 +416,7 @@ void RegisterChromeWebUIConfigs() {
@@ -417,6 +418,7 @@ void RegisterChromeWebUIConfigs() {
#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
map.AddWebUIConfig(std::make_unique<ManagedUserProfileNoticeUIConfig>());
map.AddWebUIConfig(std::make_unique<IntroUIConfig>());
@@ -496,9 +496,9 @@
registrar.Add(prefs::kHeliumServicesOrigin, observer);
registrar.Add(pref_name, observer);
}
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -579,7 +579,8 @@ bool IsHostAllowedInIncognito(const GURL
--- a/chrome/browser/ui/incognito_allowed_url.cc
+++ b/chrome/browser/ui/incognito_allowed_url.cc
@@ -48,7 +48,8 @@ bool IsHostAllowedInIncognito(const GURL
host != chrome::kChromeUIHelpHost &&
host != chrome::kChromeUIHistoryHost &&
host != chrome::kChromeUIExtensionsHost &&
@@ -510,7 +510,7 @@
} // namespace
--- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
+++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
@@ -344,7 +344,9 @@ void SearchEnginesHandler::HandleSetDefa
@@ -349,7 +349,9 @@ void SearchEnginesHandler::HandleSetDefa
CHECK(choice_made_location ==
search_engines::ChoiceMadeLocation::kSearchSettings ||
choice_made_location ==
@@ -523,7 +523,7 @@
--- a/chrome/browser/favicon/favicon_utils.cc
+++ b/chrome/browser/favicon/favicon_utils.cc
@@ -188,6 +188,7 @@ bool ShouldThemifyFavicon(GURL url) {
@@ -189,6 +189,7 @@ bool ShouldThemifyFavicon(GURL url) {
url.host_piece() != chrome::kChromeUIVersionHost &&
url.host_piece() != chrome::kChromeUINetExportHost &&
url.host_piece() != chrome::kChromeUINewTabHost &&
@@ -533,7 +533,7 @@
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1909,6 +1909,12 @@
@@ -1917,6 +1917,12 @@
<message name="IDS_SETTINGS_HELIUM_SERVICES_DESCRIPTION" desc="Description of the controls available on the Helium services settings page">
Manage what Helium services are allowed in your browser
</message>
@@ -548,7 +548,7 @@
</message>
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -356,6 +356,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -357,6 +357,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::prefs::kHeliumServicesOrigin] =
settings_api::PrefType::kString;
@@ -559,7 +559,7 @@
(*s_allowlist)[::prefs::kPrivacyGuideViewed] =
--- a/chrome/browser/resources/settings/privacy_page/services_page.html
+++ b/chrome/browser/resources/settings/privacy_page/services_page.html
@@ -2,9 +2,41 @@
@@ -2,10 +2,42 @@
.label-wrapper {
padding: var(--cr-section-vertical-padding) 0;
}
@@ -582,6 +582,7 @@
+ }
</style>
<settings-subpage page-title="$i18n{heliumServicesTitle}" route-path$="[[routePath]]">
<div class="cr-col first">
+ <template is="dom-if" if="[[!prefs.helium.services.user_consented.value]]">
+ <div class="cr-row" id="onboarding-notice">
@@ -601,7 +602,7 @@
<settings-toggle-button id="servicesToggleButton"
pref="{{prefs.helium.services.enabled}}"
label="$i18n{heliumServicesToggle}"
@@ -14,6 +46,7 @@
@@ -15,6 +47,7 @@
<cr-collapse id="servicesCollapse" opened="[[prefs.helium.services.enabled.value]]">
</cr-collapse>
</div>
@@ -611,7 +612,7 @@
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -1955,6 +1955,8 @@ void AddPrivacyStrings(content::WebUIDat
@@ -1969,6 +1969,8 @@ void AddPrivacyStrings(content::WebUIDat
{"securityPageDescription", IDS_SETTINGS_SECURITY_DESCRIPTION},
{"heliumServicesTitle", IDS_SETTINGS_HELIUM_SERVICES},
{"heliumServicesDescription", IDS_SETTINGS_HELIUM_SERVICES_DESCRIPTION},

Some files were not shown because too many files have changed in this diff Show More