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

update to chromium 135.0.7049.52 (#5)

Browse Source
This commit is contained in:
wukko
2025-04-04 18:03:47 +06:00
committed by GitHub
parent 6c1355c93b cfa65ed1cb
commit a48056ea9d
98 changed files with 2400 additions and 5187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
134.0.6998.166
135.0.7049.52

1244
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

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

@@ -1,14 +1,6 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2266,7 +2266,6 @@ static_library("browser") {
"//components/reporting/util:task_runner_context",
"//components/resources",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection",
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/notification_content_detection",
"//components/safe_browsing/content/browser/password_protection",
@@ -3618,8 +3617,6 @@ static_library("browser") {
@@ -3648,8 +3648,6 @@ static_library("browser") {
"download/download_commands.cc",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -19,7 +11,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5403,10 +5403,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5405,10 +5405,6 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
handle, handle->GetWebContents()->GetBrowserContext()));
@@ -30,32 +22,6 @@
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
@@ -5461,16 +5457,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
- // g_browser_process->safe_browsing_service() may be null in unittests.
- safe_browsing::SafeBrowsingUIManager* ui_manager =
- g_browser_process->safe_browsing_service()
- ? g_browser_process->safe_browsing_service()->ui_manager().get()
- : nullptr;
- MaybeAddThrottle(
- safe_browsing::SafeBrowsingNavigationThrottle::MaybeCreateThrottleFor(
- handle, ui_manager),
- &throttles);
-
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
throttles.push_back(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
@@ -5771,8 +5757,6 @@ bool ChromeContentBrowserClient::IsPlugi
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- safe_browsing_service_ = g_browser_process->safe_browsing_service();
-
// Initialize `network_contexts_parent_directory_`.
base::FilePath user_data_dir;
base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -38,21 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey
@@ -80,43 +46,9 @@
}
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -530,13 +530,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
- safe_browsing::SafeBrowsingService* sb_service =
- g_browser_process->safe_browsing_service();
- if (sb_service && !profile_->IsOffTheRecord()) {
- // Include this download manager in the set monitored by safe browsing.
- sb_service->AddDownloadManager(dm);
- }
-
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -1074,17 +1067,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
- safe_browsing::FileTypePolicies* file_type_policies =
- safe_browsing::FileTypePolicies::GetInstance();
-
- const PrefService* prefs = profile_->GetPrefs();
- if (file_type_policies->GetFileDangerLevel(*filename, source_url, prefs) ==
- safe_browsing::DownloadFileType::NOT_DANGEROUS)
- return;
-
- base::FilePath default_filename = base::FilePath::FromUTF8Unsafe(
- l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
- *filename = filename->AddExtension(default_filename.BaseName().value());
}
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -119,7 +119,7 @@ class DownloadItemModelData : public bas
@@ -128,7 +128,7 @@ class DownloadItemModelData : public bas
// Danger level of the file determined based on the file type and whether
// there was a user action associated with the download.
@@ -125,7 +57,7 @@
// Whether the download is currently being revived.
bool is_being_revived_ = false;
@@ -502,13 +502,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -512,13 +512,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -142,131 +74,6 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -711,9 +711,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
- safe_browsing::FileTypePolicies::GetInstance()
- ->IsAllowedToOpenAutomatically(
- download_->GetTargetFilePath()) &&
!download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::PAUSE:
return !download_->IsSavePackageDownload() &&
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -256,14 +256,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
- // Note that the list of file types that are not allowed to open
- // automatically can change in the future. When the list is tightened, it is
- // expected that some entries in the users' auto open list will get dropped
- // permanently as a result.
- if (FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically(
- filename_with_extension)) {
- auto_open_by_user_.insert(extension);
- }
+ auto_open_by_user_.insert(extension);
}
}
@@ -441,10 +434,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
- if (!FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically(
- file_name)) {
- return false;
- }
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
extension.erase(0, 1);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -324,13 +324,6 @@ base::FilePath DownloadTargetDeterminer:
download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
suggested_filename, sniffed_mime_type, default_filename);
- // We don't replace the file extension if sfafe browsing consider the file
- // extension to be unsafe. Just let safe browsing scan the generated file.
- if (safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile(
- generated_filename)) {
- return generated_filename;
- }
-
// If no mime type or explicitly specified a name, don't replace file
// extension.
if (sniffed_mime_type.empty() || !suggested_filename.empty())
@@ -1290,68 +1283,7 @@ DownloadFileType::DangerLevel DownloadTa
PriorVisitsToReferrer visits) const {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- // User-initiated extension downloads from pref-whitelisted sources are not
- // considered dangerous.
- if (download_->HasUserGesture() &&
- download_crx_util::IsTrustedExtensionDownload(GetProfile(), *download_)) {
- return DownloadFileType::NOT_DANGEROUS;
- }
-
- DownloadFileType::DangerLevel danger_level =
- safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel(
- virtual_path_.BaseName(), download_->GetURL(),
- GetProfile()->GetPrefs());
- policy::DownloadRestriction download_restriction =
- static_cast<policy::DownloadRestriction>(
- GetProfile()->GetPrefs()->GetInteger(
- policy::policy_prefs::kDownloadRestrictions));
-
- // If the user has has been prompted or will be, assume that the user has
- // approved the download. A programmatic download is considered safe unless it
- // contains malware.
- bool user_approved_path =
- !download_->GetForcedFilePath().empty() &&
- // Drag and drop download paths are not approved by the user. See
- // https://crbug.com/1513639
- download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP;
- if (HasPromptedForPath() ||
- confirmation_reason_ != DownloadConfirmationReason::NONE ||
- user_approved_path) {
- // If the "DownloadRestrictions" enterprise policy explicitly disallows the
- // download, don't let the user gesture bypass the dangerous verdict.
- if ((download_restriction == policy::DownloadRestriction::DANGEROUS_FILES ||
- download_restriction ==
- policy::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES) &&
- danger_level != DownloadFileType::NOT_DANGEROUS) {
- return DownloadFileType::DANGEROUS;
- }
- return DownloadFileType::NOT_DANGEROUS;
- }
-
- // Anything the user has marked auto-open is OK if it's user-initiated.
- if (download_prefs_->IsAutoOpenEnabled(download_->GetURL(), virtual_path_) &&
- download_->HasUserGesture())
- return DownloadFileType::NOT_DANGEROUS;
-
- // A danger level of ALLOW_ON_USER_GESTURE is used to label potentially
- // dangerous file types that have a high frequency of legitimate use. We would
- // like to avoid prompting for the legitimate cases as much as possible. To
- // that end, we consider a download to be legitimate if one of the following
- // is true, and avoid prompting:
- //
- // * The user navigated to the download URL via the omnibox (either by typing
- // the URL, pasting it, or using search).
- //
- // * The navigation that initiated the download has a user gesture associated
- // with it AND the user the user is familiar with the referring origin. A
- // user is considered familiar with a referring origin if a visit for a page
- // from the same origin was recorded on the previous day or earlier.
- if (danger_level == DownloadFileType::ALLOW_ON_USER_GESTURE &&
- ((download_->GetTransitionType() &
- ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 ||
- (download_->HasUserGesture() && visits == VISITED_REFERRER)))
- return DownloadFileType::NOT_DANGEROUS;
- return danger_level;
+ return DownloadFileType::NOT_DANGEROUS;
}
std::optional<base::Time>
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -38,7 +38,6 @@
@@ -371,7 +178,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
@@ -713,18 +713,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -711,18 +711,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -436,7 +243,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -78,6 +79,7 @@ static_library("safe_browsing") {
@@ -75,6 +76,7 @@ static_library("safe_browsing") {
"//mojo/public/cpp/system",
"//services/preferences/public/cpp",
]
@@ -444,7 +251,7 @@
if (is_android) {
deps += [
@@ -549,6 +551,7 @@ static_library("advanced_protection") {
@@ -553,6 +555,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -452,7 +259,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -568,6 +571,7 @@ source_set("metrics_collector") {
@@ -572,6 +575,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -460,44 +267,6 @@
}
source_set("test_support") {
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -486,35 +486,8 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
- safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents(
- web_contents, HostContentSettingsMapFactory::GetForProfile(profile),
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
- GetForBrowserContext(profile),
- profile->GetPrefs(), g_browser_process->safe_browsing_service());
site_protection::SiteProtectionMetricsObserver::CreateForWebContents(
web_contents);
-
- if (base::FeatureList::IsEnabled(
- safe_browsing::kTailoredSecurityIntegration)) {
- safe_browsing::TailoredSecurityUrlObserver::CreateForWebContents(
- web_contents,
- safe_browsing::TailoredSecurityServiceFactory::GetForProfile(profile));
- }
- if (g_browser_process->safe_browsing_service()) {
- safe_browsing::AsyncCheckTracker::CreateForWebContents(
- web_contents, g_browser_process->safe_browsing_service()->ui_manager(),
- safe_browsing::AsyncCheckTracker::
- IsPlatformEligibleForSyncCheckerCheckAllowlist());
- }
- // SafeBrowsingTabObserver creates a ClientSideDetectionHost, which observes
- // events from PermissionRequestManager and AsyncCheckTracker in its
- // constructor. Therefore, PermissionRequestManager and AsyncCheckTracker need
- // to be created before SafeBrowsingTabObserver is created.
- safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(
- web_contents,
- std::make_unique<safe_browsing::ChromeSafeBrowsingTabObserverDelegate>());
- safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
- profile, web_contents);
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
SearchEngineTabHelper::CreateForWebContents(web_contents);
if (site_engagement::SiteEngagementService::IsEnabled()) {
--- a/chrome/browser/ui/views/download/BUILD.gn
+++ b/chrome/browser/ui/views/download/BUILD.gn
@@ -27,7 +27,6 @@ source_set("download") {
@@ -518,7 +287,7 @@
#include "chrome/browser/download/download_history.h"
#include "chrome/browser/download/download_item_model.h"
#include "chrome/browser/download/download_item_warning_data.h"
@@ -536,12 +535,6 @@ void DownloadsDOMHandler::RemoveDownload
@@ -541,12 +540,6 @@ void DownloadsDOMHandler::RemoveDownload
IdSet ids;
for (download::DownloadItem* download : to_remove) {

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

@@ -1,6 +1,6 @@
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
@@ -868,93 +868,6 @@ std::tuple<GURL, std::string> AutofillCr
@@ -888,93 +888,6 @@ std::tuple<GURL, std::string> AutofillCr
}
bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {

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

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

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

@@ -101,7 +101,7 @@ by default.
"-----BEGIN PUBLIC KEY-----"
--- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
@@ -111,7 +111,7 @@ void OnURLLoadUploadProgress(uint64_t cu
@@ -110,7 +110,7 @@ void OnURLLoadUploadProgress(uint64_t cu
} // namespace
const char WebRtcEventLogUploaderImpl::kUploadURL[] =
@@ -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
@@ -538,7 +538,7 @@ void WebRtcLogUploader::UploadCompressed
@@ -535,7 +535,7 @@ void WebRtcLogUploader::UploadCompressed
}
})");
@@ -189,7 +189,7 @@ by default.
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -72,17 +72,17 @@ namespace {
@@ -73,17 +73,17 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if BUILDFLAG(IS_CHROMEOS)
@@ -380,7 +380,7 @@ by default.
--- a/content/browser/webauth/webauth_request_security_checker.h
+++ b/content/browser/webauth/webauth_request_security_checker.h
@@ -87,9 +87,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
@@ -90,9 +90,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
// Legacy App IDs, which google.com origins are allowed to assert for
// compatibility reasons.
static constexpr char kGstaticAppId[] =
@@ -638,7 +638,7 @@ by default.
const char kFeedOAuth2Scope[] = "https://www.googleapis.com/auth/googlenow";
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -25,6 +25,7 @@
@@ -24,6 +24,7 @@
namespace {
// Gaia service constants

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

@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
IncidentReportingService::IncidentReportingService(
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -379,7 +379,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -382,7 +382,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingServiceImpl::RegisterAllDelayedAnalysis() {

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

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

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

@@ -8,7 +8,7 @@
# Dev tools attempts to download css data
--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
@@ -301,6 +301,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
@@ -318,6 +318,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
@@ -48,7 +48,7 @@
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
@@ -121,6 +121,9 @@ AffiliationFetcherDelegate* HashAffiliat
@@ -127,6 +127,9 @@ AffiliationFetcherDelegate* HashAffiliat
}
void HashAffiliationFetcher::StartRequest(

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

@@ -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
@@ -1071,6 +1071,8 @@ component("net") {
@@ -1073,6 +1073,8 @@ component("net") {
"url_request/referrer_policy.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -150,7 +150,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
@@ -53,6 +54,7 @@
@@ -54,6 +55,7 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -158,7 +158,7 @@
namespace net {
@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey<URL
@@ -642,6 +644,12 @@ URLRequest::URLRequest(base::PassKey<URL
// Sanity check out environment.
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
@@ -181,7 +181,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
#include "url/url_constants.h"
@@ -603,6 +604,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -596,6 +597,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2700,24 +2700,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2708,24 +2708,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -58,7 +58,7 @@
std::string_view process_type) {
--- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
@@ -748,8 +748,6 @@ void CrashpadClient::CrashWithoutDump(co
@@ -747,8 +747,6 @@ void CrashpadClient::CrashWithoutDump(co
// static
void CrashpadClient::SetFirstChanceExceptionHandler(
FirstChanceHandler handler) {

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

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

@@ -681,7 +681,7 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -986,7 +986,7 @@ void PrefetchContainer::AddRedirectHop(c
@@ -990,7 +990,7 @@ void PrefetchContainer::AddRedirectHop(c
// some which are added by throttles). These aren't yet supported for
// prefetch, including browsing topics and client hints.
net::HttpRequestHeaders updated_headers;
@@ -692,7 +692,7 @@
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -511,28 +511,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -519,28 +519,6 @@ bool HasGoogleHost(const GURL& url) {
}
bool IsGoogleHost(std::string_view host) {

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

@@ -1,11 +1,11 @@
--- a/components/browsing_data/content/browsing_data_model.cc
+++ b/components/browsing_data/content/browsing_data_model.cc
@@ -1002,12 +1002,6 @@ void BrowsingDataModel::PopulateFromDisk
base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI);
base::FeatureList::IsEnabled(network::features::kSharedStorageAPI);
bool is_shared_dictionary_enabled = base::FeatureList::IsEnabled(
network::features::kCompressionDictionaryTransportBackend);
- bool is_interest_group_enabled =
- base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage);
- base::FeatureList::IsEnabled(network::features::kInterestGroupStorage);
- bool is_attribution_reporting_enabled = base::FeatureList::IsEnabled(
- attribution_reporting::features::kConversionMeasurement);
- bool is_private_aggregation_enabled =
@@ -75,7 +75,23 @@
PrivacySandboxSettingsImpl::Status
--- a/content/browser/attribution_reporting/attribution_suitable_context.cc
+++ b/content/browser/attribution_reporting/attribution_suitable_context.cc
@@ -44,67 +44,7 @@ std::optional<AttributionSuitableContext
@@ -45,85 +45,13 @@ bool UkmSourceIdAllowed(RenderFrameHostI
// static
std::optional<AttributionSuitableContext> AttributionSuitableContext::Create(
NavigationHandle* navigation_handle) {
- RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(
- navigation_handle->GetRenderFrameHost());
- std::optional<AttributionSuitableContext> context = Create(rfh);
- // Override the UKM source ID from the associated ongoing navigation handle as
- // `AttributionHost::GetPageUkmSourceId()` is not updated until the navigation
- // finishes.
- if (context && UkmSourceIdAllowed(rfh)) {
- context->ukm_source_id_ = navigation_handle->GetNextPageUkmSourceId();
- }
- return context;
+ return std::nullopt;
}
// static
std::optional<AttributionSuitableContext> AttributionSuitableContext::Create(
RenderFrameHostImpl* initiator_frame) {
@@ -139,13 +155,16 @@
- !url_matcher::util::GetGoogleAmpViewerEmbeddedURL(
- initiator_root_frame->GetLastCommittedURL())
- .is_empty(),
- UkmSourceIdAllowed(initiator_root_frame)
- ? attribution_host->GetPageUkmSourceId()
- : ukm::kInvalidSourceId,
- data_host_manager->AsWeakPtr());
}
// static
--- a/content/browser/interest_group/ad_auction_service_impl.cc
+++ b/content/browser/interest_group/ad_auction_service_impl.cc
@@ -217,11 +217,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
@@ -214,11 +214,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
void AdAuctionServiceImpl::CreateMojoService(
RenderFrameHost* render_frame_host,
mojo::PendingReceiver<blink::mojom::AdAuctionService> receiver) {
@@ -172,7 +191,7 @@
- this, path, special_storage_policy_);
- }
- if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
- if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
- // Auction worklets on non-Android use dedicated processes; on Android due
- // to high cost of process launch they try to reuse renderers.
- interest_group_manager_ = std::make_unique<InterestGroupManagerImpl>(
@@ -191,7 +210,7 @@
-
- // The Topics API is not available in Incognito mode.
- if (!is_in_memory() &&
- base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) {
- base::FeatureList::IsEnabled(network::features::kBrowsingTopics)) {
- browsing_topics_site_data_manager_ =
- std::make_unique<BrowsingTopicsSiteDataManagerImpl>(path);
- }
@@ -221,7 +240,7 @@
void StoragePartitionImpl::OnStorageServiceDisconnected() {
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3857,12 +3857,6 @@ void WebContentsImpl::Init(const WebCont
@@ -3888,12 +3888,6 @@ void WebContentsImpl::Init(const WebCont
DateTimeChooser::CreateDateTimeChooser(this);
#endif

6
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
@@ -186,31 +186,13 @@ void WebRtcLogUploader::OnLoggingStopped
@@ -183,31 +183,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,
@@ -227,28 +209,7 @@ void WebRtcLogUploader::PrepareMultipart
@@ -224,28 +206,7 @@ void WebRtcLogUploader::PrepareMultipart
DCHECK(!compressed_log.empty());
DCHECK(meta_data.get());
@@ -65,7 +65,7 @@
}
void WebRtcLogUploader::UploadStoredLog(
@@ -315,48 +276,6 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -312,48 +273,6 @@ void WebRtcLogUploader::LoggingStoppedDo
DCHECK(log_buffer.get());
DCHECK(!log_paths.directory.empty());

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

@@ -1,8 +1,8 @@
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -599,17 +599,6 @@ void ExtensionInfoGenerator::CreateExten
info->controlled_info.emplace();
info->controlled_info->text =
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc
@@ -131,17 +131,6 @@ void ExtensionInfoGenerator::FillExtensi
info.controlled_info.emplace();
info.controlled_info->text =
l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE);
- } else {
- // Create Safety Hub information for any non-enterprise extension.
@@ -10,8 +10,8 @@
- ExtensionSafetyCheckUtils::GetSafetyCheckWarningReason(extension,
- profile);
- if (warning_reason != developer::SafetyCheckWarningReason::kNone) {
- info->safety_check_warning_reason = warning_reason;
- info->safety_check_text =
- info.safety_check_warning_reason = warning_reason;
- info.safety_check_text =
- ExtensionSafetyCheckUtils::GetSafetyCheckWarningStrings(
- warning_reason, state);
- }
@@ -126,18 +126,18 @@
// Returns true if the given `stage` is one in which extension enablement should
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -467,7 +467,7 @@ content::WebUIDataSource* CreateAndAddEx
@@ -477,7 +477,7 @@ content::WebUIDataSource* CreateAndAddEx
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
source->AddBoolean(
"safetyHubThreeDotDetails",
- base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails));
+ false);
// MV2 deprecation.
auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
// TODO(crbug.com/392777363): Clean these up with non-placeholder values.
#if BUILDFLAG(IS_ANDROID)
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -95,13 +95,6 @@ bool IsManifestSupported(int manifest_ve
@@ -96,13 +96,6 @@ bool IsManifestSupported(int manifest_ve
// Supported versions are always safe.
if (manifest_version >= kMinimumSupportedManifestVersion &&
manifest_version <= kMaximumSupportedManifestVersion) {

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

@@ -30,7 +30,7 @@
if (is_chrome_branded) {
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -746,10 +746,6 @@ static_library("browser") {
@@ -755,10 +755,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_metrics_document_data.h",
"navigation_predictor/navigation_predictor_preconnect_client.cc",
"navigation_predictor/navigation_predictor_preconnect_client.h",
@@ -41,7 +41,7 @@
"net/cert_verifier_service_time_updater.cc",
"net/cert_verifier_service_time_updater.h",
"net/chrome_mojo_proxy_resolver_factory.cc",
@@ -3482,10 +3478,6 @@ static_library("browser") {
@@ -3514,10 +3510,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",
@@ -4225,10 +4217,6 @@ static_library("browser") {
@@ -4250,10 +4242,6 @@ static_library("browser") {
"//chrome/browser/new_tab_page/chrome_colors",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resources:component_extension_resources",
@@ -63,9 +63,9 @@
"//chrome/browser/search/background",
"//chrome/browser/smart_card",
"//chrome/browser/themes",
@@ -4354,9 +4342,6 @@ static_library("browser") {
@@ -4378,9 +4366,6 @@ static_library("browser") {
"//components/webauthn/core/browser",
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/bluetooth",
"//services/device/public/cpp/hid",
- "//services/screen_ai",
- "//services/screen_ai/public/cpp:utilities",
@@ -73,7 +73,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4453,8 +4438,6 @@ static_library("browser") {
@@ -4475,8 +4460,6 @@ static_library("browser") {
sources += [
"accessibility/soda_installer_impl.cc",
"accessibility/soda_installer_impl.h",
@@ -82,7 +82,7 @@
"device_identity/device_oauth2_token_store_desktop.cc",
"device_identity/device_oauth2_token_store_desktop.h",
"device_notifications/device_status_icon_renderer.cc",
@@ -4493,8 +4476,6 @@ static_library("browser") {
@@ -4515,8 +4498,6 @@ static_library("browser") {
"profiles/profile_activity_metrics_recorder.h",
"profiles/profile_list_desktop.cc",
"profiles/profile_list_desktop.h",
@@ -91,7 +91,7 @@
"signin/force_signin_verifier.cc",
"signin/force_signin_verifier.h",
"signin/signin_manager.cc",
@@ -5294,7 +5275,6 @@ static_library("browser") {
@@ -5317,7 +5298,6 @@ static_library("browser") {
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/resources:app_icon_resources",
@@ -99,15 +99,15 @@
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash/accelerator",
"//chrome/browser/ui/ash/accessibility",
@@ -5552,7 +5532,6 @@ static_library("browser") {
"//device/vr/public/mojom:isolated_xr_service",
@@ -5581,7 +5561,6 @@ static_library("browser") {
"//remoting/host/chromeos:browser_interop",
"//remoting/host/chromeos:features",
"//services/device/public/cpp/geolocation",
- "//services/screen_ai/public/cpp:metrics",
"//third_party/nearby:rpc_resources_proto",
"//third_party/nearby:wire_format_proto",
"//ui/chromeos",
@@ -7778,12 +7757,6 @@ static_library("browser") {
@@ -7803,12 +7782,6 @@ static_library("browser") {
}
if (enable_pdf) {
@@ -135,9 +135,9 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1351,9 +1349,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1347,9 +1345,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#endif // BUILDFLAG(IS_CHROMEOS)
-#if !BUILDFLAG(IS_ANDROID)
- screen_ai_download_ = screen_ai::ScreenAIInstallState::Create();
@@ -147,7 +147,7 @@
bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -93,9 +93,6 @@ namespace speech {
@@ -92,9 +92,6 @@ namespace speech {
class SodaInstaller;
} // namespace speech
@@ -157,7 +157,7 @@
// Real implementation of BrowserProcess that creates and returns the services.
class BrowserProcessImpl : public BrowserProcess,
@@ -437,9 +434,6 @@ class BrowserProcessImpl : public Browse
@@ -431,9 +428,6 @@ class BrowserProcessImpl : public Browse
// to ensure that SodaInstallerImpl gets destructed first.
std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
@@ -169,16 +169,16 @@
std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
--- a/chrome/browser/chrome_browser_interface_binders.cc
+++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -127,8 +127,6 @@
@@ -78,8 +78,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
-#include "chrome/browser/screen_ai/screen_ai_service_router.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
@@ -692,27 +690,6 @@ void BindMediaFoundationPreferences(
#endif
@@ -357,27 +355,6 @@ void BindMediaFoundationPreferences(
}
#endif // BUILDFLAG(IS_WIN)
@@ -204,9 +204,9 @@
-}
-#endif
void PopulateChromeFrameBinders(
mojo::BinderMapWithContext<content::RenderFrameHost*>* map,
@@ -843,11 +820,6 @@ void PopulateChromeFrameBinders(
} // namespace
@@ -510,11 +487,6 @@ void PopulateChromeFrameBinders(
base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
}
@@ -229,7 +229,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
@@ -234,9 +232,6 @@ void RegisterComponentsForUpdate() {
@@ -237,9 +235,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
@@ -354,31 +354,31 @@
{"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -262,21 +262,6 @@ void PredictionBasedPermissionUiSelector
@@ -281,21 +281,6 @@ void PredictionBasedPermissionUiSelector
if (inner_text.size() > kPageContentMaxLength) {
inner_text.resize(kPageContentMaxLength);
}
- if (PredictionModelHandlerProvider* prediction_model_handler_provider =
- PredictionModelHandlerProviderFactory::GetForBrowserContext(
- profile_)) {
- if (GenAiModelHandler* gen_ai_model_handler =
- prediction_model_handler_provider->GetGenAiModelHandler()) {
- if (PermissionsAiHandler* gen_ai_model_handler =
- prediction_model_handler_provider->GetPermissionsAiHandler()) {
- VLOG(1) << "[PermissionsAIv1] Inquire model.";
- gen_ai_model_handler->InquireGenAiOnDeviceModel(
- gen_ai_model_handler->InquireAiOnDeviceModel(
- std::move(inner_text), request_type,
- base::BindRepeating(&PredictionBasedPermissionUiSelector::
- GenAIModelExecutionCallback,
- AiOnDeviceModelExecutionCallback,
- weak_ptr_factory_.GetWeakPtr(),
- std::move(features), request_type));
- return;
- }
- }
VLOG(1) << "[PermissionsAIv1] On device genAI model session unavailable";
VLOG(1) << "[PermissionsAIv1] On device AI model session unavailable";
} else {
VLOG(1) << "[PermissionsAIv1] The page's contnet too short or empty";
--- a/chrome/browser/prefs/BUILD.gn
+++ b/chrome/browser/prefs/BUILD.gn
@@ -265,7 +265,6 @@ source_set("impl") {
@@ -266,7 +266,6 @@ source_set("impl") {
} else {
deps += [
"//chrome/browser/promos:utils",
@@ -388,7 +388,7 @@
"//chrome/browser/search_engines",
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1888,9 +1888,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1793,9 +1793,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -400,7 +400,7 @@
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -302,7 +302,6 @@ source_set("profiles_extra_parts_impl")
@@ -301,7 +301,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/feedback",
"//chrome/browser/hid",
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
@@ -410,31 +410,31 @@
"//chrome/browser/search_engine_choice",
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -107,7 +107,6 @@
@@ -98,7 +98,6 @@
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
#include "chrome/browser/net/dns_probe_service_factory.h"
#include "chrome/browser/net/profile_network_context_service_factory.h"
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
@@ -508,7 +507,6 @@
#include "chrome/browser/new_tab_page/promos/promo_service_factory.h"
#include "chrome/browser/payments/payment_request_display_manager_factory.h"
#include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h"
@@ -314,7 +313,6 @@
#include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
#include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/serial/serial_chooser_context_factory.h"
@@ -1007,7 +1005,6 @@ void ChromeBrowserMainExtraPartsProfiles
#include "chrome/browser/search/instant_service_factory.h"
@@ -995,7 +993,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
net::ServerCertificateDatabaseServiceFactory::GetInstance();
#endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
#endif
- PreloadingModelKeyedServiceFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -1059,9 +1056,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1047,9 +1044,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -444,7 +444,7 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1125,13 +1119,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1113,13 +1107,6 @@ void ChromeBrowserMainExtraPartsProfiles
policy::UserPolicySigninServiceFactory::GetInstance();
#endif
PolicyBlocklistFactory::GetInstance();
@@ -458,7 +458,7 @@
PredictionServiceFactory::GetInstance();
predictors::AutocompleteActionPredictorFactory::GetInstance();
predictors::LoadingPredictorFactory::GetInstance();
@@ -1213,13 +1200,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1205,13 +1192,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
SafetyHubMenuNotificationServiceFactory::GetInstance();
SafetyHubHatsServiceFactory::GetInstance();
@@ -467,7 +467,7 @@
- }
-#if BUILDFLAG(ENABLE_PDF)
- screen_ai::PdfOcrControllerFactory::GetInstance();
-#endif // BUILDFLAG(ENABLE_PDF)
-#endif
- screen_ai::ScreenAIServiceRouterFactory::EnsureFactoryBuilt();
#endif
#if BUILDFLAG(IS_CHROMEOS)
@@ -501,7 +501,7 @@
// The announcement notification service might not be available for some
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -51,7 +51,6 @@
@@ -50,7 +50,6 @@
#include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -509,16 +509,16 @@
#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"
@@ -1497,9 +1496,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1507,9 +1506,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
- // Ensure PreloadingModelKeyedService is started.
- PreloadingModelKeyedServiceFactory::GetForProfile(profile);
-
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
contextual_cueing::ContextualCueingServiceFactory::GetForProfile(profile);
#endif
IdentityManagerFactory::GetForProfile(profile)->OnNetworkInitialized();
AccountReconcilorFactory::GetForProfile(profile);
#if BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -90,7 +90,6 @@ group("resources") {
@@ -544,7 +544,7 @@
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1705,8 +1705,6 @@ static_library("ui") {
@@ -1703,8 +1703,6 @@ static_library("ui") {
"//chrome/browser/reading_list",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
@@ -553,7 +553,7 @@
"//chrome/browser/smart_card:smart_card",
"//chrome/browser/tab_group_sync:utils",
"//chrome/browser/themes",
@@ -2376,7 +2374,6 @@ static_library("ui") {
@@ -2373,7 +2371,6 @@ static_library("ui") {
"//chrome/browser/policy:onc",
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification:push_notification",
@@ -697,7 +697,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"
@@ -364,24 +362,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -370,24 +368,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
@@ -722,7 +722,7 @@
// Enable accessibility for the top level render frame and all descendants.
// This causes AXTreeSerializer to reset and send accessibility events of
@@ -804,12 +784,6 @@ void ReadAnythingUntrustedPageHandler::S
@@ -824,12 +804,6 @@ void ReadAnythingUntrustedPageHandler::S
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
}
}
@@ -798,7 +798,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2079,9 +2079,6 @@ if (!is_android) {
@@ -2136,9 +2136,6 @@ if (!is_android) {
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/safe_browsing:advanced_protection",
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -808,7 +808,7 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2485,9 +2482,6 @@ if (!is_android) {
@@ -2543,9 +2540,6 @@ if (!is_android) {
"//services/network/public/proto:sct_audit_report_proto",
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
@@ -818,7 +818,7 @@
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -8020,7 +8014,6 @@ test("unit_tests") {
@@ -8032,7 +8026,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target.
deps += [
@@ -826,15 +826,15 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -8166,7 +8159,6 @@ test("unit_tests") {
"//services/device/public/cpp/bluetooth",
@@ -8175,7 +8168,6 @@ test("unit_tests") {
"//components/webapps/browser",
"//services/metrics/public/cpp:ukm_builders",
"//services/network:test_support",
- "//services/screen_ai:test_support",
"//services/video_effects/test:test_support",
"//third_party/crashpad/crashpad/util",
"//third_party/libaddressinput",
@@ -8585,7 +8577,6 @@ test("unit_tests") {
@@ -8615,7 +8607,6 @@ test("unit_tests") {
"//chrome/browser/nearby_sharing/contacts:unit_tests",
"//chrome/browser/nearby_sharing/local_device_data:unit_tests",
"//chrome/browser/policy:unit_tests",
@@ -844,7 +844,7 @@
"//chrome/browser/ui/ash:unit_tests",
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -409,7 +409,7 @@ source_set("lib") {
@@ -408,7 +408,7 @@ source_set("lib") {
}
}
@@ -884,7 +884,7 @@
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -260,12 +258,6 @@ auto RunSpeechRecognitionService(
@@ -262,12 +260,6 @@ auto RunSpeechRecognitionService(
}
#endif // !BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -897,7 +897,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
auto RunCupsIppParser(
@@ -467,7 +459,6 @@ void RegisterMainThreadServices(mojo::Se
@@ -471,7 +463,6 @@ void RegisterMainThreadServices(mojo::Se
services.Add(RunProfileImporter);
services.Add(RunMirroringService);
services.Add(RunPassageEmbeddingsService);
@@ -1044,7 +1044,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -804,10 +804,6 @@ if (is_apple) {
@@ -814,10 +814,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -1057,17 +1057,17 @@
if (use_v8_context_snapshot) {
--- a/pdf/accessibility.cc
+++ b/pdf/accessibility.cc
@@ -47,7 +47,6 @@ void GetAccessibilityInfo(PDFiumEngine*
@@ -46,7 +46,6 @@ void GetAccessibilityInfo(PDFiumEngine*
page_info.page_index = page_index;
page_info.bounds = page->rect();
page_info.char_count = char_count;
- page_info.is_searchified = page->IsPageSearchified();
chars.resize(page_info.char_count);
for (uint32_t i = 0; i < char_count; ++i) {
page->GetTextAndImageInfo(text_runs, chars, page_objects.images);
page_info.text_run_count = text_runs.size();
page_objects.links = page->GetLinkInfo(text_runs);
--- a/pdf/pdf_view_web_plugin.cc
+++ b/pdf/pdf_view_web_plugin.cc
@@ -1299,11 +1299,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
@@ -1326,11 +1326,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
if (accessibility_state_ == AccessibilityState::kPending)
LoadAccessibility();
@@ -1079,7 +1079,7 @@
if (!full_frame_)
return;
@@ -2284,7 +2279,7 @@ void PdfViewWebPlugin::EnableAccessibili
@@ -2322,7 +2317,7 @@ void PdfViewWebPlugin::EnableAccessibili
SkBitmap PdfViewWebPlugin::GetImageForOcr(int32_t page_index,
int32_t page_object_index) {
@@ -1088,7 +1088,7 @@
}
void PdfViewWebPlugin::HandleAccessibilityAction(
@@ -2834,19 +2829,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
@@ -2843,19 +2838,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
return;
}
@@ -1110,7 +1110,7 @@
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -2686,7 +2686,7 @@ void PDFiumEngine::HandleLongPress(const
@@ -2715,7 +2715,7 @@ void PDFiumEngine::HandleLongPress(const
SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) {
DCHECK(PageIndexInBounds(page_index));
@@ -1119,6 +1119,16 @@
}
bool PDFiumEngine::GetPrintScaling() {
--- a/services/passage_embeddings/passage_embeddings_service.cc
+++ b/services/passage_embeddings/passage_embeddings_service.cc
@@ -22,7 +22,6 @@ PassageEmbeddingsService::PassageEmbeddi
PassageEmbeddingsService::~PassageEmbeddingsService() = default;
void PassageEmbeddingsService::OnEmbedderDisconnect() {
- embedder_.reset();
}
void PassageEmbeddingsService::LoadModels(
--- a/services/passage_embeddings/passage_embeddings_service.h
+++ b/services/passage_embeddings/passage_embeddings_service.h
@@ -11,7 +11,6 @@
@@ -1161,7 +1171,7 @@
group("devtools_all_files") {
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
@@ -196,7 +196,6 @@ group("unittests") {
@@ -211,7 +211,6 @@ group("unittests") {
"panels/timeline:unittests",
"panels/timeline/components:unittests",
"panels/timeline/components/insights:unittests",

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

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

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

@@ -2835,7 +2835,7 @@
+#endif // BRAVE_UTILITY_IMPORTER_CHROME_IMPORTER_H_
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -10755,6 +10755,9 @@ Check your passwords anytime in <ph name
@@ -10785,6 +10785,9 @@ Check your passwords anytime in <ph name
Microsoft Edge
</message>
</if>

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

@@ -182,7 +182,7 @@
}
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -4296,6 +4296,10 @@ inline constexpr char kServiceWorkerToCo
@@ -4225,6 +4225,10 @@ inline constexpr char kServiceWorkerToCo
// is set as a SharedWorker script URL.
inline constexpr char kSharedWorkerBlobURLFixEnabled[] =
"worker.shared_worker_blob_url_fix_enabled";
@@ -195,7 +195,7 @@
#endif // CHROME_COMMON_PREF_NAMES_H_
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -1127,6 +1127,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -1138,6 +1138,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::prefs::kImportDialogSearchEngine] =
settings_api::PrefType::kBoolean;
@@ -214,7 +214,7 @@
#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"
@@ -203,6 +204,7 @@ void SettingsUI::RegisterProfilePrefs(
@@ -205,6 +206,7 @@ void SettingsUI::RegisterProfilePrefs(
registry->RegisterBooleanPref(prefs::kImportDialogHistory, true);
registry->RegisterBooleanPref(prefs::kImportDialogSavedPasswords, true);
registry->RegisterBooleanPref(prefs::kImportDialogSearchEngine, true);
@@ -222,7 +222,7 @@
}
SettingsUI::SettingsUI(content::WebUI* web_ui)
@@ -247,7 +249,7 @@ SettingsUI::SettingsUI(content::WebUI* w
@@ -249,7 +251,7 @@ SettingsUI::SettingsUI(content::WebUI* w
AddSettingsPageUIHandler(std::make_unique<DownloadsHandler>(profile));
AddSettingsPageUIHandler(std::make_unique<ExtensionControlHandler>());
AddSettingsPageUIHandler(std::make_unique<FontHandler>(profile));
@@ -233,7 +233,7 @@
#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
@@ -853,6 +853,8 @@ void AddImportDataStrings(content::WebUI
@@ -841,6 +841,8 @@ void AddImportDataStrings(content::WebUI
{"importHistory", IDS_SETTINGS_IMPORT_HISTORY_CHECKBOX},
{"importFavorites", IDS_SETTINGS_IMPORT_FAVORITES_CHECKBOX},
{"importPasswords", IDS_SETTINGS_IMPORT_PASSWORDS_CHECKBOX},
@@ -258,7 +258,7 @@
</div>
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1516,6 +1516,10 @@ static_library("ui") {
@@ -1514,6 +1514,10 @@ static_library("ui") {
"webui/settings/accessibility_main_handler.h",
"webui/settings/appearance_handler.cc",
"webui/settings/appearance_handler.h",
@@ -269,7 +269,7 @@
"webui/settings/browser_lifetime_handler.cc",
"webui/settings/browser_lifetime_handler.h",
"webui/settings/captions_handler.cc",
@@ -1669,6 +1673,13 @@ static_library("ui") {
@@ -1667,6 +1671,13 @@ static_library("ui") {
]
}
@@ -393,7 +393,7 @@
#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)
@@ -148,6 +150,13 @@ static_assert(BUILDFLAG(ENABLE_PRINTING)
namespace {
@@ -407,7 +407,7 @@
auto RunFilePatcher(mojo::PendingReceiver<patch::mojom::FilePatcher> receiver) {
return std::make_unique<patch::FilePatcherImpl>(std::move(receiver));
}
@@ -456,6 +465,7 @@ void RegisterMainThreadServices(mojo::Se
@@ -460,6 +469,7 @@ void RegisterMainThreadServices(mojo::Se
services.Add(RunCSVPasswordParser);
#if !BUILDFLAG(IS_ANDROID)
@@ -472,6 +472,16 @@
ImporterTypeMetrics metrics_type = IMPORTER_METRICS_UNKNOWN;
switch (type) {
case TYPE_UNKNOWN:
@@ -59,6 +60,9 @@ void LogImporterUseToMetrics(const std::
case TYPE_BOOKMARKS_FILE:
metrics_type = IMPORTER_METRICS_BOOKMARKS_FILE;
break;
+ default:
+ metrics_type = IMPORTER_METRICS_UNKNOWN;
+ break;
}
// Note: This leaks memory, which is the expected behavior as the factory
--- a/chrome/browser/importer/external_process_importer_client.h
+++ b/chrome/browser/importer/external_process_importer_client.h
@@ -51,10 +51,10 @@ class ExternalProcessImporterClient

64
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
@@ -2476,6 +2476,7 @@ static_library("browser") {
@@ -2498,6 +2498,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
@@ -184,6 +184,7 @@
@@ -179,6 +179,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
@@ -284,6 +284,7 @@ source_set("browser") {
@@ -291,6 +291,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
@@ -79,6 +79,7 @@
@@ -80,6 +80,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"
@@ -73,7 +73,7 @@
switches::kForceGpuMemAvailableMb,
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -109,6 +109,7 @@ target(link_target_type, "child") {
@@ -110,6 +110,7 @@ target(link_target_type, "child") {
"//third_party/blink/public/common:buildflags",
"//third_party/blink/public/strings",
"//third_party/ced",
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -481,6 +482,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -488,6 +489,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"
@@ -866,6 +867,11 @@ Document::Document(const DocumentInit& i
@@ -867,6 +868,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();
@@ -992,6 +998,14 @@ const Position Document::PositionAdjuste
@@ -993,6 +999,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
@@ -550,6 +550,10 @@ class CORE_EXPORT Document : public Cont
@@ -555,6 +555,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;
@@ -2641,6 +2645,9 @@ class CORE_EXPORT Document : public Cont
@@ -2644,6 +2648,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -176,7 +176,7 @@
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2749,6 +2749,11 @@ DOMRectList* Element::getClientRects() {
@@ -2666,6 +2666,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2776,6 +2781,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2693,6 +2698,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -228,7 +228,7 @@
// TODO(editing-dev): We should make
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
@@ -102,6 +102,24 @@ const ShapeResult* ShapeWord(const TextR
@@ -107,6 +107,24 @@ const ShapeResult* ShapeWord(const TextR
}
} // namespace
@@ -250,23 +250,23 @@
+ baselines_->setIdeographic(baselines_->ideographic() * factor);
+}
+
void TextMetrics::Update(const Font& font,
void TextMetrics::Update(const Font* font,
const TextDirection& direction,
const TextBaseline& baseline,
const V8CanvasTextBaseline::Enum baseline,
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
@@ -103,6 +103,8 @@ class CORE_EXPORT TextMetrics final : pu
@@ -112,6 +112,8 @@ class CORE_EXPORT TextMetrics final : pu
float x_position_;
};
+ void Shuffle(const double factor);
+
private:
void Update(const Font&,
const TextDirection&,
void Update(const Font*,
const TextDirection& direction,
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -227,6 +227,9 @@ class Isolate;
@@ -235,6 +235,9 @@ class Isolate;
class Value;
} // namespace v8
@@ -276,15 +276,19 @@
namespace blink {
class DOMMatrixInit;
@@ -3705,8 +3708,22 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -3763,12 +3766,25 @@ TextMetrics* BaseRenderingContext2D::mea
TextDirection direction = ToTextDirection(
state.GetDirection(), GetCanvasRenderingContextHost(), computed_style);
- return MakeGarbageCollected<TextMetrics>(
- font, direction, state.GetTextBaseline(), state.GetTextAlign(), text);
+ TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(font, direction,
+ GetState().GetTextBaseline(),
+ GetState().GetTextAlign(), text);
- font, direction, state.GetTextBaseline().AsEnum(),
- state.GetTextAlign().AsEnum(), text,
+ TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(
+ font, direction, GetState().GetTextBaseline().AsEnum(),
+ GetState().GetTextAlign().AsEnum(), text,
RuntimeEnabledFeatures::CanvasTextNgEnabled()
? &GetCanvasRenderingContextHost()->GetPlainTextPainter()
: nullptr);
+
+ // Scale text metrics if enabled
+ if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) {
@@ -303,7 +307,7 @@
void BaseRenderingContext2D::SnapshotStateForFilter() {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1762,6 +1762,7 @@ component("platform") {
@@ -1772,6 +1772,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection:language_detection",
@@ -328,17 +332,17 @@
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
@@ -38,6 +38,7 @@
@@ -35,6 +35,7 @@
#include "base/compiler_specific.h"
#include "base/memory/ptr_util.h"
#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/wtf/text/base64.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
#include "third_party/blink/renderer/platform/wtf/vector.h"
#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkSurface.h"
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2056,6 +2056,12 @@
@@ -2080,6 +2080,12 @@
status: "experimental",
},
{

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

@@ -44,7 +44,7 @@ approach to change color components.
switches::kForceGpuMemAvailableMb,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -486,6 +486,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -493,6 +493,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
@@ -2973,6 +2973,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2967,6 +2967,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
@@ -1706,7 +1706,9 @@ component("platform") {
@@ -1717,7 +1717,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -101,16 +101,16 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
@@ -36,6 +36,8 @@
@@ -34,6 +34,8 @@
#include "base/compiler_specific.h"
#include "base/memory/ptr_util.h"
+#include "base/rand_util.h"
+#include "base/logging.h"
#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
@@ -147,6 +149,11 @@ bool ImageDataBuffer::EncodeImageInterna
#include "third_party/blink/renderer/platform/wtf/text/base64.h"
@@ -141,6 +143,11 @@ bool ImageDataBuffer::EncodeImageInterna
const SkPixmap& pixmap) const {
DCHECK(is_valid_);
@@ -133,16 +133,17 @@ approach to change color components.
#include "base/numerics/checked_math.h"
#include "gpu/command_buffer/client/gles2_interface.h"
#include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
@@ -11,10 +13,12 @@
@@ -11,11 +13,13 @@
#include "third_party/blink/renderer/platform/graphics/image_observer.h"
#include "third_party/blink/renderer/platform/graphics/paint/paint_image.h"
#include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/transforms/affine_transform.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/private/SkColorData.h"
+#include "third_party/skia/src/core/SkColorData.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "v8/include/v8.h"
@@ -303,7 +304,7 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage
@@ -39,6 +39,8 @@ class PLATFORM_EXPORT StaticBitmapImage
StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
@@ -314,7 +315,7 @@ approach to change color components.
// Methods overridden by all sub-classes
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2062,6 +2062,9 @@
@@ -2086,6 +2086,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

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

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2156,6 +2156,7 @@ static_library("browser") {
@@ -2177,6 +2177,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -65,7 +65,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
@@ -117,6 +119,7 @@
@@ -118,6 +120,7 @@
#include "components/metrics/metrics_service.h"
#include "components/metrics_services_manager/metrics_services_manager.h"
#include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -73,7 +73,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/os_crypt/async/browser/os_crypt_async.h"
#include "components/permissions/permissions_client.h"
@@ -150,6 +153,7 @@
@@ -151,6 +154,7 @@
#include "extensions/common/constants.h"
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -81,7 +81,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
@@ -414,6 +418,18 @@ void BrowserProcessImpl::Init() {
@@ -417,6 +421,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -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
@@ -2507,6 +2507,10 @@ const char kMantisFeatureKeyDescription[
@@ -2453,6 +2453,10 @@ const char kMantisFeatureKeyDescription[
"Feature key to use the Mantis feature on ChromeOS.";
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -115,7 +115,7 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1432,6 +1432,9 @@ extern const char kMantisFeatureKeyName[
@@ -1417,6 +1417,9 @@ extern const char kMantisFeatureKeyName[
extern const char kMantisFeatureKeyDescription[];
#endif // IS_CHROMEOS

14
patches/extra/inox-patchset/0006-modify-default-prefs.patch
View File

@@ -1,7 +1,7 @@
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -358,7 +358,7 @@ BackgroundModeManager::~BackgroundModeMa
--- a/chrome/browser/background/extensions/background_mode_manager.cc
+++ b/chrome/browser/background/extensions/background_mode_manager.cc
@@ -364,7 +364,7 @@ BackgroundModeManager::~BackgroundModeMa
// static
void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -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
@@ -1546,7 +1546,7 @@ void ChromeContentBrowserClient::Registe
@@ -1553,7 +1553,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -87,7 +87,7 @@
prefs::kAutofillPaymentCvcStorage, true,
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -462,7 +462,7 @@ bool DoesBookmarkContainWords(const std:
@@ -487,7 +487,7 @@ bool DoesBookmarkContainWords(const std:
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -109,7 +109,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -364,7 +364,7 @@ bool HasManuallyFilledFields(const Passw
@@ -389,7 +389,7 @@ bool HasManuallyFilledFields(const Passw
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.
@@ -372,7 +372,7 @@ void PasswordManager::RegisterProfilePre
@@ -397,7 +397,7 @@ void PasswordManager::RegisterProfilePre
false);
#endif // BUILDFLAG(IS_IOS)
registry->RegisterBooleanPref(

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

@@ -1,6 +1,6 @@
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -305,6 +305,12 @@ if (is_linux || is_chromeos) {
@@ -303,6 +303,12 @@ if (is_linux || is_chromeos) {
# These files have a suspicious comparison.
# TODO fix this and re-enable this warning.
"-Wno-sign-compare",

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

@@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1686,11 +1686,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1578,11 +1578,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {

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

@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3283,6 +3288,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3302,6 +3307,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;
@@ -3308,6 +3365,22 @@ void Browser::InProgressDownloadResponse
@@ -3327,6 +3384,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -152,7 +152,7 @@
#include "chrome/browser/ui/signin/signin_view_controller.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
@@ -1184,12 +1185,17 @@ class Browser : public TabStripModelObse
@@ -1189,12 +1190,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.
@@ -1355,6 +1361,8 @@ class Browser : public TabStripModelObse
@@ -1363,6 +1369,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

10
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
@@ -925,10 +925,14 @@ bool HandleNewTabPageLocationOverride(
@@ -929,10 +929,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())
@@ -26,9 +26,9 @@
+ "Allows setting a custom URL for the new tab page. Value can be internal (e.g. `about:blank` or `chrome://new-tab-page`), external (e.g. `example.com`), or local (e.g. `file:///tmp/startpage.html`). This applies for incognito windows as well when not set to a `chrome://` internal page. ungoogled-chromium flag",
+ kOsDesktop, ORIGIN_LIST_VALUE_TYPE("custom-ntp", "")},
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -230,6 +230,7 @@ std::string GetCombinedOriginListValue(c
--- a/components/webui/flags/flags_state.cc
+++ b/components/webui/flags/flags_state.cc
@@ -234,6 +234,7 @@ std::string GetCombinedOriginListValue(c
command_line.GetSwitchValueASCII(command_line_switch);
const std::string new_value =
flags_storage.GetOriginListFlag(internal_entry_name);
@@ -36,7 +36,7 @@
return CombineAndSanitizeOriginLists(existing_value, new_value);
}
@@ -474,6 +475,7 @@ void FlagsState::SetOriginListFlag(const
@@ -482,6 +483,7 @@ void FlagsState::SetOriginListFlag(const
const std::string& value,
FlagsStorage* flags_storage) {
const std::string new_value =

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

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -20,6 +20,8 @@
@@ -18,6 +18,8 @@
namespace blink::features {
@@ -33,7 +33,15 @@
//
--- a/third_party/blink/renderer/core/editing/selection_controller.cc
+++ b/third_party/blink/renderer/core/editing/selection_controller.cc
@@ -1434,10 +1434,14 @@ FrameSelection& SelectionController::Sel
@@ -30,6 +30,7 @@
#include "third_party/blink/renderer/core/editing/selection_controller.h"
#include "base/auto_reset.h"
+#include "third_party/blink/public/common/features.h"
#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/dom/document.h"
@@ -1434,10 +1435,14 @@ FrameSelection& SelectionController::Sel
}
bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) {
@@ -50,7 +58,15 @@
Node* inner_node = event.InnerNode();
--- a/third_party/blink/renderer/core/input/mouse_event_manager.cc
+++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc
@@ -681,8 +681,14 @@ WebInputEventResult MouseEventManager::H
@@ -5,6 +5,7 @@
#include "third_party/blink/renderer/core/input/mouse_event_manager.h"
#include "build/build_config.h"
+#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/web_input_event_result.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_drag_event_init.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_pointer_event_init.h"
@@ -681,8 +682,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

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

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

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -641,5 +641,7 @@ bool BrowserFrame::RegenerateFrameOnThem
@@ -640,5 +640,7 @@ bool BrowserFrame::RegenerateFrameOnThem
}
bool BrowserFrame::IsIncognitoBrowser() const {
@@ -10,7 +10,7 @@
}
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -56,6 +56,7 @@
@@ -57,6 +57,7 @@
#include "ui/base/webui/jstemplate_builder.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/color/color_provider.h"
@@ -18,7 +18,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -437,7 +438,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -454,7 +455,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"
@@ -541,6 +542,15 @@ AutocompleteController::AutocompleteCont
@@ -537,6 +538,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();

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

@@ -2,9 +2,9 @@
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -488,7 +488,9 @@ void TabHelpers::AttachTabHelpers(WebCon
site_protection::SiteProtectionMetricsObserver::CreateForWebContents(
web_contents);
@@ -531,7 +531,9 @@ void TabHelpers::AttachTabHelpers(WebCon
profile, web_contents);
#endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("disable-search-engine-collection")) {
SearchEngineTabHelper::CreateForWebContents(web_contents);
@@ -60,8 +60,8 @@
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
#include "base/debug/crash_logging.h"
@@ -243,6 +244,12 @@ TemplateURLData UpdateTemplateURLDataIfP
return data;
@@ -290,6 +291,12 @@ bool IsAccountDataActive(const TemplateU
return false;
}
+bool ShouldAutocollect() {
@@ -73,15 +73,15 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -422,6 +429,7 @@ TemplateURLService::TemplateURLService(
@@ -470,6 +477,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::RepeatingClosure& dsp_change_callback)
: prefs_(prefs),
+ should_autocollect_(true),
search_engine_choice_service_(search_engine_choice_service),
prepopulate_data_resolver_(prepopulate_data_resolver),
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
@@ -521,8 +529,8 @@ bool TemplateURLService::CanAddAutogener
@@ -573,8 +581,8 @@ bool TemplateURLService::CanAddAutogener
// that may interfere with search queries). An easy heuristic for this is
// whether the user has a TemplateURL that has been manually modified (e.g.,
// renamed) connected to the same host.
@@ -92,7 +92,7 @@
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -2132,6 +2140,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2266,6 +2274,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
if (client_) {
client_->SetOwner(this);
}
@@ -2314,6 +2324,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2448,6 +2458,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -113,9 +113,9 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -875,6 +875,8 @@ class TemplateURLService final : public
raw_ref<search_engines::SearchEngineChoiceService>
search_engine_choice_service_;
@@ -893,6 +893,8 @@ class TemplateURLService final : public
raw_ref<TemplateURLPrepopulateData::Resolver> prepopulate_data_resolver_;
+ bool should_autocollect_; // Whether search engines should be auto-collected
+

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

@@ -8,7 +8,7 @@
#include "base/debug/alias.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
@@ -708,6 +709,13 @@ void Tab::OnGestureEvent(ui::GestureEven
@@ -719,6 +720,13 @@ void Tab::OnGestureEvent(ui::GestureEven
event->SetHandled();
}
@@ -42,7 +42,7 @@
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
@@ -1865,6 +1866,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -1888,6 +1889,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1427,7 +1427,8 @@ void BrowserCommandController::InitComma
@@ -1447,7 +1447,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -20,7 +20,7 @@
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
@@ -125,6 +126,7 @@ TabStripRegionView::TabStripRegionView(s
@@ -119,6 +120,7 @@ TabStripRegionView::TabStripRegionView(s
std::unique_ptr<TabStripComboButton> tab_strip_combo_button;
std::unique_ptr<ProductSpecificationsButton> product_specifications_button;
if (browser &&

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

@@ -9,9 +9,9 @@
+ "Set a custom value for the Accept header which is sent by the browser with every HTTP request. (e.g. `text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8`). ungoogled-chromium flag.",
+ kOsAll, ORIGIN_LIST_VALUE_TYPE("http-accept-header", "")},
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -231,6 +231,7 @@ std::string GetCombinedOriginListValue(c
--- a/components/webui/flags/flags_state.cc
+++ b/components/webui/flags/flags_state.cc
@@ -235,6 +235,7 @@ std::string GetCombinedOriginListValue(c
const std::string new_value =
flags_storage.GetOriginListFlag(internal_entry_name);
if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value;
@@ -19,7 +19,7 @@
return CombineAndSanitizeOriginLists(existing_value, new_value);
}
@@ -476,6 +477,7 @@ void FlagsState::SetOriginListFlag(const
@@ -484,6 +485,7 @@ void FlagsState::SetOriginListFlag(const
FlagsStorage* flags_storage) {
const std::string new_value =
internal_name == "custom-ntp" ? value :

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

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

4
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"
@@ -723,6 +724,10 @@ void TabStripModel::CloseAllTabsInGroup(
@@ -957,6 +958,10 @@ void TabStripModel::CloseAllTabsInGroup(
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));
@@ -19,7 +19,7 @@
CloseTabs({GetWebContentsAt(index)}, close_types);
}
@@ -1968,9 +1973,13 @@ TabStripModel::GetGroupsDestroyedFromRem
@@ -2205,9 +2210,13 @@ TabStripModel::GetGroupsDestroyedFromRem
void TabStripModel::ExecuteCloseTabsByIndices(
base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
uint32_t close_types) {

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

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

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

@@ -13,7 +13,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1204,6 +1204,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1207,6 +1207,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"
@@ -1368,7 +1369,8 @@ void HistoryBackend::InitImpl(
@@ -1369,7 +1370,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.
@@ -31,7 +31,7 @@
}
void HistoryBackend::OnMemoryPressure(
@@ -1600,6 +1602,8 @@ void HistoryBackend::AddPagesWithDetails
@@ -1597,6 +1599,8 @@ void HistoryBackend::AddPagesWithDetails
}
bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2141,6 +2141,10 @@ void BrowserView::ExitFullscreen() {
@@ -2161,6 +2161,10 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateExclusiveAccessBubble(
const ExclusiveAccessBubbleParams& params,
ExclusiveAccessBubbleHideCallback first_hide_callback) {

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

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

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

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/embedder_support/user_agent_utils.cc
+++ b/components/embedder_support/user_agent_utils.cc
@@ -145,6 +145,8 @@ const std::string& GetWindowsPlatformVer
@@ -142,6 +142,8 @@ const std::string& GetWindowsPlatformVer
// TODO(crbug.com/1330890): Remove this method along with policy.
bool ShouldReduceUserAgentMinorVersion(
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@@ -20,7 +20,7 @@
return ((user_agent_reduction !=
UserAgentReductionEnterprisePolicyState::kForceDisabled &&
base::FeatureList::IsEnabled(
@@ -168,6 +170,8 @@ bool ShouldReduceUserAgentMinorVersion(
@@ -165,6 +167,8 @@ bool ShouldReduceUserAgentMinorVersion(
// sending unified platform for the user agent string.
bool ShouldSendUserAgentUnifiedPlatform(
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@@ -29,7 +29,7 @@
#if BUILDFLAG(IS_ANDROID)
return ShouldReduceUserAgentMinorVersion(user_agent_reduction) &&
base::FeatureList::IsEnabled(
@@ -462,6 +466,8 @@ blink::UserAgentMetadata GetUserAgentMet
@@ -446,6 +450,8 @@ blink::UserAgentMetadata GetUserAgentMet
blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service,
bool only_low_entropy_ch) {
@@ -40,7 +40,7 @@
// Low entropy client hints.
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -21,6 +21,7 @@
@@ -19,6 +19,7 @@
namespace blink::features {
BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);

14
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
@@ -822,6 +822,8 @@ void UpdateNavigationRequestClientUaHead
@@ -826,6 +826,8 @@ void UpdateNavigationRequestClientUaHead
net::HttpRequestHeaders* headers,
const std::optional<GURL>& request_url) {
DCHECK(frame_tree_node);
@@ -20,9 +20,9 @@
if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) {
return;
}
@@ -843,6 +845,8 @@ void AddRequestClientHintsHeaders(
@@ -847,6 +849,8 @@ void AddRequestClientHintsHeaders(
FrameTreeNode* frame_tree_node,
const blink::ParsedPermissionsPolicy& container_policy,
const network::ParsedPermissionsPolicy& container_policy,
const std::optional<GURL>& request_url) {
+ if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints))
+ return;
@@ -31,7 +31,7 @@
data, container_policy);
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -22,6 +22,7 @@ namespace blink::features {
@@ -20,6 +20,7 @@ namespace blink::features {
BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -70,15 +70,15 @@
ua_data->SetBrandVersionList(metadata.brand_version_list);
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
@@ -48,6 +48,7 @@
@@ -51,6 +51,7 @@
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/client_hints/client_hints.h"
#include "third_party/blink/public/common/device_memory/approximated_device_memory.h"
+#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
#include "third_party/blink/public/mojom/loader/request_context_frame_type.mojom-blink.h"
#include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink.h"
@@ -509,6 +510,8 @@ void FrameFetchContext::ModifyRequestFor
#include "third_party/blink/public/platform/modules/service_worker/web_service_worker_network_provider.h"
@@ -502,6 +503,8 @@ void FrameFetchContext::ModifyRequestFor
void FrameFetchContext::AddClientHintsIfNecessary(
const std::optional<float> resource_width,
ResourceRequest& request) {

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

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

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

@@ -1,54 +1,106 @@
# Return generic values for WebGLDebugRendererInfo to remove a potential data
# leak while preventing potential website breakage
--- a/chrome/browser/ungoogled_flag_choices.h
+++ b/chrome/browser/ungoogled_flag_choices.h
@@ -79,4 +79,41 @@ const FeatureEntry::Choice kTabHoverCard
"tab-hover-cards",
"tooltip"},
};
+const FeatureEntry::FeatureParam kSpoofWebGL_Blank[] = {
+ {blink::features::kSpoofWebGLRenderer, " "},
+ {blink::features::kSpoofWebGLVendor, " "},
+};
+const FeatureEntry::FeatureParam kSpoofWebGL_Amd[] = {
+ {blink::features::kSpoofWebGLRenderer, "Radeon R9 200 Series, or similar"},
+ {blink::features::kSpoofWebGLVendor, "AMD"},
+};
+const FeatureEntry::FeatureParam kSpoofWebGL_Apple[] = {
+ {blink::features::kSpoofWebGLRenderer, "Apple GPU"},
+ {blink::features::kSpoofWebGLVendor, "Apple Inc."},
+};
+const FeatureEntry::FeatureParam kSpoofWebGL_Intel[] = {
+ {blink::features::kSpoofWebGLRenderer, "Intel(R) HD Graphics, or similar"},
+ {blink::features::kSpoofWebGLVendor, "Intel"},
+};
+const FeatureEntry::FeatureParam kSpoofWebGL_Mesa[] = {
+ {blink::features::kSpoofWebGLRenderer, "llvmpipe"},
+ {blink::features::kSpoofWebGLVendor, "Mesa"},
+};
+const FeatureEntry::FeatureParam kSpoofWebGL_Nvidia[] = {
+ {blink::features::kSpoofWebGLRenderer, "NVIDIA GeForce GTX 980, or similar"},
+ {blink::features::kSpoofWebGLVendor, "NVIDIA Corporation"},
+};
+const FeatureEntry::FeatureParam kSpoofWebGL_Qualcomm[] = {
+ {blink::features::kSpoofWebGLRenderer, "Adreno (TM) 610"},
+ {blink::features::kSpoofWebGLVendor, "Qualcomm"},
+};
+const FeatureEntry::FeatureVariation kSpoofWebGLChoices[] = {
+ {"Blank", kSpoofWebGL_Blank, std::size(kSpoofWebGL_Blank), nullptr},
+ {"AMD Radeon R9 200", kSpoofWebGL_Amd, std::size(kSpoofWebGL_Amd), nullptr},
+ {"Apple", kSpoofWebGL_Apple, std::size(kSpoofWebGL_Apple), nullptr},
+ {"Intel", kSpoofWebGL_Intel, std::size(kSpoofWebGL_Intel), nullptr},
+ {"Mesa LLVMpipe", kSpoofWebGL_Mesa, std::size(kSpoofWebGL_Mesa), nullptr},
+ {"NVIDIA GeForce GTX 980", kSpoofWebGL_Nvidia, std::size(kSpoofWebGL_Nvidia), nullptr},
+ {"Qualcomm Adreno 610", kSpoofWebGL_Qualcomm, std::size(kSpoofWebGL_Qualcomm), nullptr},
+};
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -136,4 +136,8 @@
"Remove Client Hints",
"Removes client hints (information sent to servers about your system, similar to a user agent). ungoogled-chromium flag.",
kOsAll, FEATURE_VALUE_TYPE(blink::features::kRemoveClientHints)},
@@ -140,4 +140,8 @@
"Enforce Certificate Transparency",
"Enforce Certificate Transparency for certificates that sites present. This is enabled by default. ungoogled-chromium flag.",
kOsAll, FEATURE_VALUE_TYPE(features::kCertificateTransparencyAskBeforeEnabling)},
+ {"spoof-webgl-info",
+ "Spoof WebGL Info",
+ "Return generic values for WebGLDebugRendererInfo to remove a potential data leak while preventing potential website breakage. ungoogled-chromium flag.",
+ kOsAll, FEATURE_VALUE_TYPE(blink::features::kSpoofWebGLInfo)},
+ kOsAll, FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kSpoofWebGLInfo, kSpoofWebGLChoices, "SpoofWebGLInfo")},
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -23,6 +23,7 @@ namespace blink::features {
@@ -21,6 +21,11 @@ namespace blink::features {
BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kRemoveClientHints, "RemoveClientHints", base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kSpoofWebGLInfo, "SpoofWebGLInfo", base::FEATURE_DISABLED_BY_DEFAULT);
+const char kSpoofWebGLRenderer[] = "renderer";
+const char kSpoofWebGLVendor[] = "vendor";
+const base::FeatureParam<std::string> kSpoofWebGLRendererParam{&kSpoofWebGLInfo, kSpoofWebGLRenderer, " "};
+const base::FeatureParam<std::string> kSpoofWebGLVendorParam{&kSpoofWebGLInfo, kSpoofWebGLVendor, " "};
// -----------------------------------------------------------------------------
// Feature definitions and associated constants (feature params, et cetera)
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -23,6 +23,7 @@ namespace features {
@@ -23,6 +23,11 @@ namespace features {
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag);
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo);
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRemoveClientHints);
+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kSpoofWebGLInfo);
+BLINK_COMMON_EXPORT extern const char kSpoofWebGLRenderer[];
+BLINK_COMMON_EXPORT extern const char kSpoofWebGLVendor[];
+BLINK_COMMON_EXPORT extern const base::FeatureParam<std::string> kSpoofWebGLRendererParam;
+BLINK_COMMON_EXPORT extern const base::FeatureParam<std::string> kSpoofWebGLVendorParam;
// -----------------------------------------------------------------------------
// 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
@@ -3858,6 +3858,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3860,6 +3860,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
+ if (base::FeatureList::IsEnabled(blink::features::kSpoofWebGLInfo))
+ return WebGLAny(script_state, String("ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (Subzero) (0x0000C0DE)), SwiftShader driver-5.0.0)"));
+ return WebGLAny(script_state, String(blink::features::kSpoofWebGLRendererParam.Get()));
return WebGLAny(script_state,
String(ContextGL()->GetString(GL_RENDERER)));
}
@@ -3873,6 +3875,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3875,6 +3877,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}
+ if (base::FeatureList::IsEnabled(blink::features::kSpoofWebGLInfo))
+ return WebGLAny(script_state, String("Google Inc. (Google)"));
+ return WebGLAny(script_state, String(blink::features::kSpoofWebGLVendorParam.Get()));
return WebGLAny(script_state,
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
@@ -4410,10 +4410,12 @@ const FeatureEntry::FeatureVariation kTa
@@ -4455,10 +4455,12 @@ const FeatureEntry::FeatureVariation
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

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

@@ -19,15 +19,15 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -161,6 +161,7 @@
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/header_util.h"
#include "services/network/public/cpp/is_potentially_trustworthy.h"
@@ -165,6 +165,7 @@
#include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy_features.h"
+#include "services/network/public/cpp/referrer_sanitizer.h"
#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"
@@ -387,10 +388,10 @@ void AddAdditionalRequestHeaders(
@@ -383,10 +384,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
@@ -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"
@@ -4636,10 +4637,13 @@ void RenderFrameImpl::FinalizeRequestInt
@@ -4650,10 +4651,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -100,7 +100,7 @@
--- a/services/network/public/cpp/BUILD.gn
+++ b/services/network/public/cpp/BUILD.gn
@@ -111,6 +111,8 @@ component("cpp") {
@@ -151,6 +151,8 @@ component("cpp") {
"private_network_access_check_result.cc",
"private_network_access_check_result.h",
"record_ontransfersizeupdate_utils.h",
@@ -241,7 +241,7 @@
#include "third_party/blink/public/platform/url_loader_throttle_provider.h"
#include "third_party/blink/public/platform/web_url_request_extra_data.h"
#include "third_party/blink/public/platform/websocket_handshake_throttle_provider.h"
@@ -161,10 +163,13 @@ void WebServiceWorkerFetchContextImpl::F
@@ -155,10 +157,13 @@ void WebServiceWorkerFetchContextImpl::F
request.SetURLRequestExtraData(std::move(url_request_extra_data));

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

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

20
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
@@ -48,6 +48,7 @@ namespace {
@@ -50,6 +50,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;
@@ -226,6 +227,8 @@ base::Value::Dict SearchEnginesHandler::
@@ -228,6 +229,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();
@@ -401,12 +404,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -403,12 +406,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();
@@ -436,6 +441,8 @@ bool SearchEnginesHandler::CheckFieldVal
@@ -438,6 +443,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();
}
@@ -458,18 +465,21 @@ void SearchEnginesHandler::HandleSearchE
@@ -460,18 +467,21 @@ void SearchEnginesHandler::HandleSearchE
return;
}
@@ -428,7 +428,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -924,7 +924,8 @@ void TemplateURLService::IncrementUsageC
@@ -975,7 +975,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
@@ -438,17 +438,17 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -939,6 +940,7 @@ void TemplateURLService::ResetTemplateUR
@@ -990,6 +991,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;
+ data.suggestions_url = suggestions_url;
Update(url, TemplateURL(data));
}
Update(url, base::FeatureList::IsEnabled(
syncer::kSeparateLocalAndAccountSearchEngines)
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -326,7 +326,8 @@ class TemplateURLService final : public
@@ -341,7 +341,8 @@ class TemplateURLService final : public
void ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,

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

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

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/media/webrtc/capture_policy_utils.cc
+++ b/chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -60,36 +60,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
@@ -56,36 +56,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
base::OnceCallback<void(bool)> callback,
content::BrowserContext* context,
bool is_multi_capture_allowed_for_any_origin_on_main_profile) {
@@ -37,7 +37,7 @@
}
void CheckAllScreensMediaAllowedForIwaResultReceived(
@@ -263,43 +234,13 @@ void RegisterProfilePrefs(PrefRegistrySi
@@ -257,43 +228,13 @@ void RegisterProfilePrefs(PrefRegistrySi
void CheckGetAllScreensMediaAllowedForAnyOrigin(
content::BrowserContext* context,
base::OnceCallback<void(bool)> callback) {

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
@@ -120,7 +120,6 @@ source_set("browser") {
"//components/payments/mojom",
@@ -127,7 +127,6 @@ source_set("browser") {
"//components/performance_manager/scenario_api",
"//components/power_monitor",
"//components/services/filesystem:lib",
- "//components/services/quarantine:quarantine",

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

@@ -0,0 +1,22 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -49,7 +49,7 @@ BASE_FEATURE(kBookmarkTriggerForPrerende
// switch.
BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling,
"CertificateTransparencyAskBeforeEnabling",
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#if true
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -136,4 +136,8 @@
"Remove Client Hints",
"Removes client hints (information sent to servers about your system, similar to a user agent). ungoogled-chromium flag.",
kOsAll, FEATURE_VALUE_TYPE(blink::features::kRemoveClientHints)},
+ {"enforce-certificate-transparency",
+ "Enforce Certificate Transparency",
+ "Enforce Certificate Transparency for certificates that sites present. This is enabled by default. ungoogled-chromium flag.",
+ kOsAll, FEATURE_VALUE_TYPE(features::kCertificateTransparencyAskBeforeEnabling)},
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_

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

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

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

@@ -14,7 +14,7 @@
}
return content_restrictions;
}
@@ -1727,8 +1722,7 @@ bool CanSavePage(const Browser* browser)
@@ -1723,8 +1718,7 @@ bool CanSavePage(const Browser* browser)
policy::DownloadRestriction::ALL_FILES) {
return false;
}

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -227,12 +227,10 @@ TabStripRegionView::TabStripRegionView(s
@@ -222,12 +222,10 @@ TabStripRegionView::TabStripRegionView(s
new_tab_button_->GetViewAccessibility().SetName(
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
@@ -15,7 +15,7 @@
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2107,8 +2107,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2130,8 +2130,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 "
@@ -2119,7 +2117,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2142,7 +2140,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1117,6 +1117,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1013,6 +1013,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -10,7 +10,7 @@
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -44,6 +44,7 @@
@@ -43,6 +43,7 @@
#include "chrome/browser/ui/webui/signin_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
@@ -18,7 +18,7 @@
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
#include "chrome/browser/ui/webui/version/version_ui.h"
@@ -244,6 +245,7 @@ void RegisterChromeWebUIConfigs() {
@@ -248,6 +249,7 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<SiteEngagementUIConfig>());
map.AddWebUIConfig(std::make_unique<SyncInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<TranslateInternalsUIConfig>());

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

@@ -1,23 +1,25 @@
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -30,6 +30,7 @@
--- a/components/webui/flags/flags_state.cc
+++ b/components/webui/flags/flags_state.cc
@@ -31,6 +31,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
+#include "chrome/browser/unexpire_flags.h"
#include "components/flags_ui/feature_entry.h"
#include "components/flags_ui/flags_storage.h"
#include "components/flags_ui/flags_ui_switches.h"
@@ -667,13 +668,17 @@ void FlagsState::GetFlagFeatureEntries(
#include "components/variations/field_trial_config/field_trial_util.h"
#include "components/variations/variations_associated_data.h"
#include "components/variations/variations_switches.h"
@@ -681,14 +682,19 @@ void FlagsState::GetFlagFeatureEntries(
int current_platform = GetCurrentPlatform();
for (const FeatureEntry& entry : feature_entries_) {
+ std::string desc = entry.visible_description;
if (skip_feature_entry.Run(entry))
+ if (flags::IsFlagExpired(flags_storage, entry.internal_name))
+ desc.insert(0, "!!! NOTE: THIS FLAG IS EXPIRED AND MAY STOP FUNCTIONING OR BE REMOVED SOON !!! ");
+ else
if (skip_feature_entry.Run(entry)) {
+ if (flags::IsFlagExpired(flags_storage, entry.internal_name)) {
+ desc.insert(0, "!!! NOTE: THIS FLAG IS EXPIRED AND MAY STOP FUNCTIONING OR BE REMOVED SOON !!! ");
+ } else {
continue;
+ }
}
base::Value::Dict data;
data.Set("internal_name", entry.internal_name);
@@ -27,11 +29,13 @@
base::Value::List supported_platforms;
AddOsStrings(entry.supported_platforms, &supported_platforms);
@@ -1074,6 +1079,7 @@ bool FlagsState::IsSupportedFeature(cons
if (!entry.InternalNameMatches(name))
@@ -1097,7 +1103,9 @@ bool FlagsState::IsSupportedFeature(cons
continue;
if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))
+ if (!flags::IsFlagExpired(storage, entry.internal_name))
}
if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) {
+ if (!flags::IsFlagExpired(storage, entry.internal_name)) {
continue;
+ }
}
return true;
}

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

@@ -11,7 +11,6 @@
# update status text on the About page
# link to Google's help site on the About page
# external link for theme entry on settings page
# webstore text for theme entry on settings page
# the Google account line from the Payment methods page
# Safety check section on the settings page
# Privacy guide promo on the privacy page
@@ -35,7 +34,7 @@
--- a/chrome/app/settings_chromium_strings.grdp
+++ b/chrome/app/settings_chromium_strings.grdp
@@ -370,13 +370,13 @@
@@ -367,13 +367,13 @@
<!-- Performance Page -->
<message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
@@ -54,7 +53,7 @@
<!-- Languages Page -->
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1186,7 +1186,7 @@
@@ -1183,7 +1183,7 @@
Active site
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP" desc="Help text shown on the second tab of the tab discarding exception list add dialog. Explains how to use the filter format to add an exclusion rule to the list.">
@@ -63,7 +62,7 @@
</message>
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
Power
@@ -1210,7 +1210,7 @@
@@ -1207,7 +1207,7 @@
Inactive tabs appearance
</message>
<message name="IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK" desc="Label for a performance settings toggle description that controls whether the inactive tab UI is shown. Also contains a link to the help center article.">
@@ -72,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
@@ -1222,7 +1222,7 @@
@@ -1219,7 +1219,7 @@
Performance issue alerts
</message>
<message name="IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION" desc="Label for a performance settings toggle that controls whether performance intervention notifications should be shown and link to learn more about performance issue alerts.">
@@ -220,28 +219,9 @@
<if expr="_google_chrome">
<cr-link-row class="hr" id="reportIssue" on-click="onReportIssueClick_"
hidden="[[!prefs.feedback_allowed.value]]"
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -503,15 +503,11 @@ export class SettingsAppearancePageEleme
i18nId = 'classicTheme';
break;
}
+ this.themeSublabel_ = this.i18n(i18nId);
// </if>
// <if expr="not is_linux">
- if (this.toolbarPinningEnabled_) {
this.themeSublabel_ = '';
- return;
- }
- i18nId = 'chooseFromWebStore';
// </if>
- this.themeSublabel_ = this.i18n(i18nId);
}
/** @return Whether applied theme is set by policy. */
--- a/chrome/browser/resources/settings/autofill_page/payments_section.html
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
@@ -80,11 +80,6 @@
@@ -89,11 +89,6 @@
</div>
</template>
@@ -255,7 +235,7 @@
<template is="dom-if"
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -70,7 +70,7 @@
@@ -72,7 +72,7 @@
<!-- TODO(crbug.com/40267370): Add a test to basic_page_test.ts
to check that settings-safety-hub-entry-point is not visible
in the guest mode. -->
@@ -266,15 +246,15 @@
section="safetyHubEntryPoint" nest-under-section="privacy"
--- a/chrome/browser/resources/settings/basic_page/basic_page.ts
+++ b/chrome/browser/resources/settings/basic_page/basic_page.ts
@@ -13,7 +13,6 @@ import 'chrome://resources/cr_elements/c
import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
import '../ai_page/ai_page.js';
@@ -16,7 +16,6 @@ import '../ai_page/ai_page.js';
import '../glic_page/glic_page.js';
// </if>
import '../appearance_page/appearance_page.js';
-import '../privacy_page/privacy_guide/privacy_guide_promo.js';
import '../privacy_page/privacy_page.js';
import '../safety_hub/safety_hub_entry_point.js';
import '../autofill_page/autofill_page.js';
@@ -274,7 +273,6 @@ export class SettingsBasicPageElement ex
@@ -280,7 +279,6 @@ export class SettingsBasicPageElement ex
this.showPrivacyGuidePromo_ = false;
return;
}
@@ -321,7 +301,7 @@
// <if expr="chromeos_ash">
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -41,15 +41,6 @@
@@ -48,15 +48,6 @@
label="$i18n{clearBrowsingData}"
sub-label="$i18n{clearBrowsingDataDescription}"
on-click="onClearBrowsingDataClick_"></cr-link-row>
@@ -386,7 +366,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -963,16 +963,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -959,16 +959,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -405,7 +385,7 @@
////////////////////////////////////////////////////////////////////////////////
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -1210,15 +1210,4 @@ void BookmarkMenuDelegate::BuildOtherNod
@@ -1234,15 +1234,4 @@ void BookmarkMenuDelegate::BuildOtherNod
ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
ui::SimpleMenuModel::kDefaultIconSize);
@@ -440,7 +420,7 @@
void CookieControlsContentView::AddDescriptionRow() {
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -230,6 +230,7 @@ void ProfileMenuView::BuildMenu() {
@@ -223,6 +223,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -448,7 +428,7 @@
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession()) {
return gfx::ImageSkia();
@@ -668,16 +669,8 @@ void ProfileMenuView::BuildIdentity() {
@@ -645,16 +646,8 @@ void ProfileMenuView::BuildIdentity() {
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
std::string profile_user_display_name, profile_user_email;
@@ -503,7 +483,7 @@
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -932,40 +932,20 @@ void AddPerformanceStrings(content::WebU
@@ -920,40 +920,20 @@ void AddPerformanceStrings(content::WebU
IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
{"performanceInterventionEnabledLabel",
IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
@@ -553,7 +533,7 @@
html_source->AddString(
"tabDiscardTimerFiveMinutes",
@@ -1011,11 +991,6 @@ void AddPerformanceStrings(content::WebU
@@ -999,11 +979,6 @@ void AddPerformanceStrings(content::WebU
base::NumberToString16(
performance_manager::user_tuning::BatterySaverModeManager::
kLowBatteryThresholdPercent)));
@@ -565,7 +545,7 @@
html_source->AddString("discardRingTreatmentLearnMoreUrl",
chrome::kDiscardRingTreatmentLearnMoreUrl);
@@ -3453,7 +3428,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3465,7 +3440,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -576,7 +556,7 @@
html_source->AddBoolean(
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -623,13 +623,7 @@ SettingsUI::SettingsUI(content::WebUI* w
@@ -632,13 +632,7 @@ SettingsUI::SettingsUI(content::WebUI* w
auto* optimization_guide_service =
OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
for (auto [key, name] : optimization_guide_features) {
@@ -590,21 +570,21 @@
+ html_source->AddBoolean(name, false);
}
html_source->AddBoolean("showAdvancedFeaturesMainControl",
is_any_ai_feature_enabled |= glic_enabled;
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -854,7 +854,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
@@ -838,7 +838,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
base::FEATURE_DISABLED_BY_DEFAULT);
// Enables the Live Caption feature on supported devices.
-BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_DISABLED_BY_DEFAULT);
// Controls whether a "Share this tab instead" button should be shown for
// getDisplayMedia captures. Note: This flag does not control if the "Share this
// 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
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -868,7 +868,7 @@ void MenuItemView::SetAlerted() {
@@ -869,7 +869,7 @@ void MenuItemView::SetAlerted() {
}
bool MenuItemView::ShouldShowNewBadge() const {

2
patches/helium-ui/adjust-immersive-padding.patch
View File

@@ -9,7 +9,7 @@
class ImmersiveModeFocusSearchMac : public views::FocusSearch {
public:
@@ -229,11 +229,9 @@ void ImmersiveModeControllerMac::SetEnab
@@ -233,11 +233,9 @@ void ImmersiveModeControllerMac::SetEnab
gfx::Insets ImmersiveModeControllerMac::GetTabStripRegionViewInsets() {
int right_left_inset = kTabAlignmentInset + kTrafficLightsWidth;

4
patches/helium-ui/app-menu-style.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/app_menu.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -252,7 +252,7 @@ class InMenuButtonBackground : public vi
@@ -251,7 +251,7 @@ class InMenuButtonBackground : public vi
constexpr int kCircularButtonSize = 28;
bounds_rect.ClampToCenteredSize(
gfx::Size(kCircularButtonSize, kCircularButtonSize));
@@ -9,7 +9,7 @@
}
const auto* const color_provider = view->GetColorProvider();
cc::PaintFlags flags;
@@ -1393,7 +1393,7 @@ void AppMenu::PopulateMenu(MenuItemView*
@@ -1422,7 +1422,7 @@ void AppMenu::PopulateMenu(MenuItemView*
// Helper method that adds a background to a menu item.
auto add_menu_row_background = [item](int vertical_margin,
ui::ColorId background_color_id) {

25
patches/helium-ui/clean-app-menu-model.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -741,9 +741,6 @@ SaveAndShareSubMenuModel::SaveAndShareSu
@@ -738,9 +738,6 @@ SaveAndShareSubMenuModel::SaveAndShareSu
if (!sharing_hub::SharingIsDisabledByPolicy(browser->profile())) {
AddItemWithStringIdAndVectorIcon(
this, IDC_COPY_URL, IDS_APP_MENU_COPY_LINK, kLinkChromeRefreshIcon);
@@ -10,7 +10,7 @@
AddItemWithStringIdAndVectorIcon(this, IDC_QRCODE_GENERATOR,
IDS_APP_MENU_CREATE_QR_CODE,
kQrCodeChromeRefreshIcon);
@@ -886,13 +883,6 @@ void ToolsMenuModel::Build(Browser* brow
@@ -882,13 +879,6 @@ void ToolsMenuModel::Build(Browser* brow
AddSeparator(ui::NORMAL_SEPARATOR);
@@ -24,7 +24,7 @@
AddSeparator(ui::NORMAL_SEPARATOR);
if (!features::IsExtensionMenuInRootAppMenu()) {
AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
@@ -1769,32 +1759,6 @@ void AppMenuModel::Build() {
@@ -1765,32 +1755,6 @@ void AppMenuModel::Build() {
AddSeparator(ui::NORMAL_SEPARATOR);
@@ -57,7 +57,7 @@
if (!browser_->profile()->IsOffTheRecord()) {
auto recent_tabs_sub_menu =
std::make_unique<RecentTabsSubMenuModel>(provider_, browser_);
@@ -1833,15 +1797,11 @@ void AppMenuModel::Build() {
@@ -1829,15 +1793,11 @@ void AppMenuModel::Build() {
kTabGroupsMenuItem);
}
@@ -78,9 +78,9 @@
AddItemWithStringIdAndVectorIcon(this, IDC_CLEAR_BROWSING_DATA,
IDS_CLEAR_BROWSING_DATA,
kTrashCanRefreshIcon);
@@ -1869,9 +1829,6 @@ void AppMenuModel::Build() {
@@ -1868,9 +1828,6 @@ void AppMenuModel::Build() {
lens::features::kLensOverlay));
}
#endif
- AddItemWithStringIdAndVectorIcon(this, IDC_SHOW_TRANSLATE, IDS_SHOW_TRANSLATE,
- kTranslateIcon);
@@ -88,16 +88,3 @@
CreateFindAndEditSubMenu();
sub_menus_.push_back(
@@ -1912,11 +1869,7 @@ void AppMenuModel::Build() {
AddSubMenuWithStringIdAndVectorIcon(this, IDC_HELP_MENU, IDS_HELP_MENU,
sub_menus_.back().get(), kHelpMenuIcon);
#else
-#if BUILDFLAG(IS_CHROMEOS)
- AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
-#else
- AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
-#endif
+ AddItemWithStringIdAndVectorIcon(this, IDC_ABOUT, IDS_ABOUT, kHelpMenuIcon);
#endif
AddItemWithStringIdAndVectorIcon(this, IDC_OPTIONS, IDS_SETTINGS,

6
patches/helium-ui/clean-up-installed-extension-bubble.patch
View File

@@ -1,12 +1,12 @@
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
@@ -201,22 +201,6 @@ void ExtensionInstalledBubbleView::Init(
@@ -203,22 +203,6 @@ void ExtensionInstalledBubbleView::Init(
layout->set_cross_axis_alignment(
views::BoxLayout::CrossAxisAlignment::kStart);
SetLayoutManager(std::move(layout));
-
- if (model_->show_how_to_use()) {
- AddChildView(CreateLabel(model_->GetHowToUseText()));
- AddChildViewRaw(CreateLabel(model_->GetHowToUseText()));
- }
-
- if (model_->show_key_binding()) {
@@ -22,4 +22,4 @@
- }
}
void ExtensionInstalledBubbleView::OnSignIn(const AccountInfo& account) {
void ExtensionInstalledBubbleView::LinkClicked() {

6
patches/helium-ui/fix-customize-side-panel.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/resources/side_panel/customize_chrome/app.ts
+++ b/chrome/browser/resources/side_panel/customize_chrome/app.ts
@@ -133,24 +133,6 @@ export class AppElement extends AppEleme
@@ -130,24 +130,6 @@ export class AppElement extends AppEleme
element.scrollIntoView({behavior: 'auto'});
});
@@ -25,7 +25,7 @@
this.pageHandler_.updateAttachedTabState();
// We wait for load because `scrollIntoView` above requires the page to be
@@ -275,10 +257,6 @@ export class AppElement extends AppEleme
@@ -272,10 +254,6 @@ export class AppElement extends AppEleme
await this.updateComplete;
page.focusOnBackButton();
}
@@ -38,7 +38,7 @@
declare global {
--- a/chrome/browser/resources/side_panel/customize_chrome/appearance.ts
+++ b/chrome/browser/resources/side_panel/customize_chrome/appearance.ts
@@ -129,12 +129,6 @@ export class AppearanceElement extends A
@@ -128,12 +128,6 @@ export class AppearanceElement extends A
});
this.pageHandler_.updateTheme();

10
patches/helium-ui/location-bar-style.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -544,7 +544,9 @@ gfx::RoundedCornersF IconLabelBubbleView
@@ -546,7 +546,9 @@ gfx::RoundedCornersF IconLabelBubbleView
if (radii_.has_value()) {
return radii_.value();
}
@@ -13,7 +13,7 @@
void IconLabelBubbleView::SetCornerRadii(const gfx::RoundedCornersF& radii) {
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -222,7 +222,10 @@ LocationBarView::LocationBarView(Browser
@@ -223,7 +223,10 @@ LocationBarView::LocationBarView(Browser
!v->GetOmniboxPopupView()->IsOpen();
}));
views::FocusRing::Get(this)->SetOutsetFocusRingDisabled(true);
@@ -25,7 +25,7 @@
#if BUILDFLAG(OS_LEVEL_GEOLOCATION_PERMISSION_SUPPORTED)
if (features::IsOsLevelGeolocationPermissionSupportEnabled()) {
@@ -489,7 +492,7 @@ bool LocationBarView::IsInitialized() co
@@ -490,7 +493,7 @@ bool LocationBarView::IsInitialized() co
int LocationBarView::GetBorderRadius() const {
return ChromeLayoutProvider::Get()->GetCornerRadiusMetric(
@@ -34,7 +34,7 @@
}
std::unique_ptr<views::Background> LocationBarView::CreateRoundRectBackground(
@@ -759,7 +762,7 @@ void LocationBarView::Layout(PassKey) {
@@ -761,7 +764,7 @@ void LocationBarView::Layout(PassKey) {
// The padding between the left edges of the location bar and the LHS icon
// (e.g. the page info icon, the google G icon, the selected suggestion icon,
// etc)
@@ -43,7 +43,7 @@
// The padding between the LHS icon and the text.
int text_left = 8;
// Indentation to match the suggestion icons & texts.
@@ -1226,7 +1229,7 @@ int LocationBarView::GetMinimumTrailingW
@@ -1240,7 +1243,7 @@ int LocationBarView::GetMinimumTrailingW
}
gfx::Rect LocationBarView::GetLocalBoundsWithoutEndcaps() const {

4
patches/helium-ui/narrow-layout-provider.patch
View File

@@ -1,6 +1,6 @@
--- a/ui/views/layout/layout_provider.cc
+++ b/ui/views/layout/layout_provider.cc
@@ -199,17 +199,17 @@ ShapeSysTokens GetShapeSysToken(ShapeCon
@@ -199,19 +199,19 @@ ShapeSysTokens GetShapeSysToken(ShapeCon
static constexpr auto shape_token_map =
base::MakeFixedFlatMap<ShapeContextTokens, ShapeSysTokens>({
{ShapeContextTokens::kBadgeRadius, ShapeSysTokens::kXSmall},
@@ -9,6 +9,8 @@
{ShapeContextTokens::kComboboxRadius, ShapeSysTokens::kSmall},
- {ShapeContextTokens::kDialogRadius, ShapeSysTokens::kMediumSmall},
+ {ShapeContextTokens::kDialogRadius, ShapeSysTokens::kSmall},
{ShapeContextTokens::kExtensionsMenuButtonRadius,
ShapeSysTokens::kXSmall},
{ShapeContextTokens::kFindBarViewRadius, ShapeSysTokens::kSmall},
- {ShapeContextTokens::kMenuRadius, ShapeSysTokens::kMediumSmall},
- {ShapeContextTokens::kMenuAuxRadius, ShapeSysTokens::kMediumSmall},

4
patches/helium-ui/omnibox-style.patch
View File

@@ -70,7 +70,7 @@
BEGIN_METADATA(OmniboxRowView)
--- a/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc
@@ -587,7 +587,7 @@ int OmniboxMatchCellView::GetImageIndent
@@ -599,7 +599,7 @@ int OmniboxMatchCellView::GetImageIndent
// b) Entities, answers, and icons continue to be center-aligned.
// c) Regardless of the state of those other features and their widths.
// This applies to both touch-UI and non-touch-UI.
@@ -79,7 +79,7 @@
return indent;
}
@@ -617,7 +617,7 @@ int OmniboxMatchCellView::GetTextIndent(
@@ -629,7 +629,7 @@ int OmniboxMatchCellView::GetTextIndent(
// For normal matches, the gap between the left edge of this view and the
// left edge of its favicon or answer image.

4
patches/helium-ui/remove-dead-profile-actions.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -189,7 +189,7 @@ void ProfileMenuView::BuildMenu() {
@@ -185,7 +185,7 @@ void ProfileMenuView::BuildMenu() {
BuildIdentity();
// Users should not be able to open chrome settings from WebApps.
@@ -11,7 +11,7 @@
}
--- a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -682,8 +682,6 @@ void ProfileMenuViewBase::SetProfileIden
@@ -690,8 +690,6 @@ void ProfileMenuViewBase::SetProfileIden
BuildProfileBackgroundContainer(
std::move(heading_label), profile_background_color,
std::move(avatar_image_view), std::move(edit_button), avatar_header_art);

207
patches/helium-ui/remove-dead-toolbar-actions.patch
View File

@@ -1,15 +1,15 @@
--- a/chrome/browser/ui/browser_actions.cc
+++ b/chrome/browser/ui/browser_actions.cc
@@ -31,8 +31,6 @@
#include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
@@ -35,8 +35,6 @@
#include "chrome/browser/ui/passwords/passwords_model_delegate.h"
#include "chrome/browser/ui/performance_controls/memory_saver_bubble_controller.h"
#include "chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h"
-#include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble.h"
-#include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
#include "chrome/browser/ui/tabs/public/tab_features.h"
#include "chrome/browser/ui/tabs/public/tab_interface.h"
#include "chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.h"
@@ -41,7 +39,6 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
@@ -46,7 +44,6 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/media_router/cast_browser_controller.h"
#include "chrome/browser/ui/views/page_info/page_info_view_factory.h"
@@ -17,7 +17,7 @@
#include "chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_utils.h"
#include "chrome/browser/ui/views/side_panel/side_panel_action_callback.h"
#include "chrome/browser/ui/views/side_panel/side_panel_entry_id.h"
@@ -162,10 +159,6 @@ void BrowserActions::InitializeBrowserAc
@@ -178,10 +175,6 @@ void BrowserActions::InitializeBrowserAc
SidePanelEntryId::kBookmarks, IDS_BOOKMARK_MANAGER_TITLE,
IDS_BOOKMARK_MANAGER_TITLE, kBookmarksSidePanelRefreshIcon,
kActionSidePanelShowBookmarks, browser, true),
@@ -28,7 +28,7 @@
SidePanelAction(SidePanelEntryId::kAboutThisSite,
IDS_PAGE_INFO_ABOUT_THIS_PAGE_TITLE,
IDS_PAGE_INFO_ABOUT_THIS_PAGE_TITLE,
@@ -177,24 +170,11 @@ void BrowserActions::InitializeBrowserAc
@@ -193,24 +186,11 @@ void BrowserActions::InitializeBrowserAc
IDS_SIDE_PANEL_CUSTOMIZE_CHROME_TITLE,
vector_icons::kEditChromeRefreshIcon,
kActionSidePanelShowCustomizeChrome, browser,
@@ -54,7 +54,7 @@
root_action_item_->AddChild(
SidePanelAction(SidePanelEntryId::kHistoryClusters, IDS_HISTORY_TITLE,
IDS_HISTORY_CLUSTERS_SHOW_SIDE_PANEL,
@@ -203,13 +183,7 @@ void BrowserActions::InitializeBrowserAc
@@ -219,13 +199,7 @@ void BrowserActions::InitializeBrowserAc
.Build());
}
@@ -69,114 +69,113 @@
actions::ActionItem::InvokeActionCallback callback = base::BindRepeating(
[](base::WeakPtr<Browser> browser, actions::ActionItem* item,
actions::ActionInvocationContext context) {
@@ -319,43 +293,6 @@ void BrowserActions::InitializeBrowserAc
kActionDevTools, IDS_DEV_TOOLS, IDS_DEV_TOOLS, kDeveloperToolsIcon)
.Build());
- if (send_tab_to_self::SendTabToSelfToolbarIconController::CanShowOnBrowser(
- browser)) {
- root_action_item_->AddChild(
- ChromeMenuAction(
- base::BindRepeating(
- [](Browser* browser, actions::ActionItem* item,
- actions::ActionInvocationContext context) {
- auto* bubble_controller =
- browser->browser_window_features()
- ->send_tab_to_self_toolbar_bubble_controller();
- if (bubble_controller->IsBubbleShowing()) {
- bubble_controller->HideBubble();
- } else {
- send_tab_to_self::ShowBubble(
- browser->tab_strip_model()->GetActiveWebContents());
- }
- },
- base::Unretained(browser)),
- kActionSendTabToSelf, IDS_SEND_TAB_TO_SELF, IDS_SEND_TAB_TO_SELF,
- kDevicesChromeRefreshIcon)
- .SetEnabled(chrome::CanSendTabToSelf(browser))
- .SetVisible(
- !sharing_hub::SharingIsDisabledByPolicy(browser->profile()))
- .Build());
- }
-
- root_action_item_->AddChild(
- ChromeMenuAction(base::BindRepeating(
- [](Browser* browser, actions::ActionItem* item,
- actions::ActionInvocationContext context) {
- chrome::ShowTranslateBubble(browser);
- },
- base::Unretained(browser)),
- kActionShowTranslate, IDS_SHOW_TRANSLATE,
- IDS_TOOLTIP_TRANSLATE, kTranslateIcon)
- .Build());
-
root_action_item_->AddChild(
ChromeMenuAction(base::BindRepeating(
[](Browser* browser, actions::ActionItem* item,
@@ -370,56 +307,6 @@ void BrowserActions::InitializeBrowserAc
!sharing_hub::SharingIsDisabledByPolicy(browser->profile()))
.Build());
@@ -372,43 +346,6 @@ void BrowserActions::InitializeBrowserAc
kDeveloperToolsIcon)
.Build());
- if (send_tab_to_self::SendTabToSelfToolbarIconController::CanShowOnBrowser(
- browser)) {
- root_action_item_->AddChild(
- ChromeMenuAction(
- base::BindRepeating(
- [](Browser* browser, actions::ActionItem* item,
- actions::ActionInvocationContext context) {
- auto* controller =
- autofill::AddressBubblesIconController::Get(
- browser->tab_strip_model()->GetActiveWebContents());
- if (controller && controller->GetBubbleView()) {
- controller->GetBubbleView()->Hide();
- auto* bubble_controller =
- browser->browser_window_features()
- ->send_tab_to_self_toolbar_bubble_controller();
- if (bubble_controller->IsBubbleShowing()) {
- bubble_controller->HideBubble();
- } else {
- chrome::ShowAddresses(browser);
- send_tab_to_self::ShowBubble(
- browser->tab_strip_model()->GetActiveWebContents());
- }
- },
- base::Unretained(browser)),
- kActionShowAddressesBubbleOrPage,
- IDS_ADDRESSES_AND_MORE_SUBMENU_OPTION,
- IDS_ADDRESSES_AND_MORE_SUBMENU_OPTION,
- vector_icons::kLocationOnChromeRefreshIcon)
- .SetEnabled(!is_guest_session)
- kActionSendTabToSelf, IDS_SEND_TAB_TO_SELF, IDS_SEND_TAB_TO_SELF,
- kDevicesChromeRefreshIcon)
- .SetEnabled(chrome::CanSendTabToSelf(browser))
- .SetVisible(
- !sharing_hub::SharingIsDisabledByPolicy(browser->profile()))
- .Build());
- }
-
- root_action_item_->AddChild(
- ChromeMenuAction(
- base::BindRepeating(
- [](Browser* browser, actions::ActionItem* item,
- actions::ActionInvocationContext context) {
- auto hide_bubble = [&browser](int command_id) -> bool {
- auto* controller = autofill::SavePaymentIconController::Get(
- browser->tab_strip_model()->GetActiveWebContents(),
- command_id);
- if (controller && controller->GetPaymentBubbleView()) {
- controller->GetPaymentBubbleView()->Hide();
- return true;
- }
- return false;
- };
- const bool bubble_hidden =
- hide_bubble(IDC_SAVE_CREDIT_CARD_FOR_PAGE) ||
- hide_bubble(IDC_SAVE_IBAN_FOR_PAGE);
- if (!bubble_hidden) {
- chrome::ShowPaymentMethods(browser);
- }
- },
- base::Unretained(browser)),
- kActionShowPaymentsBubbleOrPage, IDS_PAYMENT_METHOD_SUBMENU_OPTION,
- IDS_PAYMENT_METHOD_SUBMENU_OPTION, kCreditCardChromeRefreshIcon)
- .SetEnabled(!is_guest_session)
- .Build());
- root_action_item_->AddChild(
- ChromeMenuAction(base::BindRepeating(
- [](Browser* browser, actions::ActionItem* item,
- actions::ActionInvocationContext context) {
- chrome::ShowTranslateBubble(browser);
- },
- base::Unretained(browser)),
- kActionShowTranslate, IDS_SHOW_TRANSLATE,
- IDS_TOOLTIP_TRANSLATE, kTranslateIcon)
- .Build());
-
if (IsChromeLabsEnabled()) {
// TODO(b/354758327): Update `ShouldShowChromeLabsUI()` to not require
// `model` as a parameter, then use to set visibility of action item.
@@ -462,7 +349,8 @@ void BrowserActions::InitializeBrowserAc
base::Unretained(browser)),
kActionShowPasswordsBubbleOrPage, IDS_VIEW_PASSWORDS,
IDS_VIEW_PASSWORDS, vector_icons::kPasswordManagerIcon)
- .SetEnabled(!is_guest_session)
+ .SetEnabled(false)
+ .SetVisible(false)
.Build());
root_action_item_->AddChild(
ChromeMenuAction(base::BindRepeating(
[](Browser* browser, actions::ActionItem* item,
@@ -423,55 +360,6 @@ void BrowserActions::InitializeBrowserAc
!sharing_hub::SharingIsDisabledByPolicy(browser->profile()))
.Build());
root_action_item_->AddChild(
- root_action_item_->AddChild(
- ChromeMenuAction(
- base::BindRepeating(
- [](Browser* browser, actions::ActionItem* item,
- actions::ActionInvocationContext context) {
- auto* controller = autofill::AddressBubblesIconController::Get(
- browser->tab_strip_model()->GetActiveWebContents());
- if (controller && controller->GetBubbleView()) {
- controller->GetBubbleView()->Hide();
- } else {
- chrome::ShowAddresses(browser);
- }
- },
- base::Unretained(browser)),
- kActionShowAddressesBubbleOrPage,
- IDS_ADDRESSES_AND_MORE_SUBMENU_OPTION,
- IDS_ADDRESSES_AND_MORE_SUBMENU_OPTION,
- vector_icons::kLocationOnChromeRefreshIcon)
- .SetEnabled(!is_guest_session)
- .Build());
-
- root_action_item_->AddChild(
- ChromeMenuAction(
- base::BindRepeating(
- [](Browser* browser, actions::ActionItem* item,
- actions::ActionInvocationContext context) {
- auto hide_bubble = [&browser](int command_id) -> bool {
- auto* controller = autofill::SavePaymentIconController::Get(
- browser->tab_strip_model()->GetActiveWebContents(),
- command_id);
- if (controller && controller->GetPaymentBubbleView()) {
- controller->GetPaymentBubbleView()->Hide();
- return true;
- }
- return false;
- };
- const bool bubble_hidden =
- hide_bubble(IDC_SAVE_CREDIT_CARD_FOR_PAGE) ||
- hide_bubble(IDC_SAVE_IBAN_FOR_PAGE);
- if (!bubble_hidden) {
- chrome::ShowPaymentMethods(browser);
- }
- },
- base::Unretained(browser)),
- kActionShowPaymentsBubbleOrPage, IDS_PAYMENT_METHOD_SUBMENU_OPTION,
- IDS_PAYMENT_METHOD_SUBMENU_OPTION, kCreditCardChromeRefreshIcon)
- .SetEnabled(!is_guest_session)
- .Build());
-
if (IsChromeLabsEnabled() &&
!web_app::AppBrowserController::IsWebApp(browser)) {
// TODO(354758327): Update `ShouldShowChromeLabsUI()` to not require
@@ -514,7 +402,8 @@ void BrowserActions::InitializeBrowserAc
base::Unretained(browser)),
kActionShowPasswordsBubbleOrPage, IDS_VIEW_PASSWORDS,
IDS_VIEW_PASSWORDS, vector_icons::kPasswordManagerIcon)
- .SetEnabled(!is_guest_session)
+ .SetEnabled(false)
+ .SetVisible(false)
.Build());
root_action_item_->AddChild(

51
patches/helium-ui/remove-toolbar-corners.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -270,18 +270,6 @@ void ToolbarView::Init() {
@@ -267,18 +267,6 @@ void ToolbarView::Init() {
aura::WindowOcclusionTracker::ScopedPause pause_occlusion;
#endif
@@ -19,7 +19,7 @@
auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this,
display_mode_ != DisplayMode::NORMAL);
@@ -855,13 +843,6 @@ void ToolbarView::Layout(PassKey) {
@@ -835,13 +823,6 @@ void ToolbarView::Layout(PassKey) {
// The container view should be the exact same size/position as ToolbarView.
container_view_->SetSize(size());
@@ -33,7 +33,7 @@
if (display_mode_ == DisplayMode::CUSTOM_TAB) {
custom_tab_bar_->SetBounds(0, 0, width(),
custom_tab_bar_->GetPreferredSize().height());
@@ -871,7 +852,6 @@ void ToolbarView::Layout(PassKey) {
@@ -851,7 +832,6 @@ void ToolbarView::Layout(PassKey) {
if (display_mode_ == DisplayMode::NORMAL) {
LayoutCommon();
@@ -41,46 +41,33 @@
}
if (toolbar_controller_) {
@@ -909,50 +889,6 @@ void ToolbarView::OnThemeChanged() {
@@ -889,37 +869,6 @@ void ToolbarView::OnThemeChanged() {
SchedulePaint();
}
-// The implementation of this method is subtle.
-// The goal is to create rounded corners in the top-left and top-right corners,
-// allowing background_view_left_ and background_view_right_ to peek through. In
-// order for the corners to look good, we must use antialiasing on the clip
-// paths. When there are fractional device scale factors (e.g. 1.5), it's easy
-// (common even) to have straight edges of the clip path end up on non-integral
-// boundaries (e.g. y=68.5). This is unavoidable. Antialiasing turns these
-// non-integral boundary clip paths into 2-pixel "fuzzy" boundaries, which in
-// turn causes misalignment with other views::Views which assume the boundaries
-// are exact. Solving this problem completely will require a rethink of how we
-// implement fractional device scale factors in Chrome. In the meanwhile, the
-// implementation of this method minimizes the length of straight edges of the
-// clip path to minimize issues. To do this we carve out the two corners, and
-// then take the inverse as our clip path.
-void ToolbarView::UpdateClipPath() {
- const int corner_radius = GetLayoutConstant(TOOLBAR_CORNER_RADIUS);
- SkPath path;
- const gfx::Rect local_bounds = GetLocalBounds();
-
- // Carve out top-left.
- path.moveTo(0, 0);
- SkPath path;
- // The bottom of the toolbar may be clipped more than necessary in
- // certain scale factor so adds extra 2dp so that even if the origin
- // and the height are rounded down, we still can paint til the
- // bottom of the toolbar. The similar logic is applied to
- // BookmarkBarView which can be the bottom component within the
- // TopContainerView, and TopContainerView which is the parent and
- // can also clip the paint region for child views.
- // TODO(crbug.com/41344902): Remove this hack once the pixel canvas is
- // enabled on all aura platforms.
- const int extended_height = local_bounds.height() + 2;
- path.moveTo(0, local_bounds.height());
- path.lineTo(0, corner_radius);
- path.arcTo(corner_radius, corner_radius, 0, SkPath::kSmall_ArcSize,
- SkPathDirection::kCW, corner_radius, 0);
- path.lineTo(0, 0);
-
- // Carve out top-right.
- path.moveTo(local_bounds.width() - corner_radius, 0);
- path.lineTo(local_bounds.width() - corner_radius, 0);
- path.arcTo(corner_radius, corner_radius, 0, SkPath::kSmall_ArcSize,
- SkPathDirection::kCW, local_bounds.width(), corner_radius);
- path.lineTo(local_bounds.width(), 0);
- path.lineTo(local_bounds.width() - corner_radius, 0);
-
- // Take the inverse so we keep everything else. Artifacts are confined to the
- // corners.
- path.setFillType(SkPathFillType::kInverseWinding);
- path.lineTo(local_bounds.width(), extended_height);
- path.lineTo(0, extended_height);
- container_view_->SetClipPath(path);
-}
-

10
patches/helium-ui/tab-style.patch
View File

@@ -68,7 +68,7 @@
--- a/chrome/browser/ui/views/tabs/tab_style_views.cc
+++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
@@ -201,8 +201,6 @@ SkPath TabStyleViewsImpl::GetPath(TabSty
@@ -200,8 +200,6 @@ SkPath TabStyleViewsImpl::GetPath(TabSty
CHECK(tab());
const int stroke_thickness = GetStrokeThickness(force_active);
@@ -77,7 +77,7 @@
// We'll do the entire path calculation in aligned pixels.
// TODO(dfried): determine if we actually want to use |stroke_thickness| as
// the inset in this case.
@@ -216,11 +214,7 @@ SkPath TabStyleViewsImpl::GetPath(TabSty
@@ -215,11 +213,7 @@ SkPath TabStyleViewsImpl::GetPath(TabSty
float extension_corner_radius = tab_style()->GetBottomCornerRadius() * scale;
// Selected, hover, and inactive tab fills are a detached squarcle tab.
@@ -87,6 +87,6 @@
- path_type == TabStyle::PathType::kInteriorClip ||
- path_type == TabStyle::PathType::kHitTest) {
+ if ((true)) {
// TODO (crbug.com/1451400): This constant should be unified with
// kCRtabstripRegionViewControlPadding in tab_strip_region_view.
float top_content_corner_radius = content_corner_radius;
float bottom_content_corner_radius = content_corner_radius;
float tab_height = GetLayoutConstant(TAB_HEIGHT) * scale;

2
patches/helium-ui/toolbar-style.patch
View File

@@ -11,7 +11,7 @@
std::u16string(), ax::mojom::DescriptionFrom::kAttributeExplicitlyEmpty);
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -157,7 +157,7 @@ void ToolbarButton::ClearHighlight() {
@@ -164,7 +164,7 @@ void ToolbarButton::ClearHighlight() {
int ToolbarButton::GetRoundedCornerRadius() const {
return ChromeLayoutProvider::Get()->GetCornerRadiusMetric(

16
patches/helium-ui/transparent-location-icon.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -46,7 +46,7 @@ constexpr int kIconLabelBubbleSeparatorW
@@ -48,7 +48,7 @@ constexpr int kIconLabelBubbleSeparatorW
// Amount of space on either side of the separator that appears after the icon
// or label.
@@ -9,7 +9,7 @@
// The length of the separator's fade animation. These values are empirical.
constexpr int kIconLabelBubbleFadeInDurationMs = 250;
@@ -82,9 +82,7 @@ void IconLabelBubbleView::SeparatorView:
@@ -84,9 +84,7 @@ void IconLabelBubbleView::SeparatorView:
const SkColor separator_color = SkColorSetA(
owner_->delegate_->GetIconLabelBubbleSurroundingForegroundColor(),
owner_->delegate_->GetIconLabelBubbleSeparatorAlpha());
@@ -20,7 +20,7 @@
canvas->DrawLine(gfx::PointF(x, GetLocalBounds().y()),
gfx::PointF(x, GetLocalBounds().bottom()), separator_color);
}
@@ -247,11 +245,10 @@ void IconLabelBubbleView::Layout(PassKey
@@ -249,11 +247,10 @@ void IconLabelBubbleView::Layout(PassKey
separator_bounds.Inset(
gfx::Insets::VH((separator_bounds.height() - separator_height) / 2, 0));
@@ -35,7 +35,7 @@
separator_view_->SetBounds(separator_x, separator_bounds.y(), separator_width,
separator_height);
@@ -593,7 +590,7 @@ int IconLabelBubbleView::GetInternalSpac
@@ -595,7 +592,7 @@ int IconLabelBubbleView::GetInternalSpac
}
constexpr int kDefaultInternalSpacingTouchUI = 10;
@@ -44,7 +44,7 @@
return (ui::TouchUiController::Get()->touch_ui()
? kDefaultInternalSpacingTouchUI
@@ -750,6 +747,10 @@ SkPath IconLabelBubbleView::GetHighlight
@@ -751,6 +748,10 @@ SkPath IconLabelBubbleView::GetHighlight
SkIntToScalar(radii.lower_right()), SkIntToScalar(radii.lower_right()),
SkIntToScalar(radii.lower_left()), SkIntToScalar(radii.lower_left())};
@@ -57,7 +57,7 @@
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -274,9 +274,9 @@ void LocationBarView::Init() {
@@ -275,9 +275,9 @@ void LocationBarView::Init() {
CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY);
const gfx::FontList& omnibox_chip_font_list = typography_provider.GetFont(
@@ -69,7 +69,7 @@
auto location_icon_view =
std::make_unique<LocationIconView>(omnibox_chip_font_list, this, this);
@@ -762,15 +762,15 @@ void LocationBarView::Layout(PassKey) {
@@ -764,15 +764,15 @@ void LocationBarView::Layout(PassKey) {
// The padding between the left edges of the location bar and the LHS icon
// (e.g. the page info icon, the google G icon, the selected suggestion icon,
// etc)
@@ -120,7 +120,7 @@
BEGIN_METADATA(LocationIconView)
--- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
+++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
@@ -171,7 +171,7 @@ const std::u16string& SelectedKeywordVie
@@ -178,7 +178,7 @@ const std::u16string& SelectedKeywordVie
int SelectedKeywordView::GetExtraInternalSpacing() const {
// Align the label text with the suggestion text.

22
patches/helium/add-kagi-search.patch
View File

@@ -1,6 +1,6 @@
--- a/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
+++ b/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
@@ -163,6 +163,17 @@
@@ -177,6 +177,17 @@
"id": 1
},
@@ -20,9 +20,9 @@
"keyword": "karmasearch.org",
--- a/components/search_engines/search_engine_type.h
+++ b/components/search_engines/search_engine_type.h
@@ -92,6 +92,8 @@ enum SearchEngineType {
SEARCH_ENGINE_STARTER_PACK_GEMINI = 73,
SEARCH_ENGINE_LILO = 74,
@@ -95,6 +95,8 @@ enum SearchEngineType {
SEARCH_ENGINE_STARTER_PACK_PAGE = 76,
SEARCH_ENGINE_MCAFEE = 77,
+ SEARCH_ENGINE_KAGI = 150,
+
@@ -31,10 +31,10 @@
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -21036,6 +21036,7 @@ Called by update_net_error_codes.py.-->
<int value="72" label="YouSearch"/>
<int value="73" label="StarterPackGemini"/>
<int value="74" label="Lilo"/>
@@ -21195,6 +21195,7 @@ Called by update_net_error_codes.py.-->
<int value="75" label="Startpage"/>
<int value="76" label="StarterPackPage"/>
<int value="77" label="McAfee"/>
+ <int value="150" label="Kagi"/>
</enum>
@@ -44,8 +44,8 @@
@@ -43,6 +43,7 @@ constexpr EngineAndTier engines_default[
{SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &break_stuff_google},
{SearchEngineTier::kRemainingEngines, &qwant},
+ {SearchEngineTier::kRemainingEngines, &kagi},
{SearchEngineTier::kTopEngines, &qwant},
+ {SearchEngineTier::kTopEngines, &kagi},
};
const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
// clang-format on

59
patches/helium/add-native-bangs.patch
View File

@@ -7,7 +7,7 @@
+#include "content/public/browser/storage_partition.h"
#include "rlz/buildflags/buildflags.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
@@ -65,6 +66,7 @@ std::unique_ptr<KeyedService> TemplateUR
Profile* profile = Profile::FromBrowserContext(context);
return std::make_unique<TemplateURLService>(
@@ -43,7 +43,7 @@
"template_url_data.cc",
"template_url_data.h",
"template_url_data_util.cc",
@@ -77,6 +79,7 @@ static_library("search_engines") {
@@ -79,6 +81,7 @@ static_library("search_engines") {
"//components/country_codes",
"//components/crash/core/common:crash_key",
"//components/database_utils",
@@ -101,26 +101,26 @@
#include "components/search_engines/template_url_data.h"
+#include "components/search_engines/template_url_data_util.h"
#include "components/search_engines/template_url_prepopulate_data.h"
#include "components/search_engines/template_url_prepopulate_data_resolver.h"
#include "components/search_engines/template_url_service_client.h"
#include "components/search_engines/template_url_service_observer.h"
@@ -69,6 +73,7 @@
@@ -70,6 +74,7 @@
#include "components/sync/protocol/search_engine_specifics.pb.h"
#include "components/url_formatter/url_fixer.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -423,6 +428,7 @@ class TemplateURLService::PreLoadingProv
#include "url/url_util.h"
@@ -470,6 +475,7 @@ class TemplateURLService::PreLoadingProv
// TemplateURLService ---------------------------------------------------------
TemplateURLService::TemplateURLService(
PrefService& prefs,
+ scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
search_engines::SearchEngineChoiceService& search_engine_choice_service,
TemplateURLPrepopulateData::Resolver& prepopulate_data_resolver,
std::unique_ptr<SearchTermsData> search_terms_data,
const scoped_refptr<KeywordWebDataService>& web_data_service,
@@ -433,6 +439,8 @@ TemplateURLService::TemplateURLService(
search_engine_choice_service_(search_engine_choice_service),
@@ -482,6 +488,8 @@ TemplateURLService::TemplateURLService(
prepopulate_data_resolver_(prepopulate_data_resolver),
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
+ url_loader_factory_(std::move(url_loader_factory)),
@@ -128,20 +128,21 @@
client_(std::move(client)),
dsp_change_callback_(dsp_change_callback),
pre_loading_providers_(std::make_unique<PreLoadingProviders>()),
@@ -448,10 +456,12 @@ TemplateURLService::TemplateURLService(
@@ -498,11 +506,13 @@ TemplateURLService::TemplateURLService(
TemplateURLService::TemplateURLService(
PrefService& prefs,
+ scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
search_engines::SearchEngineChoiceService& search_engine_choice_service,
TemplateURLPrepopulateData::Resolver& prepopulate_data_resolver,
base::span<const TemplateURLService::Initializer> initializers)
: TemplateURLService(
prefs,
+ url_loader_factory,
search_engine_choice_service,
prepopulate_data_resolver,
/*search_terms_data=*/std::make_unique<SearchTermsData>(),
/*web_data_service=*/nullptr,
@@ -551,6 +561,10 @@ bool TemplateURLService::ShowInActivesLi
@@ -603,6 +613,10 @@ bool TemplateURLService::ShowInActivesLi
}
bool TemplateURLService::HiddenFromLists(const TemplateURL* t_url) const {
@@ -152,7 +153,7 @@
switch (t_url->policy_origin()) {
case TemplateURLData::PolicyOrigin::kNoPolicy:
// Hide if the preferred search engine for the keyword is created by
@@ -1390,11 +1404,37 @@ void TemplateURLService::Load() {
@@ -1445,11 +1459,37 @@ void TemplateURLService::Load() {
if (web_data_service_) {
load_handle_ = web_data_service_->GetKeywords(this);
@@ -190,7 +191,7 @@
base::CallbackListSubscription TemplateURLService::RegisterOnLoadedCallback(
base::OnceClosure callback) {
return loaded_ ? base::CallbackListSubscription()
@@ -2172,6 +2212,13 @@ void TemplateURLService::Init() {
@@ -2306,6 +2346,13 @@ void TemplateURLService::Init() {
base::Unretained(this)));
}
@@ -219,23 +220,23 @@
#if BUILDFLAG(IS_ANDROID)
#include "base/android/scoped_java_ref.h"
#endif
@@ -138,6 +140,7 @@ class TemplateURLService final : public
@@ -142,6 +144,7 @@ class TemplateURLService final : public
TemplateURLService(
PrefService& prefs,
+ scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
search_engines::SearchEngineChoiceService& search_engine_choice_service,
TemplateURLPrepopulateData::Resolver& prepopulate_data_resolver,
std::unique_ptr<SearchTermsData> search_terms_data,
const scoped_refptr<KeywordWebDataService>& web_data_service,
@@ -148,6 +151,7 @@ class TemplateURLService final : public
@@ -153,6 +156,7 @@ class TemplateURLService final : public
// some template URL data.
explicit TemplateURLService(
PrefService& prefs,
+ scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
search_engines::SearchEngineChoiceService& search_engine_choice_service,
TemplateURLPrepopulateData::Resolver& prepopulate_data_resolver,
base::span<const TemplateURLService::Initializer> initializers = {});
@@ -460,6 +464,8 @@ class TemplateURLService final : public
@@ -475,6 +479,8 @@ class TemplateURLService final : public
// OnTemplateURLServiceChanged.
void Load();
@@ -244,7 +245,7 @@
// Registers a callback to be called when the service has loaded.
//
// If the service has already loaded, this function does nothing.
@@ -686,6 +692,8 @@ class TemplateURLService final : public
@@ -697,6 +703,8 @@ class TemplateURLService final : public
void Init();
@@ -253,7 +254,7 @@
// Simulate a loaded `TemplateURLService`.
void ApplyInitializersForTesting(
base::span<const TemplateURLService::Initializer> initializers);
@@ -885,6 +893,10 @@ class TemplateURLService final : public
@@ -903,6 +911,10 @@ class TemplateURLService final : public
// Service used to store entries.
scoped_refptr<KeywordWebDataService> web_data_service_;
@@ -514,7 +515,7 @@
@@ -743,9 +743,9 @@ bool AutocompleteInput::HasHTTPSScheme(c
// static
AutocompleteInput::FeaturedKeywordMode
AutocompleteInput::GetFeaturedKeywordMode(const std::u16string& text) {
AutocompleteInput::GetFeaturedKeywordMode(std::u16string_view text) {
- if (text == u"@")
+ if (text == u"@" || text == u"!")
return FeaturedKeywordMode::kExact;
@@ -525,7 +526,7 @@
}
--- a/components/search_engines/template_url_data.cc
+++ b/components/search_engines/template_url_data.cc
@@ -26,7 +26,7 @@ namespace {
@@ -27,7 +27,7 @@ namespace {
// Returns a GUID used for sync, which is random except for built-in search
// engines. The latter benefit from using a deterministic GUID, to make sure
// sync doesn't incur in duplicates for prepopulated engines.
@@ -534,7 +535,7 @@
// We compute a GUID deterministically given |prepopulate_id| or
// |starter_pack_id|, using an arbitrary base GUID.
std::string guid;
@@ -37,6 +37,9 @@ std::string GenerateGUID(int prepopulate
@@ -38,6 +38,9 @@ std::string GenerateGUID(int prepopulate
} else if (starter_pack_id > 0) {
guid = base::StringPrintf("ec205736-edd7-4022-a9a3-b431fc%06d",
starter_pack_id);
@@ -544,7 +545,7 @@
} else {
guid = base::Uuid::GenerateRandomV4().AsLowercaseString();
}
@@ -116,7 +119,7 @@ TemplateURLData::TemplateURLData(
@@ -117,7 +120,7 @@ TemplateURLData::TemplateURLData(
created_from_play_api(false),
usage_count(0),
prepopulate_id(prepopulate_id),
@@ -564,7 +565,7 @@
size_t TemplateURLData::EstimateMemoryUsage() const {
--- a/components/search_engines/template_url_data.h
+++ b/components/search_engines/template_url_data.h
@@ -242,6 +242,9 @@ struct TemplateURLData {
@@ -245,6 +245,9 @@ struct TemplateURLData {
// starter_pack_id > 0.
int starter_pack_id{0};
@@ -622,7 +623,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
@@ -1842,6 +1842,9 @@ void AddPrivacyStrings(content::WebUIDat
@@ -1850,6 +1850,9 @@ void AddPrivacyStrings(content::WebUIDat
{"heliumServicesToggle", IDS_SETTINGS_HELIUM_SERVICES_TOGGLE},
{"heliumServicesToggleDescription",
IDS_SETTINGS_HELIUM_SERVICES_TOGGLE_DESCRIPTION},
@@ -634,7 +635,7 @@
{"heliumExtProxyToggleDescription",
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2088,6 +2088,12 @@
@@ -2085,6 +2085,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>
@@ -673,7 +674,7 @@
}
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -341,6 +341,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -344,6 +344,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::prefs::kHeliumExtProxyEnabled] =
settings_api::PrefType::kBoolean;

2
patches/helium/disable-bookmarks-bar.patch
View File

@@ -1,6 +1,6 @@
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -462,14 +462,14 @@ bool DoesBookmarkContainWords(const std:
@@ -487,14 +487,14 @@ bool DoesBookmarkContainWords(const std:
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(

2
patches/helium/enable-tab-muting.patch
View File

@@ -1,6 +1,6 @@
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -323,7 +323,7 @@ BASE_FEATURE(kPictureInPictureOcclusionT
@@ -310,7 +310,7 @@ BASE_FEATURE(kPictureInPictureOcclusionT
// Enables user control over muting tab audio from the tab strip.
BASE_FEATURE(kEnableTabMuting,
"EnableTabMuting",

26
patches/helium/force-eu-search-features.patch
View File

@@ -1,33 +1,31 @@
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -31,7 +31,6 @@
@@ -32,7 +32,6 @@
#include "chrome/browser/profiles/profile_attributes_storage.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profile_shortcut_manager.h"
-#include "chrome/browser/search_engine_choice/search_engine_choice_service_factory.h"
-#include "chrome/browser/regional_capabilities/regional_capabilities_service_factory.h"
#include "chrome/browser/signin/account_consistency_mode_manager.h"
#include "chrome/browser/signin/account_consistency_mode_manager_factory.h"
#include "chrome/browser/signin/chrome_signin_client_factory.h"
@@ -85,7 +84,6 @@
@@ -83,7 +82,6 @@
#include "components/plus_addresses/grit/plus_addresses_strings.h"
#include "components/plus_addresses/plus_address_service.h"
#include "components/prefs/pref_service.h"
-#include "components/regional_capabilities/regional_capabilities_service.h"
#include "components/safe_browsing/core/common/features.h"
#include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h"
#include "components/saved_tab_groups/public/features.h"
-#include "components/search_engines/search_engine_choice/search_engine_choice_service.h"
#include "components/signin/public/base/signin_buildflags.h"
#include "components/signin/public/base/signin_switches.h"
#include "components/strings/grit/components_branded_strings.h"
@@ -2383,16 +2381,9 @@ void AddSearchStrings(content::WebUIData
@@ -2391,14 +2389,9 @@ void AddSearchStrings(content::WebUIData
html_source->AddString("searchExplanationLearnMoreURL",
chrome::kOmniboxLearnMoreURL);
- search_engines::SearchEngineChoiceService* search_engine_choice_service =
- search_engines::SearchEngineChoiceServiceFactory::GetForProfile(profile);
- int country_id = search_engine_choice_service
- ? search_engine_choice_service->GetCountryId()
- : country_codes::GetCurrentCountryID();
- regional_capabilities::RegionalCapabilitiesService* regional_capabilities =
- regional_capabilities::RegionalCapabilitiesServiceFactory::GetForProfile(
- profile);
html_source->AddLocalizedString(
"searchEnginesSettingsDialogSubtitle",
- search_engines::IsEeaChoiceCountry(country_id)
- regional_capabilities->IsInEeaCountry()
- ? IDS_SEARCH_ENGINE_CHOICE_SETTINGS_SUBTITLE
- : IDS_SEARCH_ENGINE_CHOICE_SETTINGS_SUBTITLE_NON_EEA);
+ IDS_SEARCH_ENGINE_CHOICE_SETTINGS_SUBTITLE);

10
patches/helium/hop/setup.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/policy/chrome_browser_policy_connector.cc
+++ b/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -32,6 +32,7 @@
@@ -31,6 +31,7 @@
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
#include "components/policy/core/common/command_line_policy_provider.h"
#include "components/policy/core/common/configuration_policy_provider.h"
@@ -8,7 +8,7 @@
#include "components/policy/core/common/local_test_policy_provider.h"
#include "components/policy/core/common/policy_logger.h"
#include "components/policy/core/common/policy_map.h"
@@ -286,6 +287,12 @@ void ChromeBrowserPolicyConnector::SetDe
@@ -278,6 +279,12 @@ void ChromeBrowserPolicyConnector::SetDe
std::vector<std::unique_ptr<policy::ConfigurationPolicyProvider>>
ChromeBrowserPolicyConnector::CreatePolicyProviders() {
auto providers = BrowserPolicyConnector::CreatePolicyProviders();
@@ -23,7 +23,7 @@
if (platform_provider) {
--- a/chrome/browser/policy/chrome_browser_policy_connector.h
+++ b/chrome/browser/policy/chrome_browser_policy_connector.h
@@ -115,6 +115,10 @@ class ChromeBrowserPolicyConnector : pub
@@ -109,6 +109,10 @@ class ChromeBrowserPolicyConnector : pub
return command_line_provider_;
}
@@ -34,7 +34,7 @@
// Set ProxyPolicyProvider for testing, caller needs to init and shutdown the
// provider.
void SetProxyPolicyProviderForTesting(
@@ -191,6 +195,9 @@ class ChromeBrowserPolicyConnector : pub
@@ -183,6 +187,9 @@ class ChromeBrowserPolicyConnector : pub
// Owned by base class.
raw_ptr<ConfigurationPolicyProvider> command_line_provider_ = nullptr;
@@ -46,7 +46,7 @@
std::unique_ptr<LocalTestPolicyProvider> local_test_provider_;
--- a/chrome/browser/policy/profile_policy_connector.cc
+++ b/chrome/browser/policy/profile_policy_connector.cc
@@ -383,6 +383,10 @@ void ProfilePolicyConnector::Init(
@@ -378,6 +378,10 @@ void ProfilePolicyConnector::Init(
if (connector->command_line_policy_provider()) {
policy_providers_.push_back(connector->command_line_policy_provider());
}

522
patches/helium/make-ddg-default.patch
View File

@@ -1,6 +1,6 @@
--- a/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
+++ b/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
@@ -153,29 +153,13 @@
@@ -167,29 +167,13 @@
// *** *** *** *** WARNING *** *** *** ***
// TODO(crbug.com/343792225): Identify a way to resolve this problem and implement
// necessary changes.
@@ -36,7 +36,7 @@
--- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/search_engine_countries-inc.cc
@@ -38,1416 +38,17 @@ struct EngineAndTier {
@@ -38,1084 +38,11 @@ struct EngineAndTier {
// Default (for countries with no better engine set)
constexpr EngineAndTier engines_default[] = {
@@ -78,14 +78,14 @@
-
-// Austria
-constexpr EngineAndTier engines_AT[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kRemainingEngines, &yahoo_at},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kRemainingEngines, &yahoo_at},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Australia
@@ -108,25 +108,26 @@
-
-// Belgium
-constexpr EngineAndTier engines_BE[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Bulgaria
-constexpr EngineAndTier engines_BG[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Bahrain
@@ -233,14 +234,14 @@
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_co},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
{SearchEngineTier::kTopEngines, &duckduckgo},
{SearchEngineTier::kTopEngines, &ecosia},
-};
-
-// Costa Rica
-constexpr EngineAndTier engines_CR[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &yandex_com},
@@ -248,53 +249,52 @@
-
-// Republic of Cyprus
-constexpr EngineAndTier engines_CY[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Czech Republic
-constexpr EngineAndTier engines_CZ[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &seznam},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &seznam},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Germany
-constexpr EngineAndTier engines_DE[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kRemainingEngines, &yahoo_de},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kRemainingEngines, &yahoo_de},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &startpage},
-};
-
-// Denmark
-constexpr EngineAndTier engines_DK[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_dk},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_dk},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-
-// Dominican Republic
-constexpr EngineAndTier engines_DO[] = {
- {SearchEngineTier::kTopEngines, &google},
@@ -324,14 +324,14 @@
-
-// Estonia
-constexpr EngineAndTier engines_EE[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Egypt
@@ -345,26 +345,26 @@
-
-// Spain
-constexpr EngineAndTier engines_ES[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_es},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_es},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Finland
-constexpr EngineAndTier engines_FI[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_fi},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_fi},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Faroe Islands
@@ -378,14 +378,14 @@
-
-// France
-constexpr EngineAndTier engines_FR[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &duckduckgo},
- {SearchEngineTier::kRemainingEngines, &yahoo_fr},
- {SearchEngineTier::kRemainingEngines, &lilo},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &duckduckgo},
- {SearchEngineTier::kRemainingEngines, &lilo},
- {SearchEngineTier::kRemainingEngines, &yahoo_fr},
-};
-
-// United Kingdom
@@ -399,14 +399,14 @@
-
-// Greece
-constexpr EngineAndTier engines_GR[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Guatemala
@@ -438,26 +438,26 @@
-
-// Croatia
-constexpr EngineAndTier engines_HR[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Hungary
-constexpr EngineAndTier engines_HU[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Indonesia
@@ -471,14 +471,14 @@
-
-// Ireland
-constexpr EngineAndTier engines_IE[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_uk},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_uk},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Israel
@@ -519,26 +519,26 @@
-
-// Iceland
-constexpr EngineAndTier engines_IS[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Italy
-constexpr EngineAndTier engines_IT[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_it},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_it},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Jamaica
@@ -615,51 +615,52 @@
-
-// Liechtenstein
-constexpr EngineAndTier engines_LI[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Lithuania
-constexpr EngineAndTier engines_LT[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &yep},
-};
-
-// Luxembourg
-constexpr EngineAndTier engines_LU[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Latvia
-constexpr EngineAndTier engines_LV[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Libya
-constexpr EngineAndTier engines_LY[] = {
- {SearchEngineTier::kTopEngines, &google},
@@ -716,14 +717,14 @@
-
-// Malta
-constexpr EngineAndTier engines_MT[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// Mexico
@@ -755,26 +756,26 @@
-
-// Netherlands
-constexpr EngineAndTier engines_NL[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_nl},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_nl},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Norway
-constexpr EngineAndTier engines_NO[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// New Zealand
@@ -833,14 +834,14 @@
-
-// Poland
-constexpr EngineAndTier engines_PL[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Puerto Rico
@@ -854,14 +855,14 @@
-
-// Portugal
-constexpr EngineAndTier engines_PT[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Paraguay
@@ -884,14 +885,14 @@
-
-// Romania
-constexpr EngineAndTier engines_RO[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &yahoo_emea},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Serbia
@@ -932,14 +933,14 @@
-
-// Sweden
-constexpr EngineAndTier engines_SE[] = {
- {SearchEngineTier::kTopEngines, &google},
{SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_se},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_se},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Singapore
@@ -953,27 +954,26 @@
-
-// Slovenia
-constexpr EngineAndTier engines_SI[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
{SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &yep},
+ {SearchEngineTier::kTopEngines, &break_stuff_google},
{SearchEngineTier::kRemainingEngines, &qwant},
};
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &yep},
- {SearchEngineTier::kRemainingEngines, &qwant},
-};
-
-// Slovakia
-constexpr EngineAndTier engines_SK[] = {
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &seznam},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
- {SearchEngineTier::kTopEngines, &google},
- {SearchEngineTier::kTopEngines, &brave},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &bing},
- {SearchEngineTier::kTopEngines, &seznam},
- {SearchEngineTier::kRemainingEngines, &yahoo_emea},
- {SearchEngineTier::kRemainingEngines, &ecosia},
- {SearchEngineTier::kRemainingEngines, &privacywall},
-};
-
-// El Salvador
@@ -1118,11 +1118,13 @@
- {SearchEngineTier::kTopEngines, &yahoo},
- {SearchEngineTier::kTopEngines, &duckduckgo},
- {SearchEngineTier::kTopEngines, &sogou},
-};
-
-// clang-format on
-// ----------------------------------------------------------------------------
-
+ {SearchEngineTier::kTopEngines, &break_stuff_google},
+ {SearchEngineTier::kTopEngines, &qwant},
};
// clang-format on
@@ -1123,332 +50,8 @@ constexpr EngineAndTier engines_ZW[] = {
const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
int country_id) {
- const EngineAndTier* engines;
@@ -1458,12 +1460,12 @@
for (size_t i = 0; i < num_engines; i++) {
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -319,7 +319,7 @@ std::unique_ptr<TemplateURLData> GetPrep
PrefService* prefs,
search_engines::SearchEngineChoiceService* search_engine_choice_service) {
return FindPrepopulatedEngineInternal(prefs, search_engine_choice_service,
- google.id,
+ duckduckgo.id,
@@ -283,7 +283,7 @@ void ClearPrepopulatedEnginesInPrefs(Pre
std::unique_ptr<TemplateURLData> GetPrepopulatedFallbackSearch(
PrefService& prefs,
CountryID country_id) {
- return FindPrepopulatedEngineInternal(prefs, country_id, google.id,
+ return FindPrepopulatedEngineInternal(prefs, country_id, duckduckgo.id,
/*use_first_as_fallback=*/true);
}

2
patches/helium/prefer-https-by-default.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -648,7 +648,7 @@ BASE_FEATURE(kHttpsFirstBalancedMode,
@@ -665,7 +665,7 @@ BASE_FEATURE(kHttpsFirstBalancedMode,
// possible.
BASE_FEATURE(kHttpsFirstBalancedModeAutoEnable,
"HttpsFirstBalancedModeAutoEnable",

50
patches/helium/proxy-extension-downloads.patch
View File

@@ -147,7 +147,7 @@
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -339,6 +339,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -342,6 +342,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
// Helium services page
(*s_allowlist)[::prefs::kHeliumServicesEnabled] =
settings_api::PrefType::kBoolean;
@@ -182,7 +182,7 @@
</div>
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -1842,6 +1842,10 @@ void AddPrivacyStrings(content::WebUIDat
@@ -1850,6 +1850,10 @@ void AddPrivacyStrings(content::WebUIDat
{"heliumServicesToggle", IDS_SETTINGS_HELIUM_SERVICES_TOGGLE},
{"heliumServicesToggleDescription",
IDS_SETTINGS_HELIUM_SERVICES_TOGGLE_DESCRIPTION},
@@ -195,7 +195,7 @@
IDS_SETTINGS_HELIUM_SERVICES_OVERRIDE_DESCRIPTION},
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2082,6 +2082,12 @@
@@ -2079,6 +2079,12 @@
<message name="IDS_SETTINGS_HELIUM_SERVICES_TOGGLE_DESCRIPTION" desc="Description of the toggle for enabling/disabling of all Helium services">
When enabled, Helium will be able to connect to anonymous services for providing additional functionality, such as native !bangs or extension downloads.
</message>
@@ -257,14 +257,14 @@
PrefChangeRegistrar& registrar, const base::RepeatingClosure& observer);
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -69,6 +69,7 @@ source_set("extensions") {
"//components/content_settings/core/browser:cookie_settings",
@@ -300,6 +300,7 @@ source_set("extensions") {
"//components/cookie_config",
"//components/crx_file",
"//components/pref_registry",
"//components/embedder_support",
+ "//components/helium_services",
"//content/public/browser",
"//extensions/browser",
"//extensions/buildflags",
"//components/infobars/content",
"//components/infobars/core",
"//components/no_state_prefetch/browser",
--- a/chrome/browser/extensions/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -18,10 +18,12 @@
@@ -279,8 +279,8 @@
+#include "extensions/common/extension_urls.h"
#include "url/gurl.h"
using content::BrowserThread;
@@ -236,11 +238,11 @@ bool PendingExtensionManager::AddFromExt
#if !BUILDFLAG(IS_ANDROID)
@@ -248,11 +250,11 @@ bool PendingExtensionManager::AddFromExt
kRemoteInstall);
}
@@ -295,7 +295,7 @@
ManifestLocation install_source = it.second.install_source();
// Some install sources read a CRX from the filesystem. They can
@@ -252,6 +254,17 @@ std::list<std::string> PendingExtensionM
@@ -264,6 +266,17 @@ std::list<std::string> PendingExtensionM
continue;
}
@@ -326,7 +326,7 @@
#include "components/update_client/update_query_params.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
@@ -187,9 +190,6 @@ void ExtensionUpdater::EnsureDownloaderC
@@ -189,9 +192,6 @@ void ExtensionUpdater::EnsureDownloaderC
if (!downloader_.get()) {
downloader_ = downloader_factory_.Run(this);
}
@@ -336,7 +336,7 @@
}
void ExtensionUpdater::Start() {
@@ -211,6 +211,15 @@ void ExtensionUpdater::Start() {
@@ -213,6 +213,15 @@ void ExtensionUpdater::Start() {
CheckSoon();
ScheduleNextCheck();
}
@@ -352,7 +352,7 @@
}
void ExtensionUpdater::Stop() {
@@ -315,7 +324,6 @@ void ExtensionUpdater::AddToDownloader(
@@ -318,7 +327,6 @@ void ExtensionUpdater::AddToDownloader(
int request_id,
DownloadFetchPriority fetch_priority,
ExtensionUpdateCheckParams* update_check_params) {
@@ -360,7 +360,7 @@
// In Kiosk mode extensions are downloaded and updated by the ExternalCache.
// Therefore we skip updates here to avoid conflicts.
@@ -414,7 +422,7 @@ void ExtensionUpdater::CheckNow(CheckPar
@@ -417,7 +425,7 @@ void ExtensionUpdater::CheckNow(CheckPar
// Add fetch records for extensions that should be fetched by an update URL.
// These extensions are not yet installed. They come from group policy
// and external install sources.
@@ -369,7 +369,7 @@
service_->pending_extension_manager();
const CorruptedExtensionReinstaller* corrupted_extension_reinstaller =
service_->corrupted_extension_reinstaller();
@@ -552,7 +560,7 @@ void ExtensionUpdater::CheckNow(CheckPar
@@ -555,7 +563,7 @@ void ExtensionUpdater::CheckNow(CheckPar
// OnExtensionDownloadFinished for each extension that was checked.
downloader_->StartAllPending(extension_cache_);
@@ -390,7 +390,7 @@
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -43,6 +43,7 @@
@@ -45,6 +45,7 @@
#include "components/crx_file/id_util.h"
#include "components/download/public/common/download_url_parameters.h"
#include "components/update_client/update_query_params.h"
@@ -398,7 +398,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/download_manager.h"
#include "content/public/browser/navigation_controller.h"
@@ -199,7 +200,7 @@ GURL WebstoreInstaller::GetWebstoreInsta
@@ -201,7 +202,7 @@ GURL WebstoreInstaller::GetWebstoreInsta
if (!install_source.empty())
params.push_back(installsource_param);
params.push_back("uc");
@@ -409,7 +409,7 @@
url_string + "?response=redirect&" +
--- a/chrome/browser/extensions/webstore_installer.h
+++ b/chrome/browser/extensions/webstore_installer.h
@@ -203,7 +203,7 @@ class WebstoreInstaller : public Extensi
@@ -110,7 +110,7 @@ class WebstoreInstaller : public Extensi
friend class base::DeleteHelper<WebstoreInstaller>;
// Helper to get install URL.
@@ -475,17 +475,17 @@
#include "extensions/browser/extension_registry_observer.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/updater/extension_downloader.h"
@@ -337,6 +338,8 @@ class ExtensionUpdater : public Extensio
@@ -338,6 +339,8 @@ class ExtensionUpdater : public Extensio
raw_ptr<PrefService, DanglingUntriaged> prefs_ = nullptr;
raw_ptr<Profile, DanglingUntriaged> profile_ = nullptr;
+ PrefChangeRegistrar pref_change_registrar_;
+
raw_ptr<ExtensionRegistry, DanglingUntriaged> registry_ = nullptr;
raw_ptr<ExtensionRegistrar, DanglingUntriaged> registrar_ = nullptr;
std::map<int, InProgressCheck> requests_in_progress_;
--- a/chrome/browser/extensions/pending_extension_info.h
+++ b/chrome/browser/extensions/pending_extension_info.h
--- a/extensions/browser/pending_extension_info.h
+++ b/extensions/browser/pending_extension_info.h
@@ -57,6 +57,8 @@ class PendingExtensionInfo {
const base::Version& version() const { return version_; }
const std::string& install_parameter() const { return install_parameter_; }
@@ -497,7 +497,7 @@
// this function is run. If it returns true, the extension is installed.
--- a/chrome/browser/extensions/pending_extension_manager.h
+++ b/chrome/browser/extensions/pending_extension_manager.h
@@ -140,7 +140,7 @@ class PendingExtensionManager {
@@ -144,7 +144,7 @@ class PendingExtensionManager : public K
// Get the list of pending IDs that should be installed from an update URL.
// Pending extensions that will be installed from local files will not be
// included in the set.

12
patches/helium/reenable-spellcheck-downloads.patch
View File

@@ -96,7 +96,7 @@
#endif // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7942,6 +7942,8 @@ static_library("browser") {
@@ -7977,6 +7977,8 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",
@@ -107,7 +107,7 @@
if (!is_android) {
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -343,6 +343,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -346,6 +346,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::prefs::kHeliumBangsEnabled] =
settings_api::PrefType::kBoolean;
@@ -144,7 +144,7 @@
</div>
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2094,6 +2094,12 @@
@@ -2091,6 +2091,12 @@
<message name="IDS_SETTINGS_HELIUM_SERVICES_BANGS_TOGGLE_DESCRIPTION" desc="Description of the toggle for enabling/disabling of downloading bangs">
When enabled, Helium will fetch our list of bangs that help you browse the Internet faster, such as !w or !gh.
</message>
@@ -159,7 +159,7 @@
</message>
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -1843,6 +1843,9 @@ void AddPrivacyStrings(content::WebUIDat
@@ -1851,6 +1851,9 @@ void AddPrivacyStrings(content::WebUIDat
{"heliumBangsToggle", IDS_SETTINGS_HELIUM_SERVICES_BANGS_TOGGLE},
{"heliumBangsToggleDescription",
IDS_SETTINGS_HELIUM_SERVICES_BANGS_TOGGLE_DESCRIPTION},
@@ -171,7 +171,7 @@
{"heliumExtProxyToggleDescription",
--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
@@ -12,6 +12,7 @@ import("//components/nacl/features.gni")
@@ -11,6 +11,7 @@ import("//components/nacl/features.gni")
import("//components/safe_browsing/buildflags.gni")
import("//components/sharing_message/buildflags.gni")
import("//components/signin/features.gni")
@@ -179,7 +179,7 @@
import("//components/supervised_user/buildflags.gni")
import("//content/public/common/features.gni")
import("//crypto/features.gni")
@@ -104,4 +105,5 @@ chrome_grit_defines = [
@@ -103,4 +104,5 @@ chrome_grit_defines = [
"optimize_webui=$optimize_webui",
"chrome_root_store_cert_management_ui=$chrome_root_store_cert_management_ui",
"use_nss_certs=$use_nss_certs",

3
patches/helium/regenerate-search_engine_choice_scaled_resources.patch
View File

@@ -1,6 +1,6 @@
--- a/components/resources/search_engine_choice_scaled_resources.grdp
+++ b/components/resources/search_engine_choice_scaled_resources.grdp
@@ -5,46 +5,10 @@
@@ -5,47 +5,10 @@
<if expr="_google_chrome">
<structure type="chrome_scaled_image" name="IDR_GOOGLE_COM_PNG" file="google_chrome/google_search_logo.png" />
</if>
@@ -41,6 +41,7 @@
- <structure type="chrome_scaled_image" name="IDR_SEZNAM_PNG" file="search_engine_choice/seznam.png" />
- <structure type="chrome_scaled_image" name="IDR_SE_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
- <structure type="chrome_scaled_image" name="IDR_SG_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
- <structure type="chrome_scaled_image" name="IDR_STARTPAGE_COM_PNG" file="search_engine_choice/startpage_com.png" />
- <structure type="chrome_scaled_image" name="IDR_TH_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
- <structure type="chrome_scaled_image" name="IDR_TR_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
- <structure type="chrome_scaled_image" name="IDR_TW_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />

10
patches/helium/scan-chrome-native-messaging-hosts.patch
View File

@@ -25,7 +25,7 @@
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -199,6 +199,11 @@ bool PathProvider(int key, base::FilePat
@@ -186,6 +186,11 @@ bool PathProvider(int key, base::FilePat
}
create_dir = true;
break;
@@ -37,7 +37,7 @@
case chrome::DIR_USER_DOCUMENTS:
if (!GetUserDocumentsDirectory(&cur)) {
return false;
@@ -606,11 +611,28 @@ bool PathProvider(int key, base::FilePat
@@ -575,11 +580,28 @@ bool PathProvider(int key, base::FilePat
#endif // !BUILDFLAG(IS_MAC)
break;
@@ -68,7 +68,7 @@
#if !BUILDFLAG(IS_ANDROID)
--- a/chrome/common/chrome_paths.h
+++ b/chrome/common/chrome_paths.h
@@ -25,6 +25,7 @@ enum {
@@ -24,6 +24,7 @@ enum {
DIR_LOGS = PATH_START, // Directory where logs should be written.
DIR_USER_DATA, // Directory where user data can be written.
@@ -76,7 +76,7 @@
DIR_CRASH_METRICS, // Directory where crash metrics are written.
DIR_CRASH_DUMPS, // Directory where crash dumps are written.
DIR_LOCAL_TRACES, // Directory where local traces are written.
@@ -122,6 +123,9 @@ enum {
@@ -117,6 +118,9 @@ enum {
// manifest files are stored.
DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts
// installed per-user.
@@ -114,7 +114,7 @@
// DIR_ROAMING_USER_DATA has been overridden by a command-line option.
--- a/chrome/common/chrome_paths_linux.cc
+++ b/chrome/common/chrome_paths_linux.cc
@@ -100,6 +100,23 @@ bool GetDefaultUserDataDirectory(base::F
@@ -99,6 +99,23 @@ bool GetDefaultUserDataDirectory(base::F
return true;
}

26
patches/helium/services-prefs.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2070,6 +2070,31 @@
@@ -2067,6 +2067,31 @@
<message name="IDS_SETTINGS_SECURITY_DESCRIPTION" desc="Description of the controls available on the security settings page">
Safe Browsing (protection from dangerous sites) and other security settings
</message>
@@ -34,7 +34,7 @@
Google Advanced Protection Program
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -1837,6 +1837,18 @@ void AddPrivacyStrings(content::WebUIDat
@@ -1845,6 +1845,18 @@ void AddPrivacyStrings(content::WebUIDat
{"permissionsPageDescription", IDS_SETTINGS_PERMISSIONS_DESCRIPTION},
{"securityPageTitle", IDS_SETTINGS_SECURITY},
{"securityPageDescription", IDS_SETTINGS_SECURITY_DESCRIPTION},
@@ -91,7 +91,7 @@
</g>
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -76,6 +76,11 @@
@@ -83,6 +83,11 @@
sub-label="$i18n{permissionsPageDescription}"
on-click="onPermissionsPageClick_"
role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
@@ -103,7 +103,7 @@
</div>
<if expr="use_nss_certs">
@@ -170,6 +175,13 @@
@@ -177,6 +182,13 @@
</template>
</template>
@@ -119,7 +119,7 @@
associated-control="[[$$('#securityLinkRow')]]"
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -502,6 +502,12 @@ export class SettingsPrivacyPageElement
@@ -515,6 +515,12 @@ export class SettingsPrivacyPageElement
Router.getInstance().navigateTo(routes.SITE_SETTINGS);
}
@@ -134,10 +134,10 @@
this.metricsBrowserProxy_.recordAction(
--- a/chrome/browser/resources/settings/router.ts
+++ b/chrome/browser/resources/settings/router.ts
@@ -33,6 +33,7 @@ export interface SettingsRoutes {
EDIT_DICTIONARY: Route;
@@ -34,6 +34,7 @@ export interface SettingsRoutes {
FONTS: Route;
GLIC: Route;
GEMINI: Route;
GLIC_SECTION: Route;
+ HELIUM_SERVICES: Route;
HISTORY_SEARCH: Route;
INCOMPATIBLE_APPLICATIONS: Route;
@@ -155,7 +155,7 @@
if (visibility.safetyHub !== false) {
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -141,6 +141,7 @@ build_webui("build") {
@@ -142,6 +142,7 @@ build_webui("build") {
"privacy_page/security_keys_set_pin_dialog.ts",
"privacy_page/security_keys_subpage.ts",
"privacy_page/security_page.ts",
@@ -280,7 +280,7 @@
+customElements.define(SettingsHeliumServicesPageElement.is, SettingsHeliumServicesPageElement);
--- a/chrome/browser/resources/settings/lazy_load.ts
+++ b/chrome/browser/resources/settings/lazy_load.ts
@@ -30,6 +30,7 @@ import './privacy_page/security_keys_pho
@@ -31,6 +31,7 @@ import './privacy_page/security_keys_pho
import './privacy_page/security_keys_phones_list.js';
import './privacy_page/security_keys_phones_dialog.js';
import './privacy_page/security_page.js';
@@ -288,7 +288,7 @@
import './safety_hub/safety_hub_page.js';
import './safety_hub/safety_hub_entry_point.js';
import './site_settings/all_sites.js';
@@ -202,6 +203,7 @@ export {ResetDialogPage, SettingsSecurit
@@ -204,6 +205,7 @@ export {ResetDialogPage, SettingsSecurit
export {SetPinDialogPage, SettingsSecurityKeysSetPinDialogElement} from './privacy_page/security_keys_set_pin_dialog.js';
export {SecurityKeysSubpageElement} from './privacy_page/security_keys_subpage.js';
export {HttpsFirstModeSetting, SafeBrowsingSetting, SettingsSecurityPageElement} from './privacy_page/security_page.js';
@@ -320,7 +320,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -42,6 +42,7 @@
@@ -43,6 +43,7 @@
#include "components/dom_distiller/core/pref_names.h"
#include "components/drive/drive_pref_names.h"
#include "components/embedder_support/pref_names.h"
@@ -328,7 +328,7 @@
#include "components/language/core/browser/pref_names.h"
#include "components/live_caption/pref_names.h"
#include "components/media_router/common/pref_names.h"
@@ -335,6 +336,12 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -338,6 +339,12 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kString;
#endif

2
patches/helium/settings/move-macos-settings.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -276,16 +276,6 @@
@@ -274,16 +274,6 @@
</template>
</select>
</div>

14
patches/helium/settings/remove-autofill.patch
View File

@@ -16,7 +16,7 @@
class="cr-nav-menu-item">
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -53,7 +53,7 @@
@@ -55,7 +55,7 @@
<settings-ai-page prefs="{{prefs}}"></settings-ai-page>
</settings-section>
</template>
@@ -27,7 +27,7 @@
section="autofill">
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -230,29 +230,6 @@ function createRoutes(): SettingsRoutes
@@ -238,21 +238,6 @@ function createRoutes(): SettingsRoutes
r.FONTS = r.APPEARANCE.createChild('/fonts');
}
@@ -37,18 +37,10 @@
- r.PAYMENTS = r.AUTOFILL.createChild('/payments');
- r.ADDRESSES = r.AUTOFILL.createChild('/addresses');
-
- if (loadTimeData.getBoolean('autofillAiEnabled')) {
- if (loadTimeData.getBoolean('autofillAiFeatureEnabled')) {
- r.AUTOFILL_AI = r.AUTOFILL.createChild('/autofillAi');
- }
-
- // <if expr="enable_glic">
- if (visibility.glic !== false &&
- loadTimeData.getBoolean('showGlicSettings')) {
- r.GLIC = r.BASIC.createSection(
- '/glic', 'glic', loadTimeData.getString('glicPageTitle'));
- }
- // </if>
-
- // <if expr="is_win or is_macosx">
- r.PASSKEYS = r.AUTOFILL.createChild('/passkeys');
- // </if>

2
patches/series
View File

@@ -1,7 +1,6 @@
upstream-fixes/glue_core_pools.patch
upstream-fixes/hardware_destructive_interference_size.patch
upstream-fixes/missing-dependencies.patch
upstream-fixes/fix-building-without-safe-browsing.patch
core/inox-patchset/0001-fix-building-without-safebrowsing.patch
core/inox-patchset/0003-disable-autofill-download-manager.patch
@@ -105,6 +104,7 @@ extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
extra/ungoogled-chromium/enable-extra-locales.patch
extra/ungoogled-chromium/disable-chromelabs.patch
extra/ungoogled-chromium/remove-pac-size-limit.patch
extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch
extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch
extra/brave/chrome-importer-files.patch

29
patches/upstream-fixes/fix-building-without-safe-browsing.patch
View File

@@ -1,29 +0,0 @@
Taken from upstream commit chromium@d9a89d6e5cfa15c2a58091f972ccdd6fde57ebb3.
--- a/services/preferences/tracked/tracked_persistent_pref_store_factory.cc
+++ b/services/preferences/tracked/tracked_persistent_pref_store_factory.cc
@@ -103,12 +103,18 @@ PersistentPrefStore* CreateTrackedPersis
}
#endif
- mojo::Remote<prefs::mojom::TrackedPreferenceValidationDelegate>
- validation_delegate;
- validation_delegate.Bind(std::move(config->validation_delegate));
- auto validation_delegate_ref = base::MakeRefCounted<base::RefCountedData<
- mojo::Remote<prefs::mojom::TrackedPreferenceValidationDelegate>>>(
- std::move(validation_delegate));
+ scoped_refptr<base::RefCountedData<
+ mojo::Remote<prefs::mojom::TrackedPreferenceValidationDelegate>>>
+ validation_delegate_ref;
+ if (config->validation_delegate) {
+ mojo::Remote<prefs::mojom::TrackedPreferenceValidationDelegate>
+ validation_delegate;
+ validation_delegate.Bind(std::move(config->validation_delegate));
+ validation_delegate_ref = base::MakeRefCounted<base::RefCountedData<
+ mojo::Remote<prefs::mojom::TrackedPreferenceValidationDelegate>>>(
+ std::move(validation_delegate));
+ }
+
std::unique_ptr<PrefHashFilter> unprotected_pref_hash_filter(
new PrefHashFilter(CreatePrefHashStore(*config, false),
GetExternalVerificationPrefHashStorePair(

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

@@ -1,16 +1,16 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -880,6 +880,7 @@ source_set("extensions") {
@@ -931,6 +931,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
+ "//components/safe_browsing/content/common/proto:download_file_types_proto",
"//components/safe_browsing/core/browser/db:database_manager",
"//components/safe_browsing/core/common",
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//components/safe_browsing/core/common/proto:csd_proto",
"//components/search_engines",
"//components/services/app_service",
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -552,6 +552,7 @@ static_library("url_constants") {
@@ -544,6 +544,7 @@ static_library("url_constants") {
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
"//components/password_manager/content/common",
"//components/safe_browsing/core/common",
@@ -20,7 +20,7 @@
}
--- a/components/component_updater/installer_policies/BUILD.gn
+++ b/components/component_updater/installer_policies/BUILD.gn
@@ -47,6 +47,7 @@ static_library("installer_policies_no_co
@@ -49,6 +49,7 @@ static_library("installer_policies_no_co
"//components/update_client",
"//mojo/public/cpp/base:protobuf_support",
"//services/network/public/cpp",
@@ -40,26 +40,21 @@
public_deps = [
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -104,6 +104,7 @@ source_set("browser") {
@@ -109,6 +109,7 @@ source_set("browser") {
"//components/file_access",
"//components/filename_generation",
"//components/input",
+ "//components/lens:buildflags",
"//components/language/core/common",
"//components/language_detection/content/common",
"//components/link_header_util",
"//components/metrics",
--- a/services/passage_embeddings/BUILD.gn
+++ b/services/passage_embeddings/BUILD.gn
@@ -31,6 +31,7 @@ source_set("passage_embeddings") {
@@ -38,9 +38,9 @@ source_set("passage_embeddings") {
deps += [ "//services/on_device_model:ml_internal_buildflags" ]
}
deps = [
+ "//components/optimization_guide:machine_learning_tflite_buildflags",
"//services/passage_embeddings/public/mojom",
"//third_party/sentencepiece:sentencepiece",
"//third_party/sentencepiece:sentencepiece_proto",
@@ -38,7 +39,6 @@ source_set("passage_embeddings") {
+ deps += [ "//components/optimization_guide:machine_learning_tflite_buildflags" ]
if (build_with_tflite_lib) {
deps += [
- "//components/optimization_guide:machine_learning_tflite_buildflags",

1942
pruning.list
View File

File diff suppressed because it is too large Load Diff

4
utils/clone.py
View File

@@ -107,7 +107,7 @@ def clone(args): # pylint: disable=too-many-branches, too-many-locals, too-many-
if iswin:
(dtpath / 'git.bat').write_text('git')
# Apply changes to gclient
run(['git', 'apply'],
run(['git', 'apply', '--ignore-whitespace'],
input=Path(__file__).with_name('depot_tools.patch').read_text().replace(
'UC_OUT', str(args.output)).replace('UC_STAGING',
str(ucstaging)).replace('GSUVER', gsuver),
@@ -268,7 +268,7 @@ def main():
parser.add_argument('-p',
'--pgo',
default='linux',
choices=('linux', 'mac', 'mac-arm', 'win32', 'win64'),
choices=('linux', 'mac', 'mac-arm', 'win32', 'win64', 'win-arm64'),
help='Specifiy which pgo profile to download. Default: %(default)s')
parser.add_argument('-s',
'--sysroot',

19
utils/depot_tools.patch
View File

@@ -1,4 +1,5 @@
# Changes to gclient that:
# use system python on windows
# move dotfiles into the staging directory
# skip cipd binary downloads
# skip gcs downloads unless its an allowed sysroot
@@ -6,6 +7,14 @@
# add flag to specify an allowed sysroot
# ensure shallow fetches
# utilize a newer version of gsutil to support later versions of python
--- a/gclient.bat
+++ b/gclient.bat
@@ -20,4 +20,4 @@ IF %ERRORLEVEL% NEQ 0 (
set PATH=%PATH%;%~dp0
:: Defer control.
-call vpython3 "%~dp0gclient.py" %*
+call python3 "%~dp0gclient.py" %*
--- a/gclient.py
+++ b/gclient.py
@@ -126,8 +126,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
@@ -57,7 +66,7 @@
self._gn_args = local_scope.get('gclient_gn_args', [])
# It doesn't make sense to set all of these, since setting gn_args_from
# to another DEPS will make gclient ignore any other local gn_args*
@@ -3935,6 +3945,7 @@ def CMDsync(parser, args):
@@ -3977,6 +3987,7 @@ def CMDsync(parser, args):
dest='experiments',
default=[],
help='Which experiments should be enabled.')
@@ -67,7 +76,7 @@
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -952,8 +952,7 @@ class GitWrapper(SCMWrapper):
@@ -971,8 +971,7 @@ class GitWrapper(SCMWrapper):
self._SetFetchConfig(options)
# Fetch upstream if we don't already have |revision|.
@@ -77,7 +86,7 @@
self._Fetch(options, prune=options.force)
if not scm.GIT.IsValidRevision(
@@ -969,7 +968,7 @@ class GitWrapper(SCMWrapper):
@@ -988,7 +987,7 @@ class GitWrapper(SCMWrapper):
# This is a big hammer, debatable if it should even be here...
if options.force or options.reset:
@@ -86,7 +95,7 @@
if options.upstream and upstream_branch:
target = upstream_branch
self._Scrub(target, options)
@@ -984,7 +983,6 @@ class GitWrapper(SCMWrapper):
@@ -1003,7 +1002,6 @@ class GitWrapper(SCMWrapper):
# to the checkout step.
if not (options.force or options.reset):
self._CheckClean(revision)
@@ -94,7 +103,7 @@
if not current_revision:
current_revision = self._Capture(
@@ -1668,8 +1666,7 @@ class GitWrapper(SCMWrapper):
@@ -1691,8 +1689,7 @@ class GitWrapper(SCMWrapper):
fetch_cmd.append('--no-tags')
elif quiet:
fetch_cmd.append('--quiet')