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

Update to Chromium 96.0.4664.45 (#1732)

Browse Source
This commit is contained in:
Ahrotahn
2021-11-17 11:48:41 -06:00
committed by GitHub
parent 9b30a58fc3
commit 6c5eb7d44f
63 changed files with 2046 additions and 1991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
95.0.4638.69
96.0.4664.45

469
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

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

@@ -67,7 +67,7 @@ Subject: Disable fetching of all field trials
/* Alphabetical: */
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net:
@@ -238,17 +238,7 @@ bool GetInstanceManipulations(const net:
// Variations seed fetching is only enabled in official Chrome builds, if a URL
// is specified on the command line, and for testing.
bool IsFetchingEnabled() {

110
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
@@ -2180,7 +2180,6 @@ static_library("browser") {
@@ -2195,7 +2195,6 @@ static_library("browser") {
"//components/reputation/core:proto",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -8,7 +8,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3660,8 +3659,6 @@ static_library("browser") {
@@ -3706,8 +3705,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -30,7 +30,7 @@
namespace subresource_filter {
class RulesetService;
}
@@ -214,9 +210,6 @@ class BrowserProcess {
@@ -218,9 +214,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -50,7 +50,7 @@
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -392,8 +391,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -395,8 +394,6 @@ void BrowserProcessImpl::StartTearDown()
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if BUILDFLAG(ENABLE_PLUGINS)
plugins_resource_service_.reset();
@@ -1023,14 +1020,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1030,14 +1027,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -74,7 +74,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1295,26 +1284,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1300,26 +1289,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -103,7 +103,7 @@
created_subresource_filter_ruleset_service_ = true;
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -186,7 +186,6 @@ class BrowserProcessImpl : public Browse
@@ -190,7 +190,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> manager) override;
#endif
StatusTray* status_tray() override;
@@ -111,7 +111,7 @@
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
federated_learning::FlocSortingLshClustersService*
@@ -340,9 +339,6 @@ class BrowserProcessImpl : public Browse
@@ -344,9 +343,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -131,7 +131,7 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/share/share_history.h"
#include "chrome/browser/share/share_ranking.h"
@@ -662,10 +661,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate::
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -144,7 +144,7 @@
delete_begin, delete_end, filter_builder, host_content_settings_map_,
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -916,30 +916,6 @@ void SetApplicationLocaleOnIOThread(cons
@@ -921,34 +921,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}
@@ -158,6 +158,12 @@
- content::WebContents* web_contents)
- : service_(CertificateReportingServiceFactory::GetForBrowserContext(
- web_contents->GetBrowserContext())) {}
-
- CertificateReportingServiceCertReporter(
- const CertificateReportingServiceCertReporter&) = delete;
- CertificateReportingServiceCertReporter& operator=(
- const CertificateReportingServiceCertReporter&) = delete;
-
- ~CertificateReportingServiceCertReporter() override {}
-
- // SSLCertReporter implementation
@@ -168,14 +174,12 @@
-
- private:
- CertificateReportingService* service_;
-
- DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceCertReporter);
-};
-
#if BUILDFLAG(ENABLE_EXTENSIONS)
AppLoadedInTabSource ClassifyAppLoadedInTabSource(
@@ -1356,7 +1332,6 @@ void ChromeContentBrowserClient::PostAft
@@ -1423,7 +1395,6 @@ void ChromeContentBrowserClient::PostAft
InitNetworkContextsParentDirectory();
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -183,7 +187,7 @@
}
bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
@@ -4059,7 +4034,7 @@ ChromeContentBrowserClient::CreateThrott
@@ -4229,7 +4200,7 @@ ChromeContentBrowserClient::CreateThrott
content::WebContents* web_contents = handle->GetWebContents();
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
@@ -192,7 +196,7 @@
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
base::BindOnce(
&ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
@@ -4088,15 +4063,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -4258,15 +4229,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -233,7 +237,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -396,13 +396,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
@@ -436,13 +436,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm;
@@ -247,7 +251,7 @@
}
#if defined(OS_ANDROID)
@@ -749,16 +742,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -791,16 +784,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename) {
@@ -266,7 +270,7 @@
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -87,7 +87,7 @@ class DownloadItemModelData : public bas
@@ -86,7 +86,7 @@ class DownloadItemModelData : public bas
// Danger level of the file determined based on the file type and whether
// there was a user action associated with the download.
@@ -275,7 +279,7 @@
// Whether the download is currently being revived.
bool is_being_revived_;
@@ -124,7 +124,7 @@ DownloadItemModelData::DownloadItemModel
@@ -123,7 +123,7 @@ DownloadItemModelData::DownloadItemModel
: should_show_in_shelf_(true),
was_ui_notified_(false),
should_prefer_opening_in_browser_(false),
@@ -284,7 +288,7 @@
is_being_revived_(false) {}
} // namespace
@@ -378,13 +378,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -381,13 +381,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -301,7 +305,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -593,9 +593,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -599,9 +599,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -313,7 +317,7 @@
return !download_->IsSavePackageDownload() &&
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -259,14 +259,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
@@ -260,14 +260,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
@@ -329,7 +333,7 @@
}
}
@@ -474,10 +467,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -475,10 +468,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -397,7 +401,7 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1271,9 +1270,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1274,9 +1273,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@@ -407,7 +411,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::unique_ptr<downloads::AcceptDanger::Params> params(
downloads::AcceptDanger::Params::Create(args()));
@@ -1311,42 +1307,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1314,42 +1310,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -461,7 +465,7 @@
#include "chrome/common/extensions/api/downloads.h"
#include "components/download/content/public/all_download_item_notifier.h"
#include "components/download/public/common/download_path_reservation_tracker.h"
@@ -187,26 +186,16 @@ class DownloadsRemoveFileFunction : publ
@@ -199,13 +198,6 @@ class DownloadsRemoveFileFunction : publ
class DownloadsAcceptDangerFunction : public ExtensionFunction {
public:
@@ -474,7 +478,8 @@
-
DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER)
DownloadsAcceptDangerFunction();
ResponseAction Run() override;
@@ -217,13 +209,10 @@ class DownloadsAcceptDangerFunction : pu
protected:
~DownloadsAcceptDangerFunction() override;
@@ -485,9 +490,9 @@
void PromptOrWait(int download_id, int retries);
- static OnPromptCreatedCallback* on_prompt_created_;
DISALLOW_COPY_AND_ASSIGN(DownloadsAcceptDangerFunction);
};
class DownloadsShowFunction : public ExtensionFunction {
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
@@ -54,38 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct
@@ -531,7 +536,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
@@ -681,18 +681,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -683,18 +683,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -550,7 +555,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1157,52 +1145,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1159,52 +1147,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -667,7 +672,7 @@
std::unique_ptr<std::string> response_body) {
--- a/chrome/browser/extensions/blocklist_state_fetcher.h
+++ b/chrome/browser/extensions/blocklist_state_fetcher.h
@@ -34,8 +34,6 @@ class BlocklistStateFetcher {
@@ -37,8 +37,6 @@ class BlocklistStateFetcher {
virtual void Request(const std::string& id, RequestCallback callback);
@@ -676,7 +681,7 @@
protected:
void OnURLLoaderComplete(network::SimpleURLLoader* url_loader,
std::unique_ptr<std::string> response_body);
@@ -54,7 +52,6 @@ class BlocklistStateFetcher {
@@ -57,7 +55,6 @@ class BlocklistStateFetcher {
void SendRequest(const std::string& id);
@@ -686,7 +691,7 @@
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -823,9 +823,6 @@ void ChromeMetricsServiceClient::Registe
@@ -828,9 +828,6 @@ void ChromeMetricsServiceClient::Registe
metrics_service_->RegisterMetricsProvider(
std::make_unique<HttpsEngagementMetricsProvider>());
@@ -710,7 +715,7 @@
// static
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -294,7 +294,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -297,7 +297,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(IS_CHROMEOS_LACROS)
CertDbInitializerFactory::GetInstance();
#endif
@@ -725,10 +730,10 @@
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/sessions/exit_type_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/signin/signin_ui_util.h"
@@ -658,17 +657,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -627,17 +626,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -768,7 +773,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -86,6 +87,7 @@ static_library("safe_browsing") {
@@ -88,6 +89,7 @@ static_library("safe_browsing") {
"//extensions/browser",
]
}
@@ -776,7 +781,7 @@
if (safe_browsing_mode != 0) {
# "Safe Browsing Basic" files used for safe browsing in full mode
@@ -410,6 +412,7 @@ static_library("advanced_protection") {
@@ -411,6 +413,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -784,7 +789,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -426,6 +429,7 @@ source_set("metrics_collector") {
@@ -428,6 +431,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -886,7 +891,7 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -3885,7 +3885,6 @@ static_library("ui") {
@@ -3946,7 +3946,6 @@ static_library("ui") {
"views/device_chooser_content_view.h",
"views/devtools_process_observer.cc",
"views/devtools_process_observer.h",
@@ -896,7 +901,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -318,16 +318,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -330,16 +330,6 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -932,8 +937,8 @@
- ShowDangerPrompt(file);
}
void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
@@ -319,12 +315,6 @@ void DownloadsDOMHandler::RemoveDownload
void DownloadsDOMHandler::AcceptIncognitoWarning(const std::string& id) {
@@ -325,12 +321,6 @@ void DownloadsDOMHandler::RemoveDownload
IdSet ids;
for (auto* download : to_remove) {
@@ -946,7 +951,7 @@
DownloadItemModel item_model(download);
if (!item_model.ShouldShowInShelf() ||
download->GetState() == download::DownloadItem::IN_PROGRESS) {
@@ -398,44 +388,6 @@ void DownloadsDOMHandler::FinalizeRemova
@@ -404,44 +394,6 @@ void DownloadsDOMHandler::FinalizeRemova
}
}
@@ -1001,7 +1006,7 @@
#include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h"
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
#include "content/public/browser/web_contents_observer.h"
@@ -89,18 +88,6 @@ class DownloadsDOMHandler : public conte
@@ -94,18 +93,6 @@ class DownloadsDOMHandler : public conte
// null-checking |original_notifier_|.
content::DownloadManager* GetOriginalNotifierManager() const;
@@ -1022,7 +1027,7 @@
bool IsDeletingHistoryAllowed();
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -279,117 +279,6 @@ CreateHttpsOnlyModePage(content::WebCont
@@ -281,116 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont
request_url));
}
@@ -1063,8 +1068,6 @@
- resource.is_subresource = request_url != main_frame_url;
- resource.is_subframe = false;
- resource.threat_type = threat_type;
- resource.web_contents_getter =
- security_interstitials::GetWebContentsGetter(primary_main_frame_id);
- resource.render_process_id = primary_main_frame_id.child_id;
- resource.render_frame_id = primary_main_frame_id.frame_routing_id;
- resource.threat_source = g_browser_process->safe_browsing_service()
@@ -1112,14 +1115,15 @@
- is_giant_webview = true;
- }
- }
- const content::GlobalRenderFrameHostId primary_main_frame_id =
- web_contents->GetMainFrame()->GetGlobalId();
- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
- resource.url = request_url;
- resource.is_subresource = request_url != main_frame_url;
- resource.is_subframe = false;
- resource.threat_type = threat_type;
- resource.web_contents_getter = security_interstitials::GetWebContentsGetter(
- web_contents->GetMainFrame()->GetProcess()->GetID(),
- web_contents->GetMainFrame()->GetRoutingID());
- resource.render_process_id = primary_main_frame_id.child_id;
- resource.render_frame_id = primary_main_frame_id.frame_routing_id;
- resource.threat_source = g_browser_process->safe_browsing_service()
- ->database_manager()
- ->GetThreatSource();
@@ -1140,7 +1144,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -506,8 +395,6 @@ void InterstitialHTMLSource::StartDataRe
@@ -507,8 +397,6 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
} else if (path_without_query == "/legacy-tls") {
interstitial_delegate = CreateLegacyTLSBlockingPage(web_contents);
@@ -1149,7 +1153,7 @@
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -524,16 +411,12 @@ void InterstitialHTMLSource::StartDataRe
@@ -525,16 +413,12 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
}

2
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
@@ -825,96 +825,6 @@ std::tuple<GURL, std::string> AutofillDo
@@ -824,96 +824,6 @@ std::tuple<GURL, std::string> AutofillDo
}
bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {

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

@@ -22,7 +22,7 @@
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -526,18 +521,6 @@ void ComponentLoader::AddDefaultComponen
@@ -495,18 +490,6 @@ void ComponentLoader::AddDefaultComponen
AddHangoutServicesExtension();
#endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
@@ -55,7 +55,7 @@
{
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -556,20 +556,6 @@ void WebstoreInstaller::DownloadNextPend
@@ -555,20 +555,6 @@ void WebstoreInstaller::DownloadNextPend
void WebstoreInstaller::DownloadCrx(
const std::string& extension_id,
InstallSource source) {
@@ -76,7 +76,7 @@
}
// http://crbug.com/165634
@@ -713,21 +699,6 @@ void WebstoreInstaller::UpdateDownloadPr
@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!crx_installer_.get());

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

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

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

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

@@ -101,7 +101,7 @@ by default.
constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold =
--- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -46,8 +46,8 @@ namespace {
@@ -52,8 +52,8 @@ namespace {
const char kGoogleDotCom[] = "google.com";
constexpr const char* kGoogleGstaticAppIds[] = {
@@ -192,7 +192,7 @@ by default.
--- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc
@@ -200,7 +200,7 @@ const int64_t DownloadFeedback::kMaxUplo
@@ -202,7 +202,7 @@ const int64_t DownloadFeedback::kMaxUplo
// static
const char DownloadFeedback::kSbFeedbackURL[] =
@@ -223,28 +223,17 @@ by default.
// The filename under which we'll store the denylist (in the user data dir). The
// old file will be used as a backup in case the new file has not been loaded
// yet.
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -42,7 +42,7 @@ using std::string;
namespace {
-const char kUploadURL[] = "https://clients2.google.com/cr/report";
+const char kUploadURL[] = "trk:109:https://clients2.google.com/cr/report";
const char kCrashUploadContentType[] = "multipart/form-data";
const char kCrashMultipartBoundary[] =
"----**--yradnuoBgoLtrapitluMklaTelgooG--**----";
--- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
+++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
@@ -37,7 +37,7 @@ namespace {
@@ -54,7 +54,7 @@ const char* kUpdateBrowserRedirectUrl =
#else
// The URL to be used to re-install Chrome when auto-update failed for
// too long.
- "https://www.google.com/chrome";
+ "trk:242:https://www.google.com/chrome";
#endif
// The URL to be used to re-install Chrome when auto-update failed for too long.
constexpr char kDownloadChromeUrl[] =
- "https://www.google.com/chrome/?&brand=CHWL"
+ "trk:242:https://www.google.com/chrome/?&brand=CHWL"
"&utm_campaign=en&utm_source=en-et-na-us-chrome-bubble&utm_medium=et";
// The maximum number of ignored bubble we track in the NumLaterPerReinstall
bool g_upgrade_bubble_is_showing = false;
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -67,17 +67,17 @@ namespace {
@@ -395,7 +384,7 @@ by default.
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -142,7 +142,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -143,7 +143,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
// Global functions -----------------------------------------------------------
@@ -526,7 +515,7 @@ by default.
return GetContentClient()->browser()->GetWebAuthenticationDelegate();
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -95,7 +95,7 @@ GURL GetStartupURL() {
@@ -96,7 +96,7 @@ GURL GetStartupURL() {
#else
const base::CommandLine::StringVector& args = command_line->GetArgs();
if (args.empty())
@@ -719,8 +708,8 @@ by default.
- "https://www.googleapis.com/auth/supportcontent";
+ "trk:104:https://www.googleapis.com/auth/supportcontent";
// Used to mint uber auth tokens when needed.
const char kGaiaSid[] = "sid";
// OAuth 2 scope for NTP Photos module API.
const char kPhotosModuleOAuth2Scope[] =
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -24,6 +24,7 @@
@@ -757,7 +746,7 @@ by default.
std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) {
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
@@ -33,7 +33,7 @@ class GaiaCookieMechanism : public jingl
@@ -36,7 +36,7 @@ class GaiaCookieMechanism : public jingl
// These attributes are necessary for working with non-gmail gaia
// accounts.
const std::string NS_GOOGLE_AUTH_PROTOCOL(

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

@@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future).
kSafeBrowsingIncidentTrafficAnnotation =
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -304,11 +304,14 @@ IncidentReportingService::UploadContext:
@@ -308,11 +308,14 @@ IncidentReportingService::UploadContext:
// static
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
IncidentReportingService::IncidentReportingService(
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -282,7 +282,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -286,7 +286,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {

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

@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -210,6 +210,10 @@ void ClientSideDetectionService::StartCl
@@ -209,6 +209,10 @@ void ClientSideDetectionService::StartCl
return;
}
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
// Fill in metadata about which model we used.
*request->mutable_population() = delegate_->GetUserPopulation();
@@ -290,6 +294,7 @@ void ClientSideDetectionService::StartCl
@@ -288,6 +292,7 @@ void ClientSideDetectionService::StartCl
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIInfoSingleton::GetInstance()),
std::move(request), access_token));

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

@@ -35,7 +35,7 @@
</script>
--- a/chrome/browser/search/background/ntp_background_service.cc
+++ b/chrome/browser/search/background/ntp_background_service.cc
@@ -66,6 +66,7 @@ void NtpBackgroundService::Shutdown() {
@@ -83,6 +83,7 @@ void NtpBackgroundService::Shutdown() {
}
void NtpBackgroundService::FetchCollectionInfo() {
@@ -65,7 +65,7 @@
if (state_ == REQUESTING) {
--- a/components/update_client/update_checker.cc
+++ b/components/update_client/update_checker.cc
@@ -127,6 +127,7 @@ void UpdateCheckerImpl::CheckForUpdates(
@@ -129,6 +129,7 @@ void UpdateCheckerImpl::CheckForUpdates(
const base::flat_map<std::string, std::string>& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) {

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

@@ -35,7 +35,7 @@
GURL rewritten_tab_url = tab_url;
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -532,7 +532,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -533,7 +533,8 @@ void AutocompleteInput::ParseForEmphasiz
// For the view-source and blob schemes, we should emphasize the host of the
// URL qualified by the view-source or blob prefix.
if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
@@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -821,6 +821,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -861,6 +861,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kFtpScheme);
RegisterWebSafeScheme(url::kDataScheme);
@@ -70,7 +70,7 @@
// TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1008,6 +1008,8 @@ component("net") {
@@ -1010,6 +1010,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -160,7 +160,7 @@
using base::Time;
using std::string;
@@ -584,6 +586,12 @@ URLRequest::URLRequest(const GURL& url,
@@ -595,6 +597,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());

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

@@ -1,39 +1,8 @@
# Disable some background communication with clients2.google.com
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -131,11 +131,16 @@ void TraceCrashServiceUploader::DoUpload
progress_callback_ = progress_callback;
done_callback_ = std::move(done_callback);
- base::ThreadPool::PostTask(
+ if (!progress_callback_.is_null()) {
+ base::ThreadPool::PostTask(
FROM_HERE, {base::TaskPriority::BEST_EFFORT},
- base::BindOnce(&TraceCrashServiceUploader::DoCompressOnBackgroundThread,
- base::Unretained(this), file_contents, upload_mode,
- upload_url_, std::move(metadata)));
+ base::BindOnce(progress_callback_, 1, 1));
+ }
+ if (!done_callback_.is_null()) {
+ base::ThreadPool::PostTask(
+ FROM_HERE, {base::TaskPriority::BEST_EFFORT},
+ base::BindOnce(std::move(done_callback_), true, "Upload skipped."));
+ }
}
void TraceCrashServiceUploader::DoCompressOnBackgroundThread(
@@ -312,6 +317,7 @@ bool TraceCrashServiceUploader::Compress
void TraceCrashServiceUploader::CreateAndStartURLLoader(
const std::string& upload_url,
const std::string& post_data) {
+ return;
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(!simple_url_loader_);
--- a/components/crash/core/app/crashpad_linux.cc
+++ b/components/crash/core/app/crashpad_linux.cc
@@ -55,8 +55,7 @@ void SetFirstChanceExceptionHandler(bool
@@ -59,8 +59,7 @@ void SetFirstChanceExceptionHandler(bool
}
bool IsCrashpadEnabled() {

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

@@ -56,7 +56,7 @@
}
// Returns the number of days in |time|, rounded to the closest day by hour if
@@ -208,7 +207,7 @@ PrivacySandboxSettings::PrivacySandboxSe
@@ -207,7 +206,7 @@ PrivacySandboxSettings::PrivacySandboxSe
PrivacySandboxSettings::~PrivacySandboxSettings() = default;
bool PrivacySandboxSettings::IsFlocAllowed() const {

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

@@ -130,7 +130,7 @@
#endif
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -33,111 +33,6 @@ namespace google_util {
@@ -33,112 +33,6 @@ namespace google_util {
namespace {
@@ -148,10 +148,11 @@
-// with a valid TLD that appears in |allowed_tlds|. If |subdomain_permission| is
-// ALLOW_SUBDOMAIN, we check against host "*.<domain_in_lower_case>.<TLD>"
-// instead.
-template <typename Container>
-bool IsValidHostName(base::StringPiece host,
- base::StringPiece domain_in_lower_case,
- SubdomainPermission subdomain_permission,
- const base::flat_set<base::StringPiece>& allowed_tlds) {
- const Container& allowed_tlds) {
- // Fast path to avoid searching the registry set.
- if (host.find(domain_in_lower_case) == base::StringPiece::npos)
- return false;
@@ -205,21 +206,21 @@
- if (base_url.is_valid() && (canonical_host == base_url.host_piece()))
- return true;
-
- static const base::NoDestructor<base::flat_set<base::StringPiece>>
- google_tlds(std::initializer_list<base::StringPiece>({GOOGLE_TLD_LIST}));
- static constexpr auto google_tlds =
- base::MakeFixedFlatSet<base::StringPiece>({GOOGLE_TLD_LIST});
- return IsValidHostName(canonical_host, "google", subdomain_permission,
- *google_tlds);
- google_tlds);
-}
-
-bool IsCanonicalHostYoutubeHostname(base::StringPiece canonical_host,
- SubdomainPermission subdomain_permission) {
- static const base::NoDestructor<base::flat_set<base::StringPiece>>
- youtube_tlds(
- std::initializer_list<base::StringPiece>({YOUTUBE_TLD_LIST}));
- static constexpr auto youtube_tlds =
- base::MakeFixedFlatSet<base::StringPiece>({YOUTUBE_TLD_LIST});
-
- return IsValidHostName(canonical_host, "youtube", subdomain_permission,
- *youtube_tlds) ||
- IsValidHostName(canonical_host, "youtubekids", subdomain_permission,
- *youtube_tlds);
- youtube_tlds) ||
- IsValidHostName(canonical_host, "youtubekids", subdomain_permission,
- youtube_tlds);
-}
-
-// True if |url| is a valid URL with a host that is in the static list of
@@ -232,17 +233,17 @@
- base::StringPiece host(url.host_piece());
- StripTrailingDot(&host);
-
- static const base::NoDestructor<base::flat_set<base::StringPiece>>
- google_subdomains(std::initializer_list<base::StringPiece>(
- {"ipv4.google.com", "ipv6.google.com"}));
- static constexpr auto google_subdomains =
- base::MakeFixedFlatSet<base::StringPiece>(
- {"ipv4.google.com", "ipv6.google.com"});
-
- return google_subdomains->contains(host);
- return google_subdomains.contains(host);
-}
-
} // namespace
// Global functions -----------------------------------------------------------
@@ -145,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -146,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
bool HasGoogleSearchQueryParam(base::StringPiece str) {
@@ -255,7 +256,7 @@
return false;
}
@@ -161,161 +50,53 @@ std::string GetGoogleLocale(const std::s
@@ -162,161 +50,53 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
@@ -484,7 +485,7 @@
bool IsGoogleHostname(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -526,11 +526,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -527,11 +527,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -510,8 +511,8 @@
namespace {
// The result of checking whether a request to a URL should have variations
@@ -235,29 +231,7 @@ class VariationsHeaderHelper {
}
@@ -238,29 +234,7 @@ class VariationsHeaderHelper {
VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
- AppendOmniboxOnDeviceSuggestionsHeaderIfNeeded(url, resource_request_);
@@ -541,7 +542,7 @@
}
private:
@@ -327,8 +301,6 @@ void RemoveVariationsHeaderIfNeeded(
@@ -328,8 +302,6 @@ void RemoveVariationsHeaderIfNeeded(
const net::RedirectInfo& redirect_info,
const network::mojom::URLResponseHead& response_head,
std::vector<std::string>* to_be_removed_headers) {
@@ -550,7 +551,7 @@
}
std::unique_ptr<network::SimpleURLLoader>
@@ -358,14 +330,11 @@ CreateSimpleURLLoaderWithVariationsHeade
@@ -359,14 +331,11 @@ CreateSimpleURLLoaderWithVariationsHeade
}
bool IsVariationsHeader(const std::string& header_name) {
@@ -567,7 +568,7 @@
}
bool ShouldAppendVariationsHeaderForTesting(
@@ -376,12 +345,6 @@ bool ShouldAppendVariationsHeaderForTest
@@ -377,12 +346,6 @@ bool ShouldAppendVariationsHeaderForTest
void UpdateCorsExemptHeaderForVariations(
network::mojom::NetworkContextParams* params) {

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -345,7 +345,6 @@ if (!is_android && !is_mac) {
@@ -351,7 +351,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
}
@@ -1151,7 +1150,6 @@ if (is_win) {
@@ -1157,7 +1156,6 @@ if (is_win) {
":keystone_registration_framework",
":swiftshader_library",
":widevine_cdm_library",

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

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

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
@@ -379,7 +379,7 @@ std::vector<GURL> PrivacySandboxSettings
@@ -378,7 +378,7 @@ std::vector<GURL> PrivacySandboxSettings
}
bool PrivacySandboxSettings::IsPrivacySandboxAllowed() {
@@ -9,7 +9,7 @@
}
bool PrivacySandboxSettings::IsPrivacySandboxEnabled() {
@@ -391,8 +391,6 @@ bool PrivacySandboxSettings::IsPrivacySa
@@ -390,8 +390,6 @@ bool PrivacySandboxSettings::IsPrivacySa
}
void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
@@ -20,7 +20,7 @@
void PrivacySandboxSettings::OnCookiesCleared() {
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -65,19 +65,6 @@
@@ -64,19 +64,6 @@
sub-label="$i18n{permissionsPageDescription}"
on-click="onPermissionsPageClick_"
role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
@@ -40,17 +40,6 @@
</div>
<if expr="use_nss_certs">
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -789,7 +789,7 @@ const base::Feature kPrivacyReview{"Priv
// Enables additional control set 2 on the privacy sandbox settings page.
const base::Feature kPrivacySandboxSettings2{"PrivacySandboxSettings2",
- base::FEATURE_ENABLED_BY_DEFAULT};
+ base::FEATURE_DISABLED_BY_DEFAULT};
const base::FeatureParam<std::string> kPrivacySandboxSettings2FlocURL{
&kPrivacySandboxSettings2, "floc-website-url",
"https://privacysandbox.com/proposals/floc"};
--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -31,7 +31,7 @@ namespace privacy_sandbox {

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

@@ -32,7 +32,7 @@
const char ModelLoader::kClientModelNamePattern[] =
"client_model_v5%s_variation_%d.pb";
#if !BUILDFLAG(FULL_SAFE_BROWSING)
@@ -125,7 +123,7 @@ ModelLoader::ModelLoader(
@@ -123,7 +121,7 @@ ModelLoader::ModelLoader(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
bool is_extended_reporting)
: name_(FillInModelName(is_extended_reporting, GetModelNumber())),
@@ -41,7 +41,7 @@
update_renderers_callback_(update_renderers_callback),
url_loader_factory_(url_loader_factory),
last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
@@ -138,7 +136,7 @@ ModelLoader::ModelLoader(
@@ -136,7 +134,7 @@ ModelLoader::ModelLoader(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
const std::string& model_name)
: name_(model_name),
@@ -50,16 +50,6 @@
update_renderers_callback_(update_renderers_callback),
url_loader_factory_(url_loader_factory),
last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
--- a/components/safe_browsing/content/browser/client_side_model_loader.h
+++ b/components/safe_browsing/content/browser/client_side_model_loader.h
@@ -42,7 +42,6 @@ class ModelLoader {
static const int kClientModelFetchIntervalMs;
static const char kClientModelFinchExperiment[];
static const char kClientModelFinchParam[];
- static const char kClientModelUrlPrefix[];
static const char kClientModelNamePattern[];
// Enum used to keep stats about why we fail to get the client model. This
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -338,7 +338,7 @@ FinancialPing::PingResponse FinancialPin

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

@@ -66,17 +66,17 @@
class Profile;
@@ -37,6 +38,7 @@ class ExtensionMigrator : public Externa
@@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa
Profile* profile_;
const std::string old_id_;
const std::string new_id_;
+ GURL chrome_blank_;
DISALLOW_COPY_AND_ASSIGN(ExtensionMigrator);
};
} // namespace extensions
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -94,27 +94,18 @@ const char kNotFromWebstoreInstallSource
@@ -93,27 +93,18 @@ const char kNotFromWebstoreInstallSource
const char kDefaultInstallSource[] = "";
const char kReinstallInstallSource[] = "reinstall";
@@ -106,7 +106,7 @@
bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
DCHECK(loader);
@@ -310,12 +301,6 @@ void ExtensionDownloader::DoStartAllPend
@@ -309,12 +300,6 @@ void ExtensionDownloader::DoStartAllPend
ReportStats();
url_stats_ = URLStats();
@@ -119,7 +119,7 @@
fetches_preparing_.clear();
}
@@ -354,11 +339,6 @@ bool ExtensionDownloader::AddExtensionDa
@@ -353,11 +338,6 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -131,7 +131,7 @@
// Skip extensions with empty IDs.
if (id.empty()) {
DLOG(WARNING) << "Found extension with empty ID";
@@ -367,12 +347,10 @@ bool ExtensionDownloader::AddExtensionDa
@@ -366,12 +346,10 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -146,7 +146,7 @@
} else {
url_stats_.other_url_count++;
}
@@ -846,20 +824,6 @@ void ExtensionDownloader::HandleManifest
@@ -845,20 +823,6 @@ void ExtensionDownloader::HandleManifest
update->info);
}
@@ -155,7 +155,7 @@
- if (fetch_data->base_url().DomainIs(kGoogleDotCom) &&
- results->daystart_elapsed_seconds >= 0) {
- Time day_start =
- Time::Now() - TimeDelta::FromSeconds(results->daystart_elapsed_seconds);
- Time::Now() - base::Seconds(results->daystart_elapsed_seconds);
-
- for (const ExtensionId& id : extension_ids) {
- ExtensionDownloaderDelegate::PingResult& result = ping_results_[id];
@@ -167,7 +167,7 @@
NotifyExtensionsDownloadStageChanged(
no_updates, ExtensionDownloaderDelegate::Stage::FINISHED);
NotifyExtensionsDownloadFailed(
@@ -1418,11 +1382,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -1417,11 +1381,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:

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

@@ -1,11 +1,11 @@
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -309,12 +309,7 @@ const base::Feature kDesktopPWAsWebBundl
@@ -323,12 +323,7 @@ const base::Feature kDesktopPWAsWebBundl
// Enable DNS over HTTPS (DoH).
const base::Feature kDnsOverHttps {
"DnsOverHttps",
-#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
- defined(OS_ANDROID)
- defined(OS_ANDROID) || defined(OS_LINUX)
- base::FEATURE_ENABLED_BY_DEFAULT
-#else
base::FEATURE_DISABLED_BY_DEFAULT
@@ -13,19 +13,6 @@
};
// Provides a mechanism to remove providers from the dropdown list in the
@@ -331,12 +326,7 @@ const base::FeatureParam<bool> kDnsOverH
// Sets whether the DoH setting is displayed in the settings UI.
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
-#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
- defined(OS_ANDROID)
true
-#else
- false
-#endif
};
// Supply one or more space-separated DoH server URI templates to use when this
--- a/net/dns/public/doh_provider_entry.cc
+++ b/net/dns/public/doh_provider_entry.cc
@@ -117,24 +117,6 @@ const DohProviderEntry::List& DohProvide
@@ -55,7 +42,7 @@
"https://public.dns.iij.jp/dns-query",
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -113,12 +113,7 @@ const base::Feature kSplitAuthCacheByNet
@@ -114,12 +114,7 @@ const base::Feature kSplitAuthCacheByNet
// Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
const base::Feature kDnsOverHttpsUpgrade {
"DnsOverHttpsUpgrade",

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

@@ -3,7 +3,7 @@
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -308,11 +308,7 @@ source_set("lib") {
@@ -311,11 +311,7 @@ source_set("lib") {
}
}
@@ -15,7 +15,7 @@
executable("$chromedriver_output") {
testonly = true
@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
@@ -337,16 +333,6 @@ executable("$chromedriver_output") {
}
}
@@ -34,7 +34,7 @@
deps = [
--- a/third_party/devtools-frontend/src/BUILD.gn
+++ b/third_party/devtools-frontend/src/BUILD.gn
@@ -137,7 +137,6 @@ foreach(module_file, non_autostart_non_r
@@ -136,7 +136,6 @@ foreach(module_file, non_autostart_non_r
devtools_frontend_resources_deps = [
":build_release_devtools",
"front_end",

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

@@ -1,6 +1,6 @@
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -1250,6 +1250,10 @@ source_set("browser") {
@@ -1274,6 +1274,10 @@ source_set("browser") {
"net/browser_online_state_observer.cc",
"net/browser_online_state_observer.h",
"net/cookie_store_factory.cc",
@@ -11,7 +11,7 @@
"net/network_errors_listing_ui.cc",
"net/network_errors_listing_ui.h",
"net/network_quality_observer_impl.cc",
@@ -3008,10 +3012,6 @@ source_set("browser") {
@@ -3034,10 +3038,6 @@ source_set("browser") {
if (enable_reporting) {
sources += [
@@ -24,7 +24,7 @@
]
--- a/content/browser/devtools/protocol/network_handler.h
+++ b/content/browser/devtools/protocol/network_handler.h
@@ -304,8 +304,10 @@ class NetworkHandler : public DevToolsDo
@@ -309,8 +309,10 @@ class NetworkHandler : public DevToolsDo
Response response,
mojo::ScopedDataPipeConsumerHandle pipe,
const std::string& mime_type);
@@ -51,7 +51,7 @@
base::FeatureList::OVERRIDE_ENABLE_FEATURE},
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1137,6 +1137,11 @@ void NetworkContext::QueueSignedExchange
@@ -1140,6 +1140,11 @@ void NetworkContext::QueueSignedExchange
const net::NetworkIsolationKey& network_isolation_key) {
NOTREACHED();
}
@@ -65,7 +65,7 @@
void NetworkContext::ClearDomainReliability(
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -567,10 +567,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE)
@@ -570,10 +570,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE)
return require_network_isolation_key_;
}
@@ -87,7 +87,7 @@
#include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/mojom/content_security_policy.mojom-blink.h"
@@ -2284,9 +2285,11 @@ const base::UnguessableToken& LocalFrame
@@ -2304,9 +2305,11 @@ const base::UnguessableToken& LocalFrame
return base::UnguessableToken::Null();
}
@@ -109,7 +109,7 @@
#include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h"
#include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
#include "third_party/blink/public/common/frame/frame_ad_evidence.h"
@@ -545,7 +546,9 @@ class CORE_EXPORT LocalFrame final : pub
@@ -546,7 +547,9 @@ class CORE_EXPORT LocalFrame final : pub
SmoothScrollSequencer& GetSmoothScrollSequencer();

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@@ -1,7 +1,7 @@
# Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -131,6 +131,7 @@
@@ -133,6 +133,7 @@
#include "components/spellcheck/common/spellcheck_common.h"
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/strings/grit/components_strings.h"
@@ -9,7 +9,7 @@
#include "components/translate/core/browser/translate_download_manager.h"
#include "components/translate/core/browser/translate_manager.h"
#include "components/translate/core/browser/translate_prefs.h"
@@ -1729,6 +1730,8 @@ void RenderViewContextMenu::AppendPageIt
@@ -1751,6 +1752,8 @@ void RenderViewContextMenu::AppendPageIt
menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
}
@@ -18,7 +18,7 @@
ChromeTranslateClient* chrome_translate_client =
ChromeTranslateClient::FromWebContents(embedder_web_contents_);
const bool canTranslate =
@@ -1750,6 +1753,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -1772,6 +1775,7 @@ void RenderViewContextMenu::AppendPageIt
IDC_CONTENT_CONTEXT_TRANSLATE,
l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
}

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

@@ -9,7 +9,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2354,6 +2354,7 @@ static_library("browser") {
@@ -2370,6 +2370,7 @@ static_library("browser") {
"//third_party/libyuv",
"//third_party/metrics_proto",
"//third_party/re2",
@@ -19,7 +19,7 @@
"//third_party/widevine/cdm:headers",
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -147,6 +147,7 @@
@@ -151,6 +151,7 @@
#include "components/translate/core/browser/translate_ranker_impl.h"
#include "components/translate/core/common/translate_util.h"
#include "components/ui_devtools/switches.h"
@@ -44,7 +44,7 @@
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -220,6 +220,7 @@ source_set("browser") {
@@ -222,6 +222,7 @@ source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/sqlite",
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/bad_message.h"
@@ -3479,6 +3480,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3465,6 +3466,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLDraftExtensions,
switches::kEnableWebGLImageChromium,
switches::kFileUrlPathAlias,
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -468,6 +469,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -466,6 +467,10 @@ void SetRuntimeFeaturesFromCommandLine(c
{wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true},
{wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo,
true},
@@ -104,15 +104,15 @@
if (command_line.HasSwitch(mapping.switch_name))
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -219,6 +219,8 @@ class WebRuntimeFeatures {
@@ -218,6 +218,8 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
BLINK_PLATFORM_EXPORT static void
EnableSignedExchangePrefetchCacheForNavigations(bool);
BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch(
bool);
BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool);
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -42,6 +42,7 @@
@@ -123,7 +123,7 @@
#include "base/time/time.h"
#include "cc/input/overscroll_behavior.h"
#include "cc/input/scroll_snap_data.h"
@@ -856,6 +857,14 @@ Range* Document::CreateRangeAdjustedToTr
@@ -855,6 +856,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>();
@@ -2146,6 +2155,15 @@ void Document::UpdateStyleAndLayoutTreeF
@@ -2145,6 +2154,15 @@ void Document::UpdateStyleAndLayoutTreeF
#if DCHECK_IS_ON()
AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
#endif
@@ -167,7 +167,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2074,6 +2078,9 @@ class CORE_EXPORT Document : public Cont
@@ -2078,6 +2082,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
@@ -2115,6 +2115,11 @@ DOMRectList* Element::getClientRects() {
@@ -2114,6 +2114,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
quads, *element_layout_object);
@@ -191,7 +191,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2132,6 +2137,9 @@ FloatRect Element::GetBoundingClientRect
@@ -2131,6 +2136,9 @@ FloatRect Element::GetBoundingClientRect
DCHECK(element_layout_object);
GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -203,7 +203,7 @@
--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
@@ -1595,11 +1595,21 @@ DOMRectList* Range::getClientRects() con
@@ -1598,11 +1598,21 @@ DOMRectList* Range::getClientRects() con
Vector<FloatQuad> quads;
GetBorderAndTextQuads(quads);
@@ -266,7 +266,7 @@
const TextDirection&,
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
@@ -963,9 +963,15 @@ TextMetrics* CanvasRenderingContext2D::m
@@ -912,9 +912,15 @@ TextMetrics* CanvasRenderingContext2D::m
TextDirection direction =
ToTextDirection(GetState().GetDirection(), canvas());
@@ -285,7 +285,7 @@
void CanvasRenderingContext2D::fillFormattedText(
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1681,6 +1681,7 @@ component("platform") {
@@ -1686,6 +1686,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/power_scheduler",
"//components/search_engines:search_engine_utils",
@@ -295,7 +295,7 @@
"//crypto",
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -700,4 +700,12 @@ void WebRuntimeFeatures::EnableCLSScroll
@@ -689,4 +689,12 @@ void WebRuntimeFeatures::EnableCLSScroll
RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable);
}
@@ -310,8 +310,8 @@
} // namespace blink
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1066,6 +1066,12 @@
origin_trial_feature_name: "FledgeInterestGroupAPI",
@@ -1076,6 +1076,12 @@
origin_trial_feature_name: "Fledge",
},
{
+ name: "FingerprintingClientRectsNoise",

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

@@ -34,7 +34,7 @@ approach to change color components.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3482,6 +3482,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3468,6 +3468,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -44,7 +44,7 @@ approach to change color components.
switches::kForceGpuMemAvailableMb,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -473,6 +473,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -471,6 +471,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -55,25 +55,25 @@ approach to change color components.
if (command_line.HasSwitch(mapping.switch_name))
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -221,6 +221,7 @@ class WebRuntimeFeatures {
@@ -220,6 +220,7 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasImageDataNoise(bool);
BLINK_PLATFORM_EXPORT static void
EnableSignedExchangePrefetchCacheForNavigations(bool);
BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch(
bool);
BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool);
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -28,6 +28,7 @@
@@ -30,6 +30,7 @@
#include "third_party/blink/renderer/platform/graphics/bitmap_image.h"
#include "third_party/blink/renderer/platform/graphics/graphics_context.h"
#include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
+#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
#include "third_party/blink/renderer/platform/graphics/stroke_data.h"
#include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
#include "third_party/blink/renderer/platform/instrumentation/use_counter.h"
@@ -2273,6 +2274,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2311,6 +2312,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -85,7 +85,7 @@ approach to change color components.
return image_data;
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1639,7 +1639,9 @@ component("platform") {
@@ -1645,7 +1645,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -98,7 +98,7 @@ approach to change color components.
"//third_party/blink/renderer/platform/blob",
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -708,4 +708,8 @@ void WebRuntimeFeatures::EnableFingerpri
@@ -697,4 +697,8 @@ void WebRuntimeFeatures::EnableFingerpri
RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
}
@@ -322,7 +322,7 @@ approach to change color components.
// Methods overridden by all sub-classes
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1072,6 +1072,9 @@
@@ -1082,6 +1082,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

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

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2113,6 +2113,7 @@ static_library("browser") {
@@ -2126,6 +2126,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -80,7 +80,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
@@ -342,6 +346,18 @@ void BrowserProcessImpl::Init() {
@@ -345,6 +349,18 @@ void BrowserProcessImpl::Init() {
base::BindRepeating(&ApplyMetricsReportingPolicy));
#endif
@@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1567,6 +1567,10 @@ const char kMediaHistoryDescription[] =
@@ -1621,6 +1621,10 @@ const char kMediaHistoryDescription[] =
"Enables Media History which records data around media playbacks on "
"websites.";
@@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -902,6 +902,9 @@ extern const char kLogJsConsoleMessagesD
@@ -930,6 +930,9 @@ extern const char kLogJsConsoleMessagesD
extern const char kMediaHistoryName[];
extern const char kMediaHistoryDescription[];

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

@@ -3,9 +3,9 @@ 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
@@ -695,9 +695,6 @@ void StartupBrowserCreatorImpl::AddInfoB
}
#endif
@@ -672,9 +672,6 @@ void StartupBrowserCreatorImpl::AddInfoB
infobars::ContentInfoBarManager* infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(web_contents);
- if (!google_apis::HasAPIKeyConfigured())
- GoogleApiKeysInfoBarDelegate::Create(infobar_manager);

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

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

@@ -12,7 +12,7 @@
void BackgroundModeManager::RegisterProfile(Profile* profile) {
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1178,7 +1178,7 @@ void ChromeContentBrowserClient::Registe
@@ -1238,7 +1238,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -45,7 +45,7 @@
enum class NetworkPredictionStatus {
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -318,7 +318,7 @@ void ProfileNetworkContextService::Updat
@@ -319,7 +319,7 @@ void ProfileNetworkContextService::Updat
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -56,7 +56,7 @@
registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled,
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -281,7 +281,7 @@ const char Profile::kProfileKey[] = "__P
@@ -276,7 +276,7 @@ const char Profile::kProfileKey[] = "__P
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
@@ -78,10 +78,10 @@
</cr-dialog>
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
@@ -125,7 +125,7 @@ void AccountConsistencyModeManager::Regi
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
registry->RegisterBooleanPref(kDiceMigrationCompletePref, false);
#endif
@@ -111,7 +111,7 @@ AccountConsistencyModeManager::~AccountC
// static
void AccountConsistencyModeManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
+ registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
}

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

@@ -84,7 +84,7 @@
}
--- a/services/device/battery/battery_status_service.h
+++ b/services/device/battery/battery_status_service.h
@@ -56,15 +56,10 @@ class BatteryStatusService {
@@ -60,15 +60,10 @@ class BatteryStatusService {
// Updates current battery status and sends new status to interested
// render processes. Can be called on any thread via a callback.
void NotifyConsumers(const mojom::BatteryStatus& status);
@@ -98,5 +98,5 @@
- mojom::BatteryStatus status_;
- bool status_updated_;
bool is_shutdown_;
};
DISALLOW_COPY_AND_ASSIGN(BatteryStatusService);

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

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

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

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

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

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

@@ -9,7 +9,7 @@
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -468,6 +470,7 @@ Browser::Browser(const CreateParams& par
@@ -467,6 +469,7 @@ Browser::Browser(const CreateParams& par
omit_from_session_restore_(params.omit_from_session_restore),
should_trigger_session_restore_(params.should_trigger_session_restore),
cancel_download_confirmation_state_(NOT_PROMPTED),
@@ -17,7 +17,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -831,7 +834,7 @@ Browser::WarnBeforeClosingResult Browser
@@ -830,7 +833,7 @@ Browser::WarnBeforeClosingResult Browser
// If the browser can close right away (there are no pending downloads we need
// to prompt about) then there's no need to warn. In the future, we might need
// to check other conditions as well.
@@ -26,7 +26,7 @@
return WarnBeforeClosingResult::kOkToClose;
DCHECK(!warn_before_closing_callback_)
@@ -861,6 +864,7 @@ bool Browser::TryToCloseWindow(
@@ -860,6 +863,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -34,7 +34,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -2699,6 +2703,62 @@ bool Browser::CanCloseWithInProgressDown
@@ -2702,6 +2706,62 @@ bool Browser::CanCloseWithInProgressDown
return false;
}
@@ -97,7 +97,7 @@
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
if (cancel_downloads) {
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
@@ -2717,6 +2777,22 @@ void Browser::InProgressDownloadResponse
@@ -2720,6 +2780,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -130,7 +130,7 @@
#include "chrome/browser/ui/signin_view_controller.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/unload_controller.h"
@@ -1005,12 +1006,17 @@ class Browser : public TabStripModelObse
@@ -1008,12 +1009,17 @@ class Browser : public TabStripModelObse
// Returns true if the window can close, false otherwise.
bool CanCloseWithInProgressDownloads();
@@ -148,7 +148,7 @@
// Called when all warnings have completed when attempting to close the
// browser directly (e.g. via hotkey, close button, terminate signal, etc.)
// Used as a WarnBeforeClosingCallback by ShouldCloseWindow().
@@ -1173,6 +1179,8 @@ class Browser : public TabStripModelObse
@@ -1176,6 +1182,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -738,6 +738,9 @@ bool HandleNewTabPageLocationOverride(
@@ -743,6 +743,9 @@ bool HandleNewTabPageLocationOverride(
Profile* profile = Profile::FromBrowserContext(browser_context);
std::string ntp_location =
profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride);

2
patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
View File

@@ -80,7 +80,7 @@
#include "base/feature_list.h"
#include "base/i18n/break_iterator.h"
#include "base/i18n/case_conversion.h"
@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_p
@@ -646,6 +647,9 @@ void SearchProvider::Run(bool query_is_p
}
void SearchProvider::DoHistoryQuery(bool minimal_changes) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5818,7 +5818,7 @@ bool ChromeContentBrowserClient::ShouldA
@@ -6001,7 +6001,7 @@ bool ChromeContentBrowserClient::ShouldA
const url::Origin& embedder_origin,
const content::PepperPluginInfo& plugin_info) {
#if BUILDFLAG(ENABLE_PDF)
@@ -33,15 +33,12 @@
plugin_service->RegisterInternalPlugin(info, true);
--- a/chrome/browser/plugins/plugin_prefs.cc
+++ b/chrome/browser/plugins/plugin_prefs.cc
@@ -37,9 +37,9 @@ namespace {
bool IsPDFViewerPlugin(const std::u16string& plugin_name) {
return (plugin_name ==
- base::ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName)) ||
+ base::ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName())) ||
(plugin_name ==
- base::ASCIIToUTF16(ChromeContentClient::kPDFInternalPluginName));
+ base::ASCIIToUTF16(ChromeContentClient::GetPDFInternalPluginName()));
@@ -40,7 +40,7 @@ bool IsPDFViewerPlugin(const std::u16str
// plugin, which is also used for Print Preview. Note that only the PDF viewer
// and Print Preview can create the internal PDF plugin in the first place.
return plugin_name ==
- base::ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName);
+ base::ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName());
}
} // namespace
@@ -254,7 +251,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -246,6 +246,7 @@ static_library("common") {
@@ -249,6 +249,7 @@ static_library("common") {
"//components/no_state_prefetch/common",
"//components/no_state_prefetch/common:mojo_bindings",
"//components/page_load_metrics/common:common",
@@ -363,7 +360,7 @@
FILE_PATH_LITERAL("internal-pdf-viewer");
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1043,7 +1043,7 @@ WebPlugin* ChromeContentRendererClient::
@@ -1047,7 +1047,7 @@ WebPlugin* ChromeContentRendererClient::
}
}
} else if (info.name ==
@@ -372,7 +369,7 @@
// Report PDF load metrics. Since the PDF plugin is comprised of an
// extension that loads a second plugin, avoid double counting by
// ignoring the creation of the second plugin.
@@ -1075,7 +1075,7 @@ WebPlugin* ChromeContentRendererClient::
@@ -1079,7 +1079,7 @@ WebPlugin* ChromeContentRendererClient::
#if BUILDFLAG(ENABLE_PDF)
if (info.name ==
@@ -381,7 +378,7 @@
return pdf::CreateInternalPlugin(
info, std::move(params), render_frame,
std::make_unique<ChromePdfInternalPluginDelegate>());
@@ -1088,7 +1088,7 @@ WebPlugin* ChromeContentRendererClient::
@@ -1092,7 +1092,7 @@ WebPlugin* ChromeContentRendererClient::
PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
url);
if (info.name ==

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

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

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

@@ -13,7 +13,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -140,9 +140,10 @@ ChromeRenderFrameObserver::ChromeRenderF
@@ -139,9 +139,10 @@ ChromeRenderFrameObserver::ChromeRenderF
if (!render_frame->IsMainFrame())
return;
@@ -25,7 +25,7 @@
if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
SetClientSidePhishingDetection();
#endif
@@ -202,14 +203,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -201,14 +202,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent())
return;
@@ -52,7 +52,7 @@
--- a/chrome/renderer/chrome_render_frame_observer.h
+++ b/chrome/renderer/chrome_render_frame_observer.h
@@ -134,6 +134,7 @@ class ChromeRenderFrameObserver : public
@@ -139,6 +139,7 @@ class ChromeRenderFrameObserver : public
#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr;
#endif
@@ -83,7 +83,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -281,6 +288,7 @@ TemplateURLService::TemplateURLService(
@@ -282,6 +289,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::RepeatingClosure& dsp_change_callback)
: prefs_(prefs),
@@ -91,7 +91,7 @@
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
client_(std::move(client)),
@@ -362,8 +370,8 @@ bool TemplateURLService::CanAddAutogener
@@ -363,8 +371,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.
@@ -102,7 +102,7 @@
}
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
@@ -1495,6 +1503,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -1496,6 +1504,8 @@ SyncDataMap TemplateURLService::CreateGU
void TemplateURLService::Init(const Initializer* initializers,
int num_initializers) {
@@ -111,7 +111,7 @@
if (client_)
client_->SetOwner(this);
@@ -1631,6 +1641,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -1632,6 +1642,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -123,7 +123,7 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -702,6 +702,8 @@ class TemplateURLService : public WebDat
@@ -706,6 +706,8 @@ class TemplateURLService : public WebDat
// ---------- Browser state related members ---------------------------------
PrefService* prefs_ = nullptr;

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1141,7 +1141,8 @@ void BrowserCommandController::InitComma
@@ -1139,7 +1139,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);

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

@@ -1,15 +1,15 @@
--- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
@@ -26,6 +26,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -24,6 +24,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/sync/sync_service_factory.h"
+#include "components/browsing_data/core/features.h"
#include "components/browsing_data/core/pref_names.h"
#include "components/keep_alive_registry/keep_alive_types.h"
#include "components/keep_alive_registry/scoped_keep_alive.h"
@@ -137,6 +138,21 @@ class BrowsingDataRemoverObserver
std::unique_ptr<ScopedKeepAlive> keep_alive_;
@@ -151,6 +152,21 @@ class BrowsingDataRemoverObserver
#endif
};
+uint64_t AllOriginTypeMask() {
@@ -30,7 +30,7 @@
uint64_t GetOriginTypeMask(const base::Value& data_types) {
uint64_t result = 0;
for (const auto& data_type : data_types.GetList()) {
@@ -277,8 +293,9 @@ void ChromeBrowsingDataLifetimeManager::
@@ -292,8 +308,9 @@ void ChromeBrowsingDataLifetimeManager::
bool keep_browser_alive) {
auto* data_types = profile_->GetPrefs()->GetList(
browsing_data::prefs::kClearBrowsingDataOnExitList);
@@ -42,9 +42,9 @@
profile_->GetPrefs()->SetBoolean(
browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
auto* remover = profile_->GetBrowsingDataRemover();
@@ -294,8 +311,8 @@ void ChromeBrowsingDataLifetimeManager::
KeepAliveRestartOption::DISABLED)
: nullptr;
@@ -304,8 +321,8 @@ void ChromeBrowsingDataLifetimeManager::
DCHECK(keep_browser_alive);
#endif
remover->RemoveAndReply(base::Time(), base::Time::Max(),
- GetRemoveMask(*data_types),
- GetOriginTypeMask(*data_types),
@@ -52,7 +52,7 @@
+ cdoe ? AllOriginTypeMask() : GetOriginTypeMask(*data_types),
BrowsingDataRemoverObserver::Create(
remover, /*filterable_deletion=*/true, profile_,
std::move(keep_alive)));
keep_browser_alive));
--- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc
@@ -48,6 +48,8 @@ ChromeBrowsingDataLifetimeManagerFactory
@@ -77,10 +77,10 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/browsing_data/core/features.cc
+++ b/components/browsing_data/core/features.cc
@@ -12,5 +12,7 @@ const base::Feature kEnableRemovingAllTh
@@ -19,5 +19,7 @@ const base::Feature kEnableBrowsingDataL
const base::Feature kEnableBrowsingDataLifetimeManager{
"BrowsingDataLifetimeManager", base::FEATURE_ENABLED_BY_DEFAULT};
#endif
+
+const base::Feature kClearDataOnExit{"ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT};
} // namespace features

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

@@ -8,7 +8,7 @@
#include "base/containers/flat_map.h"
#include "base/cxx17_backports.h"
#include "base/metrics/histogram_macros.h"
@@ -1780,6 +1781,10 @@ bool TabStripModel::CloseTabs(base::span
@@ -1779,6 +1780,10 @@ bool TabStripModel::CloseTabs(base::span
if (items.empty())
return true;

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

@@ -77,7 +77,7 @@
#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
@@ -238,6 +239,13 @@ bool ExtensionManagement::IsInstallation
@@ -250,6 +251,13 @@ bool ExtensionManagement::IsInstallation
bool ExtensionManagement::IsOffstoreInstallAllowed(
const GURL& url,
const GURL& referrer_url) const {

2
patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch
View File

@@ -21,7 +21,7 @@
#include "base/i18n/rtl.h"
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
@@ -194,7 +195,8 @@ void AppModalDialogManager::RunBeforeUnl
@@ -196,7 +197,8 @@ void AppModalDialogManager::RunBeforeUnl
ChromeJavaScriptDialogExtraData* extra_data =
&javascript_dialog_extra_data_[web_contents];

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

@@ -21,13 +21,13 @@
#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
@@ -916,7 +917,8 @@ void HistoryBackend::InitImpl(
@@ -911,7 +912,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.
- expirer_.StartExpiringOldStuff(TimeDelta::FromDays(kExpireDaysThreshold));
- expirer_.StartExpiringOldStuff(base::Days(kExpireDaysThreshold));
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("keep-old-history"))
+ expirer_.StartExpiringOldStuff(TimeDelta::FromDays(kExpireDaysThreshold));
+ expirer_.StartExpiringOldStuff(base::Days(kExpireDaysThreshold));
LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time);
}

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

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

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -268,14 +268,30 @@ void ToolbarView::Init() {
@@ -273,12 +273,28 @@ void ToolbarView::Init() {
std::unique_ptr<ToolbarAccountIconContainerView>
toolbar_account_icon_container;
@@ -15,12 +15,10 @@
+
bool show_avatar_toolbar_button = true;
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (!base::FeatureList::IsEnabled(chromeos::features::kAvatarToolbarButton)) {
// ChromeOS only badges Incognito and Guest icons in the browser window.
- show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() ||
- browser_->profile()->IsGuestSession();
+ show_avatar_toolbar_button = in_incognito_or_guest_mode;
}
// ChromeOS only badges Incognito and Guest icons in the browser window.
- show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() ||
- browser_->profile()->IsGuestSession();
+ show_avatar_toolbar_button = in_incognito_or_guest_mode;
#endif
+
+ if (flag_value == "always")

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

@@ -13,7 +13,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -266,5 +266,7 @@ const base::Feature kPartitionedCookies{
@@ -263,5 +263,7 @@ const base::Feature kPartitionedCookies{
const base::Feature kExtraCookieValidityChecks{
"ExtraCookieValidityChecks", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -23,7 +23,7 @@
} // namespace net
--- a/net/base/features.h
+++ b/net/base/features.h
@@ -400,6 +400,8 @@ NET_EXPORT extern const base::Feature kP
@@ -396,6 +396,8 @@ NET_EXPORT extern const base::Feature kP
// feature flag, assuming no breakage occurs with it enabled.
NET_EXPORT extern const base::Feature kExtraCookieValidityChecks;
@@ -34,7 +34,7 @@
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -138,11 +138,6 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -139,11 +139,6 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -46,7 +46,7 @@
enum DnsResolveStatus {
RESOLVE_STATUS_DNS_SUCCESS = 0,
RESOLVE_STATUS_PROC_SUCCESS,
@@ -3693,7 +3688,7 @@ bool HostResolverManager::IsIPv6Reachabl
@@ -3696,7 +3691,7 @@ bool HostResolverManager::IsIPv6Reachabl
(tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) {
SetLastIPv6ProbeResult(

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

@@ -27,7 +27,7 @@
searchEngine: CrInputElement,
};
}
@@ -55,6 +56,7 @@ class SettingsSearchEngineDialogElement
@@ -54,6 +55,7 @@ class SettingsSearchEngineDialogElement
searchEngine_: String,
keyword_: String,
queryUrl_: String,
@@ -35,7 +35,7 @@
dialogTitle_: String,
actionButtonText_: String,
};
@@ -64,6 +66,7 @@ class SettingsSearchEngineDialogElement
@@ -63,6 +65,7 @@ class SettingsSearchEngineDialogElement
private searchEngine_: string;
private keyword_: string;
private queryUrl_: string;
@@ -43,7 +43,7 @@
private dialogTitle_: string;
private actionButtonText_: string;
private browserProxy_: SearchEnginesBrowserProxy =
@@ -93,6 +96,7 @@ class SettingsSearchEngineDialogElement
@@ -92,6 +95,7 @@ class SettingsSearchEngineDialogElement
this.searchEngine_ = this.model.name;
this.keyword_ = this.model.keyword;
this.queryUrl_ = this.model.url;
@@ -51,7 +51,7 @@
} else {
this.dialogTitle_ =
loadTimeData.getString('searchEnginesAddSearchEngine');
@@ -128,8 +132,12 @@ class SettingsSearchEngineDialogElement
@@ -127,8 +131,12 @@ class SettingsSearchEngineDialogElement
}
}
@@ -66,7 +66,7 @@
}
private cancel_() {
@@ -138,7 +146,8 @@ class SettingsSearchEngineDialogElement
@@ -137,7 +145,8 @@ class SettingsSearchEngineDialogElement
private onActionButtonTap_() {
this.browserProxy_.searchEngineEditCompleted(
@@ -76,7 +76,7 @@
this.$.dialog.close();
}
@@ -166,9 +175,11 @@ class SettingsSearchEngineDialogElement
@@ -165,9 +174,11 @@ class SettingsSearchEngineDialogElement
private updateActionButtonState_() {
const allValid = [
@@ -92,7 +92,7 @@
}
--- a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
+++ b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
@@ -28,6 +28,7 @@ export type SearchEngine = {
@@ -30,6 +30,7 @@ export type SearchEngine = {
modelIndex: number,
name: string,
url: string,
@@ -100,7 +100,7 @@
urlLocked: boolean,
};
@@ -51,7 +52,7 @@ export interface SearchEnginesBrowserPro
@@ -53,7 +54,7 @@ export interface SearchEnginesBrowserPro
searchEngineEditCancelled(): void;
searchEngineEditCompleted(
@@ -109,7 +109,7 @@
getSearchEnginesList(): Promise<SearchEnginesInfo>;
@@ -82,11 +83,12 @@ export class SearchEnginesBrowserProxyIm
@@ -84,11 +85,12 @@ export class SearchEnginesBrowserProxyIm
}
searchEngineEditCompleted(
@@ -177,7 +177,7 @@
protected:
virtual ~EditSearchEngineControllerDelegate() {}
@@ -49,6 +50,8 @@ class EditSearchEngineController {
@@ -54,6 +55,8 @@ class EditSearchEngineController {
// character results in a valid url.
bool IsURLValid(const std::string& url_input) const;
@@ -186,7 +186,7 @@
// Returns true if the value of |keyword_input| represents a valid keyword.
// The keyword is valid if it is non-empty and does not conflict with an
// existing entry. NOTE: this is just the keyword, not the title and url.
@@ -57,7 +60,8 @@ class EditSearchEngineController {
@@ -62,7 +65,8 @@ class EditSearchEngineController {
// Completes the add or edit of a search engine.
void AcceptAddOrEdit(const std::u16string& title_input,
const std::u16string& keyword_input,
@@ -251,7 +251,7 @@
}
--- a/chrome/browser/ui/search_engines/keyword_editor_controller.h
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.h
@@ -25,14 +25,16 @@ class KeywordEditorController {
@@ -29,14 +29,16 @@ class KeywordEditorController {
// model. Returns the index of the added URL.
int AddTemplateURL(const std::u16string& title,
const std::u16string& keyword,
@@ -315,7 +315,7 @@
TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) {
--- a/chrome/browser/ui/search_engines/template_url_table_model.h
+++ b/chrome/browser/ui/search_engines/template_url_table_model.h
@@ -51,13 +51,15 @@ class TemplateURLTableModel : public ui:
@@ -54,13 +54,15 @@ class TemplateURLTableModel : public ui:
void Add(int index,
const std::u16string& short_name,
const std::u16string& keyword,
@@ -353,7 +353,7 @@
dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0);
GURL icon_url = template_url->favicon_url();
if (icon_url.is_valid())
@@ -320,12 +324,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -325,12 +329,14 @@ void SearchEnginesHandler::HandleSearchE
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
const std::u16string& keyword,
@@ -371,7 +371,7 @@
edit_controller_.reset();
}
@@ -356,6 +362,8 @@ bool SearchEnginesHandler::CheckFieldVal
@@ -361,6 +367,8 @@ bool SearchEnginesHandler::CheckFieldVal
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
else if (field_name.compare(kQueryUrlField) == 0)
is_valid = edit_controller_->IsURLValid(field_value);
@@ -380,7 +380,7 @@
else
NOTREACHED();
@@ -377,17 +385,21 @@ void SearchEnginesHandler::HandleSearchE
@@ -382,17 +390,21 @@ void SearchEnginesHandler::HandleSearchE
std::string search_engine;
std::string keyword;
std::string query_url;
@@ -406,7 +406,7 @@
--- a/chrome/browser/ui/webui/settings/search_engines_handler.h
+++ b/chrome/browser/ui/webui/settings/search_engines_handler.h
@@ -46,7 +46,8 @@ class SearchEnginesHandler : public Sett
@@ -50,7 +50,8 @@ class SearchEnginesHandler : public Sett
void OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
const std::u16string& keyword,
@@ -416,7 +416,7 @@
// SettingsPageUIHandler implementation.
void RegisterMessages() override;
@@ -78,8 +79,8 @@ class SearchEnginesHandler : public Sett
@@ -82,8 +83,8 @@ class SearchEnginesHandler : public Sett
// to WebUI. Called from WebUI.
void HandleValidateSearchEngineInput(const base::ListValue* args);
@@ -429,7 +429,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -640,7 +640,8 @@ void TemplateURLService::IncrementUsageC
@@ -641,7 +641,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
@@ -439,7 +439,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -655,6 +656,7 @@ void TemplateURLService::ResetTemplateUR
@@ -656,6 +657,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -449,7 +449,7 @@
}
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -249,7 +249,8 @@ class TemplateURLService : public WebDat
@@ -253,7 +253,8 @@ class TemplateURLService : public WebDat
void ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,

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

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

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

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

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

@@ -10,7 +10,7 @@
#include "crypto/secure_hash.h"
#if defined(OS_WIN)
@@ -533,105 +532,6 @@ DownloadInterruptReason BaseFile::Publis
@@ -535,105 +534,6 @@ DownloadInterruptReason BaseFile::Publis
}
#endif // defined(OS_ANDROID)
@@ -116,7 +116,7 @@
void BaseFile::AnnotateWithSourceInformation(
const std::string& client_guid,
@@ -639,32 +539,8 @@ void BaseFile::AnnotateWithSourceInforma
@@ -641,32 +541,8 @@ void BaseFile::AnnotateWithSourceInforma
const GURL& referrer_url,
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
OnAnnotationDoneCallback on_annotation_done_callback) {
@@ -161,48 +161,46 @@
"//components/services/storage",
"//components/services/storage:filesystem_proxy_factory",
"//components/services/storage/dom_storage:local_storage_proto",
--- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc
+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc
@@ -11,7 +11,6 @@
--- a/content/browser/file_system_access/safe_move_helper.cc
+++ b/content/browser/file_system_access/safe_move_helper.cc
@@ -12,7 +12,6 @@
#include "base/task/thread_pool.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
-#include "components/services/quarantine/quarantine.h"
#include "content/browser/file_system_access/file_system_access_error.h"
#include "content/browser/file_system_access/file_system_access_manager_impl.h"
#include "content/public/browser/content_browser_client.h"
@@ -382,22 +381,9 @@ void FileSystemAccessFileWriterImpl::Did
// In case of error, the swap file URL will point to a valid filesystem
// location. The file at this URL will be deleted when the mojo pipe closes.
#include "content/public/common/content_client.h"
@@ -193,20 +192,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
// not exist anymore. In case of error, the source file URL will point to a
// valid filesystem location.
base::OnceCallback<void(base::File::Error)> result_callback;
- if (RequireSecurityChecks()) {
- GURL referrer_url = manager()->is_off_the_record() ? GURL() : context().url;
- GURL referrer_url = manager_->is_off_the_record() ? GURL() : context_.url;
- mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote;
- if (quarantine_connection_callback_) {
- quarantine_connection_callback_.Run(
- quarantine_remote.BindNewPipeAndPassReceiver());
- }
- result_callback =
- base::BindOnce(&FileSystemAccessFileWriterImpl::DidSwapFileDoQuarantine,
- weak_factory_.GetWeakPtr(), url(), referrer_url,
- std::move(quarantine_remote));
- result_callback = base::BindOnce(
- &SafeMoveHelper::DidFileDoQuarantine, weak_factory_.GetWeakPtr(),
- dest_url(), referrer_url, std::move(quarantine_remote));
- } else {
result_callback = base::BindOnce(
&FileSystemAccessFileWriterImpl::DidSwapFileSkipQuarantine,
weak_factory_.GetWeakPtr());
result_callback = base::BindOnce(&SafeMoveHelper::DidFileSkipQuarantine,
weak_factory_.GetWeakPtr());
- }
DoFileSystemOperation(
FROM_HERE, &FileSystemOperationRunner::MoveFileLocal,
std::move(result_callback), swap_url(), url(),
@@ -422,7 +408,6 @@ void FileSystemAccessFileWriterImpl::Did
void FileSystemAccessFileWriterImpl::DidSwapFileDoQuarantine(
manager_->DoFileSystemOperation(
FROM_HERE, &storage::FileSystemOperationRunner::MoveFileLocal,
std::move(result_callback), source_url(), dest_url(), option_);
@@ -220,7 +207,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
void SafeMoveHelper::DidFileDoQuarantine(
const storage::FileSystemURL& target_url,
const GURL& referrer_url,
- mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
base::File::Error result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -453,37 +438,9 @@ void FileSystemAccessFileWriterImpl::Did
@@ -251,37 +237,9 @@ void SafeMoveHelper::DidFileDoQuarantine
referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
? referrer_url
: GURL();
@@ -215,7 +213,7 @@
- ->browser()
- ->GetApplicationClientGUIDForQuarantineCheck(),
- mojo::WrapCallbackWithDefaultInvokeIfNotRun(
- base::BindOnce(&FileSystemAccessFileWriterImpl::DidAnnotateFile,
- base::BindOnce(&SafeMoveHelper::DidAnnotateFile,
- weak_factory_.GetWeakPtr(),
- std::move(quarantine_remote)),
- quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED));
@@ -225,7 +223,7 @@
- FROM_HERE, {base::MayBlock()},
- base::BindOnce(&quarantine::SetInternetZoneIdentifierDirectly,
- target_url.path(), authority_url, referrer_url),
- base::BindOnce(&FileSystemAccessFileWriterImpl::DidAnnotateFile,
- base::BindOnce(&SafeMoveHelper::DidAnnotateFile,
- weak_factory_.GetWeakPtr(),
- std::move(quarantine_remote)));
-#else
@@ -235,15 +233,15 @@
- }
}
void FileSystemAccessFileWriterImpl::DidAnnotateFile(
void SafeMoveHelper::DidAnnotateFile(
- mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
quarantine::mojom::QuarantineFileResult result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--- a/content/browser/file_system_access/file_system_access_file_writer_impl.h
+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h
@@ -110,10 +110,8 @@ class CONTENT_EXPORT FileSystemAccessFil
void DidSwapFileDoQuarantine(
--- a/content/browser/file_system_access/safe_move_helper.h
+++ b/content/browser/file_system_access/safe_move_helper.h
@@ -58,10 +58,8 @@ class CONTENT_EXPORT SafeMoveHelper {
void DidFileDoQuarantine(
const storage::FileSystemURL& target_url,
const GURL& referrer_url,
- mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
@@ -252,10 +250,10 @@
- mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
quarantine::mojom::QuarantineFileResult result);
// After write and quarantine checks should apply to paths on all filesystems
void ComputeHashForSourceFile(HashCallback callback);
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
@@ -480,7 +480,7 @@ void PepperFileIOHost::OnLocalFileOpened
@@ -456,7 +456,7 @@ void PepperFileIOHost::OnLocalFileOpened
ppapi::host::ReplyMessageContext reply_context,
const base::FilePath& path,
base::File::Error error_code) {
@@ -264,7 +262,7 @@
// Quarantining a file before its contents are available is only supported on
// Windows and Linux.
if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
@@ -514,7 +514,7 @@ void PepperFileIOHost::OnLocalFileOpened
@@ -490,7 +490,7 @@ void PepperFileIOHost::OnLocalFileOpened
#endif
}
@@ -283,7 +281,7 @@
#include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
#include "ipc/ipc_listener.h"
#include "ipc/ipc_platform_file.h"
@@ -89,12 +88,6 @@ class PepperFileIOHost : public ppapi::h
@@ -93,12 +92,6 @@ class PepperFileIOHost : public ppapi::h
const base::FilePath& path,
base::File::Error error_code);

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
@@ -121,9 +121,7 @@ void IntranetRedirectDetector::FinishSle
@@ -119,9 +119,7 @@ void IntranetRedirectDetector::FinishSle
simple_loaders_.clear();
resulting_origins_.clear();

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

@@ -3,7 +3,7 @@
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -3596,8 +3596,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3595,8 +3595,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3611,8 +3610,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3610,8 +3609,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

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

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

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
@@ -438,11 +438,6 @@ int GetContentRestrictions(const Browser
@@ -440,11 +440,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -14,7 +14,7 @@
}
return content_restrictions;
}
@@ -1338,8 +1333,7 @@ bool CanSavePage(const Browser* browser)
@@ -1342,8 +1337,7 @@ bool CanSavePage(const Browser* browser)
prefs::kAllowFileSelectionDialogs)) {
return false;
}
@@ -64,7 +64,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
@@ -27,11 +27,7 @@ bool HasWebUIScheme(const GURL& url) {
@@ -26,11 +26,7 @@ bool HasWebUIScheme(const GURL& url) {
}
bool IsSavableURL(const GURL& url) {

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

@@ -13,7 +13,7 @@
AddChildView(std::make_unique<views::InkDropContainerView>());
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2676,8 +2676,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2680,8 +2680,6 @@ void TabStrip::NewTabButtonPressed(const
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {
@@ -22,7 +22,7 @@
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
CHECK(clipboard);
std::u16string clipboard_text;
@@ -2685,7 +2683,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2689,7 +2687,6 @@ void TabStrip::NewTabButtonPressed(const
/* data_dst = */ nullptr, &clipboard_text);
if (!clipboard_text.empty())
controller_->CreateNewTabWithLocation(clipboard_text);

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

@@ -51,18 +51,20 @@
-</div>
--- a/chrome/browser/resources/history/side_bar.html
+++ b/chrome/browser/resources/history/side_bar.html
@@ -111,11 +111,6 @@
<paper-ripple></paper-ripple>
</a>
</template>
- <a id="syncedTabs" role="menuitem" href="/syncedTabs" class="page-item"
@@ -128,13 +128,6 @@
$i18n{historyMenuItem}
<paper-ripple></paper-ripple>
</a>
- <a id="syncedTabs" role="menuitem" href="/syncedTabs"
- class="page-item cr-nav-menu-item"
- path="syncedTabs" on-click="onItemClick_">
- <iron-icon icon="cr:phonelink"></iron-icon>
- $i18n{openTabsMenuItem}
- <paper-ripple></paper-ripple>
- </a>
<div class="separator"></div>
<a role="menuitem" id="clear-browsing-data"
href="chrome://settings/clearBrowserData"
class="cr-nav-menu-item"
--- a/chrome/browser/resources/ntp4/incognito_tab.html
+++ b/chrome/browser/resources/ntp4/incognito_tab.html
@@ -24,8 +24,6 @@ document.querySelector('#incognitothemec
@@ -127,7 +129,7 @@
<div class="separator"></div>
--- a/chrome/browser/resources/settings/autofill_page/passwords_section.html
+++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
@@ -106,6 +106,7 @@
@@ -107,6 +107,7 @@
label="$i18n{trustedVaultOptInLabel}"
sub-label="$i18n{trustedVaultOptInSubLabel}">
</cr-link-row>
@@ -135,7 +137,7 @@
<div id="checkPasswordsBannerContainer" class="cr-row"
hidden$="[[!shouldShowBanner_]]">
<picture>
@@ -154,6 +155,7 @@
@@ -155,6 +156,7 @@
<!-- This div lays out the link correctly, relative to the text. -->
<div class="cr-padded-text">$i18nRaw{managePasswordsLabel}</div>
</div>
@@ -221,14 +223,14 @@
--- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
+++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
@@ -111,7 +111,7 @@
<iron-icon icon="settings:assignment"></iron-icon>
$i18n{autofillPageTitle}
<paper-ripple></paper-ripple>
</a>
- <template is="dom-if" if="[[!enableLandingPageRedesign_]]">
+ <template is="dom-if" if="[[false]]">
<a role="menuitem" href="/safetyCheck"
hidden="[[!pageVisibility.safetyCheck]]"
id="safetyCheck">
id="safetyCheck"
--- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
+++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
@@ -72,7 +72,7 @@
@@ -242,7 +244,7 @@
</cr-icon-button>
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -175,6 +175,7 @@ void ProfileMenuView::BuildMenu() {
@@ -176,6 +176,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {

1376
pruning.list
View File

File diff suppressed because it is too large Load Diff