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

Update to Chromium 80.0.3987.42

Browse Source
This commit is contained in:
Albert Tang
2020-01-10 14:04:40 -06:00
committed by tangalbert919
parent e2fae994d7
commit 3f783ccc69
56 changed files with 675 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
79.0.3945.130
80.0.3987.42

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

@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
@@ -107,10 +107,7 @@ public abstract class ChromeFeatureList
@@ -108,10 +108,7 @@ public abstract class ChromeFeatureList
*/
public static int getFieldTrialParamByFeatureAsInt(
String featureName, String paramName, int defaultValue) {
@@ -22,7 +22,7 @@ Subject: Disable fetching of all field trials
}
/**
@@ -127,10 +124,7 @@ public abstract class ChromeFeatureList
@@ -128,10 +125,7 @@ public abstract class ChromeFeatureList
*/
public static double getFieldTrialParamByFeatureAsDouble(
String featureName, String paramName, double defaultValue) {
@@ -34,7 +34,7 @@ Subject: Disable fetching of all field trials
}
/**
@@ -147,10 +141,7 @@ public abstract class ChromeFeatureList
@@ -148,10 +142,7 @@ public abstract class ChromeFeatureList
*/
public static boolean getFieldTrialParamByFeatureAsBoolean(
String featureName, String paramName, boolean defaultValue) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2985,8 +2985,6 @@ jumbo_static_library("browser") {
@@ -3096,8 +3096,6 @@ jumbo_static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -67,7 +67,7 @@
network_time_tracker_.reset();
#if BUILDFLAG(ENABLE_PLUGINS)
plugins_resource_service_.reset();
@@ -950,22 +947,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -952,22 +949,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -90,7 +90,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1221,26 +1202,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1223,26 +1204,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -141,7 +141,7 @@
subresource_filter_ruleset_service_;
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -58,7 +58,6 @@
@@ -60,7 +60,6 @@
#include "chrome/browser/previews/previews_service.h"
#include "chrome/browser/previews/previews_service_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -149,8 +149,8 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/web_data_service_factory.h"
@@ -662,36 +661,6 @@ void ChromeBrowsingDataRemoverDelegate::
CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(), base::Time::Max(),
@@ -665,36 +664,6 @@ void ChromeBrowsingDataRemoverDelegate::
ContentSettingsType::CLIENT_HINTS, base::Time(), base::Time::Max(),
website_settings_filter);
- // Clear the safebrowsing cookies only if time period is for "all time". It
@@ -188,7 +188,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -837,30 +837,6 @@ void SetApplicationLocaleOnIOThread(cons
@@ -834,30 +834,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}
@@ -219,7 +219,7 @@
#if defined(OS_ANDROID)
float GetDeviceScaleAdjustment() {
static const float kMinFSM = 1.05f;
@@ -1259,7 +1235,6 @@ void ChromeContentBrowserClient::PostAft
@@ -1290,7 +1266,6 @@ void ChromeContentBrowserClient::PostAft
InitNetworkContextsParentDirectory();
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -227,7 +227,7 @@
}
bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
@@ -2062,7 +2037,7 @@ void ChromeContentBrowserClient::AppendE
@@ -2097,7 +2072,7 @@ void ChromeContentBrowserClient::AppendE
// Disable client-side phishing detection in the renderer if it is
// disabled in the Profile preferences or the browser process.
if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
@@ -236,7 +236,7 @@
command_line->AppendSwitch(
switches::kDisableClientSidePhishingDetection);
}
@@ -3948,7 +3923,7 @@ ChromeContentBrowserClient::CreateThrott
@@ -3959,7 +3934,7 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
@@ -245,7 +245,7 @@
base::Bind(&SSLErrorHandler::HandleSSLError),
base::Bind(&IsInHostedApp)));
@@ -3970,12 +3945,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -3981,12 +3956,6 @@ ChromeContentBrowserClient::CreateThrott
GooglePasswordManagerNavigationThrottle::MaybeCreateThrottleFor(handle));
#endif
@@ -283,7 +283,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -322,13 +322,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
@@ -321,13 +321,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm;
@@ -297,7 +297,7 @@
}
#if defined(OS_ANDROID)
@@ -638,16 +631,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -633,16 +626,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename) {
@@ -313,7 +313,7 @@
- *filename = filename->AddExtension(default_filename.BaseName().value());
}
void ChromeDownloadManagerDelegate::OpenDownloadUsingPlatformHandler(
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -75,7 +75,7 @@ class DownloadItemModelData : public bas
@@ -379,7 +379,7 @@
}
}
@@ -385,10 +378,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
@@ -387,10 +380,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
bool DownloadPrefs::EnableAutoOpenBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -574,7 +574,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
@@ -683,51 +683,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -721,51 +721,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -626,7 +626,7 @@
+ "")));
}
} // namespace extensions
WebstorePrivateGetExtensionStatusFunction::
--- a/chrome/browser/extensions/blacklist_state_fetcher.cc
+++ b/chrome/browser/extensions/blacklist_state_fetcher.cc
@@ -32,28 +32,8 @@ BlacklistStateFetcher::~BlacklistStateFe
@@ -704,7 +704,7 @@
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -759,9 +759,6 @@ void ChromeMetricsServiceClient::Registe
@@ -767,9 +767,6 @@ void ChromeMetricsServiceClient::Registe
metrics_service_->RegisterMetricsProvider(
std::make_unique<HttpsEngagementMetricsProvider>());
@@ -728,14 +728,14 @@
// static
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -252,7 +252,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -224,7 +224,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalServiceFactory::GetInstance();
#endif
- CertificateReportingServiceFactory::GetInstance();
ChromeBrowsingDataRemoverDelegateFactory::GetInstance();
#if defined(OS_CHROMEOS)
chromeos::android_sms::AndroidSmsServiceFactory::GetInstance();
ChromeSigninClientFactory::GetInstance();
ClientHintsFactory::GetInstance();
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -91,7 +91,6 @@
@@ -746,7 +746,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"
@@ -602,17 +601,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -579,17 +578,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -784,8 +784,8 @@
jumbo_static_library("safe_browsing") {
+ if (false) {
sources = [
"safe_browsing_controller_client.cc",
"safe_browsing_controller_client.h",
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -62,6 +63,7 @@ jumbo_static_library("safe_browsing") {
]
deps += [ "//extensions/browser" ]
@@ -796,7 +796,7 @@
# "Safe Browsing Basic" files used for safe browsing in full mode
--- a/chrome/browser/ssl/captive_portal_blocking_page.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc
@@ -211,10 +211,7 @@ void CaptivePortalBlockingPage::Populate
@@ -222,10 +222,7 @@ void CaptivePortalBlockingPage::Populate
load_time_data->SetString("recurrentErrorParagraph", "");
load_time_data->SetBoolean("show_recurrent_error_paragraph", false);
@@ -808,7 +808,7 @@
}
void CaptivePortalBlockingPage::CommandReceived(const std::string& command) {
@@ -229,8 +226,6 @@ void CaptivePortalBlockingPage::CommandR
@@ -240,8 +237,6 @@ void CaptivePortalBlockingPage::CommandR
security_interstitials::SecurityInterstitialCommand cmd =
static_cast<security_interstitials::SecurityInterstitialCommand>(
command_num);
@@ -817,20 +817,9 @@
switch (cmd) {
case security_interstitials::CMD_OPEN_LOGIN:
captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent(
--- a/chrome/browser/ssl/cert_report_helper.cc
+++ b/chrome/browser/ssl/cert_report_helper.cc
@@ -181,8 +181,6 @@ void CertReportHelper::FinishCertCollect
LOG(ERROR) << "Failed to serialize certificate report.";
return;
}
-
- ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report);
}
bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -234,92 +234,6 @@ bool SecurityStateTabHelper::UsedPolicyI
@@ -248,92 +248,6 @@ bool SecurityStateTabHelper::UsedPolicyI
security_state::MaliciousContentStatus
SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -947,7 +936,7 @@
void ChromeSubresourceFilterClient::OnReloadRequested() {
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2706,7 +2706,6 @@ jumbo_static_library("ui") {
@@ -2764,7 +2764,6 @@ jumbo_static_library("ui") {
"views/device_chooser_content_view.h",
"views/devtools_process_observer.cc",
"views/devtools_process_observer.h",
@@ -957,7 +946,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -248,10 +248,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -256,10 +256,6 @@ void TabHelpers::AttachTabHelpers(WebCon
PreviewsUITabHelper::CreateForWebContents(web_contents);
RecentlyAudibleHelper::CreateForWebContents(web_contents);
ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
@@ -965,17 +954,17 @@
- web_contents);
- safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
- profile, web_contents);
safety_tips::ReputationWebContentsObserver::CreateForWebContents(
web_contents);
ReputationWebContentsObserver::CreateForWebContents(web_contents);
SearchEngineTabHelper::CreateForWebContents(web_contents);
@@ -304,7 +300,6 @@ void TabHelpers::AttachTabHelpers(WebCon
SecurityStateTabHelper::CreateForWebContents(web_contents);
@@ -310,7 +306,6 @@ void TabHelpers::AttachTabHelpers(WebCon
pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(
web_contents, std::make_unique<ChromePDFWebContentsHelperClient>());
PluginObserver::CreateForWebContents(web_contents);
SadTabHelper::CreateForWebContents(web_contents);
- safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents);
SearchTabHelper::CreateForWebContents(web_contents);
TabDialogs::CreateForWebContents(web_contents);
if (base::FeatureList::IsEnabled(features::kTabHoverCardImages) ||
if (base::FeatureList::IsEnabled(features::kSyncEncryptionKeysWebApi)) {
SyncEncryptionKeysTabHelper::CreateForWebContents(web_contents);
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -23,7 +23,6 @@
@@ -996,7 +985,7 @@
}
void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
@@ -312,12 +308,6 @@ void DownloadsDOMHandler::RemoveDownload
@@ -317,12 +313,6 @@ void DownloadsDOMHandler::RemoveDownload
IdSet ids;
for (auto* download : to_remove) {
@@ -1009,7 +998,7 @@
DownloadItemModel item_model(download);
if (!item_model.ShouldShowInShelf() ||
download->GetState() == download::DownloadItem::IN_PROGRESS) {
@@ -374,32 +364,6 @@ void DownloadsDOMHandler::FinalizeRemova
@@ -379,32 +369,6 @@ void DownloadsDOMHandler::FinalizeRemova
}
}
@@ -1073,7 +1062,7 @@
bool IsDeletingHistoryAllowed();
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -277,117 +277,6 @@ LookalikeUrlInterstitialPage* CreateLook
@@ -250,117 +250,6 @@ LookalikeUrlInterstitialPage* CreateLook
safe_url));
}
@@ -1133,7 +1122,7 @@
- // parts which depend on the NavigationEntry are not hit.
- return safe_browsing::SafeBrowsingBlockingPage::CreateBlockingPage(
- g_browser_process->safe_browsing_service()->ui_manager().get(),
- web_contents, main_frame_url, resource);
- web_contents, main_frame_url, resource, true);
-}
-
-TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage(
@@ -1191,16 +1180,16 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -493,8 +382,6 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate.reset(CreateSSLBlockingPage(web_contents));
} else if (path_without_query == "/mitm-software-ssl") {
interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents));
@@ -473,8 +362,6 @@ void InterstitialHTMLSource::StartDataRe
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate.reset(
CreateBlockedInterceptionBlockingPage(web_contents));
- } else if (path_without_query == "/safebrowsing") {
- interstitial_delegate.reset(CreateSafeBrowsingBlockingPage(web_contents));
} else if (path_without_query == "/clock") {
interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents));
} else if (path_without_query == "/lookalike") {
@@ -506,13 +393,6 @@ void InterstitialHTMLSource::StartDataRe
@@ -486,13 +373,6 @@ void InterstitialHTMLSource::StartDataRe
} else if (path_without_query == "/origin_policy") {
interstitial_delegate.reset(
CreateOriginPolicyInterstitialPage(web_contents));
@@ -1235,3 +1224,13 @@
const base::Feature kThreatDomDetailsTagAndAttributeFeature{
"ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT};
--- a/components/security_interstitials/content/cert_report_helper.cc
+++ b/components/security_interstitials/content/cert_report_helper.cc
@@ -160,7 +160,6 @@ void CertReportHelper::FinishCertCollect
return;
}
- ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report);
}
bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {

11
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,86 +829,6 @@ AutofillDownloadManager::GetRequestURLAn
@@ -830,95 +830,6 @@ AutofillDownloadManager::GetRequestURLAn
}
bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
@@ -28,6 +28,15 @@
- resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
- resource_request->method = method;
-
- // On iOS we have a single, shared URLLoaderFactory provided by BrowserState.
- // As it is shared, it is not trusted and we cannot assign trusted_params
- // to the network request.
-#if !defined(OS_IOS)
- resource_request->trusted_params = network::ResourceRequest::TrustedParams();
- resource_request->trusted_params->network_isolation_key =
- driver_->NetworkIsolationKey();
-#endif
-
- // Add Chrome experiment state to the request headers.
- variations::AppendVariationsHeaderUnknownSignedIn(
- request_url,

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

@@ -10,7 +10,7 @@
#if defined(OS_CHROMEOS)
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -342,11 +342,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -338,11 +338,6 @@ void ComponentLoader::AddWebStoreApp() {
if (!IsNormalSession())
return;
#endif
@@ -22,7 +22,7 @@
}
#if defined(OS_CHROMEOS)
@@ -444,11 +439,6 @@ void ComponentLoader::AddDefaultComponen
@@ -447,11 +442,6 @@ void ComponentLoader::AddDefaultComponen
AddKeyboardApp();
#else // defined(OS_CHROMEOS)
DCHECK(!skip_session_components);
@@ -34,7 +34,7 @@
#endif // defined(OS_CHROMEOS)
if (!skip_session_components) {
@@ -523,13 +513,6 @@ void ComponentLoader::AddDefaultComponen
@@ -526,13 +516,6 @@ void ComponentLoader::AddDefaultComponen
AddHangoutServicesExtension();
#endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
@@ -83,7 +83,7 @@
}
// http://crbug.com/165634
@@ -723,21 +709,6 @@ void WebstoreInstaller::UpdateDownloadPr
@@ -724,21 +710,6 @@ void WebstoreInstaller::UpdateDownloadPr
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!crx_installer_.get());

2
patches/core/inox-patchset/0007-disable-web-resource-service.patch
View File

@@ -1,6 +1,6 @@
--- a/components/web_resource/web_resource_service.cc
+++ b/components/web_resource/web_resource_service.cc
@@ -124,44 +124,7 @@ bool WebResourceService::GetFetchSchedul
@@ -120,44 +120,7 @@ bool WebResourceService::GetFetchSchedul
// Initializes the fetching of data from the resource server. Data
// load calls OnSimpleLoaderComplete.
void WebResourceService::StartFetch() {

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

4
patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -170,7 +170,6 @@ void SpellcheckHunspellDictionary::Retry
@@ -162,7 +162,6 @@ void SpellcheckHunspellDictionary::Retry
return;
}
browser_context_ = browser_context;
@@ -8,7 +8,7 @@
}
bool SpellcheckHunspellDictionary::IsReady() const {
@@ -408,9 +407,6 @@ void SpellcheckHunspellDictionary::Initi
@@ -400,9 +399,6 @@ void SpellcheckHunspellDictionary::Initi
}
if (browser_context_) {

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

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

2
patches/core/inox-patchset/chromium-exclude_unwind_tables.patch
View File

@@ -1,6 +1,6 @@
--- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni
@@ -87,19 +87,19 @@ declare_args() {
@@ -82,19 +82,19 @@ declare_args() {
# is_component_build=false. Very large debug symbols can have unwanted side
# effects so this is enforced by default for chromium.
forbid_non_component_debug_builds = build_with_chromium

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

@@ -84,7 +84,7 @@ by default.
for tag_suffix in _TagSuffixes():
--- a/chrome/browser/chromeos/customization/customization_document.cc
+++ b/chrome/browser/chromeos/customization/customization_document.cc
@@ -175,7 +175,7 @@ std::string ReadFileInBackground(const b
@@ -172,7 +172,7 @@ std::string ReadFileInBackground(const b
// Template URL where to fetch OEM services customization manifest from.
const char ServicesCustomizationDocument::kManifestUrl[] =
@@ -95,9 +95,9 @@ by default.
// 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
@@ -1053,7 +1053,7 @@ void FileManagerPrivateInternalGetDownlo
@@ -1042,7 +1042,7 @@ void FileManagerPrivateInternalGetDownlo
IdentityManagerFactory::GetForProfile(chrome_details.GetProfile());
const std::string& account_id = identity_manager->GetPrimaryAccountId();
const CoreAccountId& account_id = identity_manager->GetPrimaryAccountId();
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");
@@ -106,7 +106,7 @@ by default.
content::BrowserContext::GetDefaultStoragePartition(
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -84,7 +84,7 @@ namespace {
@@ -82,7 +82,7 @@ namespace {
using api::file_manager_private::ProfileInfo;
@@ -188,9 +188,9 @@ by default.
}
ProfileAvatarDownloader::ProfileAvatarDownloader(
--- a/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js
@@ -87,9 +87,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = {
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
@@ -86,9 +86,9 @@ ChromeVoxPrefs.DEFAULT_PREFS = {
'position': '{}',
'siteSpecificEnhancements': true,
'siteSpecificScriptBase':
@@ -250,7 +250,7 @@ by default.
DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -263,7 +263,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -255,7 +255,7 @@ GURL SpellcheckHunspellDictionary::GetDi
DCHECK(!bdict_file.empty());
static const char kDownloadServerUrl[] =
@@ -294,7 +294,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
@@ -73,17 +73,17 @@ namespace {
@@ -78,17 +78,17 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if defined(OS_CHROMEOS)
@@ -332,7 +332,7 @@ by default.
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -246,7 +246,7 @@ const char kSyncErrorsHelpURL[] =
@@ -249,7 +249,7 @@ const char kSyncErrorsHelpURL[] =
"https://support.google.com/chrome/?p=settings_sync_error";
const char kSyncGoogleDashboardURL[] =
@@ -341,7 +341,7 @@ by default.
const char kSyncLearnMoreURL[] =
"https://support.google.com/chrome/?p=settings_sign_in";
@@ -350,7 +350,7 @@ const char kNaturalScrollHelpURL[] =
@@ -353,7 +353,7 @@ const char kNaturalScrollHelpURL[] =
const char kOemEulaURLPath[] = "oem";
const char kOnlineEulaURLPath[] =
@@ -523,7 +523,7 @@ by default.
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -230,10 +230,10 @@ void PasswordStore::GetLogins(const Form
@@ -239,10 +239,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 &&
@@ -551,7 +551,7 @@ by default.
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -3797,7 +3797,7 @@
@@ -3910,7 +3910,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -560,7 +560,7 @@ by default.
'id': 34,
'caption': '''Configure the list of force-installed apps and extensions''',
'tags': ['full-admin-access'],
@@ -8031,7 +8031,7 @@
@@ -8174,7 +8174,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -658,7 +658,7 @@ by default.
if (url.is_valid() && url.has_scheme())
--- a/extensions/browser/updater/safe_manifest_parser.cc
+++ b/extensions/browser/updater/safe_manifest_parser.cc
@@ -27,7 +27,7 @@ namespace {
@@ -28,7 +28,7 @@ namespace {
constexpr char kExpectedGupdateProtocol[] = "2.0";
constexpr char kExpectedGupdateXmlns[] =
@@ -784,28 +784,6 @@ by default.
const char kWebrtcTransportNamespace[] = "google:remoting:webrtc";
--- a/remoting/webapp/base/js/xmpp_login_handler.js
+++ b/remoting/webapp/base/js/xmpp_login_handler.js
@@ -295,7 +295,7 @@ remoting.XmppLoginHandler.prototype.star
'auth:allow-generated-jid="true" ' +
'auth:client-uses-full-bind-result="true" ' +
'auth:allow-non-google-login="true" ' +
- 'xmlns:auth="http://www.google.com/talk/protocol/auth">' +
+ 'xmlns:auth="trk:176:http://www.google.com/talk/protocol/auth">' +
cookie +
'</auth>');
};
--- a/remoting/webapp/crd/manifest.json.jinja2
+++ b/remoting/webapp/crd/manifest.json.jinja2
@@ -24,7 +24,7 @@
"client_id": "{{ REMOTING_IDENTITY_API_CLIENT_ID }}",
"scopes": [
{% if USE_GCD %}
- "https://www.googleapis.com/auth/clouddevices",
+ "trk:198:https://www.googleapis.com/auth/clouddevices",
{% endif %}
"https://www.googleapis.com/auth/chromoting",
"https://www.googleapis.com/auth/googletalk",
--- a/ui/views/examples/webview_example.cc
+++ b/ui/views/examples/webview_example.cc
@@ -25,7 +25,7 @@ void WebViewExample::CreateExampleView(V

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

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

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

@@ -35,15 +35,15 @@
GURL rewritten_tab_url = tab_url;
--- a/chromecast/browser/url_request_context_factory.cc
+++ b/chromecast/browser/url_request_context_factory.cc
@@ -39,6 +39,7 @@
#include "net/http/http_stream_factory.h"
@@ -40,6 +40,7 @@
#include "net/proxy_resolution/proxy_resolution_service.h"
#include "net/quic/quic_context.h"
#include "net/ssl/ssl_config_service_defaults.h"
+#include "net/url_request/trk_protocol_handler.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_context_getter.h"
@@ -245,13 +246,17 @@ void URLRequestContextFactory::Initializ
@@ -248,13 +249,17 @@ void URLRequestContextFactory::Initializ
new net::URLRequestJobFactoryImpl());
// Keep ProtocolHandlers added in sync with
// CastContentBrowserClient::IsHandledURL().
@@ -100,8 +100,8 @@
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
@@ -513,6 +513,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterWebSafeScheme(url::kHttpsScheme);
@@ -531,6 +531,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kFtpScheme);
RegisterWebSafeScheme(url::kDataScheme);
+ RegisterWebSafeScheme(url::kTraceScheme);
@@ -110,7 +110,7 @@
// TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1801,6 +1801,8 @@ component("net") {
@@ -1662,6 +1662,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -202,7 +202,7 @@
using base::Time;
using std::string;
@@ -592,6 +594,12 @@ URLRequest::URLRequest(const GURL& url,
@@ -579,6 +581,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -218,16 +218,16 @@
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -40,6 +40,7 @@
#include "net/quic/quic_stream_factory.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/static_http_user_agent_settings.h"
+#include "net/url_request/trk_protocol_handler.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
@@ -621,6 +622,9 @@ std::unique_ptr<URLRequestContext> URLRe
job_factory->SetProtocolHandler(url::kDataScheme,
std::make_unique<DataProtocolHandler>());
@@ -629,6 +630,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();
+ job_factory->SetProtocolHandler(url::kTraceScheme,
+ std::make_unique<TrkProtocolHandler>());
@@ -237,9 +237,9 @@
storage->set_ftp_auth_cache(std::make_unique<FtpAuthCache>());
--- a/url/url_constants.cc
+++ b/url/url_constants.cc
@@ -26,6 +26,7 @@ const char kHttpsScheme[] = "https";
const char kJavaScriptScheme[] = "javascript";
const char kMailToScheme[] = "mailto";
@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto";
// See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport
const char kQuicTransportScheme[] = "quic-transport";
const char kTelScheme[] = "tel";
+const char kTraceScheme[] = "trk";
const char kWsScheme[] = "ws";
@@ -247,9 +247,9 @@
--- a/url/url_constants.h
+++ b/url/url_constants.h
@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char
COMPONENT_EXPORT(URL) extern const char kJavaScriptScheme[];
@@ -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[];
+COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
COMPONENT_EXPORT(URL) extern const char kWsScheme[];
@@ -257,15 +257,16 @@
--- a/url/url_util.cc
+++ b/url/url_util.cc
@@ -52,6 +52,7 @@ struct SchemeRegistry {
kHttpsScheme,
kAboutScheme,
kDataScheme,
+ kTraceScheme,
kWssScheme,
@@ -49,7 +49,7 @@ struct SchemeRegistry {
// Schemes that do not trigger mixed content warning.
std::vector<std::string> secure_schemes = {
- kHttpsScheme, kAboutScheme, kDataScheme, kQuicTransportScheme, kWssScheme,
+ kHttpsScheme, kAboutScheme, kDataScheme, kTraceScheme, kQuicTransportScheme, kWssScheme,
};
@@ -67,6 +68,7 @@ struct SchemeRegistry {
// Schemes that normal pages cannot link to or access (i.e., with the same
@@ -64,6 +64,7 @@ struct SchemeRegistry {
kAboutScheme,
kJavaScriptScheme,
kDataScheme,

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

@@ -2,7 +2,7 @@
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -317,7 +317,7 @@ bool DomDistillerViewerSource::ShouldSer
@@ -295,7 +295,7 @@ bool DomDistillerViewerSource::ShouldSer
}
std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() {
@@ -24,10 +24,10 @@
.english :lang(zh) {display: none}
--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
@@ -130,7 +130,7 @@ function maybeSetWebFont() {
return;
@@ -132,7 +132,7 @@ function maybeSetWebFont() {
}
var e = document.createElement('link');
const e = document.createElement('link');
- e.href = 'https://fonts.googleapis.com/css?family=Roboto';
+ e.href = 'chrome://resources/css/roboto.css';
e.rel = 'stylesheet';

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

@@ -3,14 +3,14 @@
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -270,7 +270,6 @@
<include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" preprocess="true" />
<include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" preprocess="true" />
<include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
- <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_host\authenticator.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
@@ -173,7 +173,6 @@
<include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" compress="gzip" flattenhtml="true" allowexternalscript="true" type="BINDATA" preprocess="true" />
<include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" compress="gzip" flattenhtml="true" type="BINDATA" preprocess="true" />
<include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" compress="gzip" flattenhtml="true" type="BINDATA" />
- <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_host\authenticator.js" compress="gzip" flattenhtml="true" type="BINDATA" />
<include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" compress="gzip" flattenhtml="true" type="BINDATA" />
<include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" compress="gzip" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -52,7 +52,6 @@ content::WebUIDataSource* CreateWebUIDat
@@ -23,8 +23,8 @@
source->AddLocalizedString(
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -259,63 +259,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
int load_flags,
@@ -296,64 +296,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
network::mojom::CredentialsMode credentials_mode,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
-
@@ -32,7 +32,7 @@
- resource_request->url = gaia_gurl;
- original_url_ = gaia_gurl;
-
- if (!(load_flags & net::LOAD_DO_NOT_SEND_COOKIES)) {
- if (credentials_mode != network::mojom::CredentialsMode::kOmit) {
- DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url(), gaia_gurl.GetOrigin())
- << gaia_gurl;
- resource_request->site_for_cookies = GaiaUrls::GetInstance()->gaia_url();
@@ -55,13 +55,14 @@
- // maintain a separation between the user's browsing and Chrome's internal
- // services. Where such mixing is desired (MergeSession or OAuthLogin), it
- // will be done explicitly.
- resource_request->load_flags = load_flags;
- resource_request->credentials_mode = credentials_mode;
-
- url_loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
- traffic_annotation);
- if (!body.empty())
- url_loader_->AttachStringForUpload(body,
- "application/x-www-form-urlencoded");
- if (!body.empty()) {
- DCHECK(!body_content_type.empty());
- url_loader_->AttachStringForUpload(body, body_content_type);
- }
-
- url_loader_->SetAllowHttpErrorResults(true);
-

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() {
@@ -467,6 +467,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();
@@ -666,27 +667,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(
@@ -745,24 +725,6 @@ void GCMClientImpl::SetGServicesSettings
@@ -749,24 +729,6 @@ void GCMClientImpl::SetGServicesSettings
void GCMClientImpl::SchedulePeriodicCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());

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

@@ -50,12 +50,11 @@
}
void GoogleURLLoaderThrottle::WillRedirectRequest(
@@ -64,33 +30,6 @@ void GoogleURLLoaderThrottle::WillRedire
@@ -64,32 +30,6 @@ void GoogleURLLoaderThrottle::WillRedire
bool* /* defer */,
std::vector<std::string>* to_be_removed_headers,
net::HttpRequestHeaders* modified_headers) {
- network::mojom::URLResponseHeadPtr response_head_ptr = response_head;
- variations::RemoveVariationsHeaderIfNeeded(*redirect_info, *response_head_ptr,
- variations::RemoveVariationsHeaderIfNeeded(*redirect_info, response_head,
- to_be_removed_headers);
-
- // URLLoaderThrottles can only change the redirect URL when the network
@@ -84,9 +83,9 @@
}
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -98,17 +37,5 @@ void GoogleURLLoaderThrottle::WillProces
@@ -97,17 +37,5 @@ void GoogleURLLoaderThrottle::WillProces
const GURL& response_url,
network::ResourceResponseHead* response_head,
network::mojom::URLResponseHead* response_head,
bool* defer) {
- // Built-in additional protection for the chrome web store origin.
- GURL webstore_url(extension_urls::GetWebstoreLaunchURL());

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -337,7 +337,6 @@ if (!is_android && !is_mac) {
@@ -358,7 +358,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
@@ -1206,7 +1205,6 @@ if (is_win) {
@@ -1214,7 +1213,6 @@ if (is_win) {
":packed_resources",
":swiftshader_library",
":widevine_cdm_library",

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
@@ -519,23 +519,6 @@ GURL GetOSSettingsUrl(const std::string&
@@ -509,23 +509,6 @@ GURL GetOSSettingsUrl(const std::string&
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
void ShowBrowserSignin(Browser* browser,
signin_metrics::AccessPoint access_point) {

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

@@ -14,7 +14,7 @@
TranslateHelper::~TranslateHelper() {
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -679,8 +679,7 @@ void TranslateManager::FilterIsTranslate
@@ -692,8 +692,7 @@ void TranslateManager::FilterIsTranslate
TranslateBrowserMetrics::INITIATION_STATUS_NO_NETWORK);
}
@@ -36,4 +36,4 @@
+ &data_, "var securityOrigin = '';");
// Load embedded translate.js.
data_.append(ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/plugins/plugins_resource_service.cc
+++ b/chrome/browser/plugins/plugins_resource_service.cc
@@ -54,9 +54,6 @@ const int kStartResourceFetchDelayMs = 6
@@ -53,9 +53,6 @@ const int kStartResourceFetchDelayMs = 6
// Delay between calls to update the cache 1 day and 2 minutes in testing mode.
const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
@@ -12,7 +12,7 @@
GURL GetPluginsServerURL() {
std::string filename;
#if defined(OS_WIN)
@@ -71,7 +68,7 @@ GURL GetPluginsServerURL() {
@@ -70,7 +67,7 @@ GURL GetPluginsServerURL() {
#error Unknown platform
#endif
@@ -62,7 +62,7 @@
// Constructs a model loader to fetch a model using |url_loader_factory|.
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -338,7 +338,7 @@ FinancialPing::PingResponse FinancialPin
@@ -339,7 +339,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;
@@ -382,7 +382,7 @@ FinancialPing::PingResponse FinancialPin
@@ -383,7 +383,7 @@ FinancialPing::PingResponse FinancialPin
return PING_SUCCESSFUL;
#else
std::string url =

33
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
@@ -599,10 +599,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -601,10 +601,6 @@ std::vector<url::Origin> ChromeContentBr
GetOriginsRequiringDedicatedProcess() {
std::vector<url::Origin> list;
@@ -102,7 +102,7 @@
bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
DCHECK(loader);
@@ -310,12 +301,6 @@ void ExtensionDownloader::DoStartAllPend
@@ -308,12 +299,6 @@ void ExtensionDownloader::DoStartAllPend
ReportStats();
url_stats_ = URLStats();
@@ -115,7 +115,7 @@
fetches_preparing_.clear();
}
@@ -349,11 +334,6 @@ bool ExtensionDownloader::AddExtensionDa
@@ -347,11 +332,6 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -127,7 +127,7 @@
// Skip extensions with empty IDs.
if (id.empty()) {
DLOG(WARNING) << "Found extension with empty ID";
@@ -362,12 +342,10 @@ bool ExtensionDownloader::AddExtensionDa
@@ -360,12 +340,10 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -142,24 +142,7 @@
} else {
url_stats_.other_url_count++;
}
@@ -648,13 +626,9 @@ void ExtensionDownloader::OnManifestLoad
const int error =
response_code == -1 ? loader->NetError() : response_code;
const std::string uma_histogram_name =
- url.DomainIs(kGoogleDotCom)
- ? std::string(
- "Extensions."
- "ExtensionUpdaterFirstUpdateCheckErrorsGoogleUrl")
- : std::string(
- "Extensions."
- "ExtensionUpdaterFirstUpdateCheckErrorsNonGoogleUrl");
+ std::string(
+ "Extensions."
+ "ExtensionUpdaterFirstUpdateCheckErrorsNonGoogleUrl");
const auto& extension_ids =
manifests_queue_.active_request()->extension_ids();
for (auto it = extension_ids.begin(); it != extension_ids.end(); ++it) {
@@ -724,20 +698,6 @@ void ExtensionDownloader::HandleManifest
@@ -702,20 +680,6 @@ void ExtensionDownloader::HandleManifest
fetch_data->request_ids()));
}
@@ -177,10 +160,10 @@
- }
- }
-
NotifyExtensionsDownloadStageChanged(no_updates,
ExtensionDownloaderDelegate::FINISHED);
NotifyExtensionsDownloadStageChanged(
no_updates, ExtensionDownloaderDelegate::Stage::FINISHED);
NotifyExtensionsDownloadFailed(
@@ -1190,11 +1150,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -1193,11 +1157,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:

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

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

78
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
@@ -4900,19 +4900,7 @@ ChromeContentBrowserClient::GetSafeBrows
@@ -4901,19 +4901,7 @@ ChromeContentBrowserClient::GetSafeBrows
content::ResourceContext* resource_context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -68,7 +68,7 @@
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/common/chrome_paths.h"
@@ -328,75 +327,6 @@ class ReadPermissionGrantImpl
@@ -328,78 +327,6 @@ class ReadPermissionGrantImpl
PermissionStatus status_ = PermissionStatus::GRANTED;
};
@@ -133,6 +133,9 @@
-
- // This shouldn't be returned for Native File System write checks.
- case Result::ASYNC_SCANNING:
- case Result::SENSITIVE_CONTENT_WARNING:
- case Result::SENSITIVE_CONTENT_BLOCK:
- case Result::DEEP_SCANNED_SAFE:
- NOTREACHED();
- return ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult::
- kAllow;
@@ -144,7 +147,7 @@
} // namespace
ChromeNativeFileSystemPermissionContext::Grants::Grants() = default;
@@ -677,29 +607,6 @@ void ChromeNativeFileSystemPermissionCon
@@ -680,29 +607,6 @@ void ChromeNativeFileSystemPermissionCon
process_id, frame_id, std::move(callback)));
}
@@ -191,7 +194,7 @@
// method when grants stop being scoped to a frame.
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -24,7 +24,6 @@
@@ -25,7 +25,6 @@
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/prerender/prerender_contents.h"
#include "chrome/browser/profiles/profile.h"
@@ -199,7 +202,7 @@
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/site_isolation/site_isolation_policy.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -91,11 +90,11 @@
@@ -93,11 +92,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"
@@ -211,8 +214,8 @@
-#endif
#if defined(OS_ANDROID)
#include "chrome/browser/android/preferences/preferences_launcher.h"
@@ -539,6 +538,7 @@ bool ChromePasswordManagerClient::IsIsol
#include "chrome/browser/android/tab_android.h"
@@ -543,6 +542,7 @@ bool ChromePasswordManagerClient::IsIsol
return SiteIsolationPolicy::IsIsolationForPasswordSitesEnabled();
}
@@ -220,7 +223,7 @@
#if defined(ON_FOCUS_PING_ENABLED) || \
defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
safe_browsing::PasswordProtectionService*
@@ -561,6 +561,7 @@ void ChromePasswordManagerClient::CheckS
@@ -565,6 +565,7 @@ void ChromePasswordManagerClient::CheckS
}
}
#endif // defined(ON_FOCUS_PING_ENABLED)
@@ -228,7 +231,7 @@
#if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -568,24 +569,11 @@ void ChromePasswordManagerClient::CheckP
@@ -572,24 +573,11 @@ void ChromePasswordManagerClient::CheckP
const std::string& username,
const std::vector<std::string>& matching_domains,
bool password_field_exists) {
@@ -253,17 +256,17 @@
}
#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
@@ -692,7 +680,9 @@ void ChromePasswordManagerClient::OnInpu
@@ -710,7 +698,9 @@ void ChromePasswordManagerClient::OnInpu
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
OnPaste();
} else {
+#if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
password_reuse_detection_manager_.OnKeyPressed(key_event.text);
password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
+#endif // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
}
#endif // defined(OS_ANDROID)
}
@@ -806,9 +796,11 @@ void ChromePasswordManagerClient::OnPast
@@ -836,9 +826,11 @@ void ChromePasswordManagerClient::OnPast
base::string16 text;
clipboard->ReadText(ui::ClipboardBuffer::kCopyPaste, &text);
was_on_paste_called_ = true;
@@ -278,8 +281,8 @@
const gfx::RectF& bounds) {
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -181,7 +181,7 @@ class ChromePasswordManagerClient
void OnImeTextCommittedEvent(const base::string16& text_str) override;
@@ -184,7 +184,7 @@ class ChromePasswordManagerClient
void OnImeFinishComposingTextEvent() override;
#endif // defined(OS_ANDROID)
-#if defined(ON_FOCUS_PING_ENABLED)
@@ -289,7 +292,7 @@
safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
--- 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
@@ -36,34 +36,4 @@ void HandleOnPerformDrop(
@@ -37,35 +37,4 @@ void HandleOnPerformDrop(
content::WebContents* web_contents,
const content::DropData& drop_data,
content::WebContentsViewDelegate::DropCompletionCallback callback) {
@@ -322,19 +325,20 @@
-
- safe_browsing::DeepScanningDialogDelegate::ShowForWebContents(
- web_contents, std::move(data),
- base::BindOnce(&DeepScanCompletionCallback, std::move(callback)));
- base::BindOnce(&DeepScanCompletionCallback, std::move(callback)),
- safe_browsing::DeepScanAccessPoint::DRAG_AND_DROP);
}
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -1059,6 +1059,7 @@ void DownloadItemView::ShowDeepScanningD
deep_scanning_label_ = AddChildView(std::move(deep_scanning_label));
deep_scanning_label_->SetSize(AdjustTextAndGetSize(deep_scanning_label_));
@@ -1127,6 +1127,7 @@ void DownloadItemView::ShowDeepScanningD
},
base::Unretained(this))));
+#if BUILDFLAG(FULL_SAFE_BROWSING)
int delay_delivery = g_browser_process->local_state()->GetInteger(
prefs::kDelayDeliveryUntilVerdict);
if (delay_delivery != safe_browsing::DELAY_DOWNLOADS &&
@@ -1070,6 +1071,9 @@ void DownloadItemView::ShowDeepScanningD
@@ -1138,6 +1139,9 @@ void DownloadItemView::ShowDeepScanningD
} else {
open_button_->SetEnabled(false);
}
@@ -344,7 +348,7 @@
file_name_label_->SetVisible(false);
status_label_->SetVisible(false);
@@ -1357,6 +1361,8 @@ base::string16 DownloadItemView::ElidedF
@@ -1445,7 +1449,9 @@ base::string16 DownloadItemView::ElidedF
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -353,19 +357,21 @@
+#endif
should_open_while_scanning_ = true;
}
--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
@@ -147,9 +147,7 @@ PasswordReuseModalWarningDialog::Passwor
service_->AddObserver(this);
views::Label* message_body_label = CreateMessageBodyLabel(
- service_
- ? service_->GetWarningDetailText(password_type)
- : l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
+ l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
if (password_type.account_type() ==
ReusedPasswordAccountType::SAVED_PASSWORD) {
@@ -159,10 +159,7 @@ PasswordReuseModalWarningDialog::Passwor
placeholder_offsets);
} else {
views::Label* message_body_label = CreateMessageBodyLabel(
- service_
- ? service_->GetWarningDetailText(password_type,
- &placeholder_offsets)
- : l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
+ l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
CreateGaiaPasswordReuseModalWarningDialog(message_body_label);
}
}
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -78,8 +78,6 @@
@@ -375,9 +381,9 @@
-#include "components/safe_browsing/web_ui/constants.h"
-#include "components/safe_browsing/web_ui/safe_browsing_ui.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"
#include "content/public/browser/web_contents.h"
@@ -390,8 +388,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -414,8 +412,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<PredictorsUI>;
if (url.host_piece() == chrome::kChromeUIQuotaInternalsHost)
return &NewWebUI<QuotaInternalsUI>;
@@ -388,7 +394,7 @@
if (url.host_piece() == chrome::kChromeUISuggestionsHost)
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -296,7 +296,7 @@ void ContentPasswordManagerDriver::ShowT
@@ -309,7 +309,7 @@ void ContentPasswordManagerDriver::ShowT
void ContentPasswordManagerDriver::CheckSafeBrowsingReputation(
const GURL& form_action,
const GURL& frame_url) {
@@ -399,7 +405,7 @@
}
--- a/components/password_manager/core/browser/password_manager_client.h
+++ b/components/password_manager/core/browser/password_manager_client.h
@@ -273,7 +273,7 @@ class PasswordManagerClient {
@@ -279,7 +279,7 @@ class PasswordManagerClient {
// Returns the current best guess as to the page's display language.
virtual std::string GetPageLanguage() const;

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

File diff suppressed because it is too large Load Diff

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

@@ -3,23 +3,8 @@
# This also fixes local debugging with domain substitution
# Related comment: https://bugs.chromium.org/p/chromium/issues/detail?id=710701#c14
--- a/third_party/blink/renderer/devtools/BUILD.gn
+++ b/third_party/blink/renderer/devtools/BUILD.gn
@@ -1621,11 +1621,9 @@ if (!external_devtools_frontend) {
"$resources_out_dir/InspectorBackendCommands.js",
]
- # Bundle remote modules in ChromeOS.
- if (is_chromeos) {
+ # Always bundle remote modules.
grd_files += generated_remote_modules + devtools_emulated_devices_images +
lighthouse_locale_files
- }
inputs = grd_files + devtools_image_files
outfile = "$root_gen_dir/devtools/devtools_resources.grd"
--- a/third_party/blink/renderer/devtools/front_end/audits_worker.json
+++ b/third_party/blink/renderer/devtools/front_end/audits_worker.json
--- a/third_party/devtools-frontend/src/front_end/audits_worker.json
+++ b/third_party/devtools-frontend/src/front_end/audits_worker.json
@@ -1,6 +1,6 @@
{
"modules": [
@@ -28,9 +13,9 @@
+ { "name": "audits_worker" }
]
}
--- a/third_party/blink/renderer/devtools/front_end/devtools_app.json
+++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json
@@ -4,23 +4,23 @@
--- a/third_party/devtools-frontend/src/front_end/devtools_app.json
+++ b/third_party/devtools-frontend/src/front_end/devtools_app.json
@@ -4,16 +4,16 @@
{ "name": "inspector_main", "type": "autostart" },
{ "name": "mobile_throttling", "type": "autostart" },
@@ -50,33 +35,3 @@
{ "name": "har_importer" },
{ "name": "help" },
{ "name": "layers" },
{ "name": "layer_viewer" },
{ "name": "network" },
{ "name": "performance_monitor" },
- { "name": "product_registry_impl", "type": "remote" },
+ { "name": "product_registry_impl" },
{ "name": "resources" },
{ "name": "security" },
{ "name": "timeline" },
--- a/third_party/blink/renderer/devtools/front_end/shell.json
+++ b/third_party/blink/renderer/devtools/front_end/shell.json
@@ -21,7 +21,7 @@
{ "name": "changes" },
{ "name": "cm" },
- { "name": "cm_modes", "type": "remote" },
+ { "name": "cm_modes" },
{ "name": "color_picker" },
{ "name": "console" },
{ "name": "coverage" },
--- a/third_party/blink/renderer/devtools/front_end/worker_app.json
+++ b/third_party/blink/renderer/devtools/front_end/worker_app.json
@@ -10,7 +10,7 @@
{ "name": "help" },
{ "name": "layer_viewer" },
{ "name": "network" },
- { "name": "product_registry_impl", "type": "remote" },
+ { "name": "product_registry_impl" },
{ "name": "resources" },
{ "name": "timeline" },
{ "name": "timeline_model" }

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

@@ -9,17 +9,17 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2146,6 +2146,7 @@ jumbo_static_library("browser") {
@@ -2225,6 +2225,7 @@ jumbo_static_library("browser") {
"//third_party/metrics_proto",
"//third_party/re2",
"//third_party/smhasher:cityhash",
+ "//third_party/ungoogled:switches",
"//third_party/webrtc_overrides",
"//third_party/webrtc_overrides:init_webrtc",
"//third_party/webrtc_overrides:webrtc_component",
"//third_party/widevine/cdm:buildflags",
"//third_party/zlib",
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -148,6 +148,7 @@
@@ -150,6 +150,7 @@
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/forcedark/forcedark_switches.h"
#include "third_party/leveldatabase/leveldb_features.h"
@@ -27,7 +27,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/accessibility/accessibility_switches.h"
#include "ui/base/ui_base_features.h"
@@ -1461,6 +1462,14 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1451,6 +1452,14 @@ const FeatureEntry kFeatureEntries[] = {
"Force punycode hostnames",
"Force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs).",
kOsAll, SINGLE_VALUE_TYPE("force-punycode-hostnames")},
@@ -44,17 +44,17 @@
SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -205,6 +205,7 @@ jumbo_source_set("browser") {
@@ -208,6 +208,7 @@ jumbo_source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/sqlite",
+ "//third_party/ungoogled:switches",
"//third_party/webrtc/modules/desktop_capture:primitives",
"//third_party/webrtc/rtc_base:rtc_base",
"//third_party/webrtc_overrides:webrtc_component",
"//third_party/zlib",
"//third_party/zlib/google:zip",
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -220,6 +220,7 @@
@@ -225,6 +225,7 @@
#include "third_party/blink/public/common/page/launching_process_state.h"
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
#include "third_party/blink/public/public_buildflags.h"
@@ -62,18 +62,18 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/accessibility/accessibility_switches.h"
#include "ui/base/ui_base_switches.h"
@@ -3037,6 +3038,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3147,6 +3148,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLDraftExtensions,
switches::kEnableWebGLImageChromium,
switches::kEnableWebVR,
switches::kFileUrlPathAlias,
+ switches::kFingerprintingClientRectsNoise,
+ switches::kFingerprintingCanvasMeasureTextNoise,
switches::kForceDarkMode,
switches::kForceDeviceScaleFactor,
switches::kForceDisableWebRtcApmInAudioService,
switches::kForceDisplayColorProfile,
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -123,6 +123,7 @@ target(link_target_type, "child") {
@@ -125,6 +125,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
@@ -24,6 +24,7 @@
@@ -26,6 +26,7 @@
#include "services/network/public/cpp/network_switches.h"
#include "third_party/blink/public/common/features.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"
@@ -439,6 +440,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -447,6 +448,10 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kEnableAccessibilityObjectModel, true},
{wrf::EnableAllowSyncXHRInPageDismissal,
switches::kAllowSyncXHRInPageDismissal, true},
@@ -99,13 +99,13 @@
+ switches::kFingerprintingClientRectsNoise, true},
+ {wrf::EnableFingerprintingCanvasMeasureTextNoise,
+ switches::kFingerprintingCanvasMeasureTextNoise, true},
};
for (const auto& mapping : switchToFeatureMapping) {
if (command_line.HasSwitch(mapping.switch_name))
{wrf::EnableShadowDOMV0, switches::kWebComponentsV0Enabled, true},
{wrf::EnableCustomElementsV0, switches::kWebComponentsV0Enabled, true},
{wrf::EnableHTMLImports, switches::kWebComponentsV0Enabled, true},
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -229,6 +229,8 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableMergeBlockingNonBlockingPools(bool);
@@ -226,6 +226,8 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableTranslateService(bool);
BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
@@ -123,7 +123,7 @@
#include "base/time/time.h"
#include "cc/input/overscroll_behavior.h"
#include "cc/input/scroll_snap_data.h"
@@ -1236,6 +1237,14 @@ Range* Document::CreateRangeAdjustedToTr
@@ -1307,6 +1308,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>();
@@ -2791,6 +2800,15 @@ void Document::UpdateStyleAndLayoutTree(
@@ -2872,6 +2881,15 @@ void Document::UpdateStyleAndLayoutTree(
#if DCHECK_IS_ON()
AssertLayoutTreeUpdated(*this);
#endif
@@ -156,7 +156,7 @@
void Document::UpdateActiveStyle() {
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -414,6 +414,10 @@ class CORE_EXPORT Document : public Cont
@@ -416,6 +416,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -167,7 +167,7 @@
String visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -1934,6 +1938,9 @@ class CORE_EXPORT Document : public Cont
@@ -1968,6 +1972,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
@@ -1877,6 +1877,11 @@ DOMRectList* Element::getClientRects() {
@@ -1902,6 +1902,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
quads, *element_layout_object);
@@ -191,7 +191,7 @@
return DOMRectList::Create(quads);
}
@@ -1894,6 +1899,9 @@ DOMRect* Element::getBoundingClientRect(
@@ -1919,6 +1924,9 @@ DOMRect* Element::getBoundingClientRect(
DCHECK(element_layout_object);
GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -266,7 +266,7 @@
const TextDirection&,
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
@@ -818,9 +818,15 @@ TextMetrics* CanvasRenderingContext2D::m
@@ -821,9 +821,15 @@ TextMetrics* CanvasRenderingContext2D::m
else
direction = ToTextDirection(GetState().GetDirection(), canvas());
@@ -285,17 +285,17 @@
void CanvasRenderingContext2D::DrawTextInternal(
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1490,6 +1490,7 @@ jumbo_component("platform") {
@@ -1519,6 +1519,7 @@ jumbo_component("platform") {
"//third_party/emoji-segmenter",
"//third_party/icu",
"//third_party/libyuv",
+ "//third_party/ungoogled:switches",
"//third_party/webrtc/api:libjingle_logging_api",
"//third_party/webrtc/api:packet_socket_factory",
"//third_party/webrtc/api/audio_codecs/L16:audio_decoder_L16",
"//third_party/webrtc_overrides:webrtc_component",
"//third_party/zlib/google:compression_utils",
"//ui/base:base",
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -704,4 +704,12 @@ void WebRuntimeFeatures::EnableAccelerat
@@ -696,4 +696,12 @@ void WebRuntimeFeatures::EnableAccelerat
RuntimeEnabledFeatures::SetAcceleratedSmallCanvasesEnabled(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
@@ -693,6 +693,12 @@
@@ -724,6 +724,12 @@
name: "FileSystem",
status: "stable",
},

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

@@ -23,7 +23,7 @@ approach to change color components.
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1475,6 +1475,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1465,6 +1465,10 @@ const FeatureEntry kFeatureEntries[] = {
"Enable Canvas::measureText() fingerprint deception",
"Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.",
kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
@@ -36,28 +36,28 @@ approach to change color components.
SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3040,6 +3040,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3150,6 +3150,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
+ switches::kFingerprintingCanvasImageDataNoise,
switches::kForceDarkMode,
switches::kForceDeviceScaleFactor,
switches::kForceDisableWebRtcApmInAudioService,
switches::kForceDisplayColorProfile,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -444,6 +444,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -452,6 +452,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
+ {wrf::EnableFingerprintingCanvasImageDataNoise,
+ switches::kFingerprintingCanvasImageDataNoise, true},
};
for (const auto& mapping : switchToFeatureMapping) {
if (command_line.HasSwitch(mapping.switch_name))
{wrf::EnableShadowDOMV0, switches::kWebComponentsV0Enabled, true},
{wrf::EnableCustomElementsV0, switches::kWebComponentsV0Enabled, true},
{wrf::EnableHTMLImports, switches::kWebComponentsV0Enabled, true},
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -231,6 +231,7 @@ class WebRuntimeFeatures {
@@ -228,6 +228,7 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -67,7 +67,7 @@ approach to change color components.
BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1454,7 +1454,9 @@ jumbo_component("platform") {
@@ -1478,7 +1478,9 @@ jumbo_component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -80,7 +80,7 @@ approach to change color components.
":blink_platform_public_deps",
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -712,4 +712,8 @@ void WebRuntimeFeatures::EnableFingerpri
@@ -704,4 +704,8 @@ void WebRuntimeFeatures::EnableFingerpri
RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
}
@@ -91,16 +91,16 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
@@ -35,6 +35,8 @@
#include <memory>
@@ -36,6 +36,8 @@
#include "base/compiler_specific.h"
#include "base/memory/ptr_util.h"
+#include "base/rand_util.h"
+#include "base/logging.h"
#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
@@ -127,6 +129,11 @@ bool ImageDataBuffer::EncodeImageInterna
@@ -130,6 +132,11 @@ bool ImageDataBuffer::EncodeImageInterna
const SkPixmap& pixmap) const {
DCHECK(is_valid_);
@@ -123,12 +123,11 @@ approach to change color components.
#include "base/numerics/checked_math.h"
#include "gpu/command_buffer/client/gles2_interface.h"
#include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
@@ -11,12 +13,14 @@
@@ -11,11 +13,13 @@
#include "third_party/blink/renderer/platform/graphics/image_observer.h"
#include "third_party/blink/renderer/platform/graphics/paint/paint_image.h"
#include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkPaint.h"
@@ -138,7 +137,7 @@ approach to change color components.
#include "v8/include/v8.h"
namespace blink {
@@ -141,10 +145,165 @@ bool StaticBitmapImage::ConvertToArrayBu
@@ -117,9 +121,164 @@ bool StaticBitmapImage::CopyToByteArray(
DCHECK(read_pixels_successful ||
!sk_image->bounds().intersect(SkIRect::MakeXYWH(
rect.X(), rect.Y(), info.width(), info.height())));
@@ -147,7 +146,6 @@ approach to change color components.
+ ShuffleSubchannelColorData(result.Data(), info, rect.X(), rect.Y());
+ }
+
result.Transfer(dest_contents);
return true;
}
@@ -306,7 +304,7 @@ approach to change color components.
return sync_token;
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
@@ -44,6 +44,8 @@ class PLATFORM_EXPORT StaticBitmapImage
@@ -30,6 +30,8 @@ class PLATFORM_EXPORT StaticBitmapImage
static scoped_refptr<StaticBitmapImage> Create(sk_sp<SkData> data,
const SkImageInfo&);
@@ -317,7 +315,7 @@ approach to change color components.
// Methods overridden by all sub-classes
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -699,6 +699,9 @@
@@ -730,6 +730,9 @@
{
name: "FingerprintingCanvasMeasureTextNoise",
},

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

@@ -17,9 +17,9 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1981,6 +1981,7 @@ jumbo_static_library("browser") {
@@ -2062,6 +2062,7 @@ jumbo_static_library("browser") {
"//components/net_log",
"//components/network_hints/common",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
+ "//components/network_session_configurator/common",
"//components/network_time",
@@ -27,7 +27,7 @@ with limited CPU/memory resources and it is disabled by default.
"//components/offline_items_collection/core",
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -701,6 +701,11 @@ const FeatureEntry::Choice kForceEffecti
@@ -739,6 +739,11 @@ const FeatureEntry::Choice kForceEffecti
net::kEffectiveConnectionType4G},
};
@@ -39,7 +39,7 @@ with limited CPU/memory resources and it is disabled by default.
// Ensure that all effective connection types returned by Network Quality
// Estimator (NQE) are also exposed via flags.
static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
@@ -2449,6 +2454,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2440,6 +2445,9 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kAutofillCreditCardUploadDescription, kOsAll,
FEATURE_VALUE_TYPE(autofill::features::kAutofillUpstream)},
#endif // TOOLKIT_VIEWS || OS_ANDROID
@@ -74,10 +74,10 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/optimization_guide/optimization_guide_features.h"
#include "components/optimization_guide/optimization_guide_service.h"
@@ -131,6 +134,7 @@
#include "extensions/buildflags/buildflags.h"
@@ -132,6 +135,7 @@
#include "extensions/common/constants.h"
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "net/socket/client_socket_pool_manager.h"
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
@@ -103,9 +103,9 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1262,6 +1262,10 @@ const char kLookalikeUrlNavigationSugges
const char kMarkHttpAsName[] = "Mark non-secure origins as non-secure";
const char kMarkHttpAsDescription[] = "Change the UI treatment for HTTP pages";
@@ -1266,6 +1266,10 @@ extern const char kMediaInspectorLogging
"project; #enable-devtools-experiments must also be enabled as well on "
"desktop platforms";
+const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
+const char kMaxConnectionsPerHostDescription[] =
@@ -116,9 +116,9 @@ 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
@@ -767,6 +767,9 @@ extern const char kMarkHttpAsWarning[];
extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
@@ -766,6 +766,9 @@ extern const char kMarkHttpAsWarningAndD
extern const char kMediaInspectorLoggingName[];
extern const char kMediaInspectorLoggingDescription[];
+extern const char kMaxConnectionsPerHostName[];
+extern const char kMaxConnectionsPerHostDescription[];

2
patches/extra/debian/disable/fuzzers.patch
View File

@@ -15,7 +15,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"//testing/libfuzzer/fuzzers",
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -2404,12 +2404,6 @@ test("content_perftests") {
@@ -2308,12 +2308,6 @@ test("content_perftests") {
}
}

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
@@ -845,10 +845,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -855,10 +855,6 @@ void StartupBrowserCreatorImpl::AddInfoB
InfoBarService* infobar_service =
InfoBarService::FromWebContents(web_contents);

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

24
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
@@ -302,7 +302,7 @@ void BackgroundModeManager::RegisterPref
@@ -310,7 +310,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
@@ -1115,7 +1115,7 @@ void ChromeContentBrowserClient::Registe
@@ -1144,7 +1144,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -67,7 +67,7 @@
</cr-dialog>
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
@@ -150,7 +150,7 @@ void AccountConsistencyModeManager::Regi
@@ -118,7 +118,7 @@ void AccountConsistencyModeManager::Regi
registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
false);
#endif
@@ -94,7 +94,7 @@
registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -43,7 +43,7 @@ NavigationCorrectionTabObserver::~Naviga
@@ -57,7 +57,7 @@ void NavigationCorrectionTabObserver::Se
// static
void NavigationCorrectionTabObserver::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* prefs) {
@@ -129,7 +129,7 @@
prefs::kCloudPrintXmppPingEnabled, false);
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
@@ -136,10 +136,10 @@ const char kAutocompleteLastVersionReten
@@ -131,10 +131,10 @@ const char kAutocompleteLastVersionReten
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
registry->RegisterBooleanPref(
@@ -142,7 +142,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kAutofillLastVersionDeduped, 0,
@@ -152,7 +152,7 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -147,7 +147,7 @@ void RegisterProfilePrefs(user_prefs::Pr
prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
@@ -181,9 +181,9 @@
prefs::kCookieControlsMode,
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -155,10 +155,10 @@ void PasswordManager::RegisterProfilePre
registry->RegisterBooleanPref(prefs::kBlacklistedCredentialsNormalized,
false);
@@ -178,10 +178,10 @@ void AddLocallySavedPredictions(FieldInf
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
- prefs::kCredentialsEnableService, true,
+ prefs::kCredentialsEnableService, false,
@@ -207,13 +207,13 @@
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -365,14 +365,6 @@ bool Extension::ShouldDisplayInExtension
if (is_theme())
@@ -333,14 +333,6 @@ bool Extension::ShouldDisplayInExtension
if (type == Manifest::TYPE_THEME)
return false;
- // Hide component extensions because they are only extensions as an
- // implementation detail of Chrome.
- if (extensions::Manifest::IsComponentLocation(location()) &&
- if (Manifest::IsComponentLocation(location) &&
- !base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kShowComponentExtensionOptions)) {
- return false;

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

@@ -191,7 +191,7 @@
const PrepopulatedEngine* const engines_CZ[] = {
+ &duckduckgo,
&google,
&seznam,
&seznam_cz,
&bing,
@@ -211,30 +219,31 @@ const PrepopulatedEngine* const engines_

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/startup/startup_tab_provider.cc
+++ b/chrome/browser/ui/startup/startup_tab_provider.cc
@@ -45,7 +45,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
@@ -46,7 +46,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
// Chrome OS has its own welcome flow provided by OOBE.

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

4
patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch
View File

@@ -14,8 +14,8 @@ Out with all those tracking cookies!
// WARNING: The string names of the permissions passed in below are used to
// generate preference names and should never be changed!
- Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_ALLOW,
+ Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY,
- Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_ALLOW,
+ Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY,
WebsiteSettingsInfo::SYNCABLE,
WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,

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
@@ -660,7 +660,7 @@ static base::mac::ScopedObjCClassSwizzle
@@ -661,7 +661,7 @@ static base::mac::ScopedObjCClassSwizzle
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1430,6 +1430,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1420,6 +1420,10 @@ const FeatureEntry kFeatureEntries[] = {
"Enable stacking in tab strip",
"Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
@@ -15,7 +15,7 @@
SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -153,9 +153,10 @@ ChromeRenderFrameObserver::ChromeRenderF
@@ -152,9 +152,10 @@ ChromeRenderFrameObserver::ChromeRenderF
if (!render_frame->IsMainFrame())
return;
@@ -72,7 +72,7 @@
#include "base/debug/crash_logging.h"
#include "base/format_macros.h"
#include "base/metrics/histogram_macros.h"
@@ -200,6 +201,12 @@ bool IsCreatedByExtension(const Template
@@ -199,6 +200,12 @@ bool IsCreatedByExtension(const Template
template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
}
@@ -85,15 +85,15 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -285,6 +292,7 @@ TemplateURLService::TemplateURLService(
rappor::RapporServiceImpl* rappor_service,
@@ -283,6 +290,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::Closure& dsp_change_callback)
: prefs_(prefs),
+ should_autocollect_(true),
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
client_(std::move(client)),
@@ -349,7 +357,7 @@ bool TemplateURLService::CanAddAutogener
@@ -346,7 +354,7 @@ bool TemplateURLService::CanAddAutogener
if (existing_url) {
// We already have a TemplateURL for this keyword. Only allow it to be
// replaced if the TemplateURL can be replaced.
@@ -102,7 +102,7 @@
}
// We don't have a TemplateURL with keyword. We still may not allow this
@@ -358,8 +366,8 @@ bool TemplateURLService::CanAddAutogener
@@ -355,8 +363,8 @@ bool TemplateURLService::CanAddAutogener
// that may interfere with search queries). An easy heuristic for this is
// whether the user has a TemplateURL that has been manually modified (e.g.,
// renamed) connected to the same host.
@@ -113,7 +113,7 @@
}
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
@@ -1407,6 +1415,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -1396,6 +1404,8 @@ SyncDataMap TemplateURLService::CreateGU
void TemplateURLService::Init(const Initializer* initializers,
int num_initializers) {
@@ -122,7 +122,7 @@
if (client_)
client_->SetOwner(this);
@@ -1631,6 +1641,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -1620,6 +1630,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -132,7 +132,7 @@
const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
if (!urls)
return true;
@@ -1641,7 +1654,8 @@ bool TemplateURLService::CanAddAutogener
@@ -1630,7 +1643,8 @@ bool TemplateURLService::CanAddAutogener
}
bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {
@@ -144,7 +144,7 @@
TemplateURL* TemplateURLService::FindNonExtensionTemplateURLForKeyword(
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -733,6 +733,8 @@ class TemplateURLService : public WebDat
@@ -728,6 +728,8 @@ class TemplateURLService : public WebDat
// ---------- Browser state related members ---------------------------------
PrefService* prefs_ = nullptr;

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

@@ -3,7 +3,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -241,6 +241,16 @@ const unsigned kOsDesktop = kOsMac | kOs
@@ -243,6 +243,16 @@ const unsigned kOsDesktop = kOsMac | kOs
const unsigned kOsAura = kOsWin | kOsLinux | kOsCrOS;
#endif // USE_AURA || OS_ANDROID
@@ -20,7 +20,7 @@
const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
{flags_ui::kGenericExperimentChoiceEnabled,
@@ -1412,6 +1422,10 @@ const FeatureEntry::Choice kEnableCrOSAc
@@ -1402,6 +1412,10 @@ const FeatureEntry::Choice kEnableCrOSAc
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -107,7 +107,7 @@
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
@@ -169,6 +170,13 @@ bool ExtensionManagement::IsInstallation
@@ -189,6 +190,13 @@ bool ExtensionManagement::IsInstallation
bool ExtensionManagement::IsOffstoreInstallAllowed(
const GURL& url,
const GURL& referrer_url) const {

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1434,6 +1434,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1424,6 +1424,10 @@ const FeatureEntry kFeatureEntries[] = {
"Disable search engine collection",
"Prevents search engines from being added automatically.",
kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
@@ -23,17 +23,17 @@
#include "base/lazy_instance.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
@@ -244,6 +245,13 @@ IDNConversionResult IDNToUnicodeWithAdju
input16.reserve(host.length());
input16.insert(input16.end(), host.begin(), host.end());
@@ -267,6 +268,13 @@ IDNConversionResult IDNToUnicodeWithAdju
host16.reserve(host.length());
host16.insert(host16.end(), host.begin(), host.end());
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("force-punycode-hostnames")) {
+ // Leave as punycode.
+ IDNConversionResult result;
+ result.result = input16;
+ result.result = host16;
+ return result;
+ }
+
bool is_tld_ascii = true;
size_t last_dot = host.rfind('.');
if (last_dot != base::StringPiece::npos &&
// Compute the top level domain to be used in spoof checks later.
base::StringPiece top_level_domain;
base::string16 top_level_domain_unicode;

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

@@ -3,13 +3,13 @@
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -816,7 +816,8 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -827,7 +827,8 @@ void StartupBrowserCreatorImpl::AddInfoB
if (!browser || !profile_ || browser->tab_strip_model()->count() == 0)
return;
- if (HasPendingUncleanExit(browser->profile())) {
- if (HasPendingUncleanExit(browser->profile()))
+ if (HasPendingUncleanExit(browser->profile()) &&
+ !command_line_.HasSwitch("hide-crashed-bubble")) {
SessionCrashedBubble::Show(browser);
}
+ !command_line_.HasSwitch("hide-crashed-bubble"))
SessionCrashedBubble::ShowIfNotOffTheRecordProfile(browser);
bool show_bad_flags_security_warnings = ShouldShowBadFlagsSecurityWarnings();

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -264,6 +264,16 @@ const FeatureEntry::Choice kShowAvatarBu
@@ -266,6 +266,16 @@ const FeatureEntry::Choice kShowAvatarBu
"never"}
};
@@ -17,7 +17,7 @@
const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
{flags_ui::kGenericExperimentChoiceEnabled,
@@ -3642,6 +3652,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3630,6 +3640,11 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
autofill::features::kAutofillEnableAccountWalletStorage)},
@@ -67,9 +67,9 @@
+ scroll_event_changes_tab_ = ShouldScrollChangesTab();
+}
BrowserRootView::~BrowserRootView() = default;
@@ -244,7 +259,7 @@ const char* BrowserRootView::GetClassNam
BrowserRootView::~BrowserRootView() {
// It's possible to destroy the browser while a drop is active. In this case,
@@ -251,7 +266,7 @@ const char* BrowserRootView::GetClassNam
}
bool BrowserRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -251,6 +251,19 @@ const FeatureEntry::Choice kExtensionHan
@@ -253,6 +253,19 @@ const FeatureEntry::Choice kExtensionHan
"always-prompt-for-install"},
};
@@ -20,7 +20,7 @@
const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
{flags_ui::kGenericExperimentChoiceEnabled,
@@ -3739,6 +3752,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3724,6 +3737,11 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(arc::kEnableUnifiedAudioFocusFeature)},
#endif // defined(OS_CHROMEOS)
@@ -34,7 +34,7 @@
flag_descriptions::kUseAngleDescription, kOsWin,
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -265,6 +265,15 @@ void ToolbarView::Init() {
@@ -217,6 +217,15 @@ void ToolbarView::Init() {
std::unique_ptr<ToolbarAccountIconContainerView>
toolbar_account_icon_container;
@@ -50,7 +50,7 @@
bool show_avatar_toolbar_button = true;
if (base::FeatureList::IsEnabled(
autofill::features::kAutofillEnableToolbarStatusChip)) {
@@ -276,11 +285,17 @@ void ToolbarView::Init() {
@@ -228,11 +237,17 @@ void ToolbarView::Init() {
} else {
#if defined(OS_CHROMEOS)
// ChromeOS only badges Incognito and Guest icons in the browser window.

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1412,6 +1412,10 @@ const FeatureEntry::Choice kEnableCrOSAc
@@ -1402,6 +1402,10 @@ const FeatureEntry::Choice kEnableCrOSAc
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -15,7 +15,7 @@
SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -69,14 +69,13 @@ using content::WebContents;
@@ -71,14 +71,13 @@ using content::WebContents;
namespace {
bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {

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

@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/containers/linked_list.h"
#include "base/debug/debugger.h"
@@ -123,11 +124,6 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -128,11 +129,6 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -23,12 +23,12 @@
enum DnsResolveStatus {
RESOLVE_STATUS_DNS_SUCCESS = 0,
RESOLVE_STATUS_PROC_SUCCESS,
@@ -3270,7 +3266,7 @@ bool HostResolverManager::IsIPv6Reachabl
@@ -3565,7 +3561,7 @@ bool HostResolverManager::IsIPv6Reachabl
if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) {
last_ipv6_probe_result_ =
- IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log);
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("set-ipv6-probe-false");
last_ipv6_probe_time_ = tick_clock_->NowTicks();
SetLastIPv6ProbeResult(
- IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log));
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("set-ipv6-probe-false"));
cached = false;
}
net_log.AddEvent(

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

@@ -130,7 +130,7 @@
bool EditSearchEngineController::IsKeywordValid(
const base::string16& keyword_input) const {
base::string16 keyword_input_trimmed(
@@ -81,10 +90,12 @@ bool EditSearchEngineController::IsKeywo
@@ -88,10 +97,12 @@ bool EditSearchEngineController::IsKeywo
void EditSearchEngineController::AcceptAddOrEdit(
const base::string16& title_input,
const base::string16& keyword_input,
@@ -144,7 +144,7 @@
TemplateURLService* template_url_service =
TemplateURLServiceFactory::GetForProfile(profile_);
@@ -112,7 +123,8 @@ void EditSearchEngineController::AcceptA
@@ -119,7 +130,8 @@ void EditSearchEngineController::AcceptA
} else {
// Adding or modifying an entry via the Delegate.
edit_keyword_delegate_->OnEditedKeyword(template_url_, title_input,
@@ -417,7 +417,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -608,7 +608,8 @@ void TemplateURLService::IncrementUsageC
@@ -605,7 +605,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const base::string16& title,
const base::string16& keyword,
@@ -427,7 +427,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -622,6 +623,7 @@ void TemplateURLService::ResetTemplateUR
@@ -619,6 +620,7 @@ void TemplateURLService::ResetTemplateUR
}
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
@@ -435,7 +435,7 @@
Update(url, TemplateURL(data));
}
@@ -1991,7 +1993,7 @@ TemplateURL* TemplateURLService::Add(std
@@ -1980,7 +1982,7 @@ TemplateURL* TemplateURLService::Add(std
// Neither engine can be replaced. Uniquify the existing keyword.
base::string16 new_keyword = UniquifyKeyword(*existing_turl, false);
ResetTemplateURL(existing_turl, existing_turl->short_name(),
@@ -446,7 +446,7 @@
}
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -252,7 +252,8 @@ class TemplateURLService : public WebDat
@@ -247,7 +247,8 @@ class TemplateURLService : public WebDat
void ResetTemplateURL(TemplateURL* url,
const base::string16& title,
const base::string16& keyword,

4
patches/extra/ungoogled-chromium/default-to-https-scheme.patch
View File

@@ -8,7 +8,7 @@
--- a/chrome/browser/resources/bookmarks/edit_dialog.js
+++ b/chrome/browser/resources/bookmarks/edit_dialog.js
@@ -95,7 +95,7 @@ Polymer({
@@ -111,7 +111,7 @@ Polymer({
/**
* Validates the value of the URL field, returning true if it is a valid URL.
@@ -17,7 +17,7 @@
* @return {boolean}
* @private
*/
@@ -107,7 +107,7 @@ Polymer({
@@ -123,7 +123,7 @@ Polymer({
return true;
}

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
@@ -433,14 +433,14 @@ bool IDNToUnicodeOneComponent(const base
@@ -460,14 +460,14 @@ bool IDNToUnicodeOneComponent(const base
} // 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
@@ -96,9 +96,7 @@ void IntranetRedirectDetector::FinishSle
@@ -115,9 +115,7 @@ void IntranetRedirectDetector::FinishSle
simple_loaders_.clear();
resulting_origins_.clear();

2
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
@@ -3347,16 +3347,14 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3343,16 +3343,14 @@ ScriptValue WebGLRenderingContextBase::g
return ScriptValue::CreateNull(script_state->GetIsolate());
case WebGLDebugRendererInfo::kUnmaskedRendererWebgl:
if (ExtensionEnabled(kWebGLDebugRendererInfoName))

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -377,12 +377,6 @@ int GetContentRestrictions(const Browser
@@ -382,12 +382,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -15,7 +15,7 @@
if (current_tab->ShowingInterstitialPage())
content_restrictions |= CONTENT_RESTRICTION_PRINT;
}
@@ -1026,8 +1020,7 @@ bool CanSavePage(const Browser* browser)
@@ -1055,8 +1049,7 @@ bool CanSavePage(const Browser* browser)
prefs::kAllowFileSelectionDialogs)) {
return false;
}
@@ -66,7 +66,7 @@
// These lists are lazily initialized below and are leaked on shutdown to
--- a/content/public/common/url_utils.cc
+++ b/content/public/common/url_utils.cc
@@ -25,11 +25,7 @@ bool HasWebUIScheme(const GURL& url) {
@@ -28,11 +28,7 @@ bool HasWebUIScheme(const GURL& url) {
}
bool IsSavableURL(const GURL& url) {

2
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
@@ -3046,15 +3046,12 @@ void TabStrip::ButtonPressed(views::Butt
@@ -3219,15 +3219,12 @@ void TabStrip::ButtonPressed(views::Butt
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {

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

@@ -2,7 +2,7 @@
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -279,7 +279,7 @@ WindowOpenDisposition RenderViewImpl::Na
@@ -275,7 +275,7 @@ WindowOpenDisposition RenderViewImpl::Na
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

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

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

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

@@ -211,7 +211,7 @@
+ &searx,
&duckduckgo,
&google,
&seznam,
&seznam_cz,
@@ -219,6 +240,7 @@ const PrepopulatedEngine* const engines_
// Germany