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

Upgrade to Chromium 89.0.4389.40

Browse Source
This commit is contained in:
Albert Tang
2021-02-22 12:46:44 -06:00
parent 27c9e9fabd
commit ac9c35ab9f
70 changed files with 3002 additions and 5171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
88.0.4324.182
89.0.4389.40

1551
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

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

@@ -4,9 +4,9 @@ Date: Sun, 8 Jul 2018 18:16:34 +0200
Subject: Disable fetching of all field trials
---
.../src/org/chromium/chrome/browser/ChromeFeatureList.java | 12 +++---------
components/variations/service/variations_service.cc | 4 ++++
2 files changed, 7 insertions(+), 9 deletions(-)
.../browser/flags/ChromeFeatureList.java | 19 ++++---------------
.../variations/service/variations_service.cc | 12 +-----------
2 files changed, 5 insertions(+), 26 deletions(-)
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -59,7 +59,7 @@ Subject: Disable fetching of all field trials
/** Alphabetical: */
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -236,17 +236,7 @@ bool GetInstanceManipulations(const net:
@@ -239,17 +239,7 @@ bool GetInstanceManipulations(const net:
// Variations seed fetching is only enabled in official Chrome builds, if a URL
// is specified on the command line, and for testing.
bool IsFetchingEnabled() {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3451,8 +3451,6 @@ static_library("browser") {
@@ -3540,8 +3540,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -11,7 +11,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -49,10 +49,6 @@ class NetworkQualityTracker;
@@ -50,10 +50,6 @@ class NetworkQualityTracker;
class SharedURLLoaderFactory;
}
@@ -22,7 +22,7 @@
namespace subresource_filter {
class RulesetService;
}
@@ -216,9 +212,6 @@ class BrowserProcess {
@@ -212,9 +208,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -34,7 +34,7 @@
virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -67,7 +67,6 @@
@@ -68,7 +68,6 @@
#include "chrome/browser/printing/print_preview_dialog_controller.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
@@ -42,7 +42,7 @@
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -377,8 +376,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -376,8 +375,6 @@ void BrowserProcessImpl::StartTearDown()
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -51,7 +51,7 @@
network_time_tracker_.reset();
#if BUILDFLAG(ENABLE_PLUGINS)
plugins_resource_service_.reset();
@@ -985,14 +982,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -983,14 +980,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -66,7 +66,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1251,26 +1240,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1229,26 +1218,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -95,7 +95,7 @@
created_subresource_filter_ruleset_service_ = true;
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -169,7 +169,6 @@ class BrowserProcessImpl : public Browse
@@ -170,7 +170,6 @@ class BrowserProcessImpl : public Browse
void set_background_mode_manager_for_test(
std::unique_ptr<BackgroundModeManager> manager) override;
StatusTray* status_tray() override;
@@ -103,7 +103,7 @@
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
federated_learning::FlocSortingLshClustersService*
@@ -319,9 +318,6 @@ class BrowserProcessImpl : public Browse
@@ -318,9 +317,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -115,15 +115,15 @@
subresource_filter_ruleset_service_;
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -66,7 +66,6 @@
#include "chrome/browser/previews/previews_service.h"
#include "chrome/browser/previews/previews_service_factory.h"
@@ -73,7 +73,6 @@
#include "chrome/browser/privacy_sandbox/privacy_sandbox_settings.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/spellchecker/spellcheck_factory.h"
#include "chrome/browser/spellchecker/spellcheck_service.h"
@@ -657,10 +656,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -669,10 +668,6 @@ void ChromeBrowsingDataRemoverDelegate::
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -136,7 +136,7 @@
delete_begin, delete_end, filter_builder, host_content_settings_map_,
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -903,30 +903,6 @@ void SetApplicationLocaleOnIOThread(cons
@@ -918,30 +918,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}
@@ -167,7 +167,7 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
AppLoadedInTabSource ClassifyAppLoadedInTabSource(
@@ -1450,7 +1426,6 @@ void ChromeContentBrowserClient::PostAft
@@ -1490,7 +1466,6 @@ void ChromeContentBrowserClient::PostAft
InitNetworkContextsParentDirectory();
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -175,16 +175,16 @@
}
bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
@@ -4060,7 +4035,7 @@ ChromeContentBrowserClient::CreateThrott
@@ -4129,7 +4104,7 @@ ChromeContentBrowserClient::CreateThrott
base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent));
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
- std::make_unique<CertificateReportingServiceCertReporter>(web_contents),
+ nullptr,
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp)));
throttles.push_back(std::make_unique<LoginNavigationThrottle>(handle));
@@ -4073,9 +4048,6 @@ ChromeContentBrowserClient::CreateThrott
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
base::BindOnce(
&TypedNavigationUpgradeThrottle::
@@ -4151,9 +4126,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -219,7 +219,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -386,13 +386,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
@@ -393,13 +393,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm;
@@ -233,7 +233,7 @@
}
#if defined(OS_ANDROID)
@@ -733,16 +726,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -740,16 +733,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename) {
@@ -299,7 +299,7 @@
return !download_->IsSavePackageDownload() &&
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -265,14 +265,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
@@ -266,14 +266,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
@@ -315,7 +315,7 @@
}
}
@@ -472,10 +465,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -473,10 +466,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -383,7 +383,7 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1326,9 +1325,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1312,9 +1311,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@@ -393,18 +393,16 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::unique_ptr<downloads::AcceptDanger::Params> params(
downloads::AcceptDanger::Params::Create(*args_));
@@ -1366,43 +1362,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1352,41 +1348,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
- // DownloadDangerPrompt displays a modal dialog using native widgets that the
- // user must either accept or cancel. It cannot be scripted.
- DownloadDangerPrompt* prompt = DownloadDangerPrompt::Create(
- download_item,
- web_contents,
- true,
- base::Bind(&DownloadsAcceptDangerFunction::DangerPromptCallback,
- this, download_id));
- download_item, web_contents, true,
- base::BindOnce(&DownloadsAcceptDangerFunction::DangerPromptCallback, this,
- download_id));
- // DownloadDangerPrompt deletes itself
- if (on_prompt_created_ && !on_prompt_created_->is_null())
- on_prompt_created_->Run(prompt);
@@ -516,7 +514,7 @@
referrer_entries)));
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -1035,51 +1035,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1041,51 +1041,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -573,7 +571,7 @@
+++ b/chrome/browser/extensions/blocklist_state_fetcher.cc
@@ -32,33 +32,8 @@ BlocklistStateFetcher::~BlocklistStateFe
void BlocklistStateFetcher::Request(const std::string& id,
const RequestCallback& callback) {
RequestCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (!safe_browsing_config_) {
- if (g_browser_process && g_browser_process->safe_browsing_service()) {
@@ -581,13 +579,13 @@
- g_browser_process->safe_browsing_service()->GetV4ProtocolConfig());
- } else {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::BindOnce(callback, BLOCKLISTED_UNKNOWN));
- FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
- return;
- }
- }
-
- bool request_already_sent = base::Contains(callbacks_, id);
- callbacks_.insert(std::make_pair(id, callback));
- callbacks_.insert(std::make_pair(id, std::move(callback)));
- if (request_already_sent)
- return;
-
@@ -603,7 +601,7 @@
-
- SendRequest(id);
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::BindOnce(callback, BLOCKLISTED_UNKNOWN));
+ FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
}
void BlocklistStateFetcher::SendRequest(const std::string& id) {
@@ -634,7 +632,7 @@
+++ b/chrome/browser/extensions/blocklist_state_fetcher.h
@@ -34,8 +34,6 @@ class BlocklistStateFetcher {
virtual void Request(const std::string& id, const RequestCallback& callback);
virtual void Request(const std::string& id, RequestCallback callback);
- void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config);
-
@@ -651,14 +649,14 @@
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -777,9 +777,6 @@ void ChromeMetricsServiceClient::Registe
@@ -780,9 +780,6 @@ void ChromeMetricsServiceClient::Registe
metrics_service_->RegisterMetricsProvider(
std::make_unique<HttpsEngagementMetricsProvider>());
- metrics_service_->RegisterMetricsProvider(
- std::make_unique<CertificateReportingMetricsProvider>());
-
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
#if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
metrics_service_->RegisterMetricsProvider(
std::make_unique<UpgradeMetricsProvider>());
--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
@@ -675,7 +673,7 @@
// static
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -249,7 +249,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -264,7 +264,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalServiceFactory::GetInstance();
#endif
@@ -685,7 +683,7 @@
#endif
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -92,7 +92,6 @@
@@ -94,7 +94,6 @@
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
@@ -693,7 +691,7 @@
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/signin/signin_ui_util.h"
@@ -588,17 +587,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -639,17 +638,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -713,7 +711,7 @@
CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
--- a/chrome/browser/profiles/profiles_state.cc
+++ b/chrome/browser/profiles/profiles_state.cc
@@ -255,9 +255,6 @@ void RemoveBrowsingDataForProfile(const
@@ -248,9 +248,6 @@ void RemoveBrowsingDataForProfile(const
// The BrowsingDataRemover relies on many objects that aren't created in unit
// tests. Previously this code would depend on content::ResourceDispatcherHost
// but that's gone, so do a similar hack for now.
@@ -743,7 +741,7 @@
# "Safe Browsing Basic" files used for safe browsing in full mode
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -274,92 +274,6 @@ bool SecurityStateTabHelper::UsedPolicyI
@@ -275,92 +275,6 @@ bool SecurityStateTabHelper::UsedPolicyI
security_state::MaliciousContentStatus
SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -838,7 +836,7 @@
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
@@ -205,10 +205,7 @@ void ChromeSubresourceFilterClient::Allo
@@ -110,10 +110,7 @@ void ChromeSubresourceFilterClient::OnAd
const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
ChromeSubresourceFilterClient::GetSafeBrowsingDatabaseManager() {
@@ -849,10 +847,10 @@
+ return nullptr;
}
void ChromeSubresourceFilterClient::ToggleForceActivationInCurrentWebContents(
subresource_filter::ProfileInteractionManager*
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -3513,7 +3513,6 @@ static_library("ui") {
@@ -3585,7 +3585,6 @@ static_library("ui") {
"views/device_chooser_content_view.h",
"views/devtools_process_observer.cc",
"views/devtools_process_observer.h",
@@ -862,7 +860,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -310,11 +310,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -314,11 +314,6 @@ void TabHelpers::AttachTabHelpers(WebCon
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
@@ -915,8 +913,8 @@
- download::DownloadItem* dangerous_item) {
- DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create(
- dangerous_item, GetWebUIWebContents(), false,
- base::Bind(&DownloadsDOMHandler::DangerPromptDone,
- weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId()));
- base::BindOnce(&DownloadsDOMHandler::DangerPromptDone,
- weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId()));
- // danger_prompt will delete itself.
- DCHECK(danger_prompt);
-}
@@ -1128,7 +1126,7 @@
html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -95,7 +95,6 @@
@@ -96,7 +96,6 @@
#include "components/paint_preview/buildflags/buildflags.h"
#include "components/pdf/renderer/pepper_pdf_host.h"
#include "components/safe_browsing/buildflags.h"

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

@@ -1,16 +1,16 @@
--- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
+++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
@@ -26,7 +26,6 @@ namespace extensions {
@@ -27,7 +27,6 @@ namespace extensions {
bool IsComponentExtensionAllowlisted(const std::string& extension_id) {
const char* const kAllowed[] = {
- extension_misc::kInAppPaymentsSupportAppId,
extension_misc::kCastExtensionIdRelease,
extension_misc::kPdfExtensionId,
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -349,11 +349,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -350,11 +350,6 @@ void ComponentLoader::AddWebStoreApp() {
if (!IsNormalSession())
return;
#endif
@@ -21,20 +21,8 @@
- l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
}
#if defined(OS_CHROMEOS)
@@ -460,11 +455,6 @@ void ComponentLoader::AddDefaultComponen
AddKeyboardApp();
#else // defined(OS_CHROMEOS)
DCHECK(!skip_session_components);
-#if BUILDFLAG(ENABLE_PRINTING)
- // Cloud Print component app. Not required on Chrome OS.
- Add(IDR_CLOUDPRINT_MANIFEST,
- base::FilePath(FILE_PATH_LITERAL("cloud_print")));
-#endif // BUILDFLAG(ENABLE_PRINTING)
#endif // defined(OS_CHROMEOS)
if (!skip_session_components) {
@@ -525,18 +515,6 @@ void ComponentLoader::AddDefaultComponen
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -521,18 +516,6 @@ void ComponentLoader::AddDefaultComponen
AddHangoutServicesExtension();
#endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
@@ -50,12 +38,12 @@
- l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_PAGE_TITLE));
- }
-
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
AddChromeCameraApp();
AddVideoPlayerExtension();
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -31,9 +31,6 @@ ExternalComponentLoader::~ExternalCompon
@@ -32,9 +32,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
auto prefs = std::make_unique<base::DictionaryValue>();
@@ -63,7 +51,7 @@
- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get());
-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
{
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc

2
patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
View File

@@ -1,6 +1,6 @@
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -131,10 +131,10 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -132,10 +132,10 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;

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

@@ -1,6 +1,6 @@
--- a/chrome/updater/configurator.cc
+++ b/chrome/updater/configurator.cc
@@ -62,7 +62,7 @@ int Configurator::UpdateDelay() const {
@@ -67,7 +67,7 @@ int Configurator::UpdateDelay() const {
}
std::vector<GURL> Configurator::UpdateUrl() const {

2
patches/core/inox-patchset/0017-disable-new-avatar-menu.patch
View File

@@ -1,6 +1,6 @@
--- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc
+++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc
@@ -81,7 +81,7 @@ void PrimaryAccountPolicyManagerImpl::On
@@ -86,7 +86,7 @@ void PrimaryAccountPolicyManagerImpl::On
}
bool PrimaryAccountPolicyManagerImpl::IsSigninAllowed() const {

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

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

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

@@ -1,79 +1,75 @@
From cf98027e6f671068371d33e89db26d8bfcd6caff Mon Sep 17 00:00:00 2001
From 06f6141610cb2aa562c94dbb9f1f4355e4b34c5d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 3 Nov 2014 10:52:56 +0100
Subject: [PATCH 64/66] all: add trk: prefixes to possibly evil connections
Date: Mon, 30 Sep 2019 09:37:51 +0200
Subject: [PATCH 75/76] all: add trk: prefixes to possibly evil connections
Prefix URLs to Google services with trk: so that whenever something
tries to load them, the developer will be informed via printf and
dialog about this infraction.
dialog (extra info bar between URLbar and content window) about this.
If you see such dialog, we know that (a) either the URL needs to be
whitelisted, or (b) the feature that triggered it needs to be disabled
by default.
---
build/mac/tweak_info_plist.py | 2 +-
.../chromeos/customization/customization_document.cc | 2 +-
.../extensions/file_manager/private_api_drive.cc | 2 +-
.../extensions/file_manager/private_api_misc.cc | 2 +-
.../extensions/file_manager/private_api_strings.cc | 12 ++++++------
.../api/cryptotoken_private/cryptotoken_private_api.cc | 4 ++--
chrome/browser/extensions/install_signer.cc | 2 +-
chrome/browser/media/media_url_constants.cc | 2 +-
chrome/browser/nacl_host/nacl_infobar_delegate.cc | 2 +-
chrome/browser/net/predictor.cc | 2 +-
chrome/browser/profiles/profile_avatar_downloader.cc | 2 +-
.../chromeos/chromevox/chromevox/background/prefs.js | 4 ++--
.../resources/default_apps/external_extensions.json | 6 +++---
.../safe_browsing/client_side_detection_service.cc | 4 ++--
chrome/browser/safe_browsing/download_feedback.cc | 2 +-
.../browser/safe_search_api/safe_search_url_checker.cc | 2 +-
.../spellchecker/spellcheck_hunspell_dictionary.cc | 2 +-
.../browser/supervised_user/supervised_user_service.cc | 2 +-
chrome/browser/tracing/crash_service_uploader.cc | 2 +-
.../browser/ui/views/outdated_upgrade_bubble_view.cc | 2 +-
chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | 8 ++++----
chrome/common/extensions/chrome_extensions_client.cc | 4 ++--
chrome/common/extensions/extension_constants.cc | 2 +-
chrome/common/url_constants.cc | 6 +++---
chrome/installer/util/google_chrome_distribution.cc | 2 +-
chromecast/browser/service/cast_service_simple.cc | 2 +-
chromeos/geolocation/simple_geolocation_provider.cc | 2 +-
components/cloud_devices/common/cloud_devices_urls.cc | 8 ++++----
components/crash/content/app/breakpad_linux.cc | 2 +-
components/drive/service/drive_api_service.cc | 8 ++++----
components/feedback/feedback_uploader.cc | 2 +-
components/gcm_driver/gcm_account_tracker.cc | 4 ++--
components/google/core/browser/google_url_tracker.cc | 2 +-
components/history/core/browser/web_history_service.cc | 6 +++---
components/invalidation/impl/gcm_network_channel.cc | 2 +-
components/invalidation/impl/p2p_invalidator.cc | 2 +-
components/metrics/url_constants.cc | 4 ++--
.../password_manager/core/browser/password_store.cc | 8 ++++----
components/policy/core/common/policy_loader_win.cc | 2 +-
components/policy/resources/policy_templates.json | 4 ++--
components/rappor/rappor_service_impl.cc | 2 +-
components/search_engines/prepopulated_engines.json | 2 +-
.../translate/core/browser/translate_url_fetcher.cc | 1 +
components/translate/core/common/translate_util.cc | 2 +-
components/variations/variations_url_constants.cc | 2 +-
content/browser/speech/speech_recognition_engine.cc | 2 +-
content/shell/browser/shell_browser_main_parts.cc | 2 +-
google_apis/gaia/gaia_constants.cc | 18 +++++++++---------
google_apis/gaia/google_service_auth_error.cc | 2 +-
google_apis/gcm/engine/gservices_settings.cc | 6 +++---
jingle/notifier/base/gaia_token_pre_xmpp_auth.cc | 2 +-
remoting/base/breakpad_mac.mm | 2 +-
remoting/protocol/jingle_messages.cc | 2 +-
remoting/webapp/base/js/xmpp_login_handler.js | 2 +-
remoting/webapp/crd/manifest.json.jinja2 | 2 +-
rlz/lib/lib_values.cc | 2 +-
ui/app_list/demo/app_list_demo_views.cc | 2 +-
ui/views/examples/webview_example.cc | 2 +-
61 files changed, 101 insertions(+), 100 deletions(-)
build/mac/tweak_info_plist.py | 2 +-
.../customization/customization_document.cc | 2 +-
.../file_manager/private_api_drive.cc | 2 +-
.../file_manager/private_api_misc.cc | 2 +-
.../remote_commands/crd_host_delegate.cc | 6 +++---
.../cryptotoken_private_api.cc | 4 ++--
chrome/browser/extensions/install_signer.cc | 2 +-
.../media/webrtc/webrtc_event_log_uploader.cc | 2 +-
.../media/webrtc/webrtc_log_uploader.cc | 2 +-
.../nacl_host/nacl_infobar_delegate.cc | 2 +-
.../profiles/profile_avatar_downloader.cc | 2 +-
.../default_apps/external_extensions.json | 6 +++---
.../client_side_detection_service.cc | 2 +-
.../download_protection/download_feedback.cc | 2 +-
.../spellcheck_hunspell_dictionary.cc | 2 +-
.../supervised_user_service.cc | 2 +-
.../browser/tracing/crash_service_uploader.cc | 2 +-
.../ui/views/outdated_upgrade_bubble_view.cc | 2 +-
.../ui/webui/ntp/ntp_resource_cache.cc | 8 ++++----
.../components/recovery_component.cc | 2 +-
.../crash/crashpad_crash_reporter.cc | 2 +-
.../extensions/chrome_extensions_client.cc | 4 ++--
.../setup/google_chrome_behaviors.cc | 2 +-
.../browser/service/cast_service_simple.cc | 2 +-
chromecast/crash/linux/minidump_uploader.cc | 2 +-
.../simple_geolocation_provider.cc | 2 +-
.../common/cloud_devices_urls.cc | 8 ++++----
components/drive/service/drive_api_service.cc | 4 ++--
components/feedback/feedback_uploader.cc | 2 +-
components/gcm_driver/gcm_account_tracker.cc | 4 ++--
components/google/core/common/google_util.cc | 2 +-
.../core/browser/web_history_service.cc | 6 +++---
components/metrics/url_constants.cc | 2 +-
.../core/browser/password_store.cc | 8 ++++----
components/rappor/rappor_service_impl.cc | 2 +-
.../safe_search_url_checker_client.cc | 2 +-
.../safe_search_api/stub_url_checker.cc | 2 +-
.../core/browser/translate_url_fetcher.cc | 1 +
.../translate/core/common/translate_util.cc | 2 +-
.../variations/variations_url_constants.cc | 2 +-
.../speech/speech_recognition_engine.cc | 2 +-
.../browser/webauth/authenticator_common.cc | 4 ++--
.../shell/browser/shell_browser_main_parts.cc | 2 +-
google_apis/gaia/gaia_constants.cc | 20 +++++++++----------
google_apis/gaia/gaia_urls.cc | 1 +
google_apis/gcm/engine/gservices_settings.cc | 6 +++---
.../notifier/base/gaia_token_pre_xmpp_auth.cc | 2 +-
remoting/base/breakpad_mac.mm | 2 +-
remoting/protocol/jingle_messages.cc | 2 +-
rlz/lib/lib_values.cc | 2 +-
third_party/libjingle_xmpp/xmpp/constants.cc | 6 +++---
.../chromevox/background/prefs.js | 4 ++--
.../chromevoxclassic/host/chrome/host.js | 4 ++--
ui/views/examples/webview_example.cc | 2 +-
54 files changed, 89 insertions(+), 87 deletions(-)
--- a/build/apple/tweak_info_plist.py
+++ b/build/apple/tweak_info_plist.py
@@ -194,7 +194,7 @@ def _AddKeystoneKeys(plist, bundle_ident
@@ -195,7 +195,7 @@ def _AddKeystoneKeys(plist, bundle_ident
also requires the |bundle_identifier| argument (com.example.product)."""
plist['KSVersion'] = plist['CFBundleShortVersionString']
plist['KSProductID'] = bundle_identifier
@@ -106,7 +102,7 @@ by default.
content::BrowserContext::GetDefaultStoragePartition(
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -81,7 +81,7 @@ namespace {
@@ -82,7 +82,7 @@ namespace {
using api::file_manager_private::ProfileInfo;
@@ -115,43 +111,26 @@ by default.
// Thresholds for mountCrostini() API.
constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold =
--- a/chrome/browser/chromeos/file_manager/file_manager_string_util.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_string_util.cc
@@ -28,25 +28,25 @@ namespace {
--- a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc
+++ b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc
@@ -78,11 +78,11 @@ constexpr char kCRDConnectClientKey[] =
// Location of the page to buy more storage for Google Drive.
const char kGoogleDriveBuyStorageUrl[] =
- "https://www.google.com/settings/storage";
+ "trk:210:https://www.google.com/settings/storage";
// OAuth2 Token scopes
constexpr char kCloudDevicesOAuth2Scope[] =
- "https://www.googleapis.com/auth/clouddevices";
+ "trk:233:https://www.googleapis.com/auth/clouddevices";
constexpr char kChromotingRemoteSupportOAuth2Scope[] =
- "https://www.googleapis.com/auth/chromoting.remote.support";
+ "trk:234:https://www.googleapis.com/auth/chromoting.remote.support";
constexpr char kTachyonOAuth2Scope[] =
- "https://www.googleapis.com/auth/tachyon";
+ "trk:235:https://www.googleapis.com/auth/tachyon";
// Location of the overview page about Google Drive.
const char kGoogleDriveOverviewUrl[] =
- "https://support.google.com/chromebook/?p=filemanager_drive";
+ "trk:211:https://support.google.com/chromebook/?p=filemanager_drive";
} // namespace
// Location of Google Drive specific help.
const char kGoogleDriveHelpUrl[] =
- "https://support.google.com/chromebook/?p=filemanager_drivehelp";
+ "trk:212:https://support.google.com/chromebook/?p=filemanager_drivehelp";
// Location of the help page about making Google Drive files available offline.
const char kGoogleDriveOfflineHelpUrl[] =
- "http://support.google.com/chromebook/?p=offline_files";
+ "trk:213:http://support.google.com/chromebook/?p=offline_files";
// Location of Google Drive root.
-const char kGoogleDriveRootUrl[] = "https://drive.google.com";
+const char kGoogleDriveRootUrl[] = "trk:214:https://drive.google.com";
// Printf format
-const char kHelpURLFormat[] = "https://support.google.com/chromebook/answer/%d";
+const char kHelpURLFormat[] = "trk:215:https://support.google.com/chromebook/answer/%d";
// Location of the help page for low space warning in the downloads directory.
const int kDownloadsLowSpaceWarningHelpNumber = 1061547;
--- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -60,8 +60,8 @@ enum class U2FAttestationPromptResult {
@@ -42,8 +42,8 @@ namespace {
const char kGoogleDotCom[] = "google.com";
constexpr const char* kGoogleGstaticAppIds[] = {
@@ -173,6 +152,28 @@ by default.
const char kPublicKeyPEM[] = \
"-----BEGIN PUBLIC KEY-----" \
--- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
@@ -122,7 +122,7 @@ void OnURLLoadUploadProgress(uint64_t cu
} // namespace
const char WebRtcEventLogUploaderImpl::kUploadURL[] =
- "https://clients2.google.com/cr/report";
+ "trk:300:https://clients2.google.com/cr/report";
WebRtcEventLogUploaderImpl::Factory::Factory(
scoped_refptr<base::SequencedTaskRunner> task_runner)
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -482,7 +482,7 @@ void WebRtcLogUploader::UploadCompressed
"Not implemented, it would be good to do so."
})");
- constexpr char kUploadURL[] = "https://clients2.google.com/cr/report";
+ constexpr char kUploadURL[] = "trk:301:https://clients2.google.com/cr/report";
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = !upload_url_for_testing_.is_empty()
? upload_url_for_testing_
--- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc
+++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc
@@ -32,7 +32,7 @@ base::string16 NaClInfoBarDelegate::GetL
@@ -197,17 +198,19 @@ by default.
ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index,
--- a/chrome/browser/resources/default_apps/external_extensions.json
+++ b/chrome/browser/resources/default_apps/external_extensions.json
@@ -24,15 +24,15 @@
@@ -27,17 +27,17 @@
},
// Google Sheets
"aapocclcgogkmnckokdopfmhonfmgoek" : {
- "external_update_url": "https://clients2.google.com/service/update2/crx"
+ "external_update_url": "trk:03:https://clients2.google.com/service/update2/crx"
- "external_update_url": "https://clients2.google.com/service/update2/crx",
+ "external_update_url": "trk:03:https://clients2.google.com/service/update2/crx",
"web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite"
},
// Google Slides
"felcaaldnbdncclmgdcncolpebgiejap" : {
- "external_update_url": "https://clients2.google.com/service/update2/crx"
+ "external_update_url": "trk:04:https://clients2.google.com/service/update2/crx"
- "external_update_url": "https://clients2.google.com/service/update2/crx",
+ "external_update_url": "trk:04:https://clients2.google.com/service/update2/crx",
"web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite"
},
// Drive extension
"ghbmnnjooekpmoecnnnilnnbdlolhkhi" : {
@@ -216,17 +219,6 @@ by default.
}
}
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -57,7 +57,7 @@ const int ClientSideDetectionService::kN
const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
const char ClientSideDetectionService::kClientReportPhishingUrl[] =
- "https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
+ "trk:148:https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
struct ClientSideDetectionService::ClientPhishingReportInfo {
std::unique_ptr<network::SimpleURLLoader> loader;
--- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc
@@ -200,7 +200,7 @@ const int64_t DownloadFeedback::kMaxUplo
@@ -251,7 +243,7 @@ by default.
base::ToLowerASCII(bdict_file));
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -86,7 +86,7 @@ namespace {
@@ -85,7 +85,7 @@ namespace {
// The URL from which to download a host denylist if no local one exists yet.
const char kDenylistURL[] =
@@ -262,7 +254,7 @@ by default.
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -40,7 +40,7 @@ using std::string;
@@ -41,7 +41,7 @@ using std::string;
namespace {
@@ -284,10 +276,10 @@ by default.
// The maximum number of ignored bubble we track in the NumLaterPerReinstall
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -78,17 +78,17 @@ namespace {
@@ -81,22 +81,22 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
- "https://support.google.com/chromebook/?p=incognito";
+ "trk:246:https://support.google.com/chromebook/?p=incognito";
#else
@@ -297,7 +289,7 @@ by default.
// The URL for the Learn More page shown on guest session new tab.
const char kLearnMoreGuestSessionUrl[] =
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
- "https://support.google.com/chromebook/?p=chromebook_guest";
+ "trk:248:https://support.google.com/chromebook/?p=chromebook_guest";
#else
@@ -306,9 +298,37 @@ by default.
#endif
// The URL for the Learn More page shown on ephermal guest session new tab.
const char kLearnMoreEphemeralGuestSessionUrl[] =
- "https://support.google.com/chrome/?p=ui_guest";
+ "trk:261:https://support.google.com/chrome/?p=ui_guest";
SkColor GetThemeColor(const ui::ThemeProvider& tp, int id) {
SkColor color = tp.GetColor(id);
--- a/chrome/chrome_cleaner/components/recovery_component.cc
+++ b/chrome/chrome_cleaner/components/recovery_component.cc
@@ -37,7 +37,7 @@ namespace chrome_cleaner {
namespace {
const char kComponentDownloadUrl[] =
- "https://clients2.google.com/service/update2/crx?response=redirect&os=win"
+ "trk:108:https://clients2.google.com/service/update2/crx?response=redirect&os=win"
"&installsource=swreporter&x=id%3Dnpdjjkjlcidkjlamlmmdelcjbcpdjocm"
"%26v%3D0.0.0.0%26uc&acceptformat=crx3";
--- a/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc
+++ b/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc
@@ -28,7 +28,7 @@
namespace {
// The URL where crash reports are uploaded.
-const char kReportUploadURL[] = "https://clients2.google.com/cr/report";
+const char kReportUploadURL[] = "trk:302:https://clients2.google.com/cr/report";
// Whether the current process is connected to a crash handler process.
bool g_is_connected_to_crash_handler = false;
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -46,9 +46,9 @@ namespace {
@@ -44,9 +44,9 @@ namespace {
// TODO(battre): Delete the HTTP URL once the blocklist is downloaded via HTTPS.
const char kExtensionBlocklistUrlPrefix[] =
@@ -320,37 +340,17 @@ by default.
const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh";
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -272,7 +272,7 @@ const char kSyncErrorsHelpURL[] =
"https://support.google.com/chrome/?p=settings_sync_error";
const char kSyncGoogleDashboardURL[] =
- "https://www.google.com/settings/chrome/sync/";
+ "trk:251:https://www.google.com/settings/chrome/sync/";
const char kSyncLearnMoreURL[] =
"https://support.google.com/chrome/?p=settings_sign_in";
@@ -397,7 +397,7 @@ const char kNaturalScrollHelpURL[] =
const char kOemEulaURLPath[] = "oem";
const char kOnlineEulaURLPath[] =
- "https://policies.google.com/terms/embedded?hl=%s";
+ "trk:250:https://policies.google.com/terms/embedded?hl=%s";
const char kAdditionalToSOnlineURLPath[] =
"https://www.google.com/intl/%s/chrome/terms/";
--- a/chrome/installer/setup/google_chrome_behaviors.cc
+++ b/chrome/installer/setup/google_chrome_behaviors.cc
@@ -44,7 +44,7 @@ base::string16 LocalizeUrl(const wchar_t
@@ -37,7 +37,7 @@ namespace installer {
namespace {
base::string16 GetUninstallSurveyUrl() {
static constexpr wchar_t kSurveyUrl[] =
- L"https://support.google.com/chrome/contact/chromeuninstall3?hl=$1";
+ L"trk:253:https://support.google.com/chrome/contact/chromeuninstall3?hl=$1";
return LocalizeUrl(kSurveyUrl);
}
constexpr base::StringPiece16 kUninstallSurveyUrl(
- L"https://support.google.com/chrome?p=chrome_uninstall_survey");
+ L"trk:253:https://support.google.com/chrome?p=chrome_uninstall_survey");
bool NavigateToUrlWithEdge(const base::string16& url) {
base::string16 protocol_url = L"microsoft-edge:" + url;
--- a/chromecast/browser/service/cast_service_simple.cc
+++ b/chromecast/browser/service/cast_service_simple.cc
@@ -27,7 +27,7 @@ GURL GetStartupURL() {
@@ -362,6 +362,17 @@ by default.
GURL url(args[0]);
if (url.is_valid() && url.has_scheme())
--- a/chromecast/crash/linux/minidump_uploader.cc
+++ b/chromecast/crash/linux/minidump_uploader.cc
@@ -40,7 +40,7 @@ namespace {
const char kProductName[] = "Eureka";
-const char kCrashServerProduction[] = "https://clients2.google.com/cr/report";
+const char kCrashServerProduction[] = "trk:305:https://clients2.google.com/cr/report";
const char kVirtualChannel[] = "virtual-channel";
--- a/chromeos/geolocation/simple_geolocation_provider.cc
+++ b/chromeos/geolocation/simple_geolocation_provider.cc
@@ -20,7 +20,7 @@ namespace chromeos {
@@ -373,17 +384,6 @@ by default.
} // namespace
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
@@ -40,7 +40,7 @@ namespace {
const wchar_t kIePath[] = L"Internet Explorer\\iexplore.exe";
const char kChromeInstallUrl[] =
- "https://google.com/cloudprint/learn/chrome.html";
+ "trk:252:https://google.com/cloudprint/learn/chrome.html";
const wchar_t kCloudPrintRegKey[] = L"Software\\Google\\CloudPrint";
--- a/components/cloud_devices/common/cloud_devices_urls.cc
+++ b/components/cloud_devices/common/cloud_devices_urls.cc
@@ -14,14 +14,14 @@
@@ -399,13 +399,13 @@ by default.
// cloud_print_app/manifest.json. If it's matched, print driver dialog will
// open sign-in page in separate window.
-const char kCloudPrintURL[] = "https://www.google.com/cloudprint";
+const char kCloudPrintURL[] = "trk:198:https://www.google.com/cloudprint";
+const char kCloudPrintURL[] = "trk:201:https://www.google.com/cloudprint";
}
--- a/components/drive/service/drive_api_service.cc
+++ b/components/drive/service/drive_api_service.cc
@@ -76,10 +76,10 @@ namespace drive {
@@ -75,9 +75,9 @@ namespace drive {
namespace {
// OAuth2 scopes for Drive API.
@@ -413,12 +413,10 @@ by default.
+const char kDriveScope[] = "trk:217:https://www.googleapis.com/auth/drive";
const char kDriveAppsReadonlyScope[] =
- "https://www.googleapis.com/auth/drive.apps.readonly";
-const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
+ "trk:218:https://www.googleapis.com/auth/drive.apps.readonly";
+const char kDriveAppsScope[] = "trk:219:https://www.googleapis.com/auth/drive.apps";
const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
// Mime type to create a directory.
const char kFolderMimeType[] = "application/vnd.google-apps.folder";
--- a/components/feedback/feedback_uploader.cc
+++ b/components/feedback/feedback_uploader.cc
@@ -25,7 +25,7 @@ constexpr base::FilePath::CharType kFeed
@@ -444,6 +442,17 @@ by default.
// Name of the GCM account tracker for fetching access tokens.
const char kGCMAccountTrackerName[] = "gcm_account_tracker";
// Minimum token validity when sending to GCM groups server.
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -140,7 +140,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
// Global functions -----------------------------------------------------------
-const char kGoogleHomepageURL[] = "https://www.google.com/";
+const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
bool HasGoogleSearchQueryParam(base::StringPiece str) {
url::Component query(0, static_cast<int>(str.length())), key, value;
--- a/components/history/core/browser/web_history_service.cc
+++ b/components/history/core/browser/web_history_service.cc
@@ -41,13 +41,13 @@ namespace history {
@@ -465,7 +474,7 @@ by default.
"https://history.google.com/history/api/lookup?client=audio";
--- a/components/metrics/url_constants.cc
+++ b/components/metrics/url_constants.cc
@@ -7,12 +7,12 @@
@@ -7,7 +7,7 @@
namespace metrics {
const char kNewMetricsServerUrl[] =
@@ -473,17 +482,10 @@ by default.
+ "trk:265:https://clientservices.googleapis.com/uma/v2";
const char kNewMetricsServerUrlInsecure[] =
- "http://clientservices.googleapis.com/uma/v2";
+ "trk:265:http://clientservices.googleapis.com/uma/v2";
-const char kOldMetricsServerUrl[] = "https://clients4.google.com/uma/v2";
+const char kOldMetricsServerUrl[] = "trk:265:https://clients4.google.com/uma/v2";
const char kDefaultMetricsMimeType[] = "application/vnd.chrome.uma";
"http://clientservices.googleapis.com/uma/v2";
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -263,10 +263,10 @@ void PasswordStore::GetLogins(const Form
@@ -271,10 +271,10 @@ void PasswordStore::GetLogins(const Form
// TODO(mdm): actually delete them at some point, say M24 or so.
base::Time cutoff; // the null time
if (form.scheme == PasswordForm::Scheme::kHtml &&
@@ -498,35 +500,6 @@ by default.
static const base::Time::Exploded exploded_cutoff = {
2012, 1, 0, 1, 0, 0, 0, 0}; // 00:00 Jan 1 2012
base::Time out_time;
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -4588,7 +4588,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
- 'example_value': ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;https://clients2.google.com/service/update2/crx', 'abcdefghijklmnopabcdefghijklmnop'],
+ 'example_value': ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;trk:16:https://clients2.google.com/service/update2/crx', 'abcdefghijklmnopabcdefghijklmnop'],
'id': 34,
'caption': '''Configure the list of force-installed apps and extensions''',
'tags': ['full-admin-access'],
@@ -9832,7 +9832,7 @@
'dynamic_refresh': True,
},
'deprecated': True,
- 'example_value': [ '{ "extension-id": "khgabmflimjjbclkmljlpmgaleanedem", "update-url": "https://clients2.google.com/service/update2/crx" }' ],
+ 'example_value': [ '{ "extension-id": "khgabmflimjjbclkmljlpmgaleanedem", "update-url": "trk:18:https://clients2.google.com/service/update2/crx" }' ],
'id': 135,
'caption': '''List of AppPack extensions''',
'tags': [],
@@ -14866,7 +14866,7 @@
'features': {
'dynamic_refresh': True,
},
- 'example_value': ['khpfeaanjngmcnplbdlpegiifgpfgdco;https://clients2.google.com/service/update2/crx'],
+ 'example_value': ['khpfeaanjngmcnplbdlpegiifgpfgdco;trk:19:https://clients2.google.com/service/update2/crx'],
'id': 336,
'caption': '''Configure the list of installed apps and extensions on the login screen''',
'tags': ['full-admin-access'],
--- a/components/rappor/rappor_service_impl.cc
+++ b/components/rappor/rappor_service_impl.cc
@@ -32,7 +32,7 @@ const char kMimeType[] = "application/vn
@@ -538,6 +511,17 @@ by default.
} // namespace
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -53,7 +53,7 @@ const int ClientSideDetectionService::kN
const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
const char ClientSideDetectionService::kClientReportPhishingUrl[] =
- "https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
+ "trk:148:https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
struct ClientSideDetectionService::ClientPhishingReportInfo {
std::unique_ptr<network::SimpleURLLoader> loader;
--- a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc
+++ b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc
@@ -29,7 +29,7 @@ namespace safe_search_api {
@@ -549,27 +533,27 @@ by default.
const char kDataContentType[] = "application/x-www-form-urlencoded";
const char kDataFormat[] = "key=%s&urls=%s";
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -115,7 +115,7 @@
"google": {
"name": "Google",
"keyword": "google.com",
- "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
+ "favicon_url": "trk:186:https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
"search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
"suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
"image_url": "{google:baseURL}searchbyimage/upload",
--- a/components/safe_search_api/stub_url_checker.cc
+++ b/components/safe_search_api/stub_url_checker.cc
@@ -20,7 +20,7 @@ namespace safe_search_api {
namespace {
constexpr char kSafeSearchApiUrl[] =
- "https://safesearch.googleapis.com/v1:classify";
+ "trk:238:https://safesearch.googleapis.com/v1:classify";
std::string BuildResponse(bool is_porn) {
base::DictionaryValue dict;
--- a/components/translate/core/browser/translate_url_fetcher.cc
+++ b/components/translate/core/browser/translate_url_fetcher.cc
@@ -113,6 +113,7 @@ bool TranslateURLFetcher::Request(const
max_retry_on_5xx_, network::SimpleURLLoader::RetryMode::RETRY_ON_5XX);
}
@@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const
if (!extra_request_header_.empty())
resource_request->headers.AddHeaderFromString(extra_request_header_);
+ fprintf(stderr, "translator: fetching something from %s\n", url_.spec().c_str());
simple_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory,
base::BindOnce(&TranslateURLFetcher::OnSimpleLoaderComplete,
simple_loader_ =
variations::CreateSimpleURLLoaderWithVariationsHeaderUnknownSignedIn(
std::move(resource_request),
--- a/components/translate/core/common/translate_util.cc
+++ b/components/translate/core/common/translate_util.cc
@@ -20,7 +20,7 @@ const char kDetectLanguageInSubFrames[]
@@ -603,9 +587,23 @@ by default.
const char kDownstreamUrl[] = "/down?";
const char kUpstreamUrl[] = "/up?";
--- a/content/browser/webauth/authenticator_common.cc
+++ b/content/browser/webauth/authenticator_common.cc
@@ -167,9 +167,9 @@ base::Optional<std::string> ProcessAppId
// special-case AppIDs. Firefox also does this:
// https://groups.google.com/forum/#!msg/mozilla.dev.platform/Uiu3fwnA2xw/201ynAiPAQAJ
const GURL kGstatic1 =
- GURL("https://www.gstatic.com/securitykey/origins.json");
+ GURL("trk:276:https://www.gstatic.com/securitykey/origins.json");
const GURL kGstatic2 =
- GURL("https://www.gstatic.com/securitykey/a/google.com/origins.json");
+ GURL("trk:277:https://www.gstatic.com/securitykey/a/google.com/origins.json");
DCHECK(kGstatic1.is_valid() && kGstatic2.is_valid());
if (origin.DomainIs("google.com") && !appid_url.has_ref() &&
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -87,7 +87,7 @@ GURL GetStartupURL() {
@@ -88,7 +88,7 @@ GURL GetStartupURL() {
#else
const base::CommandLine::StringVector& args = command_line->GetArgs();
if (args.empty())
@@ -614,31 +612,9 @@ by default.
GURL url(args[0]);
if (url.is_valid() && url.has_scheme())
--- a/extensions/browser/updater/safe_manifest_parser.cc
+++ b/extensions/browser/updater/safe_manifest_parser.cc
@@ -28,7 +28,7 @@ namespace {
constexpr char kExpectedGupdateProtocol[] = "2.0";
constexpr char kExpectedGupdateXmlns[] =
- "http://www.google.com/update2/response";
+ "trk:182:http://www.google.com/update2/response";
void ReportError(ParseUpdateManifestCallback callback,
const ManifestParseFailure& failure) {
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -28,7 +28,7 @@ namespace extension_urls {
const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
const char kChromeWebstoreUpdateURL[] =
- "https://clients2.google.com/service/update2/crx";
+ "trk:05:https://clients2.google.com/service/update2/crx";
GURL GetWebstoreLaunchURL() {
extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
--- a/google_apis/gaia/gaia_constants.cc
+++ b/google_apis/gaia/gaia_constants.cc
@@ -25,55 +25,55 @@ const char kSyncService[] = "chromiumsyn
@@ -25,23 +25,23 @@ const char kSyncService[] = "chromiumsyn
const char kRemotingService[] = "chromoting";
// OAuth scopes.
@@ -666,15 +642,14 @@ by default.
- "https://www.googleapis.com/auth/chromesync_playpen";
+ "trk:105:https://www.googleapis.com/auth/chromesync_playpen";
// OAuth2 scope for parental consent logging for secondary account addition.
const char kKidManagementPrivilegedOAuth2Scope[] =
- "https://www.googleapis.com/auth/kid.management.privileged";
+ "trk:276:https://www.googleapis.com/auth/kid.management.privileged";
// OAuth2 scope for access to Kid Management API.
const char kKidManagementOAuth2Scope[] =
@@ -53,16 +53,16 @@ const char kKidManagementPrivilegedOAuth
// OAuth2 scope for access to Google Family Link Supervision Setup.
const char kKidsSupervisionSetupChildOAuth2Scope[] =
- "https://www.googleapis.com/auth/kids.supervision.setup.child";
+ "trk:275:https://www.googleapis.com/auth/kids.supervision.setup.child";
+ "trk:262:https://www.googleapis.com/auth/kids.supervision.setup.child";
// OAuth2 scope for access to Google Talk APIs (XMPP).
const char kGoogleTalkOAuth2Scope[] =
@@ -690,25 +665,16 @@ by default.
// OAuth scope for access to the people API (read-only).
const char kPeopleApiReadOnlyOAuth2Scope[] =
- "https://www.googleapis.com/auth/peopleapi.readonly";
+ "trk:277:https://www.googleapis.com/auth/peopleapi.readonly";
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -23,6 +23,7 @@
namespace {
// OAuth scope for access to the Reauth flow.
const char kAccountsReauthOAuth2Scope[] =
- "https://www.googleapis.com/auth/accounts.reauth";
+ "trk:278:https://www.googleapis.com/auth/accounts.reauth";
// OAuth scope for access to audit recording (ARI).
const char kAuditRecordingOAuth2Scope[] =
- "https://www.googleapis.com/auth/auditrecording-pa";
+ "trk:279:https://www.googleapis.com/auth/auditrecording-pa";
// OAuth scope for access to clear cut logs.
-const char kClearCutOAuth2Scope[] = "https://www.googleapis.com/auth/cclog";
+const char kClearCutOAuth2Scope[] = "trk:280:https://www.googleapis.com/auth/cclog";
// OAuth scope for FCM, the Firebase Cloud Messaging service.
const char kFCMOAuthScope[] =
// Gaia service constants
+//adding trk: here currently crashes the program
const char kDefaultGoogleUrl[] = "http://google.com";
const char kDefaultGaiaUrl[] = "https://accounts.google.com";
const char kDefaultGoogleApisBaseUrl[] = "https://www.googleapis.com";
--- a/google_apis/gcm/engine/gservices_settings.cc
+++ b/google_apis/gcm/engine/gservices_settings.cc
@@ -30,18 +30,18 @@ const char kRegistrationURLKey[] = "gcm_
@@ -751,7 +717,7 @@ by default.
}
if (![breakpad_config objectForKey:@BREAKPAD_URL]) {
- [breakpad_config setObject:@"https://clients2.google.com/cr/report"
+ [breakpad_config setObject:@"trk:108:https://clients2.google.com/cr/report"
+ [breakpad_config setObject:@"trk:310:https://clients2.google.com/cr/report"
forKey:@BREAKPAD_URL];
}
@@ -766,6 +732,46 @@ by default.
const char kWebrtcTransportNamespace[] = "google:remoting:webrtc";
--- a/rlz/lib/lib_values.cc
+++ b/rlz/lib/lib_values.cc
@@ -41,7 +41,7 @@ const char kSetDccResponseVariable[] = "
//
const char kFinancialPingPath[] = "/tools/pso/ping";
-const char kFinancialServer[] = "clients1.google.com";
+const char kFinancialServer[] = "cache.iridiumbrowser.de/clients1.google.com"; /* not using URLRequest! catch with cache.ir */
const int kFinancialPort = 443;
// Ping times in 100-nanosecond intervals.
--- a/third_party/libjingle_xmpp/xmpp/constants.cc
+++ b/third_party/libjingle_xmpp/xmpp/constants.cc
@@ -194,7 +194,7 @@ const StaticQName QN_SASL_TEMPORARY_AUTH
// These are non-standard.
const char NS_GOOGLE_AUTH_PROTOCOL[] =
- "http://www.google.com/talk/protocol/auth";
+ "trk:236:http://www.google.com/talk/protocol/auth";
const StaticQName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT =
{ NS_GOOGLE_AUTH_PROTOCOL, "client-uses-full-bind-result" };
const StaticQName QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN =
@@ -338,7 +338,7 @@ const char STR_SHOW_DND[] = "dnd";
const char STR_SHOW_XA[] = "xa";
const char STR_SHOW_OFFLINE[] = "offline";
-const char NS_GOOGLE_PSTN_CONFERENCE[] = "http://www.google.com/pstn-conference";
+const char NS_GOOGLE_PSTN_CONFERENCE[] = "trk:237:http://www.google.com/pstn-conference";
const StaticQName QN_GOOGLE_PSTN_CONFERENCE_STATUS = { NS_GOOGLE_PSTN_CONFERENCE, "status" };
const StaticQName QN_ATTR_STATUS = { STR_EMPTY, "status" };
@@ -433,7 +433,7 @@ const StaticQName QN_MUC_ROLE = { NS_MUC
const char STR_AFFILIATION_NONE[] = "none";
const char STR_ROLE_PARTICIPANT[] = "participant";
-const char NS_GOOGLE_SESSION[] = "http://www.google.com/session";
+const char NS_GOOGLE_SESSION[] = "trk:238:http://www.google.com/session";
const StaticQName QN_GOOGLE_CIRCLE_ID = { STR_EMPTY, "google-circle-id" };
const StaticQName QN_GOOGLE_USER_ID = { STR_EMPTY, "google-user-id" };
const StaticQName QN_GOOGLE_SESSION_BLOCKED = { NS_GOOGLE_SESSION, "blocked" };
--- a/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
+++ b/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
@@ -72,9 +72,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = {
@@ -773,10 +779,10 @@ by default.
'position': '{}',
'siteSpecificScriptBase':
- 'https://ssl.gstatic.com/accessibility/javascript/ext/',
+ 'trk:152:https://ssl.gstatic.com/accessibility/javascript/ext/',
+ 'trk:242:https://ssl.gstatic.com/accessibility/javascript/ext/',
'siteSpecificScriptLoader':
- 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
+ 'trk:153:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
+ 'trk:243:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
'sticky': false,
'typingEcho': 0,
'useIBeamCursor': cvox.ChromeVox.isMac,
@@ -787,10 +793,10 @@ by default.
!cvox.ApiImplementation.siteSpecificScriptBase);
cvox.ApiImplementation.siteSpecificScriptLoader =
- 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
+ 'trk:154:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
+ 'trk:244:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
cvox.ApiImplementation.siteSpecificScriptBase =
- 'https://ssl.gstatic.com/accessibility/javascript/ext/';
+ 'trk:155:https://ssl.gstatic.com/accessibility/javascript/ext/';
+ 'trk:245:https://ssl.gstatic.com/accessibility/javascript/ext/';
if (apiPrefsChanged) {
var searchInit = prefs['siteSpecificEnhancements'] === 'true' ?
cvox.SearchLoader.init :

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

@@ -1,18 +1,18 @@
From fe92c640c7e02841dcf5dbc20a5eddbd07fd7edf Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
From 4dfa8ed0814040317cb82d8545502186daa0a204 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 7 Jul 2015 17:02:09 +0200
Subject: [PATCH 47/66] safe_browsing: disable incident reporting
Subject: [PATCH 62/76] safe_browsing: disable incident reporting
Disables the safebrowsing incident reporting where you could upload
information about a blocked URL to Google (also added a trk prefix to
the URL so we get notified if this happens again in the future).
---
.../safe_browsing/incident_reporting/incident_report_uploader_impl.cc | 2 +-
.../safe_browsing/incident_reporting/incident_reporting_service.cc | 3 +++
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 3 +--
chrome/browser/safe_browsing/safe_browsing_service.cc | 2 ++
components/security_interstitials/core/safe_browsing_loud_error_ui.cc | 2 ++
5 files changed, 9 insertions(+), 3 deletions(-)
.../incident_reporting/incident_report_uploader_impl.cc | 2 +-
.../incident_reporting/incident_reporting_service.cc | 3 +++
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 3 +--
chrome/browser/safe_browsing/safe_browsing_service.cc | 2 +-
.../security_interstitials/core/safe_browsing_loud_error_ui.cc | 1 +
5 files changed, 7 insertions(+), 4 deletions(-)
--- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
@@ -27,16 +27,18 @@ the URL so we get notified if this happens again in the future).
kSafeBrowsingIncidentTrafficAnnotation =
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -303,11 +303,7 @@ IncidentReportingService::UploadContext:
@@ -303,11 +303,14 @@ IncidentReportingService::UploadContext:
// static
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
- if (profile->IsOffTheRecord())
- return false;
- if (!IsSafeBrowsingEnabled(*profile->GetPrefs()))
- return false;
- return IsExtendedReportingEnabled(*profile->GetPrefs());
+ return false;
+#if 0
if (profile->IsOffTheRecord())
return false;
if (!IsSafeBrowsingEnabled(*profile->GetPrefs()))
return false;
return IsExtendedReportingEnabled(*profile->GetPrefs());
+#endif
}
IncidentReportingService::IncidentReportingService(
@@ -54,7 +56,7 @@ the URL so we get notified if this happens again in the future).
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -262,7 +262,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -260,7 +260,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {
@@ -65,11 +67,11 @@ the URL so we get notified if this happens again in the future).
}
--- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
+++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
@@ -24,6 +24,7 @@ namespace {
@@ -25,6 +25,7 @@ namespace {
// For malware interstitial pages, we link the problematic URL to Google's
// diagnostic page.
+// trk:228
const char kSbDiagnosticUrl[] =
+/* trk:227 */
"https://transparencyreport.google.com/safe-browsing/search?url=%s";
// Constants for the V4 phishing string upgrades.

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

@@ -1,108 +1,34 @@
From 8f348bf2c249701de2f6049ac57fe346bd6b665f Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
From c89ce946e5328ca8a7df923d421e904bb6bfe9b6 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 7 Jul 2015 18:28:46 +0200
Subject: [PATCH 48/66] safe_browsing: disable reporting of safebrowsing
Subject: [PATCH 63/76] safe_browsing: disable reporting of safebrowsing
override
Disables reporting of the safebrowsing override, i.e. the report sent
if a user decides to visit a page that was flagged as "insecure".
This prevents trk:148 (phishing) and trk:149 (malware).
---
.../browser/safe_browsing/client_side_detection_service.cc | 12 ++++++++++++
1 file changed, 12 insertions(+)
components/safe_browsing/content/browser/client_side_detection_service.cc | 5 +++++
1 file changed, 5 insertions(+)
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -221,90 +221,8 @@ void ClientSideDetectionService::StartCl
ClientReportPhishingRequestCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -216,6 +216,10 @@ void ClientSideDetectionService::StartCl
return;
}
- if (!enabled_) {
- if (!callback.is_null())
- std::move(callback).Run(GURL(request->url()), false);
- return;
- }
-
- // Fill in metadata about which model we used.
- request->set_model_filename(model_loader_->name());
- if (is_extended_reporting || is_enhanced_reporting) {
- if (is_enhanced_reporting) {
- request->mutable_population()->set_user_population(
- ChromeUserPopulation::ENHANCED_PROTECTION);
- } else {
- request->mutable_population()->set_user_population(
- ChromeUserPopulation::EXTENDED_REPORTING);
- }
- } else {
- request->mutable_population()->set_user_population(
- ChromeUserPopulation::SAFE_BROWSING);
- }
- request->mutable_population()->set_profile_management_status(
- GetProfileManagementStatus(
- g_browser_process->browser_policy_connector()));
-
- std::string request_data;
- request->SerializeToString(&request_data);
-
- net::NetworkTrafficAnnotationTag traffic_annotation =
- net::DefineNetworkTrafficAnnotation(
- "safe_browsing_client_side_phishing_detector", R"(
- semantics {
- sender: "Safe Browsing Client-Side Phishing Detector"
- description:
- "If the client-side phishing detector determines that the "
- "current page contents are similar to phishing pages, it will "
- "send a request to Safe Browsing to ask for a final verdict. If "
- "Safe Browsing agrees the page is dangerous, Chrome will show a "
- "full-page interstitial warning."
- trigger:
- "Whenever the clinet-side detector machine learning model "
- "computes a phishy-ness score above a threshold, after page-load."
- data:
- "Top-level page URL without CGI parameters, boolean and double "
- "features extracted from DOM, such as the number of resources "
- "loaded in the page, if certain likely phishing and social "
- "engineering terms found on the page, etc."
- destination: GOOGLE_OWNED_SERVICE
- }
- policy {
- cookies_allowed: YES
- cookies_store: "Safe browsing cookie store"
- setting:
- "Users can enable or disable this feature by toggling 'Protect "
- "you and your device from dangerous sites' in Chrome settings "
- "under Privacy. This feature is enabled by default."
- chrome_policy {
- SafeBrowsingEnabled {
- policy_options {mode: MANDATORY}
- SafeBrowsingEnabled: false
- }
- }
- })");
- auto resource_request = std::make_unique<network::ResourceRequest>();
- resource_request->url = GetClientReportUrl(kClientReportPhishingUrl);
- resource_request->method = "POST";
- resource_request->load_flags = net::LOAD_DISABLE_CACHE;
- auto loader = network::SimpleURLLoader::Create(std::move(resource_request),
- traffic_annotation);
- loader->AttachStringForUpload(request_data, "application/octet-stream");
- loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
- url_loader_factory_.get(),
- base::BindOnce(&ClientSideDetectionService::OnURLLoaderComplete,
- base::Unretained(this), loader.get()));
-
- // Remember which callback and URL correspond to the current fetcher object.
- std::unique_ptr<ClientPhishingReportInfo> info(new ClientPhishingReportInfo);
- auto* loader_ptr = loader.get();
- info->loader = std::move(loader);
- info->callback = std::move(callback);
- info->phishing_url = GURL(request->url());
- client_phishing_reports_[loader_ptr] = std::move(info);
-
- // Record that we made a request
- phishing_report_times_.push(base::Time::Now());
+#if 1
+ if (!callback.is_null())
+ std::move(callback).Run(GURL(request->url()), false);
+ callback.Run(GURL(request->url()), false);
+#else
// Fill in metadata about which model we used.
request->set_model_filename(model_loader_->name());
if (is_extended_reporting || is_enhanced_reporting) {
@@ -293,6 +297,7 @@ void ClientSideDetectionService::StartCl
// Record that we made a request
phishing_report_times_.push(base::Time::Now());
+#endif
}
void ClientSideDetectionService::HandlePhishingVerdict(

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

@@ -25,7 +25,7 @@
collection_error_info_.ClearError();
--- a/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc
+++ b/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc
@@ -284,6 +284,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
@@ -285,6 +285,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
@@ -35,7 +35,7 @@
// Note: If there is an ongoing request, abandon it. It's possible that
--- a/chrome/browser/search/promos/promo_service.cc
+++ b/chrome/browser/search/promos/promo_service.cc
@@ -139,6 +139,7 @@ PromoService::PromoService(
@@ -138,6 +138,7 @@ PromoService::PromoService(
PromoService::~PromoService() = default;
void PromoService::Refresh() {
@@ -65,7 +65,7 @@
if (state_ == REQUESTING) {
--- a/components/update_client/update_checker.cc
+++ b/components/update_client/update_checker.cc
@@ -126,6 +126,7 @@ void UpdateCheckerImpl::CheckForUpdates(
@@ -128,6 +128,7 @@ void UpdateCheckerImpl::CheckForUpdates(
const base::flat_map<std::string, std::string>& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) {

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

@@ -35,7 +35,7 @@
GURL rewritten_tab_url = tab_url;
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -486,7 +486,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -526,7 +526,8 @@ void AutocompleteInput::ParseForEmphasiz
// For the view-source and blob schemes, we should emphasize the host of the
// URL qualified by the view-source or blob prefix.
if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
@@ -45,7 +45,7 @@
(static_cast<int>(text.length()) > after_scheme_and_colon)) {
// Obtain the URL prefixed by view-source or blob and parse it.
base::string16 real_url(text.substr(after_scheme_and_colon));
@@ -559,7 +560,9 @@ int AutocompleteInput::NumNonHostCompone
@@ -599,7 +600,9 @@ int AutocompleteInput::NumNonHostCompone
bool AutocompleteInput::HasHTTPScheme(const base::string16& input) {
std::string utf8_input(base::UTF16ToUTF8(input));
url::Component scheme;
@@ -81,7 +81,7 @@
// TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1083,6 +1083,8 @@ component("net") {
@@ -1086,6 +1086,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -171,7 +171,7 @@
using base::Time;
using std::string;
@@ -566,6 +568,12 @@ URLRequest::URLRequest(const GURL& url,
@@ -575,6 +577,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -194,7 +194,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_job_factory.h"
@@ -616,6 +617,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -607,6 +608,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/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -129,11 +129,16 @@ void TraceCrashServiceUploader::DoUpload
@@ -130,11 +130,16 @@ void TraceCrashServiceUploader::DoUpload
progress_callback_ = progress_callback;
done_callback_ = std::move(done_callback);
@@ -23,7 +23,7 @@
}
void TraceCrashServiceUploader::DoCompressOnBackgroundThread(
@@ -306,6 +311,7 @@ bool TraceCrashServiceUploader::Compress
@@ -307,6 +312,7 @@ bool TraceCrashServiceUploader::Compress
void TraceCrashServiceUploader::CreateAndStartURLLoader(
const std::string& upload_url,
const std::string& post_data) {

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

@@ -674,7 +674,7 @@
--- a/components/domain_reliability/uploader.cc
+++ b/components/domain_reliability/uploader.cc
@@ -77,7 +77,7 @@ class DomainReliabilityUploaderImpl : pu
@@ -79,7 +79,7 @@ class DomainReliabilityUploaderImpl : pu
if (discard_uploads_)
discarded_upload_count_++;

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

@@ -2,7 +2,7 @@
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -292,7 +292,7 @@ bool DomDistillerViewerSource::ShouldSer
@@ -295,7 +295,7 @@ bool DomDistillerViewerSource::ShouldSer
std::string DomDistillerViewerSource::GetContentSecurityPolicy(
network::mojom::CSPDirectiveName directive) {
if (directive == network::mojom::CSPDirectiveName::StyleSrc) {

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

@@ -2,9 +2,9 @@
--- a/chrome/common/google_url_loader_throttle.cc
+++ b/chrome/common/google_url_loader_throttle.cc
@@ -13,10 +13,6 @@
#include "net/base/url_util.h"
@@ -14,10 +14,6 @@
#include "services/network/public/mojom/url_response_head.mojom.h"
#include "services/network/public/mojom/x_frame_options.mojom.h"
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "extensions/common/extension_urls.h"
@@ -13,7 +13,7 @@
namespace {
#if defined(OS_ANDROID)
@@ -58,53 +54,6 @@ void GoogleURLLoaderThrottle::DetachFrom
@@ -59,53 +55,6 @@ void GoogleURLLoaderThrottle::DetachFrom
void GoogleURLLoaderThrottle::WillStartRequest(
network::ResourceRequest* request,
bool* defer) {
@@ -67,7 +67,7 @@
}
void GoogleURLLoaderThrottle::WillRedirectRequest(
@@ -114,37 +63,6 @@ void GoogleURLLoaderThrottle::WillRedire
@@ -115,37 +64,6 @@ void GoogleURLLoaderThrottle::WillRedire
std::vector<std::string>* to_be_removed_headers,
net::HttpRequestHeaders* modified_headers,
net::HttpRequestHeaders* modified_cors_exempt_headers) {
@@ -105,19 +105,25 @@
}
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -152,16 +70,5 @@ void GoogleURLLoaderThrottle::WillProces
@@ -153,22 +71,5 @@ void GoogleURLLoaderThrottle::WillProces
const GURL& response_url,
network::mojom::URLResponseHead* response_head,
bool* defer) {
- // Built-in additional protection for the chrome web store origin.
- // Built-in additional protection for the chrome web store origin by ensuring
- // that the X-Frame-Options protection mechanism is set to either DENY or
- // SAMEORIGIN.
- GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
- if (response_url.SchemeIsHTTPOrHTTPS() &&
- response_url.DomainIs(webstore_url.host_piece())) {
- if (response_head && response_head->headers &&
- !response_head->headers->HasHeaderValue("x-frame-options", "deny") &&
- !response_head->headers->HasHeaderValue("x-frame-options",
- "sameorigin")) {
- response_head->headers->AddHeader("x-frame-options", "sameorigin");
- // TODO(mkwst): Consider shifting this to a NavigationThrottle rather than
- // relying on implicit ordering between this check and the time at which
- // ParsedHeaders is created.
- CHECK(response_head);
- CHECK(response_head->parsed_headers);
- if (response_head->parsed_headers->xfo !=
- network::mojom::XFrameOptionsValue::kDeny) {
- response_head->parsed_headers->xfo =
- network::mojom::XFrameOptionsValue::kSameOrigin;
- }
- }
}
@@ -235,7 +241,7 @@
// Global functions -----------------------------------------------------------
@@ -143,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
const char kGoogleHomepageURL[] = "https://www.google.com/";
const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
bool HasGoogleSearchQueryParam(base::StringPiece str) {
- url::Component query(0, static_cast<int>(str.length())), key, value;
@@ -476,7 +482,7 @@
bool IsGoogleHostname(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -513,11 +513,7 @@ base::string16 TemplateURLRef::SearchTer
@@ -526,11 +526,7 @@ base::string16 TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -574,7 +580,7 @@
} // namespace variations
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -415,27 +415,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -430,27 +430,6 @@ bool HasGoogleHost(const GURL& url) {
}
bool IsGoogleHost(base::StringPiece host) {

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -303,7 +303,6 @@ if (!is_android && !is_mac) {
@@ -313,7 +313,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
}
@@ -1028,7 +1027,6 @@ if (is_win) {
@@ -1038,7 +1037,6 @@ if (is_win) {
":keystone_registration_framework",
":swiftshader_library",
":widevine_cdm_library",

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

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

26
patches/core/ungoogled-chromium/disable-signin.patch
View File

@@ -2,10 +2,10 @@
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -474,22 +474,6 @@ GURL GetOSSettingsUrl(const std::string&
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
@@ -493,32 +493,6 @@ GURL GetOSSettingsUrl(const std::string&
void ShowBrowserSignin(Browser* browser,
signin_metrics::AccessPoint access_point) {
signin_metrics::AccessPoint access_point,
signin::ConsentLevel consent_level) {
- Profile* original_profile = browser->profile()->GetOriginalProfile();
- DCHECK(original_profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed));
-
@@ -16,11 +16,21 @@
- std::make_unique<ScopedTabbedBrowserDisplayer>(original_profile);
- browser = displayer->browser();
-
- profiles::BubbleViewMode bubble_view_mode =
- IdentityManagerFactory::GetForProfile(original_profile)
- ->HasPrimaryAccount()
- ? profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH
- : profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN;
- profiles::BubbleViewMode bubble_view_mode;
- if (IdentityManagerFactory::GetForProfile(original_profile)
- ->HasPrimaryAccount()) {
- bubble_view_mode = profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH;
- } else {
- switch (consent_level) {
- case signin::ConsentLevel::kSync:
- bubble_view_mode = profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN;
- break;
- case signin::ConsentLevel::kNotRequired:
- bubble_view_mode = profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT;
- break;
- }
- }
-
- browser->signin_view_controller()->ShowSignin(bubble_view_mode, access_point);
}

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

@@ -21,45 +21,6 @@
}
} // namespace
--- a/chrome/browser/safe_browsing/client_side_model_loader.cc
+++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
@@ -59,8 +59,6 @@ std::string ReadFileIntoString(base::Fil
// Model Loader strings
const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
-const char ModelLoader::kClientModelUrlPrefix[] =
- "https://ssl.gstatic.com/safebrowsing/csd/";
const char ModelLoader::kClientModelNamePattern[] =
"client_model_v5%s_variation_%d.pb";
const char ModelLoader::kClientModelFinchExperiment[] =
@@ -121,7 +119,7 @@ ModelLoader::ModelLoader(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
bool is_extended_reporting)
: name_(FillInModelName(is_extended_reporting, GetModelNumber())),
- url_(kClientModelUrlPrefix + name_),
+ url_("about:blank"),
update_renderers_callback_(update_renderers_callback),
url_loader_factory_(url_loader_factory),
last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
@@ -135,7 +133,7 @@ ModelLoader::ModelLoader(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
const std::string& model_name)
: name_(model_name),
- url_(kClientModelUrlPrefix + name_),
+ url_("about:blank"),
update_renderers_callback_(update_renderers_callback),
url_loader_factory_(url_loader_factory),
last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
--- a/chrome/browser/safe_browsing/client_side_model_loader.h
+++ b/chrome/browser/safe_browsing/client_side_model_loader.h
@@ -42,7 +42,6 @@ class ModelLoader {
static const int kClientModelFetchIntervalMs;
static const char kClientModelFinchExperiment[];
static const char kClientModelFinchParam[];
- static const char kClientModelUrlPrefix[];
static const char kClientModelNamePattern[];
// Enum used to keep stats about why we fail to get the client model. This
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -336,7 +336,7 @@ FinancialPing::PingResponse FinancialPin
@@ -86,7 +47,7 @@
//
const char kFinancialPingPath[] = "/tools/pso/ping";
-const char kFinancialServer[] = "clients1.google.com";
-const char kFinancialServer[] = "cache.iridiumbrowser.de/clients1.google.com"; /* not using URLRequest! catch with cache.ir */
const int kFinancialPort = 443;
// Ping times in 100-nanosecond intervals.

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
@@ -125,28 +125,11 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -126,28 +126,11 @@ void WebRtcLogUploader::LoggingStoppedDo
DCHECK(meta_data.get());
DCHECK(!upload_done_data.paths.directory.empty());
@@ -32,7 +32,7 @@
}
void WebRtcLogUploader::PrepareMultipartPostData(
@@ -157,28 +140,7 @@ void WebRtcLogUploader::PrepareMultipart
@@ -158,28 +141,7 @@ void WebRtcLogUploader::PrepareMultipart
DCHECK(!compressed_log.empty());
DCHECK(meta_data.get());
@@ -62,7 +62,7 @@
}
void WebRtcLogUploader::UploadStoredLog(
@@ -244,49 +206,6 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -245,49 +207,6 @@ void WebRtcLogUploader::LoggingStoppedDo
DCHECK(log_buffer.get());
DCHECK(!log_paths.directory.empty());

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

@@ -15,14 +15,18 @@
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -288,13 +288,7 @@ bool ChromeContentVerifierDelegate::IsFr
@@ -289,17 +289,7 @@ bool ChromeContentVerifierDelegate::IsFr
// between which extensions are considered in-store.
// See https://crbug.com/766806 for details.
if (!InstallVerifier::IsFromStore(extension)) {
if (!InstallVerifier::IsFromStore(extension, context_)) {
- // It's possible that the webstore update url was overridden for testing
- // so also consider extensions with the default (production) update url
- // to be from the store as well.
- if (ManifestURL::GetUpdateURL(&extension) !=
- // to be from the store as well. Therefore update URL is compared with
- // |GetDefaultWebstoreUpdateUrl|, not the |GetWebstoreUpdateUrl| used by
- // |IsWebstoreUpdateUrl|.
- ExtensionManagement* extension_management =
- ExtensionManagementFactory::GetForBrowserContext(context_);
- if (extension_management->GetEffectiveUpdateURL(extension) !=
- extension_urls::GetDefaultWebstoreUpdateUrl()) {
- return false;
- }
@@ -72,7 +76,7 @@
};
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -95,27 +95,18 @@ const char kNotFromWebstoreInstallSource
@@ -94,27 +94,18 @@ const char kNotFromWebstoreInstallSource
const char kDefaultInstallSource[] = "";
const char kReinstallInstallSource[] = "reinstall";
@@ -102,7 +106,7 @@
bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
DCHECK(loader);
@@ -332,12 +323,6 @@ void ExtensionDownloader::DoStartAllPend
@@ -310,12 +301,6 @@ void ExtensionDownloader::DoStartAllPend
ReportStats();
url_stats_ = URLStats();
@@ -115,7 +119,7 @@
fetches_preparing_.clear();
}
@@ -376,11 +361,6 @@ bool ExtensionDownloader::AddExtensionDa
@@ -354,11 +339,6 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -127,7 +131,7 @@
// Skip extensions with empty IDs.
if (id.empty()) {
DLOG(WARNING) << "Found extension with empty ID";
@@ -389,12 +369,10 @@ bool ExtensionDownloader::AddExtensionDa
@@ -367,12 +347,10 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -142,7 +146,7 @@
} else {
url_stats_.other_url_count++;
}
@@ -864,20 +842,6 @@ void ExtensionDownloader::HandleManifest
@@ -842,20 +820,6 @@ void ExtensionDownloader::HandleManifest
update->info);
}
@@ -163,7 +167,7 @@
NotifyExtensionsDownloadStageChanged(
no_updates, ExtensionDownloaderDelegate::Stage::FINISHED);
NotifyExtensionsDownloadFailed(
@@ -1426,11 +1390,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -1404,11 +1368,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:
@@ -185,5 +189,5 @@
-const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
+const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore";
const char kChromeWebstoreUpdateURL[] =
"trk:05:https://clients2.google.com/service/update2/crx";
"https://clients2.google.com/service/update2/crx";

4
patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch
View File

@@ -1,6 +1,6 @@
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -1141,6 +1141,10 @@ source_set("browser") {
@@ -1150,6 +1150,10 @@ source_set("browser") {
"net/browser_online_state_observer.cc",
"net/browser_online_state_observer.h",
"net/cookie_store_factory.cc",
@@ -11,7 +11,7 @@
"net/network_errors_listing_ui.cc",
"net/network_errors_listing_ui.h",
"net/network_quality_observer_impl.cc",
@@ -2773,10 +2777,6 @@ source_set("browser") {
@@ -2796,10 +2800,6 @@ source_set("browser") {
if (enable_reporting) {
sources += [

6
patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4254,8 +4254,6 @@ static_library("ui") {
@@ -4352,8 +4352,6 @@ static_library("ui") {
"views/sync/dice_bubble_sync_promo_view.h",
"views/sync/dice_signin_button_view.cc",
"views/sync/dice_signin_button_view.h",
@@ -25,7 +25,7 @@
}
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -325,6 +325,7 @@ void InlineSigninHelper::OnClientOAuthSu
@@ -371,6 +371,7 @@ void InlineSigninHelper::OnClientOAuthSu
const ClientOAuthResult& result,
Profile* /*profile*/,
Profile::CreateStatus /*status*/) {
@@ -33,7 +33,7 @@
HandlerSigninReason reason = GetHandlerSigninReason(current_url_);
if (reason == HandlerSigninReason::FETCH_LST_ONLY) {
// Constants are only available on Windows for the Google Credential
@@ -414,6 +415,7 @@ void InlineSigninHelper::OnClientOAuthSu
@@ -459,6 +460,7 @@ void InlineSigninHelper::OnClientOAuthSu
CreateSyncStarter(result.refresh_token);
}
base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -4048,11 +4048,13 @@ ChromeContentBrowserClient::CreateThrott
@@ -4126,11 +4126,13 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -14,9 +14,9 @@
}
+#endif
#if defined(OS_WIN) || defined(OS_MAC) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
@@ -5163,20 +5165,7 @@ ChromeContentBrowserClient::GetSafeBrows
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -5312,20 +5314,7 @@ ChromeContentBrowserClient::GetSafeBrows
bool should_check_on_sb_disabled) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -40,7 +40,7 @@
safe_browsing::RealTimeUrlLookupServiceBase*
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -129,7 +129,6 @@ using content::DownloadManager;
@@ -130,7 +130,6 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -48,7 +48,7 @@
using safe_browsing::DownloadProtectionService;
namespace {
@@ -1387,8 +1386,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -1430,8 +1429,6 @@ void ChromeDownloadManagerDelegate::OnDo
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
@@ -75,15 +75,15 @@
#include "content/public/browser/web_contents.h"
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
@@ -273,6 +273,7 @@ void SafeBrowsingPrivateEventRouter::OnD
@@ -300,6 +300,7 @@ void SafeBrowsingPrivateEventRouter::OnD
event_router_->BroadcastEvent(std::move(extension_event));
}
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -304,6 +305,7 @@ void SafeBrowsingPrivateEventRouter::OnD
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeyDangerousDownloadEvent) == 0) {
@@ -334,6 +335,7 @@ void SafeBrowsingPrivateEventRouter::OnD
},
params.url, params.file_name, params.download_digest_sha256,
params.user_name, mime_type, content_size));
@@ -91,15 +91,15 @@
}
void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown(
@@ -331,6 +333,7 @@ void SafeBrowsingPrivateEventRouter::OnS
@@ -361,6 +363,7 @@ void SafeBrowsingPrivateEventRouter::OnS
event_router_->BroadcastEvent(std::move(extension_event));
}
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -360,6 +363,7 @@ void SafeBrowsingPrivateEventRouter::OnS
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeyInterstitialEvent) == 0) {
@@ -393,6 +396,7 @@ void SafeBrowsingPrivateEventRouter::OnS
},
params.url, params.reason, net_error_code, params.user_name,
event_result));
@@ -107,15 +107,15 @@
}
void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
@@ -387,6 +391,7 @@ void SafeBrowsingPrivateEventRouter::OnS
@@ -420,6 +424,7 @@ void SafeBrowsingPrivateEventRouter::OnS
event_router_->BroadcastEvent(std::move(extension_event));
}
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -408,6 +413,7 @@ void SafeBrowsingPrivateEventRouter::OnS
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeyInterstitialEvent) == 0) {
@@ -444,6 +449,7 @@ void SafeBrowsingPrivateEventRouter::OnS
return event;
},
params.url, params.reason, net_error_code, params.user_name));
@@ -123,15 +123,15 @@
}
void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult(
@@ -420,6 +426,7 @@ void SafeBrowsingPrivateEventRouter::OnA
@@ -456,6 +462,7 @@ void SafeBrowsingPrivateEventRouter::OnA
const enterprise_connectors::ContentAnalysisResponse::Result& result,
const int64_t content_size,
safe_browsing::EventResult event_result) {
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -434,6 +441,7 @@ void SafeBrowsingPrivateEventRouter::OnA
if (result.tag() == "malware") {
DCHECK_EQ(1, result.triggered_rules().size());
OnDangerousDeepScanningResult(
@@ -467,6 +474,7 @@ void SafeBrowsingPrivateEventRouter::OnA
OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type,
trigger, result, content_size, event_result);
}
@@ -139,15 +139,15 @@
}
void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult(
@@ -448,6 +456,7 @@ void SafeBrowsingPrivateEventRouter::OnD
@@ -481,6 +489,7 @@ void SafeBrowsingPrivateEventRouter::OnD
const std::string& malware_family,
const std::string& malware_category,
const std::string& evidence_locker_filepath) {
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -497,6 +506,7 @@ void SafeBrowsingPrivateEventRouter::OnD
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeyDangerousDownloadEvent) == 0) {
@@ -533,6 +542,7 @@ void SafeBrowsingPrivateEventRouter::OnD
url.spec(), file_name, download_digest_sha256, GetProfileUserName(),
threat_type, mime_type, trigger, content_size, event_result,
malware_family, malware_category, evidence_locker_filepath));
@@ -155,15 +155,15 @@
}
void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
@@ -508,6 +518,7 @@ void SafeBrowsingPrivateEventRouter::OnS
@@ -544,6 +554,7 @@ void SafeBrowsingPrivateEventRouter::OnS
const enterprise_connectors::ContentAnalysisResponse::Result& result,
const int64_t content_size,
safe_browsing::EventResult event_result) {
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -553,6 +564,7 @@ void SafeBrowsingPrivateEventRouter::OnS
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeySensitiveDataEvent) == 0) {
@@ -592,6 +603,7 @@ void SafeBrowsingPrivateEventRouter::OnS
result, url.spec(), file_name, download_digest_sha256,
GetProfileUserName(), mime_type, trigger, content_size,
event_result));
@@ -171,15 +171,15 @@
}
void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
@@ -564,6 +576,7 @@ void SafeBrowsingPrivateEventRouter::OnA
@@ -603,6 +615,7 @@ void SafeBrowsingPrivateEventRouter::OnA
safe_browsing::DeepScanAccessPoint access_point,
const enterprise_connectors::ContentAnalysisResponse::Result& result,
const int64_t content_size) {
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -608,6 +621,7 @@ void SafeBrowsingPrivateEventRouter::OnA
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeySensitiveDataEvent) == 0) {
@@ -650,6 +663,7 @@ void SafeBrowsingPrivateEventRouter::OnA
result, url.spec(), file_name, download_digest_sha256,
GetProfileUserName(), mime_type, trigger, access_point,
content_size));
@@ -187,15 +187,15 @@
}
void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
@@ -620,6 +634,7 @@ void SafeBrowsingPrivateEventRouter::OnU
@@ -662,6 +676,7 @@ void SafeBrowsingPrivateEventRouter::OnU
const std::string& reason,
const int64_t content_size,
safe_browsing::EventResult event_result) {
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -659,6 +674,7 @@ void SafeBrowsingPrivateEventRouter::OnU
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeyUnscannedFileEvent) == 0) {
@@ -704,6 +719,7 @@ void SafeBrowsingPrivateEventRouter::OnU
url.spec(), file_name, download_digest_sha256, GetProfileUserName(),
mime_type, trigger, access_point, reason, content_size,
event_result));
@@ -203,15 +203,15 @@
}
void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
@@ -669,6 +685,7 @@ void SafeBrowsingPrivateEventRouter::OnD
@@ -714,6 +730,7 @@ void SafeBrowsingPrivateEventRouter::OnD
const std::string& mime_type,
const int64_t content_size,
safe_browsing::EventResult event_result) {
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -703,6 +720,7 @@ void SafeBrowsingPrivateEventRouter::OnD
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeyDangerousDownloadEvent) == 0) {
@@ -751,6 +768,7 @@ void SafeBrowsingPrivateEventRouter::OnD
},
url.spec(), file_name, download_digest_sha256, GetProfileUserName(),
threat_type, mime_type, content_size, event_result));
@@ -219,15 +219,15 @@
}
void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed(
@@ -712,6 +730,7 @@ void SafeBrowsingPrivateEventRouter::OnD
@@ -760,6 +778,7 @@ void SafeBrowsingPrivateEventRouter::OnD
const std::string& threat_type,
const std::string& mime_type,
const int64_t content_size) {
+#if defined(FULL_SAFE_BROWSING)
if (!IsRealtimeReportingEnabled())
return;
@@ -745,6 +764,7 @@ void SafeBrowsingPrivateEventRouter::OnD
auto settings = GetReportingSettings();
if (!settings.has_value() ||
settings->enabled_event_names.count(kKeyDangerousDownloadEvent) == 0) {
@@ -796,6 +815,7 @@ void SafeBrowsingPrivateEventRouter::OnD
},
url.spec(), file_name, download_digest_sha256, GetProfileUserName(),
threat_type, mime_type, content_size));
@@ -235,7 +235,7 @@
}
// static
@@ -970,7 +990,11 @@ void SafeBrowsingPrivateEventRouter::Rep
@@ -1097,7 +1117,11 @@ void SafeBrowsingPrivateEventRouter::Rep
}
std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const {
@@ -246,42 +246,24 @@
+#endif
}
#if defined(OS_CHROMEOS)
--- a/chrome/browser/media/webrtc/display_media_access_handler.cc
+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
@@ -107,6 +107,7 @@ void DisplayMediaAccessHandler::HandleRe
return;
}
+ #if BUILDFLAG(FULL_SAFE_BROWSING)
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Show the warning
@@ -121,6 +122,7 @@ void DisplayMediaAccessHandler::HandleRe
observer->OnDesktopCaptureRequest();
return;
}
+ #endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if defined(OS_MAC)
// Do not allow picker UI to be shown on a page that isn't in the foreground
--- a/chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc
+++ b/chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc
#if BUILDFLAG(IS_CHROMEOS_ASH)
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -20,7 +20,6 @@
#include "chrome/browser/native_file_system/native_file_system_permission_context_factory.h"
#include "chrome/browser/native_file_system/native_file_system_permission_request_manager.h"
#include "chrome/browser/file_system_access/file_system_access_permission_context_factory.h"
#include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
#include "chrome/browser/ui/native_file_system_dialogs.h"
#include "chrome/browser/ui/file_system_access_dialogs.h"
#include "chrome/common/chrome_paths.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -231,79 +230,6 @@ BindResultCallbackToCurrentSequence(
@@ -232,79 +231,6 @@ BindResultCallbackToCurrentSequence(
base::SequencedTaskRunnerHandle::Get(), std::move(callback));
}
-void DoSafeBrowsingCheckOnUIThread(
- content::GlobalFrameRoutingId frame_id,
- std::unique_ptr<content::NativeFileSystemWriteItem> item,
- std::unique_ptr<content::FileSystemAccessWriteItem> item,
- safe_browsing::CheckDownloadCallback callback) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- // Download Protection Service is not supported on Android.
@@ -310,12 +292,12 @@
- item->web_contents = content::WebContents::FromRenderFrameHost(rfh);
- }
-
- sb_service->download_protection_service()->CheckNativeFileSystemWrite(
- sb_service->download_protection_service()->CheckFileSystemAccessWrite(
- std::move(item), std::move(callback));
-#endif
-}
-
-ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult
-ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult
-InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) {
- using Result = safe_browsing::DownloadCheckResult;
- switch (result) {
@@ -324,8 +306,8 @@
- // failed safe browsing ping.
- case Result::UNKNOWN:
- case Result::SAFE:
- case Result::WHITELISTED_BY_POLICY:
- return ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult::
- case Result::ALLOWLISTED_BY_POLICY:
- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
- kAllow;
-
- case Result::DANGEROUS:
@@ -335,34 +317,33 @@
- case Result::BLOCKED_PASSWORD_PROTECTED:
- case Result::BLOCKED_TOO_LARGE:
- case Result::BLOCKED_UNSUPPORTED_FILE_TYPE:
- return ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult::
- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
- kBlock;
-
- // This shouldn't be returned for Native File System write checks.
- // This shouldn't be returned for File System Access write checks.
- case Result::ASYNC_SCANNING:
- case Result::SENSITIVE_CONTENT_WARNING:
- case Result::SENSITIVE_CONTENT_BLOCK:
- case Result::DEEP_SCANNED_SAFE:
- case Result::PROMPT_FOR_SCANNING:
- NOTREACHED();
- return ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult::
- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
- kAllow;
- }
- NOTREACHED();
- return ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult::kBlock;
- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::kBlock;
-}
-
} // namespace
ChromeNativeFileSystemPermissionContext::Grants::Grants() = default;
@@ -379,29 +305,6 @@ void ChromeNativeFileSystemPermissionCon
ChromeFileSystemAccessPermissionContext::Grants::Grants() = default;
@@ -380,28 +306,6 @@ void ChromeFileSystemAccessPermissionCon
std::move(callback)));
}
-void ChromeNativeFileSystemPermissionContext::PerformAfterWriteChecks(
- std::unique_ptr<content::NativeFileSystemWriteItem> item,
-void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
- std::unique_ptr<content::FileSystemAccessWriteItem> item,
- content::GlobalFrameRoutingId frame_id,
-
- base::OnceCallback<void(AfterWriteCheckResult)> callback) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- content::GetUIThreadTaskRunner({})->PostTask(
@@ -382,33 +363,51 @@
- base::SequencedTaskRunnerHandle::Get(), std::move(callback))));
-}
-
void ChromeNativeFileSystemPermissionContext::
void ChromeFileSystemAccessPermissionContext::
DidConfirmSensitiveDirectoryAccess(
const url::Origin& origin,
--- a/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h
+++ b/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h
@@ -53,10 +53,6 @@ class ChromeNativeFileSystemPermissionCo
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
@@ -53,10 +53,6 @@ class ChromeFileSystemAccessPermissionCo
HandleType handle_type,
content::GlobalFrameRoutingId frame_id,
base::OnceCallback<void(SensitiveDirectoryResult)> callback) override;
- void PerformAfterWriteChecks(
- std::unique_ptr<content::NativeFileSystemWriteItem> item,
- std::unique_ptr<content::FileSystemAccessWriteItem> item,
- content::GlobalFrameRoutingId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)> callback) override;
bool CanObtainReadPermission(const url::Origin& origin) override;
bool CanObtainWritePermission(const url::Origin& origin) override;
--- a/chrome/browser/media/webrtc/display_media_access_handler.cc
+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
@@ -109,6 +109,7 @@ void DisplayMediaAccessHandler::HandleRe
return;
}
+ #if BUILDFLAG(FULL_SAFE_BROWSING)
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Show the warning
@@ -123,6 +124,7 @@ void DisplayMediaAccessHandler::HandleRe
observer->OnDesktopCaptureRequest();
return;
}
+ #endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if defined(OS_MAC)
// Do not allow picker UI to be shown on a page that isn't in the foreground
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -31,7 +31,6 @@
#include "chrome/browser/password_manager/field_info_manager_factory.h"
@@ -32,7 +32,6 @@
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_metrics.h"
-#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -105,11 +104,11 @@
@@ -107,11 +106,11 @@
#if BUILDFLAG(FULL_SAFE_BROWSING)
#include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
#include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
@@ -421,23 +420,29 @@
#if defined(OS_ANDROID)
#include "base/feature_list.h"
@@ -802,6 +801,7 @@ std::string ChromePasswordManagerClient:
return std::string();
@@ -829,6 +828,7 @@ autofill::LanguageCode ChromePasswordMan
return autofill::LanguageCode();
}
+#if BUILDFLAG(FULL_SAFE_BROWSING)
#if defined(ON_FOCUS_PING_ENABLED) || defined(PASSWORD_REUSE_DETECTION_ENABLED)
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
@@ -823,6 +823,7 @@ void ChromePasswordManagerClient::CheckS
}
return safe_browsing::ChromePasswordProtectionService::
@@ -839,13 +839,6 @@ ChromePasswordManagerClient::GetPassword
void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
const GURL& form_action,
const GURL& frame_url) {
- safe_browsing::PasswordProtectionService* pps =
- GetPasswordProtectionService();
- if (pps) {
- pps->MaybeStartPasswordFieldOnFocusRequest(
- web_contents(), web_contents()->GetLastCommittedURL(), form_action,
- frame_url, pps->GetAccountInfo().hosted_domain);
- }
}
#endif // defined(ON_FOCUS_PING_ENABLED)
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if defined(PASSWORD_REUSE_DETECTION_ENABLED)
void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -831,24 +832,11 @@ void ChromePasswordManagerClient::CheckP
@@ -855,22 +848,10 @@ void ChromePasswordManagerClient::CheckP
const std::vector<password_manager::MatchingReusedCredential>&
matching_reused_credentials,
bool password_field_exists) {
@@ -450,9 +455,8 @@
- web_contents(), web_contents()->GetLastCommittedURL(), username,
- password_type, matching_reused_credentials, password_field_exists);
}
#endif // defined(PASSWORD_REUSE_DETECTION_ENABLED)
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if defined(PASSWORD_REUSE_WARNING_ENABLED)
void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
- safe_browsing::PasswordProtectionService* pps =
- GetPasswordProtectionService();
@@ -460,22 +464,23 @@
- pps->MaybeLogPasswordReuseDetectedEvent(web_contents());
- }
}
#endif // defined(PASSWORD_REUSE_WARNING_ENABLED)
@@ -1321,9 +1309,11 @@ void ChromePasswordManagerClient::OnPast
ui::EndpointType::kDefault, /*notify_if_restricted=*/false);
clipboard->ReadText(ui::ClipboardBuffer::kCopyPaste, &data_dst, &text);
was_on_paste_called_ = true;
+#if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
password_reuse_detection_manager_.OnPaste(std::move(text));
+#endif // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
ukm::SourceId ChromePasswordManagerClient::GetUkmSourceId() {
@@ -1364,10 +1345,12 @@ void ChromePasswordManagerClient::OnPast
if (self) {
was_on_paste_called_ = true;
+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
password_reuse_detection_manager_.OnPaste(std::move(text));
+#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
}
}
-#endif
+#endif // !defined(OS_ANDROID)
+#endif // !defined(OS_ANDROID)
void ChromePasswordManagerClient::RenderFrameCreated(
content::RenderFrameHost* render_frame_host) {
@@ -1382,7 +1372,9 @@ void ChromePasswordManagerClient::OnInpu
@@ -1424,7 +1407,9 @@ void ChromePasswordManagerClient::OnInpu
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
OnPaste();
} else {
@@ -485,7 +490,7 @@
}
#endif // defined(OS_ANDROID)
}
@@ -1421,6 +1413,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1463,6 +1448,7 @@ bool ChromePasswordManagerClient::IsPass
is_enabled = false;
}
@@ -493,7 +498,7 @@
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Disable password
@@ -1431,6 +1424,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1473,6 +1459,7 @@ bool ChromePasswordManagerClient::IsPass
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -503,22 +508,30 @@
password_manager::BrowserSavePasswordProgressLogger logger(
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -187,12 +187,13 @@ class ChromePasswordManagerClient
@@ -190,13 +190,14 @@ class ChromePasswordManagerClient
void AnnotateNavigationEntry(bool has_password_field) override;
std::string GetPageLanguage() const override;
autofill::LanguageCode GetPageLanguage() const override;
-#if defined(ON_FOCUS_PING_ENABLED) || defined(PASSWORD_REUSE_DETECTION_ENABLED)
+#if (defined(ON_FOCUS_PING_ENABLED) || defined(PASSWORD_REUSE_DETECTION_ENABLED)) && \
+ BUILDFLAG(FULL_SAFE_BROWSING)
+#if BUILDFLAG(FULL_SAFE_BROWSING)
safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
const override;
#endif
-#if defined(ON_FOCUS_PING_ENABLED)
+#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
#if defined(ON_FOCUS_PING_ENABLED)
void CheckSafeBrowsingReputation(const GURL& form_action,
const GURL& frame_url) override;
#endif
-#endif
+#endif // defined(ON_FOCUS_PING_ENABLED)
void CheckProtectedPasswordEntry(
password_manager::metrics_util::PasswordType reused_password_type,
@@ -204,6 +205,7 @@ class ChromePasswordManagerClient
const std::vector<password_manager::MatchingReusedCredential>&
matching_reused_credentials,
bool password_field_exists) override;
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
void LogPasswordReuseDetectedEvent() override;
--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
@@ -17,7 +17,6 @@
@@ -618,7 +631,7 @@
}
--- a/chrome/browser/reputation/reputation_service.cc
+++ b/chrome/browser/reputation/reputation_service.cc
@@ -111,9 +111,7 @@ void ReputationService::GetReputationSta
@@ -119,9 +119,7 @@ void ReputationService::GetReputationSta
ReputationCheckCallback callback) {
DCHECK(url.SchemeIsHTTPOrHTTPS());
@@ -631,7 +644,7 @@
if (service->EngagedSitesNeedUpdating()) {
--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
@@ -50,30 +50,7 @@ RealTimeUrlLookupServiceFactory::RealTim
@@ -53,37 +53,7 @@ RealTimeUrlLookupServiceFactory::RealTim
KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
@@ -654,8 +667,15 @@
- return new RealTimeUrlLookupService(
- network::SharedURLLoaderFactory::Create(std::move(url_loader_factory)),
- VerdictCacheManagerFactory::GetForProfile(profile),
- IdentityManagerFactory::GetForProfile(profile),
- ProfileSyncServiceFactory::GetForProfile(profile), profile->GetPrefs(),
- base::BindRepeating(&safe_browsing::SyncUtils::IsHistorySyncEnabled,
- ProfileSyncServiceFactory::GetForProfile(profile)),
- profile->GetPrefs(),
- std::make_unique<SafeBrowsingPrimaryAccountTokenFetcher>(
- IdentityManagerFactory::GetForProfile(profile)),
- base::BindRepeating(&safe_browsing::SyncUtils::
- AreSigninAndSyncSetUpForSafeBrowsingTokenFetches,
- ProfileSyncServiceFactory::GetForProfile(profile),
- IdentityManagerFactory::GetForProfile(profile)),
- GetProfileManagementStatus(browser_policy_connector),
- is_under_advanced_protection, profile->IsOffTheRecord(),
- g_browser_process->variations_service());
@@ -746,7 +766,7 @@
}
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -754,9 +754,7 @@ void DownloadItemView::UpdateLabels() {
@@ -770,9 +770,7 @@ void DownloadItemView::UpdateLabels() {
deep_scanning_label_->SetVisible(mode_ == Mode::kDeepScanning);
if (deep_scanning_label_->GetVisible()) {
@@ -757,13 +777,14 @@
? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
: IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
const base::string16 filename = ElidedFilename(*deep_scanning_label_);
@@ -780,10 +778,14 @@ void DownloadItemView::UpdateButtons() {
@@ -796,11 +794,15 @@ void DownloadItemView::UpdateButtons() {
}
const bool allow_open_during_deep_scan =
+#if BUILDFLAG(FULL_SAFE_BROWSING)
(mode_ == Mode::kDeepScanning) &&
!enterprise_connectors::ConnectorsManager::GetInstance()
!enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext(
model_->profile())
->DelayUntilVerdict(
enterprise_connectors::AnalysisConnector::FILE_DOWNLOADED);
+#else
@@ -772,7 +793,7 @@
open_button_->SetEnabled((mode_ == Mode::kNormal) || prompt_to_scan ||
allow_open_during_deep_scan);
@@ -1194,7 +1196,9 @@ void DownloadItemView::ShowContextMenuIm
@@ -1224,7 +1226,9 @@ void DownloadItemView::ShowContextMenuIm
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -798,7 +819,7 @@
modal_construction_start_time_ = base::TimeTicks::Now();
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -87,8 +87,6 @@
@@ -86,8 +86,6 @@
#include "components/prefs/pref_service.h"
#include "components/reading_list/features/reading_list_switches.h"
#include "components/safe_browsing/buildflags.h"
@@ -807,7 +828,7 @@
#include "components/search/ntp_features.h"
#include "components/security_interstitials/content/connection_help_ui.h"
#include "components/security_interstitials/content/known_interception_disclosure_ui.h"
@@ -567,8 +565,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -557,8 +555,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<PredictorsUI>;
if (url.host_piece() == chrome::kChromeUIQuotaInternalsHost)
return &NewWebUI<QuotaInternalsUI>;
@@ -826,9 +847,9 @@
}
}
--- a/chrome/browser/ui/webui/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management_ui_handler.cc
@@ -813,14 +813,6 @@ base::Value ManagementUIHandler::GetThre
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -814,14 +814,6 @@ base::Value ManagementUIHandler::GetThre
auto* on_page_visited_event =
chrome_policies.GetValue(policy::key::kEnterpriseRealTimeUrlCheckMode);
@@ -841,7 +862,7 @@
- info.Append(std::move(value));
- }
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
std::string enterprise_manager = GetDeviceManager();
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -856,9 +877,9 @@
}
--- a/components/password_manager/core/browser/password_manager_client.h
+++ b/components/password_manager/core/browser/password_manager_client.h
@@ -325,11 +325,14 @@ class PasswordManagerClient {
@@ -330,11 +330,14 @@ class PasswordManagerClient {
// Returns the current best guess as to the page's display language.
virtual std::string GetPageLanguage() const;
virtual autofill::LanguageCode GetPageLanguage() const;
+#if (defined(ON_FOCUS_PING_ENABLED) || defined(PASSWORD_REUSE_DETECTION_ENABLED)) && \
+ BUILDFLAG(FULL_SAFE_BROWSING)
@@ -872,7 +893,7 @@
// Checks the safe browsing reputation of the webpage when the
// user focuses on a username/password field. This is used for reporting
// only, and won't trigger a warning.
@@ -337,6 +340,7 @@ class PasswordManagerClient {
@@ -342,6 +345,7 @@ class PasswordManagerClient {
const GURL& frame_url) = 0;
#endif
@@ -880,17 +901,17 @@
// Checks the safe browsing reputation of the webpage where password reuse
// happens. This is called by the PasswordReuseDetectionManager when a
// protected password is typed on the wrong domain. This may trigger a
@@ -349,6 +353,7 @@ class PasswordManagerClient {
@@ -354,6 +358,7 @@ class PasswordManagerClient {
const std::string& username,
const std::vector<MatchingReusedCredential>& matching_reused_credentials,
bool password_field_exists) = 0;
+#endif
#if defined(PASSWORD_REUSE_WARNING_ENABLED)
// Records a Chrome Sync event that GAIA password reuse was detected.
virtual void LogPasswordReuseDetectedEvent() = 0;
--- a/components/password_manager/core/browser/password_reuse_detection_manager.cc
+++ b/components/password_manager/core/browser/password_reuse_detection_manager.cc
@@ -172,10 +172,12 @@ void PasswordReuseDetectionManager::OnRe
@@ -170,10 +170,12 @@ void PasswordReuseDetectionManager::OnRe
? reused_protected_password_hash->username
: "";
@@ -989,90 +1010,84 @@
// Protected by lock_.
--- a/content/browser/file_system_access/native_file_system_file_writer_impl.cc
+++ b/content/browser/file_system_access/native_file_system_file_writer_impl.cc
@@ -462,51 +462,7 @@ void NativeFileSystemFileWriterImpl::Clo
// swap file even if the writer was destroyed at that point.
state_ = State::kClosePending;
@@ -513,15 +513,8 @@ void NativeFileSystemFileWriterImpl::Clo
close_callback_ = std::move(callback);
- if (!RequireSecurityChecks() || !manager()->permission_context()) {
- DidPassAfterWriteCheck(std::move(callback));
- DidAfterWriteCheck(
- FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow);
- return;
- }
-
- ComputeHashForSwapFile(base::BindOnce(
- &NativeFileSystemFileWriterImpl::DoAfterWriteCheck,
- weak_factory_.GetWeakPtr(), base::WrapRefCounted(manager()), swap_url(),
- std::move(callback)));
-}
-
- ComputeHashForSwapFile(
- base::BindOnce(&NativeFileSystemFileWriterImpl::DoAfterWriteCheck,
- weak_factory_.GetWeakPtr()));
+ DidAfterWriteCheck(
+ FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow);
}
void NativeFileSystemFileWriterImpl::AbortImpl(AbortCallback callback) {
@@ -541,37 +534,6 @@ void NativeFileSystemFileWriterImpl::Abo
manager()->RemoveFileWriter(this);
}
-// static
-void NativeFileSystemFileWriterImpl::DoAfterWriteCheck(
- base::WeakPtr<NativeFileSystemFileWriterImpl> file_writer,
- scoped_refptr<NativeFileSystemManagerImpl> manager,
- const storage::FileSystemURL& swap_url,
- NativeFileSystemFileWriterImpl::CloseCallback callback,
- base::File::Error hash_result,
- const std::string& hash,
- int64_t size) {
- if (!file_writer || hash_result != base::File::FILE_OK) {
- // If writer was deleted, or calculating the hash failed try deleting the
- // swap file and invoke the callback.
- manager->operation_runner().PostTaskWithThisObject(
- FROM_HERE, base::BindOnce(&RemoveSwapFile, swap_url));
- std::move(callback).Run(native_file_system_error::FromStatus(
- NativeFileSystemStatus::kOperationAborted,
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
- if (hash_result != base::File::FILE_OK) {
- // Calculating the hash failed try deleting the swap file and invoke the
- // callback.
- manager()->operation_runner().PostTaskWithThisObject(
- FROM_HERE, base::BindOnce(&RemoveSwapFile, swap_url()));
- CallCloseCallbackAndDeleteThis(native_file_system_error::FromStatus(
- FileSystemAccessStatus::kOperationAborted,
- "Failed to perform Safe Browsing check."));
- return;
- }
-
- DCHECK_CALLED_ON_VALID_SEQUENCE(file_writer->sequence_checker_);
-
- auto item = std::make_unique<NativeFileSystemWriteItem>();
- item->target_file_path = file_writer->url().path();
- item->full_path = file_writer->swap_url().path();
- auto item = std::make_unique<FileSystemAccessWriteItem>();
- item->target_file_path = url().path();
- item->full_path = swap_url().path();
- item->sha256_hash = hash;
- item->size = size;
- item->frame_url = file_writer->context().url;
- item->has_user_gesture = file_writer->has_transient_user_activation_;
- file_writer->manager()->permission_context()->PerformAfterWriteChecks(
- std::move(item), file_writer->context().frame_id,
- item->frame_url = context().url;
- item->has_user_gesture = has_transient_user_activation_;
- manager()->permission_context()->PerformAfterWriteChecks(
- std::move(item), context().frame_id,
- base::BindOnce(&NativeFileSystemFileWriterImpl::DidAfterWriteCheck,
- file_writer, std::move(manager), swap_url,
- std::move(callback)));
+ DidPassAfterWriteCheck(std::move(callback));
}
// static
- weak_factory_.GetWeakPtr()));
-}
-
void NativeFileSystemFileWriterImpl::DidAfterWriteCheck(
FileSystemAccessPermissionContext::AfterWriteCheckResult result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--- a/content/browser/file_system_access/native_file_system_file_writer_impl.h
+++ b/content/browser/file_system_access/native_file_system_file_writer_impl.h
@@ -81,16 +81,8 @@ class CONTENT_EXPORT NativeFileSystemFil
bool complete);
@@ -106,9 +106,6 @@ class CONTENT_EXPORT NativeFileSystemFil
void TruncateImpl(uint64_t length, TruncateCallback callback);
void CloseImpl(CloseCallback callback);
- // The following two methods are static, because they need to be invoked to
- // perform cleanup even if the writer was deleted before they were invoked.
- static void DoAfterWriteCheck(
- base::WeakPtr<NativeFileSystemFileWriterImpl> file_writer,
- scoped_refptr<NativeFileSystemManagerImpl> manager,
- const storage::FileSystemURL& swap_url,
- NativeFileSystemFileWriterImpl::CloseCallback callback,
- base::File::Error hash_result,
- const std::string& hash,
- int64_t size);
+ // The following method is static, because it needs to be invoked to
+ // perform cleanup even if the writer was deleted before it was invoked.
static void DidAfterWriteCheck(
base::WeakPtr<NativeFileSystemFileWriterImpl> file_writer,
scoped_refptr<NativeFileSystemManagerImpl> manager,
--- a/content/public/browser/native_file_system_permission_context.h
+++ b/content/public/browser/native_file_system_permission_context.h
@@ -99,12 +99,6 @@ class NativeFileSystemPermissionContext
void AbortImpl(AbortCallback callback);
- void DoAfterWriteCheck(base::File::Error hash_result,
- const std::string& hash,
- int64_t size);
void DidAfterWriteCheck(
FileSystemAccessPermissionContext::AfterWriteCheckResult result);
void DidSwapFileSkipQuarantine(base::File::Error result);
--- a/content/public/browser/file_system_access_permission_context.h
+++ b/content/public/browser/file_system_access_permission_context.h
@@ -107,12 +107,6 @@ class FileSystemAccessPermissionContext
base::OnceCallback<void(SensitiveDirectoryResult)> callback) = 0;
enum class AfterWriteCheckResult { kAllow, kBlock };
- // Runs a recently finished write operation through checks such as malware
- // or other security checks to determine if the write should be allowed.
- virtual void PerformAfterWriteChecks(
- std::unique_ptr<NativeFileSystemWriteItem> item,
- std::unique_ptr<FileSystemAccessWriteItem> item,
- GlobalFrameRoutingId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)> callback) = 0;

12
patches/core/ungoogled-chromium/remove-enable-dse-memoryssa-cflag.patch
View File

@@ -1,16 +1,6 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -604,9 +604,6 @@ config("compiler") {
# Experimentally determined to yield a reasonable trade-off between
# build time, run-time performance, and binary size.
"-mllvm:-import-instr-limit=10",
-
- # TODO(https://crbug.com/1127713): Investigate, remove.
- "-mllvm:-enable-dse-memoryssa=false",
]
} else {
ldflags += [ "-flto=thin" ]
@@ -631,9 +628,6 @@ config("compiler") {
@@ -651,9 +651,6 @@ config("compiler") {
"-Wl,--thinlto-cache-policy,$cache_policy",
]

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

File diff suppressed because it is too large Load Diff

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

@@ -6,8 +6,8 @@
"google": {
- "name": "Google",
- "keyword": "google.com",
- "favicon_url": "trk:186:https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
- "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
- "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
- "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
- "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
- "image_url": "{google:baseURL}searchbyimage/upload",
- "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}",

10
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
@@ -121,6 +121,7 @@
@@ -122,6 +122,7 @@
#include "components/spellcheck/common/spellcheck_common.h"
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/strings/grit/components_strings.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"
@@ -1533,6 +1534,8 @@ void RenderViewContextMenu::AppendPageIt
@@ -1553,6 +1554,8 @@ void RenderViewContextMenu::AppendPageIt
menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
}
@@ -18,7 +18,7 @@
ChromeTranslateClient* chrome_translate_client =
ChromeTranslateClient::FromWebContents(embedder_web_contents_);
const bool canTranslate =
@@ -1554,6 +1557,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -1574,6 +1577,7 @@ void RenderViewContextMenu::AppendPageIt
IDC_CONTENT_CONTEXT_TRANSLATE,
l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
}
@@ -44,7 +44,7 @@
#include "components/translate/core/common/translate_util.h"
#include "net/base/url_util.h"
#include "ui/base/l10n/l10n_util.h"
@@ -215,6 +217,9 @@ GURL TranslateLanguageList::TranslateLan
@@ -220,6 +222,9 @@ GURL TranslateLanguageList::TranslateLan
}
void TranslateLanguageList::RequestLanguageList() {
@@ -56,7 +56,7 @@
request_pending_ = true;
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -850,8 +850,9 @@ void TranslateManager::FilterIsTranslate
@@ -855,8 +855,9 @@ void TranslateManager::FilterIsTranslate
->LogAutofillAssistantDeferredTriggerDecision();
}

32
patches/core/ungoogled-chromium/use-local-devtools-files.patch
View File

@@ -5,40 +5,12 @@
--- a/third_party/devtools-frontend/src/BUILD.gn
+++ b/third_party/devtools-frontend/src/BUILD.gn
@@ -226,7 +226,7 @@ devtools_frontend_resources_deps = [
@@ -212,7 +212,7 @@ devtools_applications = [
devtools_frontend_resources_deps = [
":build_release_devtools",
":devtools_extension_api",
"front_end",
- "test",
+# "test",
]
group("devtools_all_files") {
@@ -261,7 +261,6 @@ action("generate_devtools_grd") {
generated_emulated_device_images +
[
"$resources_out_dir/devtools_extension_api.js",
- "$resources_out_dir/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm",
"$resources_out_dir/formatter_worker_entrypoint.js",
"$resources_out_dir/third_party/acorn/package/dist/acorn.mjs",
]
--- a/third_party/devtools-frontend/src/devtools_grd_files.gni
+++ b/third_party/devtools-frontend/src/devtools_grd_files.gni
@@ -317,7 +317,6 @@ grd_files_release_sources = [
"front_end/screencast/screencast.js",
"front_end/sdk/sdk-legacy.js",
"front_end/sdk/sdk.js",
- "front_end/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm",
"front_end/search/search-legacy.js",
"front_end/search/search.js",
"front_end/search/search_module.js",
--- a/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/BUILD.gn
+++ b/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/BUILD.gn
@@ -8,7 +8,6 @@ devtools_pre_built("wasm_source_map") {
sources = [
"pkg/wasm_source_map.d.ts",
"pkg/wasm_source_map.js",
- "pkg/wasm_source_map_bg.wasm",
"wasm_source_map-tsconfig.json",
]
}

42
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
@@ -2295,6 +2295,7 @@ static_library("browser") {
@@ -2353,6 +2353,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
@@ -174,6 +174,7 @@
@@ -177,6 +177,7 @@
#include "third_party/blink/public/common/forcedark/forcedark_switches.h"
#include "third_party/blink/public/common/switches.h"
#include "third_party/leveldatabase/leveldb_features.h"
@@ -44,7 +44,7 @@
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -216,6 +216,7 @@ source_set("browser") {
@@ -218,6 +218,7 @@ source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/sqlite",
@@ -54,7 +54,7 @@
"//third_party/zlib",
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -219,6 +219,7 @@
@@ -214,6 +214,7 @@
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
#include "third_party/blink/public/mojom/disk_allocator.mojom.h"
#include "third_party/blink/public/public_buildflags.h"
@@ -62,7 +62,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/accessibility/accessibility_switches.h"
#include "ui/base/ui_base_switches.h"
@@ -3331,6 +3332,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3235,6 +3236,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLDraftExtensions,
switches::kEnableWebGLImageChromium,
switches::kFileUrlPathAlias,
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -445,6 +446,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -455,6 +456,10 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kEnableAccessibilityObjectModel, true},
{wrf::EnableAllowSyncXHRInPageDismissal,
switches::kAllowSyncXHRInPageDismissal, true},
@@ -104,15 +104,15 @@
if (command_line.HasSwitch(mapping.switch_name))
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -200,6 +200,8 @@ class WebRuntimeFeatures {
@@ -199,6 +199,8 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
BLINK_PLATFORM_EXPORT static void EnableGetCurrentBrowsingContextMedia(bool);
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
BLINK_PLATFORM_EXPORT static void EnableShadowDOMV0(bool);
BLINK_PLATFORM_EXPORT static void EnableCustomElementsV0(bool);
BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
BLINK_PLATFORM_EXPORT static void
EnableSignedExchangePrefetchCacheForNavigations(bool);
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -42,6 +42,7 @@
@@ -123,7 +123,7 @@
#include "base/time/time.h"
#include "cc/input/overscroll_behavior.h"
#include "cc/input/scroll_snap_data.h"
@@ -929,6 +930,14 @@ Range* Document::CreateRangeAdjustedToTr
@@ -923,6 +924,14 @@ Range* Document::CreateRangeAdjustedToTr
Position::BeforeNode(*shadow_host));
}
@@ -138,7 +138,7 @@
SelectorQueryCache& Document::GetSelectorQueryCache() {
if (!selector_query_cache_)
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
@@ -2510,6 +2519,15 @@ void Document::UpdateStyleAndLayoutTree(
@@ -2429,6 +2438,15 @@ void Document::UpdateStyleAndLayoutTree(
#if DCHECK_IS_ON()
AssertLayoutTreeUpdated(*this);
#endif
@@ -156,7 +156,7 @@
void Document::InvalidateStyleAndLayoutForFontUpdates() {
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -448,6 +448,10 @@ class CORE_EXPORT Document : public Cont
@@ -442,6 +442,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -167,7 +167,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -1981,6 +1985,9 @@ class CORE_EXPORT Document : public Cont
@@ -1967,6 +1971,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -179,7 +179,7 @@
HeapVector<Member<ScriptElementBase>> current_script_stack_;
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2062,6 +2062,11 @@ DOMRectList* Element::getClientRects() {
@@ -2057,6 +2057,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
quads, *element_layout_object);
@@ -191,7 +191,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2079,6 +2084,9 @@ DOMRect* Element::getBoundingClientRect(
@@ -2074,6 +2079,9 @@ DOMRect* Element::getBoundingClientRect(
DCHECK(element_layout_object);
GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -266,7 +266,7 @@
const TextDirection&,
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
@@ -947,9 +947,15 @@ TextMetrics* CanvasRenderingContext2D::m
@@ -974,9 +974,15 @@ TextMetrics* CanvasRenderingContext2D::m
else
direction = ToTextDirection(GetState().GetDirection(), canvas());
@@ -285,7 +285,7 @@
void CanvasRenderingContext2D::DrawTextInternal(
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1622,6 +1622,7 @@ component("platform") {
@@ -1638,6 +1638,7 @@ component("platform") {
"//cc/mojo_embedder",
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
@@ -295,8 +295,8 @@
"//crypto",
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -647,4 +647,12 @@ void WebRuntimeFeatures::EnableTargetBla
RuntimeEnabledFeatures::SetTargetBlankImpliesNoOpenerEnabled(enable);
@@ -643,4 +643,12 @@ void WebRuntimeFeatures::EnableCSSColorS
RuntimeEnabledFeatures::SetCSSColorSchemeUARenderingEnabled(enable);
}
+void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
@@ -310,8 +310,8 @@
} // namespace blink
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -872,6 +872,12 @@
status: "stable",
@@ -894,6 +894,12 @@
status: "experimental",
},
{
+ name: "FingerprintingClientRectsNoise",

14
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
@@ -2080,6 +2080,7 @@ static_library("browser") {
@@ -2131,6 +2131,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -64,14 +64,14 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/synchronization/waitable_event.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
@@ -96,6 +98,7 @@
@@ -98,6 +100,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"
+#include "components/network_session_configurator/common/network_switches.h"
#include "components/network_time/network_time_tracker.h"
#include "components/optimization_guide/optimization_guide_features.h"
#include "components/optimization_guide/optimization_guide_service.h"
#include "components/permissions/permissions_client.h"
#include "components/policy/core/common/policy_service.h"
@@ -131,6 +134,7 @@
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -80,7 +80,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
@@ -327,6 +331,18 @@ void BrowserProcessImpl::Init() {
@@ -326,6 +330,18 @@ void BrowserProcessImpl::Init() {
base::BindRepeating(&ApplyMetricsReportingPolicy));
#endif
@@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1384,6 +1384,10 @@ const char kMediaHistoryDescription[] =
@@ -1383,6 +1383,10 @@ const char kMediaHistoryDescription[] =
"Enables Media History which records data around media playbacks on "
"websites.";
@@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -823,6 +823,9 @@ extern const char kMarkHttpAsWarningAndD
@@ -820,6 +820,9 @@ extern const char kLogJsConsoleMessagesD
extern const char kMediaHistoryName[];
extern const char kMediaHistoryDescription[];

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

@@ -3,8 +3,8 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -696,9 +696,6 @@ void StartupBrowserCreatorImpl::AddInfoB
/*auto_expire=*/false, /*should_animate=*/false);
@@ -596,9 +596,6 @@ void StartupBrowserCreatorImpl::AddInfoB
}
#endif
- if (!google_apis::HasAPIKeyConfigured())

2
patches/extra/debian/disable/welcome-page.patch
View File

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1138,7 +1138,7 @@ void ProfileManager::InitProfileUserPref
@@ -1189,7 +1189,7 @@ void ProfileManager::InitProfileUserPref
profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
supervised_user_id);
}

10
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
@@ -340,7 +340,7 @@ void BackgroundModeManager::RegisterPref
@@ -360,7 +360,7 @@ void BackgroundModeManager::RegisterPref
registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
#endif
@@ -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
@@ -1302,7 +1302,7 @@ void ChromeContentBrowserClient::Registe
@@ -1337,7 +1337,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -45,7 +45,7 @@
enum class NetworkPredictionStatus {
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -319,7 +319,7 @@ void ProfileNetworkContextService::Updat
@@ -324,7 +324,7 @@ void ProfileNetworkContextService::Updat
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -56,7 +56,7 @@
registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled,
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -276,7 +276,7 @@ const char Profile::kProfileKey[] = "__P
@@ -248,7 +248,7 @@ const char Profile::kProfileKey[] = "__P
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
@@ -78,7 +78,7 @@
</cr-dialog>
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
@@ -116,7 +116,7 @@ void AccountConsistencyModeManager::Regi
@@ -117,7 +117,7 @@ void AccountConsistencyModeManager::Regi
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
registry->RegisterBooleanPref(kDiceMigrationCompletePref, false);
#endif

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -187,26 +187,7 @@ struct NewTabURLDetails {
@@ -188,26 +188,7 @@ struct NewTabURLDetails {
: chrome::kChromeSearchLocalNtpUrl);
#endif

997
patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch
View File

File diff suppressed because it is too large Load Diff

4
patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch
View File

@@ -1,10 +1,10 @@
--- a/chrome/browser/ui/startup/startup_tab_provider.cc
+++ b/chrome/browser/ui/startup/startup_tab_provider.cc
@@ -47,7 +47,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
@@ -48,7 +48,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
// Chrome OS has its own welcome flow provided by OOBE.
-#if defined(OS_CHROMEOS)
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if 1
return StartupTabs();
#else

4
patches/extra/inox-patchset/0019-disable-battery-status-service.patch
View File

@@ -11,7 +11,7 @@
}
BatteryStatusService::~BatteryStatusService() = default;
@@ -40,58 +37,16 @@ BatteryStatusService::AddCallback(const
@@ -40,58 +37,16 @@ base::CallbackListSubscription BatterySt
DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
DCHECK(!is_shutdown_);
@@ -84,7 +84,7 @@
}
--- a/services/device/battery/battery_status_service.h
+++ b/services/device/battery/battery_status_service.h
@@ -57,15 +57,10 @@ class BatteryStatusService {
@@ -56,15 +56,10 @@ class BatteryStatusService {
// Updates current battery status and sends new status to interested
// render processes. Can be called on any thread via a callback.
void NotifyConsumers(const mojom::BatteryStatus& status);

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

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

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

@@ -11,7 +11,7 @@ very interesting in themselves. Force them to be stored.
--- a/third_party/blink/common/mime_util/mime_util.cc
+++ b/third_party/blink/common/mime_util/mime_util.cc
@@ -77,6 +77,7 @@ static const char* const kUnsupportedTex
@@ -81,6 +81,7 @@ static const char* const kUnsupportedTex
"text/x-csv",
"text/x-vcf",
"text/rtf",

2
patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
View File

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

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

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

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

@@ -7,8 +7,8 @@
+#include "base/command_line.h"
#include "base/observer_list.h"
#include "build/build_config.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -68,10 +69,12 @@ bool BookmarkTabHelper::ShouldShowBookma
#include "build/chromeos_buildflags.h"
@@ -69,10 +70,12 @@ bool BookmarkTabHelper::ShouldShowBookma
!prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar))
return false;

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/metrics/histogram.h"
@@ -249,6 +250,15 @@ AutocompleteController::AutocompleteCont
@@ -276,6 +277,15 @@ AutocompleteController::AutocompleteCont
search_service_worker_signal_sent_(false),
template_url_service_(provider_client_->GetTemplateURLService()) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();

10
patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5732,7 +5732,7 @@ bool ChromeContentBrowserClient::ShouldA
@@ -5879,7 +5879,7 @@ bool ChromeContentBrowserClient::ShouldA
const url::Origin& embedder_origin,
const content::PepperPluginInfo& plugin_info) {
#if BUILDFLAG(ENABLE_PDF)
@@ -11,7 +11,7 @@
if (embedder_origin.scheme() == extensions::kExtensionScheme &&
--- a/chrome/browser/pdf/pdf_extension_util.cc
+++ b/chrome/browser/pdf/pdf_extension_util.cc
@@ -153,7 +153,7 @@ std::string GetManifest() {
@@ -172,7 +172,7 @@ std::string GetManifest() {
DCHECK(manifest_contents.find(kNameTag) != std::string::npos);
base::ReplaceFirstSubstringAfterOffset(
&manifest_contents, 0, kNameTag,
@@ -254,7 +254,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -241,6 +241,7 @@ static_library("common") {
@@ -245,6 +245,7 @@ static_library("common") {
"//components/no_state_prefetch/common",
"//components/no_state_prefetch/common:mojo_bindings",
"//components/page_load_metrics/common:common",
@@ -362,7 +362,7 @@
FILE_PATH_LITERAL("internal-pdf-viewer");
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -928,7 +928,7 @@ WebPlugin* ChromeContentRendererClient::
@@ -945,7 +945,7 @@ WebPlugin* ChromeContentRendererClient::
}
}
} else if (info.name ==
@@ -371,7 +371,7 @@
// Report PDF load metrics. Since the PDF plugin is comprised of an
// extension that loads a second plugin, avoid double counting by
// ignoring the creation of the second plugin.
@@ -964,7 +964,7 @@ WebPlugin* ChromeContentRendererClient::
@@ -981,7 +981,7 @@ WebPlugin* ChromeContentRendererClient::
PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
url);
if (info.name ==

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

@@ -67,10 +67,10 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/debug/crash_logging.h"
#include "base/format_macros.h"
#include "base/metrics/histogram_macros.h"
@@ -207,6 +208,12 @@ bool IsCreatedByExtension(const Template
@@ -196,6 +197,12 @@ bool IsCreatedByExtension(const Template
template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
}
@@ -83,7 +83,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -291,6 +298,7 @@ TemplateURLService::TemplateURLService(
@@ -280,6 +287,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::Closure& dsp_change_callback)
: prefs_(prefs),
@@ -91,16 +91,7 @@
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
client_(std::move(client)),
@@ -356,7 +364,7 @@ bool TemplateURLService::CanAddAutogener
if (existing_url) {
// We already have a TemplateURL for this keyword. Only allow it to be
// replaced if the TemplateURL can be replaced.
- return CanReplace(existing_url);
+ return should_autocollect_ && CanReplace(existing_url);
}
// We don't have a TemplateURL with keyword. We still may not allow this
@@ -365,8 +373,8 @@ bool TemplateURLService::CanAddAutogener
@@ -361,8 +369,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.
@@ -111,7 +102,7 @@
}
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
@@ -1423,6 +1431,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -1446,6 +1454,8 @@ SyncDataMap TemplateURLService::CreateGU
void TemplateURLService::Init(const Initializer* initializers,
int num_initializers) {
@@ -120,7 +111,7 @@
if (client_)
client_->SetOwner(this);
@@ -1559,6 +1569,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -1582,6 +1592,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -130,19 +121,9 @@
const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
if (!urls)
return true;
@@ -1569,7 +1582,8 @@ bool TemplateURLService::CanAddAutogener
}
bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {
- return !ShowInDefaultList(t_url) && t_url->safe_for_autoreplace();
+ return should_autocollect_ && !ShowInDefaultList(t_url) &&
+ t_url->safe_for_autoreplace();
}
TemplateURL* TemplateURLService::FindNonExtensionTemplateURLForKeyword(
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -702,6 +702,8 @@ class TemplateURLService : public WebDat
@@ -685,6 +685,8 @@ class TemplateURLService : public WebDat
// ---------- Browser state related members ---------------------------------
PrefService* prefs_ = nullptr;

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

@@ -8,7 +8,7 @@
#include "base/containers/flat_map.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
@@ -1726,6 +1727,10 @@ bool TabStripModel::InternalCloseTabs(
@@ -1738,6 +1739,10 @@ bool TabStripModel::InternalCloseTabs(
if (items.empty())
return true;

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

@@ -74,10 +74,10 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
+#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/stl_util.h"
@@ -196,6 +197,13 @@ bool ExtensionManagement::IsInstallation
@@ -234,6 +235,13 @@ bool ExtensionManagement::IsInstallation
bool ExtensionManagement::IsOffstoreInstallAllowed(
const GURL& url,
const GURL& referrer_url) const {

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

@@ -13,7 +13,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -82,6 +82,8 @@ WindowOpenDisposition RenderViewImpl::Na
@@ -86,6 +86,8 @@ WindowOpenDisposition RenderViewImpl::Na
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

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

@@ -18,10 +18,10 @@
#include <vector>
+#include "base/command_line.h"
#include "base/i18n/uchar.h"
#include "base/lazy_instance.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
@@ -267,6 +268,13 @@ IDNConversionResult IDNToUnicodeWithAdju
@@ -268,6 +269,13 @@ IDNConversionResult IDNToUnicodeWithAdju
host16.reserve(host.length());
host16.insert(host16.end(), host.begin(), host.end());

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

@@ -3,7 +3,7 @@
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -661,7 +661,8 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -551,7 +551,8 @@ void StartupBrowserCreatorImpl::AddInfoB
if (command_line_.HasSwitch(switches::kKioskMode))
return;

4
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
@@ -240,14 +240,30 @@ void ToolbarView::Init() {
@@ -241,14 +241,30 @@ void ToolbarView::Init() {
std::unique_ptr<ToolbarAccountIconContainerView>
toolbar_account_icon_container;
@@ -14,7 +14,7 @@
+ browser_->profile()->IsGuestSession();
+
bool show_avatar_toolbar_button = true;
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (!base::FeatureList::IsEnabled(chromeos::features::kAvatarToolbarButton)) {
// ChromeOS only badges Incognito and Guest icons in the browser window.
- show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() ||

4
patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
View File

@@ -2,13 +2,13 @@
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -77,14 +77,13 @@ using content::WebContents;
@@ -79,14 +79,13 @@ using content::WebContents;
namespace {
bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {
- *adjust_layout = false;
- // For ash, always allow entering stacked mode.
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
*adjust_layout = true;
return prefs->GetBoolean(prefs::kTabStripStackedLayout);
#else

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

@@ -13,9 +13,9 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -193,5 +193,7 @@ extern const base::FeatureParam<base::Ti
"TimeoutTcpConnectAttemptMax",
base::TimeDelta::FromSeconds(30));
@@ -199,5 +199,7 @@ constexpr base::Feature kFirstPartySets{
const base::FeatureParam<bool> kFirstPartySetsIsDogfooder{
&kFirstPartySets, "FirstPartySetsIsDogfooder", false};
+const base::Feature kSetIpv6ProbeFalse{"SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT};
+
@@ -23,9 +23,9 @@
} // namespace net
--- a/net/base/features.h
+++ b/net/base/features.h
@@ -287,6 +287,8 @@ NET_EXPORT extern const base::FeaturePar
NET_EXPORT extern const base::FeatureParam<base::TimeDelta>
kTimeoutTcpConnectAttemptMax;
@@ -294,6 +294,8 @@ NET_EXPORT extern const base::Feature kF
// feature.
NET_EXPORT extern const base::FeatureParam<bool> kFirstPartySetsIsDogfooder;
+NET_EXPORT extern const base::Feature kSetIpv6ProbeFalse;
+
@@ -34,7 +34,7 @@
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -131,11 +131,6 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -132,11 +132,6 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -46,7 +46,7 @@
enum DnsResolveStatus {
RESOLVE_STATUS_DNS_SUCCESS = 0,
RESOLVE_STATUS_PROC_SUCCESS,
@@ -3708,7 +3703,7 @@ bool HostResolverManager::IsIPv6Reachabl
@@ -3370,7 +3365,7 @@ bool HostResolverManager::IsIPv6Reachabl
(tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) {
SetLastIPv6ProbeResult(

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

@@ -417,7 +417,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -616,7 +616,8 @@ void TemplateURLService::IncrementUsageC
@@ -640,7 +640,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const base::string16& title,
const base::string16& keyword,
@@ -427,7 +427,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -630,6 +631,7 @@ void TemplateURLService::ResetTemplateUR
@@ -654,6 +655,7 @@ void TemplateURLService::ResetTemplateUR
}
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
@@ -435,18 +435,9 @@
Update(url, TemplateURL(data));
}
@@ -1914,7 +1916,7 @@ TemplateURL* TemplateURLService::Add(std
// Neither engine can be replaced. Uniquify the existing keyword.
base::string16 new_keyword = UniquifyKeyword(*existing_turl, false);
ResetTemplateURL(existing_turl, existing_turl->short_name(),
- new_keyword, existing_turl->url());
+ new_keyword, existing_turl->url(), "");
DCHECK_EQ(new_keyword, existing_turl->keyword());
}
}
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -237,7 +237,8 @@ class TemplateURLService : public WebDat
@@ -251,7 +251,8 @@ class TemplateURLService : public WebDat
void ResetTemplateURL(TemplateURL* url,
const base::string16& title,
const base::string16& keyword,
@@ -454,5 +445,5 @@
+ const std::string& search_url,
+ const std::string& suggestions_url);
// Creates TemplateURL, populating it with data from Play API. If TemplateURL
// with matching keyword already exists then merges Play API data into it.
// Creates a TemplateURL for |keyword| marked with created_from_play_api().
// Returns the newly created engine.

4
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
@@ -2448,7 +2448,13 @@ const FeatureEntry::FeatureVariation kCh
@@ -2570,7 +2570,13 @@ const FeatureEntry::FeatureVariation kPa
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.
@@ -13,7 +13,7 @@
+#include "chrome/browser/ungoogled_platform_flag_entries.h"
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
// //tools/flags/generate_unexpire_flags.py.
#include "chrome/browser/unexpire_flags_gen.inc"
#include "build/chromeos_buildflags.h"
--- /dev/null
+++ b/chrome/browser/bromite_flag_choices.h
@@ -0,0 +1,7 @@

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

@@ -176,7 +176,7 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -62,7 +62,6 @@ source_set("browser") {
@@ -64,7 +64,6 @@ source_set("browser") {
"//components/discardable_memory/service",
"//components/download/database",
"//components/download/public/common:public",

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

@@ -2,7 +2,7 @@
--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
@@ -469,14 +469,14 @@ ComponentResult IDNToUnicodeOneComponent
@@ -471,14 +471,14 @@ ComponentResult IDNToUnicodeOneComponent
} // namespace
const FormatUrlType kFormatUrlOmitNothing = 0;

4
patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
View File

@@ -3,7 +3,7 @@
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -3560,8 +3560,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3691,8 +3691,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3575,8 +3574,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3706,8 +3705,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

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

@@ -2,12 +2,12 @@
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -310,7 +310,7 @@ const base::Feature kFontAccessChooser{"
@@ -322,7 +322,7 @@ const base::Feature kFontAccessChooser{"
// Prefetch request properties are updated to be privacy-preserving. See
// crbug.com/988956.
const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",
- base::FEATURE_DISABLED_BY_DEFAULT};
+ base::FEATURE_ENABLED_BY_DEFAULT};
const char kMixedContentAutoupgradeModeParamName[] = "mode";
const char kMixedContentAutoupgradeModeAllPassive[] = "all-passive";
// Decodes jpeg 4:2:0 formatted images to YUV instead of RGBX and stores in this
// format in the image decode cache. See crbug.com/919627 for details on the

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -408,11 +408,6 @@ int GetContentRestrictions(const Browser
@@ -407,11 +407,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -14,7 +14,7 @@
}
return content_restrictions;
}
@@ -1187,8 +1182,7 @@ bool CanSavePage(const Browser* browser)
@@ -1202,8 +1197,7 @@ bool CanSavePage(const Browser* browser)
prefs::kAllowFileSelectionDialogs)) {
return false;
}

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

@@ -1,10 +1,10 @@
--- a/chrome/browser/ui/views/tabs/new_tab_button.cc
+++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
@@ -57,10 +57,8 @@ class NewTabButton::HighlightPathGenerat
NewTabButton::NewTabButton(TabStrip* tab_strip, PressedCallback callback)
: views::ImageButton(std::move(callback)), tab_strip_(tab_strip) {
@@ -58,10 +58,8 @@ NewTabButton::NewTabButton(TabStrip* tab
SetAnimateOnStateChange(true);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
SetTriggerableEventFlags(GetTriggerableEventFlags() |
ui::EF_MIDDLE_MOUSE_BUTTON);
-#endif
@@ -13,7 +13,7 @@
AddChildView(std::make_unique<views::InkDropContainerView>());
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2434,8 +2434,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2578,8 +2578,6 @@ void TabStrip::NewTabButtonPressed(const
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {
@@ -22,7 +22,7 @@
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
CHECK(clipboard);
base::string16 clipboard_text;
@@ -2443,7 +2441,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2587,7 +2585,6 @@ void TabStrip::NewTabButtonPressed(const
/* data_dst = */ nullptr, &clipboard_text);
if (!clipboard_text.empty())
controller_->CreateNewTabWithLocation(clipboard_text);

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

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

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

@@ -27,7 +27,7 @@
href="chrome://settings/clearBrowserData"
--- a/chrome/browser/resources/settings/a11y_page/a11y_page.html
+++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html
@@ -56,10 +56,6 @@
@@ -57,10 +57,6 @@
sub-label="$i18n{accessibleImageLabelsSubtitle}">
</settings-toggle-button>
</if>
@@ -69,17 +69,14 @@
<settings-section page-title="$i18n{privacyPageTitle}"
--- a/chrome/browser/resources/settings/languages_page/languages_page.html
+++ b/chrome/browser/resources/settings/languages_page/languages_page.html
@@ -220,14 +220,6 @@
@@ -219,11 +219,6 @@
</a>
</div>
</div>
- <settings-toggle-button id="offerTranslateOtherLanguages"
- pref="{{prefs.translate.enabled}}"
- label="$i18n{offerToEnableTranslate}"
- <if expr="chromeos">
- on-settings-boolean-control-change="onTranslateToggleChange_"
- </if>
- >
- on-settings-boolean-control-change="onTranslateToggleChange_">
- </settings-toggle-button>
</iron-collapse>
<settings-toggle-button
@@ -110,7 +107,7 @@
class="hr"
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -81,10 +81,3 @@
@@ -76,10 +76,3 @@
sub-label="$i18n{manageCertificatesDescription}"
on-click="onManageCertificatesClick_"></cr-link-row>
</if>
@@ -138,7 +135,7 @@
<iron-icon icon="cr:security"></iron-icon>
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -214,6 +214,7 @@ void ProfileMenuView::BuildMenu() {
@@ -217,6 +217,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -146,16 +143,17 @@
Profile* profile = browser()->profile();
if (!profile->IsRegularProfile())
@@ -504,7 +505,7 @@ void ProfileMenuView::BuildIdentity() {
@@ -514,8 +515,7 @@ void ProfileMenuView::BuildIdentity() {
menu_title_, menu_subtitle_);
} else {
menu_title_ = base::string16();
- menu_subtitle_ =
- l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE);
+ menu_subtitle_ = base::string16();
SetProfileIdentityInfo(
profile_name, background_color, edit_button_params,
ui::ImageModel::FromImage(
profile_attributes->GetAvatarIcon(kIdentityImageSize)),
/*title=*/base::string16(),
- l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE));
+ base::string16());
}
}
@@ -570,6 +571,7 @@ void ProfileMenuView::BuildSyncInfo() {
@@ -586,6 +586,7 @@ void ProfileMenuView::BuildSyncInfo() {
return;
}

196
patches/extra/ungoogled-chromium/searx.patch
View File

@@ -45,145 +45,145 @@
// United Arab Emirates
const PrepopulatedEngine* const engines_AE[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -48,6 +50,7 @@ const PrepopulatedEngine* const engines_
// Albania
const PrepopulatedEngine* const engines_AL[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -57,6 +60,7 @@ const PrepopulatedEngine* const engines_
// Argentina
const PrepopulatedEngine* const engines_AR[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_ar,
@@ -66,6 +70,7 @@ const PrepopulatedEngine* const engines_
// Austria
const PrepopulatedEngine* const engines_AT[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&duckduckgo,
@@ -75,6 +80,7 @@ const PrepopulatedEngine* const engines_
// Australia
const PrepopulatedEngine* const engines_AU[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_au,
@@ -84,6 +90,7 @@ const PrepopulatedEngine* const engines_
// Bosnia and Herzegovina
const PrepopulatedEngine* const engines_BA[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -92,6 +99,7 @@ const PrepopulatedEngine* const engines_
// Belgium
const PrepopulatedEngine* const engines_BE[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -101,6 +109,7 @@ const PrepopulatedEngine* const engines_
// Bulgaria
const PrepopulatedEngine* const engines_BG[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -110,6 +119,7 @@ const PrepopulatedEngine* const engines_
// Bahrain
const PrepopulatedEngine* const engines_BH[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -119,6 +129,7 @@ const PrepopulatedEngine* const engines_
// Burundi
const PrepopulatedEngine* const engines_BI[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -128,6 +139,7 @@ const PrepopulatedEngine* const engines_
// Brunei
const PrepopulatedEngine* const engines_BN[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -137,6 +149,7 @@ const PrepopulatedEngine* const engines_
// Bolivia
const PrepopulatedEngine* const engines_BO[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -146,6 +159,7 @@ const PrepopulatedEngine* const engines_
// Brazil
const PrepopulatedEngine* const engines_BR[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_br,
@@ -155,6 +169,7 @@ const PrepopulatedEngine* const engines_
// Belarus
const PrepopulatedEngine* const engines_BY[] = {
+ &searx,
&duckduckgo,
&google,
&yandex_by,
&mail_ru,
@@ -164,6 +179,7 @@ const PrepopulatedEngine* const engines_
// Belize
const PrepopulatedEngine* const engines_BZ[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -173,6 +189,7 @@ const PrepopulatedEngine* const engines_
// Canada
const PrepopulatedEngine* const engines_CA[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_ca,
@@ -182,6 +199,7 @@ const PrepopulatedEngine* const engines_
// Switzerland
const PrepopulatedEngine* const engines_CH[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&duckduckgo,
@@ -191,6 +209,7 @@ const PrepopulatedEngine* const engines_
// Chile
const PrepopulatedEngine* const engines_CL[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_es,
@@ -200,6 +219,7 @@ const PrepopulatedEngine* const engines_
// China
@@ -197,65 +197,65 @@
// Colombia
const PrepopulatedEngine* const engines_CO[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_es,
@@ -219,6 +240,7 @@ const PrepopulatedEngine* const engines_
// Costa Rica
const PrepopulatedEngine* const engines_CR[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -228,6 +250,7 @@ const PrepopulatedEngine* const engines_
// Czech Republic
const PrepopulatedEngine* const engines_CZ[] = {
+ &searx,
&duckduckgo,
&google,
&seznam_cz,
&bing,
@@ -237,6 +260,7 @@ const PrepopulatedEngine* const engines_
// Germany
const PrepopulatedEngine* const engines_DE[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&duckduckgo,
@@ -246,6 +270,7 @@ const PrepopulatedEngine* const engines_
// Denmark
const PrepopulatedEngine* const engines_DK[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_dk,
@@ -255,6 +280,7 @@ const PrepopulatedEngine* const engines_
// Dominican Republic
const PrepopulatedEngine* const engines_DO[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -264,6 +290,7 @@ const PrepopulatedEngine* const engines_
// Algeria
const PrepopulatedEngine* const engines_DZ[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo_uk,
&bing,
@@ -273,6 +300,7 @@ const PrepopulatedEngine* const engines_
// Ecuador
const PrepopulatedEngine* const engines_EC[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -282,6 +310,7 @@ const PrepopulatedEngine* const engines_
// Estonia
@@ -269,33 +269,33 @@
// Egypt
const PrepopulatedEngine* const engines_EG[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo,
&bing,
@@ -301,6 +331,7 @@ const PrepopulatedEngine* const engines_
// Spain
const PrepopulatedEngine* const engines_ES[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_es,
@@ -310,6 +341,7 @@ const PrepopulatedEngine* const engines_
// Finland
const PrepopulatedEngine* const engines_FI[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_fi,
@@ -319,6 +351,7 @@ const PrepopulatedEngine* const engines_
// Faroe Islands
const PrepopulatedEngine* const engines_FO[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_dk,
@@ -328,6 +361,7 @@ const PrepopulatedEngine* const engines_
// France
@@ -309,97 +309,97 @@
// United Kingdom
const PrepopulatedEngine* const engines_GB[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_uk,
@@ -347,6 +382,7 @@ const PrepopulatedEngine* const engines_
// Greece
const PrepopulatedEngine* const engines_GR[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -356,6 +392,7 @@ const PrepopulatedEngine* const engines_
// Guatemala
const PrepopulatedEngine* const engines_GT[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -365,6 +402,7 @@ const PrepopulatedEngine* const engines_
// Hong Kong
const PrepopulatedEngine* const engines_HK[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo_hk,
&bing,
@@ -374,6 +412,7 @@ const PrepopulatedEngine* const engines_
// Honduras
const PrepopulatedEngine* const engines_HN[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -383,6 +422,7 @@ const PrepopulatedEngine* const engines_
// Croatia
const PrepopulatedEngine* const engines_HR[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -392,6 +432,7 @@ const PrepopulatedEngine* const engines_
// Hungary
const PrepopulatedEngine* const engines_HU[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -401,6 +442,7 @@ const PrepopulatedEngine* const engines_
// Indonesia
const PrepopulatedEngine* const engines_ID[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo_id,
&bing,
@@ -410,6 +452,7 @@ const PrepopulatedEngine* const engines_
// Ireland
const PrepopulatedEngine* const engines_IE[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -419,6 +462,7 @@ const PrepopulatedEngine* const engines_
// Israel
const PrepopulatedEngine* const engines_IL[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yandex_ru,
@@ -428,6 +472,7 @@ const PrepopulatedEngine* const engines_
// India
const PrepopulatedEngine* const engines_IN[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_in,
@@ -437,6 +482,7 @@ const PrepopulatedEngine* const engines_
// Iraq
const PrepopulatedEngine* const engines_IQ[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_uk,
@@ -446,6 +492,7 @@ const PrepopulatedEngine* const engines_
// Iran
@@ -413,49 +413,49 @@
// Iceland
const PrepopulatedEngine* const engines_IS[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -465,6 +513,7 @@ const PrepopulatedEngine* const engines_
// Italy
const PrepopulatedEngine* const engines_IT[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -474,6 +523,7 @@ const PrepopulatedEngine* const engines_
// Jamaica
const PrepopulatedEngine* const engines_JM[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -483,6 +533,7 @@ const PrepopulatedEngine* const engines_
// Jordan
const PrepopulatedEngine* const engines_JO[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -492,6 +543,7 @@ const PrepopulatedEngine* const engines_
// Japan
const PrepopulatedEngine* const engines_JP[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo_jp,
&bing,
@@ -501,6 +553,7 @@ const PrepopulatedEngine* const engines_
// Kenya
const PrepopulatedEngine* const engines_KE[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -510,6 +563,7 @@ const PrepopulatedEngine* const engines_
// South Korea
@@ -469,9 +469,9 @@
// Kuwait
const PrepopulatedEngine* const engines_KW[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -529,6 +584,7 @@ const PrepopulatedEngine* const engines_
// Kazakhstan
@@ -485,65 +485,65 @@
// Lebanon
const PrepopulatedEngine* const engines_LB[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -548,6 +605,7 @@ const PrepopulatedEngine* const engines_
// Liechtenstein
const PrepopulatedEngine* const engines_LI[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&duckduckgo,
@@ -557,6 +615,7 @@ const PrepopulatedEngine* const engines_
// Lithuania
const PrepopulatedEngine* const engines_LT[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -566,6 +625,7 @@ const PrepopulatedEngine* const engines_
// Luxembourg
const PrepopulatedEngine* const engines_LU[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&duckduckgo,
@@ -575,6 +635,7 @@ const PrepopulatedEngine* const engines_
// Latvia
const PrepopulatedEngine* const engines_LV[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yandex_ru,
@@ -584,6 +645,7 @@ const PrepopulatedEngine* const engines_
// Libya
const PrepopulatedEngine* const engines_LY[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -593,6 +655,7 @@ const PrepopulatedEngine* const engines_
// Morocco
const PrepopulatedEngine* const engines_MA[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo_fr,
&bing,
@@ -602,6 +665,7 @@ const PrepopulatedEngine* const engines_
// Monaco
const PrepopulatedEngine* const engines_MC[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -611,6 +675,7 @@ const PrepopulatedEngine* const engines_
// Moldova
@@ -557,265 +557,265 @@
// Montenegro
const PrepopulatedEngine* const engines_ME[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -630,6 +696,7 @@ const PrepopulatedEngine* const engines_
// Macedonia
const PrepopulatedEngine* const engines_MK[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -639,6 +706,7 @@ const PrepopulatedEngine* const engines_
// Mexico
const PrepopulatedEngine* const engines_MX[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_mx,
@@ -648,6 +716,7 @@ const PrepopulatedEngine* const engines_
// Malaysia
const PrepopulatedEngine* const engines_MY[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_my,
@@ -657,6 +726,7 @@ const PrepopulatedEngine* const engines_
// Nicaragua
const PrepopulatedEngine* const engines_NI[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -666,6 +736,7 @@ const PrepopulatedEngine* const engines_
// Netherlands
const PrepopulatedEngine* const engines_NL[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&duckduckgo,
@@ -675,6 +746,7 @@ const PrepopulatedEngine* const engines_
// Norway
const PrepopulatedEngine* const engines_NO[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -684,6 +756,7 @@ const PrepopulatedEngine* const engines_
// New Zealand
const PrepopulatedEngine* const engines_NZ[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_nz,
@@ -693,6 +766,7 @@ const PrepopulatedEngine* const engines_
// Oman
const PrepopulatedEngine* const engines_OM[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -702,6 +776,7 @@ const PrepopulatedEngine* const engines_
// Panama
const PrepopulatedEngine* const engines_PA[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -711,6 +786,7 @@ const PrepopulatedEngine* const engines_
// Peru
const PrepopulatedEngine* const engines_PE[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_es,
@@ -720,6 +796,7 @@ const PrepopulatedEngine* const engines_
// Philippines
const PrepopulatedEngine* const engines_PH[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -729,6 +806,7 @@ const PrepopulatedEngine* const engines_
// Pakistan
const PrepopulatedEngine* const engines_PK[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo,
&bing,
@@ -738,6 +816,7 @@ const PrepopulatedEngine* const engines_
// Poland
const PrepopulatedEngine* const engines_PL[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -746,6 +825,7 @@ const PrepopulatedEngine* const engines_
// Puerto Rico
const PrepopulatedEngine* const engines_PR[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -755,6 +835,7 @@ const PrepopulatedEngine* const engines_
// Portugal
const PrepopulatedEngine* const engines_PT[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -764,6 +845,7 @@ const PrepopulatedEngine* const engines_
// Paraguay
const PrepopulatedEngine* const engines_PY[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -773,6 +855,7 @@ const PrepopulatedEngine* const engines_
// Qatar
const PrepopulatedEngine* const engines_QA[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -782,6 +865,7 @@ const PrepopulatedEngine* const engines_
// Romania
const PrepopulatedEngine* const engines_RO[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -791,6 +875,7 @@ const PrepopulatedEngine* const engines_
// Serbia
const PrepopulatedEngine* const engines_RS[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -800,6 +885,7 @@ const PrepopulatedEngine* const engines_
// Russia
const PrepopulatedEngine* const engines_RU[] = {
+ &searx,
&duckduckgo,
&google,
&yandex_ru,
&mail_ru,
@@ -809,6 +895,7 @@ const PrepopulatedEngine* const engines_
// Rwanda
const PrepopulatedEngine* const engines_RW[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -818,6 +905,7 @@ const PrepopulatedEngine* const engines_
// Saudi Arabia
const PrepopulatedEngine* const engines_SA[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -827,6 +915,7 @@ const PrepopulatedEngine* const engines_
// Sweden
const PrepopulatedEngine* const engines_SE[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo_se,
@@ -836,6 +925,7 @@ const PrepopulatedEngine* const engines_
// Singapore
const PrepopulatedEngine* const engines_SG[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -845,6 +935,7 @@ const PrepopulatedEngine* const engines_
// Slovenia
const PrepopulatedEngine* const engines_SI[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&duckduckgo,
@@ -853,6 +944,7 @@ const PrepopulatedEngine* const engines_
// Slovakia
const PrepopulatedEngine* const engines_SK[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -862,6 +954,7 @@ const PrepopulatedEngine* const engines_
// El Salvador
const PrepopulatedEngine* const engines_SV[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -871,6 +964,7 @@ const PrepopulatedEngine* const engines_
// Syria
const PrepopulatedEngine* const engines_SY[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -880,6 +974,7 @@ const PrepopulatedEngine* const engines_
// Thailand
const PrepopulatedEngine* const engines_TH[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -889,6 +984,7 @@ const PrepopulatedEngine* const engines_
// Tunisia
const PrepopulatedEngine* const engines_TN[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo_fr,
&bing,
@@ -898,6 +994,7 @@ const PrepopulatedEngine* const engines_
// Turkey
const PrepopulatedEngine* const engines_TR[] = {
+ &searx,
&duckduckgo,
&google,
&yandex_tr,
&yahoo_tr,
@@ -907,6 +1004,7 @@ const PrepopulatedEngine* const engines_
// Trinidad and Tobago
const PrepopulatedEngine* const engines_TT[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -916,6 +1014,7 @@ const PrepopulatedEngine* const engines_
// Taiwan
@@ -829,41 +829,41 @@
// Tanzania
const PrepopulatedEngine* const engines_TZ[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -935,6 +1035,7 @@ const PrepopulatedEngine* const engines_
// Ukraine
const PrepopulatedEngine* const engines_UA[] = {
+ &searx,
&duckduckgo,
&google,
&yandex_ua,
&bing,
@@ -944,6 +1045,7 @@ const PrepopulatedEngine* const engines_
// United States
const PrepopulatedEngine* const engines_US[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -953,6 +1055,7 @@ const PrepopulatedEngine* const engines_
// Uruguay
const PrepopulatedEngine* const engines_UY[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -962,6 +1065,7 @@ const PrepopulatedEngine* const engines_
// Venezuela
const PrepopulatedEngine* const engines_VE[] = {
+ &searx,
&duckduckgo,
&google,
&yahoo_ve,
&bing,
@@ -971,6 +1075,7 @@ const PrepopulatedEngine* const engines_
// Vietnam
@@ -877,22 +877,22 @@
// Yemen
const PrepopulatedEngine* const engines_YE[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -990,6 +1096,7 @@ const PrepopulatedEngine* const engines_
// South Africa
const PrepopulatedEngine* const engines_ZA[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,
@@ -999,6 +1106,7 @@ const PrepopulatedEngine* const engines_
// Zimbabwe
const PrepopulatedEngine* const engines_ZW[] = {
+ &searx,
&duckduckgo,
&google,
&bing,
&yahoo,

1
patches/series
View File

@@ -87,4 +87,3 @@ extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
extra/ungoogled-chromium/add-extra-channel-info.patch
extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
extra/bromite/flag-max-connections-per-host.patch
extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch

2800
pruning.list
View File

File diff suppressed because it is too large Load Diff