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

Update to Chromium 117.0.5938.62

Browse Source
This commit is contained in:
Blaise
2023-09-01 16:44:31 -05:00
parent 8ce58cf3eb
commit c97db8a197
72 changed files with 3745 additions and 3086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
116.0.5845.188
117.0.5938.62

1176
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

79
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
@@ -2262,7 +2262,6 @@ static_library("browser") {
@@ -2276,7 +2276,6 @@ static_library("browser") {
"//components/reporting/util:task_runner_context",
"//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",
@@ -3617,8 +3616,6 @@ static_library("browser") {
@@ -3664,8 +3663,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -19,7 +19,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -54,10 +54,6 @@ class NetworkQualityTracker;
@@ -55,10 +55,6 @@ class NetworkQualityTracker;
class SharedURLLoaderFactory;
}
@@ -30,7 +30,7 @@
namespace subresource_filter {
class RulesetService;
}
@@ -214,9 +210,6 @@ class BrowserProcess {
@@ -215,9 +211,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -42,7 +42,7 @@
virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -72,7 +72,6 @@
@@ -73,7 +73,6 @@
#include "chrome/browser/printing/print_preview_dialog_controller.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
@@ -50,8 +50,8 @@
#include "chrome/browser/screen_ai/screen_ai_downloader.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
@@ -420,8 +419,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -436,8 +435,6 @@ void BrowserProcessImpl::StartTearDown()
#endif
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
- if (safe_browsing_service_.get())
@@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1057,14 +1054,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1079,14 +1076,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_);
@@ -1300,26 +1289,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1322,26 +1311,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
@@ -190,7 +190,6 @@ class BrowserProcessImpl : public Browse
@@ -191,7 +191,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;
@@ -341,9 +340,6 @@ class BrowserProcessImpl : public Browse
@@ -349,9 +348,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -131,7 +131,7 @@
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/share/share_history.h"
@@ -612,10 +611,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -624,10 +623,6 @@ void ChromeBrowsingDataRemoverDelegate::
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -144,7 +144,7 @@
browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1058,34 +1058,6 @@ void SetApplicationLocaleOnIOThread(cons
@@ -1066,34 +1066,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}
@@ -179,7 +179,7 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
AppLoadedInTabSource ClassifyAppLoadedInTabSource(
@@ -5012,14 +4984,9 @@ ChromeContentBrowserClient::CreateThrott
@@ -5095,14 +5067,9 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
handle, handle->GetWebContents()->GetBrowserContext()));
@@ -195,7 +195,7 @@
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
base::BindOnce(
&ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
@@ -5065,16 +5032,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5148,16 +5115,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -212,7 +212,7 @@
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
throttles.push_back(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
@@ -5358,8 +5315,6 @@ void ChromeContentBrowserClient::Overrid
@@ -5428,8 +5385,6 @@ void ChromeContentBrowserClient::Overrid
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -246,7 +246,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -470,13 +470,6 @@ void ChromeDownloadManagerDelegate::SetD
@@ -471,13 +471,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
@@ -260,7 +260,7 @@
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -841,17 +834,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -854,17 +847,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
@@ -280,7 +280,7 @@
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -107,7 +107,7 @@ class DownloadItemModelData : public bas
@@ -108,7 +108,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.
@@ -289,7 +289,7 @@
// Whether the download is currently being revived.
bool is_being_revived_;
@@ -157,7 +157,7 @@ DownloadItemModelData* DownloadItemModel
@@ -158,7 +158,7 @@ DownloadItemModelData* DownloadItemModel
DownloadItemModelData::DownloadItemModelData()
: should_show_in_shelf_(true),
was_ui_notified_(false),
@@ -298,7 +298,7 @@
is_being_revived_(false) {}
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -541,13 +541,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -542,13 +542,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -315,7 +315,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -726,9 +726,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -728,9 +728,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -343,7 +343,7 @@
}
}
@@ -459,10 +452,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -462,10 +455,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -548,7 +548,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
@@ -726,18 +726,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -722,18 +722,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -567,7 +567,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1258,55 +1246,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1254,56 +1242,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -577,11 +577,11 @@
- return RespondNow(ArgumentList(
- api::webstore_private::GetReferrerChain::Results::Create("")));
-
- content::RenderFrameHost* rfh = render_frame_host();
- content::RenderFrameHost* outermost_rfh =
- rfh ? rfh->GetOutermostMainFrame() : nullptr;
- content::RenderFrameHost* outermost_render_frame_host =
- render_frame_host() ? render_frame_host()->GetOutermostMainFrame()
- : nullptr;
-
- if (!outermost_rfh) {
- if (!outermost_render_frame_host) {
- return RespondNow(ErrorWithArguments(
- api::webstore_private::GetReferrerChain::Results::Create(""),
- kWebstoreUserCancelledError));
@@ -594,7 +594,8 @@
- safe_browsing::ReferrerChain referrer_chain;
- SafeBrowsingNavigationObserverManager::AttributionResult result =
- navigation_observer_manager->IdentifyReferrerChainByRenderFrameHost(
- outermost_rfh, kExtensionReferrerUserGestureLimit, &referrer_chain);
- outermost_render_frame_host, kExtensionReferrerUserGestureLimit,
- &referrer_chain);
-
- // If the referrer chain is incomplete we'll append the most recent
- // navigations to referrer chain for diagnostic purposes. This only happens if
@@ -708,7 +709,7 @@
// static
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -93,7 +93,6 @@
@@ -92,7 +92,6 @@
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
#include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
@@ -716,7 +717,7 @@
#include "chrome/browser/sessions/exit_type_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
@@ -647,17 +646,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -641,17 +640,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -756,7 +757,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -100,6 +101,7 @@ static_library("safe_browsing") {
@@ -96,6 +97,7 @@ static_library("safe_browsing") {
"//extensions/browser",
]
}
@@ -764,7 +765,7 @@
if (safe_browsing_mode != 0) {
# "Safe Browsing Basic" files used for safe browsing in full mode
@@ -516,6 +518,7 @@ static_library("advanced_protection") {
@@ -514,6 +516,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -772,7 +773,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -535,6 +538,7 @@ source_set("metrics_collector") {
@@ -533,6 +536,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -877,7 +878,7 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4774,7 +4774,6 @@ static_library("ui") {
@@ -4828,7 +4828,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h",
@@ -887,7 +888,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -425,22 +425,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -450,22 +450,6 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -1213,9 +1214,9 @@
html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -98,7 +98,6 @@
#include "components/paint_preview/buildflags/buildflags.h"
@@ -100,7 +100,6 @@
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/buildflags.h"
-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
#include "components/spellcheck/spellcheck_buildflags.h"

18
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
@@ -791,95 +791,6 @@ std::tuple<GURL, std::string> AutofillDo
@@ -762,95 +762,6 @@ std::tuple<GURL, std::string> AutofillDo
}
bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
@@ -21,8 +21,8 @@
- // thousands when rich metadata is enabled.
- if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY &&
- method == "GET") {
- UMA_HISTOGRAM_COUNTS_100000("Autofill.Query.GetUrlLength",
- request_url.spec().length());
- base::UmaHistogramCounts100000("Autofill.Query.GetUrlLength",
- request_url.spec().length());
- }
-
- auto resource_request = std::make_unique<network::ResourceRequest>();
@@ -71,15 +71,15 @@
- simple_loader->SetAllowHttpErrorResults(true);
-
- if (method == "POST") {
- const std::string content_type = "application/x-protobuf";
- std::string payload;
- if (!GetAPIBodyPayload(request_data.payload, request_data.request_type,
- &payload)) {
- static constexpr char content_type[] = "application/x-protobuf";
- absl::optional<std::string> payload = GetAPIBodyPayload(
- std::move(request_data.payload), request_data.request_type);
- if (!payload) {
- return false;
- }
-
- // Attach payload data and add data format header.
- simple_loader->AttachStringForUpload(payload, content_type);
- simple_loader->AttachStringForUpload(std::move(payload).value(),
- content_type);
- }
-
- // Transfer ownership of the loader into url_loaders_. Temporarily hang

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

@@ -24,7 +24,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -36,9 +36,6 @@ ExternalComponentLoader::~ExternalCompon
@@ -37,9 +37,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
auto prefs = base::Value::Dict();

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

@@ -380,15 +380,15 @@ by default.
std::move(resource_request),
--- a/components/translate/core/common/translate_util.cc
+++ b/components/translate/core/common/translate_util.cc
@@ -21,7 +21,7 @@ const char kDetectLanguageInSubFrames[]
@@ -13,7 +13,7 @@
} // namespace
namespace translate {
-const char kSecurityOrigin[] = "https://translate.googleapis.com/";
+const char kSecurityOrigin[] = "trk:220:https://translate.googleapis.com/";
BASE_FEATURE(kTranslateSubFrames,
"TranslateSubFrames",
// The feature is explicitly disabled on Webview and Weblayer.
// TODO(crbug.com/1292622): Enable the feature on Webview.
--- a/components/variations/variations_url_constants.cc
+++ b/components/variations/variations_url_constants.cc
@@ -8,7 +8,7 @@ namespace variations {
@@ -454,7 +454,7 @@ by default.
const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
--- a/google_apis/gaia/gaia_constants.cc
+++ b/google_apis/gaia/gaia_constants.cc
@@ -14,157 +14,157 @@ const char kChromeSource[] = "ChromiumBr
@@ -14,161 +14,161 @@ const char kChromeSource[] = "ChromiumBr
const char kUnexpectedServiceResponse[] = "UnexpectedServiceResponse";
// OAuth scopes.
@@ -620,6 +620,11 @@ by default.
- "https://www.googleapis.com/auth/nearbysharing-pa";
+ "trk:101:https://www.googleapis.com/auth/nearbysharing-pa";
// OAuth2 scope for access to nearby sharing.
const char kNearbyPresenceOAuth2Scope[] =
- "https://www.googleapis.com/auth/nearbypresence-pa";
+ "trk:114:https://www.googleapis.com/auth/nearbypresence-pa";
// OAuth2 scopes for access to GCM account tracker.
-const char kGCMGroupServerOAuth2Scope[] = "https://www.googleapis.com/auth/gcm";
+const char kGCMGroupServerOAuth2Scope[] = "trk:102:https://www.googleapis.com/auth/gcm";
@@ -656,7 +661,7 @@ by default.
const char kFeedOAuth2Scope[] = "https://www.googleapis.com/auth/googlenow";
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -24,6 +24,7 @@
@@ -23,6 +23,7 @@
namespace {
// Gaia service constants

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

@@ -23,9 +23,9 @@ the URL so we get notified if this happens again in the future).
- bool is_extended_reporting_opt_in_allowed =
- IsExtendedReportingOptInAllowed(*prefs);
+ bool is_extended_reporting_opt_in_allowed = false;
bool is_proceed_anyway_disabled =
prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);
bool is_proceed_anyway_disabled = IsSafeBrowsingProceedAnywayDisabled(*prefs);
// Determine if any prefs need to be updated prior to showing the security
--- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
@@ -27,7 +27,7 @@ namespace safe_browsing {

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
@@ -248,6 +248,10 @@ void ClientSideDetectionService::StartCl
@@ -245,6 +245,10 @@ void ClientSideDetectionService::StartCl
return;
}
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
std::string request_data;
request->SerializeToString(&request_data);
@@ -334,6 +338,7 @@ void ClientSideDetectionService::StartCl
@@ -331,6 +335,7 @@ void ClientSideDetectionService::StartCl
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIInfoSingleton::GetInstance()),
std::move(request), access_token));

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

@@ -41,7 +41,7 @@
</script>
--- a/chrome/browser/search/background/ntp_background_service.cc
+++ b/chrome/browser/search/background/ntp_background_service.cc
@@ -93,6 +93,7 @@ void NtpBackgroundService::Shutdown() {
@@ -97,6 +97,7 @@ void NtpBackgroundService::Shutdown() {
}
void NtpBackgroundService::FetchCollectionInfo() {

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

@@ -23,7 +23,7 @@
url.SchemeIs(dom_distiller::kDomDistillerScheme))
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -123,7 +123,8 @@ int GetIndexOfExistingTab(Browser* brows
@@ -170,7 +170,8 @@ int GetIndexOfExistingTab(Browser* brows
// RewriteURLIfNecessary removes the "view-source:" scheme which could lead
// to incorrect matching, so ensure that the target and the candidate are
// either both view-source:, or neither is.
@@ -70,7 +70,7 @@
// other origins, so we should not treat them as web safe. Remove callers of
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1031,6 +1031,8 @@ component("net") {
@@ -1040,6 +1040,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -181,7 +181,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
#include "net/url_request/url_request_throttler_manager.h"
@@ -574,6 +575,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -575,6 +576,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2572,7 +2572,8 @@ void ChromeContentBrowserClient::AppendE
@@ -2584,7 +2584,8 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -29,7 +29,7 @@
const base::FilePath& exe_path,
--- a/components/gwp_asan/client/gwp_asan.cc
+++ b/components/gwp_asan/client/gwp_asan.cc
@@ -139,6 +139,11 @@ size_t AllocationSamplingFrequency(const
@@ -164,6 +164,11 @@ size_t AllocationSamplingFrequency(const
// Exported for testing.
GWP_ASAN_EXPORT absl::optional<AllocatorSettings> GetAllocatorSettings(

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

@@ -1,16 +1,5 @@
# Disables references to fonts.googleapis.com
--- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css
+++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css
@@ -2,7 +2,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
-@import url(https://fonts.googleapis.com/css?family=Roboto);
+@import url(chrome://resources/css/roboto.css);
body {
margin: 0 0 20px 0;
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -301,7 +301,7 @@ bool DomDistillerViewerSource::ShouldSer
@@ -44,17 +33,6 @@
e.rel = 'stylesheet';
e.type = 'text/css';
document.head.appendChild(e);
--- a/components/supervised_user/core/browser/resources/supervised_user_block_interstitial.html
+++ b/components/supervised_user/core/browser/resources/supervised_user_block_interstitial.html
@@ -5,7 +5,7 @@
<meta name="viewport"
content="initial-scale=1, minimum-scale=1, width=device-width">
<title>$i18n{blockPageTitle}</title>
-<link href="https://fonts.googleapis.com/css?family=Google+Sans" rel="stylesheet">
+<link href="chrome://resources/css/roboto.css" rel="stylesheet">
<link rel="stylesheet" href="../../../../../components/security_interstitials/core/common/resources/interstitial_core.css">
<link rel="stylesheet" href="supervised_user_block_interstitial.css">
<script src="supervised_user_block_interstitial.js"></script>
--- a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
+++ b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
@@ -12,8 +12,7 @@

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

@@ -2,7 +2,7 @@
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -450,6 +450,7 @@ void GCMClientImpl::StartGCM() {
@@ -448,6 +448,7 @@ void GCMClientImpl::StartGCM() {
void GCMClientImpl::InitializeMCSClient() {
DCHECK(network_connection_tracker_);
@@ -10,7 +10,7 @@
std::vector<GURL> endpoints;
endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
@@ -654,28 +655,6 @@ void GCMClientImpl::RemoveHeartbeatInter
@@ -652,28 +653,6 @@ void GCMClientImpl::RemoveHeartbeatInter
void GCMClientImpl::StartCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -39,7 +39,7 @@
}
void GCMClientImpl::OnCheckinCompleted(
@@ -732,24 +711,6 @@ void GCMClientImpl::SetGServicesSettings
@@ -730,24 +709,6 @@ void GCMClientImpl::SetGServicesSettings
void GCMClientImpl::SchedulePeriodicCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/webui/suggest_internals/suggest_internals_handler.cc
+++ b/chrome/browser/ui/webui/suggest_internals/suggest_internals_handler.cc
@@ -55,9 +55,6 @@ void SuggestInternalsHandler::OnSuggestR
@@ -56,9 +56,6 @@ void SuggestInternalsHandler::OnSuggestR
suggest_internals::mojom::Request::New();
mojom_request->id = request_id;
mojom_request->url = request->url;
@@ -10,13 +10,13 @@
- variations::GetVariationsHeader(*request, &variations_header);
- mojom_request->data[variations::kClientDataHeader] = variations_header;
mojom_request->data[request->method] = request->url.spec();
mojom_request->status = suggest_internals::mojom::RequestStatus::kSent;
mojom_request->start_time = base::Time::Now();
mojom_request->status = suggest_internals::mojom::RequestStatus::kCreated;
page_->OnSuggestRequestCreated(std::move(mojom_request));
--- a/chrome/common/google_url_loader_throttle.cc
+++ b/chrome/common/google_url_loader_throttle.cc
@@ -18,10 +18,6 @@
#include "services/network/public/mojom/url_response_head.mojom.h"
@@ -20,10 +20,6 @@
#include "services/network/public/mojom/x_frame_options.mojom.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "extensions/common/extension_urls.h"
@@ -25,7 +25,7 @@
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
#include "chrome/common/bound_session_request_throttled_listener.h"
#include "components/signin/public/base/signin_switches.h"
@@ -74,51 +70,6 @@ void GoogleURLLoaderThrottle::DetachFrom
@@ -76,53 +72,6 @@ void GoogleURLLoaderThrottle::DetachFrom
void GoogleURLLoaderThrottle::WillStartRequest(
network::ResourceRequest* request,
bool* defer) {
@@ -68,6 +68,8 @@
- ShouldDeferRequestForBoundSession(request->url)) {
- CHECK(bound_session_request_throttled_listener_);
- *defer = true;
- CHECK(!bound_session_request_throttled_start_time_.has_value());
- bound_session_request_throttled_start_time_ = base::TimeTicks::Now();
- bound_session_request_throttled_listener_->OnRequestBlockedOnCookie(
- base::BindOnce(
- &GoogleURLLoaderThrottle::OnDeferRequestForBoundSessionCompleted,
@@ -77,7 +79,7 @@
}
void GoogleURLLoaderThrottle::WillRedirectRequest(
@@ -128,48 +79,6 @@ void GoogleURLLoaderThrottle::WillRedire
@@ -132,50 +81,6 @@ void GoogleURLLoaderThrottle::WillRedire
std::vector<std::string>* to_be_removed_headers,
net::HttpRequestHeaders* modified_headers,
net::HttpRequestHeaders* modified_cors_exempt_headers) {
@@ -117,6 +119,8 @@
- ShouldDeferRequestForBoundSession(redirect_info->new_url)) {
- CHECK(bound_session_request_throttled_listener_);
- *defer = true;
- CHECK(!bound_session_request_throttled_start_time_.has_value());
- bound_session_request_throttled_start_time_ = base::TimeTicks::Now();
- bound_session_request_throttled_listener_->OnRequestBlockedOnCookie(
- base::BindOnce(
- &GoogleURLLoaderThrottle::OnDeferRequestForBoundSessionCompleted,
@@ -126,7 +130,7 @@
}
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -177,23 +86,6 @@ void GoogleURLLoaderThrottle::WillProces
@@ -183,23 +88,6 @@ void GoogleURLLoaderThrottle::WillProces
const GURL& response_url,
network::mojom::URLResponseHead* response_head,
bool* defer) {
@@ -506,7 +510,7 @@
bool IsGoogleHostname(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -558,11 +558,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -561,11 +561,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -625,7 +629,7 @@
} // namespace variations
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -486,27 +486,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -489,27 +489,6 @@ bool HasGoogleHost(const GURL& url) {
}
bool IsGoogleHost(base::StringPiece host) {

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -388,7 +388,6 @@ if (!is_android && !is_mac) {
@@ -384,7 +384,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -1243,7 +1242,6 @@ if (is_win) {
@@ -1256,7 +1255,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_library",
":widevine_cdm_library",

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

@@ -1,6 +1,6 @@
--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -108,7 +108,7 @@ namespace privacy_sandbox {
@@ -11,7 +11,7 @@ namespace privacy_sandbox {
void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(
@@ -11,7 +11,7 @@
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1ConsentDecisionMade,
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -92,7 +92,7 @@ base::Value::Dict CreateBlockedTopicEntr
@@ -103,7 +103,7 @@ base::Value::Dict CreateBlockedTopicEntr
// static
bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -20,7 +20,7 @@
}
// static
@@ -596,20 +596,7 @@ bool PrivacySandboxSettingsImpl::IsPriva
@@ -673,20 +673,7 @@ bool PrivacySandboxSettingsImpl::IsPriva
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabled() const {
@@ -42,7 +42,7 @@
}
void PrivacySandboxSettingsImpl::SetAllPrivacySandboxAllowedForTesting() {
@@ -634,11 +621,10 @@ void PrivacySandboxSettingsImpl::SetTopi
@@ -711,11 +698,10 @@ void PrivacySandboxSettingsImpl::SetTopi
}
void PrivacySandboxSettingsImpl::SetPrivacySandboxEnabled(bool enabled) {
@@ -55,7 +55,7 @@
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
@@ -726,11 +712,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
@@ -803,11 +789,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
return Status::kIncognitoProfile;
}
@@ -80,7 +80,7 @@
kPrivacySandboxAggregationServiceTrustedServerUrlAwsParam{
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -521,7 +521,7 @@ BASE_FEATURE(kContentCaptureConstantStre
@@ -544,7 +544,7 @@ BASE_FEATURE(kContentCaptureConstantStre
// Controls whether the Conversion Measurement API infrastructure is enabled.
BASE_FEATURE(kConversionMeasurement,
"ConversionMeasurement",

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

@@ -2,18 +2,9 @@
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -336,7 +336,7 @@ FinancialPing::PingResponse FinancialPin
@@ -299,7 +299,7 @@ FinancialPing::PingResponse FinancialPin
response->clear();
// Open network connection.
InternetHandle connection_handle = InternetConnectA(inet_handle,
- kFinancialServer, kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
+ "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
INTERNET_FLAG_NO_CACHE_WRITE, 0);
if (!connection_handle)
return PING_FAILURE;
@@ -380,7 +380,7 @@ FinancialPing::PingResponse FinancialPin
return PING_SUCCESSFUL;
#else
std::string url =
- base::StringPrintf("https://%s%s", kFinancialServer, request);
+ base::StringPrintf("https://%s%s", "about:blank", request);

200
patches/core/ungoogled-chromium/disable-web-environment-integrity.patch
View File

@@ -1,24 +1,71 @@
--- a/android_webview/browser/BUILD.gn
+++ b/android_webview/browser/BUILD.gn
@@ -225,7 +225,6 @@ source_set("browser") {
"//components/embedder_support:embedder_support",
"//components/embedder_support/android:util",
"//components/embedder_support/origin_trials",
- "//components/environment_integrity/android",
"//components/favicon_base:favicon_base",
"//components/flags_ui",
"//components/keyed_service/content",
--- a/chrome/android/chrome_test_java_sources.gni
+++ b/chrome/android/chrome_test_java_sources.gni
@@ -193,7 +193,6 @@ chrome_test_java_sources = [
@@ -194,7 +194,6 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/download/OMADownloadHandlerTest.java",
"javatests/src/org/chromium/chrome/browser/download/ServicificationDownloadTest.java",
"javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadDialogIncognitoTest.java",
- "javatests/src/org/chromium/chrome/browser/environment_integrity/EnvironmentIntegrityTest.java",
"javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java",
"javatests/src/org/chromium/chrome/browser/feature_engagement/ScreenshotTabObserverTest.java",
"javatests/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollectorTest.java",
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -906,8 +906,6 @@ source_set("browser") {
"download/save_package_serialization_handler.h",
"download/save_types.cc",
"download/save_types.h",
- "environment_integrity/environment_integrity_service_impl.cc",
- "environment_integrity/environment_integrity_service_impl.h",
"eye_dropper_chooser_impl.cc",
"eye_dropper_chooser_impl.h",
"feature_observer.cc",
"javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTest.java",
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3398,7 +3398,6 @@ static_library("browser") {
"//components/embedder_support/android:util",
"//components/embedder_support/android:web_contents_delegate",
"//components/endpoint_fetcher:endpoint_fetcher",
- "//components/environment_integrity/android",
"//components/external_intents/android",
"//components/favicon/android",
"//components/favicon/core:database",
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -528,7 +528,6 @@ test("components_unittests") {
"//components/embedder_support/android:native_java_unittests_java",
"//components/embedder_support/android/metrics:test_support_java",
"//components/embedder_support/android/metrics:unit_tests",
- "//components/environment_integrity/android:unit_tests",
"//components/gcm_driver/instance_id:test_support",
"//components/gcm_driver/instance_id/android:instance_id_driver_java",
"//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
--- a/components/environment_integrity/android/android_environment_integrity_service.cc
+++ b/components/environment_integrity/android/android_environment_integrity_service.cc
@@ -83,25 +83,8 @@ AndroidEnvironmentIntegrityService::GetD
void AndroidEnvironmentIntegrityService::GetEnvironmentIntegrity(
const std::vector<uint8_t>& content_binding,
GetEnvironmentIntegrityCallback callback) {
- if (!base::FeatureList::IsEnabled(
- blink::features::kWebEnvironmentIntegrity)) {
ReportBadMessageAndDeleteThis(
"Feature not enabled. IPC call not expected.");
- return;
- }
- if (!integrity_service_->IsIntegrityAvailable()) {
- std::move(callback).Run(EnvironmentIntegrityResponseCode::kInternalError,
- std::vector<uint8_t>());
- return;
- }
-
- const url::Origin& origin =
- render_frame_host().GetOutermostMainFrame()->GetLastCommittedOrigin();
- GetDataManager()->GetHandle(
- origin, base::BindOnce(&AndroidEnvironmentIntegrityService::OnGetHandle,
- weak_factory_.GetWeakPtr(),
- EnvironmentIntegrityRequest(std::move(callback),
- content_binding)));
}
void AndroidEnvironmentIntegrityService::OnGetHandle(
--- a/content/browser/browser_interface_binders.cc
+++ b/content/browser/browser_interface_binders.cc
@@ -125,7 +125,6 @@
@@ -29,86 +76,17 @@
#include "third_party/blink/public/mojom/feature_observer/feature_observer.mojom.h"
#include "third_party/blink/public/mojom/file/file_utilities.mojom.h"
#include "third_party/blink/public/mojom/file_system_access/file_system_access_manager.mojom.h"
@@ -181,7 +180,6 @@
#if BUILDFLAG(IS_ANDROID)
#include "content/browser/android/date_time_chooser_android.h"
#include "content/browser/android/text_suggestion_host_android.h"
-#include "content/browser/environment_integrity/environment_integrity_service_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_android.h"
#include "services/device/public/mojom/nfc.mojom.h"
#include "third_party/blink/public/mojom/hid/hid.mojom.h"
@@ -1199,17 +1197,9 @@ void PopulateBinderMapWithContext(
base::BindRepeating(&BindDateTimeChooserForFrame));
map->Add<blink::mojom::TextSuggestionHost>(
base::BindRepeating(&BindTextSuggestionHostForFrame));
- if (base::FeatureList::IsEnabled(features::kWebEnvironmentIntegrity)) {
- map->Add<blink::mojom::EnvironmentIntegrityService>(
- base::BindRepeating(&EnvironmentIntegrityServiceImpl::Create));
- }
#else
map->Add<blink::mojom::TextSuggestionHost>(base::BindRepeating(
&EmptyBinderForFrame<blink::mojom::TextSuggestionHost>));
- if (base::FeatureList::IsEnabled(features::kWebEnvironmentIntegrity)) {
@@ -1144,10 +1143,6 @@ void PopulateBinderMapWithContext(
map->Add<blink::mojom::BrowsingTopicsDocumentService>(
base::BindRepeating(&BrowsingTopicsDocumentHost::CreateMojoService));
}
- if (base::FeatureList::IsEnabled(blink::features::kWebEnvironmentIntegrity)) {
- map->Add<blink::mojom::EnvironmentIntegrityService>(base::BindRepeating(
- &EmptyBinderForFrame<blink::mojom::EnvironmentIntegrityService>));
- }
#endif // BUILDFLAG(IS_ANDROID)
map->Add<blink::mojom::ClipboardHost>(
--- a/content/browser/environment_integrity/environment_integrity_service_impl.cc
+++ b/content/browser/environment_integrity/environment_integrity_service_impl.cc
@@ -20,17 +20,10 @@ EnvironmentIntegrityServiceImpl::~Enviro
void EnvironmentIntegrityServiceImpl::Create(
content::RenderFrameHost* render_frame_host,
mojo::PendingReceiver<blink::mojom::EnvironmentIntegrityService> receiver) {
- CHECK(render_frame_host);
-
- // The object is bound to the lifetime of `render_frame_host` and the mojo
- // connection. See DocumentService for details.
- new EnvironmentIntegrityServiceImpl(*render_frame_host, std::move(receiver));
}
void EnvironmentIntegrityServiceImpl::GetEnvironmentIntegrity(
GetEnvironmentIntegrityCallback callback) {
- // TODO(crbug.com/1439945) Get integrity token from PIA Crystal API.
- std::move(callback).Run();
}
} // namespace content
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -396,8 +396,6 @@ void SetRuntimeFeaturesFromChromiumFeatu
{"WebAppTabStrip", raw_ref(features::kDesktopPWAsTabStrip)},
{"WebAppTabStripCustomizations",
raw_ref(blink::features::kDesktopPWAsTabStripCustomizations)},
- {"WebEnvironmentIntegrity",
- raw_ref(features::kWebEnvironmentIntegrity)},
{"WebSerialBluetooth",
raw_ref(features::kEnableBluetoothSerialPortProfileInSerialApi)},
{"WGIGamepadTriggerRumble",
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -1433,10 +1433,6 @@ BASE_FEATURE(kWebBluetoothNewPermissions
"WebBluetoothNewPermissionsBackend",
base::FEATURE_DISABLED_BY_DEFAULT);
-// Enables the Web Environment Integrity API.
-BASE_FEATURE(kWebEnvironmentIntegrity,
- "WebEnvironmentIntegrity",
- base::FEATURE_DISABLED_BY_DEFAULT);
// If WebGL Image Chromium is allowed, this feature controls whether it is
// enabled.
--- a/content/public/common/content_features.h
+++ b/content/public/common/content_features.h
@@ -318,7 +318,6 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWeb
CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAuthnTouchToFillCredentialSelection);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebBluetooth);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebBluetoothNewPermissionsBackend);
-CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebEnvironmentIntegrity);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebGLImageChromium);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebMidi);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebOtpBackendAuto);
#if !BUILDFLAG(IS_ANDROID)
map->Add<blink::mojom::DirectSocketsService>(
base::BindRepeating(&DirectSocketsServiceImpl::CreateForFrame));
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -65,7 +65,6 @@ mojom("mojom_platform") {
@@ -121,7 +99,7 @@
"fenced_frame/fenced_frame_config.mojom",
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -1883,8 +1883,6 @@ generated_interface_sources_in_modules =
@@ -1905,8 +1905,6 @@ generated_interface_sources_in_modules =
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk.h",
@@ -132,15 +110,28 @@
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_entry_sync.cc",
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -242,8 +242,6 @@ static_idl_files_in_modules = get_path_i
"//third_party/blink/renderer/modules/encryptedmedia/media_keys_get_status_for_policy.idl",
"//third_party/blink/renderer/modules/encryptedmedia/media_keys_policy.idl",
"//third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.idl",
- "//third_party/blink/renderer/modules/environment_integrity/environment_integrity.idl",
- "//third_party/blink/renderer/modules/environment_integrity/navigator_environment_integrity.idl",
"//third_party/blink/renderer/modules/eventsource/event_source.idl",
"//third_party/blink/renderer/modules/eventsource/event_source_init.idl",
"//third_party/blink/renderer/modules/eyedropper/color_selection_options.idl",
@@ -241,8 +241,6 @@ static_idl_files_in_modules = [
"//third_party/blink/renderer/modules/encryptedmedia/media_keys_get_status_for_policy.idl",
"//third_party/blink/renderer/modules/encryptedmedia/media_keys_policy.idl",
"//third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.idl",
- "//third_party/blink/renderer/modules/environment_integrity/environment_integrity.idl",
- "//third_party/blink/renderer/modules/environment_integrity/navigator_environment_integrity.idl",
"//third_party/blink/renderer/modules/eventsource/event_source.idl",
"//third_party/blink/renderer/modules/eventsource/event_source_init.idl",
"//third_party/blink/renderer/modules/eyedropper/color_selection_options.idl",
--- a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
+++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
@@ -548,10 +548,6 @@ bool OriginTrialContext::CanEnableTrialF
return base::FeatureList::IsEnabled(features::kComputePressure);
}
- if (trial_name == "WebEnvironmentIntegrity") {
- return base::FeatureList::IsEnabled(features::kWebEnvironmentIntegrity);
- }
-
return true;
}
--- a/third_party/blink/renderer/modules/BUILD.gn
+++ b/third_party/blink/renderer/modules/BUILD.gn
@@ -90,7 +90,6 @@ component("modules") {
@@ -153,14 +144,19 @@
"//third_party/blink/renderer/modules/eyedropper",
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3920,12 +3920,6 @@
@@ -3954,17 +3954,6 @@
base_feature: "none",
},
{
- name: "WebEnvironmentIntegrity",
- status: "experimental",
- base_feature: "none",
- origin_trial_feature_name: "WebEnvironmentIntegrity",
- // base_feature is meant as kill-switch. The RuntimeFeature should follow
- // the `status` field or Origin Trial unless explicitly overriden by
- // Finch / command line flags.
- base_feature_status: "enabled",
- copied_from_base_feature_if: "overridden",
- origin_trial_allows_third_party: true,
- },
- {
name: "WebFontResizeLCP",

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -631,12 +631,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -661,12 +661,6 @@ std::vector<url::Origin> ChromeContentBr
GetOriginsRequiringDedicatedProcess() {
std::vector<url::Origin> list;

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

@@ -1,6 +1,6 @@
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -348,12 +348,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
@@ -339,12 +339,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
// Enable DNS over HTTPS (DoH).
BASE_FEATURE(kDnsOverHttps,
"DnsOverHttps",
@@ -15,7 +15,7 @@
// Set whether fallback to insecure DNS is allowed by default. This setting may
--- a/net/dns/public/doh_provider_entry.cc
+++ b/net/dns/public/doh_provider_entry.cc
@@ -160,32 +160,6 @@ const DohProviderEntry::List& DohProvide
@@ -174,32 +174,6 @@ const DohProviderEntry::List& DohProvide
/*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
LoggingLevel::kNormal),
new DohProviderEntry(

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

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -957,8 +957,6 @@ if (is_win) {
@@ -953,8 +953,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -14,7 +14,7 @@
# from disk image and Keystone promotion (if so enabled). It
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -366,7 +366,7 @@ source_set("lib") {
@@ -389,7 +389,7 @@ source_set("lib") {
}
}
@@ -25,13 +25,14 @@
testonly = true
--- a/chrome/test/variations/BUILD.gn
+++ b/chrome/test/variations/BUILD.gn
@@ -49,6 +49,5 @@ python_library("variations_desktop_smoke
":test_utils",
"//testing:run_isolated_script_test",
"//testing:test_scripts_shared",
- "//third_party/catapult/third_party/gsutil:gsutil",
]
@@ -7,7 +7,6 @@ python_library("test_utils") {
data = [ "//chrome/test/variations/test_utils/" ]
- data_deps = [ "//third_party/catapult/third_party/gsutil:gsutil" ]
}
python_library("fixtures") {
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -308,8 +308,6 @@ source_set("unit_tests") {
@@ -45,7 +46,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -728,10 +728,6 @@ if (is_apple) {
@@ -733,10 +733,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -299,8 +299,6 @@ static_library("browser") {
@@ -301,8 +301,6 @@ static_library("browser") {
"commerce/shopping_service_factory.h",
"complex_tasks/task_tab_helper.cc",
"complex_tasks/task_tab_helper.h",
@@ -11,7 +11,7 @@
"component_updater/chrome_component_updater_configurator.cc",
"component_updater/chrome_component_updater_configurator.h",
"component_updater/chrome_origin_trials_component_installer.cc",
@@ -627,8 +625,6 @@ static_library("browser") {
@@ -631,8 +629,6 @@ static_library("browser") {
"internal_auth.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -20,7 +20,7 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"ip_protection/blind_sign_http_impl.cc",
@@ -3643,10 +3639,6 @@ static_library("browser") {
@@ -3690,10 +3686,6 @@ static_library("browser") {
"enterprise/connectors/analysis/analysis_service_settings.h",
"enterprise/connectors/analysis/analysis_settings.cc",
"enterprise/connectors/analysis/analysis_settings.h",
@@ -31,7 +31,7 @@
"enterprise/connectors/analysis/content_analysis_dialog.cc",
"enterprise/connectors/analysis/content_analysis_dialog.h",
"enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
@@ -3947,10 +3939,6 @@ static_library("browser") {
@@ -3994,10 +3986,6 @@ static_library("browser") {
"new_tab_page/modules/recipes/recipes_service_factory.h",
"new_tab_page/modules/recipes/time_format_util.cc",
"new_tab_page/modules/recipes/time_format_util.h",
@@ -39,18 +39,18 @@
- "new_tab_page/modules/safe_browsing/safe_browsing_handler.h",
- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.cc",
- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.h",
"new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.cc",
"new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.h",
"new_tab_page/new_tab_page_util.cc",
"new_tab_page/new_tab_page_util.h",
"new_tab_page/one_google_bar/one_google_bar_data.cc",
@@ -4422,7 +4410,6 @@ static_library("browser") {
@@ -4480,7 +4468,6 @@ static_library("browser") {
"//chrome/browser/new_tab_page/modules/history_clusters/cart:mojo_bindings",
"//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
"//chrome/browser/new_tab_page/modules/recipes:mojo_bindings",
- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings",
"//chrome/browser/policy:path_parser",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
@@ -6191,10 +6178,6 @@ static_library("browser") {
@@ -6261,10 +6248,6 @@ static_library("browser") {
sources += [
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
@@ -61,7 +61,7 @@
"enterprise/connectors/device_trust/attestation/browser/attestation_switches.cc",
"enterprise/connectors/device_trust/attestation/browser/attestation_switches.h",
"enterprise/connectors/device_trust/attestation/browser/attester.h",
@@ -7726,9 +7709,14 @@ static_library("browser") {
@@ -7794,9 +7777,14 @@ static_library("browser") {
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
"//components/safe_browsing/content/browser/download:download_stats",
"//components/safe_browsing/content/common:file_type_policies",
@@ -79,7 +79,7 @@
sources += [
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5033,11 +5033,13 @@ ChromeContentBrowserClient::CreateThrott
@@ -5116,11 +5116,13 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -93,7 +93,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -6755,26 +6757,7 @@ ChromeContentBrowserClient::GetSafeBrows
@@ -6838,26 +6840,7 @@ ChromeContentBrowserClient::GetSafeBrows
? content::BrowserThread::UI
: content::BrowserThread::IO);
@@ -121,7 +121,7 @@
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -6795,11 +6778,6 @@ ChromeContentBrowserClient::GetUrlLookup
@@ -6878,11 +6861,6 @@ ChromeContentBrowserClient::GetUrlLookup
GetForProfile(profile);
}
#endif
@@ -182,16 +182,6 @@
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && !BUILDFLAG(IS_CHROMEOS)
ManageScreenAIComponentRegistration(cus, g_browser_process->local_state());
#endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && !BUILDFLAG(IS_CHROMEOS)
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -73,6 +73,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_client.h"
#include "content/public/common/url_constants.h"
+#include "net/cert/x509_certificate.h"
#include "third_party/blink/public/common/input/web_gesture_event.h"
#include "third_party/blink/public/common/input/web_input_event.h"
#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
--- a/chrome/browser/download/bubble/download_bubble_ui_controller.cc
+++ b/chrome/browser/download/bubble/download_bubble_ui_controller.cc
@@ -28,7 +28,6 @@
@@ -202,7 +192,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -223,8 +222,6 @@ void DownloadBubbleUIController::Process
@@ -224,8 +223,6 @@ void DownloadBubbleUIController::Process
commands.ExecuteCommand(command);
break;
case DownloadCommands::REVIEW:
@@ -213,7 +203,7 @@
RetryDownload(model, command);
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -139,7 +139,6 @@ using content::DownloadManager;
@@ -140,7 +140,6 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -221,7 +211,23 @@
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -1507,7 +1506,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -597,15 +596,6 @@ bool ChromeDownloadManagerDelegate::Shou
#endif
bool should_open = download_prefs_->IsAutoOpenEnabled(url, path);
- int64_t file_type_uma_value =
- safe_browsing::FileTypePolicies::GetInstance()->UmaValueForFile(path);
- if (should_open) {
- base::UmaHistogramSparse("SBClientDownload.AutoOpenEnabledFileType",
- file_type_uma_value);
- } else {
- base::UmaHistogramSparse("SBClientDownload.AutoOpenDisabledFileType",
- file_type_uma_value);
- }
return should_open;
}
@@ -1529,7 +1519,6 @@ void ChromeDownloadManagerDelegate::OnDo
DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info->target_path, target_info->is_filetype_handled_safely);
@@ -229,7 +235,7 @@
}
if (ShouldBlockFile(item, target_info->danger_type)) {
MaybeReportDangerousDownloadBlocked(
@@ -1586,59 +1584,6 @@ bool ChromeDownloadManagerDelegate::IsOp
@@ -1608,59 +1597,6 @@ bool ChromeDownloadManagerDelegate::IsOp
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item,
download::DownloadDangerType danger_type) const {
@@ -289,7 +295,7 @@
return false;
}
@@ -1653,7 +1598,6 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1675,7 +1611,6 @@ void ChromeDownloadManagerDelegate::Mayb
service->MaybeSendDangerousDownloadOpenedReport(download,
show_download_in_folder);
}
@@ -297,7 +303,7 @@
if (!download->GetAutoOpened()) {
download::DownloadContent download_content =
download::DownloadContentFromMimeType(download->GetMimeType(), false);
@@ -1661,6 +1605,7 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1683,6 +1618,7 @@ void ChromeDownloadManagerDelegate::Mayb
download->GetDangerType(), download_content, base::Time::Now(),
download->GetEndTime(), show_download_in_folder);
}
@@ -305,7 +311,7 @@
}
void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
@@ -1718,8 +1663,7 @@ void ChromeDownloadManagerDelegate::Chec
@@ -1740,8 +1676,7 @@ void ChromeDownloadManagerDelegate::Chec
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -317,7 +323,7 @@
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -952,106 +952,10 @@ void DownloadItemModel::ExecuteCommand(D
@@ -960,80 +960,10 @@ void DownloadItemModel::ExecuteCommand(D
DownloadItemModel::BubbleUIInfo
DownloadItemModel::GetBubbleUIInfoForTailoredWarning() const {
@@ -329,21 +335,11 @@
- if (danger_type == download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT &&
- tailored_verdict.tailored_verdict_type() ==
- TailoredVerdict::SUSPICIOUS_ARCHIVE) {
- return DownloadUIModel::BubbleUIInfo()
- .AddSubpageSummary(l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SUSPICIOUS_ARCHIVE))
- .AddIconAndColor(features::IsChromeRefresh2023()
- ? vector_icons::kNotSecureWarningChromeRefreshIcon
- : vector_icons::kNotSecureWarningIcon,
- ui::kColorAlertMediumSeverityIcon)
- .AddSecondaryTextColor(ui::kColorAlertMediumSeverityText)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddPrimarySubpageButton(
- l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
- DownloadCommands::Command::DISCARD)
- .AddSecondarySubpageButton(
- l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_CONTINUE),
- DownloadCommands::Command::KEEP, ui::kColorAlertMediumSeverityText);
- return DownloadUIModel::BubbleUIInfo::SuspiciousUiPattern(
- l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_MALWARE),
- l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_CONTINUE_SUSPICIOUS_FILE));
- }
-
- // Cookie theft
@@ -364,31 +360,15 @@
- "SBClientDownload.TailoredWarning.HasVaidEmailForAccountInfo",
- !email.empty());
- if (!email.empty()) {
- return DownloadUIModel::BubbleUIInfo()
- .AddSubpageSummary(l10n_util::GetStringFUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_COOKIE_THEFT_AND_ACCOUNT,
- base::ASCIIToUTF16(email)))
- .AddIconAndColor(features::IsChromeRefresh2023()
- ? vector_icons::kDangerousChromeRefreshIcon
- : vector_icons::kDangerousIcon,
- ui::kColorAlertHighSeverity)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddPrimarySubpageButton(
- l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
- DownloadCommands::Command::DISCARD);
- return DownloadUIModel::BubbleUIInfo::DangerousUiPattern(
- l10n_util::GetStringFUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_COOKIE_THEFT_AND_ACCOUNT,
- base::ASCIIToUTF16(email)));
- }
- }
- return DownloadUIModel::BubbleUIInfo()
- .AddSubpageSummary(l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_COOKIE_THEFT))
- .AddIconAndColor(features::IsChromeRefresh2023()
- ? vector_icons::kDangerousChromeRefreshIcon
- : vector_icons::kDangerousIcon,
- ui::kColorAlertHighSeverity)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddPrimarySubpageButton(
- l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
- DownloadCommands::Command::DISCARD);
- return DownloadUIModel::BubbleUIInfo::DangerousUiPattern(
- l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_COOKIE_THEFT));
- }
-
- NOTREACHED();
@@ -558,7 +538,7 @@
void FilesRequestHandler::OnGotFileInfo(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
size_t index,
@@ -246,14 +206,6 @@ void FilesRequestHandler::OnGotFileInfo(
@@ -253,14 +213,6 @@ void FilesRequestHandler::OnGotFileInfo(
void FilesRequestHandler::FinishRequestEarly(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
safe_browsing::BinaryUploadService::Result result) {
@@ -588,7 +568,7 @@
void OnGotFileInfo(
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
@@ -429,19 +429,6 @@ absl::optional<std::string> ConnectorsSe
@@ -439,19 +439,6 @@ absl::optional<std::string> ConnectorsSe
return absl::nullopt;
}
@@ -670,11 +650,12 @@
signals.Set(device_signals::names::kBuiltInDnsClientEnabled,
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -433,7 +433,7 @@ void RealtimeReportingClient::ReportEven
@@ -509,8 +509,7 @@ void RealtimeReportingClient::ReportEven
}
std::string RealtimeReportingClient::GetProfileUserName() const {
- return safe_browsing::GetProfileEmail(identity_manager_);
- return identity_manager_ ? safe_browsing::GetProfileEmail(identity_manager_)
- : std::string();
+ return std::string();
}
@@ -806,7 +787,7 @@
} // namespace utils
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -296,10 +296,6 @@ static_library("extensions") {
@@ -298,10 +298,6 @@ static_library("extensions") {
"api/runtime/chrome_runtime_api_delegate.h",
"api/safe_browsing_private/safe_browsing_private_api.cc",
"api/safe_browsing_private/safe_browsing_private_api.h",
@@ -817,7 +798,7 @@
"api/safe_browsing_private/safe_browsing_util.cc",
"api/safe_browsing_private/safe_browsing_util.h",
"api/search/search_api.cc",
@@ -638,8 +634,6 @@ static_library("extensions") {
@@ -640,8 +636,6 @@ static_library("extensions") {
"menu_manager_factory.h",
"navigation_observer.cc",
"navigation_observer.h",
@@ -933,7 +914,7 @@
void Blocklist::GetMalwareIDs(const std::set<std::string>& ids,
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -730,76 +730,23 @@ void ChromeExtensionsBrowserClient::Noti
@@ -723,76 +723,23 @@ void ChromeExtensionsBrowserClient::Noti
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::string& code) const {
@@ -1011,14 +992,14 @@
}
// static
@@ -968,7 +915,6 @@ void ChromeExtensionsBrowserClient::GetW
@@ -961,7 +908,6 @@ void ChromeExtensionsBrowserClient::GetW
void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager(
content::WebContents* web_contents) const {
- ChromePasswordReuseDetectionManagerClient::CreateForWebContents(web_contents);
}
} // namespace extensions
media_device_salt::MediaDeviceSaltService*
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -52,7 +52,6 @@
@@ -1210,7 +1191,7 @@
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -451,8 +451,6 @@ void ExtensionSystemImpl::InstallUpdate(
@@ -448,8 +448,6 @@ void ExtensionSystemImpl::InstallUpdate(
void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes(
const std::string& extension_id,
const base::Value::Dict& attributes) {
@@ -1255,7 +1236,7 @@
}
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -32,7 +32,6 @@
@@ -33,7 +33,6 @@
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
#include "chrome/browser/profiles/profile.h"
@@ -1263,7 +1244,7 @@
#include "chrome/browser/ui/file_system_access_dialogs.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pdf_util.h"
@@ -404,85 +403,6 @@ bool ShouldBlockAccessToPath(const base:
@@ -401,86 +400,6 @@ bool ShouldBlockAccessToPath(const base:
return true;
}
@@ -1338,6 +1319,7 @@
- case Result::SENSITIVE_CONTENT_BLOCK:
- case Result::DEEP_SCANNED_SAFE:
- case Result::PROMPT_FOR_SCANNING:
- case Result::DEEP_SCANNED_FAILED:
- NOTREACHED();
- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
- kAllow;
@@ -1349,7 +1331,7 @@
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
return id.empty() ? kDefaultLastPickedDirectoryKey
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
@@ -502,13 +422,7 @@ base::StringPiece GetGrantKeyFromGrantTy
@@ -500,13 +419,7 @@ std::string_view GetGrantKeyFromGrantTyp
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -1364,7 +1346,7 @@
}
} // namespace
@@ -1340,29 +1254,6 @@ void ChromeFileSystemAccessPermissionCon
@@ -1418,29 +1331,6 @@ void ChromeFileSystemAccessPermissionCon
std::move(callback));
}
@@ -1396,7 +1378,7 @@
const base::FilePath& path,
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
@@ -90,10 +90,6 @@ class ChromeFileSystemAccessPermissionCo
@@ -93,10 +93,6 @@ class ChromeFileSystemAccessPermissionCo
UserAction user_action,
content::GlobalRenderFrameHostId frame_id,
base::OnceCallback<void(SensitiveEntryResult)> callback) override;
@@ -1451,7 +1433,7 @@
NotificationHandler::Type::EXTENSION,
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -36,7 +36,6 @@
@@ -30,7 +30,6 @@
#include "chrome/browser/password_manager/password_reuse_manager_factory.h"
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -1459,7 +1441,7 @@
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/sync_service_factory.h"
@@ -847,6 +846,7 @@ autofill::LanguageCode ChromePasswordMan
@@ -854,6 +853,7 @@ autofill::LanguageCode ChromePasswordMan
return autofill::LanguageCode();
}
@@ -1467,7 +1449,7 @@
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
return safe_browsing::ChromePasswordProtectionService::
@@ -866,6 +866,7 @@ void ChromePasswordManagerClient::CheckS
@@ -873,6 +873,7 @@ void ChromePasswordManagerClient::CheckS
}
}
#endif // defined(ON_FOCUS_PING_ENABLED)
@@ -1475,7 +1457,7 @@
#if !BUILDFLAG(IS_ANDROID)
void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
@@ -873,28 +874,10 @@ void ChromePasswordManagerClient::MaybeR
@@ -880,28 +881,10 @@ void ChromePasswordManagerClient::MaybeR
bool is_federated,
const url::Origin& federated_origin,
const std::u16string& login_user_name) const {
@@ -1504,7 +1486,7 @@
}
#endif
@@ -1435,6 +1418,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1445,6 +1428,7 @@ bool ChromePasswordManagerClient::IsPass
is_enabled = false;
}
@@ -1512,7 +1494,7 @@
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Disable password
@@ -1445,6 +1429,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1455,6 +1439,7 @@ bool ChromePasswordManagerClient::IsPass
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -1654,14 +1636,25 @@
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -332,52 +332,5 @@ bool PredictionBasedPermissionUiSelector
@@ -334,63 +334,5 @@ bool PredictionBasedPermissionUiSelector
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
permissions::RequestType request_type) {
- if (!safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) {
return PredictionSource::USE_NONE;
- if (base::FeatureList::IsEnabled(
- permissions::features::kPermissionDedicatedCpssSetting)) {
- if (request_type == permissions::RequestType::kNotifications &&
- !profile_->GetPrefs()->GetBoolean(prefs::kEnableNotificationCPSS)) {
- return PredictionSource::USE_NONE;
- }
- if (request_type == permissions::RequestType::kGeolocation &&
- !profile_->GetPrefs()->GetBoolean(prefs::kEnableGeolocationCPSS)) {
- return PredictionSource::USE_NONE;
- }
- } else {
- if (!safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) {
- return PredictionSource::USE_NONE;
- }
- }
-
- bool is_server_side_prediction_enabled = false;
- bool is_ondevice_prediction_enabled = false;
-
@@ -1704,7 +1697,7 @@
- } else if (is_ondevice_prediction_enabled) {
- return PredictionSource::USE_ONDEVICE;
- } else {
- return PredictionSource::USE_NONE;
return PredictionSource::USE_NONE;
- }
}
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -1717,7 +1710,7 @@
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -1994,8 +1995,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2045,8 +2046,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -1726,7 +1719,7 @@
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
handlers->AddHandler(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
@@ -2078,13 +2077,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2129,13 +2128,6 @@ std::unique_ptr<ConfigurationPolicyHandl
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
@@ -1742,7 +1735,7 @@
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -263,7 +263,6 @@
@@ -267,7 +267,6 @@
#include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
#include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
#include "chrome/browser/new_tab_page/modules/recipes/recipes_service.h"
@@ -1750,7 +1743,7 @@
#include "chrome/browser/new_tab_page/promos/promo_service.h"
#include "chrome/browser/policy/developer_tools_policy_handler.h"
#include "chrome/browser/search/background/ntp_custom_background_service.h"
@@ -1720,7 +1719,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -1818,7 +1817,6 @@ void RegisterProfilePrefs(user_prefs::Pr
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
NewTabUI::RegisterProfilePrefs(registry);
@@ -1760,50 +1753,50 @@
PinnedTabCodec::RegisterProfilePrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -654,9 +654,6 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
@@ -679,9 +679,6 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance();
-#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
ExitTypeServiceFactory::GetInstance();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_ANDROID)
enterprise_idle::IdleServiceFactory::GetInstance();
@@ -961,23 +958,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if !BUILDFLAG(IS_ANDROID)
ResetReportUploaderFactory::GetInstance();
#endif
@@ -954,7 +951,6 @@ void ChromeBrowserMainExtraPartsProfiles
safe_browsing::CloudBinaryUploadServiceFactory::GetInstance();
safe_browsing::ExtensionTelemetryServiceFactory::GetInstance();
safe_browsing::HashRealTimeServiceFactory::GetInstance();
-#if BUILDFLAG(FULL_SAFE_BROWSING)
- safe_browsing::AdvancedProtectionStatusManagerFactory::GetInstance();
- safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory::GetInstance();
-#endif
safe_browsing::ChromePasswordProtectionServiceFactory::GetInstance();
safe_browsing::ChromePingManagerFactory::GetInstance();
safe_browsing::ClientSideDetectionServiceFactory::GetInstance();
@@ -962,6 +958,7 @@ void ChromeBrowserMainExtraPartsProfiles
safe_browsing::SafeBrowsingMetricsCollectorFactory::GetInstance();
safe_browsing::SafeBrowsingNavigationObserverManagerFactory::GetInstance();
safe_browsing::VerdictCacheManagerFactory::GetInstance();
+#endif
- safe_browsing::ChromePasswordProtectionServiceFactory::GetInstance();
- safe_browsing::ChromePingManagerFactory::GetInstance();
- safe_browsing::ClientSideDetectionServiceFactory::GetInstance();
-#if BUILDFLAG(FULL_SAFE_BROWSING)
- safe_browsing::CloudBinaryUploadServiceFactory::GetInstance();
- safe_browsing::ExtensionTelemetryServiceFactory::GetInstance();
- safe_browsing::HashRealTimeServiceFactory::GetInstance();
-#endif
- safe_browsing::RealTimeUrlLookupServiceFactory::GetInstance();
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetInstance();
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::GetInstance();
- safe_browsing::TailoredSecurityServiceFactory::GetInstance();
- safe_browsing::VerdictCacheManagerFactory::GetInstance();
SafeSearchFactory::GetInstance();
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
screen_ai::AXScreenAIAnnotatorFactory::EnsureFactoryBuilt();
screen_ai::PdfOcrControllerFactory::GetInstance();
@@ -1020,7 +1017,6 @@ void ChromeBrowserMainExtraPartsProfiles
}
#endif
TabRestoreServiceFactory::GetInstance();
- safe_browsing::TailoredSecurityServiceFactory::GetInstance();
TemplateURLFetcherFactory::GetInstance();
TemplateURLServiceFactory::GetInstance();
#if !BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/settings/lazy_load.ts
+++ b/chrome/browser/resources/settings/lazy_load.ts
@@ -193,7 +193,6 @@ export {SettingsPrivacyGuideDialogElemen
@@ -173,7 +173,6 @@ export {SettingsPrivacyGuideDialogElemen
export {PrivacyGuideHistorySyncFragmentElement} from './privacy_page/privacy_guide/privacy_guide_history_sync_fragment.js';
export {PrivacyGuideMsbbFragmentElement} from './privacy_page/privacy_guide/privacy_guide_msbb_fragment.js';
export {SettingsPrivacyGuidePageElement} from './privacy_page/privacy_guide/privacy_guide_page.js';
-export {PrivacyGuideSafeBrowsingFragmentElement} from './privacy_page/privacy_guide/privacy_guide_safe_browsing_fragment.js';
export {PrivacyGuideSearchSuggestionsFragmentElement} from './privacy_page/privacy_guide/privacy_guide_search_suggestions_fragment.js';
export {PrivacyGuideWelcomeFragmentElement} from './privacy_page/privacy_guide/privacy_guide_welcome_fragment.js';
export {SettingsPrivacySandboxAdMeasurementSubpageElement} from './privacy_page/privacy_sandbox/privacy_sandbox_ad_measurement_subpage.js';
export {SettingsPrivacySandboxFledgeSubpageElement} from './privacy_page/privacy_sandbox/privacy_sandbox_fledge_subpage.js';
--- a/chrome/browser/resources/settings/privacy_page/privacy_guide/privacy_guide_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_guide/privacy_guide_page.ts
@@ -16,7 +16,6 @@ import './privacy_guide_completion_fragm
@@ -1811,9 +1804,9 @@
import './privacy_guide_history_sync_fragment.js';
import './privacy_guide_msbb_fragment.js';
-import './privacy_guide_safe_browsing_fragment.js';
import './privacy_guide_search_suggestions_fragment.js';
import './privacy_guide_welcome_fragment.js';
import './step_indicator.js';
--- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
+++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
@@ -71,10 +71,6 @@ void FileOpeningJob::ProcessNextTask(bas
@@ -1842,8 +1835,8 @@
~FileOpeningTask();
- // Non-owning pointer to the request corresponding to the file to open.
- raw_ptr<safe_browsing::FileAnalysisRequest, DanglingUntriaged> request =
- nullptr;
- raw_ptr<safe_browsing::FileAnalysisRequest, AcrossTasksDanglingUntriaged>
- request = nullptr;
-
// Indicates if this task has been taken and is owned by a thread.
std::atomic_bool taken{false};
@@ -2005,7 +1998,7 @@
} // namespace
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -665,7 +665,6 @@ static_library("ui") {
@@ -572,7 +572,6 @@ static_library("ui") {
"//components/renderer_context_menu",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -2013,7 +2006,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser/db:database_manager",
@@ -3777,8 +3776,6 @@ static_library("ui") {
@@ -3759,8 +3758,6 @@ static_library("ui") {
"startup/web_app_startup_utils.h",
"tab_contents/chrome_web_contents_menu_helper.cc",
"tab_contents/chrome_web_contents_menu_helper.h",
@@ -2022,7 +2015,7 @@
"views/autofill/payments/virtual_card_selection_dialog_view.cc",
"views/autofill/payments/virtual_card_selection_dialog_view.h",
"views/autofill/payments/webauthn_dialog_view.cc",
@@ -5268,8 +5265,6 @@ static_library("ui") {
@@ -5339,8 +5336,6 @@ static_library("ui") {
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
@@ -2059,7 +2052,7 @@
void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -342,7 +342,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -348,7 +348,6 @@ void TabHelpers::AttachTabHelpers(WebCon
ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
web_contents,
autofill::ContentAutofillClient::FromWebContents(web_contents));
@@ -2213,7 +2206,7 @@
// DownloadsDOMHandler, private: --------------------------------------------
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -1009,12 +1009,6 @@ base::Value::Dict ManagementUIHandler::G
@@ -1025,12 +1025,6 @@ base::Value::Dict ManagementUIHandler::G
&info);
}
@@ -2270,7 +2263,7 @@
std::move(callback),
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1544,7 +1544,6 @@ if (!is_android) {
@@ -1640,7 +1640,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2278,7 +2271,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -6368,7 +6367,6 @@ test("unit_tests") {
@@ -6543,7 +6542,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2286,9 +2279,34 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:mock_password_protection",
"//components/safe_browsing/content/browser/web_ui",
--- a/components/enterprise/buildflags/buildflags.gni
+++ b/components/enterprise/buildflags/buildflags.gni
@@ -12,11 +12,11 @@ declare_args() {
# Enable support for content analysis against a cloud agent for Enterprise
# Connector policies.
enterprise_cloud_content_analysis =
- is_win || is_mac || is_linux || is_chromeos
+ false
# Enable support for content analysis against a cloud agent for Enterprise
# Connector policies.
- enterprise_local_content_analysis = is_win || is_mac || is_linux
+ enterprise_local_content_analysis = false
}
declare_args() {
@@ -25,7 +25,7 @@ declare_args() {
# the fact that `enterprise_cloud_content_analysis` is a superset of
# `enterprise_local_content_analysis`.
enterprise_content_analysis =
- enterprise_cloud_content_analysis || enterprise_local_content_analysis
+ false
}
# These two flags are equivalent, but `enable_print_content_analysis` still
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -473,7 +473,7 @@ void ContentPasswordManagerDriver::Check
@@ -484,7 +484,7 @@ void ContentPasswordManagerDriver::Check
if (!password_manager::bad_message::CheckFrameNotPrerendering(
render_frame_host_))
return;
@@ -2299,7 +2317,7 @@
}
--- a/components/password_manager/core/browser/password_manager_client.h
+++ b/components/password_manager/core/browser/password_manager_client.h
@@ -392,11 +392,14 @@ class PasswordManagerClient {
@@ -398,11 +398,14 @@ class PasswordManagerClient {
// Returns the current best guess as to the page's display language.
virtual autofill::LanguageCode GetPageLanguage() const;
@@ -2334,7 +2352,7 @@
+# }
--- a/components/safe_browsing/content/common/safe_browsing.mojom
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
@@ -133,7 +133,6 @@ interface PhishingDetector {
@@ -134,7 +134,6 @@ interface PhishingDetector {
=> (PhishingDetectorResult result, string request_proto);
};
@@ -2344,7 +2362,7 @@
interface PhishingModelSetter {
--- a/components/safe_browsing/core/browser/BUILD.gn
+++ b/components/safe_browsing/core/browser/BUILD.gn
@@ -23,8 +23,6 @@ source_set("browser") {
@@ -25,8 +25,6 @@ source_set("browser") {
"url_checker_delegate.h",
"url_realtime_mechanism.cc",
"url_realtime_mechanism.h",
@@ -2430,9 +2448,29 @@
}
void OhttpKeyService::Shutdown() {
--- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
+++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
@@ -516,17 +516,6 @@ void TailoredSecurityService::Shutdown()
}
void TailoredSecurityService::TailoredSecurityTimestampUpdateCallback() {
- if (base::FeatureList::IsEnabled(
- safe_browsing::kTailoredSecurityRetryForSyncUsers)) {
- // TODO(crbug.com/1469133): remove sync flow last user interaction pref.
- prefs_->SetInteger(prefs::kTailoredSecuritySyncFlowLastUserInteractionState,
- TailoredSecurityRetryState::UNKNOWN);
- prefs_->SetInteger(prefs::kTailoredSecuritySyncFlowRetryState,
- TailoredSecurityRetryState::UNKNOWN);
- prefs_->SetTime(prefs::kTailoredSecuritySyncFlowLastRunTime,
- base::Time::Now());
- }
-
StartRequest(base::BindOnce(&TailoredSecurityService::MaybeNotifySyncUser,
weak_ptr_factory_.GetWeakPtr()));
}
--- a/components/safe_browsing/core/browser/verdict_cache_manager.cc
+++ b/components/safe_browsing/core/browser/verdict_cache_manager.cc
@@ -453,16 +453,6 @@ VerdictCacheManager::VerdictCacheManager
@@ -455,16 +455,6 @@ VerdictCacheManager::VerdictCacheManager
// pref_service can be null in tests.
if (pref_service) {
pref_change_registrar_.Init(pref_service);
@@ -2575,7 +2613,7 @@
// possible to request one. This is used to block file dialogs from being
--- a/content/public/test/fake_file_system_access_permission_context.cc
+++ b/content/public/test/fake_file_system_access_permission_context.cc
@@ -46,13 +46,6 @@ void FakeFileSystemAccessPermissionConte
@@ -47,13 +47,6 @@ void FakeFileSystemAccessPermissionConte
std::move(callback).Run(SensitiveEntryResult::kAllowed);
}
@@ -2632,9 +2670,9 @@
declare_args() {
--- a/weblayer/BUILD.gn
+++ b/weblayer/BUILD.gn
@@ -473,7 +473,6 @@ source_set("weblayer_lib_base") {
"//components/profile_metrics",
@@ -474,7 +474,6 @@ source_set("weblayer_lib_base") {
"//components/reduce_accept_language/browser",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection",
"//components/safe_browsing/content/browser/web_ui",

710
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
@@ -154,6 +154,7 @@
@@ -155,6 +155,7 @@
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/strings/grit/components_strings.h"
#include "components/supervised_user/core/common/buildflags.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"
@@ -1990,6 +1991,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2003,6 +2004,7 @@ void RenderViewContextMenu::AppendPageIt
menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
if (CanTranslate(/*menu_logging=*/true)) {
@@ -47,7 +47,7 @@
request_pending_ = true;
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -834,8 +834,9 @@ void TranslateManager::FilterIsTranslate
@@ -825,8 +825,9 @@ void TranslateManager::FilterIsTranslate
TriggerDecision::kDisabledOffline);
}

28
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
@@ -2446,6 +2446,7 @@ static_library("browser") {
@@ -2461,6 +2461,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
@@ -160,6 +160,7 @@
@@ -158,6 +158,7 @@
#include "components/translate/core/browser/translate_ranker_impl.h"
#include "components/translate/core/common/translate_util.h"
#include "components/ui_devtools/switches.h"
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/attribution_reporting/attribution_manager.h"
@@ -3585,6 +3586,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3604,6 +3605,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -74,7 +74,7 @@
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -102,6 +102,7 @@ target(link_target_type, "child") {
"//third_party/blink/public/common",
"//third_party/blink/public/common:buildflags",
"//third_party/blink/public/strings",
"//third_party/ced",
+ "//components/ungoogled:ungoogled_switches",
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -471,6 +472,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -462,6 +463,10 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kEnableWebGPUDeveloperFeatures, true},
{wrf::EnableDirectSockets, switches::kEnableIsolatedWebAppsInRenderer,
true},
@@ -124,7 +124,7 @@
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -941,6 +942,14 @@ Range* Document::CreateRangeAdjustedToTr
@@ -939,6 +940,14 @@ Range* Document::CreateRangeAdjustedToTr
Position::BeforeNode(*shadow_host));
}
@@ -139,7 +139,7 @@
SelectorQueryCache& Document::GetSelectorQueryCache() {
if (!selector_query_cache_)
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
@@ -2289,6 +2298,15 @@ void Document::UpdateStyleAndLayoutTreeF
@@ -2291,6 +2300,15 @@ void Document::UpdateStyleAndLayoutTreeF
#if DCHECK_IS_ON()
AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
#endif
@@ -157,7 +157,7 @@
void Document::InvalidateStyleAndLayoutForFontUpdates() {
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -532,6 +532,10 @@ class CORE_EXPORT Document : public Cont
@@ -531,6 +531,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -168,7 +168,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2429,6 +2433,9 @@ class CORE_EXPORT Document : public Cont
@@ -2416,6 +2420,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -180,7 +180,7 @@
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2116,6 +2116,11 @@ DOMRectList* Element::getClientRects() {
@@ -2142,6 +2142,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -192,7 +192,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2143,6 +2148,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2169,6 +2174,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -267,7 +267,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
@@ -942,9 +942,15 @@ TextMetrics* CanvasRenderingContext2D::m
@@ -924,9 +924,15 @@ TextMetrics* CanvasRenderingContext2D::m
TextDirection direction =
ToTextDirection(GetState().GetDirection(), canvas());
@@ -286,7 +286,7 @@
void CanvasRenderingContext2D::drawFormattedText(
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1700,6 +1700,7 @@ component("platform") {
@@ -1687,6 +1687,7 @@ component("platform") {
"//cc/mojo_embedder",
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
@@ -311,7 +311,7 @@
} // namespace blink
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1789,6 +1789,12 @@
@@ -1747,6 +1747,12 @@
origin_trial_feature_name: "Focusgroup",
},
{

12
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
@@ -3588,6 +3588,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3607,6 +3607,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
@@ -476,6 +476,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -467,6 +467,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -65,7 +65,7 @@ approach to change color components.
};
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -41,6 +41,7 @@
@@ -42,6 +42,7 @@
#include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h"
#include "third_party/blink/renderer/platform/graphics/graphics_context.h"
#include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
@@ -73,7 +73,7 @@ approach to change color components.
#include "third_party/blink/renderer/platform/graphics/stroke_data.h"
#include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
@@ -2183,6 +2184,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2185,6 +2186,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
@@ -1656,7 +1656,9 @@ component("platform") {
@@ -1643,7 +1643,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -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
@@ -1795,6 +1795,9 @@
@@ -1753,6 +1753,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

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

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2176,6 +2176,7 @@ static_library("browser") {
@@ -2188,6 +2188,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -63,7 +63,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
@@ -105,6 +107,7 @@
@@ -106,6 +108,7 @@
#include "components/metrics/metrics_service.h"
#include "components/metrics_services_manager/metrics_services_manager.h"
#include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -71,7 +71,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/permissions/permissions_client.h"
#include "components/policy/core/common/policy_service.h"
@@ -136,6 +139,7 @@
@@ -137,6 +140,7 @@
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "net/log/net_log.h"
@@ -79,7 +79,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"
@@ -357,6 +361,18 @@ void BrowserProcessImpl::Init() {
@@ -365,6 +369,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -100,7 +100,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2110,6 +2110,10 @@ const char kUnthrottledNestedTimeoutDesc
@@ -2152,6 +2152,10 @@ const char kUnthrottledNestedTimeoutDesc
"websites abusing the API will still eventually have their setTimeouts "
"clamped.";
@@ -113,7 +113,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
@@ -1182,6 +1182,9 @@ extern const char kLogJsConsoleMessagesD
@@ -1216,6 +1216,9 @@ extern const char kUndoAutofillDescripti
extern const char kUnthrottledNestedTimeoutName[];
extern const char kUnthrottledNestedTimeoutDescription[];

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

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -133,9 +133,6 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -139,9 +139,6 @@ void AddInfoBarsIfNecessary(Browser* bro
infobars::ContentInfoBarManager* infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(web_contents);

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
@@ -1561,7 +1561,7 @@ void ChromeContentBrowserClient::Registe
@@ -1570,7 +1570,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -23,7 +23,7 @@
// used for mapping the command-line flags).
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -388,7 +388,7 @@ void ProfileNetworkContextService::Updat
@@ -412,7 +412,7 @@ void ProfileNetworkContextService::Updat
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -34,7 +34,7 @@
registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled,
--- a/chrome/browser/prefetch/prefetch_prefs.h
+++ b/chrome/browser/prefetch/prefetch_prefs.h
@@ -28,7 +28,7 @@ enum class NetworkPredictionOptions {
@@ -23,7 +23,7 @@ enum class NetworkPredictionOptions {
kWifiOnlyDeprecated = 1,
kDisabled = 2,
kExtended = 3,
@@ -83,7 +83,7 @@
registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
@@ -129,7 +129,7 @@ const char kAutofillPaymentMethodsMandat
@@ -136,7 +136,7 @@ const char kAutofillUsingVirtualViewStru
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
registry->RegisterBooleanPref(
@@ -92,7 +92,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kAutofillLastVersionDeduped, 0,
@@ -141,7 +141,7 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -148,7 +148,7 @@ void RegisterProfilePrefs(user_prefs::Pr
prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
@@ -114,7 +114,7 @@
registry->RegisterBooleanPref(
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -73,7 +73,7 @@ void CookieSettings::RegisterProfilePref
@@ -72,7 +72,7 @@ void CookieSettings::RegisterProfilePref
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(
prefs::kCookieControlsMode,
@@ -125,7 +125,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -257,14 +257,14 @@ base::CallbackListSubscription AddSyncEn
@@ -237,14 +237,14 @@ base::CallbackListSubscription AddSyncEn
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(

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

@@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1693,11 +1693,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1690,11 +1690,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/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
@@ -938,7 +938,7 @@ class AppControllerNativeThemeObserver :
@@ -936,7 +936,7 @@ class AppControllerNativeThemeObserver :
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"
@@ -475,6 +477,7 @@ Browser::Browser(const CreateParams& par
@@ -469,6 +471,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),
@@ -846,6 +849,7 @@ Browser::WarnBeforeClosingResult Browser
@@ -840,6 +843,7 @@ Browser::WarnBeforeClosingResult Browser
// true or there are no pending downloads we need to prompt about) then
// there's no need to warn.
if (force_skip_warning_user_on_close_ || CanCloseWithInProgressDownloads())
@@ -25,7 +25,7 @@
return WarnBeforeClosingResult::kOkToClose;
DCHECK(!warn_before_closing_callback_)
@@ -880,6 +884,7 @@ bool Browser::TryToCloseWindow(
@@ -874,6 +878,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -33,7 +33,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -2834,6 +2839,62 @@ bool Browser::CanCloseWithInProgressDown
@@ -2841,6 +2846,62 @@ bool Browser::CanCloseWithInProgressDown
return false;
}
@@ -96,7 +96,7 @@
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
if (cancel_downloads) {
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
@@ -2852,6 +2913,22 @@ void Browser::InProgressDownloadResponse
@@ -2859,6 +2920,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -129,7 +129,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"
@@ -1073,12 +1074,17 @@ class Browser : public TabStripModelObse
@@ -1092,12 +1093,17 @@ class Browser : public TabStripModelObse
// Returns true if the window can close, false otherwise.
bool CanCloseWithInProgressDownloads();
@@ -147,7 +147,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().
@@ -1253,6 +1259,8 @@ class Browser : public TabStripModelObse
@@ -1268,6 +1274,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

6
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
@@ -879,10 +879,14 @@ bool HandleNewTabPageLocationOverride(
@@ -887,10 +887,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())
@@ -28,7 +28,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -221,6 +221,7 @@ std::string GetCombinedOriginListValue(c
@@ -222,6 +222,7 @@ std::string GetCombinedOriginListValue(c
command_line.GetSwitchValueASCII(command_line_switch);
const std::string new_value =
flags_storage.GetOriginListFlag(internal_entry_name);
@@ -36,7 +36,7 @@
return CombineAndSanitizeOriginLists(existing_value, new_value);
}
@@ -417,6 +418,7 @@ void FlagsState::SetOriginListFlag(const
@@ -460,6 +461,7 @@ void FlagsState::SetOriginListFlag(const
const std::string& value,
FlagsStorage* flags_storage) {
const std::string new_value =

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

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -135,6 +135,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe
@@ -141,6 +141,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe
"AutofillSendUnidentifiedKeyAfterFill",
base::FEATURE_DISABLED_BY_DEFAULT);

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

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

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -558,5 +558,7 @@ bool BrowserFrame::RegenerateFrameOnThem
@@ -597,5 +597,7 @@ bool BrowserFrame::RegenerateFrameOnThem
}
bool BrowserFrame::IsIncognitoBrowser() const {
@@ -10,13 +10,21 @@
}
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -423,7 +423,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -53,6 +53,7 @@
#include "ui/base/webui/jstemplate_builder.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/color/color_provider.h"
+#include "ui/color/color_provider_manager.h"
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -423,7 +424,9 @@ void NTPResourceCache::CreateNewTabIncog
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
// Colors.
- const ui::ColorProvider& cp = web_contents->GetColorProvider();
+ auto key = native_theme->GetColorProviderKey(nullptr);
+ key.color_mode = ui::ColorProviderManager::ColorMode::kDark;
+ key.color_mode = ui::ColorProviderKey::ColorMode::kDark;
+ const ui::ColorProvider& cp = *ui::ColorProviderManager::Get().GetColorProviderFor(key);
substitutions["colorBackground"] = color_utils::SkColorToRgbaString(
GetThemeColor(native_theme, cp, kColorNewTabPageBackground));

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

@@ -41,9 +41,9 @@
#include "base/feature_list.h"
#include "base/format_macros.h"
#include "base/functional/bind.h"
@@ -360,6 +361,15 @@ AutocompleteController::AutocompleteCont
triggered_feature_service_(
provider_client_->GetOmniboxTriggeredFeatureService()) {
@@ -367,6 +368,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering")) {
+ const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering");

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

@@ -27,7 +27,7 @@
return true;
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -315,7 +315,8 @@ void LocationBarView::Init() {
@@ -333,7 +333,8 @@ void LocationBarView::Init() {
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
@@ -258,14 +258,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -256,14 +256,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent() || frame->IsInFencedFrameTree())
return;
@@ -47,8 +47,8 @@
+#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/debug/crash_logging.h"
#include "base/format_macros.h"
@@ -161,6 +162,12 @@ bool IsCreatedByExtension(const Template
#include "base/feature_list.h"
@@ -164,6 +165,12 @@ bool IsCreatedByExtension(const Template
template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
}
@@ -61,7 +61,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -245,6 +252,7 @@ TemplateURLService::TemplateURLService(
@@ -248,6 +255,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::RepeatingClosure& dsp_change_callback)
: prefs_(prefs),
@@ -69,7 +69,7 @@
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
client_(std::move(client)),
@@ -319,8 +327,8 @@ bool TemplateURLService::CanAddAutogener
@@ -329,8 +337,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.
@@ -80,7 +80,7 @@
}
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
@@ -1577,6 +1585,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -1604,6 +1612,8 @@ SyncDataMap TemplateURLService::CreateGU
void TemplateURLService::Init(const Initializer* initializers,
int num_initializers) {
@@ -89,7 +89,7 @@
if (client_)
client_->SetOwner(this);
@@ -1712,6 +1722,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -1747,6 +1757,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -101,7 +101,7 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -742,6 +742,8 @@ class TemplateURLService : public WebDat
@@ -751,6 +751,8 @@ class TemplateURLService : public WebDat
// ---------- Browser state related members ---------------------------------
raw_ptr<PrefService> prefs_ = nullptr;

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

@@ -8,7 +8,7 @@
#include "base/debug/alias.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
@@ -645,6 +646,8 @@ void Tab::OnGestureEvent(ui::GestureEven
@@ -654,6 +655,8 @@ void Tab::OnGestureEvent(ui::GestureEven
}
std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
@@ -27,7 +27,7 @@
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
@@ -1646,6 +1647,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -1648,6 +1649,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

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

@@ -19,13 +19,13 @@
+#include "base/command_line.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/ui_features.h"
#endif // BUILDFLAG(IS_WIN)
@@ -34,7 +35,8 @@ gfx::Size WindowFrameUtil::GetWindows10G
bool WindowFrameUtil::IsWin10TabSearchCaptionButtonEnabled(
#include "ui/base/ui_base_features.h"
@@ -34,7 +35,8 @@ gfx::Size WindowFrameUtil::GetWindowsCap
bool WindowFrameUtil::IsWindowsTabSearchCaptionButtonEnabled(
const Browser* browser) {
#if BUILDFLAG(IS_WIN)
- return browser->is_type_normal();
+ return browser->is_type_normal() &&
- return !features::IsChromeRefresh2023() && browser->is_type_normal();
+ return !features::IsChromeRefresh2023() && browser->is_type_normal() &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button");
#else
return false;
@@ -40,7 +40,7 @@
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -83,7 +84,8 @@ TabStripRegionView::TabStripRegionView(s
@@ -88,7 +89,8 @@ TabStripRegionView::TabStripRegionView(s
// Add and configure the TabSearchButton.
std::unique_ptr<TabSearchButton> tab_search_button;

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

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -222,6 +222,7 @@ std::string GetCombinedOriginListValue(c
@@ -223,6 +223,7 @@ std::string GetCombinedOriginListValue(c
const std::string new_value =
flags_storage.GetOriginListFlag(internal_entry_name);
if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value;
@@ -19,7 +19,7 @@
return CombineAndSanitizeOriginLists(existing_value, new_value);
}
@@ -419,6 +420,7 @@ void FlagsState::SetOriginListFlag(const
@@ -462,6 +463,7 @@ void FlagsState::SetOriginListFlag(const
FlagsStorage* flags_storage) {
const std::string new_value =
internal_name == "custom-ntp" ? value :

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

@@ -1,14 +1,14 @@
--- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
@@ -27,6 +27,7 @@
#include "chrome/browser/sync/sync_service_factory.h"
@@ -29,6 +29,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "components/browsing_data/core/browsing_data_policies_utils.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"
@@ -161,6 +162,21 @@ class BrowsingDataRemoverObserver
@@ -164,6 +165,21 @@ class BrowsingDataRemoverObserver
#endif
};
@@ -30,20 +30,20 @@
uint64_t GetOriginTypeMask(const base::Value::List& data_types) {
uint64_t result = 0;
for (const auto& data_type : data_types) {
@@ -328,9 +344,10 @@ void ChromeBrowsingDataLifetimeManager::
@@ -331,9 +347,10 @@ void ChromeBrowsingDataLifetimeManager::
const base::Value::List& data_types = profile_->GetPrefs()->GetList(
browsing_data::prefs::kClearBrowsingDataOnExitList);
- if (!data_types.empty() &&
+ bool cdoe = base::FeatureList::IsEnabled(browsing_data::features::kClearDataOnExit);
+ if (!data_types.empty() && (cdoe ||
+ if (cdoe || (!data_types.empty() &&
IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
- profile_, browsing_data::prefs::kClearBrowsingDataOnExitList))) {
+ profile_, browsing_data::prefs::kClearBrowsingDataOnExitList)))) {
profile_->GetPrefs()->SetBoolean(
browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
auto* remover = profile_->GetBrowsingDataRemover();
@@ -341,8 +358,8 @@ void ChromeBrowsingDataLifetimeManager::
@@ -344,8 +361,8 @@ void ChromeBrowsingDataLifetimeManager::
DCHECK(keep_browser_alive);
#endif
remover->RemoveAndReply(base::Time(), base::Time::Max(),

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

@@ -1,22 +1,22 @@
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -12,6 +12,7 @@
@@ -11,6 +11,7 @@
#include <unordered_map>
#include <utility>
#include "base/auto_reset.h"
+#include "base/command_line.h"
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -1859,6 +1860,10 @@ bool TabStripModel::CloseTabs(base::span
if (items.empty())
return true;
@@ -1898,6 +1899,10 @@ void TabStripModel::CloseTabs(base::span
return;
}
+ const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("close-window-with-last-tab");
+ if (flag_value == "never" && !closing_all_ && items.size() == count())
+ if (flag_value == "never" && !closing_all_ && static_cast<int>(filtered_items.size()) == count())
+ delegate()->AddTabAt(GURL(), -1, true);
+
const bool closing_all = static_cast<int>(items.size()) == count();
const bool closing_all = static_cast<int>(filtered_items.size()) == count();
base::WeakPtr<TabStripModel> ref = weak_factory_.GetWeakPtr();
if (closing_all) {
--- a/chrome/browser/ungoogled_flag_choices.h

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

@@ -13,7 +13,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1173,6 +1173,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1170,6 +1170,8 @@ WindowOpenDisposition NavigationPolicyTo
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

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

@@ -21,7 +21,7 @@
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
#include "base/feature_list.h"
@@ -1305,7 +1306,8 @@ void HistoryBackend::InitImpl(
@@ -1313,7 +1314,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.

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

@@ -3,7 +3,7 @@
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -104,7 +104,8 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -110,7 +110,8 @@ void AddInfoBarsIfNecessary(Browser* bro
return;
// Web apps should not display the session restore bubble (crbug.com/1264121)

6
patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch
View File

@@ -8,14 +8,14 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
@@ -32,6 +33,7 @@
@@ -31,6 +32,7 @@
#include "chrome/browser/ui/views/frame/toolbar_button_provider.h"
#include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h"
#include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "components/feature_engagement/public/event_constants.h"
#include "content/public/browser/web_contents.h"
#include "extensions/common/extension_features.h"
#include "ui/base/dragdrop/drag_drop_types.h"
@@ -360,6 +362,17 @@ void ExtensionsToolbarContainer::AnchorA
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
anchor_view && anchor_view->GetVisible() ? anchor_view
@@ -34,7 +34,7 @@
widget->Show();
}
@@ -867,6 +880,9 @@ void ExtensionsToolbarContainer::UpdateC
@@ -908,6 +921,9 @@ void ExtensionsToolbarContainer::UpdateC
}
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1765,6 +1765,10 @@ void BrowserView::UpdateExclusiveAccessE
@@ -1810,6 +1810,10 @@ void BrowserView::UpdateExclusiveAccessE
ExclusiveAccessBubbleHideCallback bubble_first_hide_callback,
bool notify_download,
bool force_update) {
@@ -13,7 +13,7 @@
platform_util::IsBrowserLockedFullscreen(browser_.get());
--- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc
+++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc
@@ -69,6 +69,10 @@ bool IsExitUiEnabled() {
@@ -71,6 +71,10 @@ bool IsExitUiEnabled() {
// menu and controls reveal when the cursor is moved to the top.
return false;
#else

2
patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-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
@@ -368,7 +368,8 @@ void ToolbarView::Init() {
@@ -386,7 +386,8 @@ void ToolbarView::Init() {
std::unique_ptr<SidePanelToolbarButton> side_panel_button;
std::unique_ptr<SidePanelToolbarContainer> side_panel_toolbar_container;

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -995,7 +995,11 @@ void Tab::UpdateIconVisibility() {
@@ -1003,7 +1003,11 @@ void Tab::UpdateIconVisibility() {
if (IsActive()) {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1016,6 +1020,8 @@ void Tab::UpdateIconVisibility() {
@@ -1024,6 +1028,8 @@ void Tab::UpdateIconVisibility() {
available_width -= favicon_width;
showing_close_button_ = large_enough_for_close_button;

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

@@ -1,8 +1,8 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -455,6 +455,17 @@ void ToolbarView::Init() {
@@ -475,6 +475,17 @@ void ToolbarView::Init() {
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
show_avatar_toolbar_button = !profiles::IsPublicSession();
show_avatar_toolbar_button = !profiles::IsManagedGuestSession();
#endif
+
+ const std::string sab_value = base::CommandLine::ForCurrentProcess()->

2
patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3791,10 +3791,12 @@ const FeatureEntry::FeatureVariation kPa
@@ -3822,10 +3822,12 @@ const FeatureEntry::FeatureVariation kPa
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

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

@@ -19,7 +19,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -152,6 +152,8 @@ static_library("common_lib") {
@@ -151,6 +151,8 @@ static_library("common_lib") {
"pref_names_util.cc",
"pref_names_util.h",
"ref_counted_util.h",
@@ -28,17 +28,17 @@
"search/instant_mojom_traits.h",
"search/instant_types.cc",
"search/instant_types.h",
@@ -276,6 +278,7 @@ static_library("common_lib") {
@@ -259,6 +261,7 @@ static_library("common_lib") {
"//components/no_state_prefetch/common",
"//components/no_state_prefetch/common:mojo_bindings",
"//components/page_load_metrics/common:common",
"//components/password_manager/content/common",
+ "//services/network/public/mojom",
]
if (enable_supervised_users) {
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -869,6 +869,14 @@ BASE_FEATURE(kNewMacNotificationAPI,
@@ -905,6 +905,14 @@ BASE_FEATURE(kNewMacNotificationAPI,
// referrers instead of their ordinary behavior.
BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -55,7 +55,7 @@
// on-screen until dismissed, they are instead shown for a very long time.
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h
@@ -507,6 +507,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_D
@@ -535,6 +535,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_D
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers);
@@ -152,7 +152,7 @@
+#endif // CHROME_COMMON_REFERRER_SANITIZER_H_
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -318,8 +318,7 @@ source_set("lib") {
@@ -341,8 +341,7 @@ source_set("lib") {
"//base/third_party/dynamic_annotations",
"//build:branding_buildflags",
"//build:chromeos_buildflags",
@@ -173,7 +173,7 @@
disallowed_extension_deps_ = [
# Components should largely not depend on //extensions. Since // extensions
# is not a component target and is linked with //chrome, depending on most
@@ -730,7 +730,7 @@ test("components_unittests") {
@@ -735,7 +735,7 @@ test("components_unittests") {
# On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -182,7 +182,7 @@
assert_no_deps = [ "//chrome/*" ]
assert_no_deps += disallowed_extension_deps_
}
@@ -1018,7 +1018,7 @@ if (use_blink) {
@@ -1024,7 +1024,7 @@ if (use_blink) {
# dependency. On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -193,7 +193,7 @@
}
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -41,6 +41,7 @@
@@ -42,6 +42,7 @@
#include "build/build_config.h"
#include "build/buildflag.h"
#include "build/chromeos_buildflags.h"
@@ -201,7 +201,7 @@
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
#include "content/browser/browsing_topics/header_util.h"
#include "content/browser/child_process_security_policy_impl.h"
@@ -385,10 +386,10 @@ void AddAdditionalRequestHeaders(
@@ -386,10 +387,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
@@ -218,7 +218,7 @@
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -51,6 +51,7 @@
@@ -52,6 +52,7 @@
#include "build/chromeos_buildflags.h"
#include "cc/base/switches.h"
#include "cc/trees/ukm_manager.h"
@@ -226,7 +226,7 @@
#include "content/common/associated_interfaces.mojom.h"
#include "content/common/content_navigation_policy.h"
#include "content/common/content_switches_internal.h"
@@ -4304,10 +4305,13 @@ void RenderFrameImpl::WillSendRequestInt
@@ -4340,10 +4341,13 @@ void RenderFrameImpl::WillSendRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -264,7 +264,7 @@
#include "components/domain_reliability/monitor.h"
#include "net/base/features.h"
#include "net/base/isolation_info.h"
@@ -59,9 +60,14 @@ NetworkServiceNetworkDelegate::~NetworkS
@@ -53,9 +54,14 @@ NetworkServiceNetworkDelegate::~NetworkS
void NetworkServiceNetworkDelegate::MaybeTruncateReferrer(
net::URLRequest* const request,
const GURL& effective_url) {

4
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
@@ -12,6 +12,8 @@
@@ -13,6 +13,8 @@
namespace net::features {
@@ -47,7 +47,7 @@
// ICANN uses this localhost address to indicate a name collision.
//
// The policy in Chromium is to fail host resolving if it resolves to
@@ -3895,33 +3890,10 @@ int HostResolverManager::StartIPv6Reacha
@@ -3903,33 +3898,10 @@ int HostResolverManager::StartIPv6Reacha
return OK;
}

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

@@ -427,7 +427,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -605,7 +605,8 @@ void TemplateURLService::IncrementUsageC
@@ -614,7 +614,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
@@ -437,7 +437,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -620,6 +621,7 @@ void TemplateURLService::ResetTemplateUR
@@ -629,6 +630,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;

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
@@ -3787,7 +3787,13 @@ const FeatureEntry::FeatureVariation kPa
@@ -3818,7 +3818,13 @@ const FeatureEntry::FeatureVariation kPa
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.

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

@@ -24,9 +24,9 @@
- if (!host_content_settings_map) {
- return false;
- }
- ContentSettingsForOneType content_settings;
- host_content_settings_map->GetSettingsForOneType(
- ContentSettingsType::ALL_SCREEN_CAPTURE, &content_settings);
- ContentSettingsForOneType content_settings =
- host_content_settings_map->GetSettingsForOneType(
- ContentSettingsType::ALL_SCREEN_CAPTURE);
- return base::ranges::any_of(content_settings,
- [](const ContentSettingPatternSource& source) {
- return source.GetContentSetting() ==

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

@@ -10,7 +10,7 @@
#include "crypto/secure_hash.h"
#if BUILDFLAG(IS_ANDROID)
@@ -525,99 +524,10 @@ DownloadInterruptReason BaseFile::Publis
@@ -525,94 +524,10 @@ DownloadInterruptReason BaseFile::Publis
}
#endif // BUILDFLAG(IS_ANDROID)
@@ -87,11 +87,7 @@
-}
-
-void BaseFile::OnFileQuarantined(
- bool connection_error,
- quarantine::mojom::QuarantineFileResult result) {
- base::UmaHistogramBoolean("Download.QuarantineService.ConnectionError",
- connection_error);
-
- DCHECK(on_annotation_done_callback_);
- quarantine_service_.reset();
- std::move(on_annotation_done_callback_)
@@ -101,16 +97,15 @@
-void BaseFile::OnQuarantineServiceError(const GURL& source_url,
- const GURL& referrer_url) {
-#if BUILDFLAG(IS_WIN)
- OnFileQuarantined(/*connection_error=*/true,
- quarantine::SetInternetZoneIdentifierDirectly(
- full_path_, source_url, referrer_url));
- OnFileQuarantined(quarantine::SetInternetZoneIdentifierDirectly(
- full_path_, source_url, referrer_url));
-#else // !BUILDFLAG(IS_WIN)
- CHECK(false) << "In-process quarantine service should not have failed.";
-#endif // !BUILDFLAG(IS_WIN)
}
void BaseFile::AnnotateWithSourceInformation(
@@ -626,32 +536,8 @@ void BaseFile::AnnotateWithSourceInforma
@@ -621,32 +536,8 @@ void BaseFile::AnnotateWithSourceInforma
const GURL& referrer_url,
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
OnAnnotationDoneCallback on_annotation_done_callback) {
@@ -137,8 +132,8 @@
-
- quarantine_service_->QuarantineFile(
- full_path_, authority_url, referrer_url, client_guid,
- base::BindOnce(&BaseFile::OnFileQuarantined, weak_factory_.GetWeakPtr(),
- false));
- base::BindOnce(&BaseFile::OnFileQuarantined,
- weak_factory_.GetWeakPtr()));
- }
+ std::move(on_annotation_done_callback)
+ .Run(DOWNLOAD_INTERRUPT_REASON_NONE);

2
patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch
View File

@@ -1,6 +1,6 @@
--- a/components/optimization_guide/core/optimization_guide_features.cc
+++ b/components/optimization_guide/core/optimization_guide_features.cc
@@ -93,7 +93,7 @@ BASE_FEATURE(kOptimizationHints,
@@ -96,7 +96,7 @@ BASE_FEATURE(kOptimizationHints,
// Enables fetching from a remote Optimization Guide Service.
BASE_FEATURE(kRemoteOptimizationGuideFetching,
"OptimizationHintsFetching",

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
@@ -3788,8 +3788,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3821,8 +3821,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3803,8 +3802,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3836,8 +3835,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
@@ -1222,7 +1222,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
@@ -1309,7 +1309,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -469,10 +469,6 @@ int GetContentRestrictions(const Browser
@@ -521,10 +521,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -13,7 +13,7 @@
}
return content_restrictions;
}
@@ -1537,8 +1533,7 @@ bool CanSavePage(const Browser* browser)
@@ -1595,8 +1591,7 @@ bool CanSavePage(const Browser* browser)
DownloadPrefs::DownloadRestriction::ALL_FILES) {
return false;
}

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

@@ -1,19 +1,21 @@
--- a/chrome/browser/ui/views/tabs/new_tab_button.cc
+++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
@@ -62,10 +62,8 @@ NewTabButton::NewTabButton(TabStrip* tab
SetAnimateOnStateChange(true);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
SetTriggerableEventFlags(GetTriggerableEventFlags() |
ui::EF_MIDDLE_MOUSE_BUTTON);
-#endif
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -164,12 +164,10 @@ TabStripRegionView::TabStripRegionView(s
if (features::IsChromeRefresh2023()) {
foreground_frame_active_color_id_ =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
// The New Tab Button can be middle-clicked on Linux.
new_tab_button_->SetTriggerableEventFlags(
new_tab_button_->GetTriggerableEventFlags() |
ui::EF_MIDDLE_MOUSE_BUTTON);
-#endif
}
reserved_grab_handle_space_ =
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -1887,8 +1887,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -1868,8 +1868,6 @@ void TabStrip::NewTabButtonPressed(const
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {
@@ -22,7 +24,7 @@
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
CHECK(clipboard);
std::u16string clipboard_text;
@@ -1896,7 +1894,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -1877,7 +1875,6 @@ void TabStrip::NewTabButtonPressed(const
/* data_dst = */ nullptr, &clipboard_text);
if (!clipboard_text.empty())
controller_->CreateNewTabWithLocation(clipboard_text);

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1025,6 +1025,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1026,6 +1026,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -18,7 +18,7 @@
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
#include "chrome/browser/ui/webui/version/version_ui.h"
@@ -885,6 +886,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
@@ -891,6 +892,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
}
#endif
@@ -174,7 +174,7 @@
+#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -644,6 +644,7 @@ const char kExtensionConfigureCommandsSu
@@ -652,6 +652,7 @@ const char kExtensionConfigureCommandsSu
// Add hosts here to be included in chrome://chrome-urls (about:about).
// These hosts will also be suggested by BuiltinProvider.
const char* const kChromeHostURLs[] = {

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

@@ -8,7 +8,7 @@
#include "components/flags_ui/feature_entry.h"
#include "components/flags_ui/flags_storage.h"
#include "components/flags_ui/flags_ui_switches.h"
@@ -592,13 +593,17 @@ void FlagsState::GetFlagFeatureEntries(
@@ -653,13 +654,17 @@ void FlagsState::GetFlagFeatureEntries(
int current_platform = GetCurrentPlatform();
for (const FeatureEntry& entry : feature_entries_) {
@@ -27,7 +27,7 @@
base::Value::List supported_platforms;
AddOsStrings(entry.supported_platforms, &supported_platforms);
@@ -978,6 +983,7 @@ bool FlagsState::IsSupportedFeature(cons
@@ -1055,6 +1060,7 @@ bool FlagsState::IsSupportedFeature(cons
if (!entry.InternalNameMatches(name))
continue;
if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))

2
patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
View File

@@ -20,7 +20,7 @@
--- a/components/search_engines/util.cc
+++ b/components/search_engines/util.cc
@@ -490,7 +490,7 @@ void GetSearchProvidersUsingLoadedEngine
@@ -522,7 +522,7 @@ void GetSearchProvidersUsingLoadedEngine
const int prepopulate_resource_keyword_version =
TemplateURLPrepopulateData::GetDataVersion(prefs);

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

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

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

@@ -8,7 +8,6 @@
# link to Google's help site on the About page
# external link for theme entry on settings page
# webstore text for theme entry on settings page
# Check passwords and managed passwords sections from the passwords page
# the Google account line from the Payment methods page
# Safety check section on the settings page
# Privacy guide promo on the privacy page
@@ -24,8 +23,8 @@
--- a/chrome/browser/resources/extensions/item_list.html
+++ b/chrome/browser/resources/extensions/item_list.html
@@ -90,13 +90,6 @@
</extensions-review-panel>
@@ -107,13 +107,6 @@
<h2 class="extension-title-container">$i18n{safetyCheckAllExtensions}</h2>
</template>
</div>
- <div id="no-items" class="empty-list-message"
@@ -40,18 +39,20 @@
shownAppsCount_, shownExtensionsCount_, apps, extensions)]]">
--- a/chrome/browser/resources/extensions/sidebar.html
+++ b/chrome/browser/resources/extensions/sidebar.html
@@ -76,12 +76,3 @@
@@ -71,14 +71,3 @@
<paper-ripple></paper-ripple>
</a>
</iron-selector>
-<div>
- <div class="separator"></div>
- <a class="section-item" id="moreExtensions" target="_blank"
- href="$i18n{getMoreExtensionsUrl}" on-click="onMoreExtensionsClick_">
- <span>$i18n{openChromeWebStore}</span>
- <div class="cr-icon icon-external"></div>
- <div class="cr-nav-menu-item" id="moreExtensions">
- <iron-icon id="web-store-icon" icon="extensions-icons:web_store">
- </iron-icon>
- <span id="discover-more-text" class="cr-secondary-text"
- on-click="onMoreExtensionsClick_"
- inner-h-t-m-l="[[discoverMoreText_]]"></span>
- <paper-ripple></paper-ripple>
- </a>
- </div>
-</div>
--- a/chrome/browser/resources/history/side_bar.html
+++ b/chrome/browser/resources/history/side_bar.html
@@ -136,7 +137,7 @@
<div class="separator"></div>
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -362,8 +362,8 @@ export class SettingsAppearancePageEleme
@@ -426,8 +426,8 @@ export class SettingsAppearancePageEleme
return;
}
@@ -146,7 +147,7 @@
switch (this.systemTheme_) {
case SystemTheme.GTK:
i18nId = 'gtkTheme';
@@ -375,11 +375,8 @@ export class SettingsAppearancePageEleme
@@ -439,11 +439,8 @@ export class SettingsAppearancePageEleme
i18nId = 'classicTheme';
break;
}
@@ -159,27 +160,9 @@
}
/** @return Whether applied theme is set by policy. */
--- a/chrome/browser/resources/settings/autofill_page/passwords_section.html
+++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
@@ -125,6 +125,7 @@
</settings-toggle-button>
</template>
</if>
+<if expr="False">
<div id="checkPasswordsBannerContainer" class="cr-row"
hidden$="[[!shouldShowBanner_]]">
<picture>
@@ -186,6 +187,7 @@
</cr-icon-button>
</div>
</if>
+</if>
<div class="cr-row first">
<h2 id="savedPasswordsHeading" class="flex">
$i18n{savedPasswordsHeading}
--- a/chrome/browser/resources/settings/autofill_page/payments_section.html
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
@@ -74,11 +74,6 @@
@@ -85,11 +85,6 @@
</div>
</template>
@@ -193,15 +176,15 @@
<template is="dom-if"
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -38,7 +38,7 @@
prefs="{{prefs}}">
</settings-privacy-guide-promo>
@@ -40,7 +40,7 @@
</settings-section>
- <template is="dom-if" if="[[showPage_(pageVisibility.safetyCheck)]]"
+ <template is="dom-if" if="[[false]]"
restamp>
<!-- TODO(crbug/1469277): Remove after SafetyHub launched. -->
<template is="dom-if"
- if="[[showSafetyCheckPage_(pageVisibility.safetyCheck)]]" restamp>
+ if="[[false]]" restamp>
<settings-section page-title="$i18n{safetyCheckSectionTitle}"
section="safetyCheck" nest-under-section="privacy"
id="safetyCheckSettingsSection">
--- a/chrome/browser/resources/settings/basic_page/basic_page.ts
+++ b/chrome/browser/resources/settings/basic_page/basic_page.ts
@@ -11,7 +11,6 @@ import 'chrome://resources/cr_elements/c
@@ -211,7 +194,7 @@
-import '../privacy_page/privacy_guide/privacy_guide_promo.js';
import '../privacy_page/privacy_page.js';
import '../safety_check_page/safety_check_page.js';
import '../autofill_page/autofill_page.js';
import '../safety_hub/safety_hub_entry_point.js';
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
@@ -13,7 +13,7 @@
@@ -256,7 +239,7 @@
start-icon="settings:cookie"
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -141,10 +141,3 @@
@@ -138,10 +138,3 @@
</template>
</if>
@@ -314,27 +297,42 @@
ui::ImageModel::FromImage(
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -549,17 +549,6 @@ SadTabView::SadTabView(content::WebConte
@@ -552,9 +552,6 @@ SadTabView::SadTabView(content::WebConte
auto* actions_container =
container->AddChildView(std::make_unique<views::FlexLayoutView>());
actions_container->SetCrossAxisAlignment(views::LayoutAlignment::kCenter);
- // Do not show the help link in the kiosk session to prevent escape from a
- // kiosk app.
- if (!chromeos::IsKioskSession()) {
- auto* help_link =
- actions_container->AddChildView(std::make_unique<views::Link>(
- l10n_util::GetStringUTF16(GetHelpLinkTitle())));
- help_link->SetCallback(base::BindRepeating(
- &SadTab::PerformAction, base::Unretained(this), Action::HELP_LINK));
- help_link->SetProperty(views::kTableVertAlignKey,
- views::LayoutAlignment::kCenter);
- }
-
- EnableHelpLink(actions_container);
-
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -627,22 +624,6 @@ void SadTabView::AttachToWebView() {
}
}
-void SadTabView::EnableHelpLink(views::FlexLayoutView* actions_container) {
-#if BUILDFLAG(IS_CHROMEOS)
- // Do not show the help link in the kiosk session to prevent escape from a
- // kiosk app.
- if (chromeos::IsKioskSession()) {
- return;
- }
-#endif
- auto* help_link =
- actions_container->AddChildView(std::make_unique<views::Link>(
- l10n_util::GetStringUTF16(GetHelpLinkTitle())));
- help_link->SetCallback(base::BindRepeating(
- &SadTab::PerformAction, base::Unretained(this), Action::HELP_LINK));
- help_link->SetProperty(views::kTableVertAlignKey,
- views::LayoutAlignment::kCenter);
-}
void SadTabView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
// Specify the maximum message and title width explicitly.
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -869,7 +869,7 @@ const base::FeatureParam<std::string> kM
@@ -873,7 +873,7 @@ const base::FeatureParam<std::string> kM
#endif // BUILDFLAG(IS_WIN)
// Enables the Live Caption feature on supported devices.

3632
pruning.list
View File

File diff suppressed because it is too large Load Diff

111
utils/depot_tools.patch
View File

@@ -5,7 +5,7 @@
# ensure shallow fetches
--- a/gclient.py
+++ b/gclient.py
@@ -130,8 +130,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
@@ -119,8 +119,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
# one, e.g. if a spec explicitly says `cache_dir = None`.)
UNSET_CACHE_DIR = object()
@@ -16,66 +16,67 @@
PREVIOUS_SYNC_COMMITS = 'GCLIENT_PREVIOUS_SYNC_COMMITS'
@@ -417,6 +417,7 @@ class Dependency(gclient_utils.WorkItem,
protocol='https',
git_dependencies_state=gclient_eval.DEPS,
print_outbuf=False):
+ if name and name[0:3] == "src": name = "UC_OUT"+name[3:]
gclient_utils.WorkItem.__init__(self, name)
DependencySettings.__init__(
self, parent, url, managed, custom_deps, custom_vars,
@@ -718,6 +719,7 @@ class Dependency(gclient_utils.WorkItem,
@@ -413,6 +413,7 @@ class Dependency(gclient_utils.WorkItem,
protocol='https',
git_dependencies_state=gclient_eval.DEPS,
print_outbuf=False):
+ if name and name[0:3] == "src": name = "UC_OUT"+name[3:]
gclient_utils.WorkItem.__init__(self, name)
DependencySettings.__init__(self, parent, url, managed, custom_deps,
custom_vars, custom_hooks, deps_file,
@@ -721,6 +722,7 @@ class Dependency(gclient_utils.WorkItem,
condition = dep_value.get('condition')
dep_type = dep_value.get('dep_type')
+ if dep_type == 'cipd': continue
condition = dep_value.get('condition')
dep_type = dep_value.get('dep_type')
+ if dep_type == 'cipd': continue
if condition and not self._get_option('process_all_deps', False):
if condition not in cached_conditions:
@@ -824,6 +826,8 @@ class Dependency(gclient_utils.WorkItem,
if condition and not self._get_option('process_all_deps', False):
@@ -821,6 +823,8 @@ class Dependency(gclient_utils.WorkItem,
self._gn_args_from = local_scope.get('gclient_gn_args_from')
self._gn_args_file = local_scope.get('gclient_gn_args_file')
+ if self._gn_args_file and self._gn_args_file[0:3] == "src":
+ self._gn_args_file = "UC_OUT"+self._gn_args_file[3:]
self._gn_args = local_scope.get('gclient_gn_args', [])
# It doesn't make sense to set all of these, since setting gn_args_from to
# another DEPS will make gclient ignore any other local gn_args* settings.
self._gn_args_from = local_scope.get('gclient_gn_args_from')
self._gn_args_file = local_scope.get('gclient_gn_args_file')
+ if self._gn_args_file and self._gn_args_file[0:3] == "src":
+ self._gn_args_file = "UC_OUT"+self._gn_args_file[3:]
self._gn_args = local_scope.get('gclient_gn_args', [])
# It doesn't make sense to set all of these, since setting gn_args_from
# to another DEPS will make gclient ignore any other local gn_args*
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -786,7 +786,7 @@ class GitWrapper(SCMWrapper):
self._SetFetchConfig(options)
@@ -840,8 +840,7 @@ class GitWrapper(SCMWrapper):
self._SetFetchConfig(options)
# Fetch upstream if we don't already have |revision|.
- if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
+ if False:
self._Fetch(options, prune=options.force)
# Fetch upstream if we don't already have |revision|.
- if not scm.GIT.IsValidRevision(
- self.checkout_path, revision, sha_only=True):
+ if False:
self._Fetch(options, prune=options.force)
if not scm.GIT.IsValidRevision(self.checkout_path, revision,
@@ -801,7 +801,7 @@ class GitWrapper(SCMWrapper):
if not scm.GIT.IsValidRevision(
@@ -857,7 +856,7 @@ class GitWrapper(SCMWrapper):
# This is a big hammer, debatable if it should even be here...
if options.force or options.reset:
- target = 'HEAD'
+ target = 'FETCH_HEAD'
if options.upstream and upstream_branch:
target = upstream_branch
self._Scrub(target, options)
@@ -815,7 +815,6 @@ class GitWrapper(SCMWrapper):
# system. The best we can do is carry forward to the checkout step.
if not (options.force or options.reset):
self._CheckClean(revision)
- self._CheckDetachedHead(revision, options)
if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
self.Print('Up-to-date; skipping checkout.')
else:
@@ -1482,8 +1481,7 @@ class GitWrapper(SCMWrapper):
fetch_cmd.append('--no-tags')
elif quiet:
fetch_cmd.append('--quiet')
- if depth:
- fetch_cmd.append('--depth=' + str(depth))
+ fetch_cmd.append('--depth=1')
self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
# This is a big hammer, debatable if it should even be here...
if options.force or options.reset:
- target = 'HEAD'
+ target = 'FETCH_HEAD'
if options.upstream and upstream_branch:
target = upstream_branch
self._Scrub(target, options)
@@ -872,7 +871,6 @@ class GitWrapper(SCMWrapper):
# to the checkout step.
if not (options.force or options.reset):
self._CheckClean(revision)
- self._CheckDetachedHead(revision, options)
if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
self.Print('Up-to-date; skipping checkout.')
else:
@@ -1587,8 +1585,7 @@ class GitWrapper(SCMWrapper):
fetch_cmd.append('--no-tags')
elif quiet:
fetch_cmd.append('--quiet')
- if depth:
- fetch_cmd.append('--depth=' + str(depth))
+ fetch_cmd.append('--depth=1')
self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
def _SetFetchConfig(self, options):
def _SetFetchConfig(self, options):

3
utils/prune_binaries.py
View File

@@ -20,6 +20,7 @@ CONTINGENT_PATHS = (
# Sources
'third_party/angle/third_party/VK-GL-CTS/src/',
'third_party/llvm/',
'third_party/rust-src/',
# Binaries
'buildtools/linux64/',
'buildtools/reclient/',
@@ -31,7 +32,9 @@ CONTINGENT_PATHS = (
'third_party/depot_tools/external_bin/',
'third_party/devtools-frontend/src/third_party/esbuild/',
'third_party/libei/',
'third_party/llvm-build-tools/',
'third_party/ninja/',
'third_party/siso/',
'third_party/updater/chrome_linux64/',
'third_party/updater/chromium_linux64/',
'tools/luci-go/',