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

Update to Chromium 93.0.4577.63

Browse Source
This commit is contained in:
Zoraver Kang
2021-09-04 16:51:12 -04:00
parent 2db58a8698
commit bb17f21c2d
70 changed files with 3302 additions and 2881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
92.0.4515.159
93.0.4577.63

1193
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

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

@@ -10,10 +10,12 @@ Subject: Disable fetching of all field trials
--- 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
@@ -123,9 +123,7 @@ public abstract class ChromeFeatureList
@@ -123,11 +123,7 @@ public abstract class ChromeFeatureList
* the specified parameter does not exist.
*/
public static String getFieldTrialParamByFeature(String featureName, String paramName) {
- String testValue = FeatureList.getTestValueForFieldTrialParam(featureName, paramName);
- if (testValue != null) return testValue;
- if (FeatureList.hasTestFeatures()) return "";
- assert FeatureList.isInitialized();
- return ChromeFeatureListJni.get().getFieldTrialParamByFeature(featureName, paramName);
@@ -21,10 +23,12 @@ Subject: Disable fetching of all field trials
}
/**
@@ -142,10 +140,7 @@ public abstract class ChromeFeatureList
@@ -144,12 +140,7 @@ public abstract class ChromeFeatureList
*/
public static int getFieldTrialParamByFeatureAsInt(
String featureName, String paramName, int defaultValue) {
- String testValue = FeatureList.getTestValueForFieldTrialParam(featureName, paramName);
- if (testValue != null) return Integer.valueOf(testValue);
- if (FeatureList.hasTestFeatures()) return defaultValue;
- assert FeatureList.isInitialized();
- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt(
@@ -33,10 +37,12 @@ Subject: Disable fetching of all field trials
}
/**
@@ -162,10 +157,7 @@ public abstract class ChromeFeatureList
@@ -166,12 +157,7 @@ public abstract class ChromeFeatureList
*/
public static double getFieldTrialParamByFeatureAsDouble(
String featureName, String paramName, double defaultValue) {
- String testValue = FeatureList.getTestValueForFieldTrialParam(featureName, paramName);
- if (testValue != null) return Double.valueOf(testValue);
- if (FeatureList.hasTestFeatures()) return defaultValue;
- assert FeatureList.isInitialized();
- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble(
@@ -45,10 +51,12 @@ Subject: Disable fetching of all field trials
}
/**
@@ -196,10 +188,7 @@ public abstract class ChromeFeatureList
@@ -202,12 +188,7 @@ public abstract class ChromeFeatureList
*/
public static boolean getFieldTrialParamByFeatureAsBoolean(
String featureName, String paramName, boolean defaultValue) {
- String testValue = FeatureList.getTestValueForFieldTrialParam(featureName, paramName);
- if (testValue != null) return Boolean.valueOf(testValue);
- if (FeatureList.hasTestFeatures()) return defaultValue;
- assert FeatureList.isInitialized();
- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean(

12
patches/core/debian/disable/unrar.patch
View File

@@ -16,7 +16,7 @@ bug: http://bugs.debian.org/914487
--- a/chrome/common/safe_browsing/BUILD.gn
+++ b/chrome/common/safe_browsing/BUILD.gn
@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) {
public_deps = [ "//components/safe_browsing/core:csd_proto" ]
public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
}
- source_set("rar_analyzer") {
@@ -30,8 +30,8 @@ bug: http://bugs.debian.org/914487
- ":download_type_util",
- "//base",
- "//base:i18n",
- "//components/safe_browsing/core:features",
- "//components/safe_browsing/core:file_type_policies",
- "//components/safe_browsing/content/common:file_type_policies",
- "//components/safe_browsing/core/common",
- "//third_party/unrar:unrar",
- ]
-
@@ -49,18 +49,18 @@ bug: http://bugs.debian.org/914487
- "UNRAR_NO_EXCEPTIONS",
- ]
-
- public_deps = [ "//components/safe_browsing/core:csd_proto" ]
- public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
- }
-
if (is_mac) {
source_set("disk_image_type_sniffer_mac") {
sources = [
@@ -145,7 +112,6 @@ source_set("safe_browsing") {
@@ -149,7 +116,6 @@ source_set("safe_browsing") {
":archive_analyzer_results",
":binary_feature_extractor",
":download_type_util",
- ":rar_analyzer",
"//components/safe_browsing/core:features",
"//components/safe_browsing/core/common",
]
--- a/chrome/services/file_util/safe_archive_analyzer.cc

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

@@ -1,14 +1,14 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2170,7 +2170,6 @@ static_library("browser") {
@@ -2149,7 +2149,6 @@ static_library("browser") {
"//components/reputation/core:proto",
"//components/resources",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection",
"//components/safe_browsing/content/password_protection",
"//components/safe_browsing/content/web_ui",
"//components/safe_browsing/core:download_file_types_proto",
@@ -3568,8 +3567,6 @@ static_library("browser") {
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3563,8 +3562,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -19,7 +19,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -50,10 +50,6 @@ class NetworkQualityTracker;
@@ -51,10 +51,6 @@ class NetworkQualityTracker;
class SharedURLLoaderFactory;
}
@@ -30,7 +30,7 @@
namespace subresource_filter {
class RulesetService;
}
@@ -209,9 +205,6 @@ class BrowserProcess {
@@ -210,9 +206,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -42,7 +42,7 @@
virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -68,7 +68,6 @@
@@ -70,7 +70,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"
@@ -50,7 +50,7 @@
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -366,8 +365,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -377,8 +376,6 @@ void BrowserProcessImpl::StartTearDown()
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if BUILDFLAG(ENABLE_PLUGINS)
plugins_resource_service_.reset();
@@ -971,14 +968,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -995,14 +992,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -74,7 +74,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1219,26 +1208,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1250,26 +1239,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -103,7 +103,7 @@
created_subresource_filter_ruleset_service_ = true;
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -175,7 +175,6 @@ class BrowserProcessImpl : public Browse
@@ -180,7 +180,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> manager) override;
#endif
StatusTray* status_tray() override;
@@ -111,7 +111,7 @@
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
federated_learning::FlocSortingLshClustersService*
@@ -323,9 +322,6 @@ class BrowserProcessImpl : public Browse
@@ -332,9 +331,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -131,7 +131,7 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/spellchecker/spellcheck_factory.h"
#include "chrome/browser/spellchecker/spellcheck_service.h"
@@ -665,10 +664,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -664,10 +663,6 @@ void ChromeBrowsingDataRemoverDelegate::
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -144,7 +144,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
@@ -1005,30 +1005,6 @@ void SetApplicationLocaleOnIOThread(cons
@@ -1016,30 +1016,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}
@@ -175,7 +175,7 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
AppLoadedInTabSource ClassifyAppLoadedInTabSource(
@@ -1458,7 +1434,6 @@ void ChromeContentBrowserClient::PostAft
@@ -1434,7 +1410,6 @@ void ChromeContentBrowserClient::PostAft
InitNetworkContextsParentDirectory();
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -183,7 +183,7 @@
}
bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
@@ -4132,7 +4107,7 @@ ChromeContentBrowserClient::CreateThrott
@@ -4107,7 +4082,7 @@ ChromeContentBrowserClient::CreateThrott
base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent));
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
@@ -191,8 +191,8 @@
+ nullptr,
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
base::BindOnce(
&TypedNavigationUpgradeThrottle::
@@ -4160,9 +4135,6 @@ ChromeContentBrowserClient::CreateThrott
&ShouldIgnoreInterstitialBecauseNavigationDefaultedToHttps)));
@@ -4134,9 +4109,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -260,7 +260,7 @@
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -85,7 +85,7 @@ class DownloadItemModelData : public bas
@@ -86,7 +86,7 @@ class DownloadItemModelData : public bas
// Danger level of the file determined based on the file type and whether
// there was a user action associated with the download.
@@ -269,7 +269,7 @@
// Whether the download is currently being revived.
bool is_being_revived_;
@@ -122,7 +122,7 @@ DownloadItemModelData::DownloadItemModel
@@ -123,7 +123,7 @@ DownloadItemModelData::DownloadItemModel
: should_show_in_shelf_(true),
was_ui_notified_(false),
should_prefer_opening_in_browser_(false),
@@ -278,7 +278,7 @@
is_being_revived_(false) {}
} // namespace
@@ -376,13 +376,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -377,13 +377,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -295,7 +295,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -547,9 +547,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -592,9 +592,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -307,7 +307,7 @@
return !download_->IsSavePackageDownload() &&
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -266,14 +266,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
@@ -259,14 +259,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
@@ -323,7 +323,7 @@
}
}
@@ -480,10 +473,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -474,10 +467,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -484,17 +484,18 @@
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
@@ -53,37 +53,7 @@ SafeBrowsingPrivateGetReferrerChainFunct
@@ -54,38 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct
base::StringPrintf("Could not find tab with id %d.", params->tab_id)));
}
- Profile* profile = Profile::FromBrowserContext(browser_context());
- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile))
- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
- profile->GetPrefs(), g_browser_process->safe_browsing_service()))
- return RespondNow(NoArguments());
-
- scoped_refptr<SafeBrowsingNavigationObserverManager>
- navigation_observer_manager = g_browser_process->safe_browsing_service()
- ->navigation_observer_manager();
- SafeBrowsingNavigationObserverManager* navigation_observer_manager =
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
- GetForBrowserContext(profile);
-
- safe_browsing::ReferrerChain referrer_chain;
- SafeBrowsingNavigationObserverManager::AttributionResult result =
@@ -507,7 +508,7 @@
- // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0.
- int recent_navigations_to_collect =
- SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend(
- *profile, result);
- profile, profile->GetPrefs(), result);
- if (recent_navigations_to_collect > 0) {
- navigation_observer_manager->AppendRecentNavigations(
- recent_navigations_to_collect, &referrer_chain);
@@ -524,7 +525,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
@@ -675,18 +675,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -681,18 +681,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -543,12 +544,13 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1176,51 +1164,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1157,52 +1145,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
- Profile* profile = Profile::FromBrowserContext(browser_context());
- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile))
- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
- profile->GetPrefs(), g_browser_process->safe_browsing_service()))
- return RespondNow(ArgumentList(
- api::webstore_private::GetReferrerChain::Results::Create("")));
-
@@ -559,9 +561,9 @@
- kWebstoreUserCancelledError));
- }
-
- scoped_refptr<SafeBrowsingNavigationObserverManager>
- navigation_observer_manager = g_browser_process->safe_browsing_service()
- ->navigation_observer_manager();
- SafeBrowsingNavigationObserverManager* navigation_observer_manager =
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
- GetForBrowserContext(profile);
-
- safe_browsing::ReferrerChain referrer_chain;
- SafeBrowsingNavigationObserverManager::AttributionResult result =
@@ -574,7 +576,7 @@
- // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0.
- int recent_navigations_to_collect =
- SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend(
- *profile, result);
- profile, profile->GetPrefs(), result);
- if (recent_navigations_to_collect > 0) {
- navigation_observer_manager->AppendRecentNavigations(
- recent_navigations_to_collect, &referrer_chain);
@@ -598,7 +600,7 @@
WebstorePrivateGetExtensionStatusFunction::
--- a/chrome/browser/extensions/blocklist_state_fetcher.cc
+++ b/chrome/browser/extensions/blocklist_state_fetcher.cc
@@ -32,33 +32,8 @@ BlocklistStateFetcher::~BlocklistStateFe
@@ -33,33 +33,8 @@ BlocklistStateFetcher::~BlocklistStateFe
void BlocklistStateFetcher::Request(const std::string& id,
RequestCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -634,7 +636,7 @@
}
void BlocklistStateFetcher::SendRequest(const std::string& id) {
@@ -69,8 +44,7 @@ void BlocklistStateFetcher::SendRequest(
@@ -70,8 +45,7 @@ void BlocklistStateFetcher::SendRequest(
std::string request_str;
request.SerializeToString(&request_str);
@@ -644,7 +646,7 @@
net::NetworkTrafficAnnotationTag traffic_annotation =
net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
semantics {
@@ -120,12 +94,6 @@ void BlocklistStateFetcher::SendRequest(
@@ -121,12 +95,6 @@ void BlocklistStateFetcher::SendRequest(
base::Unretained(this), fetcher));
}
@@ -678,7 +680,7 @@
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -811,9 +811,6 @@ void ChromeMetricsServiceClient::Registe
@@ -801,9 +801,6 @@ void ChromeMetricsServiceClient::Registe
metrics_service_->RegisterMetricsProvider(
std::make_unique<HttpsEngagementMetricsProvider>());
@@ -702,7 +704,7 @@
// static
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -288,7 +288,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -281,7 +281,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(IS_CHROMEOS_LACROS)
CertDbInitializerFactory::GetInstance();
#endif
@@ -720,7 +722,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"
@@ -652,17 +651,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -635,17 +634,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -740,7 +742,7 @@
CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
--- a/chrome/browser/profiles/profiles_state.cc
+++ b/chrome/browser/profiles/profiles_state.cc
@@ -315,9 +315,6 @@ void RemoveBrowsingDataForProfile(const
@@ -258,9 +258,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.
@@ -760,7 +762,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -84,6 +85,7 @@ static_library("safe_browsing") {
@@ -87,6 +88,7 @@ static_library("safe_browsing") {
"//extensions/browser",
]
}
@@ -768,15 +770,15 @@
if (safe_browsing_mode != 0) {
# "Safe Browsing Basic" files used for safe browsing in full mode
@@ -395,6 +397,7 @@ static_library("advanced_protection") {
@@ -397,6 +399,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
+ if (false) {
sources = [
"safe_browsing_metrics_collector.cc",
"safe_browsing_metrics_collector.h",
@@ -412,6 +415,7 @@ source_set("metrics_collector") {
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -413,6 +416,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -786,7 +788,7 @@
source_set("test_support") {
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -205,88 +205,6 @@ bool SecurityStateTabHelper::UsedPolicyI
@@ -227,89 +227,6 @@ bool SecurityStateTabHelper::UsedPolicyI
security_state::MaliciousContentStatus
SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -865,6 +867,7 @@
- case safe_browsing::SB_THREAT_TYPE_SUSPICIOUS_SITE:
- case safe_browsing::SB_THREAT_TYPE_APK_DOWNLOAD:
- case safe_browsing::SB_THREAT_TYPE_HIGH_CONFIDENCE_ALLOWLIST:
- case safe_browsing::SB_THREAT_TYPE_ACCURACY_TIPS:
- // These threat types are not currently associated with
- // interstitials, and thus resources with these threat types are
- // not ever whitelisted or pending whitelisting.
@@ -877,7 +880,7 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -3754,7 +3754,6 @@ static_library("ui") {
@@ -3803,7 +3803,6 @@ static_library("ui") {
"views/device_chooser_content_view.h",
"views/devtools_process_observer.cc",
"views/devtools_process_observer.h",
@@ -887,12 +890,15 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -315,11 +315,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -316,14 +316,6 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
- safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents(
- web_contents);
- web_contents, HostContentSettingsMapFactory::GetForProfile(profile),
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
- GetForBrowserContext(profile),
- profile->GetPrefs(), g_browser_process->safe_browsing_service());
- safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents);
- safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
- profile, web_contents);
@@ -1008,8 +1014,8 @@
bool IsDeletingHistoryAllowed();
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -287,113 +287,6 @@ CreateInsecureFormPage(content::WebConte
request_url));
@@ -298,114 +298,6 @@ CreateHttpsOnlyModePage(content::WebCont
request_url));
}
-std::unique_ptr<safe_browsing::SafeBrowsingBlockingPage>
@@ -1061,10 +1067,11 @@
- // creates a SafeBrowsingBlockingPage but does not actually show a real
- // interstitial. Instead it extracts the html and displays it manually, so the
- // parts which depend on the NavigationEntry are not hit.
- auto* ui_manager =
- g_browser_process->safe_browsing_service()->ui_manager().get();
- return base::WrapUnique<safe_browsing::SafeBrowsingBlockingPage>(
- safe_browsing::SafeBrowsingBlockingPage::CreateBlockingPage(
- g_browser_process->safe_browsing_service()->ui_manager().get(),
- web_contents, main_frame_url, resource, true));
- ui_manager->blocking_page_factory()->CreateSafeBrowsingPage(
- ui_manager, web_contents, main_frame_url, {resource}, true));
-}
-
-std::unique_ptr<TestSafeBrowsingBlockingPageQuiet>
@@ -1122,7 +1129,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -510,8 +403,6 @@ void InterstitialHTMLSource::StartDataRe
@@ -522,8 +414,6 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
} else if (path_without_query == "/legacy-tls") {
interstitial_delegate = CreateLegacyTLSBlockingPage(web_contents);
@@ -1131,8 +1138,8 @@
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -526,16 +417,12 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateInsecureFormPage(web_contents);
@@ -540,16 +430,12 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
}
- if (path_without_query == "/quietsafebrowsing") {
@@ -1153,9 +1160,9 @@
html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -96,7 +96,6 @@
@@ -95,7 +95,6 @@
#include "components/page_load_metrics/renderer/metrics_render_frame_observer.h"
#include "components/paint_preview/buildflags/buildflags.h"
#include "components/pdf/renderer/pepper_pdf_host.h"
#include "components/safe_browsing/buildflags.h"
-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
#include "components/spellcheck/spellcheck_buildflags.h"

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

@@ -1,6 +1,6 @@
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
@@ -829,96 +829,6 @@ AutofillDownloadManager::GetRequestURLAn
@@ -807,96 +807,6 @@ std::tuple<GURL, std::string> AutofillDo
}
bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
@@ -11,7 +11,7 @@
- // Get the URL and method to use for this request.
- std::string method;
- GURL request_url;
- std::tie(request_url, method) = GetRequestURLAndMethodForApi(request_data);
- std::tie(request_url, method) = GetRequestURLAndMethod(request_data);
-
- // Track the URL length for GET queries because the URL length can be in the
- // thousands when rich metadata is enabled.

10
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
@@ -29,7 +29,6 @@ namespace extensions {
@@ -28,7 +28,6 @@ namespace extensions {
bool IsComponentExtensionAllowlisted(const std::string& extension_id) {
const char* const kAllowed[] = {
extension_misc::kCastExtensionIdRelease,
- extension_misc::kInAppPaymentsSupportAppId,
extension_misc::kPdfExtensionId,
#if BUILDFLAG(IS_CHROMEOS_ASH)
extension_misc::kAccessibilityCommonExtensionId,
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -353,11 +353,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -354,11 +354,6 @@ void ComponentLoader::AddWebStoreApp() {
if (!IsNormalSession())
return;
#endif
@@ -22,7 +22,7 @@
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -534,18 +529,6 @@ void ComponentLoader::AddDefaultComponen
@@ -531,18 +526,6 @@ void ComponentLoader::AddDefaultComponen
AddHangoutServicesExtension();
#endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
@@ -43,7 +43,7 @@
base::FilePath path = base::FilePath(command_line->GetSwitchValueASCII(
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -31,9 +31,6 @@ ExternalComponentLoader::~ExternalCompon
@@ -29,9 +29,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
auto prefs = std::make_unique<base::DictionaryValue>();

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
@@ -135,10 +135,10 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -138,10 +138,10 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;

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

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

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

@@ -79,7 +79,7 @@ by default.
if base_tag != '':
--- a/chrome/browser/ash/customization/customization_document.cc
+++ b/chrome/browser/ash/customization/customization_document.cc
@@ -173,7 +173,7 @@ std::string ReadFileInBackground(const b
@@ -175,7 +175,7 @@ std::string ReadFileInBackground(const b
// Template URL where to fetch OEM services customization manifest from.
const char ServicesCustomizationDocument::kManifestUrl[] =
@@ -88,20 +88,9 @@ by default.
// A custom extensions::ExternalLoader that the ServicesCustomizationDocument
// creates and uses to publish OEM default apps to the extensions system.
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
@@ -858,7 +858,7 @@ void FileManagerPrivateInternalGetDownlo
const CoreAccountId& account_id =
identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kSignin);
std::vector<std::string> scopes;
- scopes.emplace_back("https://www.googleapis.com/auth/drive.readonly");
+ scopes.emplace_back("trk:208:https://www.googleapis.com/auth/drive.readonly");
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory =
browser_context()
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -82,7 +82,7 @@ namespace {
@@ -83,7 +83,7 @@ namespace {
using api::file_manager_private::ProfileInfo;
@@ -110,23 +99,6 @@ by default.
// Thresholds for mountCrostini() API.
constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold =
--- a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc
+++ b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc
@@ -36,11 +36,11 @@ namespace {
// 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";
class DefaultNativeMessageHostFactory
: public CRDHostDelegate::NativeMessageHostFactory {
--- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -42,8 +42,8 @@ namespace {
@@ -153,7 +125,7 @@ by default.
"-----BEGIN PUBLIC KEY-----" \
--- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
@@ -122,7 +122,7 @@ void OnURLLoadUploadProgress(uint64_t cu
@@ -123,7 +123,7 @@ void OnURLLoadUploadProgress(uint64_t cu
} // namespace
const char WebRtcEventLogUploaderImpl::kUploadURL[] =
@@ -164,7 +136,7 @@ by default.
scoped_refptr<base::SequencedTaskRunner> task_runner)
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -482,7 +482,7 @@ void WebRtcLogUploader::UploadCompressed
@@ -483,7 +483,7 @@ void WebRtcLogUploader::UploadCompressed
"Not implemented, it would be good to do so."
})");
@@ -231,7 +203,7 @@ by default.
DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -278,7 +278,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -279,7 +279,7 @@ GURL SpellcheckHunspellDictionary::GetDi
DCHECK(!bdict_file.empty());
static const char kDownloadServerUrl[] =
@@ -253,7 +225,7 @@ by default.
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -41,7 +41,7 @@ using std::string;
@@ -42,7 +42,7 @@ using std::string;
namespace {
@@ -275,7 +247,7 @@ 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
@@ -67,22 +67,22 @@ namespace {
@@ -67,17 +67,17 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -296,13 +268,7 @@ by default.
+ "trk:261:https://support.google.com/chrome/?p=ui_guest";
#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";
std::string ReplaceTemplateExpressions(
const scoped_refptr<base::RefCountedMemory>& bytes,
--- a/chrome/chrome_cleaner/components/recovery_component.cc
+++ b/chrome/chrome_cleaner/components/recovery_component.cc
@@ -37,7 +37,7 @@ namespace chrome_cleaner {
@@ -429,7 +395,7 @@ by default.
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -140,7 +140,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -142,7 +142,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
// Global functions -----------------------------------------------------------
@@ -468,23 +434,6 @@ by default.
const char kNewMetricsServerUrlInsecure[] =
"http://clientservices.googleapis.com/uma/v2";
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -296,10 +296,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 &&
- (form.signon_realm == "http://www.google.com" ||
- form.signon_realm == "http://www.google.com/" ||
- form.signon_realm == "https://www.google.com" ||
- form.signon_realm == "https://www.google.com/")) {
+ (form.signon_realm == "trk:187:http://www.google.com" ||
+ form.signon_realm == "trk:188:http://www.google.com/" ||
+ form.signon_realm == "trk:189:https://www.google.com" ||
+ form.signon_realm == "trk:190:https://www.google.com/")) {
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/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -60,7 +60,7 @@ const int ClientSideDetectionService::kN
@@ -498,7 +447,7 @@ by default.
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 {
@@ -28,7 +28,7 @@ namespace safe_search_api {
namespace {
const char kSafeSearchApiUrl[] =
@@ -509,7 +458,7 @@ by default.
--- 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 {
@@ -21,7 +21,7 @@ namespace safe_search_api {
namespace {
constexpr char kSafeSearchApiUrl[] =
@@ -520,7 +469,7 @@ by default.
base::DictionaryValue dict;
--- a/components/translate/core/browser/translate_url_fetcher.cc
+++ b/components/translate/core/browser/translate_url_fetcher.cc
@@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const
@@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const
if (!extra_request_header_.empty())
resource_request->headers.AddHeaderFromString(extra_request_header_);
@@ -530,7 +479,7 @@ by default.
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[]
@@ -20,7 +20,7 @@ const char kDetectLanguageInSubFrames[]
} // namespace
@@ -552,7 +501,7 @@ by default.
"http://clientservices.googleapis.com/chrome-variations/seed";
--- a/content/browser/speech/speech_recognition_engine.cc
+++ b/content/browser/speech/speech_recognition_engine.cc
@@ -31,7 +31,7 @@ namespace content {
@@ -33,7 +33,7 @@ namespace content {
namespace {
const char kWebServiceBaseUrl[] =
@@ -563,21 +512,21 @@ by default.
--- a/content/browser/webauth/authenticator_common.cc
+++ b/content/browser/webauth/authenticator_common.cc
@@ -178,9 +178,9 @@ absl::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());
@@ -88,9 +88,9 @@ enum class RequestExtension {
namespace {
if (origin.DomainIs("google.com") && !appid_url.has_ref() &&
constexpr char kGstaticAppId[] =
- "https://www.gstatic.com/securitykey/origins.json";
+ "trk:276:https://www.gstatic.com/securitykey/origins.json";
constexpr char kGstaticCorpAppId[] =
- "https://www.gstatic.com/securitykey/a/google.com/origins.json";
+ "trk:277:https://www.gstatic.com/securitykey/a/google.com/origins.json";
WebAuthenticationDelegate* GetWebAuthenticationDelegate() {
return GetContentClient()->browser()->GetWebAuthenticationDelegate();
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -87,7 +87,7 @@ GURL GetStartupURL() {
@@ -95,7 +95,7 @@ GURL GetStartupURL() {
#else
const base::CommandLine::StringVector& args = command_line->GetArgs();
if (args.empty())
@@ -602,7 +551,7 @@ by default.
extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
--- a/google_apis/gaia/gaia_constants.cc
+++ b/google_apis/gaia/gaia_constants.cc
@@ -25,119 +25,119 @@ const char kSyncService[] = "chromiumsyn
@@ -25,125 +25,125 @@ const char kSyncService[] = "chromiumsyn
const char kRemotingService[] = "chromoting";
// OAuth scopes.
@@ -727,6 +676,8 @@ by default.
// OAuth2 scope for access to Drive.
-const char kDriveOAuth2Scope[] = "https://www.googleapis.com/auth/drive";
+const char kDriveOAuth2Scope[] = "trk:095:https://www.googleapis.com/auth/drive";
// The scope required for an access token in order to query ItemSuggest.
const char kDriveReadOnlyOAuth2Scope[] =
- "https://www.googleapis.com/auth/drive.readonly";
+ "trk:096:https://www.googleapis.com/auth/drive.readonly";
@@ -753,11 +704,16 @@ by default.
- "https://www.googleapis.com/auth/chromewebstore.readonly";
+ "trk:101:https://www.googleapis.com/auth/chromewebstore.readonly";
// OAuth2 scope for access to Account Capabilities API.
const char kAccountCapabilitiesOAuth2Scope[] =
- "https://www.googleapis.com/auth/account.capabilities";
+ "trk:102:https://www.googleapis.com/auth/account.capabilities";
// Used to mint uber auth tokens when needed.
const char kGaiaSid[] = "sid";
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -23,6 +23,7 @@
@@ -24,6 +24,7 @@
namespace {
// Gaia service constants

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

@@ -14,9 +14,21 @@ the URL so we get notified if this happens again in the future).
.../security_interstitials/core/safe_browsing_loud_error_ui.cc | 1 +
5 files changed, 7 insertions(+), 4 deletions(-)
--- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
+++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
@@ -35,8 +35,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
Profile::FromBrowserContext(web_contents->GetBrowserContext());
// Create appropriate display options for this blocking page.
PrefService* prefs = profile->GetPrefs();
- bool is_extended_reporting_opt_in_allowed =
- IsExtendedReportingOptInAllowed(*prefs);
+ bool is_extended_reporting_opt_in_allowed = false;
bool is_proceed_anyway_disabled =
prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);
--- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
@@ -25,7 +25,7 @@ namespace safe_browsing {
@@ -27,7 +27,7 @@ namespace safe_browsing {
namespace {
const char kSbIncidentReportUrl[] =
@@ -42,21 +54,9 @@ the URL so we get notified if this happens again in the future).
}
IncidentReportingService::IncidentReportingService(
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -91,8 +91,7 @@ class SafeBrowsingBlockingPageFactoryImp
PrefService* prefs =
Profile::FromBrowserContext(web_contents->GetBrowserContext())
->GetPrefs();
- bool is_extended_reporting_opt_in_allowed =
- IsExtendedReportingOptInAllowed(*prefs);
+ bool is_extended_reporting_opt_in_allowed = false;
bool is_proceed_anyway_disabled =
prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -262,7 +262,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -280,7 +280,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {

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

@@ -1,5 +1,15 @@
## Prevent request attempts
# chrome://discards/ attempts to use d3 to display the graph
--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
@@ -299,6 +299,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
+ return;
callbacks_.push_back(std::move(callback));
// Note: If there is an ongoing request, abandon it. It's possible that
--- a/chrome/browser/resources/discards/graph_doc_template.html
+++ b/chrome/browser/resources/discards/graph_doc_template.html
@@ -78,10 +78,6 @@ URL. As result, this document needs to b
@@ -23,16 +33,6 @@
if (collections_loader_ != nullptr)
return;
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
@@ -298,6 +298,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
+ return;
callbacks_.push_back(std::move(callback));
// 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
@@ -138,6 +138,7 @@ PromoService::PromoService(
@@ -40,12 +40,12 @@
void PromoService::Refresh() {
+ return;
if (extensions::ShouldShowExtensionsCheckupPromo(profile_)) {
ServeExtensionCheckupPromo();
return;
net::NetworkTrafficAnnotationTag traffic_annotation =
net::DefineNetworkTrafficAnnotation("promo_service", R"(
semantics {
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -285,6 +285,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -286,6 +286,7 @@ GURL SpellcheckHunspellDictionary::GetDi
}
void SpellcheckHunspellDictionary::DownloadDictionary(GURL url) {

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

@@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -808,6 +808,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -810,6 +810,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kFtpScheme);
RegisterWebSafeScheme(url::kDataScheme);
@@ -70,7 +70,7 @@
// TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1013,6 +1013,8 @@ component("net") {
@@ -1009,6 +1009,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -144,10 +144,10 @@
+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -13,6 +13,7 @@
@@ -12,6 +12,7 @@
#include "base/compiler_specific.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
@@ -160,7 +160,7 @@
using base::Time;
using std::string;
@@ -582,6 +584,12 @@ URLRequest::URLRequest(const GURL& url,
@@ -580,6 +582,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -183,7 +183,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"
@@ -608,6 +609,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -553,6 +554,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();
@@ -205,7 +205,7 @@
const char kWssScheme[] = "wss";
--- a/url/url_constants.h
+++ b/url/url_constants.h
@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char
@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char
COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
COMPONENT_EXPORT(URL) extern const char kTelScheme[];
@@ -215,7 +215,7 @@
COMPONENT_EXPORT(URL) extern const char kWssScheme[];
--- a/url/url_util.cc
+++ b/url/url_util.cc
@@ -62,7 +62,7 @@ struct SchemeRegistry {
@@ -63,7 +63,7 @@ struct SchemeRegistry {
// Schemes that do not trigger mixed content warning.
std::vector<std::string> secure_schemes = {
@@ -224,7 +224,7 @@
};
// Schemes that normal pages cannot link to or access (i.e., with the same
@@ -77,6 +77,7 @@ struct SchemeRegistry {
@@ -78,6 +78,7 @@ struct SchemeRegistry {
kAboutScheme,
kJavaScriptScheme,
kDataScheme,

6
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
@@ -130,11 +130,16 @@ void TraceCrashServiceUploader::DoUpload
@@ -131,11 +131,16 @@ void TraceCrashServiceUploader::DoUpload
progress_callback_ = progress_callback;
done_callback_ = std::move(done_callback);
@@ -23,7 +23,7 @@
}
void TraceCrashServiceUploader::DoCompressOnBackgroundThread(
@@ -307,6 +312,7 @@ bool TraceCrashServiceUploader::Compress
@@ -308,6 +313,7 @@ bool TraceCrashServiceUploader::Compress
void TraceCrashServiceUploader::CreateAndStartURLLoader(
const std::string& upload_url,
const std::string& post_data) {
@@ -33,7 +33,7 @@
--- a/components/crash/core/app/crashpad_linux.cc
+++ b/components/crash/core/app/crashpad_linux.cc
@@ -54,8 +54,7 @@ void SetFirstChanceExceptionHandler(bool
@@ -55,8 +55,7 @@ void SetFirstChanceExceptionHandler(bool
}
bool IsCrashpadEnabled() {

18
patches/core/ungoogled-chromium/disable-floc.patch
View File

@@ -1,13 +1,16 @@
--- a/chrome/browser/federated_learning/floc_id_provider_factory.cc
+++ b/chrome/browser/federated_learning/floc_id_provider_factory.cc
@@ -48,39 +48,7 @@ FlocIdProviderFactory::~FlocIdProviderFa
@@ -49,42 +49,7 @@ FlocIdProviderFactory::~FlocIdProviderFa
KeyedService* FlocIdProviderFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
- if (!base::FeatureList::IsEnabled(kFederatedLearningOfCohorts))
- return nullptr;
-
- Profile* profile = Profile::FromBrowserContext(context);
-
- syncer::SyncService* sync_service =
- ProfileSyncServiceFactory::GetForProfile(profile);
- SyncServiceFactory::GetForProfile(profile);
- if (!sync_service)
- return nullptr;
-
@@ -58,14 +61,3 @@
}
bool PrivacySandboxSettings::IsFlocAllowedForContext(
--- a/components/federated_learning/features/features.cc
+++ b/components/federated_learning/features/features.cc
@@ -34,7 +34,7 @@ const base::Feature kFlocPagesWithAdReso
// required.
// TODO(yaoxia): merge other floc features into this one.
const base::Feature kFederatedLearningOfCohorts{
- "FederatedLearningOfCohorts", base::FEATURE_ENABLED_BY_DEFAULT};
+ "FederatedLearningOfCohorts", base::FEATURE_DISABLED_BY_DEFAULT};
constexpr base::FeatureParam<base::TimeDelta> kFlocIdScheduledUpdateInterval{
&kFederatedLearningOfCohorts, "update_interval",
base::TimeDelta::FromDays(7)};

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

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

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

@@ -2,7 +2,7 @@
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -466,6 +466,7 @@ void GCMClientImpl::StartGCM() {
@@ -465,6 +465,7 @@ void GCMClientImpl::StartGCM() {
void GCMClientImpl::InitializeMCSClient() {
DCHECK(network_connection_tracker_);
@@ -10,7 +10,7 @@
std::vector<GURL> endpoints;
endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
@@ -671,27 +672,6 @@ void GCMClientImpl::RemoveHeartbeatInter
@@ -670,27 +671,6 @@ void GCMClientImpl::RemoveHeartbeatInter
void GCMClientImpl::StartCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -38,7 +38,7 @@
}
void GCMClientImpl::OnCheckinCompleted(
@@ -748,24 +728,6 @@ void GCMClientImpl::SetGServicesSettings
@@ -747,24 +727,6 @@ void GCMClientImpl::SetGServicesSettings
void GCMClientImpl::SchedulePeriodicCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());

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

@@ -104,7 +104,7 @@
}
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -157,22 +76,5 @@ void GoogleURLLoaderThrottle::WillProces
@@ -157,23 +76,5 @@ void GoogleURLLoaderThrottle::WillProces
const GURL& response_url,
network::mojom::URLResponseHead* response_head,
bool* defer) {
@@ -121,6 +121,7 @@
- CHECK(response_head->parsed_headers);
- if (response_head->parsed_headers->xfo !=
- network::mojom::XFrameOptionsValue::kDeny) {
- response_head->headers->SetHeader("X-Frame-Options", "SAMEORIGIN");
- response_head->parsed_headers->xfo =
- network::mojom::XFrameOptionsValue::kSameOrigin;
- }
@@ -129,7 +130,7 @@
#endif
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -33,109 +33,6 @@ namespace google_util {
@@ -33,111 +33,6 @@ namespace google_util {
namespace {
@@ -216,6 +217,8 @@
- youtube_tlds(
- std::initializer_list<base::StringPiece>({YOUTUBE_TLD_LIST}));
- return IsValidHostName(canonical_host, "youtube", subdomain_permission,
- *youtube_tlds) ||
- IsValidHostName(canonical_host, "youtubekids", subdomain_permission,
- *youtube_tlds);
-}
-
@@ -239,7 +242,7 @@
} // namespace
// Global functions -----------------------------------------------------------
@@ -143,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -145,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
bool HasGoogleSearchQueryParam(base::StringPiece str) {
@@ -252,7 +255,7 @@
return false;
}
@@ -159,161 +50,53 @@ std::string GetGoogleLocale(const std::s
@@ -161,161 +50,53 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
@@ -426,7 +429,7 @@
--- a/components/page_load_metrics/browser/page_load_metrics_util.cc
+++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
@@ -188,9 +188,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
@@ -196,9 +196,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
}
bool IsGoogleSearchHostname(const GURL& url) {
@@ -439,7 +442,7 @@
bool IsGoogleSearchResultUrl(const GURL& url) {
--- a/components/page_load_metrics/common/page_load_metrics_util.cc
+++ b/components/page_load_metrics/common/page_load_metrics_util.cc
@@ -32,38 +32,7 @@ const char* kBufferTimerDelayParamName =
@@ -36,38 +36,7 @@ const char* kBufferTimerDelayParamName =
} // namespace
absl::optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
@@ -496,7 +499,7 @@
bool TemplateURLRef::ExtractSearchTermsFromURL(
--- a/components/variations/net/variations_http_headers.cc
+++ b/components/variations/net/variations_http_headers.cc
@@ -27,10 +27,6 @@
@@ -26,10 +26,6 @@
namespace variations {
@@ -507,7 +510,7 @@
namespace {
// The result of checking whether a request to a URL should have variations
@@ -236,29 +232,7 @@ class VariationsHeaderHelper {
@@ -235,29 +231,7 @@ class VariationsHeaderHelper {
}
bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
@@ -538,7 +541,7 @@
}
private:
@@ -328,8 +302,6 @@ void RemoveVariationsHeaderIfNeeded(
@@ -327,8 +301,6 @@ void RemoveVariationsHeaderIfNeeded(
const net::RedirectInfo& redirect_info,
const network::mojom::URLResponseHead& response_head,
std::vector<std::string>* to_be_removed_headers) {
@@ -547,7 +550,7 @@
}
std::unique_ptr<network::SimpleURLLoader>
@@ -359,14 +331,11 @@ CreateSimpleURLLoaderWithVariationsHeade
@@ -358,14 +330,11 @@ CreateSimpleURLLoaderWithVariationsHeade
}
bool IsVariationsHeader(const std::string& header_name) {
@@ -564,7 +567,7 @@
}
bool ShouldAppendVariationsHeaderForTesting(
@@ -377,12 +346,6 @@ bool ShouldAppendVariationsHeaderForTest
@@ -376,12 +345,6 @@ bool ShouldAppendVariationsHeaderForTest
void UpdateCorsExemptHeaderForVariations(
network::mojom::NetworkContextParams* params) {
@@ -579,7 +582,7 @@
} // namespace variations
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -431,27 +431,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -442,27 +442,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
@@ -318,7 +318,6 @@ if (!is_android && !is_mac) {
@@ -319,7 +319,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
}
@@ -1140,7 +1139,6 @@ if (is_win) {
@@ -1136,7 +1135,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
@@ -277,7 +277,7 @@ void NetworkTimeTracker::UpdateNetworkTi
@@ -279,7 +279,7 @@ void NetworkTimeTracker::UpdateNetworkTi
}
bool NetworkTimeTracker::AreTimeFetchesEnabled() const {

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

@@ -11,7 +11,7 @@
bool PrivacySandboxSettings::IsFlocAllowed() const {
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -771,7 +771,7 @@ const base::Feature kPrivacyAdvisor{"Pri
@@ -754,7 +754,7 @@ const base::Feature kPrivacyReview{"Priv
// Enables the privacy sandbox settings page.
const base::Feature kPrivacySandboxSettings{"PrivacySandboxSettings",

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -474,32 +474,6 @@ GURL GetOSSettingsUrl(const std::string&
@@ -478,32 +478,6 @@ GURL GetOSSettingsUrl(const std::string&
void ShowBrowserSignin(Browser* browser,
signin_metrics::AccessPoint access_point,
signin::ConsentLevel consent_level) {

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

@@ -62,7 +62,7 @@
// 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
@@ -338,7 +338,7 @@ FinancialPing::PingResponse FinancialPin
// Open network connection.
InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -71,7 +71,7 @@
INTERNET_FLAG_NO_CACHE_WRITE, 0);
if (!connection_handle)
return PING_FAILURE;
@@ -380,7 +380,7 @@ FinancialPing::PingResponse FinancialPin
@@ -382,7 +382,7 @@ FinancialPing::PingResponse FinancialPin
return PING_SUCCESSFUL;
#else
std::string url =

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

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -656,10 +656,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -655,10 +655,6 @@ std::vector<url::Origin> ChromeContentBr
GetOriginsRequiringDedicatedProcess() {
std::vector<url::Origin> list;
@@ -15,7 +15,7 @@
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -289,17 +289,7 @@ bool ChromeContentVerifierDelegate::IsFr
@@ -288,17 +288,7 @@ bool ChromeContentVerifierDelegate::IsFr
// between which extensions are considered in-store.
// See https://crbug.com/766806 for details.
if (!InstallVerifier::IsFromStore(extension, context_)) {

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

@@ -15,7 +15,7 @@
executable("$chromedriver_output") {
testonly = true
@@ -337,16 +333,6 @@ executable("$chromedriver_output") {
@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
}
}
@@ -34,7 +34,7 @@
deps = [
--- a/third_party/devtools-frontend/src/BUILD.gn
+++ b/third_party/devtools-frontend/src/BUILD.gn
@@ -138,7 +138,6 @@ foreach(module_file, non_autostart_non_r
@@ -139,7 +139,6 @@ foreach(module_file, non_autostart_non_r
devtools_frontend_resources_deps = [
":build_release_devtools",
"front_end",

20
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
@@ -1203,6 +1203,10 @@ source_set("browser") {
@@ -1226,6 +1226,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",
@@ -2919,10 +2923,6 @@ source_set("browser") {
@@ -2965,10 +2969,6 @@ source_set("browser") {
if (enable_reporting) {
sources += [
@@ -32,7 +32,7 @@
#include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/mojom/content_security_policy.mojom-blink.h"
@@ -630,7 +631,9 @@ void LocalFrame::Trace(Visitor* visitor)
@@ -423,7 +424,9 @@ void LocalFrame::Trace(Visitor* visitor)
visitor->Trace(raw_system_clipboard_);
visitor->Trace(virtual_keyboard_overlay_changed_observers_);
visitor->Trace(pause_handle_receivers_);
@@ -42,7 +42,7 @@
#if defined(OS_MAC)
visitor->Trace(text_input_host_);
#endif
@@ -2500,6 +2503,7 @@ const base::UnguessableToken& LocalFrame
@@ -2310,6 +2313,7 @@ const base::UnguessableToken& LocalFrame
return base::UnguessableToken::Null();
}
@@ -50,7 +50,7 @@
mojom::blink::ReportingServiceProxy* LocalFrame::GetReportingService() {
if (!reporting_service_.is_bound()) {
GetBrowserInterfaceBroker().GetInterface(
@@ -2508,6 +2512,7 @@ mojom::blink::ReportingServiceProxy* Loc
@@ -2318,6 +2322,7 @@ mojom::blink::ReportingServiceProxy* Loc
}
return reporting_service_.get();
}
@@ -60,15 +60,15 @@
void LocalFrame::NotifyUserActivation(
--- a/third_party/blink/renderer/core/frame/local_frame.h
+++ b/third_party/blink/renderer/core/frame/local_frame.h
@@ -37,6 +37,7 @@
@@ -36,6 +36,7 @@
#include "build/build_config.h"
#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "net/net_buildflags.h"
#include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
#include "third_party/blink/public/common/frame/frame_ad_evidence.h"
#include "third_party/blink/public/common/frame/payment_request_token.h"
#include "third_party/blink/public/common/frame/transient_allow_fullscreen.h"
@@ -540,9 +541,9 @@ class CORE_EXPORT LocalFrame final
@@ -545,9 +546,9 @@ class CORE_EXPORT LocalFrame final : pub
}
SmoothScrollSequencer& GetSmoothScrollSequencer();
@@ -80,7 +80,7 @@
// Returns the frame host ptr. The interface returned is backed by an
// associated interface with the legacy Chrome IPC channel.
mojom::blink::LocalFrameHost& GetLocalFrameHostRemote() const;
@@ -1019,8 +1020,10 @@ class CORE_EXPORT LocalFrame final
@@ -875,8 +876,10 @@ class CORE_EXPORT LocalFrame final : pub
// const methods.
//
// LocalFrame can be reused by multiple ExecutionContext.
@@ -129,7 +129,7 @@
const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
ReportingContext::GetReportingService() const {
if (!reporting_service_.is_bound()) {
@@ -149,6 +155,7 @@ ReportingContext::GetReportingService()
@@ -149,6 +155,7 @@ ReportingContext::GetReportingService()
}
return reporting_service_;
}

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

@@ -14,7 +14,7 @@
}
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -348,6 +348,7 @@ void InlineSigninHelper::OnClientOAuthSu
@@ -347,6 +347,7 @@ void InlineSigninHelper::OnClientOAuthSu
const ClientOAuthResult& result,
Profile* /*profile*/,
Profile::CreateStatus /*status*/) {
@@ -22,7 +22,7 @@
HandlerSigninReason reason = GetHandlerSigninReason(current_url_);
if (reason == HandlerSigninReason::kFetchLstOnly) {
// Constants are only available on Windows for the Google Credential
@@ -425,6 +426,7 @@ void InlineSigninHelper::OnClientOAuthSu
@@ -423,6 +424,7 @@ void InlineSigninHelper::OnClientOAuthSu
}
base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);

366
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
@@ -4135,11 +4135,13 @@ ChromeContentBrowserClient::CreateThrott
@@ -4109,11 +4109,13 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -16,7 +16,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -5411,26 +5413,7 @@ ChromeContentBrowserClient::GetSafeBrows
@@ -5436,26 +5438,7 @@ ChromeContentBrowserClient::GetSafeBrows
const std::vector<std::string>& allowlist_domains) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -44,7 +44,7 @@
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -5451,11 +5434,6 @@ ChromeContentBrowserClient::GetUrlLookup
@@ -5476,11 +5459,6 @@ ChromeContentBrowserClient::GetUrlLookup
GetForProfile(profile);
}
#endif
@@ -58,7 +58,7 @@
--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
@@ -92,45 +92,6 @@ void MaybeCreateSafeBrowsingForRenderer(
@@ -97,45 +97,6 @@ void MaybeCreateSafeBrowsingForRenderer(
const std::vector<std::string>& allowlist_domains)>
get_checker_delegate,
mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) {
@@ -147,7 +147,7 @@
using safe_browsing::DownloadProtectionService;
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
@@ -1426,8 +1425,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -1373,8 +1372,6 @@ void ChromeDownloadManagerDelegate::OnDo
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
@@ -158,7 +158,7 @@
MaybeReportDangerousDownloadBlocked(
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -37,13 +37,11 @@
@@ -38,14 +38,12 @@
#include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_factory.h"
#include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
#include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
@@ -168,13 +168,14 @@
#include "components/policy/core/browser/url_util.h"
#include "components/policy/core/common/chrome_schema.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/common/features.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/safe_browsing/core/features.h"
#include "components/url_matcher/url_matcher.h"
#include "content/public/browser/web_contents.h"
#include "crypto/secure_hash.h"
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
@@ -362,19 +362,6 @@ absl::optional<std::string> ConnectorsSe
@@ -449,19 +449,6 @@ absl::optional<std::string> ConnectorsSe
return absl::nullopt;
}
@@ -204,7 +205,7 @@
#include "content/public/browser/browser_context.h"
namespace base {
@@ -74,12 +73,6 @@ class ConnectorsService : public KeyedSe
@@ -82,12 +81,6 @@ class ConnectorsService : public KeyedSe
// is no token to use.
absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
@@ -214,20 +215,20 @@
- safe_browsing::EnterpriseRealTimeUrlCheckMode GetAppliedRealTimeUrlCheck()
- const;
-
// Testing functions.
ConnectorsManager* ConnectorsManagerForTesting();
// Returns the CBCM domain or profile domain that enables connector policies.
// If both set Connector policies, the CBCM domain is returned as it has
// precedence.
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
@@ -53,7 +53,6 @@ void ContextInfoFetcher::Fetch(ContextIn
@@ -75,7 +75,6 @@ void ContextInfoFetcher::Fetch(ContextIn
GetAnalysisConnectorProviders(enterprise_connectors::FILE_DOWNLOADED);
info.on_bulk_data_entry_providers =
GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
- info.realtime_url_check_mode = GetRealtimeUrlCheckMode();
info.on_security_event_providers = GetOnSecurityEventProviders();
info.browser_version = version_info::GetVersionNumber();
@@ -79,11 +78,6 @@ std::vector<std::string> ContextInfoFetc
info.safe_browsing_protection_level = GetSafeBrowsingProtectionLevel();
@@ -108,11 +107,6 @@ std::vector<std::string> ContextInfoFetc
return connectors_service_->GetAnalysisServiceProviderNames(connector);
}
@@ -259,9 +260,9 @@
std::vector<std::string> on_security_event_providers;
- safe_browsing::EnterpriseRealTimeUrlCheckMode realtime_url_check_mode;
std::string browser_version;
};
@@ -76,7 +75,6 @@ class ContextInfoFetcher {
safe_browsing::SafeBrowsingState safe_browsing_protection_level;
bool site_isolation_enabled;
@@ -83,7 +82,6 @@ class ContextInfoFetcher {
std::vector<std::string> GetAnalysisConnectorProviders(
enterprise_connectors::AnalysisConnector connector);
@@ -271,7 +272,7 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -656,8 +656,6 @@ static_library("extensions") {
@@ -652,8 +652,6 @@ static_library("extensions") {
"menu_manager_factory.h",
"navigation_observer.cc",
"navigation_observer.h",
@@ -282,10 +283,10 @@
"pending_extension_info.cc",
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -55,17 +55,8 @@ api::enterprise_reporting_private::Conte
info.on_file_downloaded_providers = signals.on_file_downloaded_providers;
info.on_bulk_data_entry_providers = signals.on_bulk_data_entry_providers;
info.on_security_event_providers = signals.on_security_event_providers;
@@ -66,17 +66,8 @@ api::enterprise_reporting_private::Conte
: nullptr;
info.chrome_remote_desktop_app_blocked =
signals.chrome_remote_desktop_app_blocked;
- switch (signals.realtime_url_check_mode) {
- case safe_browsing::REAL_TIME_CHECK_DISABLED:
info.realtime_url_check_mode = extensions::api::
@@ -297,9 +298,9 @@
- REALTIME_URL_CHECK_MODE_ENABLED_MAIN_FRAME;
- break;
- }
info.browser_version = signals.browser_version;
info.browser_version = std::move(signals.browser_version);
info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
return info;
--- 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
@@ -307,6 +307,7 @@ void SafeBrowsingPrivateEventRouter::OnD
@@ -476,7 +477,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -54,7 +54,6 @@
@@ -53,7 +53,6 @@
#include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h"
#include "chrome/browser/extensions/install_verifier.h"
#include "chrome/browser/extensions/installed_loader.h"
@@ -484,7 +485,7 @@
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "chrome/browser/extensions/shared_module_service.h"
@@ -376,7 +375,6 @@ ExtensionService::ExtensionService(Profi
@@ -380,7 +379,6 @@ ExtensionService::ExtensionService(Profi
safe_browsing_verdict_handler_(extension_prefs,
ExtensionRegistry::Get(profile),
this),
@@ -492,7 +493,7 @@
registry_(ExtensionRegistry::Get(profile)),
pending_extension_manager_(profile),
install_directory_(install_directory),
@@ -845,50 +843,6 @@ bool ExtensionService::IsExtensionEnable
@@ -848,50 +846,6 @@ bool ExtensionService::IsExtensionEnable
return extension_registrar_.IsExtensionEnabled(extension_id);
}
@@ -543,7 +544,7 @@
void ExtensionService::MaybeEnableRemotelyDisabledExtension(
const std::string& extension_id) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -904,56 +858,6 @@ void ExtensionService::MaybeEnableRemote
@@ -907,56 +861,6 @@ void ExtensionService::MaybeEnableRemote
unchanged.erase(extension_id);
// Remove the extension from the blocklist.
UpdateBlocklistedExtensions({}, unchanged);
@@ -662,7 +663,7 @@
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -469,8 +469,6 @@ void ExtensionSystemImpl::InstallUpdate(
@@ -466,8 +466,6 @@ void ExtensionSystemImpl::InstallUpdate(
void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes(
const std::string& extension_id,
const base::Value& attributes) {
@@ -673,7 +674,7 @@
bool ExtensionSystemImpl::FinishDelayedInstallationIfReady(
--- a/chrome/browser/extensions/safe_browsing_verdict_handler.cc
+++ b/chrome/browser/extensions/safe_browsing_verdict_handler.cc
@@ -100,8 +100,6 @@ void SafeBrowsingVerdictHandler::UpdateG
@@ -101,8 +101,6 @@ void SafeBrowsingVerdictHandler::UpdateG
greylist_.Remove(id);
extension_prefs_->SetExtensionBlocklistState(extension->id(),
NOT_BLOCKLISTED);
@@ -682,7 +683,7 @@
}
// Iterate over `greylist` instead of `not_yet_greylisted`, because the
@@ -119,9 +117,6 @@ void SafeBrowsingVerdictHandler::UpdateG
@@ -120,9 +118,6 @@ void SafeBrowsingVerdictHandler::UpdateG
greylist_.Insert(extension);
BlocklistState greylist_state = state_map.find(id)->second;
extension_prefs_->SetExtensionBlocklistState(id, greylist_state);
@@ -702,12 +703,12 @@
#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"
@@ -310,80 +309,6 @@ BindResultCallbackToCurrentSequence(
@@ -311,80 +310,6 @@ BindResultCallbackToCurrentSequence(
base::SequencedTaskRunnerHandle::Get(), std::move(callback));
}
-void DoSafeBrowsingCheckOnUIThread(
- content::GlobalFrameRoutingId frame_id,
- content::GlobalRenderFrameHostId frame_id,
- std::unique_ptr<content::FileSystemAccessWriteItem> item,
- safe_browsing::CheckDownloadCallback callback) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -783,13 +784,13 @@
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
return id.empty() ? kDefaultLastPickedDirectoryKey
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
@@ -1114,28 +1039,6 @@ void ChromeFileSystemAccessPermissionCon
@@ -1115,28 +1040,6 @@ void ChromeFileSystemAccessPermissionCon
std::move(callback)));
}
-void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
- std::unique_ptr<content::FileSystemAccessWriteItem> item,
- content::GlobalFrameRoutingId frame_id,
- content::GlobalRenderFrameHostId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)> callback) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- content::GetUIThreadTaskRunner({})->PostTask(
@@ -814,20 +815,20 @@
const url::Origin& origin,
--- 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
@@ -81,10 +81,6 @@ class ChromeFileSystemAccessPermissionCo
@@ -85,10 +85,6 @@ class ChromeFileSystemAccessPermissionCo
HandleType handle_type,
content::GlobalFrameRoutingId frame_id,
content::GlobalRenderFrameHostId frame_id,
base::OnceCallback<void(SensitiveDirectoryResult)> callback) override;
- void PerformAfterWriteChecks(
- std::unique_ptr<content::FileSystemAccessWriteItem> item,
- content::GlobalFrameRoutingId frame_id,
- content::GlobalRenderFrameHostId 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
@@ -108,6 +108,7 @@ void DisplayMediaAccessHandler::HandleRe
@@ -109,6 +109,7 @@ void DisplayMediaAccessHandler::HandleRe
return;
}
@@ -835,7 +836,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. Show the warning
@@ -122,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe
@@ -123,6 +124,7 @@ void DisplayMediaAccessHandler::HandleRe
observer->OnDesktopCaptureRequest();
return;
}
@@ -845,15 +846,15 @@
// 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"
@@ -33,7 +33,6 @@
#include "chrome/browser/password_manager/password_reuse_manager_factory.h"
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/profiles/profile.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"
@@ -108,11 +107,11 @@
#include "chrome/browser/sync/sync_service_factory.h"
@@ -110,11 +109,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"
@@ -866,7 +867,7 @@
#if defined(OS_ANDROID)
#include "base/feature_list.h"
@@ -804,6 +803,7 @@ autofill::LanguageCode ChromePasswordMan
@@ -807,6 +806,7 @@ autofill::LanguageCode ChromePasswordMan
return autofill::LanguageCode();
}
@@ -874,7 +875,7 @@
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
return safe_browsing::ChromePasswordProtectionService::
@@ -814,13 +814,6 @@ ChromePasswordManagerClient::GetPassword
@@ -817,13 +817,6 @@ ChromePasswordManagerClient::GetPassword
void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
const GURL& form_action,
const GURL& frame_url) {
@@ -888,7 +889,7 @@
}
#endif // defined(ON_FOCUS_PING_ENABLED)
@@ -830,22 +823,10 @@ void ChromePasswordManagerClient::CheckP
@@ -833,22 +826,10 @@ void ChromePasswordManagerClient::CheckP
const std::vector<password_manager::MatchingReusedCredential>&
matching_reused_credentials,
bool password_field_exists) {
@@ -912,7 +913,7 @@
}
ukm::SourceId ChromePasswordManagerClient::GetUkmSourceId() {
@@ -1304,9 +1285,11 @@ void ChromePasswordManagerClient::OnPast
@@ -1323,9 +1304,11 @@ void ChromePasswordManagerClient::OnPast
}
was_on_paste_called_ = true;
@@ -925,7 +926,7 @@
void ChromePasswordManagerClient::RenderFrameCreated(
content::RenderFrameHost* render_frame_host) {
@@ -1341,7 +1324,9 @@ void ChromePasswordManagerClient::OnInpu
@@ -1360,7 +1343,9 @@ void ChromePasswordManagerClient::OnInpu
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
OnPaste();
} else {
@@ -935,7 +936,7 @@
}
#endif // defined(OS_ANDROID)
}
@@ -1380,6 +1365,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1399,6 +1384,7 @@ bool ChromePasswordManagerClient::IsPass
is_enabled = false;
}
@@ -943,7 +944,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
@@ -1390,6 +1376,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1409,6 +1395,7 @@ bool ChromePasswordManagerClient::IsPass
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -953,7 +954,7 @@
password_manager::BrowserSavePasswordProgressLogger logger(
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -191,13 +191,14 @@ class ChromePasswordManagerClient
@@ -192,13 +192,14 @@ class ChromePasswordManagerClient
void AnnotateNavigationEntry(bool has_password_field) override;
autofill::LanguageCode GetPageLanguage() const override;
@@ -969,7 +970,7 @@
void CheckProtectedPasswordEntry(
password_manager::metrics_util::PasswordType reused_password_type,
@@ -205,6 +206,7 @@ class ChromePasswordManagerClient
@@ -206,6 +207,7 @@ class ChromePasswordManagerClient
const std::vector<password_manager::MatchingReusedCredential>&
matching_reused_credentials,
bool password_field_exists) override;
@@ -979,14 +980,14 @@
--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
@@ -16,7 +16,6 @@
#include "components/permissions/permission_uma_util.h"
@@ -17,7 +17,6 @@
#include "components/permissions/permissions_client.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/browser/db/database_manager.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/safe_browsing/core/db/database_manager.h"
namespace {
constexpr char kExcludedKey[] = "exempted";
@@ -136,6 +135,7 @@ void AbusiveOriginPermissionRevocationRe
DCHECK(profile_);
DCHECK(callback_);
@@ -1005,7 +1006,7 @@
void AbusiveOriginPermissionRevocationRequest::OnSafeBrowsingVerdictReceived(
--- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
+++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
@@ -17,11 +17,9 @@
@@ -17,7 +17,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
#include "chrome/browser/permissions/quiet_notification_permission_ui_state.h"
@@ -1013,11 +1014,7 @@
#include "chrome/common/chrome_features.h"
#include "components/permissions/permission_request.h"
#include "components/permissions/request_type.h"
-#include "components/safe_browsing/core/db/database_manager.h"
namespace {
@@ -151,9 +149,6 @@ void ContextualNotificationPermissionUiS
@@ -151,9 +150,6 @@ void ContextualNotificationPermissionUiS
}
void ContextualNotificationPermissionUiSelector::Cancel() {
@@ -1027,7 +1024,7 @@
}
bool ContextualNotificationPermissionUiSelector::IsPermissionRequestSupported(
@@ -179,24 +174,14 @@ void ContextualNotificationPermissionUiS
@@ -179,24 +175,14 @@ void ContextualNotificationPermissionUiS
absl::optional<Decision> decision =
GetDecisionBasedOnSiteReputation(reputation);
@@ -1079,25 +1076,6 @@
double hold_back_chance = 0.0;
bool is_permissions_predictions_enabled = false;
switch (request_type) {
--- a/chrome/browser/profiles/profile_info_cache.cc
+++ b/chrome/browser/profiles/profile_info_cache.cc
@@ -33,7 +33,6 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
-#include "components/signin/public/base/signin_pref_names.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
@@ -165,8 +164,6 @@ void ProfileInfoCache::AddProfileToCache
info->SetBoolean(kIsUsingDefaultAvatarKey, true);
if (params.account_id.HasAccountIdKey())
info->SetString(kAccountIdKey, params.account_id.GetAccountIdKey());
- info->SetBoolKey(prefs::kSignedInWithCredentialProvider,
- params.is_signed_in_with_credential_provider);
cache->SetKey(key, base::Value::FromUniquePtrValue(std::move(info)));
ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted);
entry->InitializeLastNameToDisplay();
--- a/chrome/browser/reputation/reputation_service.cc
+++ b/chrome/browser/reputation/reputation_service.cc
@@ -119,9 +119,7 @@ void ReputationService::GetReputationSta
@@ -1139,7 +1117,7 @@
} // namespace safe_browsing
--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
@@ -55,29 +55,7 @@ RealTimeUrlLookupServiceFactory::RealTim
@@ -59,28 +59,7 @@ RealTimeUrlLookupServiceFactory::RealTim
KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
@@ -1160,12 +1138,11 @@
- IdentityManagerFactory::GetForProfile(profile)),
- base::BindRepeating(&safe_browsing::SyncUtils::
- AreSigninAndSyncSetUpForSafeBrowsingTokenFetches,
- ProfileSyncServiceFactory::GetForProfile(profile),
- SyncServiceFactory::GetForProfile(profile),
- IdentityManagerFactory::GetForProfile(profile)),
- profile->IsOffTheRecord(), g_browser_process->variations_service(),
- g_browser_process->safe_browsing_service()
- ->navigation_observer_manager()
- .get());
- SafeBrowsingNavigationObserverManagerFactory::GetForBrowserContext(
- profile));
+ return nullptr;
}
@@ -1197,7 +1174,7 @@
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/subresource_filter/subresource_filter_profile_context_factory.h"
#include "components/safe_browsing/core/db/database_manager.h"
#include "components/safe_browsing/core/browser/db/database_manager.h"
#include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h"
@@ -18,10 +17,7 @@ namespace {
// available. Otherwise returns nullptr.
@@ -1229,53 +1206,9 @@
}
void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
--- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
+++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
@@ -79,37 +79,8 @@ void HandleOnPerformDrop(
content::WebContents* web_contents,
const content::DropData& drop_data,
content::WebContentsViewDelegate::DropCompletionCallback callback) {
- enterprise_connectors::ContentAnalysisDelegate::Data data;
- Profile* profile =
- Profile::FromBrowserContext(web_contents->GetBrowserContext());
- auto connector =
- drop_data.filenames.empty()
- ? enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY
- : enterprise_connectors::AnalysisConnector::FILE_ATTACHED;
- if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
- profile, web_contents->GetLastCommittedURL(), &data, connector)) {
- std::move(callback).Run(
- content::WebContentsViewDelegate::DropCompletionResult::kContinue);
- return;
- }
-
- // Collect the data that needs to be scanned.
- if (!drop_data.url_title.empty())
- data.text.push_back(drop_data.url_title);
- if (drop_data.text)
- data.text.push_back(*drop_data.text);
- if (drop_data.html)
- data.text.push_back(*drop_data.html);
- if (!drop_data.file_contents.empty())
- data.text.push_back(base::UTF8ToUTF16(drop_data.file_contents));
-
- if (drop_data.filenames.empty()) {
- ScanData(web_contents, std::move(callback), std::move(data));
- } else {
- base::ThreadPool::PostTaskAndReplyWithResult(
- FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
- base::BindOnce(&GetPathsToScan, web_contents, std::move(drop_data),
- std::move(data)),
- base::BindOnce(&ScanData, web_contents, std::move(callback)));
- }
+ // In the original code, this ran safe_browsing::DeepScanningDialogDelegate
+ // Instead, run the code under "if (!safe_browsing::DeepScanningDialogDelegate::IsEnabled(...)) ..."
+ std::move(callback).Run(
+ content::WebContentsViewDelegate::DropCompletionResult::kContinue);
}
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -789,9 +789,7 @@ void DownloadItemView::UpdateLabels() {
@@ -806,9 +806,7 @@ void DownloadItemView::UpdateLabels() {
deep_scanning_label_->SetVisible(mode_ ==
download::DownloadItemMode::kDeepScanning);
if (deep_scanning_label_->GetVisible()) {
@@ -1286,7 +1219,7 @@
? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
: IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
const std::u16string filename = ElidedFilename(*deep_scanning_label_);
@@ -815,11 +813,15 @@ void DownloadItemView::UpdateButtons() {
@@ -855,11 +853,15 @@ void DownloadItemView::UpdateButtons() {
}
const bool allow_open_during_deep_scan =
@@ -1302,7 +1235,7 @@
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
prompt_to_scan || allow_open_during_deep_scan);
@@ -1261,7 +1263,9 @@ void DownloadItemView::ShowContextMenuIm
@@ -1352,7 +1354,9 @@ void DownloadItemView::ShowContextMenuIm
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -1312,26 +1245,6 @@
model_->SetOpenWhenComplete(true);
}
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -76,8 +76,6 @@
#include "components/prefs/pref_service.h"
#include "components/reading_list/features/reading_list_switches.h"
#include "components/safe_browsing/buildflags.h"
-#include "components/safe_browsing/content/web_ui/safe_browsing_ui.h"
-#include "components/safe_browsing/core/web_ui/constants.h"
#include "components/security_interstitials/content/connection_help_ui.h"
#include "components/security_interstitials/content/known_interception_disclosure_ui.h"
#include "components/security_interstitials/content/urls.h"
@@ -615,8 +613,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<PredictorsUI>;
if (url.host_piece() == chrome::kChromeUIQuotaInternalsHost)
return &NewWebUI<QuotaInternalsUI>;
- if (url.host_piece() == safe_browsing::kChromeUISafeBrowsingHost)
- return &NewWebUI<safe_browsing::SafeBrowsingUI>;
if (url.host_piece() == chrome::kChromeUISignInInternalsHost)
return &NewWebUI<SignInInternalsUI>;
if (url.host_piece() == chrome::kChromeUISuggestionsHost)
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -360,7 +360,6 @@ void DownloadsDOMHandler::OpenDuringScan
@@ -1344,7 +1257,7 @@
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -801,12 +801,6 @@ base::Value ManagementUIHandler::GetThre
@@ -809,12 +809,6 @@ base::Value ManagementUIHandler::GetThre
&info);
}
@@ -1404,19 +1317,18 @@
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
@@ -170,10 +170,12 @@ void PasswordReuseDetectionManager::OnRe
@@ -162,9 +162,11 @@ void PasswordReuseDetectionManager::OnRe
? reused_protected_password_hash->username
: "";
+#if defined(PASSWORD_REUSE_DETECTION_ENABLED)
client_->CheckProtectedPasswordEntry(
reused_password_type, username,
std::move(all_matching_reused_credentials_).extract(),
password_field_detected);
+#endif
all_matching_reused_credentials_.clear();
+ #if defined(PASSWORD_REUSE_DETECTION_ENABLED)
client_->CheckProtectedPasswordEntry(reused_password_type, username,
matching_reused_credentials,
password_field_detected);
+ #endif
}
void PasswordReuseDetectionManager::SetClockForTesting(base::Clock* clock) {
--- a/components/safe_browsing/content/common/safe_browsing.mojom
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
@@ -120,7 +120,6 @@ enum PhishingDetectorResult {
@@ -1427,119 +1339,9 @@
// Interface for setting the CSD model and to start phishing classification.
interface PhishingDetector {
// A classification model for client-side phishing detection.
--- a/components/safe_browsing/core/file_type_policies.cc
+++ b/components/safe_browsing/core/file_type_policies.cc
@@ -21,7 +21,9 @@ struct FileTypePoliciesSingletonTrait
: public base::DefaultSingletonTraits<FileTypePolicies> {
static FileTypePolicies* New() {
FileTypePolicies* instance = new FileTypePolicies();
+#if BUILDFLAG(FULL_SAFE_BROWSING)
instance->PopulateFromResourceBundle();
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
return instance;
}
};
@@ -48,10 +50,12 @@ FileTypePolicies::~FileTypePolicies() {
AutoLock lock(lock_); // DCHECK fail if the lock is held.
}
+#if BUILDFLAG(FULL_SAFE_BROWSING)
std::string FileTypePolicies::ReadResourceBundle() {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
return bundle.LoadDataResourceString(IDR_DOWNLOAD_FILE_TYPES_PB);
}
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
void FileTypePolicies::RecordUpdateMetrics(UpdateResult result,
const std::string& src_name) {
@@ -67,12 +71,14 @@ void FileTypePolicies::RecordUpdateMetri
}
}
+#if BUILDFLAG(FULL_SAFE_BROWSING)
void FileTypePolicies::PopulateFromResourceBundle() {
AutoLock lock(lock_);
std::string binary_pb = ReadResourceBundle();
UpdateResult result = PopulateFromBinaryPb(binary_pb);
RecordUpdateMetrics(result, "ResourceBundle");
}
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
void FileTypePolicies::PopulateFromDynamicUpdate(const std::string& binary_pb) {
AutoLock lock(lock_);
--- a/components/safe_browsing/core/file_type_policies.h
+++ b/components/safe_browsing/core/file_type_policies.h
@@ -11,6 +11,7 @@
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/synchronization/lock.h"
+#include "components/safe_browsing/buildflags.h"
#include "components/safe_browsing/core/proto/download_file_types.pb.h"
namespace safe_browsing {
@@ -105,8 +106,10 @@ class FileTypePolicies {
// only if it passes integrity checks.
virtual UpdateResult PopulateFromBinaryPb(const std::string& binary_pb);
+#if BUILDFLAG(FULL_SAFE_BROWSING)
// Fetch the blob from the main resource bundle.
virtual std::string ReadResourceBundle();
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
// Record the result of an update attempt.
virtual void RecordUpdateMetrics(UpdateResult result,
@@ -124,10 +127,12 @@ class FileTypePolicies {
void SwapConfig(std::unique_ptr<DownloadFileTypeConfig>& new_config);
void SwapConfigLocked(std::unique_ptr<DownloadFileTypeConfig>& new_config);
+#if BUILDFLAG(FULL_SAFE_BROWSING)
// Read data from the main ResourceBundle. This updates the internal list
// only if the data passes integrity checks. This is normally called once
// after construction.
void PopulateFromResourceBundle();
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
// The latest config we've committed. Starts out null.
// Protected by lock_.
--- a/components/safe_browsing/core/password_protection/password_protection_service_base.cc
+++ b/components/safe_browsing/core/password_protection/password_protection_service_base.cc
@@ -260,12 +260,6 @@ void PasswordProtectionServiceBase::Hist
history_service_observation_.Reset();
}
-bool PasswordProtectionServiceBase::IsWarningEnabled(
- ReusedPasswordAccountType password_type) {
- return GetPasswordProtectionWarningTriggerPref(password_type) ==
- PHISHING_REUSE;
-}
-
// static
ReusedPasswordType
PasswordProtectionServiceBase::GetPasswordProtectionReusedPasswordType(
--- a/components/safe_browsing/core/password_protection/password_protection_service_base.h
+++ b/components/safe_browsing/core/password_protection/password_protection_service_base.h
@@ -22,7 +22,6 @@
#include "components/safe_browsing/buildflags.h"
#include "components/safe_browsing/core/browser/referrer_chain_provider.h"
#include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/safe_browsing/core/db/database_manager.h"
#include "components/safe_browsing/core/db/v4_protocol_manager_util.h"
#include "components/safe_browsing/core/password_protection/metrics_util.h"
@@ -142,10 +141,6 @@ class PasswordProtectionServiceBase : pu
// Returns if the warning UI is enabled.
bool IsWarningEnabled(ReusedPasswordAccountType password_type);
- // Returns the pref value of password protection warning trigger.
- virtual PasswordProtectionTrigger GetPasswordProtectionWarningTriggerPref(
- ReusedPasswordAccountType password_type) const = 0;
-
// If |url| matches Safe Browsing allowlist domains, password protection
// change password URL, or password protection login URLs in the enterprise
// policy.
--- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc
+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc
@@ -338,15 +338,8 @@ void FileSystemAccessFileWriterImpl::Clo
@@ -339,15 +339,8 @@ void FileSystemAccessFileWriterImpl::Clo
close_callback_ = std::move(callback);
@@ -1557,7 +1359,7 @@
}
void FileSystemAccessFileWriterImpl::AbortImpl(AbortCallback callback) {
@@ -366,35 +359,6 @@ void FileSystemAccessFileWriterImpl::Abo
@@ -367,35 +360,6 @@ void FileSystemAccessFileWriterImpl::Abo
manager()->RemoveFileWriter(this);
}
@@ -1595,7 +1397,7 @@
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--- a/content/browser/file_system_access/file_system_access_file_writer_impl.h
+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h
@@ -99,9 +99,6 @@ class CONTENT_EXPORT FileSystemAccessFil
@@ -103,9 +103,6 @@ class CONTENT_EXPORT FileSystemAccessFil
void TruncateImpl(uint64_t length, TruncateCallback callback);
void CloseImpl(CloseCallback callback);
void AbortImpl(AbortCallback callback);
@@ -1607,7 +1409,7 @@
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
@@ -107,12 +107,6 @@ class FileSystemAccessPermissionContext
base::OnceCallback<void(SensitiveDirectoryResult)> callback) = 0;
enum class AfterWriteCheckResult { kAllow, kBlock };
@@ -1615,7 +1417,7 @@
- // or other security checks to determine if the write should be allowed.
- virtual void PerformAfterWriteChecks(
- std::unique_ptr<FileSystemAccessWriteItem> item,
- GlobalFrameRoutingId frame_id,
- GlobalRenderFrameHostId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)> callback) = 0;
// Returns whether the give |origin| already allows read permission, or it is
@@ -1638,7 +1440,7 @@
UpdateService::UpdateService(
--- a/weblayer/BUILD.gn
+++ b/weblayer/BUILD.gn
@@ -451,7 +451,6 @@ source_set("weblayer_lib_base") {
@@ -454,7 +454,6 @@ source_set("weblayer_lib_base") {
"//components/pref_registry:pref_registry",
"//components/prefs",
"//components/profile_metrics",

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

File diff suppressed because it is too large Load Diff

12
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
@@ -125,6 +125,7 @@
@@ -128,6 +128,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"
@@ -1592,6 +1593,8 @@ void RenderViewContextMenu::AppendPageIt
@@ -1686,6 +1687,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 =
@@ -1613,6 +1616,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -1707,6 +1710,7 @@ void RenderViewContextMenu::AppendPageIt
IDC_CONTENT_CONTEXT_TRANSLATE,
l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
}
@@ -36,7 +36,7 @@
#include "base/json/json_reader.h"
#include "base/lazy_instance.h"
#include "base/notreached.h"
@@ -24,6 +25,7 @@
@@ -23,6 +24,7 @@
#include "components/translate/core/browser/translate_event_details.h"
#include "components/translate/core/browser/translate_url_fetcher.h"
#include "components/translate/core/browser/translate_url_util.h"
@@ -44,7 +44,7 @@
#include "components/translate/core/common/translate_util.h"
#include "net/base/url_util.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
@@ -220,6 +222,9 @@ GURL TranslateLanguageList::TranslateLan
@@ -219,6 +221,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
@@ -892,8 +892,9 @@ void TranslateManager::FilterIsTranslate
@@ -915,8 +915,9 @@ void TranslateManager::FilterIsTranslate
->LogAutofillAssistantDeferredTriggerDecision();
}

46
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
@@ -2346,6 +2346,7 @@ static_library("browser") {
@@ -2320,6 +2320,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
@@ -139,6 +139,7 @@
@@ -141,6 +141,7 @@
#include "components/translate/core/browser/translate_ranker_impl.h"
#include "components/translate/core/common/translate_util.h"
#include "components/ui_devtools/switches.h"
@@ -44,7 +44,7 @@
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -218,6 +218,7 @@ source_set("browser") {
@@ -222,6 +222,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
@@ -209,6 +209,7 @@
@@ -213,6 +213,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"
@@ -3370,6 +3371,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3483,6 +3484,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLDraftExtensions,
switches::kEnableWebGLImageChromium,
switches::kFileUrlPathAlias,
@@ -73,7 +73,7 @@
switches::kForceGpuMemAvailableMb,
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -102,6 +102,7 @@ target(link_target_type, "child") {
@@ -103,6 +103,7 @@ target(link_target_type, "child") {
"//third_party/blink/public/common",
"//third_party/blink/public/strings",
"//third_party/ced",
@@ -83,7 +83,7 @@
"//ui/events/blink",
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -31,6 +31,7 @@
@@ -32,6 +32,7 @@
#include "third_party/blink/public/common/loader/referrer_utils.h"
#include "third_party/blink/public/common/switches.h"
#include "third_party/blink/public/platform/web_runtime_features.h"
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -468,6 +469,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -473,6 +474,10 @@ void SetRuntimeFeaturesFromCommandLine(c
{wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true},
{wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo,
true},
@@ -104,7 +104,7 @@
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
@@ -215,6 +215,8 @@ class WebRuntimeFeatures {
@@ -218,6 +218,8 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
BLINK_PLATFORM_EXPORT static void EnableGetCurrentBrowsingContextMedia(bool);
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
@@ -115,15 +115,15 @@
BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch(
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -43,6 +43,7 @@
@@ -42,6 +42,7 @@
#include "base/containers/contains.h"
#include "base/debug/dump_without_crashing.h"
#include "base/macros.h"
#include "base/metrics/histogram_functions.h"
+#include "base/rand_util.h"
#include "base/time/time.h"
#include "cc/input/overscroll_behavior.h"
#include "cc/input/scroll_snap_data.h"
@@ -859,6 +860,14 @@ Range* Document::CreateRangeAdjustedToTr
@@ -858,6 +859,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>();
@@ -2157,6 +2166,15 @@ void Document::UpdateStyleAndLayoutTreeF
@@ -2131,6 +2140,15 @@ void Document::UpdateStyleAndLayoutTreeF
#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
@@ -456,6 +456,10 @@ class CORE_EXPORT Document : public Cont
@@ -453,6 +453,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;
@@ -2021,6 +2025,9 @@ class CORE_EXPORT Document : public Cont
@@ -2051,6 +2055,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
@@ -2120,6 +2120,11 @@ DOMRectList* Element::getClientRects() {
@@ -2103,6 +2103,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
quads, *element_layout_object);
@@ -191,7 +191,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2137,6 +2142,9 @@ FloatRect Element::GetBoundingClientRect
@@ -2120,6 +2125,9 @@ FloatRect Element::GetBoundingClientRect
DCHECK(element_layout_object);
GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -203,7 +203,7 @@
--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
@@ -1614,11 +1614,21 @@ DOMRectList* Range::getClientRects() con
@@ -1591,11 +1591,21 @@ DOMRectList* Range::getClientRects() con
Vector<FloatQuad> quads;
GetBorderAndTextQuads(quads);
@@ -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
@@ -983,9 +983,15 @@ TextMetrics* CanvasRenderingContext2D::m
@@ -946,9 +946,15 @@ TextMetrics* CanvasRenderingContext2D::m
TextDirection direction =
ToTextDirection(GetState().GetDirection(), canvas());
@@ -285,7 +285,7 @@
void CanvasRenderingContext2D::fillFormattedText(
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1669,6 +1669,7 @@ component("platform") {
@@ -1679,6 +1679,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/power_scheduler",
"//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
@@ -686,4 +686,12 @@ void WebRuntimeFeatures::EnableDocumentT
RuntimeEnabledFeatures::SetDocumentTransitionEnabled(enable);
@@ -698,4 +698,12 @@ void WebRuntimeFeatures::EnableCLSScroll
RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable);
}
+void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
@@ -310,7 +310,7 @@
} // namespace blink
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -975,6 +975,12 @@
@@ -1023,6 +1023,12 @@
origin_trial_feature_name: "FledgeInterestGroupAPI",
},
{

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

@@ -34,7 +34,7 @@ approach to change color components.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3373,6 +3373,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3486,6 +3486,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -44,7 +44,7 @@ approach to change color components.
switches::kForceGpuMemAvailableMb,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -473,6 +473,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -478,6 +478,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -55,7 +55,7 @@ approach to change color components.
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
@@ -217,6 +217,7 @@ class WebRuntimeFeatures {
@@ -220,6 +220,7 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -65,7 +65,7 @@ approach to change color components.
BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch(
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -24,6 +24,7 @@
@@ -25,6 +25,7 @@
#include "third_party/blink/renderer/platform/geometry/float_quad.h"
#include "third_party/blink/renderer/platform/graphics/bitmap_image.h"
#include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
@@ -73,7 +73,7 @@ approach to change color components.
#include "third_party/blink/renderer/platform/graphics/stroke_data.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
@@ -2180,6 +2181,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2091,6 +2092,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -85,7 +85,7 @@ approach to change color components.
if (!IsPaint2D()) {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1628,7 +1628,9 @@ component("platform") {
@@ -1637,7 +1637,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -98,7 +98,7 @@ approach to change color components.
"//third_party/blink/renderer/platform/blob",
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -694,4 +694,8 @@ void WebRuntimeFeatures::EnableFingerpri
@@ -706,4 +706,8 @@ void WebRuntimeFeatures::EnableFingerpri
RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
}
@@ -311,7 +311,7 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
@@ -35,6 +35,8 @@ class PLATFORM_EXPORT StaticBitmapImage
@@ -36,6 +36,8 @@ class PLATFORM_EXPORT StaticBitmapImage
StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
@@ -322,7 +322,7 @@ approach to change color components.
// Methods overridden by all sub-classes
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -981,6 +981,9 @@
@@ -1029,6 +1029,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

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
@@ -2105,6 +2105,7 @@ static_library("browser") {
@@ -2083,6 +2083,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -49,7 +49,7 @@ with limited CPU/memory resources and it is disabled by default.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -18,12 +18,14 @@
@@ -19,12 +19,14 @@
#include "base/debug/leak_annotations.h"
#include "base/files/file_path.h"
#include "base/location.h"
@@ -64,7 +64,7 @@ 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"
@@ -97,6 +99,7 @@
@@ -99,6 +101,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"
@@ -72,7 +72,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/permissions/permissions_client.h"
#include "components/policy/core/common/policy_service.h"
@@ -129,6 +132,7 @@
@@ -131,6 +134,7 @@
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "net/log/net_log.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"
@@ -316,6 +320,18 @@ void BrowserProcessImpl::Init() {
@@ -327,6 +331,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
@@ -1511,6 +1511,10 @@ const char kMediaHistoryDescription[] =
@@ -1566,6 +1566,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
@@ -883,6 +883,9 @@ extern const char kLogJsConsoleMessagesD
@@ -902,6 +902,9 @@ extern const char kLogJsConsoleMessagesD
extern const char kMediaHistoryName[];
extern const char kMediaHistoryDescription[];

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

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -647,9 +647,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -652,9 +652,6 @@ void StartupBrowserCreatorImpl::AddInfoB
}
#endif

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
@@ -1339,7 +1339,7 @@ void ProfileManager::InitProfileUserPref
@@ -1284,7 +1284,7 @@ void ProfileManager::InitProfileUserPref
profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
supervised_user_id);
}

16
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
@@ -373,7 +373,7 @@ void BackgroundModeManager::RegisterPref
@@ -376,7 +376,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
@@ -1286,7 +1286,7 @@ void ChromeContentBrowserClient::Registe
@@ -1262,7 +1262,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
@@ -318,7 +318,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
@@ -280,7 +280,7 @@ const char Profile::kProfileKey[] = "__P
@@ -281,7 +281,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
@@ -120,7 +120,7 @@ void AccountConsistencyModeManager::Regi
@@ -125,7 +125,7 @@ void AccountConsistencyModeManager::Regi
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
registry->RegisterBooleanPref(kDiceMigrationCompletePref, false);
#endif
@@ -89,7 +89,7 @@
// static
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -72,11 +72,11 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -77,11 +77,11 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
@@ -105,7 +105,7 @@
registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
--- a/chrome/service/cloud_print/connector_settings.cc
+++ b/chrome/service/cloud_print/connector_settings.cc
@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(Service
@@ -59,7 +59,7 @@ void ConnectorSettings::InitFrom(Service
DCHECK(server_url_.is_valid());
connect_new_printers_ = prefs->GetBoolean(
@@ -168,7 +168,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -207,10 +207,10 @@ bool HasMutedCredentials(base::span<cons
@@ -204,10 +204,10 @@ bool HasMutedCredentials(base::span<cons
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(

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

@@ -39,7 +39,7 @@
const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
"RemoteSuggestionsEmulateM58FetchingSchedule",
@@ -69,10 +69,10 @@ const char kNotificationsDailyLimit[] =
@@ -69,10 +69,10 @@ const char kNotificationsDailyLimit[] =
const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
const base::Feature kKeepPrefetchedContentSuggestions{

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
@@ -1479,8 +1479,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1480,8 +1480,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/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
@@ -277,7 +277,7 @@ void DownloadPrefs::RegisterProfilePrefs
@@ -270,7 +270,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
@@ -846,7 +846,7 @@ static base::mac::ScopedObjCClassSwizzle
@@ -862,7 +862,7 @@ static base::mac::ScopedObjCClassSwizzle
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

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

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

4
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"
@@ -275,6 +276,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();
@@ -79,7 +79,7 @@
#include "base/feature_list.h"
#include "base/i18n/break_iterator.h"
#include "base/i18n/case_conversion.h"
@@ -643,6 +644,9 @@ void SearchProvider::Run(bool query_is_p
@@ -646,6 +647,9 @@ void SearchProvider::Run(bool query_is_p
}
void SearchProvider::DoHistoryQuery(bool minimal_changes) {

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

@@ -1,17 +1,17 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5770,7 +5770,7 @@ bool ChromeContentBrowserClient::ShouldA
@@ -5794,7 +5794,7 @@ bool ChromeContentBrowserClient::ShouldA
const url::Origin& embedder_origin,
const content::PepperPluginInfo& plugin_info) {
#if BUILDFLAG(ENABLE_PDF)
- if (plugin_info.name == ChromeContentClient::kPDFInternalPluginName) {
+ if (plugin_info.name == ChromeContentClient::GetPDFInternalPluginName()) {
#if BUILDFLAG(ENABLE_EXTENSIONS)
// Allow embedding the internal PDF plugin in the built-in PDF extension.
if (embedder_origin.scheme() == extensions::kExtensionScheme &&
return IsPdfInternalPluginAllowedOrigin(embedder_origin);
}
#endif // BUILDFLAG(ENABLE_PDF)
--- a/chrome/browser/pdf/pdf_extension_util.cc
+++ b/chrome/browser/pdf/pdf_extension_util.cc
@@ -169,7 +169,7 @@ std::string GetManifest() {
@@ -170,7 +170,7 @@ std::string GetManifest() {
DCHECK(manifest_contents.find(kNameTag) != std::string::npos);
base::ReplaceFirstSubstringAfterOffset(
&manifest_contents, 0, kNameTag,
@@ -22,7 +22,7 @@
}
--- a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
+++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
@@ -64,7 +64,7 @@ class PDFIFrameNavigationThrottleTest :
@@ -65,7 +65,7 @@ class PDFIFrameNavigationThrottleTest :
// Register a fake PDF Viewer plugin into our plugin service.
content::WebPluginInfo info;
info.name =
@@ -254,17 +254,17 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -251,6 +251,7 @@ static_library("common") {
@@ -248,6 +248,7 @@ static_library("common") {
"//components/no_state_prefetch/common",
"//components/no_state_prefetch/common:mojo_bindings",
"//components/page_load_metrics/common:common",
+ "//components/ungoogled:ungoogled_switches",
]
if (enable_plugins) {
if (enable_pdf) {
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -120,7 +120,7 @@ void ComputeBuiltInPlugins(std::vector<c
@@ -121,7 +121,7 @@ void ComputeBuiltInPlugins(std::vector<c
content::PepperPluginInfo pdf_info;
pdf_info.is_internal = true;
pdf_info.is_out_of_process = true;
@@ -363,7 +363,7 @@
FILE_PATH_LITERAL("internal-pdf-viewer");
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -992,7 +992,7 @@ WebPlugin* ChromeContentRendererClient::
@@ -1021,7 +1021,7 @@ WebPlugin* ChromeContentRendererClient::
}
}
} else if (info.name ==
@@ -372,7 +372,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.
@@ -1038,7 +1038,7 @@ WebPlugin* ChromeContentRendererClient::
@@ -1066,7 +1066,7 @@ WebPlugin* ChromeContentRendererClient::
PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
url);
if (info.name ==

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/sharing/features.cc
+++ b/chrome/browser/sharing/features.cc
@@ -50,3 +50,5 @@ const base::Feature kSharingPreferVapid
@@ -32,3 +32,5 @@ const base::Feature kSharingPreferVapid
base::FEATURE_DISABLED_BY_DEFAULT
#endif // defined(OS_ANDROID)
};
@@ -8,7 +8,7 @@
+const base::Feature kDisableQRGenerator{"DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT};
--- a/chrome/browser/sharing/features.h
+++ b/chrome/browser/sharing/features.h
@@ -54,4 +54,5 @@ extern const base::Feature kSharingSendV
@@ -34,4 +34,5 @@ extern const base::Feature kSharingSendV
// Feature flag for prefer sending sharing message using VAPID.
extern const base::Feature kSharingPreferVapid;
@@ -27,7 +27,7 @@
return true;
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -265,7 +265,8 @@ void LocationBarView::Init() {
@@ -287,7 +287,8 @@ void LocationBarView::Init() {
// the left most icon.
params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
params.types_enabled.push_back(PageActionIconType::kClickToCall);

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1110,7 +1110,8 @@ void BrowserCommandController::InitComma
@@ -1135,7 +1135,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -18,11 +18,11 @@
#include "base/bind.h"
+#include "base/command_line.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/ui/layout_constants.h"
@@ -260,7 +261,8 @@ TabStripRegionView::TabStripRegionView(s
tip_marquee_view_->SetProperty(views::kMarginsKey, control_padding);
#include "build/build_config.h"
#include "chrome/browser/themes/theme_properties.h"
@@ -127,7 +128,8 @@ TabStripRegionView::TabStripRegionView(s
return;
#endif
const Browser* browser = tab_strip_->controller()->GetBrowser();
- if (browser && browser->is_type_normal()) {
+ if (browser && browser->is_type_normal() &&

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

@@ -35,10 +35,10 @@
auto* data_types = profile_->GetPrefs()->GetList(
browsing_data::prefs::kClearBrowsingDataOnExitList);
- if (data_types && !data_types->GetList().empty() &&
- !ProfileSyncServiceFactory::IsSyncAllowed(profile_)) {
- !SyncServiceFactory::IsSyncAllowed(profile_)) {
+ bool cdoe = base::FeatureList::IsEnabled(browsing_data::features::kClearDataOnExit);
+ if (cdoe || (data_types && !data_types->GetList().empty() &&
+ !ProfileSyncServiceFactory::IsSyncAllowed(profile_))) {
+ !SyncServiceFactory::IsSyncAllowed(profile_))) {
profile_->GetPrefs()->SetBoolean(
browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
auto* remover = profile_->GetBrowsingDataRemover();
@@ -80,7 +80,7 @@
@@ -12,5 +12,7 @@ const base::Feature kEnableRemovingAllTh
const base::Feature kEnableBrowsingDataLifetimeManager{
"BrowsingDataLifetimeManager", base::FEATURE_DISABLED_BY_DEFAULT};
"BrowsingDataLifetimeManager", base::FEATURE_ENABLED_BY_DEFAULT};
+
+const base::Feature kClearDataOnExit{"ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT};
} // namespace features

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"
@@ -1803,6 +1804,10 @@ bool TabStripModel::InternalCloseTabs(
@@ -1799,6 +1800,10 @@ bool TabStripModel::CloseTabs(base::span
if (items.empty())
return true;

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

@@ -11,7 +11,7 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
@@ -128,6 +129,14 @@ scoped_refptr<extensions::CrxInstaller>
@@ -128,6 +129,14 @@ scoped_refptr<extensions::CrxInstaller>
return installer;
}
@@ -37,7 +37,7 @@
}
--- a/chrome/browser/download/download_crx_util.h
+++ b/chrome/browser/download/download_crx_util.h
@@ -43,6 +43,10 @@ scoped_refptr<extensions::CrxInstaller>
@@ -43,6 +43,10 @@ scoped_refptr<extensions::CrxInstaller>
Profile* profile,
const download::DownloadItem& download_item);

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
@@ -79,6 +79,8 @@ WindowOpenDisposition RenderViewImpl::Na
@@ -69,6 +69,8 @@ WindowOpenDisposition RenderViewImpl::Na
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

2
patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch
View File

@@ -21,7 +21,7 @@
#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
@@ -907,7 +908,8 @@ void HistoryBackend::InitImpl(
@@ -886,7 +887,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.

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

@@ -20,8 +20,8 @@
+#include "base/command_line.h"
#include "base/lazy_instance.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
@@ -265,6 +266,13 @@ IDNConversionResult IDNToUnicodeWithAdju
#include "base/strings/strcat.h"
@@ -264,6 +265,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
@@ -612,7 +612,8 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -609,7 +609,8 @@ void StartupBrowserCreatorImpl::AddInfoB
if (command_line_.HasSwitch(switches::kKioskMode))
return;

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

@@ -1,14 +1,14 @@
--- a/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -9,6 +9,7 @@
#include <utility>
@@ -11,6 +11,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
+#include "base/command_line.h"
#include "base/metrics/user_metrics.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
@@ -106,6 +107,18 @@ DragOperation GetDropEffect(const ui::Dr
@@ -109,6 +110,18 @@ DragOperation GetDropEffect(const ui::Dr
return DragOperation::kMove;
}
@@ -27,7 +27,7 @@
} // namespace
BrowserRootView::DropInfo::DropInfo() = default;
@@ -117,7 +130,9 @@ BrowserRootView::DropInfo::~DropInfo() {
@@ -120,7 +133,9 @@ BrowserRootView::DropInfo::~DropInfo() {
BrowserRootView::BrowserRootView(BrowserView* browser_view,
views::Widget* widget)
@@ -38,7 +38,7 @@
BrowserRootView::~BrowserRootView() {
// It's possible to destroy the browser while a drop is active. In this case,
@@ -268,7 +283,7 @@ bool BrowserRootView::OnMouseWheel(const
@@ -245,7 +260,7 @@ bool BrowserRootView::OnMouseWheel(const
// Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
// disable it if the latter feature is enabled.
@@ -49,7 +49,7 @@
// tabstrip, or the empty space beside the tabstrip.
--- a/chrome/browser/ui/views/frame/browser_root_view.h
+++ b/chrome/browser/ui/views/frame/browser_root_view.h
@@ -136,6 +136,8 @@ class BrowserRootView : public views::in
@@ -142,6 +142,8 @@ class BrowserRootView : public views::in
int scroll_remainder_x_ = 0;
int scroll_remainder_y_ = 0;

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -263,14 +263,30 @@ void ToolbarView::Init() {
@@ -267,14 +267,30 @@ void ToolbarView::Init() {
std::unique_ptr<ToolbarAccountIconContainerView>
toolbar_account_icon_container;

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -81,14 +81,13 @@ using content::WebContents;
@@ -82,14 +82,13 @@ using content::WebContents;
namespace {
bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {

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
@@ -242,5 +242,7 @@ const base::Feature kUdpSocketPosixAlway
const base::Feature kCookieSameSiteConsidersRedirectChain{
"CookieSameSiteConsidersRedirectChain", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -263,5 +263,7 @@ const base::Feature kCookieSameSiteConsi
const base::Feature kSamePartyCookiesConsideredFirstParty{
"SamePartyCookiesConsideredFirstParty", base::FEATURE_DISABLED_BY_DEFAULT};
+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
@@ -356,6 +356,8 @@ NET_EXPORT extern const base::Feature kU
// See spec changes in https://github.com/httpwg/http-extensions/pull/1348
NET_EXPORT extern const base::Feature kCookieSameSiteConsidersRedirectChain;
@@ -406,6 +406,8 @@ NET_EXPORT extern const base::Feature kC
// privacy mode is disabled in same-party contexts.)
NET_EXPORT extern const base::Feature kSamePartyCookiesConsideredFirstParty;
+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
@@ -135,11 +135,6 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -138,11 +138,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,
@@ -3367,7 +3362,7 @@ bool HostResolverManager::IsIPv6Reachabl
@@ -3363,7 +3358,7 @@ bool HostResolverManager::IsIPv6Reachabl
(tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) {
SetLastIPv6ProbeResult(

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

@@ -19,17 +19,17 @@
<cr-button class="cancel-button" on-click="cancel_" id="cancel">
--- a/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.js
+++ b/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.js
@@ -42,6 +42,9 @@ Polymer({
queryUrl_: String,
@@ -56,6 +56,9 @@ class SettingsSearchEngineDialogElement
queryUrl_: String,
/** @private {string} */
+ suggestionsUrl_: String,
/** @private {string} */
+ suggestionsUrl_: String,
+
+ /** @private {string} */
dialogTitle_: String,
+ /** @private {string} */
dialogTitle_: String,
/** @private {string} */
@@ -75,6 +78,7 @@ Polymer({
/** @private {string} */
@@ -93,6 +96,7 @@ class SettingsSearchEngineDialogElement
this.searchEngine_ = this.model.name;
this.keyword_ = this.model.keyword;
this.queryUrl_ = this.model.url;
@@ -37,7 +37,7 @@
} else {
this.dialogTitle_ =
loadTimeData.getString('searchEnginesAddSearchEngine');
@@ -112,8 +116,12 @@ Polymer({
@@ -133,8 +137,12 @@ class SettingsSearchEngineDialogElement
}
}
@@ -49,10 +49,10 @@
+ this.$.queryUrl,
+ this.$.suggestionsUrl
+ ].forEach(element => this.validateElement_(element));
},
}
/** @private */
@@ -124,7 +132,8 @@ Polymer({
@@ -145,7 +153,8 @@ class SettingsSearchEngineDialogElement
/** @private */
onActionButtonTap_() {
this.browserProxy_.searchEngineEditCompleted(
@@ -60,9 +60,9 @@
+ this.searchEngine_, this.keyword_, this.queryUrl_,
+ this.suggestionsUrl_);
this.$.dialog.close();
},
}
@@ -161,9 +170,11 @@ Polymer({
@@ -182,9 +191,11 @@ class SettingsSearchEngineDialogElement
/** @private */
updateActionButtonState_() {
const allValid = [
@@ -75,7 +75,7 @@
+ inputElement.id == 'suggestionsUrl');
});
this.$.actionButton.disabled = !allValid;
},
}
--- a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.js
+++ b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.js
@@ -28,6 +28,7 @@ import {addSingletonGetter, sendWithProm
@@ -86,7 +86,7 @@
* urlLocked: boolean}}
* @see chrome/browser/ui/webui/settings/search_engine_manager_handler.cc
*/
@@ -59,8 +60,9 @@ export class SearchEnginesBrowserProxy {
@@ -60,8 +61,9 @@ export class SearchEnginesBrowserProxy {
* @param {string} searchEngine
* @param {string} keyword
* @param {string} queryUrl
@@ -97,7 +97,7 @@
/** @return {!Promise<!SearchEnginesInfo>} */
getSearchEnginesList() {}
@@ -98,11 +100,12 @@ export class SearchEnginesBrowserProxyIm
@@ -99,11 +101,12 @@ export class SearchEnginesBrowserProxyIm
}
/** @override */
@@ -260,7 +260,7 @@
bool CanEdit(const TemplateURL* url) const;
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -98,20 +98,24 @@ void TemplateURLTableModel::Remove(int i
@@ -112,20 +112,24 @@ void TemplateURLTableModel::Remove(int i
void TemplateURLTableModel::Add(int index,
const std::u16string& short_name,
const std::u16string& keyword,
@@ -290,7 +290,7 @@
DCHECK(index >= 0 && index <= RowCount());
DCHECK(!url.empty());
TemplateURL* template_url = GetTemplateURL(index);
@@ -120,7 +124,8 @@ void TemplateURLTableModel::ModifyTempla
@@ -134,7 +138,8 @@ void TemplateURLTableModel::ModifyTempla
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
template_url->SupportsReplacement(
template_url_service_->search_terms_data()));
@@ -330,7 +330,7 @@
// Dummy number used for indicating that a new search engine is added.
const int kNewSearchEngineIndex = -1;
@@ -194,6 +195,9 @@ SearchEnginesHandler::CreateDictionaryFo
@@ -208,6 +209,9 @@ SearchEnginesHandler::CreateDictionaryFo
Profile* profile = Profile::FromWebUI(web_ui());
dict->SetString(
"url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
@@ -340,7 +340,7 @@
dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0);
GURL icon_url = template_url->favicon_url();
if (icon_url.is_valid())
@@ -290,12 +294,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -304,12 +308,14 @@ void SearchEnginesHandler::HandleSearchE
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
const std::u16string& keyword,
@@ -358,7 +358,7 @@
edit_controller_.reset();
}
@@ -326,6 +332,8 @@ bool SearchEnginesHandler::CheckFieldVal
@@ -340,6 +346,8 @@ bool SearchEnginesHandler::CheckFieldVal
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
else if (field_name.compare(kQueryUrlField) == 0)
is_valid = edit_controller_->IsURLValid(field_value);
@@ -367,7 +367,7 @@
else
NOTREACHED();
@@ -347,17 +355,21 @@ void SearchEnginesHandler::HandleSearchE
@@ -361,17 +369,21 @@ void SearchEnginesHandler::HandleSearchE
std::string search_engine;
std::string keyword;
std::string query_url;

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

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

4
patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/media/router/discovery/dial/dial_registry.cc
+++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc
@@ -192,10 +192,6 @@ void DialRegistry::StartPeriodicDiscover
@@ -191,10 +191,6 @@ void DialRegistry::StartPeriodicDiscover
dial_ = CreateDialService();
dial_->AddObserver(this);
@@ -14,7 +14,7 @@
}
void DialRegistry::DoDiscovery() {
@@ -209,8 +205,6 @@ void DialRegistry::StopPeriodicDiscovery
@@ -208,8 +204,6 @@ void DialRegistry::StopPeriodicDiscovery
if (!dial_)
return;

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

@@ -153,8 +153,8 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -79,7 +79,6 @@ source_set("browser") {
"//components/payments/mojom",
@@ -83,7 +83,6 @@ source_set("browser") {
"//components/permissions:permissions_common",
"//components/power_scheduler",
"//components/services/filesystem:lib",
- "//components/services/quarantine:quarantine",
@@ -171,7 +171,7 @@
#include "content/browser/file_system_access/file_system_access_error.h"
#include "content/browser/file_system_access/file_system_access_manager_impl.h"
#include "content/public/browser/content_browser_client.h"
@@ -377,22 +376,9 @@ void FileSystemAccessFileWriterImpl::Did
@@ -378,22 +377,9 @@ void FileSystemAccessFileWriterImpl::Did
// In case of error, the swap file URL will point to a valid filesystem
// location. The file at this URL will be deleted when the mojo pipe closes.
base::OnceCallback<void(base::File::Error)> result_callback;
@@ -194,7 +194,7 @@
DoFileSystemOperation(
FROM_HERE, &FileSystemOperationRunner::MoveFileLocal,
std::move(result_callback), swap_url(), url(),
@@ -417,7 +403,6 @@ void FileSystemAccessFileWriterImpl::Did
@@ -418,7 +404,6 @@ void FileSystemAccessFileWriterImpl::Did
void FileSystemAccessFileWriterImpl::DidSwapFileDoQuarantine(
const storage::FileSystemURL& target_url,
const GURL& referrer_url,
@@ -202,7 +202,7 @@
base::File::Error result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -448,37 +433,9 @@ void FileSystemAccessFileWriterImpl::Did
@@ -449,37 +434,9 @@ void FileSystemAccessFileWriterImpl::Did
referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
? referrer_url
: GURL();
@@ -242,7 +242,7 @@
--- a/content/browser/file_system_access/file_system_access_file_writer_impl.h
+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h
@@ -105,10 +105,8 @@ class CONTENT_EXPORT FileSystemAccessFil
@@ -109,10 +109,8 @@ class CONTENT_EXPORT FileSystemAccessFil
void DidSwapFileDoQuarantine(
const storage::FileSystemURL& target_url,
const GURL& referrer_url,

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
@@ -464,14 +464,14 @@ ComponentResult IDNToUnicodeOneComponent
@@ -463,14 +463,14 @@ ComponentResult IDNToUnicodeOneComponent
} // namespace
const FormatUrlType kFormatUrlOmitNothing = 0;

2
patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -122,9 +122,7 @@ void IntranetRedirectDetector::FinishSle
@@ -121,9 +121,7 @@ void IntranetRedirectDetector::FinishSle
simple_loaders_.clear();
resulting_origins_.clear();

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
@@ -3582,8 +3582,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3590,8 +3590,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3597,8 +3596,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3605,8 +3604,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

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

@@ -2,7 +2,7 @@
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -361,7 +361,7 @@ const base::Feature kComputePressure{"Co
@@ -377,7 +377,7 @@ const base::Feature kComputePressure{"Co
// Prefetch request properties are updated to be privacy-preserving. See
// crbug.com/988956.
const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -425,11 +425,6 @@ int GetContentRestrictions(const Browser
@@ -426,11 +426,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;
}
@@ -1306,8 +1301,7 @@ bool CanSavePage(const Browser* browser)
@@ -1311,8 +1306,7 @@ bool CanSavePage(const Browser* browser)
prefs::kAllowFileSelectionDialogs)) {
return false;
}

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

@@ -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
@@ -2662,8 +2662,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2675,8 +2675,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);
std::u16string clipboard_text;
@@ -2671,7 +2669,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2684,7 +2682,6 @@ void TabStrip::NewTabButtonPressed(const
/* data_dst = */ nullptr, &clipboard_text);
if (!clipboard_text.empty())
controller_->CreateNewTabWithLocation(clipboard_text);

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

@@ -40,17 +40,3 @@
}
} // namespace media_router
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -407,11 +407,9 @@ void AddPrintPreviewFlags(content::WebUI
source->AddBoolean("isEnterpriseManaged", webui::IsEnterpriseManaged());
-#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
source->AddBoolean(
"forceEnablePrivetPrinting",
profile->GetPrefs()->GetBoolean(prefs::kForceEnablePrivetPrinting));
-#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
source->AddBoolean(

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

@@ -30,7 +30,7 @@
href="chrome://settings/clearBrowserData"
--- a/chrome/browser/resources/ntp4/incognito_tab.html
+++ b/chrome/browser/resources/ntp4/incognito_tab.html
@@ -25,8 +25,6 @@ document.querySelector('#incognitothemec
@@ -24,8 +24,6 @@ document.querySelector('#incognitothemec
<h1>$i18n{incognitoTabHeading}</h1>
<p id="subtitle">
<span>$i18n{incognitoTabDescription}</span>
@@ -63,7 +63,7 @@
<template is="dom-if" if="[[!captionSettingsOpensExternally_]]">
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -122,8 +122,6 @@
@@ -131,8 +131,6 @@
</div>
</template>
</if>
@@ -145,7 +145,7 @@
class="hr"
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -76,10 +76,3 @@
@@ -88,10 +88,3 @@
sub-label="$i18n{manageCertificatesDescription}"
on-click="onManageCertificatesClick_"></cr-link-row>
</if>
@@ -182,7 +182,7 @@
id="safetyCheck">
--- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
+++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
@@ -68,7 +68,7 @@
@@ -72,7 +72,7 @@
</template>
<h1 class="cr-title-text">[[pageTitle]]</h1>
<slot name="subpage-title-extra"></slot>
@@ -193,16 +193,16 @@
</cr-icon-button>
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -220,6 +220,7 @@ void ProfileMenuView::BuildMenu() {
@@ -175,6 +175,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
+ return gfx::ImageSkia();
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord())
if (profile->IsOffTheRecord() || profile->IsGuestSession())
return gfx::ImageSkia();
@@ -496,8 +497,7 @@ void ProfileMenuView::BuildIdentity() {
menu_title_, menu_subtitle_);
@@ -450,8 +451,7 @@ void ProfileMenuView::BuildIdentity() {
menu_subtitle_);
} else {
menu_title_ = std::u16string();
- menu_subtitle_ =
@@ -211,11 +211,3 @@
SetProfileIdentityInfo(
profile_name, background_color, edit_button_params,
ui::ImageModel::FromImage(
@@ -573,6 +573,7 @@ void ProfileMenuView::BuildSyncInfo() {
return;
}
+ return;
// Show sync promos.
CoreAccountInfo unconsented_account =
identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin);

2035
pruning.list
View File

File diff suppressed because it is too large Load Diff