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 140.0.7339.80

Browse Source
This commit is contained in:
Blaise
2025-08-27 17:27:06 -05:00
parent 3799c9d957
commit 6128ec6560
79 changed files with 1632 additions and 1233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
139.0.7258.154
140.0.7339.80

1
devutils/update_lists.py
View File

@@ -79,6 +79,7 @@ PRUNING_EXCLUDE_PATTERNS = [
'*.mp3',
'*.wav',
'*.flac',
'*.car',
'*.icns',
'*.woff',
'*.woff2',

364
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

44
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
@@ -3797,8 +3797,6 @@ static_library("browser") {
@@ -3794,8 +3794,6 @@ static_library("browser") {
"download/download_auto_open_policy_handler.cc",
"download/download_auto_open_policy_handler.h",
"download/download_commands.cc",
@@ -11,7 +11,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
+++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
@@ -388,10 +388,6 @@ void CreateAndAddChromeThrottlesForNavig
@@ -390,10 +390,6 @@ void CreateAndAddChromeThrottlesForNavig
registry.AddThrottle(std::make_unique<PolicyBlocklistNavigationThrottle>(
registry, handle.GetWebContents()->GetBrowserContext()));
@@ -48,7 +48,7 @@
} // namespace
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -129,7 +129,7 @@ class DownloadItemModelData : public bas
@@ -128,7 +128,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.
@@ -57,7 +57,7 @@
// Whether the download is currently being revived.
bool is_being_revived_ = false;
@@ -513,13 +513,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -463,13 +463,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -76,15 +76,15 @@
}
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -38,7 +38,6 @@
#include "chrome/browser/download/bubble/download_bubble_ui_controller.h"
@@ -36,7 +36,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/download/download_core_service.h"
#include "chrome/browser/download/download_core_service_factory.h"
-#include "chrome/browser/download/download_danger_prompt.h"
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1378,9 +1377,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1379,9 +1378,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() = default;
@@ -94,7 +94,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1430,44 +1426,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1431,44 +1427,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DownloadsFunctionName::kDownloadsFunctionAcceptDanger);
@@ -245,15 +245,15 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -73,6 +74,7 @@ static_library("safe_browsing") {
"//mojo/public/cpp/system",
@@ -77,6 +78,7 @@ static_library("safe_browsing") {
"//services/metrics/public/cpp:ukm_builders",
"//services/preferences/public/cpp",
]
+ }
if (enable_extensions) {
deps += [ "//chrome/browser/ui/web_applications" ]
@@ -598,6 +600,7 @@ static_library("advanced_protection") {
@@ -601,6 +603,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -261,7 +261,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -617,6 +620,7 @@ source_set("metrics_collector") {
@@ -620,6 +623,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -271,25 +271,25 @@
source_set("unit_tests") {
--- a/chrome/browser/ui/views/download/BUILD.gn
+++ b/chrome/browser/ui/views/download/BUILD.gn
@@ -27,7 +27,6 @@ source_set("download") {
"bubble/download_dialog_view.h",
"bubble/download_toolbar_ui_controller.cc",
"bubble/download_toolbar_ui_controller.h",
@@ -6,7 +6,6 @@ assert(is_win || is_mac || is_linux || i
source_set("download") {
sources = [
- "download_danger_prompt_views.cc",
"download_in_progress_dialog_view.cc",
"download_in_progress_dialog_view.h",
"download_item_view.cc",
]
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -25,7 +25,6 @@
@@ -24,7 +24,6 @@
#include "base/threading/thread.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/download/bubble/download_bubble_ui_controller.h"
-#include "chrome/browser/download/download_danger_prompt.h"
#include "chrome/browser/download/download_history.h"
#include "chrome/browser/download/download_item_model.h"
#include "chrome/browser/download/download_item_warning_data.h"
@@ -541,12 +540,6 @@ void DownloadsDOMHandler::RemoveDownload
@@ -550,12 +549,6 @@ void DownloadsDOMHandler::RemoveDownload
IdSet ids;
for (download::DownloadItem* download : to_remove) {
@@ -300,7 +300,7 @@
- }
-
DownloadItemModel item_model(download);
if (!item_model.ShouldShowInShelf() ||
if (!item_model.ShouldShowInUi() ||
download->GetState() == download::DownloadItem::IN_PROGRESS) {
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
@@ -314,7 +314,7 @@
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -112,7 +112,6 @@
@@ -110,7 +110,6 @@
#include "components/pdf/common/pdf_util.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/buildflags.h"

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

@@ -1,6 +1,6 @@
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
@@ -938,93 +938,6 @@ std::tuple<GURL, std::string> AutofillCr
@@ -925,94 +925,6 @@ std::tuple<GURL, std::string> AutofillCr
}
bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {
@@ -13,15 +13,16 @@
-#if BUILDFLAG(IS_IOS)
- DCHECK(!request_data.isolation_info);
-#else
- DCHECK((request_data.request_type == RequestType::kRequestUpload) ==
- !request_data.isolation_info);
- DCHECK(
- (request_data.request_type == CrowdsourcingRequestType::kRequestUpload) ==
- !request_data.isolation_info);
-#endif
- // Get the URL and method to use for this request.
- auto [request_url, method] = GetRequestURLAndMethod(request_data);
-
- // Track the URL length for GET queries because the URL length can be in the
- // thousands when rich metadata is enabled.
- if (request_data.request_type == RequestType::kRequestQuery &&
- if (request_data.request_type == CrowdsourcingRequestType::kRequestQuery &&
- method == "GET") {
- base::UmaHistogramCounts100000(kUmaGetUrlLength,
- request_url.spec().length());

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

@@ -10,7 +10,7 @@
extension_misc::kAssessmentAssistantExtensionId,
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -418,11 +418,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -415,11 +415,6 @@ void ComponentLoader::AddWebStoreApp() {
return;
}
#endif

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

@@ -2,7 +2,7 @@
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -476,14 +476,6 @@ group("gn_all") {
@@ -469,14 +469,6 @@ group("gn_all") {
]
}

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

@@ -121,17 +121,6 @@ by default.
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = !upload_url_for_testing_.is_empty()
? upload_url_for_testing_
--- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc
+++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc
@@ -33,7 +33,7 @@ std::u16string NaClInfoBarDelegate::GetL
}
GURL NaClInfoBarDelegate::GetLinkURL() const {
- return GURL("https://support.google.com/chrome/?p=ib_nacl");
+ return GURL("trk:143:https://support.google.com/chrome/?p=ib_nacl");
}
std::u16string NaClInfoBarDelegate::GetMessageText() const {
--- a/chrome/browser/profiles/profile_avatar_downloader.cc
+++ b/chrome/browser/profiles/profile_avatar_downloader.cc
@@ -20,7 +20,7 @@
@@ -167,7 +156,7 @@ by default.
DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -274,7 +274,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -277,7 +277,7 @@ GURL SpellcheckHunspellDictionary::GetDi
DCHECK(!bdict_file.empty());
static const char kDownloadServerUrl[] =
@@ -274,7 +263,7 @@ by default.
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -147,7 +147,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
@@ -152,7 +152,7 @@ BASE_FEATURE(kIsViewerGoogleSearchUrl,
// Global functions -----------------------------------------------------------
@@ -304,7 +293,7 @@ by default.
"https://history.google.com/history/api/lookup?client=audio";
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -70,7 +70,7 @@ const int ClientSideDetectionService::kN
@@ -68,7 +68,7 @@ const int ClientSideDetectionService::kN
const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
const char ClientSideDetectionService::kClientReportPhishingUrl[] =

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
@@ -340,6 +340,10 @@ void ClientSideDetectionService::StartCl
@@ -281,6 +281,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);
@@ -421,6 +425,7 @@ void ClientSideDetectionService::StartCl
@@ -362,6 +366,7 @@ void ClientSideDetectionService::StartCl
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIInfoSingleton::GetInstance()),
std::move(request), access_token));

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

@@ -18,7 +18,7 @@
// Note: If there is an ongoing request, abandon it. It's possible that
--- a/chrome/browser/new_tab_page/promos/promo_service.cc
+++ b/chrome/browser/new_tab_page/promos/promo_service.cc
@@ -176,6 +176,7 @@ PromoService::PromoService(
@@ -171,6 +171,7 @@ PromoService::PromoService(
PromoService::~PromoService() = default;
void PromoService::Refresh() {
@@ -48,7 +48,7 @@
void ProfileResetter::OnDefaultSettingsFetched() {
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -281,6 +281,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -284,6 +284,7 @@ GURL SpellcheckHunspellDictionary::GetDi
}
void SpellcheckHunspellDictionary::DownloadDictionary(GURL url) {

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

@@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -938,6 +938,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -958,6 +958,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterWebSafeScheme(url::kWssScheme);
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kDataScheme);
@@ -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
@@ -1108,6 +1108,8 @@ component("net") {
@@ -1113,6 +1113,8 @@ component("net") {
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
"url_request/storage_access_status_cache.h",
@@ -173,7 +173,7 @@
return NetLogURLRequestConstructorParams(url, priority_,
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -53,6 +53,7 @@
@@ -55,6 +55,7 @@
#include "net/socket/network_binding_client_socket_factory.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/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 "url/url_constants.h"
@@ -612,6 +613,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -621,6 +622,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();

2
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
@@ -2693,24 +2693,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2711,24 +2711,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}

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

@@ -24,7 +24,7 @@
.english :lang(zh) {display: none}
--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
@@ -109,7 +109,7 @@ function maybeSetWebFont() {
@@ -153,7 +153,7 @@ function maybeSetWebFont() {
}
const e = document.createElement('link');

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

@@ -3,7 +3,7 @@
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -250,62 +250,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -232,61 +232,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
network::mojom::CredentialsMode credentials_mode,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -29,8 +29,7 @@
- if (!body.empty())
- resource_request->method = "POST";
-
- if (!headers.empty())
- resource_request->headers.AddHeadersFromString(headers);
- resource_request->headers = request_headers;
-
- resource_request->credentials_mode = credentials_mode;
-
@@ -44,7 +43,7 @@
- url_loader_->SetAllowHttpErrorResults(true);
-
- VLOG(2) << "Gaia fetcher URL: " << gaia_gurl.spec();
- VLOG(2) << "Gaia fetcher headers: " << headers;
- VLOG(2) << "Gaia fetcher headers: " << request_headers.ToString();
- VLOG(2) << "Gaia fetcher body: " << body;
-
- // Fetchers are sometimes cancelled because a network change was detected,

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

@@ -197,7 +197,7 @@
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -32,117 +32,6 @@ namespace google_util {
@@ -33,117 +33,6 @@ namespace google_util {
namespace {
@@ -314,8 +314,8 @@
-
} // namespace
// Global functions -----------------------------------------------------------
@@ -150,13 +39,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
BASE_FEATURE(kIsViewerGoogleSearchUrl,
@@ -155,13 +44,6 @@ BASE_FEATURE(kIsViewerGoogleSearchUrl,
const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
bool HasGoogleSearchQueryParam(std::string_view str) {
@@ -329,7 +329,7 @@
return false;
}
@@ -167,170 +49,53 @@ std::string GetGoogleLocale(const std::s
@@ -172,175 +54,53 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
@@ -445,7 +445,12 @@
- // Make sure the path is a known search path.
- std::string_view path(url.path_piece());
- bool is_home_page_base = IsPathHomePageBase(path);
- if (!is_home_page_base && path != "/search" && path != "/imgres") {
- bool is_search_url =
- is_home_page_base || path == "/search" || path == "/imgres";
- if (base::FeatureList::IsEnabled(kIsViewerGoogleSearchUrl)) {
- is_search_url |= path == "/viewer" || base::StartsWith(path, "/viewer/");
- }
- if (!is_search_url) {
- return false;
- }
-
@@ -565,7 +570,7 @@
bool IsProbablyGoogleSearchUrl(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -615,10 +615,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -608,10 +608,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -681,7 +686,7 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -988,7 +988,7 @@ void PrefetchContainer::AddRedirectHop(c
@@ -949,7 +949,7 @@ void PrefetchContainer::AddRedirectHop(c
// some which are added by throttles). These aren't yet supported for
// prefetch, including browsing topics and client hints.
net::HttpRequestHeaders updated_headers;
@@ -692,7 +697,7 @@
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -536,28 +536,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -538,28 +538,6 @@ bool HasGoogleHost(const GURL& url) {
}
bool IsGoogleHost(std::string_view host) {

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -368,7 +368,6 @@ if (!is_android && !is_mac) {
@@ -367,7 +367,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//components/webapps/isolated_web_apps/preload:component",
"//third_party/widevine/cdm",
]
@@ -1177,7 +1176,6 @@ if (is_win) {
@@ -1181,7 +1180,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_binaries",
":widevine_cdm_library",
@@ -25,7 +25,7 @@
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -98,11 +98,6 @@ group("resources") {
@@ -104,11 +104,6 @@ group("resources") {
]
}
@@ -35,5 +35,5 @@
- ]
- }
if (is_win || is_mac || is_linux || is_chromeos) {
public_deps += [ "connectors_internals:resources" ]
if (is_win || is_mac || is_linux || is_chromeos || is_desktop_android) {
public_deps += [ "discards:resources" ]

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

@@ -178,7 +178,7 @@
void AdAuctionServiceImpl::JoinInterestGroup(
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1485,38 +1485,7 @@ void StoragePartitionImpl::Initialize(
@@ -1484,38 +1484,7 @@ void StoragePartitionImpl::Initialize(
bucket_manager_ = std::make_unique<BucketManager>(this);
@@ -217,7 +217,7 @@
GeneratedCodeCacheSettings settings =
GetContentClient()->browser()->GetGeneratedCodeCacheSettings(
@@ -1545,8 +1514,6 @@ void StoragePartitionImpl::Initialize(
@@ -1544,8 +1513,6 @@ void StoragePartitionImpl::Initialize(
font_access_manager_ = FontAccessManager::Create();
@@ -226,7 +226,7 @@
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
if (is_in_memory()) {
@@ -1570,11 +1537,6 @@ void StoragePartitionImpl::Initialize(
@@ -1569,11 +1536,6 @@ void StoragePartitionImpl::Initialize(
std::make_unique<SharedStorageHeaderObserver>(this);
}
@@ -240,7 +240,7 @@
void StoragePartitionImpl::ResetSessionStorageConnections() {
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4127,12 +4127,6 @@ void WebContentsImpl::Init(const WebCont
@@ -4196,12 +4196,6 @@ void WebContentsImpl::Init(const WebCont
DateTimeChooser::CreateDateTimeChooser(this);
#endif

2
patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
View File

@@ -116,7 +116,7 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -130,7 +130,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -135,7 +135,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

4
patches/core/ungoogled-chromium/extensions-manifestv2.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -865,19 +865,6 @@ void ExtensionInfoGenerator::FillExtensi
@@ -864,19 +864,6 @@ void ExtensionInfoGenerator::FillExtensi
toolbar_actions_model->IsActionPinned(extension.id());
}
@@ -139,7 +139,7 @@
auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -104,13 +104,6 @@ bool IsManifestSupported(int manifest_ve
@@ -103,13 +103,6 @@ bool IsManifestSupported(int manifest_ve
// Supported versions are always safe.
if (manifest_version >= kMinimumSupportedManifestVersion &&
manifest_version <= kMaximumSupportedManifestVersion) {

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

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -369,7 +369,6 @@ if (!is_android && !is_mac) {
@@ -368,7 +368,6 @@ if (!is_android && !is_mac) {
data_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -11,7 +11,7 @@
"//components/webapps/isolated_web_apps/preload:component",
"//third_party/widevine/cdm",
]
@@ -933,8 +932,6 @@ if (is_win) {
@@ -937,8 +936,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -20,7 +20,7 @@
# This image is used to badge the lock icon in the
# authentication dialogs, such as those used for installation
# from disk image and Keystone promotion (if so enabled). It
@@ -1181,7 +1178,6 @@ if (is_win) {
@@ -1185,7 +1182,6 @@ if (is_win) {
":swiftshader_binaries",
":widevine_cdm_library",
"//chrome/browser/resources/media/mei_preload:component_bundle",
@@ -30,7 +30,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -796,10 +796,6 @@ static_library("browser") {
@@ -797,10 +797,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_metrics_document_data.h",
"navigation_predictor/navigation_predictor_preconnect_client.cc",
"navigation_predictor/navigation_predictor_preconnect_client.h",
@@ -41,7 +41,7 @@
"navigation_predictor/search_engine_preconnector_keyed_service_factory.cc",
"navigation_predictor/search_engine_preconnector_keyed_service_factory.h",
"net/cert_verifier_service_time_updater.cc",
@@ -3665,10 +3661,6 @@ static_library("browser") {
@@ -3678,10 +3674,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
@@ -52,7 +52,7 @@
"accessibility/caption_bubble_context_browser.h",
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4386,8 +4378,6 @@ static_library("browser") {
@@ -4341,8 +4333,6 @@ static_library("browser") {
"//chrome/app:command_ids",
"//chrome/app/theme:chrome_unscaled_resources_grit",
"//chrome/app/vector_icons",
@@ -60,11 +60,11 @@
- "//chrome/browser/accessibility/tree_fixing:service",
"//chrome/browser/actor",
"//chrome/browser/actor:impl",
"//chrome/browser/apps/app_service",
@@ -4408,10 +4398,6 @@ static_library("browser") {
"//chrome/browser/metrics/desktop_session_duration",
"//chrome/browser/new_tab_page/chrome_colors",
"//chrome/browser/actor/ui",
@@ -4369,10 +4359,6 @@ static_library("browser") {
"//chrome/browser/performance_manager/user_tuning",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resource_coordinator",
- "//chrome/browser/screen_ai:prefs",
- "//chrome/browser/screen_ai:screen_ai_install_state",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
@@ -72,7 +72,15 @@
"//chrome/browser/search/background",
"//chrome/browser/sharing_hub",
"//chrome/browser/smart_card",
@@ -4573,9 +4559,6 @@ static_library("browser") {
@@ -4416,7 +4402,6 @@ static_library("browser") {
"//chrome/browser/ui/webui/access_code_cast",
"//chrome/browser/ui/webui/actor_internals",
"//chrome/browser/ui/webui/app_service_internals",
- "//chrome/browser/ui/webui/autofill_ml_internals",
"//chrome/browser/ui/webui/color_pipeline_internals",
"//chrome/browser/ui/webui/infobar_internals",
"//chrome/browser/ui/webui/infobar_internals:impl",
@@ -4536,9 +4521,6 @@ static_library("browser") {
"//components/webauthn/core/browser",
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/hid",
@@ -82,7 +90,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4695,8 +4678,6 @@ static_library("browser") {
@@ -4644,8 +4626,6 @@ static_library("browser") {
sources += [
"accessibility/soda_installer_impl.cc",
"accessibility/soda_installer_impl.h",
@@ -91,7 +99,7 @@
"device_identity/device_oauth2_token_store_desktop.cc",
"device_identity/device_oauth2_token_store_desktop.h",
"device_notifications/device_status_icon_renderer.cc",
@@ -4735,8 +4716,6 @@ static_library("browser") {
@@ -4701,8 +4681,6 @@ static_library("browser") {
"profiles/profile_activity_metrics_recorder.h",
"profiles/profile_list_desktop.cc",
"profiles/profile_list_desktop.h",
@@ -100,15 +108,15 @@
"signin/force_signin_verifier.cc",
"signin/force_signin_verifier.h",
"signin/signin_manager.cc",
@@ -5541,7 +5520,6 @@ static_library("browser") {
@@ -5511,7 +5489,6 @@ static_library("browser") {
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/push_notification",
"//chrome/browser/resources:app_icon_resources",
- "//chrome/browser/screen_ai:screen_ai_dlc_installer",
"//chrome/browser/sharesheet",
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash/accelerator",
@@ -5808,7 +5786,6 @@ static_library("browser") {
@@ -5775,7 +5752,6 @@ static_library("browser") {
"//remoting/host/chromeos:browser_interop",
"//remoting/host/chromeos:features",
"//services/device/public/cpp/geolocation",
@@ -126,13 +134,13 @@
"//components/paint_preview/browser",
"//components/paint_preview/common",
"//components/paint_preview/public",
"//content/public/browser:browser",
- "//services/screen_ai/public/mojom:mojom",
"//content/public/browser",
- "//services/screen_ai/public/mojom",
]
}
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -246,12 +246,10 @@
@@ -247,12 +247,10 @@
#if BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
#include "chrome/browser/hid/hid_pinned_notification.h"
@@ -145,7 +153,7 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1382,9 +1380,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1384,9 +1382,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -157,7 +165,7 @@
bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -92,9 +92,6 @@ namespace speech {
@@ -90,9 +90,6 @@ namespace speech {
class SodaInstaller;
} // namespace speech
@@ -167,7 +175,7 @@
// Real implementation of BrowserProcess that creates and returns the services.
class BrowserProcessImpl : public BrowserProcess,
@@ -439,9 +436,6 @@ class BrowserProcessImpl : public Browse
@@ -437,9 +434,6 @@ class BrowserProcessImpl : public Browse
// to ensure that SodaInstallerImpl gets destructed first.
std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
@@ -216,21 +224,31 @@
void BindModelBroker(
content::RenderFrameHost* frame_host,
@@ -560,11 +537,6 @@ void PopulateChromeFrameBinders(
base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
@@ -554,10 +531,6 @@ void PopulateChromeFrameBinders(
&web_app::SubAppsServiceImpl::CreateIfAllowed);
}
- map->Add<screen_ai::mojom::ScreenAIAnnotator>(
- base::BindRepeating(&BindScreenAIAnnotator));
- map->Add<screen_ai::mojom::ScreenAIAnnotator>(&BindScreenAIAnnotator);
-
- map->Add<screen_ai::mojom::Screen2xMainContentExtractor>(
- base::BindRepeating(&BindScreen2xMainContentExtractor));
- &BindScreen2xMainContentExtractor);
#endif
#if BUILDFLAG(IS_WIN)
--- a/chrome/browser/chrome_browser_interface_binders_webui.cc
+++ b/chrome/browser/chrome_browser_interface_binders_webui.cc
@@ -802,8 +802,6 @@ void PopulateChromeWebUIFrameBinders(
::mojom::app_service_internals::AppServiceInternalsPageHandler,
AppServiceInternalsUI>(map);
- RegisterWebUIControllerInterfaceBinder<
- ::autofill_ml_internals::mojom::PageHandler, AutofillMlInternalsUI>(map);
RegisterWebUIControllerInterfaceBinder<
access_code_cast::mojom::PageHandlerFactory,
--- a/chrome/browser/component_updater/registration.cc
+++ b/chrome/browser/component_updater/registration.cc
@@ -66,8 +66,6 @@
@@ -64,8 +64,6 @@
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h"
@@ -239,7 +257,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
@@ -229,9 +227,6 @@ void RegisterComponentsForUpdate() {
@@ -221,9 +219,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
@@ -364,75 +382,57 @@
{"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
--- a/chrome/browser/permissions/BUILD.gn
+++ b/chrome/browser/permissions/BUILD.gn
@@ -42,8 +42,6 @@ source_set("permissions") {
"permissions_aiv1_handler.h",
"prediction_based_permission_ui_selector.cc",
"prediction_based_permission_ui_selector.h",
- "prediction_model_handler_provider.cc",
- "prediction_model_handler_provider.h",
"prediction_service_factory.cc",
"prediction_service_factory.h",
"prediction_service_request.cc",
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -249,30 +249,6 @@ void PredictionBasedPermissionUiSelector
if (snapshot.drawsNothing()) {
VLOG(1) << "[PermissionsAIv3] The page's snapshot is empty";
} else {
- PredictionModelHandlerProvider* prediction_model_handler_provider =
- PredictionModelHandlerProviderFactory::GetForBrowserContext(profile_);
- LogPredictionModelHandlerProviderForAiv3(
- prediction_model_handler_provider != nullptr);
- if (prediction_model_handler_provider) {
- PermissionsAiv3Handler* aiv3_handler =
- prediction_model_handler_provider->GetPermissionsAiv3Handler(
- request_metadata.request_type);
-
- LogPermissionsAiv3HandlerForAiv3(aiv3_handler != nullptr);
- if (aiv3_handler) {
- VLOG(1) << "[PermissionsAIv3] Inquire model";
-
- aiv3_handler->ExecuteModel(
- base::BindRepeating(
- &PredictionBasedPermissionUiSelector::
- OnDeviceAiv3ModelExecutionCallback,
- weak_ptr_factory_.GetWeakPtr(),
- /*model_inquire_start_time=*/base::TimeTicks::Now(),
- std::move(features), std::move(request_metadata)),
- std::make_unique<SkBitmap>(snapshot));
- return;
- }
- }
VLOG(1) << "[PermissionsAIv3] On device AI model session unavailable";
}
InquireServerModel(features, std::move(request_metadata),
@@ -404,22 +380,6 @@ void PredictionBasedPermissionUiSelector
if (inner_text.size() > kPageContentMaxLength) {
inner_text.resize(kPageContentMaxLength);
}
- if (PredictionModelHandlerProvider* prediction_model_handler_provider =
- PredictionModelHandlerProviderFactory::GetForBrowserContext(
- profile_)) {
- if (PermissionsAiv1Handler* aiv1_handler =
- prediction_model_handler_provider->GetPermissionsAiv1Handler()) {
- VLOG(1) << "[PermissionsAIv1] Inquire model";
- aiv1_handler->InquireAiOnDeviceModel(
- std::move(inner_text), request_metadata.request_type,
- base::BindRepeating(&PredictionBasedPermissionUiSelector::
- OnDeviceAiv1ModelExecutionCallback,
- weak_ptr_factory_.GetWeakPtr(),
- std::move(features),
- std::move(request_metadata)));
- return;
- }
- }
VLOG(1) << "[PermissionsAIv1] On device AI model session unavailable";
} else {
VLOG(1) << "[PermissionsAIv1] The page's content is too short or empty";
@@ -44,10 +44,6 @@ source_set("permissions") {
"prediction_service/passage_embedder_delegate.h",
"prediction_service/permissions_aiv1_handler.cc",
"prediction_service/permissions_aiv1_handler.h",
- "prediction_service/prediction_based_permission_ui_selector.cc",
- "prediction_service/prediction_based_permission_ui_selector.h",
- "prediction_service/prediction_model_handler_provider.cc",
- "prediction_service/prediction_model_handler_provider.h",
"prediction_service/prediction_service_factory.cc",
"prediction_service/prediction_service_factory.h",
"prediction_service/prediction_service_request.cc",
--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -475,8 +475,6 @@ ChromePermissionsClient::CreatePermissio
#endif
selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
Profile::FromBrowserContext(browser_context)));
- selectors.emplace_back(std::make_unique<PredictionBasedPermissionUiSelector>(
- Profile::FromBrowserContext(browser_context)));
return selectors;
}
--- a/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
+++ b/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
@@ -17,11 +17,6 @@ PassageEmbedderDelegate::PassageEmbedder
: profile_(profile) {}
Embedder* PassageEmbedderDelegate::get_passage_embedder() {
- if (auto* prediction_model_handler_provider =
- PredictionModelHandlerProviderFactory::GetForBrowserContext(
- profile_)) {
- return prediction_model_handler_provider->GetPassageEmbedder();
- }
return nullptr;
}
--- a/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
@@ -836,7 +836,7 @@ void PredictionBasedPermissionUiSelector
ModelExecutionData model_data) {
VLOG(1) << "[PermissionsAI] ExecuteOnDeviceAivXModel";
PredictionModelHandlerProvider* prediction_model_handler_provider =
- PredictionModelHandlerProviderFactory::GetForBrowserContext(profile_);
+ nullptr;
if (prediction_model_handler_provider) {
permissions::RequestType request_type =
model_data.request_metadata.request_type;
--- a/chrome/browser/prefs/BUILD.gn
+++ b/chrome/browser/prefs/BUILD.gn
@@ -293,7 +293,6 @@ source_set("impl") {
deps += [
@@ -297,7 +297,6 @@ source_set("impl") {
"//chrome/browser/actor/ui",
"//chrome/browser/contextual_cueing",
"//chrome/browser/promos:utils",
- "//chrome/browser/screen_ai:prefs",
@@ -441,7 +441,7 @@
"//chrome/browser/search_engines",
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1915,9 +1915,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1830,9 +1830,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -453,7 +453,7 @@
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -309,7 +309,6 @@ source_set("profiles_extra_parts_impl")
@@ -320,7 +320,6 @@ source_set("profiles_extra_parts_impl")
]
} else {
deps += [
@@ -461,7 +461,7 @@
"//chrome/browser/apps/app_service",
"//chrome/browser/autofill",
"//chrome/browser/contextual_cueing",
@@ -317,7 +316,6 @@ source_set("profiles_extra_parts_impl")
@@ -328,7 +327,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/feedback",
"//chrome/browser/hid",
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
@@ -471,7 +471,7 @@
"//chrome/browser/search_engine_choice",
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -105,7 +105,6 @@
@@ -111,7 +111,6 @@
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -479,7 +479,7 @@
#include "chrome/browser/navigation_predictor/search_engine_preconnector.h"
#include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h"
#include "chrome/browser/net/dns_probe_service_factory.h"
@@ -334,7 +333,6 @@
@@ -339,7 +338,6 @@
#include "chrome/browser/prefs/persistent_renderer_prefs_manager_factory.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
#include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
@@ -487,15 +487,15 @@
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/search/instant_service_factory.h"
@@ -1046,7 +1044,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1057,7 +1055,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
net::ServerCertificateDatabaseServiceFactory::GetInstance();
#endif
- PreloadingModelKeyedServiceFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -1098,9 +1095,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
ProfileManagementDisclaimerServiceFactory::GetInstance();
#endif
@@ -1112,9 +1109,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -505,7 +505,7 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1175,13 +1169,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1186,13 +1180,6 @@ void ChromeBrowserMainExtraPartsProfiles
policy::UserPolicySigninServiceFactory::GetInstance();
#endif
PolicyBlocklistFactory::GetInstance();
@@ -519,7 +519,7 @@
PredictionServiceFactory::GetInstance();
predictors::AutocompleteActionPredictorFactory::GetInstance();
predictors::LoadingPredictorFactory::GetInstance();
@@ -1270,10 +1257,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1278,10 +1265,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
SafetyHubMenuNotificationServiceFactory::GetInstance();
SafetyHubHatsServiceFactory::GetInstance();
@@ -530,7 +530,7 @@
#endif
#if BUILDFLAG(IS_CHROMEOS)
if (ash::features::IsScannerEnabled()) {
@@ -1387,7 +1370,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1401,7 +1384,6 @@ void ChromeBrowserMainExtraPartsProfiles
TrackingProtectionSettingsFactory::GetInstance();
translate::TranslateRankerFactory::GetInstance();
#if !BUILDFLAG(IS_ANDROID)
@@ -554,7 +554,7 @@
// System Profile.
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -853,11 +853,6 @@ void ProfileImpl::DoFinalInit(CreateMode
@@ -855,11 +855,6 @@ void ProfileImpl::DoFinalInit(CreateMode
// The password settings service needs to start listening to settings
// changes from Google Mobile Services, as early as possible.
PasswordManagerSettingsServiceFactory::GetForProfile(this);
@@ -588,7 +588,7 @@
#if BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -101,7 +101,6 @@ group("resources") {
@@ -107,7 +107,6 @@ group("resources") {
if (is_mac) {
public_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -598,7 +598,7 @@
--- a/chrome/browser/resources/pdf/pdf_viewer.html
+++ b/chrome/browser/resources/pdf/pdf_viewer.html
@@ -107,10 +107,6 @@ import {AnnotationMode} from './constant
@@ -113,10 +113,6 @@ import {AnnotationMode} from './constant
</cr-page-selector>
` : ''}
</if>
@@ -611,23 +611,31 @@
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1631,8 +1631,6 @@ static_library("ui") {
@@ -1524,8 +1524,6 @@ static_library("ui") {
"//chrome/browser/regional_capabilities",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/screen_ai:screen_ai_install_state",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
"//chrome/browser/smart_card:smart_card",
"//chrome/browser/smart_card",
"//chrome/browser/tab_group_sync:utils",
"//chrome/browser/themes",
@@ -2348,7 +2346,6 @@ static_library("ui") {
@@ -2278,7 +2276,6 @@ static_library("ui") {
"//chrome/browser/policy:onc",
"//chrome/browser/policy:system_features_disable_list",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/push_notification",
- "//chrome/browser/screen_ai/public:optical_character_recognizer",
"//chrome/browser/ui/ash/accessibility",
"//chrome/browser/ui/ash/app_access",
"//chrome/browser/ui/ash/arc",
@@ -4787,7 +4784,6 @@ static_library("ui") {
"//chrome/browser/ui/views/user_education",
"//chrome/browser/ui/webauthn:impl",
"//chrome/browser/ui/webui/app_service_internals",
- "//chrome/browser/ui/webui/autofill_ml_internals",
"//chrome/browser/ui/webui/side_panel/customize_chrome",
"//chrome/browser/ui/window_name_prompt",
"//components/collaboration/public",
--- a/chrome/browser/ui/pdf/BUILD.gn
+++ b/chrome/browser/ui/pdf/BUILD.gn
@@ -6,7 +6,6 @@ import("//pdf/features.gni")
@@ -648,29 +656,100 @@
"//chrome/common",
--- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
@@ -95,12 +95,3 @@ void ChromePDFDocumentHelperClient::SetP
@@ -107,21 +107,3 @@ void ChromePDFDocumentHelperClient::SetP
}
}
-void ChromePDFDocumentHelperClient::OnSearchifyStarted(
- content::WebContents* contents) {
- // TODO(crbug.com/360803943): Add test.
- content::RenderFrameHost* render_frame_host) {
- // Show the promo only when ScreenAI component is available and OCR can be
- // done.
- if (screen_ai::ScreenAIInstallState::GetInstance()->IsComponentAvailable()) {
- MaybeShowFeaturePromo(contents);
- if (!screen_ai::ScreenAIInstallState::GetInstance()->IsComponentAvailable()) {
- return;
- }
- content::WebContents* web_contents = GetWebContentsToUse(render_frame_host);
- if (!MaybeShowFeaturePromo(web_contents)) {
- return;
- }
- auto* const tab = tabs::TabInterface::MaybeGetFromContents(web_contents);
- if (!tab) {
- return;
- }
- tab_subscriptions_.push_back(
- tab->RegisterWillDeactivate(base::BindRepeating(&MaybeHideFeaturePromo)));
-}
--- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
@@ -24,7 +24,6 @@ class ChromePDFDocumentHelperClient : pu
@@ -25,7 +25,6 @@ class ChromePDFDocumentHelperClient : pu
void OnSaveURL(content::WebContents* contents) override;
void SetPluginCanSave(content::RenderFrameHost* render_frame_host,
bool can_save) override;
- void OnSearchifyStarted(content::WebContents* contents) override;
};
- void OnSearchifyStarted(content::RenderFrameHost* render_frame_host) override;
#endif // CHROME_BROWSER_UI_PDF_CHROME_PDF_DOCUMENT_HELPER_CLIENT_H_
// Holds subscriptions for TabInterface callbacks.
std::vector<base::CallbackListSubscription> tab_subscriptions_;
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -764,39 +764,6 @@ void MaybeRegisterChromeFeaturePromos(
.SetBubbleIcon(kLightbulbOutlineIcon)
.SetBubbleTitleText(IDS_PASSWORD_MANAGER_IPH_CREATE_SHORTCUT_TITLE)));
- // kIPHPdfSearchifyFeature:
- registry.RegisterFeature(std::move(
- FeaturePromoSpecification::CreateForToastPromo(
- feature_engagement::kIPHPdfSearchifyFeature, kTopContainerElementId,
- IDS_PDF_SEARCHIFY_IPH_BODY, IDS_PDF_SEARCHIFY_IPH_BODY_SCREEN_READER,
- FeaturePromoSpecification::AcceleratorInfo())
- .SetBubbleArrow(HelpBubbleArrow::kNone)
- .SetBubbleTitleText(IDS_PDF_SEARCHIFY_IPH_TITLE)
- .SetMetadata(132, "rhalavati@chromium.org",
- "Triggered once when user opens a PDF which gets OCRed.")
- .SetAnchorElementFilter(base::BindRepeating(
- [](const ui::ElementTracker::ElementList& elements)
- -> ui::TrackedElement* {
- if (elements.empty()) {
- return nullptr;
- }
- // Ensure a searchified PDF is visible before showing the IPH.
- auto* const browser_view =
- views::ElementTrackerViews::GetInstance()
- ->GetFirstMatchingViewAs<BrowserView>(
- kBrowserViewElementId, elements[0]->context());
- std::vector<ContentsWebView*> contents_web_views =
- browser_view->GetAllVisibleContentsWebViews();
- for (auto* contents_web_view : contents_web_views) {
- auto* pdf_doc_helper =
- pdf::PDFDocumentHelper::MaybeGetForWebContents(
- contents_web_view->GetWebContents());
- if (pdf_doc_helper && pdf_doc_helper->SearchifyStarted()) {
- return elements[0];
- }
- }
- return nullptr;
- }))));
// kIPHLensOverlayFeature:
registry.RegisterFeature(std::move(
--- a/chrome/browser/ui/webui/BUILD.gn
+++ b/chrome/browser/ui/webui/BUILD.gn
@@ -59,7 +59,6 @@ source_set("configs") {
"//chrome/browser/ui/webui/access_code_cast",
"//chrome/browser/ui/webui/actor_internals",
"//chrome/browser/ui/webui/app_service_internals",
- "//chrome/browser/ui/webui/autofill_ml_internals",
"//chrome/browser/ui/webui/color_pipeline_internals",
"//chrome/browser/ui/webui/infobar_internals",
"//chrome/browser/ui/webui/new_tab_footer",
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -295,7 +295,6 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<actor::ui::ActorOverlayUIConfig>());
map.AddWebUIConfig(std::make_unique<ActorInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<AppServiceInternalsUIConfig>());
- map.AddWebUIConfig(std::make_unique<AutofillMlInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<media_router::AccessCodeCastUIConfig>());
map.AddWebUIConfig(std::make_unique<BookmarksSidePanelUIConfig>());
map.AddWebUIConfig(std::make_unique<BookmarksUIConfig>());
--- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
+++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
@@ -35,11 +35,6 @@ void AccessibilityMainHandler::RegisterM
@@ -776,7 +855,7 @@
#include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
@@ -370,14 +368,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -376,14 +374,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
@@ -793,7 +872,7 @@
// This causes AXTreeSerializer to reset and send accessibility events of
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -373,18 +373,6 @@ static_library("renderer") {
@@ -334,18 +334,6 @@ static_library("renderer") {
]
} else {
sources += [
@@ -812,17 +891,17 @@
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -399,7 +387,6 @@ static_library("renderer") {
@@ -360,7 +348,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
- "//services/screen_ai/public/mojom",
"//services/strings",
"//third_party/re2:re2",
"//third_party/re2",
]
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -70,7 +70,6 @@
@@ -71,7 +71,6 @@
#include "url/gurl.h"
#if !BUILDFLAG(IS_ANDROID)
@@ -830,7 +909,7 @@
#include "chrome/renderer/actor/journal.h"
#include "chrome/renderer/actor/tool_executor.h"
#include "chrome/renderer/searchbox/searchbox_extension.h"
@@ -323,21 +322,6 @@ void ChromeRenderFrameObserver::DidCommi
@@ -324,21 +323,6 @@ void ChromeRenderFrameObserver::DidCommi
}
void ChromeRenderFrameObserver::DidClearWindowObject() {
@@ -854,7 +933,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2334,9 +2334,6 @@ if (!is_android) {
@@ -2375,9 +2375,6 @@ if (!is_android) {
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/safe_browsing:advanced_protection",
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -864,7 +943,7 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2755,8 +2752,6 @@ if (!is_android) {
@@ -2809,8 +2806,6 @@ if (!is_android) {
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
"//services/preferences/tracked:features",
@@ -873,7 +952,7 @@
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -8405,7 +8400,6 @@ test("unit_tests") {
@@ -8441,7 +8436,6 @@ test("unit_tests") {
#
# TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
deps += [
@@ -881,7 +960,7 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -8439,7 +8433,6 @@ test("unit_tests") {
@@ -8474,7 +8468,6 @@ test("unit_tests") {
"//chrome/browser/profile_resetter:fake_profile_resetter",
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/resources/new_tab_page_instant:resources_grit",
@@ -891,8 +970,8 @@
"//chrome/browser/search_engine_choice:unit_tests",
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -408,7 +408,7 @@ source_set("lib") {
}
@@ -416,7 +416,7 @@ source_set("lib") {
configs += [ "//build/config/compiler:no_exit_time_destructors" ]
}
-if (is_linux) {
@@ -906,15 +985,15 @@
data = [ "//chrome/test/variations/test_utils/" ]
- data_deps = [ "//third_party/catapult/third_party/gsutil:gsutil" ]
- data_deps = [ "//third_party/catapult/third_party/gsutil" ]
}
python_library("fixtures") {
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -145,7 +145,6 @@ static_library("utility") {
"//components/autofill/core/common",
"//components/user_data_importer/common",
"//components/user_data_importer/content",
"//components/user_data_importer/utility:bookmarks",
"//services/proxy_resolver:lib",
- "//services/screen_ai",
]
@@ -922,7 +1001,7 @@
--- a/chrome/utility/services.cc
+++ b/chrome/utility/services.cc
@@ -59,8 +59,6 @@
@@ -61,8 +61,6 @@
#include "services/passage_embeddings/passage_embeddings_service.h"
#include "services/proxy_resolver/proxy_resolver_factory_impl.h" // nogncheck
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
@@ -931,7 +1010,7 @@
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -258,12 +256,6 @@ auto RunSpeechRecognitionService(
@@ -268,12 +266,6 @@ auto RunSpeechRecognitionService(
}
#endif // !BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -944,7 +1023,7 @@
#if BUILDFLAG(IS_CHROMEOS)
auto RunCupsIppParser(
@@ -465,7 +457,6 @@ void RegisterMainThreadServices(mojo::Se
@@ -476,7 +468,6 @@ void RegisterMainThreadServices(mojo::Se
services.Add(RunProfileImporter);
services.Add(RunMirroringService);
services.Add(RunPassageEmbeddingsService);
@@ -954,17 +1033,27 @@
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -607,7 +607,6 @@ test("components_unittests") {
@@ -613,7 +613,6 @@ test("components_unittests") {
"//components/media_router/common/providers/cast/channel:unit_tests",
"//components/page_info:unit_tests",
"//components/permissions:unit_tests",
- "//components/permissions/prediction_service:unit_tests",
"//components/privacy_sandbox:unit_tests",
"//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests",
"//components/safety_check:unit_tests",
"//components/security_interstitials/content:unit_tests",
--- a/components/autofill/core/browser/autofill_field.cc
+++ b/components/autofill/core/browser/autofill_field.cc
@@ -24,7 +24,6 @@
#include "components/autofill/core/browser/field_type_utils.h"
#include "components/autofill/core/browser/field_types.h"
#include "components/autofill/core/browser/heuristic_source.h"
-#include "components/autofill/core/browser/ml_model/field_classification_model_handler.h"
#include "components/autofill/core/browser/proto/server.pb.h"
#include "components/autofill/core/common/autofill_constants.h"
#include "components/autofill/core/common/autofill_features.h"
--- a/components/omnibox/browser/autocomplete_classifier.cc
+++ b/components/omnibox/browser/autocomplete_classifier.cc
@@ -127,8 +127,6 @@ void AutocompleteClassifier::Classify(
@@ -131,8 +131,6 @@ void AutocompleteClassifier::Classify(
metrics::OmniboxEventProto::PageClassification page_classification,
AutocompleteMatch* match,
GURL* alternate_nav_url) {
@@ -1005,7 +1094,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -825,10 +825,6 @@ if (is_apple) {
@@ -836,10 +836,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -1016,6 +1105,17 @@
if (v8_use_external_startup_data) {
public_deps += [ "//v8" ]
if (use_v8_context_snapshot) {
--- a/services/on_device_model/on_device_model.gni
+++ b/services/on_device_model/on_device_model.gni
@@ -15,7 +15,6 @@ declare_args() {
# Constraint code is disabled on platforms where the on-device model does not
# run due to binary size.
enable_constraints = is_win || is_mac || is_linux || is_ios || is_cbx
- enable_ml_internal = build_with_internal_optimization_guide &&
- (is_win || is_mac || is_linux || is_ios || is_cbx)
+ enable_ml_internal = false
use_chromeos_model_service = is_chrome_branded && is_cbx
}
--- a/services/passage_embeddings/passage_embeddings_service.cc
+++ b/services/passage_embeddings/passage_embeddings_service.cc
@@ -23,7 +23,6 @@ PassageEmbeddingsService::~PassageEmbedd
@@ -1058,7 +1158,7 @@
}
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
@@ -207,7 +207,6 @@ group("unittests") {
@@ -209,7 +209,6 @@ group("unittests") {
"panels/timeline:unittests",
"panels/timeline/components:unittests",
"panels/timeline/components/insights:unittests",

388
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
@@ -634,8 +634,6 @@ static_library("browser") {
@@ -635,8 +635,6 @@ static_library("browser") {
"idle/idle_detection_permission_context.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -11,7 +11,7 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"k_anonymity_service/k_anonymity_service_client.cc",
@@ -2385,7 +2383,6 @@ static_library("browser") {
@@ -2403,7 +2401,6 @@ static_library("browser") {
"//components/resources",
"//components/safe_browsing/content/browser",
"//components/safe_browsing/content/browser:safe_browsing_service",
@@ -19,7 +19,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/content/common/proto:download_file_types_proto",
@@ -4001,10 +3998,6 @@ static_library("browser") {
@@ -3992,10 +3989,6 @@ static_library("browser") {
"new_tab_page/modules/modules_switches.h",
"new_tab_page/modules/new_tab_page_modules.cc",
"new_tab_page/modules/new_tab_page_modules.h",
@@ -30,7 +30,7 @@
"new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc",
"new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h",
"new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc",
@@ -8699,7 +8692,6 @@ static_library("browser_generated_files"
@@ -8662,7 +8655,6 @@ static_library("browser_generated_files"
"//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info",
"//chrome/browser/new_tab_page/chrome_colors:generate_colors_info",
"//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings",
@@ -38,18 +38,18 @@
"//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings",
@@ -9187,8 +9179,6 @@ static_library("test_support") {
@@ -9153,8 +9145,6 @@ static_library("test_support") {
"//components/reporting/util:status",
"//components/reporting/util:status_macros",
"//components/reporting/util:task_runner_context",
- "//components/safe_browsing/content/browser/notification_content_detection:notification_content_detection",
- "//components/safe_browsing/content/browser/notification_content_detection",
- "//components/safe_browsing/content/browser/notification_content_detection:test_utils",
"//components/safe_browsing/core/common/proto:csd_proto",
"//components/search_engines:test_support",
"//components/security_interstitials/content:security_interstitial_page",
--- a/chrome/browser/download/bubble/download_bubble_ui_controller.cc
+++ b/chrome/browser/download/bubble/download_bubble_ui_controller.cc
@@ -45,7 +45,6 @@
@@ -47,7 +47,6 @@
#include "components/offline_items_collection/core/offline_content_aggregator.h"
#include "components/safe_browsing/buildflags.h"
#include "components/safe_browsing/core/common/features.h"
@@ -57,7 +57,7 @@
#include "content/public/browser/download_item_utils.h"
#include "content/public/browser/download_manager.h"
@@ -265,14 +264,6 @@ void DownloadBubbleUIController::Process
@@ -275,14 +274,6 @@ void DownloadBubbleUIController::Process
switch (command) {
case DownloadCommands::KEEP:
case DownloadCommands::DISCARD: {
@@ -74,7 +74,7 @@
// Launch a HaTS survey. Note this needs to come before the command is
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -172,7 +172,6 @@ using content::DownloadManager;
@@ -178,7 +178,6 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -82,7 +82,7 @@
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
#if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION)
@@ -1876,7 +1875,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -1895,7 +1894,6 @@ void ChromeDownloadManagerDelegate::OnDo
DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info.target_path, target_info.is_filetype_handled_safely);
@@ -90,7 +90,7 @@
}
if (ShouldBlockFile(item, target_info.danger_type)) {
MaybeReportDangerousDownloadBlocked(
@@ -1957,49 +1955,20 @@ bool ChromeDownloadManagerDelegate::IsOp
@@ -1976,49 +1974,20 @@ bool ChromeDownloadManagerDelegate::IsOp
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item,
download::DownloadDangerType danger_type) const {
@@ -146,7 +146,7 @@
<< static_cast<int>(download_restriction);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1371,14 +1371,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -1378,14 +1378,7 @@ DownloadFileType::DangerLevel DownloadTa
std::optional<base::Time>
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
@@ -316,7 +316,7 @@
std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel()
--- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
+++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
@@ -172,70 +172,12 @@ void FilesRequestHandler::FileRequestCal
@@ -171,70 +171,12 @@ void FilesRequestHandler::FileRequestCal
}
bool FilesRequestHandler::UploadDataImpl() {
@@ -387,7 +387,7 @@
void FilesRequestHandler::OnGotFileInfo(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
size_t index,
@@ -284,15 +226,6 @@ void FilesRequestHandler::OnGotFileInfo(
@@ -283,15 +225,6 @@ void FilesRequestHandler::OnGotFileInfo(
void FilesRequestHandler::FinishRequestEarly(
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
safe_browsing::BinaryUploadService::Result result) {
@@ -491,7 +491,7 @@
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
@@ -187,20 +187,7 @@ void RealtimeReportingClient::SetProfile
@@ -188,20 +188,7 @@ void RealtimeReportingClient::SetProfile
}
std::string RealtimeReportingClient::GetProfileUserName() {
@@ -537,24 +537,24 @@
--- a/chrome/browser/enterprise/data_controls/reporting_service.cc
+++ b/chrome/browser/enterprise/data_controls/reporting_service.cc
@@ -182,10 +182,6 @@ void ReportingService::ReportPaste(
@@ -185,10 +185,6 @@ void ReportingService::ReportPaste(
const content::ClipboardEndpoint& destination,
const content::ClipboardMetadata& metadata,
const Verdict& verdict) {
- ReportCopyOrPaste(
- source, destination, metadata, verdict,
- extensions::SafeBrowsingPrivateEventRouter::kTriggerWebContentUpload,
- enterprise_connectors::kWebContentUploadDataTransferEventTrigger,
- GetEventResult(verdict.level()));
}
void ReportingService::ReportPasteWarningBypassed(
@@ -193,29 +189,17 @@ void ReportingService::ReportPasteWarnin
@@ -196,29 +192,17 @@ void ReportingService::ReportPasteWarnin
const content::ClipboardEndpoint& destination,
const content::ClipboardMetadata& metadata,
const Verdict& verdict) {
- ReportCopyOrPaste(
- source, destination, metadata, verdict,
- extensions::SafeBrowsingPrivateEventRouter::kTriggerWebContentUpload,
- enterprise_connectors::kWebContentUploadDataTransferEventTrigger,
- enterprise_connectors::EventResult::BYPASSED);
}
@@ -563,7 +563,7 @@
const Verdict& verdict) {
- ReportCopyOrPaste(
- source, /*destination=*/std::nullopt, metadata, verdict,
- extensions::SafeBrowsingPrivateEventRouter::kTriggerClipboardCopy,
- enterprise_connectors::kClipboardCopyDataTransferEventTrigger,
- GetEventResult(verdict.level()));
}
@@ -573,17 +573,17 @@
const Verdict& verdict) {
- ReportCopyOrPaste(
- source, /*destination=*/std::nullopt, metadata, verdict,
- extensions::SafeBrowsingPrivateEventRouter::kTriggerClipboardCopy,
- enterprise_connectors::kClipboardCopyDataTransferEventTrigger,
- enterprise_connectors::EventResult::BYPASSED);
}
void ReportingService::ReportCopyOrPaste(
@@ -225,45 +209,6 @@ void ReportingService::ReportCopyOrPaste
@@ -228,52 +212,6 @@ void ReportingService::ReportCopyOrPaste
const Verdict& verdict,
const std::string& trigger,
enterprise_connectors::EventResult event_result) {
- auto* router =
- extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile(
- enterprise_connectors::ReportingEventRouterFactory::GetForBrowserContext(
- &profile_.get());
-
- if (!router || verdict.triggered_rules().empty()) {
@@ -593,22 +593,24 @@
- GURL url;
- std::string destination_string;
- std::string source_string;
- content::WebContents* web_contents = nullptr;
- if (trigger ==
- extensions::SafeBrowsingPrivateEventRouter::kTriggerWebContentUpload) {
- enterprise_connectors::kWebContentUploadDataTransferEventTrigger) {
- DCHECK(destination.has_value());
-
- url = GetURL(*destination);
- destination_string = url.spec();
- source_string = GetClipboardSourceString(source, *destination,
- kDataControlsRulesScopePref);
- web_contents = destination->web_contents();
- } else {
- DCHECK_EQ(
- trigger,
- extensions::SafeBrowsingPrivateEventRouter::kTriggerClipboardCopy);
- DCHECK_EQ(trigger,
- enterprise_connectors::kClipboardCopyDataTransferEventTrigger);
- DCHECK(!destination.has_value());
-
- url = GetURL(source);
- source_string = GetURL(source).spec();
- web_contents = source.web_contents();
- }
-
- router->OnDataControlsSensitiveDataEvent(
@@ -618,23 +620,28 @@
- /*destination=*/destination_string,
- /*mime_type=*/GetMimeType(metadata.format_type),
- /*trigger=*/trigger,
- /*source_active_user_email=*/
- enterprise_data_protection::GetActiveContentAreaUser(source),
- /*content_area_account_email=*/
- enterprise_connectors::ContentAreaUserProvider::GetUser(
- &profile_.get(), web_contents, url),
- /*triggered_rules=*/verdict.triggered_rules(),
- /*event_result=*/event_result,
- /*content_size=*/metadata.size.value_or(-1));
}
// --------------------------------------
@@ -293,7 +238,6 @@ ReportingServiceFactory::ReportingServic
@@ -303,7 +241,6 @@ ReportingServiceFactory::ReportingServic
.WithSystem(ProfileSelection::kNone)
.WithAshInternals(ProfileSelection::kNone)
.Build()) {
- DependsOn(extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance());
- DependsOn(enterprise_connectors::ReportingEventRouterFactory::GetInstance());
}
ReportingServiceFactory::~ReportingServiceFactory() = default;
--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
@@ -195,9 +195,7 @@ void LogVerdictSource(
@@ -202,9 +202,7 @@ void LogVerdictSource(
bool IsScreenshotAllowedByDataControls(content::BrowserContext* context,
const GURL& url) {
@@ -665,7 +672,7 @@
bool site_isolation_enabled;
--- a/chrome/browser/enterprise/signals/profile_signals_collector.cc
+++ b/chrome/browser/enterprise/signals/profile_signals_collector.cc
@@ -48,14 +48,8 @@ ProfileSignalsCollector::ProfileSignalsC
@@ -45,12 +45,8 @@ ProfileSignalsCollector::ProfileSignalsC
PolicyBlocklistFactory::GetForBrowserContext(profile)),
profile_prefs_(profile->GetPrefs()),
policy_manager_(profile->GetCloudPolicyManager()),
@@ -674,13 +681,11 @@
- profile)),
profile_id_service_(
enterprise::ProfileIdServiceFactory::GetForProfile(profile)) {
-#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
- CHECK(connectors_service_);
-#endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
CHECK(policy_blocklist_service_);
CHECK(profile_id_service_);
}
@@ -73,12 +67,8 @@ void ProfileSignalsCollector::GetProfile
@@ -68,12 +64,8 @@ void ProfileSignalsCollector::GetProfile
signal_response.chrome_remote_desktop_app_blocked =
device_signals::GetChromeRemoteDesktopAppBlocked(
policy_blocklist_service_);
@@ -695,7 +700,7 @@
signal_response.profile_id = profile_id_service_->GetProfileId();
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -400,8 +400,6 @@ source_set("extensions") {
@@ -406,8 +406,6 @@ source_set("extensions") {
"mv2_deprecation_impact_checker.cc",
"mv2_deprecation_impact_checker.h",
"mv2_experiment_stage.h",
@@ -725,7 +730,7 @@
info.enterprise_profile_id = signals.enterprise_profile_id;
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -375,8 +375,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -377,8 +377,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::kBoolean;
(*s_allowlist)[::kGeneratedHttpsFirstModePref] =
settings_api::PrefType::kNumber;
@@ -769,6 +774,17 @@
}
} // namespace extensions
--- a/chrome/browser/extensions/chrome_extensions_browser_client_non_android.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client_non_android.cc
@@ -34,8 +34,6 @@ void ChromeExtensionsBrowserClient::Init
// Must occur after g_browser_process is initialized.
user_script_listener_ = std::make_unique<UserScriptListener>();
- // Full safe browsing is supported so use the Chrome delegate.
- safe_browsing_delegate_ = std::make_unique<ChromeSafeBrowsingDelegate>();
}
ProcessManagerDelegate*
--- a/chrome/browser/extensions/extension_allowlist_factory.cc
+++ b/chrome/browser/extensions/extension_allowlist_factory.cc
@@ -45,7 +45,6 @@ ExtensionAllowlistFactory::ExtensionAllo
@@ -793,14 +809,14 @@
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -56,7 +56,6 @@
@@ -55,7 +55,6 @@
#include "chrome/browser/extensions/installed_loader.h"
#include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
#include "chrome/browser/extensions/mv2_experiment_stage.h"
-#include "chrome/browser/extensions/omaha_attributes_handler.h"
#include "chrome/browser/extensions/permissions/permissions_updater.h"
#include "chrome/browser/extensions/profile_util.h"
#include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/extensions/sync/extension_sync_service.h"
@@ -212,9 +211,6 @@ ExtensionService::ExtensionService(
extension_telemetry_service_verdict_handler_(extension_prefs,
registry_,
@@ -924,11 +940,13 @@
}
--- a/chrome/browser/notifications/persistent_notification_handler.cc
+++ b/chrome/browser/notifications/persistent_notification_handler.cc
@@ -308,16 +308,6 @@ void PersistentNotificationHandler::Disa
@@ -314,24 +314,6 @@ void PersistentNotificationHandler::Disa
NotificationPermissionContext::UpdatePermission(profile, origin,
CONTENT_SETTING_BLOCK);
#endif
- // Remove `origin` from user allowlisted sites when user unsubscribes.
- // Remove `origin` from user allowlisted sites when user unsubscribes. On
- // Android, log the suspicious notification unsubscribe ukm event if the
- // notification was suspicious.
- auto* hcsm = HostContentSettingsMapFactory::GetForProfile(profile);
- if (hcsm && origin.is_valid()) {
- hcsm->SetWebsiteSettingCustomScope(
@@ -937,11 +955,17 @@
- ContentSettingsType::ARE_SUSPICIOUS_NOTIFICATIONS_ALLOWLISTED_BY_USER,
- base::Value(base::Value::Dict().Set(
- safe_browsing::kIsAllowlistedByUserKey, false)));
-#if BUILDFLAG(IS_ANDROID)
- if (notification_id.has_value()) {
- safe_browsing::MaybeLogSuspiciousNotificationUnsubscribeUkm(
- hcsm, origin, notification_id.value(), profile);
- }
-#endif
- }
}
void PersistentNotificationHandler::OpenSettings(Profile* profile,
@@ -356,42 +346,6 @@ void PersistentNotificationHandler::OnMa
@@ -384,42 +366,6 @@ void PersistentNotificationHandler::OnMa
Profile* profile,
bool did_show_warning,
bool did_user_unsubscribe) {
@@ -1012,7 +1036,7 @@
- if (notification_context) {
- notification_context->WriteNotificationMetadata(
- notification.id(), notification.origin_url(),
- safe_browsing::kMetadataDictionaryKey,
- safe_browsing::kNotificationContentDetectionMetadataDictionaryKey,
- serialized_content_detection_metadata.value(), std::move(callback));
- return;
- }
@@ -1025,8 +1049,43 @@
}
void PlatformNotificationServiceImpl::LogPersistentNotificationShownMetrics(
--- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
+++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
--- a/chrome/browser/permissions/permission_revocation_request.cc
+++ b/chrome/browser/permissions/permission_revocation_request.cc
@@ -172,32 +172,6 @@ void PermissionRevocationRequest::OnSite
base::TimeTicks::Now() - crowd_deny_request_start_time_.value();
}
- if (site_reputation && !site_reputation->warning_only()) {
- bool should_revoke_permission = false;
- switch (site_reputation->notification_ux_quality()) {
- case CrowdDenyPreloadData::SiteReputation::ABUSIVE_PROMPTS:
- case CrowdDenyPreloadData::SiteReputation::ABUSIVE_CONTENT:
- should_revoke_permission = NotificationsPermissionRevocationConfig::
- IsAbusiveOriginPermissionRevocationEnabled();
- break;
- case CrowdDenyPreloadData::SiteReputation::DISRUPTIVE_BEHAVIOR:
- should_revoke_permission = true;
- break;
- default:
- should_revoke_permission = false;
- }
- DCHECK(g_browser_process->safe_browsing_service());
- if (should_revoke_permission &&
- g_browser_process->safe_browsing_service()) {
- safe_browsing_request_.emplace(
- g_browser_process->safe_browsing_service()->database_manager(),
- base::DefaultClock::GetInstance(), url::Origin::Create(origin_),
- base::BindOnce(
- &PermissionRevocationRequest::OnSafeBrowsingVerdictReceived,
- weak_factory_.GetWeakPtr(), site_reputation));
- return;
- }
- }
NotifyCallback(Outcome::PERMISSION_NOT_REVOKED);
}
--- a/chrome/browser/permissions/prediction_service/contextual_notification_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/contextual_notification_permission_ui_selector.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
@@ -1075,63 +1134,41 @@
}
void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
--- a/chrome/browser/permissions/permission_revocation_request.cc
+++ b/chrome/browser/permissions/permission_revocation_request.cc
@@ -172,32 +172,6 @@ void PermissionRevocationRequest::OnSite
base::TimeTicks::Now() - crowd_deny_request_start_time_.value();
}
- if (site_reputation && !site_reputation->warning_only()) {
- bool should_revoke_permission = false;
- switch (site_reputation->notification_ux_quality()) {
- case CrowdDenyPreloadData::SiteReputation::ABUSIVE_PROMPTS:
- case CrowdDenyPreloadData::SiteReputation::ABUSIVE_CONTENT:
- should_revoke_permission = NotificationsPermissionRevocationConfig::
- IsAbusiveOriginPermissionRevocationEnabled();
- break;
- case CrowdDenyPreloadData::SiteReputation::DISRUPTIVE_BEHAVIOR:
- should_revoke_permission = true;
- break;
- default:
- should_revoke_permission = false;
- }
- DCHECK(g_browser_process->safe_browsing_service());
- if (should_revoke_permission &&
- g_browser_process->safe_browsing_service()) {
- safe_browsing_request_.emplace(
- g_browser_process->safe_browsing_service()->database_manager(),
- base::DefaultClock::GetInstance(), url::Origin::Create(origin_),
- base::BindOnce(
- &PermissionRevocationRequest::OnSafeBrowsingVerdictReceived,
- weak_factory_.GetWeakPtr(), site_reputation));
- return;
- }
- }
NotifyCallback(Outcome::PERMISSION_NOT_REVOKED);
}
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -596,62 +596,6 @@ bool PredictionBasedPermissionUiSelector
--- a/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc
@@ -687,83 +687,6 @@ bool PredictionBasedPermissionUiSelector
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
permissions::RequestType request_type) {
- const bool is_msbb_enabled = profile_->GetPrefs()->GetBoolean(
- unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
-
- base::UmaHistogramBoolean("Permissions.PredictionService.MSBB",
- is_msbb_enabled);
-
- VLOG(1) << "[CPSS] GetPredictionTypeToUse MSBB: " << is_msbb_enabled;
-
- const bool is_notification_cpss_enabled =
- profile_->GetPrefs()->GetBoolean(prefs::kEnableNotificationCPSS);
-
- VLOG(1) << "[CPSS] GetPredictionTypeToUse NotificationCPSS: "
- << is_notification_cpss_enabled;
-
- const bool is_geolocation_cpss_enabled =
- profile_->GetPrefs()->GetBoolean(prefs::kEnableGeolocationCPSS);
-
- VLOG(1) << "[CPSS] GetPredictionTypeToUse GeolocationCPSS: "
- << is_geolocation_cpss_enabled;
-
- if (request_type == permissions::RequestType::kNotifications &&
- !is_notification_cpss_enabled) {
- VLOG(1) << "[CPSS] GetPredictionTypeToUse NoCpssModel";
- return PredictionSource::kNoCpssModel;
- }
-
- if (request_type == permissions::RequestType::kGeolocation &&
- !is_geolocation_cpss_enabled) {
- VLOG(1) << "[CPSS] GetPredictionTypeToUse NoCpssModel";
- return PredictionSource::kNoCpssModel;
- }
-
@@ -1146,15 +1183,23 @@
-#endif // BUILDFLAG(IS_ANDROID)
- }
- if (use_server_side) {
- // Aiv3 takes priority over Aiv1 if both are enabled.
- // AIvX models take priority over each other in the following order:
- // AIv4, AIv3, AIv1
-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- if (PredictionModelHandlerProvider::IsAiv4ModelAvailable()) {
- VLOG(1) << "[CPSS] GetPredictionTypeToUse AIv4";
- return PredictionSource::kOnDeviceAiv4AndServerSideModel;
- }
- if (base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv3)) {
- VLOG(1) << "[CPSS] GetPredictionTypeToUse AIv3";
- return PredictionSource::kOnDeviceAiv3AndServerSideModel;
- }
-#endif // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- if (base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) {
- VLOG(1) << "[CPSS] GetPredictionTypeToUse AIv1";
- return PredictionSource::kOnDeviceAiv1AndServerSideModel;
- }
- VLOG(1) << "[CPSS] GetPredictionTypeToUse CPSSv3";
- return PredictionSource::kServerSideCpssV3Model;
- }
-
@@ -1168,16 +1213,16 @@
- permissions::features::kPermissionOnDeviceGeolocationPredictions);
- }
- if (use_ondevice_tflite) {
- VLOG(1) << "[CPSS] GetPredictionTypeToUse CPSSv1";
- return PredictionSource::kOnDeviceCpssV1Model;
- }
-#endif // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
-
return PredictionSource::kNoCpssModel;
}
VLOG(1) << "[CPSS] GetPredictionTypeToUse NoCpssModel";
return PredictionSource::kNoCpssModel;
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -2498,8 +2498,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2511,8 +2511,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -1188,7 +1233,7 @@
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -287,7 +287,6 @@
@@ -284,7 +284,6 @@
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
#include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h"
#include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h"
@@ -1196,7 +1241,7 @@
#include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h"
#include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h"
@@ -2164,7 +2163,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -2083,7 +2082,6 @@ void RegisterProfilePrefs(user_prefs::Pr
NewTabFooterUI::RegisterProfilePrefs(registry);
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
@@ -1206,7 +1251,7 @@
promos_utils::RegisterProfilePrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -874,9 +874,7 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -880,9 +880,7 @@ void ChromeBrowserMainExtraPartsProfiles
enterprise_connectors::TelomereEventRouterFactory::GetInstance();
}
#endif
@@ -1218,7 +1263,7 @@
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -76,9 +76,6 @@ static_library("safe_browsing") {
@@ -80,9 +80,6 @@ static_library("safe_browsing") {
]
}
@@ -1228,14 +1273,14 @@
# Note: is_android is not equivalent to safe_browsing_mode == 2.
# Sources and dependencies added to this block must not depend on anything
@@ -98,13 +95,6 @@ static_library("safe_browsing") {
@@ -102,13 +99,6 @@ static_library("safe_browsing") {
allow_circular_includes_from += [ "//chrome/browser/ash/file_manager" ]
}
- if (is_win || is_mac || is_linux || is_chromeos) {
- deps += [
- "//chrome/browser/ui/browser_window",
- "//chrome/browser/ui/toasts:toasts",
- "//chrome/browser/ui/toasts",
- "//chrome/browser/ui/toasts/api:toasts",
- ]
- }
@@ -1353,7 +1398,7 @@
} // namespace safe_browsing
--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
@@ -72,32 +72,7 @@ RealTimeUrlLookupServiceFactory::~RealTi
@@ -72,30 +72,7 @@ RealTimeUrlLookupServiceFactory::~RealTi
std::unique_ptr<KeyedService>
RealTimeUrlLookupServiceFactory::BuildServiceInstanceForBrowserContext(
content::BrowserContext* context) const {
@@ -1364,9 +1409,7 @@
- return std::make_unique<RealTimeUrlLookupService>(
- GetURLLoaderFactory(context),
- VerdictCacheManagerFactory::GetForProfile(profile),
- base::BindRepeating(
- &safe_browsing::GetUserPopulationForProfileWithCookieTheftExperiments,
- profile),
- base::BindRepeating(&safe_browsing::GetUserPopulationForProfile, profile),
- profile->GetPrefs(),
- std::make_unique<SafeBrowsingPrimaryAccountTokenFetcher>(
- IdentityManagerFactory::GetForProfile(profile)),
@@ -1450,8 +1493,8 @@
// certificate. So, when users click proceed on an interstitial, move the tab
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4466,8 +4466,6 @@ static_library("ui") {
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
@@ -4345,8 +4345,6 @@ static_library("ui") {
"views/safe_browsing/password_reuse_modal_warning_dialog.h",
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
- "views/safe_browsing/tailored_security_unconsented_modal.cc",
@@ -1459,9 +1502,19 @@
"views/select_audio_output/select_audio_output_dialog.cc",
"views/select_audio_output/select_audio_output_dialog.h",
"views/select_audio_output/select_audio_output_views.cc",
--- a/chrome/browser/ui/file_system_access/BUILD.gn
+++ b/chrome/browser/ui/file_system_access/BUILD.gn
@@ -23,7 +23,6 @@ source_set("file_system_access") {
source_set("impl") {
sources = [
- "file_system_access_dangerous_file_dialog.cc",
"file_system_access_dialogs.cc",
"file_system_access_permission_dialog.cc",
"file_system_access_restricted_directory_dialog.cc",
--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
+++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
@@ -53,7 +53,6 @@
@@ -46,7 +46,6 @@
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/common/features.h"
@@ -1469,7 +1522,7 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "revoked_permissions_service.h"
@@ -406,31 +405,6 @@ RevokedPermissionsService::RevokedPermis
@@ -210,31 +209,6 @@ RevokedPermissionsService::RevokedPermis
base::Unretained(this)));
#endif // BUILDFLAG(IS_ANDROID)
@@ -1499,9 +1552,9 @@
- browser_context_));
- }
bool migration_completed = pref_change_registrar_->prefs()->GetBoolean(
safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted);
@@ -1198,7 +1172,7 @@ bool RevokedPermissionsService::IsUnused
unused_site_permissions_manager_ =
std::make_unique<UnusedSitePermissionsManager>(browser_context, prefs);
@@ -1005,7 +979,7 @@ bool RevokedPermissionsService::IsUnused
}
bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() {
@@ -1522,7 +1575,7 @@
--- a/chrome/browser/ui/toasts/toast_service.cc
+++ b/chrome/browser/ui/toasts/toast_service.cc
@@ -34,7 +34,6 @@
@@ -35,7 +35,6 @@
#include "components/plus_addresses/features.h"
#include "components/plus_addresses/grit/plus_addresses_strings.h"
#include "components/safe_browsing/core/common/features.h"
@@ -1530,7 +1583,7 @@
#include "components/strings/grit/components_strings.h"
#include "components/tabs/public/tab_interface.h"
#include "components/vector_icons/vector_icons.h"
@@ -144,57 +143,6 @@ void ToastService::RegisterToasts(
@@ -145,57 +144,6 @@ void ToastService::RegisterToasts(
.Build());
}
@@ -1612,7 +1665,7 @@
std::unique_ptr<RenderViewContextMenuBase>
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -171,21 +171,6 @@ void MaybeReportBypassAction(download::D
@@ -180,21 +180,6 @@ void MaybeReportBypassAction(download::D
void MaybeTriggerTrustSafetySurvey(download::DownloadItem* file,
WarningSurface surface,
WarningAction action) {
@@ -1769,7 +1822,7 @@
kChromeUITabSearchHost,
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2614,7 +2614,6 @@ if (!is_android) {
@@ -2670,7 +2670,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -1777,14 +1830,14 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -7065,7 +7064,6 @@ test("unit_tests") {
@@ -7112,7 +7111,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection_images_cache",
"//components/safe_browsing/content/browser/notification_content_detection",
"//components/safe_browsing/content/browser/notification_content_detection:notifications_global_cache_list",
"//components/safe_browsing/content/browser/notification_content_detection:test_utils",
"//components/safe_browsing/content/browser/password_protection",
--- a/components/device_signals/core/browser/browser_utils.cc
+++ b/components/device_signals/core/browser/browser_utils.cc
@@ -29,35 +29,6 @@ bool IsURLBlocked(const GURL& url, Polic
@@ -1848,7 +1901,7 @@
#if BUILDFLAG(IS_WIN)
#include "components/device_signals/core/common/win/win_types.h"
@@ -246,10 +245,7 @@ struct ProfileSignalsResponse : BaseSign
@@ -256,10 +255,7 @@ struct ProfileSignalsResponse : BaseSign
bool built_in_dns_client_enabled;
bool chrome_remote_desktop_app_blocked;
@@ -1861,7 +1914,7 @@
--- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
+++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
@@ -245,18 +245,12 @@ void ChromeProfileRequestGenerator::OnAg
@@ -258,18 +258,12 @@ void ChromeProfileRequestGenerator::OnAg
profile_signals.built_in_dns_client_enabled);
profile_signals_report->set_chrome_remote_desktop_app_blocked(
profile_signals.chrome_remote_desktop_app_blocked);
@@ -1949,7 +2002,7 @@
device_signals::AvProduct av_product);
--- a/components/enterprise/buildflags/buildflags.gni
+++ b/components/enterprise/buildflags/buildflags.gni
@@ -10,11 +10,11 @@ declare_args() {
@@ -11,11 +11,11 @@ declare_args() {
# Indicates support for content analysis against a cloud agent for Enterprise
# Connector policies.
enterprise_cloud_content_analysis =
@@ -1998,9 +2051,32 @@
}
} // namespace password_manager
--- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui_util.cc
+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui_util.cc
@@ -299,20 +299,7 @@ std::string SerializeHitReport(const Hit
}
hit_report_dict.Set("threat_source", std::move(threat_source));
std::string extended_reporting_level;
- switch (hit_report.extended_reporting_level) {
- case ExtendedReportingLevel::SBER_LEVEL_OFF:
extended_reporting_level = "SBER_LEVEL_OFF";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_LEGACY:
- extended_reporting_level = "SBER_LEVEL_LEGACY";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_SCOUT:
- extended_reporting_level = "SBER_LEVEL_SCOUT";
- break;
- case ExtendedReportingLevel::SBER_LEVEL_ENHANCED_PROTECTION:
- extended_reporting_level = "SBER_LEVEL_ENHANCED_PROTECTION";
- break;
- }
hit_report_dict.Set("extended_reporting_level",
std::move(extended_reporting_level));
hit_report_dict.Set("is_enhanced_protection",
--- a/components/safe_browsing/content/common/safe_browsing.mojom
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
@@ -168,7 +168,6 @@ interface PhishingDetector {
@@ -170,7 +170,6 @@ interface PhishingDetector {
// Interface for setting a phishing model. This is scoped to an entire
// RenderProcess.
@@ -2110,7 +2186,7 @@
void OhttpKeyService::Shutdown() {
--- a/components/safe_browsing/core/browser/realtime/chrome_enterprise_url_lookup_service.cc
+++ b/components/safe_browsing/core/browser/realtime/chrome_enterprise_url_lookup_service.cc
@@ -138,7 +138,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe
@@ -142,7 +142,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe
bool ChromeEnterpriseRealTimeUrlLookupService::CanCheckSafeBrowsingDb() const {
// Check database if safe browsing is enabled.
@@ -2121,7 +2197,7 @@
bool ChromeEnterpriseRealTimeUrlLookupService::
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
@@ -244,17 +244,6 @@ void RealTimeUrlLookupService::MaybeLogP
@@ -249,17 +249,6 @@ void RealTimeUrlLookupService::MaybeLogP
bool request_had_cookie,
bool was_first_request,
bool sent_with_token) {
@@ -2299,7 +2375,7 @@
void SSLBlockingPageBase::PopulateEnhancedProtectionMessage(
--- a/components/sync_preferences/common_syncable_prefs_database.cc
+++ b/components/sync_preferences/common_syncable_prefs_database.cc
@@ -328,9 +328,6 @@ constexpr auto kCommonSyncablePrefsAllow
@@ -316,9 +316,6 @@ constexpr auto kCommonSyncablePrefsAllow
{plus_addresses::prefs::kLastPlusAddressFillingTime,
{syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES,
PrefSensitivity::kNone, MergeBehavior::kNone}},
@@ -2385,9 +2461,85 @@
void DidAfterWriteCheck(
FileSystemAccessPermissionContext::AfterWriteCheckResult result);
void DidFileSkipQuarantine(base::File::Error result);
--- a/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc
+++ b/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc
@@ -135,13 +135,6 @@ DeclarativeNetRequestUpdateDynamicRulesF
return RespondNow(NoArguments());
}
- // Collect rules to add in the Extension Telemetry Service.
- if (!rules_to_add.empty()) {
- ExtensionsBrowserClient::Get()
- ->GetSafeBrowsingDelegate()
- ->NotifyExtensionApiDeclarativeNetRequest(browser_context(),
- extension_id(), rules_to_add);
- }
auto* rules_monitor_service =
declarative_net_request::RulesMonitorService::Get(browser_context());
@@ -249,13 +242,6 @@ DeclarativeNetRequestUpdateSessionRulesF
return RespondNow(NoArguments());
}
- // Collect rules to add in the Extension Telemetry Service.
- if (!rules_to_add.empty()) {
- ExtensionsBrowserClient::Get()
- ->GetSafeBrowsingDelegate()
- ->NotifyExtensionApiDeclarativeNetRequest(browser_context(),
- extension_id(), rules_to_add);
- }
auto* rules_monitor_service =
declarative_net_request::RulesMonitorService::Get(browser_context());
--- a/extensions/browser/api/execute_code_function.cc
+++ b/extensions/browser/api/execute_code_function.cc
@@ -177,12 +177,6 @@ ExtensionFunction::ResponseAction Execut
return RespondNow(Error(std::move(error)));
if (details_->code) {
- if (!IsWebView() && extension()) {
- ExtensionsBrowserClient::Get()
- ->GetSafeBrowsingDelegate()
- ->NotifyExtensionApiTabExecuteScript(browser_context(),
- extension_id(), *details_->code);
- }
if (!Execute(*details_->code, &error))
return RespondNow(Error(std::move(error)));
--- a/extensions/browser/api/web_request/extension_web_request_event_router.cc
+++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc
@@ -1022,14 +1022,6 @@ int WebRequestEventRouter::OnBeforeReque
DCHECK(action.redirect_url);
OnDNRActionMatched(browser_context, *request, action);
*new_url = GetNewUrl(action.redirect_url.value(), browser_context);
- // Collect redirect action data for the Extension Telemetry Service.
- if (action.type == DNRRequestAction::Type::REDIRECT) {
- ExtensionsBrowserClient::Get()
- ->GetSafeBrowsingDelegate()
- ->NotifyExtensionDeclarativeNetRequestRedirectAction(
- browser_context, action.extension_id, request->url,
- action.redirect_url.value());
- }
RecordThatNavigationWasInitiatedByExtension(
request, browser_context, new_url, action.extension_id);
return net::OK;
--- a/extensions/browser/extension_host.cc
+++ b/extensions/browser/extension_host.cc
@@ -168,11 +168,6 @@ ExtensionHost::ExtensionHost(const Exten
ExtensionWebContentsObserver::GetForWebContents(host_contents())->
dispatcher()->set_delegate(this);
- // Create password reuse detection manager when new extension web contents are
- // created.
- ExtensionsBrowserClient::Get()
- ->GetSafeBrowsingDelegate()
- ->CreatePasswordReuseDetectionManager(host_contents_.get());
ExtensionHostRegistry::Get(browser_context_)->ExtensionHostCreated(this);
}
--- a/extensions/browser/extension_registrar.cc
+++ b/extensions/browser/extension_registrar.cc
@@ -777,103 +777,27 @@ void ExtensionRegistrar::UnblockAllExten
@@ -783,103 +783,27 @@ void ExtensionRegistrar::UnblockAllExten
void ExtensionRegistrar::OnBlocklistStateRemoved(
const std::string& extension_id) {

2
patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch
View File

@@ -2,7 +2,7 @@
--- a/net/tools/transport_security_state_generator/transport_security_state_generator.cc
+++ b/net/tools/transport_security_state_generator/transport_security_state_generator.cc
@@ -132,7 +132,7 @@ bool CheckDuplicateEntries(const Transpo
@@ -129,7 +129,7 @@ bool CheckDuplicateEntries(const Transpo
bool CheckNoopEntries(const TransportSecurityStateEntries& entries) {
for (const auto& entry : entries) {
if (!entry->force_https && entry->pinset.empty()) {

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

File diff suppressed because it is too large Load Diff

4
patches/core/ungoogled-chromium/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
@@ -171,6 +171,7 @@
@@ -176,6 +176,7 @@
#include "components/supervised_user/core/browser/supervised_user_preferences.h"
#include "components/supervised_user/core/browser/supervised_user_service.h"
#include "components/supervised_user/core/browser/supervised_user_url_filter.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"
@@ -2154,6 +2155,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2179,6 +2180,7 @@ void RenderViewContextMenu::AppendPageIt
}
if (CanTranslate(/*menu_logging=*/true)) {

50
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
@@ -2602,6 +2602,7 @@ static_library("browser") {
@@ -2617,6 +2617,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
@@ -184,6 +184,7 @@
@@ -183,6 +183,7 @@
#include "components/translate/core/common/translate_util.h"
#include "components/trusted_vault/features.h"
#include "components/ui_devtools/switches.h"
@@ -44,7 +44,7 @@
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -295,6 +295,7 @@ source_set("browser") {
@@ -299,6 +299,7 @@ source_set("browser") {
"//third_party/re2",
"//third_party/snappy",
"//third_party/sqlite",
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "components/viz/host/host_frame_sink_manager.h"
@@ -3517,6 +3518,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3498,6 +3499,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -91,7 +91,7 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -487,6 +488,10 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -481,6 +482,10 @@ void SetRuntimeFeaturesFromCommandLine(c
true},
{wrf::EnableWebAudioBypassOutputBufferingOptOut,
blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
@@ -104,9 +104,9 @@
for (const auto& mapping : switchToFeatureMapping) {
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -69,6 +69,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe
static void EnableFluentScrollbars(bool);
static void EnableFluentOverlayScrollbars(bool);
@@ -71,6 +71,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe
static void EnableLocalNetworkAccessWebRTC(bool);
+ static void EnableFingerprintingClientRectsNoise(bool);
+ static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -124,7 +124,7 @@
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
@@ -984,6 +985,11 @@ Document::Document(const DocumentInit& i
@@ -1085,6 +1086,11 @@ Document::Document(const DocumentInit& i
TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this),
TRACE_EVENT_FLAG_FLOW_OUT);
DCHECK(agent_);
@@ -136,7 +136,7 @@
if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) &&
features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) {
script_runner_delayer_->Activate();
@@ -1114,6 +1120,14 @@ const Position Document::PositionAdjuste
@@ -1215,6 +1221,14 @@ const Position Document::PositionAdjuste
return Position::BeforeNode(*shadow_host);
}
@@ -153,7 +153,7 @@
selector_query_cache_ = MakeGarbageCollected<SelectorQueryCache>();
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -582,6 +582,10 @@ class CORE_EXPORT Document : public Cont
@@ -572,6 +572,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -164,7 +164,7 @@
V8VisibilityState visibilityState() const;
String visibilityStateAsString() const;
bool IsPageVisible() const;
@@ -2780,6 +2784,9 @@ class CORE_EXPORT Document : public Cont
@@ -2770,6 +2774,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -176,7 +176,7 @@
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -3016,6 +3016,11 @@ DOMRectList* Element::getClientRects() {
@@ -3092,6 +3092,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -3043,6 +3048,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -3119,6 +3124,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -200,7 +200,7 @@
--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
@@ -1646,6 +1646,12 @@ DOMRectList* Range::getClientRects() con
@@ -1655,6 +1655,12 @@ DOMRectList* Range::getClientRects() con
Vector<gfx::QuadF> quads;
GetBorderAndTextQuads(quads);
@@ -213,7 +213,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -1653,7 +1659,11 @@ DOMRect* Range::getBoundingClientRect()
@@ -1662,7 +1668,11 @@ DOMRect* Range::getBoundingClientRect()
// TODO(crbug.com/1499981): This should be removed once synchronized scrolling
// impact is understood.
SyncScrollAttemptHeuristic::DidAccessScrollOffset();
@@ -266,7 +266,7 @@
const TextDirection& direction,
--- 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
@@ -109,6 +109,9 @@
@@ -108,6 +108,9 @@
// https://github.com/include-what-you-use/include-what-you-use/issues/1122
// IWYU pragma: no_include "base/numerics/clamped_math.h"
@@ -274,9 +274,9 @@
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
+
namespace blink {
namespace {
@@ -1246,13 +1249,26 @@ TextMetrics* BaseRenderingContext2D::mea
class MemoryManagedPaintCanvas;
@@ -1248,13 +1251,26 @@ TextMetrics* BaseRenderingContext2D::mea
TextDirection direction =
ToTextDirection(state.GetDirection(), host, computed_style);
@@ -308,20 +308,20 @@
String BaseRenderingContext2D::lang() const {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1792,6 +1792,7 @@ component("platform") {
@@ -1797,6 +1797,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection:language_detection",
"//components/translate/core/language_detection",
+ "//components/ungoogled:ungoogled_switches",
"//components/viz/client",
"//components/viz/common",
"//components/webrtc:net_address_utils",
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -68,4 +68,12 @@ void WebRuntimeFeatures::EnableFluentScr
void WebRuntimeFeatures::EnableFluentOverlayScrollbars(bool enable) {
RuntimeEnabledFeatures::SetFluentOverlayScrollbarsEnabled(enable);
@@ -73,4 +73,12 @@ void WebRuntimeFeatures::EnableLocalNetw
RuntimeEnabledFeatures::SetLocalNetworkAccessWebRTCEnabled(enable);
}
+void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
+ RuntimeEnabledFeatures::SetFingerprintingClientRectsNoiseEnabled(enable);
+}
@@ -343,7 +343,7 @@
#include "third_party/skia/include/core/SkImage.h"
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2310,6 +2310,12 @@
@@ -2273,6 +2273,12 @@
status: "stable",
},
{

14
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
@@ -3520,6 +3520,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3501,6 +3501,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -44,7 +44,7 @@ approach to change color components.
switches::kForceHighContrast,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -492,6 +492,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -486,6 +486,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -55,7 +55,7 @@ approach to change color components.
for (const auto& mapping : switchToFeatureMapping) {
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -71,6 +71,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe
@@ -73,6 +73,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe
static void EnableFingerprintingClientRectsNoise(bool);
static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -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
@@ -555,6 +555,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -557,6 +557,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -77,7 +77,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
@@ -1736,7 +1736,9 @@ component("platform") {
@@ -1741,7 +1741,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -90,7 +90,7 @@ approach to change color components.
"//third_party/blink/renderer/platform/blob",
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -76,4 +76,8 @@ void WebRuntimeFeatures::EnableFingerpri
@@ -81,4 +81,8 @@ void WebRuntimeFeatures::EnableFingerpri
RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
}
@@ -314,7 +314,7 @@ approach to change color components.
SkJpegEncoder::Options options;
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2316,6 +2316,9 @@
@@ -2279,6 +2279,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
@@ -2279,6 +2279,7 @@ static_library("browser") {
@@ -2295,6 +2295,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -73,15 +73,15 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/os_crypt/async/browser/os_crypt_async.h"
#include "components/permissions/permissions_client.h"
@@ -152,6 +155,7 @@
@@ -153,6 +156,7 @@
#include "extensions/common/constants.h"
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "net/socket/client_socket_pool_manager.h"
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
@@ -419,6 +423,18 @@ void BrowserProcessImpl::Init() {
#include "services/network/public/cpp/network_switches.h"
@@ -421,6 +425,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2774,6 +2774,10 @@ const char kMantisFeatureKeyDescription[
@@ -2657,6 +2657,10 @@ const char kMantisFeatureKeyDescription[
"Feature key to use the Mantis feature on ChromeOS.";
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -115,7 +115,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
@@ -1608,6 +1608,9 @@ extern const char kMantisFeatureKeyName[
@@ -1548,6 +1548,9 @@ extern const char kMantisFeatureKeyName[
extern const char kMantisFeatureKeyDescription[];
#endif // IS_CHROMEOS

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
@@ -171,10 +171,6 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -175,10 +175,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

@@ -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
@@ -535,7 +535,7 @@ void ProfileNetworkContextService::Confi
@@ -620,7 +620,7 @@ void ProfileNetworkContextService::Confi
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -45,7 +45,7 @@
// Enum representing possible values of the Preload Pages opt-in state. These
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -318,7 +318,7 @@ const char Profile::kProfileKey[] = "__P
@@ -325,7 +325,7 @@ const char Profile::kProfileKey[] = "__P
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
@@ -67,7 +67,7 @@
</cr-dialog>
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -113,7 +113,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -117,7 +117,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
@@ -78,7 +78,7 @@
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
@@ -29,7 +29,7 @@ constexpr char kAutofillRanQuasiDuplicat
@@ -31,7 +31,7 @@ constexpr char kAutofillRanQuasiDuplicat
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
registry->RegisterBooleanPref(
@@ -87,7 +87,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterIntegerPref(
kAutofillLastVersionDeduped, 0,
@@ -38,7 +38,7 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -40,7 +40,7 @@ void RegisterProfilePrefs(user_prefs::Pr
kAutofillHasSeenIban, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
@@ -120,7 +120,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -411,7 +411,7 @@ void RecordProvisionalSaveFailure(
@@ -504,7 +504,7 @@ void HandleFailedLoginDetectionForPasswo
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -129,7 +129,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
#if BUILDFLAG(IS_IOS)
// Deprecated pref in profile prefs.
@@ -419,7 +419,7 @@ void PasswordManager::RegisterProfilePre
@@ -512,7 +512,7 @@ void PasswordManager::RegisterProfilePre
false);
#endif // BUILDFLAG(IS_IOS)
registry->RegisterBooleanPref(

2
patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch
View File

@@ -1,6 +1,6 @@
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -295,6 +295,14 @@ if (is_linux || is_chromeos) {
@@ -299,6 +299,14 @@ if (is_linux || is_chromeos) {
"suid/process_util_linux.c",
"suid/sandbox.c",
]

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

23
patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
View File

@@ -1,23 +0,0 @@
From 088a50b2fc66418294166b61f31925426b1a9c54 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 15 Sep 2014 10:52:32 +0200
Subject: [PATCH 12/66] net/cert: increase default key length for
newly-generated RSA keys
Should we add something for chrome://settings, or just leave
it as hidden as it was before?
---
net/cert/x509_util.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/cert/x509_util.cc
+++ b/net/cert/x509_util.cc
@@ -282,7 +282,7 @@ bool GetTLSServerEndPointChannelBinding(
}
// RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
-static const uint16_t kRSAKeyLength = 1024;
+static const uint16_t kRSAKeyLength = 2048;
// Certificates made by CreateKeyAndSelfSignedCert will be signed using this
// digest algorithm.

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
@@ -1075,7 +1075,7 @@ class AppControllerNativeThemeObserver :
@@ -1076,7 +1076,7 @@ class AppControllerNativeThemeObserver :
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

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

@@ -1,16 +1,24 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -3825,6 +3825,10 @@ void Browser::UpdateBookmarkBarState(Boo
--- a/chrome/browser/ui/bookmarks/bookmark_bar_controller.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_bar_controller.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/bookmarks/bookmark_bar_controller.h"
+#include "base/command_line.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_features.h"
#include "chrome/browser/defaults.h"
@@ -132,6 +133,10 @@ void BookmarkBarController::OnSplitTabCh
}
bool Browser::ShouldShowBookmarkBar() const {
bool BookmarkBarController::ShouldShowBookmarkBar() const {
+ if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("bookmark-bar-ntp") == "never") {
+ return false;
+ }
+
if (profile_->IsGuestSession()) {
Profile* profile = browser_->GetProfile();
if (profile->IsGuestSession()) {
return false;
}
--- a/chrome/browser/ungoogled_flag_choices.h
+++ b/chrome/browser/ungoogled_flag_choices.h
@@ -34,4 +34,10 @@ const FeatureEntry::Choice kScrollEventC

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

@@ -1,14 +1,14 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -140,6 +140,7 @@
#include "chrome/browser/ui/unload_controller.h"
@@ -138,6 +138,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h"
#include "chrome/browser/ui/views/frame/multi_contents_view.h"
+#include "chrome/browser/ui/views/message_box_dialog.h"
#include "chrome/browser/ui/views/status_bubble_views.h"
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
@@ -658,6 +659,7 @@ Browser::Browser(const CreateParams& par
@@ -620,6 +621,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),
@@ -16,7 +16,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -1073,20 +1075,22 @@ Browser::WarnBeforeClosingResult Browser
@@ -994,20 +996,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1124,6 +1128,7 @@ bool Browser::TryToCloseWindow(
@@ -1045,6 +1049,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3543,6 +3548,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3496,6 +3501,58 @@ bool Browser::CanCloseWithInProgressDown
return false;
}
@@ -119,7 +119,7 @@
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
if (cancel_downloads) {
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
@@ -3568,6 +3625,22 @@ void Browser::InProgressDownloadResponse
@@ -3521,6 +3578,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -144,7 +144,7 @@
void Browser::CookieMigrationNoticeResponse(bool proceed_closing) {
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -32,6 +32,7 @@
@@ -33,6 +33,7 @@
#include "chrome/browser/ui/browser_window/public/browser_window_interface.h"
#include "chrome/browser/ui/browser_window/public/desktop_browser_window_capabilities_delegate.h"
#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
@@ -152,7 +152,7 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/unload_controller.h"
@@ -1204,12 +1205,17 @@ class Browser : public TabStripModelObse
@@ -1147,12 +1148,17 @@ class Browser : public TabStripModelObse
// Returns true if the window can close, false otherwise.
bool CanCloseWithInProgressDownloads();
@@ -170,7 +170,7 @@
// Called when the user has decided whether to proceed or not with the browser
// closure, in case the cookie migration notice was shown. |proceed_closing|
// is true if the browser can be closed.
@@ -1389,6 +1395,8 @@ class Browser : public TabStripModelObse
@@ -1333,6 +1339,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -833,11 +833,15 @@ bool HandleNewTabPageLocationOverride(
@@ -821,11 +821,15 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord()) {

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

@@ -66,7 +66,7 @@
#include "third_party/blink/public/platform/web_input_event_result.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_drag_event_init.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_pointer_event_init.h"
@@ -632,8 +633,14 @@ WebInputEventResult MouseEventManager::H
@@ -623,8 +624,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

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
@@ -75,6 +75,7 @@ class FrameGrabHandle : public views::Vi
@@ -74,6 +74,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.

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

@@ -18,7 +18,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -468,7 +469,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -467,7 +468,9 @@ void NTPResourceCache::CreateNewTabIncog
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
// Colors.

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

@@ -33,7 +33,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -22,6 +22,7 @@
@@ -23,6 +23,7 @@
#include "base/check_op.h"
#include "base/containers/contains.h"
@@ -41,7 +41,7 @@
#include "base/feature_list.h"
#include "base/format_macros.h"
#include "base/functional/bind.h"
@@ -569,6 +570,15 @@ AutocompleteController::AutocompleteCont
@@ -568,6 +569,15 @@ AutocompleteController::AutocompleteCont
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -79,7 +79,7 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/functional/callback.h"
@@ -631,6 +632,9 @@ void SearchProvider::Run(bool query_is_p
@@ -632,6 +633,9 @@ void SearchProvider::Run(bool query_is_p
}
void SearchProvider::DoHistoryQuery(bool minimal_changes) {

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

@@ -1,14 +1,14 @@
--- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
+++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h"
@@ -13,6 +13,7 @@
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_service.h"
+#include "components/sharing_message/features.h"
#include "content/public/browser/web_contents.h"
#include "url/gurl.h"
@@ -37,7 +38,7 @@ QRCodeGeneratorBubbleController::~QRCode
@@ -38,7 +39,7 @@ QRCodeGeneratorBubbleController::~QRCode
// static
bool QRCodeGeneratorBubbleController::IsGeneratorAvailable(const GURL& url) {

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

@@ -25,7 +25,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
@@ -259,14 +259,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent() || frame->IsInFencedFrameTree())
return;
@@ -60,8 +60,8 @@
#include "base/containers/contains.h"
#include "base/containers/fixed_flat_map.h"
#include "base/containers/flat_map.h"
@@ -370,6 +371,12 @@ bool ShouldCommitUpdateToAccount(
return account_data_changed;
@@ -402,6 +403,12 @@ bool IsGoogleAiModeUrl(GURL url) {
google_util::DISALLOW_NON_STANDARD_PORTS);
}
+bool ShouldAutocollect() {
@@ -73,7 +73,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -550,6 +557,7 @@ TemplateURLService::TemplateURLService(
@@ -582,6 +589,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::RepeatingClosure& dsp_change_callback)
: prefs_(prefs),
@@ -81,7 +81,7 @@
search_engine_choice_service_(search_engine_choice_service),
prepopulate_data_resolver_(prepopulate_data_resolver),
search_terms_data_(std::move(search_terms_data)),
@@ -655,8 +663,8 @@ bool TemplateURLService::CanAddAutogener
@@ -665,8 +673,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.
@@ -92,7 +92,7 @@
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -2480,6 +2488,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2493,6 +2501,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
if (client_) {
client_->SetOwner(this);
}
@@ -2662,6 +2672,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2658,6 +2668,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -113,7 +113,7 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -908,6 +908,8 @@ class TemplateURLService final : public
@@ -905,6 +905,8 @@ class TemplateURLService final : public
raw_ref<TemplateURLPrepopulateData::Resolver> prepopulate_data_resolver_;

6
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"
@@ -741,6 +742,13 @@ void Tab::HideHover(TabStyle::HideHoverS
@@ -754,6 +755,13 @@ void Tab::HideHover(TabStyle::HideHoverS
DeprecatedLayoutImmediately();
}
@@ -24,7 +24,7 @@
// BrowserView::GetAccessibleTabLabel to get the updated accessible name.
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -98,6 +98,7 @@ class Tab : public gfx::AnimationDelegat
@@ -100,6 +100,7 @@ class Tab : public gfx::AnimationDelegat
void OnMouseEntered(const ui::MouseEvent& event) override;
void OnMouseExited(const ui::MouseEvent& event) override;
void OnGestureEvent(ui::GestureEvent* event) override;
@@ -42,7 +42,7 @@
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
@@ -1960,6 +1961,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -2003,6 +2004,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1558,7 +1558,8 @@ void BrowserCommandController::InitComma
@@ -1585,7 +1585,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -12,10 +12,10 @@
command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE,
--- a/chrome/browser/ui/ui_features.cc
+++ b/chrome/browser/ui/ui_features.cc
@@ -388,6 +388,10 @@ static std::string GetCountryCode() {
@@ -594,6 +594,10 @@ static std::string GetCountryCode() {
}
bool IsTabSearchMoving() {
bool HasTabSearchToolbarButton() {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) {
+ return false;
+ }
@@ -25,7 +25,7 @@
base::FeatureList::IsEnabled(
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -5272,6 +5272,7 @@ void BrowserView::AddedToWidget() {
@@ -5148,6 +5148,7 @@ void BrowserView::AddedToWidget() {
toolbar_->Init();
@@ -43,14 +43,14 @@
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
@@ -119,6 +120,7 @@ TabStripRegionView::TabStripRegionView(s
std::unique_ptr<TabStripComboButton> tab_strip_combo_button;
@@ -127,6 +128,7 @@ TabStripRegionView::TabStripRegionView(s
std::unique_ptr<TabStripActionContainer> tab_strip_action_container;
std::unique_ptr<ProductSpecificationsButton> product_specifications_button;
if (browser &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button") &&
(browser->GetType() == BrowserWindowInterface::Type::TYPE_NORMAL)) {
if (features::IsTabSearchMoving() &&
!features::HasTabSearchToolbarButton() &&
if (features::HasTabSearchToolbarButton()) {
tab_strip_action_container = std::make_unique<TabStripActionContainer>(
--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
@@ -60,4 +60,8 @@

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -359,4 +359,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
@@ -368,4 +368,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
"RemovalOfIWAsFromTabCapture",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -8,7 +8,7 @@
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -135,6 +135,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
@@ -121,6 +121,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
// module, e.g.
// //chrome/browser/<foo_module>/features.h
//

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

@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/flat_map.h"
#include "base/containers/span.h"
@@ -1165,6 +1166,10 @@ void TabStripModel::CloseAllTabsInGroup(
@@ -1145,6 +1146,10 @@ void TabStripModel::CloseAllTabsInGroup(
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));
@@ -19,7 +19,7 @@
CloseTabs({GetWebContentsAt(index)}, close_types);
}
@@ -2827,9 +2832,13 @@ TabStripModel::GetGroupsDestroyedFromRem
@@ -2928,9 +2933,13 @@ TabStripModel::GetGroupsDestroyedFromRem
void TabStripModel::ExecuteCloseTabsByIndices(
base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
uint32_t close_types) {

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

@@ -50,7 +50,7 @@
bool IsExtensionDownload(const download::DownloadItem& download_item);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1236,10 +1236,12 @@ DownloadConfirmationReason DownloadTarge
@@ -1243,10 +1243,12 @@ DownloadConfirmationReason DownloadTarge
return DownloadConfirmationReason::SAVE_AS;
#if BUILDFLAG(ENABLE_EXTENSIONS)

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
@@ -1208,6 +1208,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1198,6 +1198,8 @@ WindowOpenDisposition NavigationPolicyTo
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

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

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -199,7 +199,8 @@ class SSLClientSocketImpl::SSLContext {
@@ -200,7 +200,8 @@ class SSLClientSocketImpl::SSLContext {
SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback);
SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */);

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

@@ -13,15 +13,15 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
@@ -15,6 +15,7 @@
@@ -10,6 +10,7 @@
#include <utility>
#include <vector>
+#include "base/command_line.h"
#include "base/lazy_instance.h"
#include "base/memory/raw_ptr.h"
#include "base/no_destructor.h"
#include "base/numerics/safe_conversions.h"
@@ -319,6 +320,13 @@ IDNConversionResult IDNToUnicodeWithAdju
@@ -316,6 +317,13 @@ IDNConversionResult IDNToUnicodeWithAdju
host16.reserve(host.length());
host16.insert(host16.end(), host.begin(), host.end());

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

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

2
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
@@ -2238,6 +2238,10 @@ void BrowserView::ExitFullscreen() {
@@ -2130,6 +2130,10 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateExclusiveAccessBubble(
const ExclusiveAccessBubbleParams& params,
ExclusiveAccessBubbleHideCallback first_hide_callback) {

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
@@ -1139,7 +1139,11 @@ void Tab::UpdateIconVisibility() {
@@ -1163,7 +1163,11 @@ void Tab::UpdateIconVisibility() {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1168,6 +1172,8 @@ void Tab::UpdateIconVisibility() {
@@ -1192,6 +1196,8 @@ void Tab::UpdateIconVisibility() {
!controller_->IsLockedForOnTask() &&
#endif
large_enough_for_close_button;

6
patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
View File

@@ -11,7 +11,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/components/embedder_support/user_agent_utils.cc
+++ b/components/embedder_support/user_agent_utils.cc
@@ -164,6 +164,8 @@ const std::string& GetWindowsPlatformVer
@@ -159,6 +159,8 @@ const std::string& GetWindowsPlatformVer
// TODO(crbug.com/1330890): Remove this method along with policy.
bool ShouldReduceUserAgentMinorVersion(
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@@ -20,7 +20,7 @@
return ((user_agent_reduction !=
UserAgentReductionEnterprisePolicyState::kForceDisabled &&
base::FeatureList::IsEnabled(
@@ -187,6 +189,8 @@ bool ShouldReduceUserAgentMinorVersion(
@@ -182,6 +184,8 @@ bool ShouldReduceUserAgentMinorVersion(
// sending unified platform for the user agent string.
bool ShouldSendUserAgentUnifiedPlatform(
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@@ -29,7 +29,7 @@
#if BUILDFLAG(IS_ANDROID)
return ShouldReduceUserAgentMinorVersion(user_agent_reduction) &&
base::FeatureList::IsEnabled(
@@ -616,6 +620,8 @@ blink::UserAgentMetadata GetUserAgentMet
@@ -672,6 +676,8 @@ blink::UserAgentMetadata GetUserAgentMet
blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service,
bool only_low_entropy_ch) {

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -471,6 +471,17 @@ void ToolbarView::Init() {
@@ -460,6 +460,17 @@ void ToolbarView::Init() {
browser_->profile()->IsGuestSession() ||
browser_->profile()->IsRegularProfile();
#endif

4
patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch
View File

@@ -86,7 +86,7 @@
// Feature declarations and associated constants (feature params, et cetera)
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -4052,6 +4052,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -4113,6 +4113,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -95,7 +95,7 @@
return WebGLAny(script_state,
String(ContextGL()->GetString(GL_RENDERER)));
}
@@ -4067,6 +4069,8 @@ ScriptValue WebGLRenderingContextBase::g
@@ -4128,6 +4130,8 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

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
@@ -4862,10 +4862,12 @@ const FeatureEntry::Choice kDataSharingV
@@ -4929,10 +4929,12 @@ constexpr char kWebiumFlag[] = "webium";
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

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

@@ -19,7 +19,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -170,6 +170,7 @@
@@ -172,6 +172,7 @@
#include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy_features.h"
@@ -27,7 +27,7 @@
#include "services/network/public/cpp/resource_request_body.h"
#include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h"
#include "services/network/public/cpp/url_loader_completion_status.h"
@@ -390,10 +391,10 @@ void AddAdditionalRequestHeaders(
@@ -393,10 +394,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
@@ -44,7 +44,7 @@
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -135,6 +135,7 @@
@@ -133,6 +133,7 @@
#include "services/network/public/cpp/content_decoding_interceptor.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/not_implemented_url_loader_factory.h"
@@ -52,7 +52,7 @@
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
@@ -4702,10 +4703,13 @@ void RenderFrameImpl::FinalizeRequestInt
@@ -4522,10 +4523,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
@@ -100,7 +100,7 @@
--- a/services/network/public/cpp/BUILD.gn
+++ b/services/network/public/cpp/BUILD.gn
@@ -119,6 +119,8 @@ component("cpp") {
@@ -122,6 +122,8 @@ component("cpp") {
"private_network_access_check_result.cc",
"private_network_access_check_result.h",
"record_ontransfersizeupdate_utils.h",

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
@@ -18,6 +18,8 @@
@@ -19,6 +19,8 @@
namespace net::features {
@@ -24,7 +24,7 @@
BASE_FEATURE(kAvoidH2Reprioritization,
--- a/net/base/features.h
+++ b/net/base/features.h
@@ -20,6 +20,8 @@
@@ -21,6 +21,8 @@
namespace net::features {

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

@@ -1,9 +1,9 @@
# Add suggestions URL text field to the search engine editing dialog
# (chrome://settings/searchEngines).
--- a/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
+++ b/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
@@ -37,6 +37,13 @@
--- a/chrome/browser/resources/settings/search_page/search_engine_edit_dialog.html
+++ b/chrome/browser/resources/settings/search_page/search_engine_edit_dialog.html
@@ -35,6 +35,13 @@
error-message="$i18n{notValid}"
value="{{queryUrl_}}" on-focus="validate_" on-input="validate_">
</cr-input>
@@ -17,8 +17,8 @@
</div>
<div slot="button-container">
<cr-button class="cancel-button" on-click="cancel_" id="cancel"
--- a/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
+++ b/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
--- a/chrome/browser/resources/settings/search_page/search_engine_edit_dialog.ts
+++ b/chrome/browser/resources/settings/search_page/search_engine_edit_dialog.ts
@@ -37,6 +37,7 @@ export interface SettingsSearchEngineEdi
dialog: CrDialogElement,
keyword: CrInputElement,
@@ -43,7 +43,7 @@
declare private dialogTitle_: string;
declare private actionButtonText_: string;
declare private showPolicySubtitle_: boolean;
@@ -110,6 +113,7 @@ export class SettingsSearchEngineEditDia
@@ -111,6 +114,7 @@ export class SettingsSearchEngineEditDia
this.searchEngine_ = this.model.name;
this.keyword_ = this.model.keyword;
this.queryUrl_ = this.model.url;
@@ -51,7 +51,7 @@
} else {
this.dialogTitle_ = loadTimeData.getString('searchEnginesAddSiteSearch');
this.actionButtonText_ = loadTimeData.getString('add');
@@ -146,8 +150,12 @@ export class SettingsSearchEngineEditDia
@@ -147,8 +151,12 @@ export class SettingsSearchEngineEditDia
}
}
@@ -66,7 +66,7 @@
}
private cancel_() {
@@ -156,7 +164,8 @@ export class SettingsSearchEngineEditDia
@@ -157,7 +165,8 @@ export class SettingsSearchEngineEditDia
private onActionButtonClick_() {
this.browserProxy_.searchEngineEditCompleted(
@@ -76,7 +76,7 @@
this.$.dialog.close();
}
@@ -194,8 +203,10 @@ export class SettingsSearchEngineEditDia
@@ -195,8 +204,10 @@ export class SettingsSearchEngineEditDia
this.$.searchEngine,
this.$.keyword,
this.$.queryUrl,
@@ -88,8 +88,8 @@
});
this.$.actionButton.disabled = !allValid;
}
--- a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
+++ b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
--- a/chrome/browser/resources/settings/search_page/search_engines_browser_proxy.ts
+++ b/chrome/browser/resources/settings/search_page/search_engines_browser_proxy.ts
@@ -35,6 +35,7 @@ export interface SearchEngine {
name: string;
shouldConfirmDeletion: boolean;
@@ -196,7 +196,7 @@
// already owned by the TemplateURLService.
--- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
@@ -23,23 +23,27 @@ KeywordEditorController::KeywordEditorCo
@@ -27,23 +27,27 @@ KeywordEditorController::KeywordEditorCo
KeywordEditorController::~KeywordEditorController() = default;
@@ -232,7 +232,7 @@
DCHECK(!url.empty());
const std::optional<size_t> index =
table_model_->IndexOfTemplateURL(template_url);
@@ -51,11 +55,13 @@ void KeywordEditorController::ModifyTemp
@@ -55,11 +59,13 @@ void KeywordEditorController::ModifyTemp
// Don't do anything if the entry didn't change.
if ((template_url->short_name() == title) &&
@@ -271,7 +271,7 @@
bool CanEdit(const TemplateURL* url) const;
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -202,21 +202,25 @@ void TemplateURLTableModel::Remove(size_
@@ -212,21 +212,25 @@ void TemplateURLTableModel::Remove(size_
void TemplateURLTableModel::Add(size_t index,
const std::u16string& short_name,
const std::u16string& keyword,
@@ -302,7 +302,7 @@
DCHECK(index <= RowCount());
DCHECK(!url.empty());
TemplateURL* template_url = GetTemplateURL(index);
@@ -225,7 +229,8 @@ void TemplateURLTableModel::ModifyTempla
@@ -235,7 +239,8 @@ void TemplateURLTableModel::ModifyTempla
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
template_url->SupportsReplacement(
template_url_service_->search_terms_data()));
@@ -314,7 +314,7 @@
TemplateURL* TemplateURLTableModel::GetTemplateURL(size_t index) {
--- a/chrome/browser/ui/search_engines/template_url_table_model.h
+++ b/chrome/browser/ui/search_engines/template_url_table_model.h
@@ -58,13 +58,15 @@ class TemplateURLTableModel : public ui:
@@ -85,13 +85,15 @@ class TemplateURLTableModel : public ui:
void Add(size_t index,
const std::u16string& short_name,
const std::u16string& keyword,
@@ -428,17 +428,17 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -1028,7 +1028,8 @@ void TemplateURLService::IncrementUsageC
@@ -1038,7 +1038,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
- const std::string& search_url) {
+ const std::string& search_url,
+ const std::string& suggestions_url) {
DCHECK(!IsCreatedByExtension(url));
DCHECK(!IsCreatedByExtension(*url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -1052,6 +1053,7 @@ void TemplateURLService::ResetTemplateUR
@@ -1062,6 +1063,7 @@ void TemplateURLService::ResetTemplateUR
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;
data.policy_origin = TemplateURLData::PolicyOrigin::kNoPolicy;

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
@@ -4858,7 +4858,13 @@ const FeatureEntry::Choice kDataSharingV
@@ -4925,7 +4925,13 @@ constexpr char kWebiumFlag[] = "webium";
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.

4
patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch
View File

@@ -1,11 +1,11 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -125,7 +125,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -129,7 +129,7 @@ void RegisterBrowserUserPrefs(user_prefs
false);
#endif
registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
- blink::kWebRTCIPHandlingDefault);
+ blink::kWebRTCIPHandlingDisableNonProxiedUdp);
registry->RegisterListPref(prefs::kWebRTCIPHandlingUrl, base::Value::List());
registry->RegisterBooleanPref(prefs::kWebRTCPostQuantumKeyAgreement, false);
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);

59
patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch
View File

@@ -1,16 +1,26 @@
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -119,12 +119,11 @@ void TemplateURLTableModel::Reload() {
@@ -117,23 +117,10 @@ void TemplateURLTableModel::Reload() {
extension_entries;
// Keywords that can be made the default first.
for (TemplateURL* template_url : urls) {
// Don't include the expanded set of starter pack keywords if the expansion
// feature flag is not enabled.
- if ((template_url->starter_pack_id() ==
- template_url_starter_pack_data::kGemini &&
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) ||
- (template_url->starter_pack_id() ==
- template_url_starter_pack_data::kPage &&
- !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page)) {
+
- // Skip @gemini if feature disabled.
- if (template_url->starter_pack_id() ==
- template_url_starter_pack_data::kGemini &&
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) {
- continue;
- }
- // Skip @page if feature disabled.
- if (template_url->starter_pack_id() ==
- template_url_starter_pack_data::kPage &&
- !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page) {
- continue;
- }
- // Skip @aimode if feature disabled.
- if (template_url->starter_pack_id() ==
- template_url_starter_pack_data::kAiMode &&
- (!omnibox_feature_configs::Toolbelt::Get().enabled ||
- !ai_mode_enabled_)) {
+ // Disable all Google AI starter pack options
+ if (template_url->starter_pack_id() == template_url_starter_pack_data::kGemini ||
+ template_url->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
@@ -20,23 +30,28 @@
--- a/components/omnibox/browser/featured_search_provider.cc
+++ b/components/omnibox/browser/featured_search_provider.cc
@@ -291,13 +291,14 @@ void FeaturedSearchProvider::AddFeatured
@@ -290,20 +290,10 @@ void FeaturedSearchProvider::AddFeatured
for (TemplateURL* turl : turls) {
if (turl->starter_pack_id() > 0 &&
turl->is_active() == TemplateURLData::ActiveStatus::kTrue) {
// Don't add the expanded set of starter pack engines unless the feature
// is enabled.
- if ((turl->starter_pack_id() == template_url_starter_pack_data::kGemini &&
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) ||
- (turl->starter_pack_id() == template_url_starter_pack_data::kPage &&
- !omnibox_feature_configs::ContextualSearch::Get()
- .starter_pack_page)) {
+
- // Skip @gemini if feature disabled.
- if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini &&
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) {
- continue;
- }
- // Skip @page if feature disabled.
- if (turl->starter_pack_id() == template_url_starter_pack_data::kPage &&
- !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page) {
- continue;
- }
- // Skip @aimode if feature disabled.
- if (turl->starter_pack_id() == template_url_starter_pack_data::kAiMode &&
- (!omnibox_feature_configs::Toolbelt::Get().enabled ||
- !client_->GetAimEligibilityService()->IsAimEligible())) {
+ // Disable all Google AI starter pack options
+ if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini ||
+ turl->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
+ turl->starter_pack_id() == template_url_starter_pack_data::kPage) {
continue;
}
+
// The history starter pack engine is disabled in incognito mode.
if (client_->IsOffTheRecord() &&
turl->starter_pack_id() == template_url_starter_pack_data::kHistory) {

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

@@ -10,7 +10,7 @@
#include "crypto/secure_hash.h"
#if BUILDFLAG(IS_ANDROID)
@@ -535,94 +534,10 @@ DownloadInterruptReason BaseFile::Publis
@@ -563,94 +562,10 @@ DownloadInterruptReason BaseFile::Publis
}
#endif // BUILDFLAG(IS_ANDROID)
@@ -105,7 +105,7 @@
}
void BaseFile::AnnotateWithSourceInformation(
@@ -632,32 +547,8 @@ void BaseFile::AnnotateWithSourceInforma
@@ -660,32 +575,8 @@ void BaseFile::AnnotateWithSourceInforma
const std::optional<url::Origin>& request_initiator,
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
OnAnnotationDoneCallback on_annotation_done_callback) {
@@ -142,11 +142,11 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -132,7 +132,6 @@ source_set("browser") {
@@ -138,7 +138,6 @@ source_set("browser") {
"//components/performance_manager/scenario_api",
"//components/power_monitor",
"//components/services/filesystem:lib",
- "//components/services/quarantine:quarantine",
- "//components/services/quarantine",
"//components/services/storage",
"//components/services/storage:filesystem_proxy_factory",
"//components/services/storage/dom_storage:local_storage_proto",
@@ -245,46 +245,3 @@
quarantine::mojom::QuarantineFileResult result);
void ComputeHashForSourceFile(HashCallback callback);
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
@@ -462,7 +462,7 @@ void PepperFileIOHost::OnLocalFileOpened
ppapi::host::ReplyMessageContext reply_context,
const base::FilePath& path,
base::File::Error error_code) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if 0
// Quarantining a file before its contents are available is only supported on
// Windows and Linux.
if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
@@ -496,7 +496,7 @@ void PepperFileIOHost::OnLocalFileOpened
#endif
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if 0
void PepperFileIOHost::OnLocalFileQuarantined(
ppapi::host::ReplyMessageContext reply_context,
const base::FilePath& path,
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.h
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h
@@ -14,7 +14,6 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
-#include "components/services/quarantine/public/mojom/quarantine.mojom.h"
#include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
#include "ipc/ipc_listener.h"
#include "ipc/ipc_platform_file.h"
@@ -92,12 +91,6 @@ class PepperFileIOHost final : public pp
const base::FilePath& path,
base::File::Error error_code);
- void OnLocalFileQuarantined(
- ppapi::host::ReplyMessageContext reply_context,
- const base::FilePath& path,
- mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
- quarantine::mojom::QuarantineFileResult quarantine_result);
-
void SendFileOpenReply(ppapi::host::ReplyMessageContext reply_context,
base::File::Error error_code);

14
patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
View File

@@ -1,11 +1,11 @@
--- a/components/safe_browsing/core/common/features.cc
+++ b/components/safe_browsing/core/common/features.cc
@@ -127,7 +127,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints,
--- a/components/download/public/common/download_features.cc
+++ b/components/download/public/common/download_features.cc
@@ -44,7 +44,7 @@ BASE_FEATURE(kRefreshExpirationDate,
BASE_FEATURE(kDownloadsPageReferrerUrl,
"DownloadsPageReferrerUrl",
BASE_FEATURE(kDisplayInitiatorOrigin,
"DownloadsDisplayInitiatorOrigin",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kDownloadWarningSurvey,
"DownloadWarningSurvey",
BASE_FEATURE(kDownloadNotificationServiceUnifiedAPI,
"DownloadNotificationServiceUnifiedAPI",

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

@@ -1,11 +0,0 @@
--- a/components/optimization_guide/core/optimization_guide_features.cc
+++ b/components/optimization_guide/core/optimization_guide_features.cc
@@ -55,7 +55,7 @@ BASE_FEATURE(kOptimizationHints,
// Enables fetching from a remote Optimization Guide Service.
BASE_FEATURE(kRemoteOptimizationGuideFetching,
"OptimizationHintsFetching",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
// Enables the prediction of optimization targets.
BASE_FEATURE(kOptimizationTargetPrediction,

2
patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -49,7 +49,7 @@ BASE_FEATURE(kBookmarkTriggerForPrerende
@@ -54,7 +54,7 @@ BASE_FEATURE(kBookmarkTriggerForPreconne
// switch.
BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling,
"CertificateTransparencyAskBeforeEnabling",

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

@@ -1,13 +0,0 @@
# Enable chrome://flags/#prefetch-privacy-changes by default
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2068,7 +2068,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kPreloadingHeuristicsMLModel,
"PreloadingHeuristicsMLModel",

2
patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -115,7 +115,7 @@ bool ReloadButton::GetMenuEnabled() cons
@@ -114,7 +114,7 @@ bool ReloadButton::GetMenuEnabled() cons
}
void ReloadButton::SetMenuEnabled(bool enable) {

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
@@ -600,11 +600,6 @@ int GetContentRestrictions(const Browser
@@ -611,11 +611,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -14,7 +14,7 @@
}
return content_restrictions;
}
@@ -1919,8 +1914,7 @@ bool CanSavePage(const Browser* browser)
@@ -1938,8 +1933,7 @@ bool CanSavePage(const Browser* browser)
policy::DownloadRestriction::ALL_FILES) {
return false;
}

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

@@ -1,8 +1,8 @@
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -222,12 +222,10 @@ TabStripRegionView::TabStripRegionView(s
new_tab_button_->GetViewAccessibility().SetName(
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
new_tab_button_->GetViewAccessibility().SetName(
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
-#if BUILDFLAG(IS_LINUX)
// The New Tab Button can be middle-clicked on Linux.
@@ -10,12 +10,12 @@
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
@@ -2222,8 +2222,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2273,8 +2273,6 @@ void TabStrip::NewTabButtonPressed(const
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {
@@ -24,7 +24,7 @@
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
CHECK(clipboard)
<< "Clipboard instance is not available, cannot proceed with "
@@ -2234,7 +2232,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2285,7 +2283,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}

8
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
@@ -1005,6 +1005,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1000,6 +1000,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -10,7 +10,7 @@
}
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -46,6 +46,7 @@
@@ -47,6 +47,7 @@
#include "chrome/browser/ui/webui/signin_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
@@ -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"
@@ -258,6 +259,7 @@ void RegisterChromeWebUIConfigs() {
@@ -266,6 +267,7 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<SiteEngagementUIConfig>());
map.AddWebUIConfig(std::make_unique<SyncInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<TranslateInternalsUIConfig>());
@@ -175,7 +175,7 @@
+#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -72,6 +72,7 @@ bool IsSystemWebUIHost(std::string_view
@@ -71,6 +71,7 @@ bool IsSystemWebUIHost(std::string_view
// These hosts will also be suggested by BuiltinProvider.
base::span<const base::cstring_view> ChromeURLHosts() {
static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({

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

@@ -2,7 +2,7 @@
#
--- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc
@@ -306,7 +306,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
@@ -288,7 +288,7 @@ BASE_FEATURE(kOmniboxSiteSearch, "Omnibo
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",

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

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

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

@@ -13,9 +13,9 @@
# external link for theme entry on settings page
# the Google account line from the Payment methods page
# Safety check section on the settings page
# Privacy guide promo on the privacy page
# Google sign-in and Anonymized Data Collection sections
# help bubble for the removed data collection section
# Privacy guide promo on the privacy page
# Privacy guide section on the privacy page
# The password leak detection toggle on the security settings page
# Advanced Protection Program link on the security settings page
@@ -34,7 +34,7 @@
--- a/chrome/app/settings_chromium_strings.grdp
+++ b/chrome/app/settings_chromium_strings.grdp
@@ -372,13 +372,13 @@
@@ -385,13 +385,13 @@ Chromium understands forms better and ca
<!-- Performance Page -->
<message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
@@ -53,7 +53,7 @@
<!-- Languages Page -->
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1009,7 +1009,7 @@
@@ -1058,7 +1058,7 @@
Active site
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP" desc="Help text shown on the second tab of the tab discarding exception list add dialog. Explains how to use the filter format to add an exclusion rule to the list.">
@@ -62,7 +62,7 @@
</message>
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
Power
@@ -1033,7 +1033,7 @@
@@ -1082,7 +1082,7 @@
Inactive tabs appearance
</message>
<message name="IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK" desc="Label for a performance settings toggle description that controls whether the inactive tab UI is shown. Also contains a link to the help center article.">
@@ -71,7 +71,7 @@
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_TITLE" desc="Title for the link row that points to tab hover preview card apperance settings.">
Tab hover preview card appearance
@@ -1045,7 +1045,7 @@
@@ -1094,7 +1094,7 @@
Performance issue alerts
</message>
<message name="IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION" desc="Label for a performance settings toggle that controls whether performance intervention notifications should be shown and link to learn more about performance issue alerts.">
@@ -184,7 +184,7 @@
<div class="bulletpoints first">$i18nRaw{incognitoTabFeatures}</div>
--- a/chrome/browser/resources/settings/a11y_page/a11y_page.html
+++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html
@@ -103,11 +103,6 @@
@@ -99,10 +99,5 @@
sub-label="$i18n{toastAlertLevelDescription}">
</settings-toggle-button>
</if>
@@ -194,15 +194,14 @@
- external>
- </cr-link-row>
</div>
<if expr="is_linux">
<template is="dom-if" route-path="/captions">
</settings-section>
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -57,7 +57,7 @@
<div class="cr-row two-line">
<!-- Set the icon from the iconset (when it's obsolete/EOL and
when update is done) or set the src (when it's updating). -->
-<if expr="not chromeos_ash">
-<if expr="not is_chromeos">
+<if expr="False">
<div class="icon-container"
hidden="[[!shouldShowIcons_(showUpdateStatus_)]]">
@@ -211,7 +210,7 @@
</div>
</if>
<div class="flex cr-padded-text">
-<if expr="not chromeos_ash">
-<if expr="not is_chromeos">
+<if expr="False">
<div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]">
<div role="alert" aria-live="polite"
@@ -228,9 +227,9 @@
hidden="[[!prefs.feedback_allowed.value]]"
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -41,12 +41,11 @@
<settings-animated-pages id="pages" section="appearance"
focus-config="[[focusConfig_]]">
@@ -40,12 +40,11 @@
</style>
<settings-section page-title="$i18n{appearancePageTitle}">
<div route-path="default">
- <div class="settings-row first" id="themeRow"
+ <div class="cr-row first" id="themeRow"
@@ -247,7 +246,7 @@
<div class="separator"></div>
--- a/chrome/browser/resources/settings/autofill_page/payments_section.html
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
@@ -81,11 +81,6 @@
@@ -83,11 +83,6 @@
</div>
</template>
@@ -259,35 +258,23 @@
<div class="cr-row continuation">
<h2 class="flex">$i18n{creditCards}</h2>
<template is="dom-if"
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -68,7 +68,7 @@
<!-- TODO(crbug.com/40267370): Add a test to basic_page_test.ts
to check that settings-safety-hub-entry-point is not visible
in the guest mode. -->
- <template is="dom-if" if="[[showPage_(pageVisibility_.safetyHub)]]"
+ <template is="dom-if" if="[[false]]"
restamp>
<settings-section page-title="$i18n{safetyHub}"
section="safetyHubEntryPoint" nest-under-section="privacy"
--- a/chrome/browser/resources/settings/basic_page/basic_page.ts
+++ b/chrome/browser/resources/settings/basic_page/basic_page.ts
@@ -16,7 +16,6 @@ import '../ai_page/ai_page.js';
import '../glic_page/glic_page.js';
// </if>
import '../appearance_page/appearance_page.js';
-import '../privacy_page/privacy_guide/privacy_guide_promo.js';
import '../privacy_page/privacy_page.js';
import '../safety_hub/safety_hub_entry_point.js';
import '../autofill_page/autofill_page.js';
@@ -263,7 +262,6 @@ export class SettingsBasicPageElement ex
this.showPrivacyGuidePromo_ = false;
return;
}
- this.showPrivacyGuidePromo_ = true;
if (!this.privacyGuidePromoWasShown_) {
this.privacyGuideBrowserProxy_.incrementPromoImpressionCount();
this.privacyGuidePromoWasShown_ = true;
--- a/chrome/browser/resources/settings/autofill_page/payments_section.ts
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.ts
@@ -286,14 +286,6 @@ export class SettingsPaymentsSectionElem
// Record that the user opened the payments settings.
chrome.metricsPrivate.recordUserAction('AutofillCreditCardsViewed');
- // Measure clicks on the 'Google Account' link for managing payment methods.
- const manageAccountAnchor = this.$.manageLink.querySelector('a');
- if (manageAccountAnchor !== null) {
- manageAccountAnchor.addEventListener('click', () => {
- MetricsBrowserProxyImpl.getInstance().recordAction(
- 'Autofill.PaymentMethodsSettingsPage.ManagePaymentMethodsLinkClicked');
- });
- }
}
override disconnectedCallback() {
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
@@ -24,7 +24,7 @@
@@ -310,7 +297,7 @@
- sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
- </settings-toggle-button>
<if expr="_google_chrome">
<if expr="not chromeos_ash">
<if expr="not is_chromeos">
<settings-toggle-button id="spellCheckControl"
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -324,7 +311,7 @@
- this.$.urlCollectionToggle.getBubbleAnchor(), {anchorPaddingTop: 10});
}
// <if expr="chromeos_ash">
// <if expr="is_chromeos">
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -52,15 +52,6 @@
@@ -343,6 +330,38 @@
<cr-link-row id="thirdPartyCookiesLinkRow"
start-icon="privacy:cookie"
class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
@@ -8,7 +8,6 @@ import '../basic_page/basic_page.js';
import '../safety_hub/safety_hub_entry_point.js';
import '../settings_page/settings_section.js';
import '../settings_shared.css.js';
-import './privacy_guide/privacy_guide_promo.js';
import './privacy_page.js';
import {PrefsMixin} from '/shared/settings/prefs/prefs_mixin.js';
@@ -104,13 +103,6 @@ export class SettingsPrivacyPageIndexEle
private getDefaultViews_(): string[] {
const defaultViews = ['old'];
- if (this.isPrivacyGuideAvailable) {
- defaultViews.push('privacyGuidePromo');
- }
-
- if (this.showPage_(this.pageVisibility_.safetyHub)) {
- defaultViews.push('safetyHubEntryPoint');
- }
return defaultViews;
}
@@ -231,7 +223,6 @@ export class SettingsPrivacyPageIndexEle
this.showPrivacyGuidePromo_ = false;
return;
}
- this.showPrivacyGuidePromo_ = true;
if (!this.privacyGuidePromoWasShown_) {
this.privacyGuideBrowserProxy_.incrementPromoImpressionCount();
this.privacyGuidePromoWasShown_ = true;
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -113,13 +113,6 @@
@@ -371,11 +390,12 @@
- </cr-link-row>
--- a/chrome/browser/resources/settings/search_page/search_page.html
+++ b/chrome/browser/resources/settings/search_page/search_page.html
@@ -43,11 +43,6 @@
@@ -42,12 +42,6 @@
$i18n{searchPageTitle}
<div class="secondary">
$i18n{searchEngineChoiceEntryPointSubtitle}
- <a href="$i18n{searchExplanationLearnMoreURL}"
- aria-description="$i18n{opensInNewTab}"
- aria-label="$i18n{searchExplanationLearnMoreA11yLabel}"
- target="_blank">
- $i18n{learnMore}
@@ -396,7 +416,7 @@
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
--- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
@@ -368,7 +368,6 @@ void RecentTabsSubMenuModel::Build() {
@@ -369,7 +369,6 @@ void RecentTabsSubMenuModel::Build() {
AddSeparator(ui::NORMAL_SEPARATOR);
history_separator_index_ = GetItemCount() - 1;
BuildLocalEntries();
@@ -406,7 +426,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -958,16 +958,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -959,16 +959,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -425,7 +445,7 @@
////////////////////////////////////////////////////////////////////////////////
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -1236,12 +1236,14 @@ void BookmarkMenuDelegate::BuildOtherNod
@@ -1241,12 +1241,14 @@ void BookmarkMenuDelegate::BuildOtherNod
menu->AppendMenuItem(
IDC_SHOW_BOOKMARK_SIDE_PANEL,
l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
@@ -443,7 +463,7 @@
}
--- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
+++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
@@ -156,14 +156,7 @@ void CookieControlsContentView::SetEnfor
@@ -188,14 +188,7 @@ void CookieControlsContentView::SetEnfor
}
void CookieControlsContentView::SetFeedbackSectionVisibility(bool visible) {
@@ -460,7 +480,7 @@
void CookieControlsContentView::SetCookiesRowVisible(bool visible) {
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -574,9 +574,6 @@ SadTabView::SadTabView(content::WebConte
@@ -160,9 +160,6 @@ SadTabView::SadTabView(content::WebConte
// There is currently no good way to handle kEnd alignment for a single
// element.
actions_container->SetLayoutManagerUseConstrainedSpace(false);
@@ -470,7 +490,7 @@
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -677,22 +674,6 @@ void SadTabView::AttachToWebView() {
@@ -263,22 +260,6 @@ void SadTabView::AttachToWebView() {
}
}
@@ -495,7 +515,7 @@
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -976,40 +976,20 @@ void AddPerformanceStrings(content::WebU
@@ -986,40 +986,20 @@ void AddPerformanceStrings(content::WebU
IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
{"performanceInterventionEnabledLabel",
IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
@@ -545,7 +565,7 @@
html_source->AddString(
"tabDiscardTimerFiveMinutes",
@@ -1055,11 +1035,6 @@ void AddPerformanceStrings(content::WebU
@@ -1065,11 +1045,6 @@ void AddPerformanceStrings(content::WebU
base::NumberToString16(
performance_manager::user_tuning::BatterySaverModeManager::
kLowBatteryThresholdPercent)));
@@ -557,7 +577,7 @@
html_source->AddString("discardRingTreatmentLearnMoreUrl",
chrome::kDiscardRingTreatmentLearnMoreUrl);
@@ -3515,7 +3490,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3585,7 +3560,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -568,8 +588,8 @@
html_source->AddBoolean(
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -603,27 +603,20 @@ SettingsUI::SettingsUI(content::WebUI* w
autofill::AutofillAiAction::kListEntityInstancesInSettings)},
@@ -598,27 +598,20 @@ SettingsUI::SettingsUI(content::WebUI* w
->UserIsActivePasswordChangeUser()},
};
- const bool show_ai_settings_for_testing = base::FeatureList::IsEnabled(
@@ -602,7 +622,7 @@
html_source->AddBoolean(
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -878,7 +878,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
@@ -905,7 +905,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
base::FEATURE_ENABLED_BY_DEFAULT);
// Enables the Live Caption feature on supported devices.
@@ -613,7 +633,7 @@
// fails to load. Used to diagnose issues when rolling out new versions of the
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -875,7 +875,7 @@ void MenuItemView::SetAlerted() {
@@ -869,7 +869,7 @@ void MenuItemView::SetAlerted() {
}
bool MenuItemView::ShouldShowNewBadge() const {

3
patches/series
View File

@@ -43,7 +43,6 @@ extra/inox-patchset/0013-disable-missing-key-warning.patch
extra/inox-patchset/0016-chromium-sandbox-pie.patch
extra/inox-patchset/0019-disable-battery-status-service.patch
extra/debian/disable/google-api-warning.patch
extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
extra/iridium-browser/updater-disable-auto-update.patch
@@ -70,7 +69,6 @@ extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
extra/ungoogled-chromium/enable-menu-on-reload-button.patch
extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
extra/ungoogled-chromium/disable-dial-repeating-discovery.patch
@@ -90,7 +88,6 @@ extra/ungoogled-chromium/keep-expired-flags.patch
extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
extra/ungoogled-chromium/disable-remote-optimization-guide.patch
extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch
extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch
extra/ungoogled-chromium/add-flag-to-disable-sharing-hub.patch

2
patches/upstream-fixes/glue_core_pools.patch
View File

@@ -15,7 +15,7 @@
# iff BRP support is enabled. However, for purpose of performance
--- a/base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.h
+++ b/base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.h
@@ -16,9 +16,6 @@
@@ -21,9 +21,6 @@
#if PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION)

16
patches/upstream-fixes/missing-dependencies.patch
View File

@@ -10,27 +10,27 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1000,6 +1000,7 @@ source_set("extensions") {
@@ -1025,6 +1025,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
"//components/safe_browsing/content/browser/web_ui",
+ "//components/safe_browsing/content/common/proto:download_file_types_proto",
"//components/safe_browsing/core/common/proto:csd_proto",
"//components/search_engines",
"//components/services/app_service",
--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
+++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
@@ -28,6 +28,7 @@
#include "chrome/app/chrome_command_ids.h"
@@ -20,6 +20,7 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/engagement/site_engagement_service_factory.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/safety_hub/safety_hub_prefs.h"
#include "chrome/browser/ui/safety_hub/safety_hub_result.h"
#include "chrome/browser/ui/safety_hub/safety_hub_service.h"
#include "chrome/browser/ui/safety_hub/safety_hub_util.h"
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -550,6 +550,7 @@ static_library("url_constants") {
@@ -525,6 +525,7 @@ static_library("url_constants") {
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
"//components/password_manager/content/common",
"//components/safe_browsing/core/common",
@@ -40,7 +40,7 @@
}
--- a/components/component_updater/installer_policies/BUILD.gn
+++ b/components/component_updater/installer_policies/BUILD.gn
@@ -49,6 +49,7 @@ static_library("installer_policies_no_co
@@ -53,6 +53,7 @@ static_library("installer_policies_no_co
"//components/update_client",
"//mojo/public/cpp/base:protobuf_support",
"//services/network/public/cpp",
@@ -60,7 +60,7 @@
public_deps = [
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -113,6 +113,7 @@ source_set("browser") {
@@ -119,6 +119,7 @@ source_set("browser") {
"//components/filename_generation",
"//components/fingerprinting_protection_filter/interventions/common:features",
"//components/input",

31
pruning.list
View File

@@ -58,7 +58,6 @@ build/android/stacktrace/java_deobfuscate_java.jar
build/android/tests/symbolize/liba.so
build/android/tests/symbolize/libb.so
build/linux/sysroot_scripts/keyring.gpg
buildtools/third_party/eu-strip/bin/eu-strip
chrome/app/etw_events/MSG00001.bin
chrome/app/etw_events/chrome_events_winTEMP.BIN
chrome/browser/ash/power/ml/smart_dim/20190521_example_preprocessor_config.pb
@@ -1467,8 +1466,6 @@ net/data/ssl/certificates/unittest.selfsigned.der
net/data/ssl/certificates/websocket_client_cert.p12
net/data/url_request_unittest/BullRunSpeech.txt.deflate
net/data/url_request_unittest/gzip-encoded
net/tools/testserver/dist/_socket.pyd
net/tools/testserver/dist/_ssl.pyd
pdf/pdfium/fuzzers/corpora/pdf_codec_tiff/not_kitty.tiff
pdf/pdfium/fuzzers/corpora/pdf_jpx/not_kitty.jp2
pdf/test/data/bigtable_micro.in
@@ -2118,7 +2115,6 @@ third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Universal
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/W-SU
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/WET
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Zulu
third_party/accessibility_test_framework/src/gradle/wrapper/gradle-wrapper.jar
third_party/afl/src/testcases/archives/common/bzip2/small_archive.bz2
third_party/afl/src/testcases/archives/common/cab/small_archive.cab
third_party/afl/src/testcases/archives/common/compress/small_archive.Z
@@ -7389,7 +7385,12 @@ third_party/crashpad/crashpad/snapshot/ios/testdata/crash-5726011582644224
third_party/crashpad/crashpad/snapshot/ios/testdata/crash-6605504629637120
third_party/crashpad/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8
third_party/crashpad/crashpad/util/net/testdata/binary_http_body.dat
third_party/crossbench-web-tests/synthetic/powerline/Chrome-Scheduler-Optimization-Benchmarks.ogg
third_party/crossbench/crossbench/probes/profiling/time-profile.tracetemplate
third_party/crossbench/tests/crossbench/plt/pb/battery/ac_powered.pb
third_party/crossbench/tests/crossbench/plt/pb/battery/battery_powered.pb
third_party/crossbench/tests/crossbench/plt/pb/display/1080p.pb
third_party/crossbench/tests/crossbench/plt/pb/dumpsys_meminfo.pb
third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_0000017E9E2D81A0.vs.spv
third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_000002778DE78280.cs.spv
third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_000002778F740030.fs.spv
@@ -8036,6 +8037,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/crux
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dom-size-long.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dom-size-overlap.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dom-size.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dpr.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dupe-js-inline-maps.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dupe-js.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/enhanced-traces.json.gz
@@ -10977,21 +10979,20 @@ third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/sparse/
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/sparse/multi_pattern_v2_fwd.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/sparse/multi_pattern_v2_rev.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/gen/sparse/multi_pattern_v2_rev.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/America/Bogota
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/America/Los_Angeles
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/America/Whitehorse
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/Antarctica/Troll
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/Arctic/Longyearbyen
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/Asia/Tokyo
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/Chile/EasterIsland
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/PST8PDT
third_party/rust/chromium_crates_io/vendor/tzif-v0_3/testdata/Pacific/Pohnpei
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/America/Bogota
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/America/Los_Angeles
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/America/Whitehorse
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/Antarctica/Troll
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/Arctic/Longyearbyen
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/Asia/Tokyo
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/Chile/EasterIsland
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/PST8PDT
third_party/rust/chromium_crates_io/vendor/tzif-v0_4/testdata/Pacific/Pohnpei
third_party/rust/chromium_crates_io/vendor/unicode-ident-v1/tests/fst/xid_continue.fst
third_party/rust/chromium_crates_io/vendor/unicode-ident-v1/tests/fst/xid_start.fst
third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/lib/windows.0.52.0.lib
third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/lib/windows.0.52.0.lib
third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/lib/windows.0.52.0.lib
third_party/skia/demos.skia.org/demos/mesh2d/canvaskit.wasm
third_party/skia/modules/canvaskit/tests/assets/Roboto-Regular.otf
third_party/skia/modules/canvaskit/tests/assets/red_line.skp
third_party/skia/modules/canvaskit/tests/assets/test.ttc
@@ -12395,6 +12396,8 @@ third_party/zlib/google/test/data/test_encrypted.zip
third_party/zlib/google/test/data/test_mismatch_size.zip
third_party/zlib/google/test/data/test_nocompress.zip
third_party/zlib/google/test/data/test_posix_permissions.zip
third_party/zlib/google/test/data/unicode_path_extra.zip
third_party/zlib/google/test/data/unicode_path_extra_overflow.zip
third_party/zstd/src/programs/windres/zstd32.res
third_party/zstd/src/programs/windres/zstd64.res
third_party/zstd/src/tests/dict-files/zero-weight-dict