mirror of
https://github.com/morgan9e/helium
synced 2026-04-15 00:44:06 +09:00
Update to Chromium 128.0.6613.84
This commit is contained in:
@@ -1 +1 @@
|
||||
127.0.6533.119
|
||||
128.0.6613.84
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2400,7 +2400,6 @@ static_library("browser") {
|
||||
@@ -2390,7 +2390,6 @@ static_library("browser") {
|
||||
"//components/reporting/util:task_runner_context",
|
||||
"//components/resources",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -8,7 +8,7 @@
|
||||
"//components/safe_browsing/content/browser:safe_browsing_service",
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
@@ -3864,8 +3863,6 @@ static_library("browser") {
|
||||
@@ -3849,8 +3848,6 @@ static_library("browser") {
|
||||
"download/download_commands.h",
|
||||
"download/download_crx_util.cc",
|
||||
"download/download_crx_util.h",
|
||||
@@ -19,7 +19,7 @@
|
||||
"download/download_dir_util.cc",
|
||||
--- a/chrome/browser/browser_process.h
|
||||
+++ b/chrome/browser/browser_process.h
|
||||
@@ -55,10 +55,6 @@ class NetworkQualityTracker;
|
||||
@@ -56,10 +56,6 @@ class NetworkQualityTracker;
|
||||
class SharedURLLoaderFactory;
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
namespace subresource_filter {
|
||||
class RulesetService;
|
||||
}
|
||||
@@ -223,9 +219,6 @@ class BrowserProcess {
|
||||
@@ -224,9 +220,6 @@ class BrowserProcess {
|
||||
// on this platform (or this is a unit test).
|
||||
virtual StatusTray* status_tray() = 0;
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
#include "chrome/browser/shell_integration.h"
|
||||
#include "chrome/browser/site_isolation/prefs_observer.h"
|
||||
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
|
||||
@@ -456,8 +455,6 @@ void BrowserProcessImpl::StartTearDown()
|
||||
@@ -452,8 +451,6 @@ void BrowserProcessImpl::StartTearDown()
|
||||
#endif
|
||||
metrics_services_manager_.reset();
|
||||
intranet_redirect_detector_.reset();
|
||||
@@ -74,7 +74,7 @@
|
||||
subresource_filter::RulesetService*
|
||||
BrowserProcessImpl::subresource_filter_ruleset_service() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -1451,26 +1440,6 @@ void BrowserProcessImpl::CreateBackgroun
|
||||
@@ -1446,26 +1435,6 @@ void BrowserProcessImpl::CreateBackgroun
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
created_subresource_filter_ruleset_service_ = true;
|
||||
--- a/chrome/browser/browser_process_impl.h
|
||||
+++ b/chrome/browser/browser_process_impl.h
|
||||
@@ -200,7 +200,6 @@ class BrowserProcessImpl : public Browse
|
||||
@@ -199,7 +199,6 @@ class BrowserProcessImpl : public Browse
|
||||
std::unique_ptr<BackgroundModeManager> manager) override;
|
||||
#endif
|
||||
StatusTray* status_tray() override;
|
||||
@@ -123,7 +123,7 @@
|
||||
subresource_filter_ruleset_service_;
|
||||
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
@@ -69,7 +69,6 @@
|
||||
@@ -72,7 +72,6 @@
|
||||
#include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/reading_list/reading_list_model_factory.h"
|
||||
@@ -131,7 +131,7 @@
|
||||
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
|
||||
#include "chrome/browser/search_engines/template_url_service_factory.h"
|
||||
#include "chrome/browser/share/share_history.h"
|
||||
@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate::
|
||||
@@ -663,10 +662,6 @@ void ChromeBrowsingDataRemoverDelegate::
|
||||
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
|
||||
|
||||
network::mojom::NetworkContext* safe_browsing_context = nullptr;
|
||||
@@ -144,7 +144,7 @@
|
||||
browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -5248,10 +5248,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
@@ -5461,10 +5461,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
|
||||
handle, handle->GetWebContents()->GetBrowserContext()));
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
|
||||
handle,
|
||||
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
|
||||
@@ -5303,16 +5299,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
@@ -5516,16 +5512,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
&throttles);
|
||||
#endif
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
|
||||
throttles.push_back(
|
||||
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
|
||||
@@ -5617,8 +5603,6 @@ bool ChromeContentBrowserClient::IsPlugi
|
||||
@@ -5830,8 +5816,6 @@ bool ChromeContentBrowserClient::IsPlugi
|
||||
void ChromeContentBrowserClient::InitOnUIThread() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
|
||||
@@ -207,7 +207,7 @@
|
||||
} // namespace
|
||||
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -514,13 +514,6 @@ void ChromeDownloadManagerDelegate::SetD
|
||||
@@ -527,13 +527,6 @@ void ChromeDownloadManagerDelegate::SetD
|
||||
|
||||
download_manager_ = dm;
|
||||
|
||||
@@ -221,7 +221,7 @@
|
||||
if (download_manager_) {
|
||||
download_manager_->AddObserver(this);
|
||||
}
|
||||
@@ -955,17 +948,6 @@ void ChromeDownloadManagerDelegate::Choo
|
||||
@@ -967,17 +960,6 @@ void ChromeDownloadManagerDelegate::Choo
|
||||
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
|
||||
base::FilePath* filename,
|
||||
const GURL& source_url) {
|
||||
@@ -250,7 +250,7 @@
|
||||
|
||||
// Whether the download is currently being revived.
|
||||
bool is_being_revived_ = false;
|
||||
@@ -536,13 +536,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
@@ -555,13 +555,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
data->should_prefer_opening_in_browser_ = preference;
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@
|
||||
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
|
||||
data->danger_level_ = danger_level;
|
||||
}
|
||||
@@ -749,9 +749,6 @@ bool DownloadItemModel::IsCommandEnabled
|
||||
@@ -764,9 +764,6 @@ bool DownloadItemModel::IsCommandEnabled
|
||||
// filename. Don't base an "Always open" decision based on it. Also
|
||||
// exclude extensions.
|
||||
return download_->CanOpenDownload() &&
|
||||
@@ -308,7 +308,7 @@
|
||||
extension.erase(0, 1);
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -323,13 +323,6 @@ base::FilePath DownloadTargetDeterminer:
|
||||
@@ -333,13 +333,6 @@ base::FilePath DownloadTargetDeterminer:
|
||||
download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
|
||||
suggested_filename, sniffed_mime_type, default_filename);
|
||||
|
||||
@@ -322,7 +322,7 @@
|
||||
// If no mime type or explicitly specified a name, don't replace file
|
||||
// extension.
|
||||
if (sniffed_mime_type.empty() || !suggested_filename.empty())
|
||||
@@ -1291,30 +1284,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
@@ -1362,30 +1355,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
download_->HasUserGesture())
|
||||
return DownloadFileType::NOT_DANGEROUS;
|
||||
|
||||
@@ -381,7 +381,7 @@
|
||||
- // DownloadDangerPrompt displays a modal dialog using native widgets that the
|
||||
- // user must either accept or cancel. It cannot be scripted.
|
||||
- DownloadDangerPrompt* prompt = DownloadDangerPrompt::Create(
|
||||
- download_item, web_contents, true,
|
||||
- download_item, web_contents,
|
||||
- base::BindOnce(&DownloadsAcceptDangerFunction::DangerPromptCallback, this,
|
||||
- download_id));
|
||||
- // DownloadDangerPrompt deletes itself
|
||||
@@ -500,7 +500,7 @@
|
||||
referrer_entries)));
|
||||
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
@@ -701,18 +701,6 @@ void WebstorePrivateBeginInstallWithMani
|
||||
@@ -704,18 +704,6 @@ void WebstorePrivateBeginInstallWithMani
|
||||
|
||||
void WebstorePrivateBeginInstallWithManifest3Function::
|
||||
ReportFrictionAcceptedEvent() {
|
||||
@@ -519,7 +519,7 @@
|
||||
}
|
||||
|
||||
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
|
||||
@@ -1217,54 +1205,9 @@ WebstorePrivateGetReferrerChainFunction:
|
||||
@@ -1220,54 +1208,9 @@ WebstorePrivateGetReferrerChainFunction:
|
||||
|
||||
ExtensionFunction::ResponseAction
|
||||
WebstorePrivateGetReferrerChainFunction::Run() {
|
||||
@@ -695,15 +695,15 @@
|
||||
sources = [
|
||||
"chrome_controller_client.cc",
|
||||
"chrome_controller_client.h",
|
||||
@@ -71,6 +72,7 @@ static_library("safe_browsing") {
|
||||
@@ -73,6 +74,7 @@ static_library("safe_browsing") {
|
||||
"//mojo/public/cpp/system",
|
||||
"//services/preferences/public/cpp",
|
||||
]
|
||||
+ }
|
||||
|
||||
if (is_android) {
|
||||
deps += [ "//chrome/browser/password_manager/android:utils" ]
|
||||
@@ -504,6 +506,7 @@ static_library("advanced_protection") {
|
||||
deps += [
|
||||
@@ -520,6 +522,7 @@ static_library("advanced_protection") {
|
||||
}
|
||||
|
||||
source_set("metrics_collector") {
|
||||
@@ -711,7 +711,7 @@
|
||||
sources = [
|
||||
"safe_browsing_metrics_collector_factory.cc",
|
||||
"safe_browsing_metrics_collector_factory.h",
|
||||
@@ -523,6 +526,7 @@ source_set("metrics_collector") {
|
||||
@@ -539,6 +542,7 @@ source_set("metrics_collector") {
|
||||
"//components/safe_browsing/core/common:safe_browsing_prefs",
|
||||
"//content/public/browser",
|
||||
]
|
||||
@@ -738,7 +738,7 @@
|
||||
- scoped_refptr<SafeBrowsingUIManager> sb_ui_manager = sb_service->ui_manager();
|
||||
- safe_browsing::SBThreatType threat_type;
|
||||
- if (sb_ui_manager->IsUrlAllowlistedOrPendingForWebContents(
|
||||
- entry->GetURL(), false, entry, web_contents(), false, &threat_type)) {
|
||||
- entry->GetURL(), entry, web_contents(), false, &threat_type)) {
|
||||
- switch (threat_type) {
|
||||
- case SB_THREAT_TYPE_UNUSED:
|
||||
- case SB_THREAT_TYPE_SAFE:
|
||||
@@ -817,7 +817,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -5413,7 +5413,6 @@ static_library("ui") {
|
||||
@@ -5048,7 +5048,6 @@ static_library("ui") {
|
||||
"views/download/bubble/download_dialog_view.h",
|
||||
"views/download/bubble/download_toolbar_button_view.cc",
|
||||
"views/download/bubble/download_toolbar_button_view.h",
|
||||
@@ -827,7 +827,7 @@
|
||||
"views/download/download_item_view.cc",
|
||||
--- a/chrome/browser/ui/tab_helpers.cc
|
||||
+++ b/chrome/browser/ui/tab_helpers.cc
|
||||
@@ -503,32 +503,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
@@ -501,32 +501,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
// See https://crbug.com/910288.
|
||||
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
|
||||
web_contents);
|
||||
@@ -870,21 +870,7 @@
|
||||
#include "chrome/browser/download/download_history.h"
|
||||
#include "chrome/browser/download/download_item_model.h"
|
||||
#include "chrome/browser/download/download_item_warning_data.h"
|
||||
@@ -291,13 +290,6 @@ void DownloadsDOMHandler::SaveDangerousR
|
||||
}
|
||||
|
||||
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
|
||||
- download::DownloadItem* file = GetDownloadByStringId(id);
|
||||
- if (file) {
|
||||
- DownloadItemWarningData::AddWarningActionEvent(
|
||||
- file, DownloadItemWarningData::WarningSurface::DOWNLOADS_PAGE,
|
||||
- DownloadItemWarningData::WarningAction::KEEP);
|
||||
- ShowDangerPrompt(file);
|
||||
- }
|
||||
}
|
||||
|
||||
// "Suspicious" in this context applies to insecure as well as dangerous
|
||||
@@ -568,12 +560,6 @@ void DownloadsDOMHandler::RemoveDownload
|
||||
@@ -695,12 +694,6 @@ void DownloadsDOMHandler::RemoveDownload
|
||||
IdSet ids;
|
||||
|
||||
for (download::DownloadItem* download : to_remove) {
|
||||
@@ -897,93 +883,19 @@
|
||||
DownloadItemModel item_model(download);
|
||||
if (!item_model.ShouldShowInShelf() ||
|
||||
download->GetState() == download::DownloadItem::IN_PROGRESS) {
|
||||
@@ -782,54 +768,6 @@ void DownloadsDOMHandler::FinalizeRemova
|
||||
}
|
||||
}
|
||||
|
||||
-// TODO(chlily): This is obsoleted by ImprovedDownloadPageWarnings. Clean this
|
||||
-// up.
|
||||
-void DownloadsDOMHandler::ShowDangerPrompt(
|
||||
- download::DownloadItem* dangerous_item) {
|
||||
- DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create(
|
||||
- dangerous_item, GetWebUIWebContents(), false,
|
||||
- base::BindOnce(&DownloadsDOMHandler::DangerPromptDone,
|
||||
- weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId()));
|
||||
- // danger_prompt will delete itself.
|
||||
- DCHECK(danger_prompt);
|
||||
-}
|
||||
-
|
||||
-// TODO(chlily): This is obsoleted by ImprovedDownloadPageWarnings. Clean this
|
||||
-// up.
|
||||
-void DownloadsDOMHandler::DangerPromptDone(
|
||||
- int download_id,
|
||||
- DownloadDangerPrompt::Action action) {
|
||||
- if (action != DownloadDangerPrompt::ACCEPT) {
|
||||
- return;
|
||||
- }
|
||||
- download::DownloadItem* item = nullptr;
|
||||
- if (GetMainNotifierManager()) {
|
||||
- item = GetMainNotifierManager()->GetDownload(download_id);
|
||||
- }
|
||||
- if (!item && GetOriginalNotifierManager()) {
|
||||
- item = GetOriginalNotifierManager()->GetDownload(download_id);
|
||||
- }
|
||||
- if (!item || item->IsDone()) {
|
||||
- return;
|
||||
- }
|
||||
- CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
|
||||
-
|
||||
- // If a download is insecure, validate that first. Is most cases, insecure
|
||||
- // download warnings will occur first, but in the worst case scenario, we show
|
||||
- // a dangerous warning twice. That's better than showing an insecure download
|
||||
- // warning, then dismissing the dangerous download warning. Since insecure
|
||||
- // downloads triggering the UI are temporary and rare to begin with, this
|
||||
- // should very rarely occur.
|
||||
- if (item->IsInsecure()) {
|
||||
- item->ValidateInsecureDownload();
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- RecordDownloadsPageValidatedHistogram(item);
|
||||
-
|
||||
- item->ValidateDangerousDownload();
|
||||
-}
|
||||
-
|
||||
void DownloadsDOMHandler::MaybeTriggerDownloadWarningHatsSurvey(
|
||||
download::DownloadItem* item,
|
||||
DownloadWarningHatsType survey_type) {
|
||||
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
|
||||
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
|
||||
@@ -12,7 +12,6 @@
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/time/time.h"
|
||||
-#include "chrome/browser/download/download_danger_prompt.h"
|
||||
#include "chrome/browser/download/download_warning_desktop_hats_utils.h"
|
||||
#include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h"
|
||||
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
|
||||
@@ -120,18 +119,6 @@ class DownloadsDOMHandler : public conte
|
||||
// null-checking |original_notifier_|.
|
||||
content::DownloadManager* GetOriginalNotifierManager() const;
|
||||
|
||||
- // Displays a native prompt asking the user for confirmation after accepting
|
||||
- // the dangerous download specified by |dangerous|. The function returns
|
||||
- // immediately, and will invoke DangerPromptAccepted() asynchronously if the
|
||||
- // user accepts the dangerous download. The native prompt will observe
|
||||
- // |dangerous| until either the dialog is dismissed or |dangerous| is no
|
||||
- // longer an in-progress dangerous download.
|
||||
- virtual void ShowDangerPrompt(download::DownloadItem* dangerous);
|
||||
-
|
||||
- // Conveys danger acceptance from the DownloadDangerPrompt to the
|
||||
- // DownloadItem.
|
||||
- void DangerPromptDone(int download_id, DownloadDangerPrompt::Action action);
|
||||
-
|
||||
// Launches a HaTS survey for a download warning that is heeded, bypassed, or
|
||||
// ignored (if all preconditions are met).
|
||||
void MaybeTriggerDownloadWarningHatsSurvey(
|
||||
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
||||
@@ -275,66 +275,6 @@ CreateHttpsOnlyModePage(content::WebCont
|
||||
@@ -279,64 +279,6 @@ CreateHttpsOnlyModePage(content::WebCont
|
||||
security_interstitials::https_only_mode::HttpInterstitialState{});
|
||||
}
|
||||
|
||||
@@ -1020,8 +932,6 @@
|
||||
- primary_main_frame->GetGlobalId();
|
||||
- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
|
||||
- resource.url = request_url;
|
||||
- resource.is_subresource = false;
|
||||
- resource.is_subframe = false;
|
||||
- resource.threat_type = threat_type;
|
||||
- resource.render_process_id = primary_main_frame_id.child_id;
|
||||
- resource.render_frame_token = primary_main_frame->GetFrameToken().value();
|
||||
@@ -1050,7 +960,7 @@
|
||||
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
|
||||
content::WebContents* web_contents) {
|
||||
const GURL kRequestUrl("https://enterprise-block.example.net");
|
||||
@@ -345,94 +285,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
|
||||
@@ -347,35 +289,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
|
||||
kRequestUrl));
|
||||
}
|
||||
|
||||
@@ -1066,8 +976,6 @@
|
||||
- primary_main_frame->GetGlobalId();
|
||||
- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
|
||||
- resource.url = kRequestUrl;
|
||||
- resource.is_subresource = false;
|
||||
- resource.is_subframe = false;
|
||||
- resource.threat_type =
|
||||
- safe_browsing::SBThreatType::SB_THREAT_TYPE_MANAGED_POLICY_WARN;
|
||||
- resource.render_process_id = primary_main_frame_id.child_id;
|
||||
@@ -1085,6 +993,13 @@
|
||||
- kRequestUrl));
|
||||
-}
|
||||
-
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
std::unique_ptr<SupervisedUserVerificationPage>
|
||||
CreateSupervisedUserVerificationPage(content::WebContents* web_contents) {
|
||||
@@ -391,61 +304,6 @@ CreateSupervisedUserVerificationPage(con
|
||||
}
|
||||
#endif
|
||||
|
||||
-std::unique_ptr<TestSafeBrowsingBlockingPageQuiet>
|
||||
-CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
|
||||
- safe_browsing::SBThreatType threat_type =
|
||||
@@ -1118,8 +1033,6 @@
|
||||
- primary_main_frame->GetGlobalId();
|
||||
- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
|
||||
- resource.url = request_url;
|
||||
- resource.is_subresource = false;
|
||||
- resource.is_subframe = false;
|
||||
- resource.threat_type = threat_type;
|
||||
- resource.render_process_id = primary_main_frame_id.child_id;
|
||||
- resource.render_frame_token = primary_main_frame->GetFrameToken().value();
|
||||
@@ -1145,7 +1058,7 @@
|
||||
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
|
||||
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
|
||||
content::WebContents* web_contents) {
|
||||
@@ -539,12 +391,8 @@ void InterstitialHTMLSource::StartDataRe
|
||||
@@ -552,12 +410,8 @@ void InterstitialHTMLSource::StartDataRe
|
||||
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
|
||||
} else if (path_without_query == "/blocked-interception") {
|
||||
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
|
||||
@@ -1158,8 +1071,8 @@
|
||||
} else if (path_without_query == "/clock") {
|
||||
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
|
||||
} else if (path_without_query == "/lookalike") {
|
||||
@@ -559,12 +407,7 @@ void InterstitialHTMLSource::StartDataRe
|
||||
interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
|
||||
@@ -576,12 +430,7 @@ void InterstitialHTMLSource::StartDataRe
|
||||
#endif
|
||||
}
|
||||
|
||||
- if (path_without_query == "/quietsafebrowsing") {
|
||||
@@ -1167,8 +1080,8 @@
|
||||
- CreateSafeBrowsingQuietBlockingPage(web_contents);
|
||||
- html = blocking_page->GetHTML();
|
||||
- interstitial_delegate = std::move(blocking_page);
|
||||
- } else if (path_without_query == "/supervised_user") {
|
||||
+ if (path_without_query == "/supervised_user") {
|
||||
- } else if (path_without_query == "/supervised-user-ask-parent") {
|
||||
+ if (path_without_query == "/supervised-user-ask-parent") {
|
||||
html = GetSupervisedUserInterstitialHTML(path);
|
||||
} else if (interstitial_delegate.get()) {
|
||||
html = interstitial_delegate.get()->GetHTMLContents();
|
||||
@@ -1180,11 +1093,11 @@
|
||||
#include "components/safe_browsing/buildflags.h"
|
||||
-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
|
||||
#include "components/spellcheck/spellcheck_buildflags.h"
|
||||
#include "components/subresource_filter/content/renderer/safe_browsing_unverified_ruleset_dealer.h"
|
||||
#include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
|
||||
#include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
|
||||
@@ -459,12 +458,8 @@ void ChromeContentRendererClient::Render
|
||||
subresource_filter_ruleset_dealer_ = std::make_unique<
|
||||
subresource_filter::SafeBrowsingUnverifiedRulesetDealer>();
|
||||
subresource_filter_ruleset_dealer_ =
|
||||
std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
|
||||
|
||||
- phishing_model_setter_ =
|
||||
- std::make_unique<safe_browsing::PhishingModelSetterImpl>();
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
--- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
|
||||
+++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
|
||||
@@ -31,7 +31,6 @@ namespace extensions {
|
||||
@@ -32,7 +32,6 @@ namespace extensions {
|
||||
|
||||
bool IsComponentExtensionAllowlisted(const std::string& extension_id) {
|
||||
const char* const kAllowed[] = {
|
||||
- extension_misc::kInAppPaymentsSupportAppId,
|
||||
extension_misc::kPdfExtensionId,
|
||||
constexpr auto kAllowed = base::MakeFixedFlatSet<std::string_view>({
|
||||
- extension_misc::kInAppPaymentsSupportAppId,
|
||||
extension_misc::kPdfExtensionId,
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
extension_misc::kAssessmentAssistantExtensionId,
|
||||
extension_misc::kAssessmentAssistantExtensionId,
|
||||
--- a/chrome/browser/extensions/component_loader.cc
|
||||
+++ b/chrome/browser/extensions/component_loader.cc
|
||||
@@ -410,11 +410,6 @@ void ComponentLoader::AddWebStoreApp() {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -465,14 +465,6 @@ group("gn_all") {
|
||||
@@ -463,14 +463,6 @@ group("gn_all") {
|
||||
deps += [ "//chromeos:chromeos_unittests" ]
|
||||
}
|
||||
|
||||
|
||||
@@ -326,7 +326,7 @@ by default.
|
||||
std::unique_ptr<network::SimpleURLLoader> loader;
|
||||
--- a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc
|
||||
+++ b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc
|
||||
@@ -28,7 +28,7 @@ namespace safe_search_api {
|
||||
@@ -27,7 +27,7 @@ namespace safe_search_api {
|
||||
namespace {
|
||||
|
||||
const char kSafeSearchApiUrl[] =
|
||||
@@ -391,7 +391,7 @@ by default.
|
||||
|
||||
--- a/content/browser/webauth/webauth_request_security_checker.h
|
||||
+++ b/content/browser/webauth/webauth_request_security_checker.h
|
||||
@@ -86,9 +86,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
|
||||
@@ -87,9 +87,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
|
||||
// Legacy App IDs, which google.com origins are allowed to assert for
|
||||
// compatibility reasons.
|
||||
static constexpr char kGstaticAppId[] =
|
||||
@@ -432,7 +432,7 @@ by default.
|
||||
const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
|
||||
--- a/google_apis/gaia/gaia_constants.cc
|
||||
+++ b/google_apis/gaia/gaia_constants.cc
|
||||
@@ -14,157 +14,157 @@ const char kChromeSource[] = "ChromiumBr
|
||||
@@ -14,166 +14,166 @@ const char kChromeSource[] = "ChromiumBr
|
||||
const char kUnexpectedServiceResponse[] = "UnexpectedServiceResponse";
|
||||
|
||||
// OAuth scopes.
|
||||
@@ -495,6 +495,17 @@ by default.
|
||||
- "https://www.googleapis.com/auth/peopleapi.readonly";
|
||||
+ "trk:081:https://www.googleapis.com/auth/peopleapi.readonly";
|
||||
|
||||
// OAuth2 scope for access to the people API (read-write).
|
||||
const char kPeopleApiReadWriteOAuth2Scope[] =
|
||||
- "https://www.googleapis.com/auth/peopleapi.readwrite";
|
||||
+ "trk:115:https://www.googleapis.com/auth/peopleapi.readwrite";
|
||||
|
||||
// OAuth2 scope for access to the people API person's locale preferences
|
||||
// (read-only).
|
||||
const char kProfileLanguageReadOnlyOAuth2Scope[] =
|
||||
- "https://www.googleapis.com/auth/profile.language.read";
|
||||
+ "trk:116:https://www.googleapis.com/auth/profile.language.read";
|
||||
|
||||
// OAuth2 scope for access to the programmatic challenge API (read-only).
|
||||
const char kProgrammaticChallengeOAuth2Scope[] =
|
||||
- "https://www.googleapis.com/auth/accounts.programmaticchallenge";
|
||||
|
||||
@@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future).
|
||||
kSafeBrowsingIncidentTrafficAnnotation =
|
||||
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
|
||||
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
|
||||
@@ -304,11 +304,14 @@ IncidentReportingService::UploadContext:
|
||||
@@ -305,11 +305,14 @@ IncidentReportingService::UploadContext:
|
||||
|
||||
// static
|
||||
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
|
||||
|
||||
@@ -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
|
||||
@@ -274,6 +274,10 @@ void ClientSideDetectionService::StartCl
|
||||
@@ -271,6 +271,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);
|
||||
|
||||
@@ -353,6 +357,7 @@ void ClientSideDetectionService::StartCl
|
||||
@@ -350,6 +354,7 @@ void ClientSideDetectionService::StartCl
|
||||
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
|
||||
base::Unretained(WebUIInfoSingleton::GetInstance()),
|
||||
std::move(request), access_token));
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
--- a/components/omnibox/browser/autocomplete_input.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_input.cc
|
||||
@@ -582,7 +582,8 @@ void AutocompleteInput::ParseForEmphasiz
|
||||
@@ -592,7 +592,8 @@ void AutocompleteInput::ParseForEmphasiz
|
||||
// For the view-source and blob schemes, we should emphasize the host of the
|
||||
// URL qualified by the view-source or blob prefix.
|
||||
if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
|
||||
@@ -60,7 +60,7 @@
|
||||
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
|
||||
--- a/content/browser/child_process_security_policy_impl.cc
|
||||
+++ b/content/browser/child_process_security_policy_impl.cc
|
||||
@@ -852,6 +852,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
|
||||
@@ -855,6 +855,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
|
||||
@@ -998,6 +998,8 @@ component("net") {
|
||||
@@ -1030,6 +1030,8 @@ component("net") {
|
||||
"url_request/referrer_policy.h",
|
||||
"url_request/static_http_user_agent_settings.cc",
|
||||
"url_request/static_http_user_agent_settings.h",
|
||||
@@ -142,15 +142,15 @@
|
||||
+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
|
||||
--- a/net/url_request/url_request.cc
|
||||
+++ b/net/url_request/url_request.cc
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "base/functional/callback_helpers.h"
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "base/notreached.h"
|
||||
#include "base/rand_util.h"
|
||||
+#include "base/strings/string_util.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/synchronization/lock.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
@@ -49,6 +50,7 @@
|
||||
@@ -51,6 +52,7 @@
|
||||
#include "net/url_request/url_request_redirect_job.h"
|
||||
#include "url/gurl.h"
|
||||
#include "url/origin.h"
|
||||
@@ -158,7 +158,7 @@
|
||||
|
||||
namespace net {
|
||||
|
||||
@@ -605,6 +607,12 @@ URLRequest::URLRequest(base::PassKey<URL
|
||||
@@ -618,6 +620,12 @@ URLRequest::URLRequest(base::PassKey<URL
|
||||
// Sanity check out environment.
|
||||
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
|
||||
|
||||
@@ -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
|
||||
@@ -48,6 +48,7 @@
|
||||
@@ -49,6 +49,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"
|
||||
@@ -584,6 +585,9 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
@@ -592,6 +593,9 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
}
|
||||
protocol_handlers_.clear();
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
if (cookie_deprecation_label_.has_value()) {
|
||||
--- a/url/url_constants.h
|
||||
+++ b/url/url_constants.h
|
||||
@@ -52,6 +52,8 @@ inline constexpr char kMaterializedViewS
|
||||
@@ -50,6 +50,8 @@ inline constexpr char kMaterializedViewS
|
||||
inline constexpr char kSteamScheme[] = "steam";
|
||||
inline constexpr char kTelScheme[] = "tel";
|
||||
inline constexpr char16_t kTelScheme16[] = u"tel";
|
||||
@@ -204,7 +204,7 @@
|
||||
inline constexpr char kUuidInPackageScheme[] = "uuid-in-package";
|
||||
--- a/url/url_util.cc
|
||||
+++ b/url/url_util.cc
|
||||
@@ -79,6 +79,7 @@ struct SchemeRegistry {
|
||||
@@ -84,6 +84,7 @@ struct SchemeRegistry {
|
||||
kWssScheme,
|
||||
kDataScheme,
|
||||
kAboutScheme,
|
||||
@@ -212,7 +212,7 @@
|
||||
};
|
||||
|
||||
// Schemes that normal pages cannot link to or access (i.e., with the same
|
||||
@@ -93,6 +94,7 @@ struct SchemeRegistry {
|
||||
@@ -98,6 +99,7 @@ struct SchemeRegistry {
|
||||
kAboutScheme,
|
||||
kJavaScriptScheme,
|
||||
kDataScheme,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -2576,24 +2576,6 @@ void ChromeContentBrowserClient::AppendE
|
||||
@@ -2707,24 +2707,6 @@ void ChromeContentBrowserClient::AppendE
|
||||
command_line->AppendSwitchASCII(switches::kMetricsClientID,
|
||||
client_info->client_id);
|
||||
}
|
||||
@@ -29,7 +29,7 @@
|
||||
if (logging::DialogsAreSuppressed())
|
||||
--- a/components/crash/core/app/crashpad.cc
|
||||
+++ b/components/crash/core/app/crashpad.cc
|
||||
@@ -81,6 +81,12 @@ void InitializeDatabasePath(const base::
|
||||
@@ -68,6 +68,12 @@ void InitializeDatabasePath(const base::
|
||||
}
|
||||
|
||||
bool InitializeCrashpadImpl(bool initial_client,
|
||||
|
||||
@@ -704,7 +704,7 @@
|
||||
|
||||
--- a/components/domain_reliability/uploader.cc
|
||||
+++ b/components/domain_reliability/uploader.cc
|
||||
@@ -80,7 +80,7 @@ class DomainReliabilityUploaderImpl : pu
|
||||
@@ -81,7 +81,7 @@ class DomainReliabilityUploaderImpl : pu
|
||||
if (discard_uploads_)
|
||||
discarded_upload_count_++;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/google_apis/gaia/gaia_auth_fetcher.cc
|
||||
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
|
||||
@@ -263,61 +263,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
|
||||
@@ -264,61 +264,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
|
||||
network::mojom::CredentialsMode credentials_mode,
|
||||
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
|
||||
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/components/gcm_driver/gcm_client_impl.cc
|
||||
+++ b/components/gcm_driver/gcm_client_impl.cc
|
||||
@@ -449,6 +449,7 @@ void GCMClientImpl::StartGCM() {
|
||||
@@ -450,6 +450,7 @@ void GCMClientImpl::StartGCM() {
|
||||
|
||||
void GCMClientImpl::InitializeMCSClient() {
|
||||
DCHECK(network_connection_tracker_);
|
||||
@@ -10,7 +10,7 @@
|
||||
std::vector<GURL> endpoints;
|
||||
endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
|
||||
GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
|
||||
@@ -653,28 +654,6 @@ void GCMClientImpl::RemoveHeartbeatInter
|
||||
@@ -654,28 +655,6 @@ void GCMClientImpl::RemoveHeartbeatInter
|
||||
|
||||
void GCMClientImpl::StartCheckin() {
|
||||
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
|
||||
@@ -39,7 +39,7 @@
|
||||
}
|
||||
|
||||
void GCMClientImpl::OnCheckinCompleted(
|
||||
@@ -731,24 +710,6 @@ void GCMClientImpl::SetGServicesSettings
|
||||
@@ -732,24 +711,6 @@ void GCMClientImpl::SetGServicesSettings
|
||||
|
||||
void GCMClientImpl::SchedulePeriodicCheckin() {
|
||||
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
|
||||
|
||||
@@ -546,7 +546,7 @@
|
||||
bool IsGoogleHostname(const GURL& url) {
|
||||
--- a/components/search_engines/template_url.cc
|
||||
+++ b/components/search_engines/template_url.cc
|
||||
@@ -593,11 +593,7 @@ std::u16string TemplateURLRef::SearchTer
|
||||
@@ -589,11 +589,7 @@ std::u16string TemplateURLRef::SearchTer
|
||||
bool TemplateURLRef::HasGoogleBaseURLs(
|
||||
const SearchTermsData& search_terms_data) const {
|
||||
ParseIfNecessary(search_terms_data);
|
||||
@@ -663,6 +663,17 @@
|
||||
}
|
||||
|
||||
} // namespace variations
|
||||
--- a/content/browser/preloading/prefetch/prefetch_container.cc
|
||||
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
|
||||
@@ -745,7 +745,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;
|
||||
- std::vector<std::string> headers_to_remove = {variations::kClientDataHeader};
|
||||
+ std::vector<std::string> headers_to_remove;
|
||||
updated_headers.SetHeader("Sec-Purpose",
|
||||
GetSecPurposeHeaderValue(redirect_info.new_url));
|
||||
|
||||
--- a/net/base/url_util.cc
|
||||
+++ b/net/base/url_util.cc
|
||||
@@ -495,28 +495,6 @@ bool HasGoogleHost(const GURL& url) {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -375,7 +375,6 @@ if (!is_android && !is_mac) {
|
||||
@@ -382,7 +382,6 @@ if (!is_android && !is_mac) {
|
||||
}
|
||||
|
||||
data_deps += [
|
||||
@@ -15,11 +15,17 @@
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
if (invoker.collect_inputs_only) {
|
||||
@@ -1222,7 +1221,6 @@ if (is_win) {
|
||||
":optimization_guide_library",
|
||||
":swiftshader_library",
|
||||
":widevine_cdm_library",
|
||||
- "//chrome/browser/resources/media/mei_preload:component_bundle",
|
||||
]
|
||||
--- a/chrome/browser/resources/BUILD.gn
|
||||
+++ b/chrome/browser/resources/BUILD.gn
|
||||
@@ -96,11 +96,6 @@ group("resources") {
|
||||
public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
|
||||
}
|
||||
|
||||
if (is_chrome_branded) {
|
||||
- if (is_mac) {
|
||||
- public_deps += [
|
||||
- "//chrome/browser/resources/media/mei_preload:component",
|
||||
- ]
|
||||
- }
|
||||
|
||||
if (is_win || is_mac || is_linux || is_chromeos_ash) {
|
||||
public_deps += [ "connectors_internals:resources" ]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/rlz/lib/financial_ping.cc
|
||||
+++ b/rlz/lib/financial_ping.cc
|
||||
@@ -306,7 +306,7 @@ FinancialPing::PingResponse FinancialPin
|
||||
@@ -311,7 +311,7 @@ FinancialPing::PingResponse FinancialPin
|
||||
response->clear();
|
||||
|
||||
std::string url =
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/browser_ui_prefs.cc
|
||||
+++ b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
@@ -107,7 +107,7 @@ void RegisterBrowserUserPrefs(user_prefs
|
||||
@@ -111,7 +111,7 @@ void RegisterBrowserUserPrefs(user_prefs
|
||||
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
|
||||
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
|
||||
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
|
||||
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
|
||||
@@ -623,12 +623,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
@@ -669,12 +669,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
GetOriginsRequiringDedicatedProcess() {
|
||||
std::vector<url::Origin> list;
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT),
|
||||
--- a/services/network/public/cpp/features.cc
|
||||
+++ b/services/network/public/cpp/features.cc
|
||||
@@ -119,12 +119,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
|
||||
@@ -126,12 +126,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
|
||||
// Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
|
||||
BASE_FEATURE(kDnsOverHttpsUpgrade,
|
||||
"DnsOverHttpsUpgrade",
|
||||
|
||||
@@ -79,10 +79,16 @@
|
||||
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
|
||||
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
|
||||
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
|
||||
@@ -76,11 +76,6 @@ KeyedService* ManifestV2ExperimentManage
|
||||
}
|
||||
@@ -139,17 +139,6 @@ bool ManifestV2ExperimentManagerFactory:
|
||||
|
||||
// Determines the current stage of the MV2 deprecation experiments.
|
||||
MV2ExperimentStage CalculateCurrentExperimentStage() {
|
||||
- // Return the "highest" stage that is currently active for the user.
|
||||
- if (base::FeatureList::IsEnabled(
|
||||
- extensions_features::kExtensionManifestV2Disabled)) {
|
||||
- return MV2ExperimentStage::kDisableWithReEnable;
|
||||
- }
|
||||
-
|
||||
- if (base::FeatureList::IsEnabled(
|
||||
- extensions_features::kExtensionManifestV2DeprecationWarning)) {
|
||||
- return MV2ExperimentStage::kWarning;
|
||||
@@ -91,3 +97,17 @@
|
||||
return MV2ExperimentStage::kNone;
|
||||
}
|
||||
|
||||
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
|
||||
@@ -468,9 +468,9 @@ content::WebUIDataSource* CreateAndAddEx
|
||||
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
|
||||
source->AddBoolean(
|
||||
"safetyCheckShowReviewPanel",
|
||||
- base::FeatureList::IsEnabled(features::kSafetyCheckExtensions));
|
||||
+ false);
|
||||
source->AddBoolean("safetyHubShowReviewPanel",
|
||||
- base::FeatureList::IsEnabled(features::kSafetyHub));
|
||||
+ false);
|
||||
|
||||
// MV2 deprecation.
|
||||
auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
|
||||
|
||||
@@ -3,7 +3,15 @@
|
||||
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -940,8 +940,6 @@ if (is_win) {
|
||||
@@ -383,7 +383,6 @@ if (!is_android && !is_mac) {
|
||||
|
||||
data_deps += [
|
||||
"//chrome/browser/resources/media/mei_preload:component",
|
||||
- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component",
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
if (invoker.collect_inputs_only) {
|
||||
@@ -949,8 +948,6 @@ if (is_win) {
|
||||
|
||||
bundle_data("chrome_framework_resources") {
|
||||
sources = [
|
||||
@@ -47,7 +55,7 @@
|
||||
#include "chrome/browser/preloading/preloading_prefs.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "components/no_state_prefetch/browser/no_state_prefetch_manager.h"
|
||||
@@ -94,11 +92,6 @@ base::TimeDelta MLModelExecutionTimerSta
|
||||
@@ -107,11 +105,6 @@ base::TimeDelta MLModelExecutionTimerSta
|
||||
return base::Milliseconds(timer_start_delay);
|
||||
}
|
||||
|
||||
@@ -59,7 +67,7 @@
|
||||
|
||||
bool MLModelOneExecutionPerHover() {
|
||||
static bool one_execution_per_hover =
|
||||
@@ -369,80 +362,6 @@ void NavigationPredictor::ProcessPointer
|
||||
@@ -421,87 +414,6 @@ void NavigationPredictor::ProcessPointer
|
||||
}
|
||||
|
||||
void NavigationPredictor::OnMLModelExecutionTimerFired() {
|
||||
@@ -117,6 +125,14 @@
|
||||
- if (model_score_callback_) {
|
||||
- std::move(model_score_callback_).Run(inputs);
|
||||
- }
|
||||
-
|
||||
- content::PreloadingData* preloading_data =
|
||||
- content::PreloadingData::GetOrCreateForWebContents(
|
||||
- content::WebContents::FromRenderFrameHost(&render_frame_host()));
|
||||
- preloading_data->OnPreloadingHeuristicsModelInput(
|
||||
- anchor.target_url,
|
||||
- base::BindOnce(&RecordMetricsForModelTraining, inputs,
|
||||
- render_frame_host().GetPageUkmSourceId()));
|
||||
- model_service->Score(
|
||||
- &scoring_model_task_tracker_, inputs,
|
||||
- base::BindOnce(&NavigationPredictor::OnPreloadingHeuristicsModelDone,
|
||||
@@ -127,10 +143,9 @@
|
||||
- // repeated executions wasteful. So we only do one execution per mouse over.
|
||||
- // As we iterate on the model, multiple executions may become useful, but we
|
||||
- // need to take care to not produce a large amount of redundant predictions
|
||||
- // (as seen in crbug.com/338200075 ). Other ideas here could be to only report
|
||||
- // when the score differs from the previous execution and/or to have a fixed
|
||||
- // limit on the number of executions while dwelling.
|
||||
- // (as seen in crbug.com/338200075 ).
|
||||
- if (!MLModelOneExecutionPerHover() &&
|
||||
- inputs.hover_dwell_time < MLModelMaxHoverTime() &&
|
||||
- !ml_model_execution_timer_.IsRunning()) {
|
||||
- ml_model_execution_timer_.Start(
|
||||
- FROM_HERE, MLModelExecutionTimerInterval(),
|
||||
@@ -142,15 +157,15 @@
|
||||
void NavigationPredictor::SetModelScoreCallbackForTesting(
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -92,7 +92,6 @@
|
||||
@@ -98,7 +98,6 @@
|
||||
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
|
||||
#include "chrome/browser/metrics/variations/google_groups_updater_service_factory.h"
|
||||
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
|
||||
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
|
||||
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
|
||||
#include "chrome/browser/net/dns_probe_service_factory.h"
|
||||
#include "chrome/browser/net/profile_network_context_service_factory.h"
|
||||
#include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h"
|
||||
@@ -958,7 +957,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -975,7 +974,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#endif
|
||||
ModelTypeStoreServiceFactory::GetInstance();
|
||||
NavigationPredictorKeyedServiceFactory::GetInstance();
|
||||
@@ -158,7 +173,7 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
NearbySharingServiceFactory::GetInstance();
|
||||
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
|
||||
@@ -1007,9 +1005,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1024,9 +1022,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
OneTimePermissionsTrackerFactory::GetInstance();
|
||||
#endif
|
||||
OpenerHeuristicServiceFactory::GetInstance();
|
||||
@@ -170,7 +185,7 @@
|
||||
OriginTrialsFactory::GetInstance();
|
||||
--- a/chrome/browser/profiles/profile_manager.cc
|
||||
+++ b/chrome/browser/profiles/profile_manager.cc
|
||||
@@ -48,7 +48,6 @@
|
||||
@@ -49,7 +49,6 @@
|
||||
#include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
|
||||
#include "chrome/browser/lifetime/application_lifetime.h"
|
||||
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
|
||||
@@ -178,7 +193,7 @@
|
||||
#include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h"
|
||||
#include "chrome/browser/prefs/incognito_mode_prefs.h"
|
||||
#include "chrome/browser/profiles/delete_profile_helper.h"
|
||||
@@ -1539,9 +1538,6 @@ void ProfileManager::DoFinalInitForServi
|
||||
@@ -1542,9 +1541,6 @@ void ProfileManager::DoFinalInitForServi
|
||||
// Ensure NavigationPredictorKeyedService is started.
|
||||
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
|
||||
|
||||
@@ -188,48 +203,51 @@
|
||||
IdentityManagerFactory::GetForProfile(profile)->OnNetworkInitialized();
|
||||
AccountReconcilorFactory::GetForProfile(profile);
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
--- a/chrome/browser/resources/BUILD.gn
|
||||
+++ b/chrome/browser/resources/BUILD.gn
|
||||
@@ -99,7 +99,6 @@ group("resources") {
|
||||
if (is_mac) {
|
||||
public_deps += [
|
||||
"//chrome/browser/resources/media/mei_preload:component",
|
||||
- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component",
|
||||
]
|
||||
}
|
||||
|
||||
--- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
|
||||
@@ -39,13 +39,6 @@ void AccessibilityMainHandler::RegisterM
|
||||
@@ -36,11 +36,6 @@ void AccessibilityMainHandler::RegisterM
|
||||
base::BindRepeating(
|
||||
&AccessibilityMainHandler::HandleCheckAccessibilityImageLabels,
|
||||
base::Unretained(this)));
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
- web_ui()->RegisterMessageCallback(
|
||||
- "getScreenAiInstallState",
|
||||
- base::BindRepeating(
|
||||
- &AccessibilityMainHandler::HandleGetScreenAIInstallState,
|
||||
- base::Unretained(this)));
|
||||
-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
}
|
||||
|
||||
void AccessibilityMainHandler::OnJavascriptAllowed() {
|
||||
@@ -56,13 +49,6 @@ void AccessibilityMainHandler::OnJavascr
|
||||
@@ -51,11 +46,6 @@ void AccessibilityMainHandler::OnJavascr
|
||||
base::Unretained(this)));
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
- if (features::IsPdfOcrEnabled() || features::IsMainNodeAnnotationsEnabled()) {
|
||||
- if (features::IsMainNodeAnnotationsEnabled()) {
|
||||
- CHECK(!component_ready_observer_.IsObserving());
|
||||
- component_ready_observer_.Observe(
|
||||
- screen_ai::ScreenAIInstallState::GetInstance());
|
||||
- }
|
||||
-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
}
|
||||
|
||||
void AccessibilityMainHandler::OnJavascriptDisallowed() {
|
||||
@@ -70,40 +56,7 @@ void AccessibilityMainHandler::OnJavascr
|
||||
@@ -63,35 +53,6 @@ void AccessibilityMainHandler::OnJavascr
|
||||
accessibility_subscription_ = {};
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
- if (features::IsPdfOcrEnabled() || features::IsMainNodeAnnotationsEnabled()) {
|
||||
- if (features::IsMainNodeAnnotationsEnabled()) {
|
||||
- component_ready_observer_.Reset();
|
||||
- }
|
||||
-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
-}
|
||||
-
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
-void AccessibilityMainHandler::DownloadProgressChanged(double progress) {
|
||||
- CHECK_GE(progress, 0.0);
|
||||
- CHECK_LE(progress, 1.0);
|
||||
@@ -255,97 +273,72 @@
|
||||
- ResolveJavascriptCallback(
|
||||
- callback_id, base::Value(static_cast<int>(current_install_state)));
|
||||
}
|
||||
-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
|
||||
void AccessibilityMainHandler::HandleGetScreenReaderState(
|
||||
const base::Value::List& args) {
|
||||
--- a/chrome/browser/ui/webui/settings/accessibility_main_handler.h
|
||||
+++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.h
|
||||
@@ -13,10 +13,6 @@
|
||||
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
-#include "base/scoped_observation.h"
|
||||
-#include "chrome/browser/screen_ai/screen_ai_install_state.h"
|
||||
-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
|
||||
namespace settings {
|
||||
|
||||
@@ -24,10 +20,6 @@ namespace settings {
|
||||
@@ -21,8 +21,7 @@ namespace settings {
|
||||
// Settings handler for the main accessibility settings page,
|
||||
// chrome://settings/accessibility.
|
||||
class AccessibilityMainHandler
|
||||
: public ::settings::SettingsPageUIHandler
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
- ,
|
||||
- public screen_ai::ScreenAIInstallState::Observer
|
||||
-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
{
|
||||
- : public ::settings::SettingsPageUIHandler,
|
||||
- public screen_ai::ScreenAIInstallState::Observer {
|
||||
+ : public ::settings::SettingsPageUIHandler {
|
||||
public:
|
||||
AccessibilityMainHandler();
|
||||
@@ -40,11 +32,6 @@ class AccessibilityMainHandler
|
||||
~AccessibilityMainHandler() override;
|
||||
@@ -34,9 +33,6 @@ class AccessibilityMainHandler
|
||||
void OnJavascriptAllowed() override;
|
||||
void OnJavascriptDisallowed() override;
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
- // screen_ai::ScreenAIInstallState::Observer:
|
||||
- void DownloadProgressChanged(double progress) override;
|
||||
- void StateChanged(screen_ai::ScreenAIInstallState::State state) override;
|
||||
-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
|
||||
private:
|
||||
void HandleGetScreenReaderState(const base::Value::List& args);
|
||||
@@ -63,11 +50,6 @@ class AccessibilityMainHandler
|
||||
@@ -53,9 +49,6 @@ class AccessibilityMainHandler
|
||||
base::CallbackListSubscription accessibility_subscription_;
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
- base::ScopedObservation<screen_ai::ScreenAIInstallState,
|
||||
- screen_ai::ScreenAIInstallState::Observer>
|
||||
- component_ready_observer_{this};
|
||||
-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
};
|
||||
|
||||
} // namespace settings
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -285,7 +285,6 @@ void AddA11yStrings(content::WebUIDataSo
|
||||
IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
|
||||
{"overscrollHistoryNavigationSubtitle",
|
||||
IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE},
|
||||
-#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
|
||||
{"mainNodeAnnotationsDownloadCompleteLabel",
|
||||
IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_DOWNLOAD_COMPLETE},
|
||||
{"mainNodeAnnotationsDownloadErrorLabel",
|
||||
@@ -297,13 +296,11 @@ void AddA11yStrings(content::WebUIDataSo
|
||||
{"mainNodeAnnotationsTitle", IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_TITLE},
|
||||
{"mainNodeAnnotationsSubtitle",
|
||||
IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_SUBTITLE},
|
||||
-#endif // BULDFLAG(ENABLE_SCREEN_AI_SERVICE)
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
};
|
||||
html_source->AddLocalizedStrings(kLocalizedStrings);
|
||||
--- a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
|
||||
@@ -61,7 +61,6 @@ std::u16string GetHelpUrlWithBoard(const
|
||||
#endif
|
||||
|
||||
-#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)) && \
|
||||
- BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
void AddAxAnnotationsSectionStrings(content::WebUIDataSource* html_source) {
|
||||
-#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
|
||||
static constexpr webui::LocalizedString kLocalizedStrings[] = {
|
||||
{"mainNodeAnnotationsDownloadErrorLabel",
|
||||
IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_DOWNLOAD_ERROR},
|
||||
@@ -77,7 +76,6 @@ void AddAxAnnotationsSectionStrings(cont
|
||||
html_source->AddBoolean(
|
||||
"mainNodeAnnotationsEnabled",
|
||||
base::FeatureList::IsEnabled(features::kMainNodeAnnotations));
|
||||
-#endif // BULDFLAG(ENABLE_SCREEN_AI_SERVICE)
|
||||
}
|
||||
|
||||
void AddCaptionSubpageStrings(content::WebUIDataSource* html_source) {
|
||||
--- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
|
||||
@@ -17,8 +17,6 @@
|
||||
#include "chrome/browser/accessibility/pdf_ocr_controller_factory.h"
|
||||
@@ -18,8 +18,6 @@
|
||||
#include "chrome/browser/browser_features.h"
|
||||
#include "chrome/browser/language/language_model_manager_factory.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
-#include "chrome/browser/screen_ai/screen_ai_service_router.h"
|
||||
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
|
||||
#include "chrome/browser/translate/chrome_translate_client.h"
|
||||
#include "chrome/browser/ui/browser.h"
|
||||
#include "chrome/browser/ui/browser_finder.h"
|
||||
@@ -301,21 +299,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
|
||||
highlightGranularity);
|
||||
}
|
||||
@@ -307,21 +305,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
|
||||
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
|
||||
SetDefaultLanguageCode(prefs_lang);
|
||||
|
||||
- if (features::IsReadAnythingWithScreen2xEnabled()) {
|
||||
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(
|
||||
@@ -365,7 +358,7 @@
|
||||
|
||||
OnActiveWebContentsChanged();
|
||||
|
||||
@@ -728,10 +711,6 @@ void ReadAnythingUntrustedPageHandler::S
|
||||
@@ -702,10 +685,6 @@ void ReadAnythingUntrustedPageHandler::S
|
||||
inner_contents[0]->GetPrimaryMainFrame()->GetLastCommittedOrigin())) {
|
||||
pdf_observer_ = std::make_unique<ReadAnythingWebContentsObserver>(
|
||||
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
|
||||
@@ -378,17 +371,33 @@
|
||||
|
||||
--- a/chrome/renderer/BUILD.gn
|
||||
+++ b/chrome/renderer/BUILD.gn
|
||||
@@ -424,10 +424,6 @@ static_library("renderer") {
|
||||
@@ -405,18 +405,6 @@ static_library("renderer") {
|
||||
deps += [ "//chrome/common/wallet:mojo_bindings" ]
|
||||
} else {
|
||||
sources += [
|
||||
"accessibility/ax_tree_distiller.cc",
|
||||
"accessibility/ax_tree_distiller.h",
|
||||
- "accessibility/ax_tree_distiller.cc",
|
||||
- "accessibility/ax_tree_distiller.h",
|
||||
- "accessibility/read_aloud_app_model.cc",
|
||||
- "accessibility/read_aloud_app_model.h",
|
||||
- "accessibility/read_aloud_traversal_utils.cc",
|
||||
- "accessibility/read_aloud_traversal_utils.h",
|
||||
- "accessibility/read_anything_app_controller.cc",
|
||||
- "accessibility/read_anything_app_controller.h",
|
||||
- "accessibility/read_anything_app_model.cc",
|
||||
- "accessibility/read_anything_app_model.h",
|
||||
- "accessibility/read_anything_node_utils.cc",
|
||||
- "accessibility/read_anything_node_utils.h",
|
||||
"media/chrome_speech_recognition_client.cc",
|
||||
"media/chrome_speech_recognition_client.h",
|
||||
"searchbox/searchbox.cc",
|
||||
@@ -430,7 +418,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",
|
||||
]
|
||||
--- a/chrome/renderer/chrome_render_frame_observer.cc
|
||||
+++ b/chrome/renderer/chrome_render_frame_observer.cc
|
||||
@@ -320,21 +320,6 @@ void ChromeRenderFrameObserver::DidCommi
|
||||
@@ -415,7 +424,7 @@
|
||||
void ChromeRenderFrameObserver::DidMeaningfulLayout(
|
||||
--- a/chrome/test/chromedriver/BUILD.gn
|
||||
+++ b/chrome/test/chromedriver/BUILD.gn
|
||||
@@ -403,7 +403,7 @@ source_set("lib") {
|
||||
@@ -405,7 +405,7 @@ source_set("lib") {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -436,7 +445,7 @@
|
||||
python_library("fixtures") {
|
||||
--- a/components/omnibox/browser/autocomplete_classifier.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_classifier.cc
|
||||
@@ -96,8 +96,6 @@ void AutocompleteClassifier::Classify(
|
||||
@@ -102,8 +102,6 @@ void AutocompleteClassifier::Classify(
|
||||
metrics::OmniboxEventProto::PageClassification page_classification,
|
||||
AutocompleteMatch* match,
|
||||
GURL* alternate_nav_url) {
|
||||
@@ -445,9 +454,29 @@
|
||||
DCHECK(!inside_classify_);
|
||||
base::AutoReset<bool> reset(&inside_classify_, true);
|
||||
AutocompleteInput input(text, page_classification, *scheme_classifier_);
|
||||
--- a/components/pdf/renderer/BUILD.gn
|
||||
+++ b/components/pdf/renderer/BUILD.gn
|
||||
@@ -44,7 +44,6 @@ static_library("renderer") {
|
||||
"//pdf:pdf_view_web_plugin",
|
||||
"//printing/buildflags",
|
||||
"//services/screen_ai/buildflags",
|
||||
- "//services/screen_ai/public/cpp:metrics",
|
||||
"//skia",
|
||||
"//third_party/blink/public:blink",
|
||||
"//third_party/icu",
|
||||
--- a/components/pdf/renderer/pdf_accessibility_tree_builder.cc
|
||||
+++ b/components/pdf/renderer/pdf_accessibility_tree_builder.cc
|
||||
@@ -9,7 +9,6 @@
|
||||
|
||||
#include "base/i18n/break_iterator.h"
|
||||
#include "base/strings/utf_string_conversion_utils.h"
|
||||
-#include "components/pdf/renderer/pdf_ocr_helper.h"
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "pdf/accessibility_structs.h"
|
||||
#include "pdf/pdf_features.h"
|
||||
--- a/components/update_client/BUILD.gn
|
||||
+++ b/components/update_client/BUILD.gn
|
||||
@@ -312,8 +312,6 @@ source_set("unit_tests") {
|
||||
@@ -315,8 +315,6 @@ source_set("unit_tests") {
|
||||
"//third_party/puffin:libpuffpatch",
|
||||
"//third_party/re2",
|
||||
]
|
||||
@@ -458,7 +487,7 @@
|
||||
fuzzer_test("update_client_protocol_serializer_fuzzer") {
|
||||
--- a/content/shell/BUILD.gn
|
||||
+++ b/content/shell/BUILD.gn
|
||||
@@ -807,10 +807,6 @@ if (is_apple) {
|
||||
@@ -806,10 +806,6 @@ if (is_apple) {
|
||||
deps = [ "//third_party/icu:icudata" ]
|
||||
}
|
||||
|
||||
@@ -521,14 +550,38 @@
|
||||
group("devtools_all_files") {
|
||||
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
|
||||
@@ -184,7 +184,6 @@ group("unittests") {
|
||||
"panels/sources/components:unittests",
|
||||
@@ -190,7 +190,6 @@ group("unittests") {
|
||||
"panels/timeline:unittests",
|
||||
"panels/timeline/components:unittests",
|
||||
"panels/timeline/components/insights:unittests",
|
||||
- "panels/timeline/fixtures/traces",
|
||||
"panels/timeline/overlays:unittests",
|
||||
"panels/timeline/track_appenders:unittests",
|
||||
"panels/utils:unittests",
|
||||
"panels/web_audio:unittests",
|
||||
--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/core/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/core/BUILD.gn
|
||||
@@ -38,5 +38,4 @@ ts_library("unittests") {
|
||||
"../testing:bundle",
|
||||
]
|
||||
|
||||
- public_deps = [ "../../../../panels/timeline/fixtures/traces" ]
|
||||
}
|
||||
--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/metrics/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/metrics/BUILD.gn
|
||||
@@ -54,5 +54,4 @@ ts_library("unittests") {
|
||||
"../testing:bundle",
|
||||
]
|
||||
|
||||
- public_deps = [ "../../../../panels/timeline/fixtures/traces" ]
|
||||
}
|
||||
--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/BUILD.gn
|
||||
@@ -51,5 +51,4 @@ ts_library("unittests") {
|
||||
"../testing:bundle",
|
||||
]
|
||||
|
||||
- public_deps = [ "../../../../panels/timeline/fixtures/traces" ]
|
||||
}
|
||||
--- a/third_party/puffin/BUILD.gn
|
||||
+++ b/third_party/puffin/BUILD.gn
|
||||
@@ -115,7 +115,6 @@ executable("puffin_unittest") {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
@@ -133,7 +133,7 @@ bool CheckDuplicateEntries(const Transpo
|
||||
@@ -132,7 +132,7 @@ bool CheckDuplicateEntries(const Transpo
|
||||
bool CheckNoopEntries(const TransportSecurityStateEntries& entries) {
|
||||
for (const auto& entry : entries) {
|
||||
if (!entry->force_https && entry->pinset.empty()) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,8 @@
|
||||
--- a/components/search_engines/prepopulated_engines.json
|
||||
+++ b/components/search_engines/prepopulated_engines.json
|
||||
@@ -125,27 +125,11 @@
|
||||
},
|
||||
|
||||
@@ -133,27 +133,11 @@
|
||||
// TODO(b/343792225): Identify a way to resolve this problem and implement
|
||||
// necessary changes.
|
||||
"google": {
|
||||
- "name": "Google",
|
||||
- "keyword": "google.com",
|
||||
|
||||
@@ -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
|
||||
@@ -169,6 +169,7 @@
|
||||
@@ -172,6 +172,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"
|
||||
@@ -2265,6 +2266,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -2282,6 +2283,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
}
|
||||
|
||||
if (CanTranslate(/*menu_logging=*/true)) {
|
||||
@@ -47,7 +47,7 @@
|
||||
request_pending_ = true;
|
||||
--- a/components/translate/core/browser/translate_manager.cc
|
||||
+++ b/components/translate/core/browser/translate_manager.cc
|
||||
@@ -834,8 +834,9 @@ void TranslateManager::FilterIsTranslate
|
||||
@@ -837,8 +837,9 @@ void TranslateManager::FilterIsTranslate
|
||||
TriggerDecision::kDisabledOffline);
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
translate_event->set_ranker_version(GetModelVersion());
|
||||
--- a/components/translate/core/browser/translate_script.cc
|
||||
+++ b/components/translate/core/browser/translate_script.cc
|
||||
@@ -139,8 +139,13 @@ void TranslateScript::OnScriptFetchCompl
|
||||
@@ -138,8 +138,13 @@ void TranslateScript::OnScriptFetchCompl
|
||||
server_params.c_str());
|
||||
|
||||
GURL security_origin = translate::GetTranslateSecurityOrigin();
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2593,6 +2593,7 @@ static_library("browser") {
|
||||
@@ -2584,6 +2584,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
|
||||
@@ -172,6 +172,7 @@
|
||||
@@ -171,6 +171,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
|
||||
@@ -256,6 +256,7 @@ source_set("browser") {
|
||||
@@ -271,6 +271,7 @@ source_set("browser") {
|
||||
"//third_party/libyuv",
|
||||
"//third_party/re2",
|
||||
"//third_party/sqlite",
|
||||
@@ -54,7 +54,7 @@
|
||||
"//tools/v8_context_snapshot:buildflags",
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -79,6 +79,7 @@
|
||||
@@ -78,6 +78,7 @@
|
||||
#include "components/services/storage/public/cpp/quota_error_or.h"
|
||||
#include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
|
||||
#include "components/tracing/common/tracing_switches.h"
|
||||
@@ -62,7 +62,7 @@
|
||||
#include "components/viz/common/switches.h"
|
||||
#include "components/viz/host/gpu_client.h"
|
||||
#include "content/browser/bad_message.h"
|
||||
@@ -3515,6 +3516,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3216,6 +3217,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"
|
||||
@@ -492,6 +493,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -489,6 +490,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
switches::kEnableWebGPUDeveloperFeatures, true},
|
||||
{wrf::EnableWebGPUExperimentalFeatures, switches::kEnableUnsafeWebGPU,
|
||||
true},
|
||||
@@ -116,7 +116,7 @@
|
||||
|
||||
--- a/third_party/blink/renderer/core/dom/document.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/document.cc
|
||||
@@ -40,6 +40,7 @@
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "base/i18n/time_formatting.h"
|
||||
#include "base/metrics/histogram_functions.h"
|
||||
#include "base/notreached.h"
|
||||
@@ -124,7 +124,7 @@
|
||||
#include "base/ranges/algorithm.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
#include "base/time/time.h"
|
||||
@@ -907,6 +908,11 @@ Document::Document(const DocumentInit& i
|
||||
@@ -916,6 +917,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();
|
||||
@@ -1022,6 +1028,14 @@ const Position Document::PositionAdjuste
|
||||
@@ -1031,6 +1037,14 @@ const Position Document::PositionAdjuste
|
||||
return Position::BeforeNode(*shadow_host);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
|
||||
--- a/third_party/blink/renderer/core/dom/document.h
|
||||
+++ b/third_party/blink/renderer/core/dom/document.h
|
||||
@@ -549,6 +549,10 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -552,6 +552,10 @@ class CORE_EXPORT Document : public Cont
|
||||
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
AtomicString visibilityState() const;
|
||||
bool IsPageVisible() const;
|
||||
bool hidden() const;
|
||||
@@ -2554,6 +2558,9 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -2574,6 +2578,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
|
||||
@@ -2425,6 +2425,11 @@ DOMRectList* Element::getClientRects() {
|
||||
@@ -2439,6 +2439,11 @@ DOMRectList* Element::getClientRects() {
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
|
||||
*element_layout_object);
|
||||
@@ -188,7 +188,7 @@
|
||||
return MakeGarbageCollected<DOMRectList>(quads);
|
||||
}
|
||||
|
||||
@@ -2452,6 +2457,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
@@ -2466,6 +2471,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
|
||||
*element_layout_object);
|
||||
@@ -228,7 +228,7 @@
|
||||
// TODO(editing-dev): We should make
|
||||
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
|
||||
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
|
||||
@@ -74,6 +74,24 @@ TextMetrics::TextMetrics(const Font& fon
|
||||
@@ -79,6 +79,24 @@ TextMetrics::TextMetrics(const Font& fon
|
||||
Update(font, direction, baseline, align, text);
|
||||
}
|
||||
|
||||
@@ -255,9 +255,9 @@
|
||||
const TextBaseline& baseline,
|
||||
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
|
||||
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
|
||||
@@ -72,6 +72,8 @@ class CORE_EXPORT TextMetrics final : pu
|
||||
|
||||
void Trace(Visitor*) const override;
|
||||
@@ -93,6 +93,8 @@ class CORE_EXPORT TextMetrics final : pu
|
||||
float x_position_;
|
||||
};
|
||||
|
||||
+ void Shuffle(const double factor);
|
||||
+
|
||||
@@ -266,7 +266,7 @@
|
||||
const TextDirection&,
|
||||
--- 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
|
||||
@@ -214,6 +214,9 @@ class Isolate;
|
||||
@@ -219,6 +219,9 @@ class Isolate;
|
||||
class Value;
|
||||
} // namespace v8
|
||||
|
||||
@@ -276,7 +276,7 @@
|
||||
namespace blink {
|
||||
|
||||
class DOMMatrixInit;
|
||||
@@ -3419,8 +3422,22 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
@@ -3512,8 +3515,22 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
const CanvasRenderingContext2DState& state = GetState();
|
||||
TextDirection direction = ToTextDirection(state.GetDirection(), canvas);
|
||||
|
||||
@@ -303,7 +303,7 @@
|
||||
void BaseRenderingContext2D::SnapshotStateForFilter() {
|
||||
--- a/third_party/blink/renderer/platform/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/platform/BUILD.gn
|
||||
@@ -1738,6 +1738,7 @@ component("platform") {
|
||||
@@ -1747,6 +1747,7 @@ component("platform") {
|
||||
"//cc/mojo_embedder",
|
||||
"//components/paint_preview/common",
|
||||
"//components/search_engines:search_engine_utils",
|
||||
@@ -338,7 +338,7 @@
|
||||
#include "third_party/blink/renderer/platform/wtf/vector.h"
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -1737,6 +1737,12 @@
|
||||
@@ -1848,6 +1848,12 @@
|
||||
status: "experimental",
|
||||
},
|
||||
{
|
||||
@@ -349,5 +349,5 @@
|
||||
+ },
|
||||
+ {
|
||||
name: "Fledge",
|
||||
status: "stable",
|
||||
base_feature: "none",
|
||||
origin_trial_feature_name: "PrivacySandboxAdsAPIs",
|
||||
|
||||
@@ -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
|
||||
@@ -3518,6 +3518,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3219,6 +3219,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kFileUrlPathAlias,
|
||||
switches::kFingerprintingClientRectsNoise,
|
||||
switches::kFingerprintingCanvasMeasureTextNoise,
|
||||
@@ -44,7 +44,7 @@ approach to change color components.
|
||||
switches::kForceGpuMemAvailableMb,
|
||||
--- a/content/child/runtime_features.cc
|
||||
+++ b/content/child/runtime_features.cc
|
||||
@@ -497,6 +497,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -494,6 +494,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
switches::kFingerprintingClientRectsNoise, true},
|
||||
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
|
||||
switches::kFingerprintingCanvasMeasureTextNoise, true},
|
||||
@@ -65,7 +65,7 @@ approach to change color components.
|
||||
};
|
||||
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
@@ -2743,6 +2743,9 @@ ImageData* BaseRenderingContext2D::getIm
|
||||
@@ -2835,6 +2835,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
|
||||
@@ -1690,7 +1690,9 @@ component("platform") {
|
||||
@@ -1699,7 +1699,9 @@ component("platform") {
|
||||
"//third_party/blink/renderer:non_test_config",
|
||||
]
|
||||
|
||||
@@ -314,7 +314,7 @@ approach to change color components.
|
||||
// Methods overridden by all sub-classes
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -1743,6 +1743,9 @@
|
||||
@@ -1854,6 +1854,9 @@
|
||||
name: "FingerprintingCanvasMeasureTextNoise",
|
||||
},
|
||||
{
|
||||
@@ -322,5 +322,5 @@ approach to change color components.
|
||||
+ },
|
||||
+ {
|
||||
name: "Fledge",
|
||||
status: "stable",
|
||||
base_feature: "none",
|
||||
origin_trial_feature_name: "PrivacySandboxAdsAPIs",
|
||||
|
||||
@@ -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
|
||||
@@ -2295,6 +2295,7 @@ static_library("browser") {
|
||||
@@ -2282,6 +2282,7 @@ static_library("browser") {
|
||||
"//components/net_log",
|
||||
"//components/network_hints/common:mojo_bindings",
|
||||
"//components/network_session_configurator/browser",
|
||||
@@ -72,15 +72,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"
|
||||
@@ -142,6 +145,7 @@
|
||||
@@ -141,6 +144,7 @@
|
||||
#include "extensions/common/constants.h"
|
||||
#include "media/media_buildflags.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
#include "net/log/net_log.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"
|
||||
@@ -384,6 +388,18 @@ void BrowserProcessImpl::Init() {
|
||||
@@ -380,6 +384,18 @@ void BrowserProcessImpl::Init() {
|
||||
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
|
||||
base::BindRepeating(&ApplyMetricsReportingPolicy));
|
||||
|
||||
@@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -2291,6 +2291,10 @@ const char kLogJsConsoleMessagesDescript
|
||||
@@ -2369,6 +2369,10 @@ const char kLogJsConsoleMessagesDescript
|
||||
"Enable logging JS console messages in system logs, please note that they "
|
||||
"may contain PII.";
|
||||
|
||||
@@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
const char kMediaRouterCastAllowAllIPsDescription[] =
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -1313,6 +1313,9 @@ extern const char kLocationBarModelOptim
|
||||
@@ -1356,6 +1356,9 @@ extern const char kLocationBarModelOptim
|
||||
extern const char kLogJsConsoleMessagesName[];
|
||||
extern const char kLogJsConsoleMessagesDescription[];
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
void BackgroundModeManager::RegisterProfile(Profile* profile) {
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::Registe
|
||||
@@ -1581,7 +1581,7 @@ void ChromeContentBrowserClient::Registe
|
||||
void ChromeContentBrowserClient::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
|
||||
@@ -23,7 +23,7 @@
|
||||
// used for mapping the command-line flags).
|
||||
--- a/chrome/browser/net/profile_network_context_service.cc
|
||||
+++ b/chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -382,7 +382,7 @@ void ProfileNetworkContextService::Confi
|
||||
@@ -381,7 +381,7 @@ void ProfileNetworkContextService::Confi
|
||||
void ProfileNetworkContextService::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
|
||||
@@ -67,7 +67,7 @@
|
||||
</cr-dialog>
|
||||
--- a/chrome/browser/ui/browser_ui_prefs.cc
|
||||
+++ b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
@@ -91,7 +91,7 @@ void RegisterBrowserUserPrefs(user_prefs
|
||||
@@ -95,7 +95,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
|
||||
@@ -39,7 +39,7 @@ int GetSyncTransportOptInBitFieldForAcco
|
||||
@@ -40,7 +40,7 @@ int GetSyncTransportOptInBitFieldForAcco
|
||||
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(
|
||||
prefs::kAutofillLastVersionDeduped, 0,
|
||||
@@ -48,7 +48,7 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
@@ -49,7 +49,7 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
prefs::kAutofillHasSeenIban, false,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -98,7 +98,7 @@
|
||||
prefs::kAutofillPaymentCvcStorage, true,
|
||||
--- a/components/bookmarks/browser/bookmark_utils.cc
|
||||
+++ b/components/bookmarks/browser/bookmark_utils.cc
|
||||
@@ -491,7 +491,7 @@ bool DoesBookmarkContainWords(const std:
|
||||
@@ -492,7 +492,7 @@ bool DoesBookmarkContainWords(const std:
|
||||
|
||||
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
--- a/components/password_manager/core/browser/password_manager.cc
|
||||
+++ b/components/password_manager/core/browser/password_manager.cc
|
||||
@@ -277,14 +277,14 @@ bool HasManuallyFilledFields(const Passw
|
||||
@@ -314,14 +314,14 @@ bool HasManuallyFilledFields(const Passw
|
||||
void PasswordManager::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
|
||||
@@ -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
|
||||
@@ -1661,11 +1661,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
@@ -1671,11 +1671,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
// and preferences have been registered since some of the import code depends
|
||||
// on preferences.
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
|
||||
@@ -12,7 +12,7 @@ it as hidden as it was before?
|
||||
|
||||
--- a/net/cert/x509_util.cc
|
||||
+++ b/net/cert/x509_util.cc
|
||||
@@ -304,7 +304,7 @@ bool GetTLSServerEndPointChannelBinding(
|
||||
@@ -285,7 +285,7 @@ bool GetTLSServerEndPointChannelBinding(
|
||||
}
|
||||
|
||||
// RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
|
||||
|
||||
@@ -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
|
||||
@@ -1059,7 +1059,7 @@ class AppControllerNativeThemeObserver :
|
||||
@@ -1062,7 +1062,7 @@ class AppControllerNativeThemeObserver :
|
||||
CFStringRef checkInterval = CFSTR("checkInterval");
|
||||
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
|
||||
if (!plist) {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
override_bounds_(params.initial_bounds),
|
||||
initial_show_state_(params.initial_show_state),
|
||||
initial_workspace_(params.initial_workspace),
|
||||
@@ -987,20 +989,22 @@ Browser::WarnBeforeClosingResult Browser
|
||||
@@ -988,20 +990,22 @@ Browser::WarnBeforeClosingResult Browser
|
||||
return WarnBeforeClosingResult::kOkToClose;
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
}
|
||||
|
||||
DCHECK(!warn_before_closing_callback_)
|
||||
@@ -1038,6 +1042,7 @@ bool Browser::TryToCloseWindow(
|
||||
@@ -1039,6 +1043,7 @@ bool Browser::TryToCloseWindow(
|
||||
|
||||
void Browser::ResetTryToCloseWindow() {
|
||||
cancel_download_confirmation_state_ = NOT_PROMPTED;
|
||||
@@ -60,7 +60,7 @@
|
||||
unload_controller_.ResetTryToCloseWindow();
|
||||
}
|
||||
|
||||
@@ -3098,6 +3103,58 @@ bool Browser::CanCloseWithInProgressDown
|
||||
@@ -3085,6 +3090,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;
|
||||
@@ -3123,6 +3180,22 @@ void Browser::InProgressDownloadResponse
|
||||
@@ -3110,6 +3167,22 @@ void Browser::InProgressDownloadResponse
|
||||
|
||||
std::move(warn_before_closing_callback_)
|
||||
.Run(WarnBeforeClosingResult::kDoNotClose);
|
||||
@@ -152,7 +152,7 @@
|
||||
#include "chrome/browser/ui/signin/signin_view_controller.h"
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
||||
#include "chrome/browser/ui/unload_controller.h"
|
||||
@@ -1183,12 +1184,17 @@ class Browser : public TabStripModelObse
|
||||
@@ -1174,12 +1175,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.
|
||||
@@ -1361,6 +1367,8 @@ class Browser : public TabStripModelObse
|
||||
@@ -1347,6 +1353,8 @@ class Browser : public TabStripModelObse
|
||||
// when the browser is closed with in-progress downloads.
|
||||
CancelDownloadConfirmationState cancel_download_confirmation_state_;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -889,10 +889,14 @@ bool HandleNewTabPageLocationOverride(
|
||||
@@ -909,10 +909,14 @@ bool HandleNewTabPageLocationOverride(
|
||||
|
||||
// Don't change the URL when incognito mode.
|
||||
if (profile->IsOffTheRecord())
|
||||
@@ -28,7 +28,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/components/flags_ui/flags_state.cc
|
||||
+++ b/components/flags_ui/flags_state.cc
|
||||
@@ -222,6 +222,7 @@ std::string GetCombinedOriginListValue(c
|
||||
@@ -223,6 +223,7 @@ std::string GetCombinedOriginListValue(c
|
||||
command_line.GetSwitchValueASCII(command_line_switch);
|
||||
const std::string new_value =
|
||||
flags_storage.GetOriginListFlag(internal_entry_name);
|
||||
@@ -36,7 +36,7 @@
|
||||
return CombineAndSanitizeOriginLists(existing_value, new_value);
|
||||
}
|
||||
|
||||
@@ -460,6 +461,7 @@ void FlagsState::SetOriginListFlag(const
|
||||
@@ -461,6 +462,7 @@ void FlagsState::SetOriginListFlag(const
|
||||
const std::string& value,
|
||||
FlagsStorage* flags_storage) {
|
||||
const std::string new_value =
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
//
|
||||
--- a/third_party/blink/renderer/core/editing/selection_controller.cc
|
||||
+++ b/third_party/blink/renderer/core/editing/selection_controller.cc
|
||||
@@ -1439,10 +1439,14 @@ FrameSelection& SelectionController::Sel
|
||||
@@ -1435,10 +1435,14 @@ FrameSelection& SelectionController::Sel
|
||||
}
|
||||
|
||||
bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) {
|
||||
@@ -50,7 +50,7 @@
|
||||
Node* inner_node = event.InnerNode();
|
||||
--- a/third_party/blink/renderer/core/input/mouse_event_manager.cc
|
||||
+++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc
|
||||
@@ -648,8 +648,14 @@ WebInputEventResult MouseEventManager::H
|
||||
@@ -650,8 +650,14 @@ WebInputEventResult MouseEventManager::H
|
||||
|
||||
bool single_click = event.Event().click_count <= 1;
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -76,6 +76,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.
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "ui/gfx/color_utils.h"
|
||||
#include "ui/native_theme/native_theme.h"
|
||||
|
||||
@@ -416,7 +417,9 @@ void NTPResourceCache::CreateNewTabIncog
|
||||
@@ -421,7 +422,9 @@ void NTPResourceCache::CreateNewTabIncog
|
||||
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
|
||||
|
||||
// Colors.
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/format_macros.h"
|
||||
#include "base/functional/bind.h"
|
||||
@@ -501,6 +502,15 @@ AutocompleteController::AutocompleteCont
|
||||
@@ -531,6 +532,15 @@ AutocompleteController::AutocompleteCont
|
||||
steady_state_omnibox_position_(
|
||||
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
|
||||
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
|
||||
@@ -59,7 +59,7 @@
|
||||
// so their async requests can be kicked off before waiting a few milliseconds
|
||||
--- a/components/omnibox/browser/history_url_provider.cc
|
||||
+++ b/components/omnibox/browser/history_url_provider.cc
|
||||
@@ -487,6 +487,9 @@ void HistoryURLProvider::Start(const Aut
|
||||
@@ -488,6 +488,9 @@ void HistoryURLProvider::Start(const Aut
|
||||
if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
|
||||
matches_.push_back(what_you_typed_match);
|
||||
|
||||
|
||||
@@ -1,22 +1,14 @@
|
||||
--- a/chrome/browser/sharing/features.cc
|
||||
+++ b/chrome/browser/sharing/features.cc
|
||||
@@ -17,3 +17,5 @@ const base::FeatureParam<int> kSharingPu
|
||||
|
||||
const base::FeatureParam<int> kSharingPulseDeltaAndroidHours = {
|
||||
&kSharingMatchPulseInterval, "SharingPulseDeltaAndroidHours", 24};
|
||||
+
|
||||
+BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
--- a/chrome/browser/sharing/features.h
|
||||
+++ b/chrome/browser/sharing/features.h
|
||||
@@ -26,4 +26,5 @@ extern const base::FeatureParam<int> kSh
|
||||
// backgrounded. Such devices cannot be marked stale aggressively.
|
||||
extern const base::FeatureParam<int> kSharingPulseDeltaAndroidHours;
|
||||
|
||||
+BASE_DECLARE_FEATURE(kDisableQRGenerator);
|
||||
#endif // CHROME_BROWSER_SHARING_FEATURES_H_
|
||||
--- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
|
||||
+++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
|
||||
@@ -23,7 +23,7 @@ QRCodeGeneratorBubbleController::~QRCode
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "components/prefs/pref_change_registrar.h"
|
||||
+#include "components/sharing_message/features.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
@@ -37,7 +38,7 @@ QRCodeGeneratorBubbleController::~QRCode
|
||||
|
||||
// static
|
||||
bool QRCodeGeneratorBubbleController::IsGeneratorAvailable(const GURL& url) {
|
||||
@@ -24,7 +16,7 @@
|
||||
+ if (!url.SchemeIsHTTPOrHTTPS() || base::FeatureList::IsEnabled(kDisableQRGenerator))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
// Check policy.
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -64,4 +64,8 @@
|
||||
@@ -36,3 +28,19 @@
|
||||
+ "Disables the QR generator for sharing page links. ungoogled-chromium flag",
|
||||
+ kOsDesktop, FEATURE_VALUE_TYPE(kDisableQRGenerator)},
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/components/sharing_message/features.cc
|
||||
+++ b/components/sharing_message/features.cc
|
||||
@@ -17,3 +17,5 @@ const base::FeatureParam<int> kSharingPu
|
||||
|
||||
const base::FeatureParam<int> kSharingPulseDeltaAndroidHours = {
|
||||
&kSharingMatchPulseInterval, "SharingPulseDeltaAndroidHours", 24};
|
||||
+
|
||||
+BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
--- a/components/sharing_message/features.h
|
||||
+++ b/components/sharing_message/features.h
|
||||
@@ -26,4 +26,5 @@ extern const base::FeatureParam<int> kSh
|
||||
// backgrounded. Such devices cannot be marked stale aggressively.
|
||||
extern const base::FeatureParam<int> kSharingPulseDeltaAndroidHours;
|
||||
|
||||
+BASE_DECLARE_FEATURE(kDisableQRGenerator);
|
||||
#endif // COMPONENTS_SHARING_MESSAGE_FEATURES_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/tab_helpers.cc
|
||||
+++ b/chrome/browser/ui/tab_helpers.cc
|
||||
@@ -503,7 +503,9 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
@@ -501,7 +501,9 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
|
||||
web_contents);
|
||||
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
|
||||
@@ -33,7 +33,7 @@
|
||||
- if (!osdd_url.is_empty()) {
|
||||
- mojo::Remote<chrome::mojom::OpenSearchDescriptionDocumentHandler>
|
||||
- osdd_handler;
|
||||
- render_frame()->GetBrowserInterfaceBroker()->GetInterface(
|
||||
- render_frame()->GetBrowserInterfaceBroker().GetInterface(
|
||||
- osdd_handler.BindNewPipeAndPassReceiver());
|
||||
- osdd_handler->PageHasOpenSearchDescriptionDocument(
|
||||
- frame->GetDocument().Url(), osdd_url);
|
||||
@@ -42,7 +42,7 @@
|
||||
+ if (!osdd_url.is_empty()) {
|
||||
+ mojo::Remote<chrome::mojom::OpenSearchDescriptionDocumentHandler>
|
||||
+ osdd_handler;
|
||||
+ render_frame()->GetBrowserInterfaceBroker()->GetInterface(
|
||||
+ render_frame()->GetBrowserInterfaceBroker().GetInterface(
|
||||
+ osdd_handler.BindNewPipeAndPassReceiver());
|
||||
+ osdd_handler->PageHasOpenSearchDescriptionDocument(
|
||||
+ frame->GetDocument().Url(), osdd_url);
|
||||
@@ -60,7 +60,7 @@
|
||||
#include "base/containers/contains.h"
|
||||
#include "base/containers/flat_map.h"
|
||||
#include "base/debug/crash_logging.h"
|
||||
@@ -210,6 +211,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
|
||||
@@ -209,6 +210,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
|
||||
return TemplateURL(merged_data);
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
} // namespace
|
||||
|
||||
// TemplateURLService::LessWithPrefix -----------------------------------------
|
||||
@@ -392,6 +399,7 @@ TemplateURLService::TemplateURLService(
|
||||
@@ -391,6 +398,7 @@ TemplateURLService::TemplateURLService(
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
)
|
||||
: prefs_(prefs),
|
||||
@@ -81,7 +81,7 @@
|
||||
search_engine_choice_service_(search_engine_choice_service),
|
||||
search_terms_data_(std::move(search_terms_data)),
|
||||
web_data_service_(web_data_service),
|
||||
@@ -530,8 +538,8 @@ bool TemplateURLService::CanAddAutogener
|
||||
@@ -509,8 +517,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(
|
||||
@@ -2071,6 +2079,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
@@ -2049,6 +2057,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
}
|
||||
|
||||
void TemplateURLService::Init() {
|
||||
@@ -101,7 +101,7 @@
|
||||
if (client_)
|
||||
client_->SetOwner(this);
|
||||
|
||||
@@ -2254,6 +2264,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
@@ -2231,6 +2241,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
|
||||
@@ -896,6 +896,8 @@ class TemplateURLService final : public
|
||||
@@ -891,6 +891,8 @@ class TemplateURLService final : public
|
||||
raw_ptr<search_engines::SearchEngineChoiceService>
|
||||
search_engine_choice_service_ = nullptr;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/debug/alias.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/i18n/rtl.h"
|
||||
@@ -688,6 +689,8 @@ void Tab::OnGestureEvent(ui::GestureEven
|
||||
@@ -693,6 +694,8 @@ void Tab::OnGestureEvent(ui::GestureEven
|
||||
}
|
||||
|
||||
std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "base/check.h"
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/containers/adapters.h"
|
||||
@@ -1808,6 +1809,8 @@ void TabStrip::OnMouseEventInTab(views::
|
||||
@@ -1822,6 +1823,8 @@ void TabStrip::OnMouseEventInTab(views::
|
||||
}
|
||||
|
||||
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/browser_command_controller.cc
|
||||
+++ b/chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -1438,7 +1438,8 @@ void BrowserCommandController::InitComma
|
||||
@@ -1432,7 +1432,8 @@ void BrowserCommandController::InitComma
|
||||
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
|
||||
normal_window);
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
@@ -111,7 +112,8 @@ TabStripRegionView::TabStripRegionView(s
|
||||
@@ -112,7 +113,8 @@ TabStripRegionView::TabStripRegionView(s
|
||||
|
||||
// Add and configure the TabSearchContainer.
|
||||
std::unique_ptr<TabSearchContainer> tab_search_container;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/components/flags_ui/flags_state.cc
|
||||
+++ b/components/flags_ui/flags_state.cc
|
||||
@@ -223,6 +223,7 @@ std::string GetCombinedOriginListValue(c
|
||||
@@ -224,6 +224,7 @@ std::string GetCombinedOriginListValue(c
|
||||
const std::string new_value =
|
||||
flags_storage.GetOriginListFlag(internal_entry_name);
|
||||
if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value;
|
||||
@@ -19,7 +19,7 @@
|
||||
return CombineAndSanitizeOriginLists(existing_value, new_value);
|
||||
}
|
||||
|
||||
@@ -462,6 +463,7 @@ void FlagsState::SetOriginListFlag(const
|
||||
@@ -463,6 +464,7 @@ void FlagsState::SetOriginListFlag(const
|
||||
FlagsStorage* flags_storage) {
|
||||
const std::string new_value =
|
||||
internal_name == "custom-ntp" ? value :
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/browser_features.cc
|
||||
+++ b/chrome/browser/browser_features.cc
|
||||
@@ -401,4 +401,5 @@ BASE_FEATURE(kBrowserDynamicCodeDisabled
|
||||
@@ -378,4 +378,5 @@ BASE_FEATURE(kBrowserDynamicCodeDisabled
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
} // namespace features
|
||||
--- a/chrome/browser/browser_features.h
|
||||
+++ b/chrome/browser/browser_features.h
|
||||
@@ -151,6 +151,7 @@ BASE_DECLARE_FEATURE(kWebUsbDeviceDetect
|
||||
@@ -133,6 +133,7 @@ BASE_DECLARE_FEATURE(kWebUsbDeviceDetect
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
BASE_DECLARE_FEATURE(kBrowserDynamicCodeDisabled);
|
||||
#endif
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/containers/adapters.h"
|
||||
#include "base/containers/contains.h"
|
||||
#include "base/containers/flat_map.h"
|
||||
@@ -2022,6 +2023,10 @@ void TabStripModel::CloseTabs(base::span
|
||||
@@ -2063,6 +2064,10 @@ void TabStripModel::CloseTabs(base::span
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -1192,10 +1192,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
@@ -1263,10 +1263,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
return DownloadConfirmationReason::SAVE_AS;
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/containers/flat_set.h"
|
||||
#include "base/feature_list.h"
|
||||
@@ -1319,7 +1320,8 @@ void HistoryBackend::InitImpl(
|
||||
@@ -1320,7 +1321,8 @@ void HistoryBackend::InitImpl(
|
||||
db_->GetStartDate(&first_recorded_time_);
|
||||
|
||||
// Start expiring old stuff.
|
||||
@@ -31,7 +31,7 @@
|
||||
}
|
||||
|
||||
void HistoryBackend::OnMemoryPressure(
|
||||
@@ -1547,6 +1549,8 @@ void HistoryBackend::AddPagesWithDetails
|
||||
@@ -1548,6 +1550,8 @@ void HistoryBackend::AddPagesWithDetails
|
||||
}
|
||||
|
||||
bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const {
|
||||
|
||||
@@ -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
|
||||
@@ -211,7 +211,8 @@ class SSLClientSocketImpl::SSLContext {
|
||||
@@ -210,7 +210,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 */);
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/functional/callback_helpers.h"
|
||||
@@ -36,6 +37,7 @@
|
||||
@@ -37,6 +38,7 @@
|
||||
#include "chrome/browser/ui/views/side_panel/side_panel_ui.h"
|
||||
#include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h"
|
||||
#include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/feature_engagement/public/event_constants.h"
|
||||
@@ -534,6 +536,17 @@ void ExtensionsToolbarContainer::AnchorA
|
||||
@@ -535,6 +537,17 @@ void ExtensionsToolbarContainer::AnchorA
|
||||
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
|
||||
anchor_view && anchor_view->GetVisible() ? anchor_view
|
||||
: GetExtensionsButton());
|
||||
@@ -34,7 +34,7 @@
|
||||
widget->Show();
|
||||
}
|
||||
|
||||
@@ -920,6 +933,9 @@ void ExtensionsToolbarContainer::UpdateC
|
||||
@@ -921,6 +934,9 @@ void ExtensionsToolbarContainer::UpdateC
|
||||
}
|
||||
|
||||
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -1953,6 +1953,10 @@ void BrowserView::ExitFullscreen() {
|
||||
@@ -1950,6 +1950,10 @@ void BrowserView::ExitFullscreen() {
|
||||
void BrowserView::UpdateExclusiveAccessBubble(
|
||||
const ExclusiveAccessBubbleParams& params,
|
||||
ExclusiveAccessBubbleHideCallback first_hide_callback) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/tabs/tab.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab.cc
|
||||
@@ -1063,7 +1063,11 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1068,7 +1068,11 @@ void Tab::UpdateIconVisibility() {
|
||||
if (IsActive()) {
|
||||
// Close button is shown on active tabs regardless of the size.
|
||||
showing_close_button_ = true;
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
showing_alert_indicator_ =
|
||||
has_alert_icon && alert_icon_width <= available_width;
|
||||
@@ -1088,6 +1092,8 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1093,6 +1097,8 @@ void Tab::UpdateIconVisibility() {
|
||||
}
|
||||
|
||||
showing_close_button_ = large_enough_for_close_button;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/client_hints/client_hints.cc
|
||||
+++ b/content/browser/client_hints/client_hints.cc
|
||||
@@ -841,6 +841,8 @@ void UpdateNavigationRequestClientUaHead
|
||||
@@ -840,6 +840,8 @@ void UpdateNavigationRequestClientUaHead
|
||||
net::HttpRequestHeaders* headers,
|
||||
const std::optional<GURL>& request_url) {
|
||||
DCHECK(frame_tree_node);
|
||||
@@ -20,7 +20,7 @@
|
||||
if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) {
|
||||
return;
|
||||
}
|
||||
@@ -862,6 +864,8 @@ void AddRequestClientHintsHeaders(
|
||||
@@ -861,6 +863,8 @@ void AddRequestClientHintsHeaders(
|
||||
FrameTreeNode* frame_tree_node,
|
||||
const blink::ParsedPermissionsPolicy& container_policy,
|
||||
const std::optional<GURL>& request_url) {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/containers/adapters.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/functional/callback_helpers.h"
|
||||
@@ -172,6 +173,18 @@ DragOperation GetDropEffect(const ui::Dr
|
||||
@@ -173,6 +174,18 @@ DragOperation GetDropEffect(const ui::Dr
|
||||
return DragOperation::kMove;
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
} // namespace
|
||||
|
||||
BrowserRootView::DropInfo::DropInfo() = default;
|
||||
@@ -184,7 +197,9 @@ BrowserRootView::DropInfo::~DropInfo() {
|
||||
@@ -185,7 +198,9 @@ BrowserRootView::DropInfo::~DropInfo() {
|
||||
|
||||
BrowserRootView::BrowserRootView(BrowserView* browser_view,
|
||||
views::Widget* widget)
|
||||
@@ -38,13 +38,13 @@
|
||||
|
||||
BrowserRootView::~BrowserRootView() {
|
||||
// It's possible to destroy the browser while a drop is active. In this case,
|
||||
@@ -328,7 +343,7 @@ bool BrowserRootView::OnMouseWheel(const
|
||||
@@ -329,7 +344,7 @@ bool BrowserRootView::OnMouseWheel(const
|
||||
|
||||
// Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
|
||||
// disable it if the latter feature is enabled.
|
||||
- if (browser_defaults::kScrollEventChangesTab &&
|
||||
+ if (scroll_event_changes_tab_ &&
|
||||
!base::FeatureList::IsEnabled(features::kScrollableTabStrip)) {
|
||||
!base::FeatureList::IsEnabled(tabs::kScrollableTabStrip)) {
|
||||
// Switch to the left/right tab if the wheel-scroll happens over the
|
||||
// tabstrip, or the empty space beside the tabstrip.
|
||||
--- a/chrome/browser/ui/views/frame/browser_root_view.h
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -467,6 +467,17 @@ void ToolbarView::Init() {
|
||||
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
show_avatar_toolbar_button = !chromeos::IsManagedGuestSession();
|
||||
@@ -483,6 +483,17 @@ void ToolbarView::Init() {
|
||||
browser_->profile()->IsGuestSession() ||
|
||||
browser_->profile()->IsRegularProfile();
|
||||
#endif
|
||||
+
|
||||
+ const std::string sab_value = base::CommandLine::ForCurrentProcess()->
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4132,10 +4132,12 @@ const FeatureEntry::FeatureVariation kAu
|
||||
@@ -4189,10 +4189,12 @@ const FeatureEntry::FeatureVariation
|
||||
#include "chrome/browser/ungoogled_flag_choices.h"
|
||||
#include "chrome/browser/bromite_flag_choices.h"
|
||||
#include "chrome/browser/ungoogled_platform_flag_choices.h"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -155,6 +155,8 @@ static_library("common_lib") {
|
||||
@@ -160,6 +160,8 @@ static_library("common_lib") {
|
||||
"pref_names_util.cc",
|
||||
"pref_names_util.h",
|
||||
"ref_counted_util.h",
|
||||
@@ -28,7 +28,7 @@
|
||||
"search/instant_mojom_traits.h",
|
||||
"search/instant_types.cc",
|
||||
"search/instant_types.h",
|
||||
@@ -267,6 +269,7 @@ static_library("common_lib") {
|
||||
@@ -272,6 +274,7 @@ static_library("common_lib") {
|
||||
"//components/no_state_prefetch/common:mojo_bindings",
|
||||
"//components/page_load_metrics/common:common",
|
||||
"//components/pdf/common:constants",
|
||||
@@ -38,7 +38,7 @@
|
||||
if (is_android || enable_library_cdms) {
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -961,6 +961,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
|
||||
@@ -982,6 +982,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
|
||||
// referrers instead of their ordinary behavior.
|
||||
BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
// on-screen until dismissed, they are instead shown for a very long time.
|
||||
--- a/chrome/common/chrome_features.h
|
||||
+++ b/chrome/common/chrome_features.h
|
||||
@@ -578,6 +578,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
|
||||
@@ -594,6 +594,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
|
||||
|
||||
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers);
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
+#endif // CHROME_COMMON_REFERRER_SANITIZER_H_
|
||||
--- a/chrome/test/chromedriver/BUILD.gn
|
||||
+++ b/chrome/test/chromedriver/BUILD.gn
|
||||
@@ -355,8 +355,7 @@ source_set("lib") {
|
||||
@@ -357,8 +357,7 @@ source_set("lib") {
|
||||
"//base",
|
||||
"//build:branding_buildflags",
|
||||
"//build:chromeos_buildflags",
|
||||
@@ -173,7 +173,7 @@
|
||||
disallowed_extension_deps_ = [
|
||||
# Components should largely not depend on //extensions. Since // extensions
|
||||
# is not a component target and is linked with //chrome, depending on most
|
||||
@@ -851,7 +851,7 @@ test("components_unittests") {
|
||||
@@ -853,7 +853,7 @@ test("components_unittests") {
|
||||
# On other platforms, no components should depend on Chrome.
|
||||
# Since //chrome depends on //extensions, we also only assert_no_deps on
|
||||
# extensions targets for non-lacros builds.
|
||||
@@ -182,7 +182,7 @@
|
||||
assert_no_deps = [ "//chrome/*" ]
|
||||
assert_no_deps += disallowed_extension_deps_
|
||||
}
|
||||
@@ -1137,7 +1137,7 @@ if (use_blink) {
|
||||
@@ -1145,7 +1145,7 @@ if (use_blink) {
|
||||
# dependency. On other platforms, no components should depend on Chrome.
|
||||
# Since //chrome depends on //extensions, we also only assert_no_deps on
|
||||
# extensions targets for non-lacros builds.
|
||||
@@ -193,15 +193,15 @@
|
||||
}
|
||||
--- a/content/browser/renderer_host/navigation_request.cc
|
||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||
@@ -41,6 +41,7 @@
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "build/build_config.h"
|
||||
#include "build/buildflag.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
+#include "chrome/common/referrer_sanitizer.h"
|
||||
#include "components/viz/host/host_frame_sink_manager.h"
|
||||
#include "content/browser/agent_cluster_key.h"
|
||||
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
|
||||
#include "content/browser/browsing_topics/header_util.h"
|
||||
@@ -386,10 +387,10 @@ void AddAdditionalRequestHeaders(
|
||||
@@ -393,10 +394,10 @@ void AddAdditionalRequestHeaders(
|
||||
net::HttpRequestHeaders::kUserAgent,
|
||||
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
|
||||
|
||||
@@ -219,14 +219,14 @@
|
||||
--- a/content/renderer/render_frame_impl.cc
|
||||
+++ b/content/renderer/render_frame_impl.cc
|
||||
@@ -55,6 +55,7 @@
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
#include "cc/base/switches.h"
|
||||
#include "cc/trees/ukm_manager.h"
|
||||
+#include "chrome/common/referrer_sanitizer.h"
|
||||
#include "content/common/associated_interfaces.mojom.h"
|
||||
#include "content/common/content_navigation_policy.h"
|
||||
#include "content/common/content_switches_internal.h"
|
||||
@@ -4547,10 +4548,13 @@ void RenderFrameImpl::WillSendRequestInt
|
||||
@@ -4548,10 +4549,13 @@ void RenderFrameImpl::WillSendRequestInt
|
||||
|
||||
request.SetHasUserGesture(frame_->HasTransientUserActivation());
|
||||
|
||||
@@ -256,7 +256,7 @@
|
||||
"//components/custom_handlers:test_support",
|
||||
--- a/services/network/network_service_network_delegate.cc
|
||||
+++ b/services/network/network_service_network_delegate.cc
|
||||
@@ -12,6 +12,7 @@
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/types/optional_util.h"
|
||||
#include "build/build_config.h"
|
||||
@@ -264,7 +264,7 @@
|
||||
#include "components/domain_reliability/monitor.h"
|
||||
#include "net/base/features.h"
|
||||
#include "net/base/isolation_info.h"
|
||||
@@ -54,9 +55,14 @@ NetworkServiceNetworkDelegate::~NetworkS
|
||||
@@ -57,9 +58,14 @@ NetworkServiceNetworkDelegate::~NetworkS
|
||||
void NetworkServiceNetworkDelegate::MaybeTruncateReferrer(
|
||||
net::URLRequest* const request,
|
||||
const GURL& effective_url) {
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
// https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html.
|
||||
--- a/net/dns/host_resolver_manager.cc
|
||||
+++ b/net/dns/host_resolver_manager.cc
|
||||
@@ -151,11 +151,6 @@ const size_t kMaxHostLength = 4096;
|
||||
@@ -152,11 +152,6 @@ const size_t kMaxHostLength = 4096;
|
||||
// cached.
|
||||
const int kIPv6ProbePeriodMs = 1000;
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
// True if |hostname| ends with either ".local" or ".local.".
|
||||
bool ResemblesMulticastDNSName(std::string_view hostname) {
|
||||
return hostname.ends_with(".local") || hostname.ends_with(".local.");
|
||||
@@ -1429,33 +1424,10 @@ int HostResolverManager::StartIPv6Reacha
|
||||
@@ -1430,33 +1425,10 @@ int HostResolverManager::StartIPv6Reacha
|
||||
return OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
this.$.dialog.close();
|
||||
}
|
||||
|
||||
@@ -185,8 +194,10 @@ export class SettingsSearchEngineEditDia
|
||||
@@ -192,8 +201,10 @@ export class SettingsSearchEngineEditDia
|
||||
this.$.searchEngine,
|
||||
this.$.keyword,
|
||||
this.$.queryUrl,
|
||||
@@ -427,7 +427,7 @@
|
||||
|
||||
--- a/components/search_engines/template_url_service.cc
|
||||
+++ b/components/search_engines/template_url_service.cc
|
||||
@@ -925,7 +925,8 @@ void TemplateURLService::IncrementUsageC
|
||||
@@ -904,7 +904,8 @@ void TemplateURLService::IncrementUsageC
|
||||
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -437,7 +437,7 @@
|
||||
DCHECK(!IsCreatedByExtension(url));
|
||||
DCHECK(!keyword.empty());
|
||||
DCHECK(!search_url.empty());
|
||||
@@ -940,6 +941,7 @@ void TemplateURLService::ResetTemplateUR
|
||||
@@ -919,6 +920,7 @@ void TemplateURLService::ResetTemplateUR
|
||||
data.safe_for_autoreplace = false;
|
||||
data.last_modified = clock_->Now();
|
||||
data.is_active = TemplateURLData::ActiveStatus::kTrue;
|
||||
@@ -447,7 +447,7 @@
|
||||
}
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -319,7 +319,8 @@ class TemplateURLService final : public
|
||||
@@ -314,7 +314,8 @@ class TemplateURLService final : public
|
||||
void ResetTemplateURL(TemplateURL* url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4128,7 +4128,13 @@ const FeatureEntry::FeatureVariation kAu
|
||||
@@ -4185,7 +4185,13 @@ const FeatureEntry::FeatureVariation
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/browser_ui_prefs.cc
|
||||
+++ b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
@@ -103,7 +103,7 @@ void RegisterBrowserUserPrefs(user_prefs
|
||||
@@ -107,7 +107,7 @@ void RegisterBrowserUserPrefs(user_prefs
|
||||
false);
|
||||
#endif
|
||||
registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
|
||||
|
||||
@@ -142,7 +142,7 @@
|
||||
} // namespace download
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -99,7 +99,6 @@ source_set("browser") {
|
||||
@@ -114,7 +114,6 @@ source_set("browser") {
|
||||
"//components/payments/mojom",
|
||||
"//components/power_monitor",
|
||||
"//components/services/filesystem:lib",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/chrome/browser/intranet_redirect_detector.cc
|
||||
+++ b/chrome/browser/intranet_redirect_detector.cc
|
||||
@@ -117,9 +117,7 @@ void IntranetRedirectDetector::FinishSle
|
||||
@@ -118,9 +118,7 @@ void IntranetRedirectDetector::FinishSle
|
||||
simple_loaders_.clear();
|
||||
resulting_origins_.clear();
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/components/optimization_guide/core/optimization_guide_features.cc
|
||||
+++ b/components/optimization_guide/core/optimization_guide_features.cc
|
||||
@@ -54,7 +54,7 @@ BASE_FEATURE(kOptimizationHints,
|
||||
@@ -55,7 +55,7 @@ BASE_FEATURE(kOptimizationHints,
|
||||
// Enables fetching from a remote Optimization Guide Service.
|
||||
BASE_FEATURE(kRemoteOptimizationGuideFetching,
|
||||
"OptimizationHintsFetching",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
|
||||
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
|
||||
@@ -3841,8 +3841,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3835,8 +3835,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
pname, IdentifiabilityBenignStringToken(
|
||||
String(ContextGL()->GetString(GL_RENDERER))));
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
}
|
||||
SynthesizeGLError(
|
||||
GL_INVALID_ENUM, "getParameter",
|
||||
@@ -3856,8 +3855,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3850,8 +3849,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
pname, IdentifiabilityBenignStringToken(
|
||||
String(ContextGL()->GetString(GL_VENDOR))));
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -1843,7 +1843,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
|
||||
@@ -1834,7 +1834,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
|
||||
// crbug.com/988956.
|
||||
BASE_FEATURE(kPrefetchPrivacyChanges,
|
||||
"PrefetchPrivacyChanges",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/browser_commands.cc
|
||||
+++ b/chrome/browser/ui/browser_commands.cc
|
||||
@@ -557,11 +557,6 @@ int GetContentRestrictions(const Browser
|
||||
@@ -554,11 +554,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;
|
||||
}
|
||||
@@ -1712,8 +1707,7 @@ bool CanSavePage(const Browser* browser)
|
||||
@@ -1717,8 +1712,7 @@ bool CanSavePage(const Browser* browser)
|
||||
DownloadPrefs::DownloadRestriction::ALL_FILES) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -200,12 +200,10 @@ TabStripRegionView::TabStripRegionView(s
|
||||
@@ -201,12 +201,10 @@ TabStripRegionView::TabStripRegionView(s
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
|
||||
// switch of lacros-chrome is complete.
|
||||
@@ -15,7 +15,7 @@
|
||||
reserved_grab_handle_space_ =
|
||||
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
@@ -2041,8 +2041,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
@@ -2059,8 +2059,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 "
|
||||
@@ -2053,7 +2051,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
@@ -2071,7 +2069,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
if (!clipboard_text.empty()) {
|
||||
controller_->CreateNewTabWithLocation(clipboard_text);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_browser_main.cc
|
||||
+++ b/chrome/browser/chrome_browser_main.cc
|
||||
@@ -1098,6 +1098,7 @@ int ChromeBrowserMainParts::PreCreateThr
|
||||
@@ -1106,6 +1106,7 @@ int ChromeBrowserMainParts::PreCreateThr
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
|
||||
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
|
||||
#include "chrome/browser/ui/webui/version/version_ui.h"
|
||||
@@ -793,6 +794,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
|
||||
@@ -774,6 +775,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
|
||||
return &NewWebUI<privacy_sandbox_internals::PrivacySandboxInternalsUI>;
|
||||
}
|
||||
|
||||
@@ -169,11 +169,11 @@
|
||||
+#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
|
||||
--- a/chrome/common/webui_url_constants.cc
|
||||
+++ b/chrome/common/webui_url_constants.cc
|
||||
@@ -677,6 +677,7 @@ const char kExtensionConfigureCommandsSu
|
||||
// Add hosts here to be included in chrome://chrome-urls (about:about).
|
||||
@@ -75,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view
|
||||
// These hosts will also be suggested by BuiltinProvider.
|
||||
const char* const kChromeHostURLs[] = {
|
||||
+ "ungoogled-first-run",
|
||||
kChromeUIAboutHost,
|
||||
kChromeUIAccessibilityHost,
|
||||
base::span<const base::cstring_view> ChromeURLHosts() {
|
||||
static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({
|
||||
+ "ungoogled-first-run",
|
||||
kChromeUIAboutHost,
|
||||
kChromeUIAccessibilityHost,
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/components/flags_ui/flags_state.cc
|
||||
+++ b/components/flags_ui/flags_state.cc
|
||||
@@ -24,6 +24,7 @@
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/values.h"
|
||||
#include "build/build_config.h"
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "components/flags_ui/feature_entry.h"
|
||||
#include "components/flags_ui/flags_storage.h"
|
||||
#include "components/flags_ui/flags_ui_switches.h"
|
||||
@@ -653,13 +654,17 @@ void FlagsState::GetFlagFeatureEntries(
|
||||
@@ -654,13 +655,17 @@ void FlagsState::GetFlagFeatureEntries(
|
||||
int current_platform = GetCurrentPlatform();
|
||||
|
||||
for (const FeatureEntry& entry : feature_entries_) {
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
base::Value::List supported_platforms;
|
||||
AddOsStrings(entry.supported_platforms, &supported_platforms);
|
||||
@@ -1063,6 +1068,7 @@ bool FlagsState::IsSupportedFeature(cons
|
||||
@@ -1064,6 +1069,7 @@ bool FlagsState::IsSupportedFeature(cons
|
||||
if (!entry.InternalNameMatches(name))
|
||||
continue;
|
||||
if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#
|
||||
--- a/components/omnibox/common/omnibox_features.cc
|
||||
+++ b/components/omnibox/common/omnibox_features.cc
|
||||
@@ -520,7 +520,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
|
||||
@@ -521,7 +521,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
|
||||
// Enables additional site search providers for the Site search Starter Pack.
|
||||
BASE_FEATURE(kStarterPackExpansion,
|
||||
"StarterPackExpansion",
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
--- a/chrome/browser/resources/extensions/item_list.html
|
||||
+++ b/chrome/browser/resources/extensions/item_list.html
|
||||
@@ -114,13 +114,6 @@
|
||||
@@ -115,13 +115,6 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -49,24 +49,22 @@
|
||||
shownAppsCount_, shownExtensionsCount_, apps, extensions)]]">
|
||||
--- a/chrome/browser/resources/extensions/sidebar.html
|
||||
+++ b/chrome/browser/resources/extensions/sidebar.html
|
||||
@@ -71,14 +71,3 @@
|
||||
@@ -74,12 +74,3 @@ cr-shared-style">
|
||||
<cr-ripple></cr-ripple>
|
||||
</a>
|
||||
</iron-selector>
|
||||
-<div>
|
||||
- <div class="separator"></div>
|
||||
- <div class="cr-nav-menu-item" id="moreExtensions">
|
||||
- <iron-icon id="web-store-icon" icon="extensions-icons:web_store">
|
||||
- </iron-icon>
|
||||
- <span id="discover-more-text" class="cr-secondary-text"
|
||||
- on-click="onMoreExtensionsClick_"
|
||||
- inner-h-t-m-l="[[discoverMoreText_]]"></span>
|
||||
- <cr-ripple></cr-ripple>
|
||||
- </div>
|
||||
</cr-menu-selector>
|
||||
-<div class="separator"></div>
|
||||
-<div class="cr-nav-menu-item" id="moreExtensions">
|
||||
- <iron-icon id="web-store-icon" icon="extensions-icons:web_store">
|
||||
- </iron-icon>
|
||||
- <span id="discover-more-text" class="cr-secondary-text"
|
||||
- on-click="onMoreExtensionsClick_"
|
||||
- inner-h-t-m-l="[[discoverMoreText_]]"></span>
|
||||
- <cr-ripple></cr-ripple>
|
||||
-</div>
|
||||
--- a/chrome/browser/resources/extensions/sidebar.ts
|
||||
+++ b/chrome/browser/resources/extensions/sidebar.ts
|
||||
@@ -50,21 +50,11 @@ export class ExtensionsSidebarElement ex
|
||||
@@ -51,21 +51,11 @@ export class ExtensionsSidebarElement ex
|
||||
* displayed.
|
||||
*/
|
||||
selectedPath_: String,
|
||||
@@ -88,14 +86,14 @@
|
||||
|
||||
/**
|
||||
* The ID of the listener on |navigation|. Stored so that the
|
||||
@@ -120,13 +110,6 @@ export class ExtensionsSidebarElement ex
|
||||
@@ -121,13 +111,6 @@ export class ExtensionsSidebarElement ex
|
||||
}
|
||||
}
|
||||
|
||||
- private computeDiscoverMoreText_(): TrustedHTML {
|
||||
- return this.i18nAdvanced('sidebarDiscoverMore', {
|
||||
- tags: ['a'],
|
||||
- attrs: ['target', 'on-click'],
|
||||
- attrs: ['target'],
|
||||
- substitutions: [loadTimeData.getString('getMoreExtensionsUrl')],
|
||||
- });
|
||||
- }
|
||||
@@ -187,16 +185,17 @@
|
||||
<cr-link-row class="hr" id="reportIssue" on-click="onReportIssueClick_"
|
||||
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
|
||||
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
|
||||
@@ -35,11 +35,11 @@
|
||||
@@ -41,12 +41,11 @@
|
||||
<settings-animated-pages id="pages" section="appearance"
|
||||
focus-config="[[focusConfig_]]">
|
||||
<div route-path="default">
|
||||
- <div class="settings-row first" id="themeRow"
|
||||
+ <div class="cr-row first" id="themeRow"
|
||||
hidden="[[!pageVisibility.setTheme]]">
|
||||
- <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
|
||||
- <cr-link-row id="openTheme" class="first"
|
||||
- hidden="[[!pageVisibility.setTheme]]"
|
||||
- label="$i18n{themes}" sub-label="[[themeSublabel_]]"
|
||||
- on-click="openThemeUrl_" external></cr-link-row>
|
||||
- on-click="onThemeClick_" external></cr-link-row>
|
||||
+ <div class="flex cr-padded-text">
|
||||
+ <div>$i18n{themes}</div><div class="secondary">[[themeSublabel_]]</div>
|
||||
+ </div>
|
||||
@@ -205,29 +204,15 @@
|
||||
<div class="separator"></div>
|
||||
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
@@ -475,8 +475,8 @@ export class SettingsAppearancePageEleme
|
||||
@@ -527,7 +527,7 @@ export class SettingsAppearancePageEleme
|
||||
this.themeSublabel_ = '';
|
||||
return;
|
||||
}
|
||||
|
||||
- let i18nId;
|
||||
// <if expr="is_linux">
|
||||
+ let i18nId;
|
||||
switch (this.systemTheme_) {
|
||||
case SystemTheme.GTK:
|
||||
i18nId = 'gtkTheme';
|
||||
@@ -488,11 +488,8 @@ export class SettingsAppearancePageEleme
|
||||
i18nId = 'classicTheme';
|
||||
break;
|
||||
}
|
||||
- // </if>
|
||||
- // <if expr="not is_linux">
|
||||
- i18nId = 'chooseFromWebStore';
|
||||
- // </if>
|
||||
+ i18nId = '';
|
||||
// </if>
|
||||
this.themeSublabel_ = this.i18n(i18nId);
|
||||
+ // </if>
|
||||
}
|
||||
|
||||
/** @return Whether applied theme is set by policy. */
|
||||
--- a/chrome/browser/resources/settings/autofill_page/payments_section.html
|
||||
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
|
||||
@@ -80,11 +80,6 @@
|
||||
@@ -272,7 +257,7 @@
|
||||
import '../privacy_page/privacy_page.js';
|
||||
import '../safety_check_page/safety_check_page.js';
|
||||
import '../safety_hub/safety_hub_entry_point.js';
|
||||
@@ -258,7 +257,6 @@ export class SettingsBasicPageElement ex
|
||||
@@ -259,7 +258,6 @@ export class SettingsBasicPageElement ex
|
||||
this.showPrivacyGuidePromo_ = false;
|
||||
return;
|
||||
}
|
||||
@@ -288,7 +273,7 @@
|
||||
|
||||
-<if expr="not is_chromeos">
|
||||
+<if expr="False">
|
||||
<div id="chromeSigninUserChoiceSetting" class="hr cr-row"
|
||||
<div id="chromeSigninUserChoiceSetting" class="hr cr-row" role="group"
|
||||
hidden="[[!chromeSigninUserChoiceInfo_.shouldShowSettings]]"
|
||||
aria-label="$i18n{chromeSigninChoiceTitle}">
|
||||
@@ -91,12 +91,6 @@
|
||||
@@ -337,7 +322,7 @@
|
||||
start-icon="settings:visibility-off"
|
||||
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
|
||||
@@ -214,9 +214,3 @@
|
||||
@@ -213,9 +213,3 @@
|
||||
</cr-link-row>
|
||||
</if>
|
||||
|
||||
@@ -384,7 +369,7 @@
|
||||
void RecentTabsSubMenuModel::BuildLocalEntries() {
|
||||
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
@@ -861,16 +861,6 @@ void ExtensionsMenuModel::Build(Browser*
|
||||
@@ -909,16 +909,6 @@ void ExtensionsMenuModel::Build(Browser*
|
||||
SetElementIdentifierAt(
|
||||
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
|
||||
kManageExtensionsMenuItem);
|
||||
@@ -419,19 +404,21 @@
|
||||
chrome::BookmarkFolderIconType::kNormal, ui::kColorMenuIcon);
|
||||
--- 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
|
||||
@@ -136,12 +136,7 @@ void CookieControlsContentView::SetEnfor
|
||||
@@ -217,14 +217,7 @@ void CookieControlsContentView::SetEnfor
|
||||
}
|
||||
|
||||
void CookieControlsContentView::SetFeedbackSectionVisibility(bool visible) {
|
||||
- if (visible && base::FeatureList::IsEnabled(
|
||||
- content_settings::features::kUserBypassFeedback)) {
|
||||
- feedback_section_->SetVisible(true);
|
||||
- // Ensure that the feedback row is always below ACT feature rows.
|
||||
- ReorderChildView(feedback_section_, children().size());
|
||||
- } else {
|
||||
feedback_section_->SetVisible(false);
|
||||
- }
|
||||
PreferredSizeChanged();
|
||||
}
|
||||
|
||||
void CookieControlsContentView::AddDescriptionRow() {
|
||||
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
@@ -188,6 +188,7 @@ void ProfileMenuView::BuildMenu() {
|
||||
@@ -442,7 +429,7 @@
|
||||
Profile* profile = browser()->profile();
|
||||
if (profile->IsOffTheRecord() || profile->IsGuestSession())
|
||||
return gfx::ImageSkia();
|
||||
@@ -576,12 +577,6 @@ void ProfileMenuView::BuildIdentity() {
|
||||
@@ -567,12 +568,6 @@ void ProfileMenuView::BuildIdentity() {
|
||||
badge_image_model, menu_title_, menu_subtitle_, management_label);
|
||||
} else {
|
||||
std::string profile_user_display_name, profile_user_email;
|
||||
@@ -492,7 +479,7 @@
|
||||
// Specify the maximum message and title width explicitly.
|
||||
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
|
||||
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
|
||||
@@ -638,17 +638,6 @@ void MaybeRegisterChromeFeaturePromos(
|
||||
@@ -637,17 +637,6 @@ void MaybeRegisterChromeFeaturePromos(
|
||||
"Triggered to encourage users to try out the reading "
|
||||
"mode feature.")));
|
||||
|
||||
@@ -512,7 +499,7 @@
|
||||
registry.RegisterFeature(std::move(
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -3342,7 +3342,7 @@ void AddSiteSettingsStrings(content::Web
|
||||
@@ -3380,7 +3380,7 @@ void AddSiteSettingsStrings(content::Web
|
||||
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
|
||||
|
||||
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
|
||||
@@ -534,7 +521,7 @@
|
||||
// getDisplayMedia captures. Note: This flag does not control if the "Share this
|
||||
--- a/ui/views/controls/menu/menu_item_view.cc
|
||||
+++ b/ui/views/controls/menu/menu_item_view.cc
|
||||
@@ -823,7 +823,7 @@ void MenuItemView::SetAlerted() {
|
||||
@@ -837,7 +837,7 @@ void MenuItemView::SetAlerted() {
|
||||
}
|
||||
|
||||
bool MenuItemView::ShouldShowNewBadge() const {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -941,6 +941,7 @@ source_set("extensions") {
|
||||
@@ -942,6 +942,7 @@ source_set("extensions") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser/web_ui:web_ui",
|
||||
@@ -8,9 +8,19 @@
|
||||
"//components/safe_browsing/core/browser/db:database_manager",
|
||||
"//components/safe_browsing/core/common",
|
||||
"//components/safe_browsing/core/common:safe_browsing_prefs",
|
||||
--- a/chrome/browser/ui/browser_commands.cc
|
||||
+++ b/chrome/browser/ui/browser_commands.cc
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "chrome/browser/ui/browser_commands.h"
|
||||
|
||||
#include <memory>
|
||||
+#include <numeric>
|
||||
#include <optional>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -596,6 +596,7 @@ static_library("url_constants") {
|
||||
@@ -603,6 +603,7 @@ static_library("url_constants") {
|
||||
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
|
||||
"//components/password_manager/content/common",
|
||||
"//components/safe_browsing/core/common",
|
||||
@@ -20,15 +30,15 @@
|
||||
}
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -72,6 +72,7 @@ source_set("browser") {
|
||||
@@ -88,6 +88,7 @@ source_set("browser") {
|
||||
"//cc/animation",
|
||||
"//cc/mojo_embedder",
|
||||
"//cc/paint",
|
||||
+ "//chrome/common:buildflags",
|
||||
"//components/attribution_reporting:data_host_mojom",
|
||||
"//components/attribution_reporting:mojom",
|
||||
"//components/back_forward_cache:enum",
|
||||
"//components/browsing_topics/common:common",
|
||||
@@ -83,6 +84,7 @@ source_set("browser") {
|
||||
@@ -100,6 +101,7 @@ source_set("browser") {
|
||||
"//components/file_access",
|
||||
"//components/filename_generation",
|
||||
"//components/input",
|
||||
@@ -36,6 +46,16 @@
|
||||
"//components/link_header_util",
|
||||
"//components/metrics",
|
||||
"//components/metrics:single_sample_metrics",
|
||||
--- a/pdf/pdfium/pdfium_engine_exports.h
|
||||
+++ b/pdf/pdfium/pdfium_engine_exports.h
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "build/build_config.h"
|
||||
#include "pdf/document_metadata.h"
|
||||
#include "services/screen_ai/buildflags/buildflags.h"
|
||||
+#include "ui/gfx/geometry/rect.h"
|
||||
#include "ui/gfx/geometry/size_f.h"
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
--- a/services/passage_embeddings/BUILD.gn
|
||||
+++ b/services/passage_embeddings/BUILD.gn
|
||||
@@ -31,6 +31,7 @@ source_set("passage_embeddings") {
|
||||
|
||||
134
pruning.list
134
pruning.list
@@ -110,6 +110,8 @@ chrome/updater/test/data/ChromiumMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.2.0.
|
||||
chrome/updater/test/data/GoogleMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.1.0.0.0/TestSystemMsiInstaller.msi
|
||||
chrome/updater/test/data/GoogleMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.2.0.0.0/TestSystemMsiInstaller.msi
|
||||
chrome/updater/test/data/ProcmonConfiguration.pmc
|
||||
chrome/updater/test/data/enterprise/win/google/test_gold.adml
|
||||
chrome/updater/test/data/enterprise/win/google/test_gold.admx
|
||||
chrome/updater/test/data/selfupdate_test_key.der
|
||||
chrome/updater/test/data/signed.exe
|
||||
chrome/updater/test/data/signed.exe.gz
|
||||
@@ -206,6 +208,7 @@ components/domain_reliability/baked_in_configs/www_google_com.json
|
||||
components/media_router/common/providers/cast/channel/fuzz_corpus/cast_message0
|
||||
components/media_router/common/providers/cast/channel/fuzz_corpus/cast_message1
|
||||
components/media_router/common/providers/cast/channel/fuzz_corpus/cast_message2
|
||||
components/privacy_sandbox/privacy_sandbox_attestations/preload/privacy-sandbox-attestations.dat
|
||||
components/safe_browsing/content/resources/empty_file_type_policy.pb
|
||||
components/safe_browsing/core/common/safe_browsing_prefs.cc
|
||||
components/safe_browsing/core/common/safe_browsing_prefs.h
|
||||
@@ -215,7 +218,8 @@ components/signin/public/base/signin_pref_names.h
|
||||
components/test/data/ad_tagging/allow.zip
|
||||
components/test/data/ad_tagging/bear-320x240-video-only.webm
|
||||
components/test/data/ad_tagging/disallow.zip
|
||||
components/test/data/autofill/ml_model/autofill_model-br-overfit.tflite
|
||||
components/test/data/autofill/ml_model/autofill_model-fold-one.tflite
|
||||
components/test/data/autofill/ml_model/autofill_model_metadata.binarypb
|
||||
components/test/data/browsing_topics/golden_data_model.tflite
|
||||
components/test/data/crx_file/sample.zip
|
||||
components/test/data/crx_file/unsigned.crx3
|
||||
@@ -331,6 +335,7 @@ components/test/data/web_package/simple_b2.wbn
|
||||
components/test/data/web_package/simple_b2_signed.swbn
|
||||
components/test/data/web_package/simple_b2_signed_ecdsa_p256_sha256.swbn
|
||||
components/test/data/web_package/simple_b2_signed_tampered.swbn
|
||||
components/test/data/web_package/simple_b2_signed_v2.swbn
|
||||
components/test/data/webp_transcode/test_small.tiff
|
||||
components/zucchini/fuzzers/testdata/imposed_ensemble_matcher_fuzzer/seed.asciipb
|
||||
components/zucchini/fuzzers/testdata/new_eventlog_provider.dll
|
||||
@@ -362,6 +367,7 @@ content/browser/indexed_db/fuzzer_corpus/indexed_db_key/string_type
|
||||
content/browser/indexed_db/fuzzer_corpus/indexed_db_key_path/ascii
|
||||
content/browser/indexed_db/fuzzer_corpus/indexed_db_key_path/ascii_utf8_vector
|
||||
content/browser/indexed_db/fuzzer_corpus/indexed_db_key_path/utf8
|
||||
device/fido/enclave/verify/testdata/endorsement.json.sig
|
||||
device/fido/enclave/verify/testdata/test_alternate_pub_key.der
|
||||
device/fido/enclave/verify/testdata/test_pub_key.der
|
||||
device/fido/enclave/verify/testdata/test_signature
|
||||
@@ -381,7 +387,7 @@ ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_1
|
||||
ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_2
|
||||
ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_3
|
||||
ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_4
|
||||
ios/chrome/browser/sessions/session_restoration_web_state_list_observer.mm
|
||||
ios/chrome/browser/sessions/model/session_restoration_web_state_list_observer.mm
|
||||
ios/chrome/browser/ui/omnibox/popup/carousel/omnibox_popup_carousel_control.mm
|
||||
ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.mm
|
||||
ios/chrome/browser/ui/omnibox/popup/row/omnibox_popup_row_content_configuration.mm
|
||||
@@ -55788,6 +55794,7 @@ third_party/android_build_tools/lint/custom_lint.jar
|
||||
third_party/angle/samples/multi_texture/basemap.tga
|
||||
third_party/angle/samples/multi_texture/lightmap.tga
|
||||
third_party/angle/samples/particle_system/smoke.tga
|
||||
third_party/angle/src/tests/capture_tests/expected/CapturedTest_ActiveTextures_ES3_Vulkan.angledata
|
||||
third_party/angle/src/tests/capture_tests/expected/CapturedTest_MultiFrame_ES3_Vulkan.angledata
|
||||
third_party/angle/third_party/glmark2/src/data/models/asteroid-high.3ds
|
||||
third_party/angle/third_party/glmark2/src/data/models/asteroid-low.3ds
|
||||
@@ -55801,6 +55808,7 @@ third_party/anonymous_tokens/src/anonymous_tokens/testdata/strong_rsa_modulus307
|
||||
third_party/anonymous_tokens/src/anonymous_tokens/testdata/strong_rsa_modulus4096_example.binarypb
|
||||
third_party/beto-core/src/nearby/connections/ukey2/ukey2_jni/java/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/beto-core/src/nearby/presence/ldt_np_jni/java/LdtNpJni/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/beto-core/src/nearby/presence/np_java_ffi/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/blink/manual_tests/WebKitSite.webarchive
|
||||
third_party/blink/manual_tests/accessibility/resources/AppletTest.class
|
||||
third_party/blink/manual_tests/plugins/test.swf
|
||||
@@ -60255,7 +60263,15 @@ third_party/boringssl/src/pki/testdata/nist-pkits/crls/requireExplicitPolicy7sub
|
||||
third_party/boringssl/src/pki/testdata/nist-pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl
|
||||
third_party/boringssl/src/pki/testdata/nist-pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl
|
||||
third_party/boringssl/src/pki/testdata/parse_certificate_unittest/v3_certificate_template.pk8
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/google-intermediate1.der
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/google-intermediate2.der
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/google-leaf.der
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/lencr-intermediate-r3.der
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/lencr-leaf.der
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/lencr-root-dst-x3.der
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/lencr-root-x1-cross-signed.der
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/lencr-root-x1.der
|
||||
third_party/boringssl/src/pki/testdata/verify_unittest/mozilla_roots.der
|
||||
third_party/boringssl/src/util/ar/testdata/linux/bar.cc.o
|
||||
third_party/boringssl/src/util/ar/testdata/linux/foo.c.o
|
||||
third_party/boringssl/src/util/ar/testdata/linux/libsample.a
|
||||
@@ -60380,29 +60396,6 @@ third_party/catapult/telemetry/telemetry/internal/testing/screen_3_frames.mov
|
||||
third_party/catapult/telemetry/telemetry/internal/testing/vid.mp4
|
||||
third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/_api_implementation.so
|
||||
third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/pyext/_message.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_AES.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_ARC2.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_ARC4.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_Blowfish.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_CAST.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_DES.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_DES3.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_XOR.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Hash/_MD2.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Hash/_MD4.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Hash/_RIPEMD160.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Hash/_SHA224.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Hash/_SHA256.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Hash/_SHA384.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Hash/_SHA512.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Util/_counter.so
|
||||
third_party/catapult/third_party/google-endpoints/Crypto/Util/strxor.so
|
||||
third_party/catapult/third_party/google-endpoints/setuptools/cli-32.exe
|
||||
third_party/catapult/third_party/google-endpoints/setuptools/cli-64.exe
|
||||
third_party/catapult/third_party/google-endpoints/setuptools/cli.exe
|
||||
third_party/catapult/third_party/google-endpoints/setuptools/gui-32.exe
|
||||
third_party/catapult/third_party/google-endpoints/setuptools/gui-64.exe
|
||||
third_party/catapult/third_party/google-endpoints/setuptools/gui.exe
|
||||
third_party/catapult/third_party/gsutil/gslib/tests/test_data/favicon.ico.gz
|
||||
third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.p12
|
||||
third_party/catapult/third_party/gsutil/gslib/vendored/oauth2client/tests/data/key.json.enc
|
||||
@@ -61189,6 +61182,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-last-cluster-max-duration.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-multiple-frames.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-single-frame.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/enhanced-traces.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/extension-tracks-and-marks.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/fenced-frame-fledge.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/forced-layouts-and-no-gpu.json.gz
|
||||
@@ -61200,6 +61194,11 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/inst
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/interactive-time.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/invalid-animation-events.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/invalidate-style-class-name-change.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/iframe/trace.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/paul/trace.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/progressive-app/trace.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/redirect/trace.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lantern/render-blocking/trace.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-layout-small-recalc.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-profile.cpuprofile.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-recalc-style.json.gz
|
||||
@@ -61219,6 +61218,8 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/mult
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/multiple-top-level-renderers.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/nested-initiators.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/nested-interactions.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/network-requests-initiators.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/network-websocket-messages.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/node-fibonacci-website.cpuprofile.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/non-composited-animation.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/one-second-interaction.json.gz
|
||||
@@ -61248,6 +61249,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/timi
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/two-functions-recursion.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/two-workers.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/user-timings-complex.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/user-timings-details.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/user-timings.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-initial-url.json.gz
|
||||
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-modifications.json.gz
|
||||
@@ -67047,6 +67049,7 @@ third_party/lzma_sdk/google/test_data/compressed_exe.7z
|
||||
third_party/lzma_sdk/google/test_data/empty.7z
|
||||
third_party/lzma_sdk/google/test_data/empty_file.7z
|
||||
third_party/lzma_sdk/google/test_data/encrypted.7z
|
||||
third_party/lzma_sdk/google/test_data/encrypted_header.7z
|
||||
third_party/lzma_sdk/google/test_data/fake_crc_table.7z
|
||||
third_party/lzma_sdk/google/test_data/file_folder_file.7z
|
||||
third_party/lzma_sdk/google/test_data/folder.7z
|
||||
@@ -67175,7 +67178,7 @@ third_party/nasm/travis/test/vmread.bin.t
|
||||
third_party/nasm/travis/test/weirdpaste.bin.t
|
||||
third_party/nasm/travis/test/xcrypt.bin.t
|
||||
third_party/nasm/travis/test/zerobyte.bin.t
|
||||
third_party/node/node_modules.tar.gz
|
||||
third_party/node/node_modules/node_modules.tar.gz
|
||||
third_party/openh264/src/autotest/performanceTest/ios/fruitstrap
|
||||
third_party/openh264/src/autotest/performanceTest/ios/iFileTransfer
|
||||
third_party/openh264/src/res/Adobe_PDF_sample_a_1024x768_50Frms.264
|
||||
@@ -67281,7 +67284,6 @@ third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/comp
|
||||
third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/rtcp_packet_with_no_sender_report.bin
|
||||
third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/sender_report_with_report_block.bin
|
||||
third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/sender_report_without_report_block.bin
|
||||
third_party/openscreen/src/osp/impl/quic/certificates/openscreen.key
|
||||
third_party/openscreen/src/test/data/cast/common/certificate/testsuite/testsuite1.pb
|
||||
third_party/openscreen/src/test/data/cast/receiver/channel/auth_challenge.pb
|
||||
third_party/openscreen/src/test/data/cast/receiver/channel/auth_response.pb
|
||||
@@ -67446,6 +67448,7 @@ third_party/quic_trace/src/examples/example.json.gz
|
||||
third_party/quic_trace/src/examples/example.qtr
|
||||
third_party/r8/custom_d8.jar
|
||||
third_party/r8/custom_r8.jar
|
||||
third_party/rust/chromium_crates_io/vendor/cxx-1.0.124/.cache/clangd/index/cxx.h.8C3971A07B37C20E.idx
|
||||
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/testdata/fowler/dat/basic.dat
|
||||
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
|
||||
third_party/rust/chromium_crates_io/vendor/regex-1.10.5/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
|
||||
@@ -67476,9 +67479,9 @@ third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/sparse
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/sparse/multi_pattern_v2_rev.littleendian.dfa
|
||||
third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.12/tests/fst/xid_continue.fst
|
||||
third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.12/tests/fst/xid_start.fst
|
||||
third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.5/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.5/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.5/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/lib/windows.0.52.0.lib
|
||||
third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/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
|
||||
@@ -67833,6 +67836,41 @@ third_party/tflite/src/tensorflow/cc/saved_model/testdata/x_plus_y_v2_debuginfo/
|
||||
third_party/tflite/src/tensorflow/cc/saved_model/testdata/x_plus_y_v2_debuginfo/variables/variables.index
|
||||
third_party/tflite/src/tensorflow/compiler/aot/codegen_test_o.golden
|
||||
third_party/tflite/src/tensorflow/compiler/jit/tests/opens2s_gnmt_mixed_precision.pbtxt.gz
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/add_with_const_input.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/argmax.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/broadcast_to.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/concat.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/custom_op.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/fc.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/fc_qat.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/gather_nd.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/lstm_calibrated.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/lstm_calibrated2.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/lstm_quantized.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/lstm_quantized2.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/maximum.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/minimum.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/mixed.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/mixed16x8.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/multi_input_add_reshape.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/pack.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/quantized_with_gather.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/resource_vars_calibrated.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/single_avg_pool_min_minus_5_max_plus_5.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/single_conv_no_bias.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/single_conv_weights_min_0_max_plus_10.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/single_conv_weights_min_minus_127_max_plus_127.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/single_softmax_min_minus_5_max_plus_5.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/split.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/svdf_calibrated.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/svdf_quantized.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/transpose.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/unidirectional_sequence_lstm_calibrated.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/unidirectional_sequence_lstm_quantized.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/unpack.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/weight_shared_between_convs.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/quantization/lite/testdata/where.bin
|
||||
third_party/tflite/src/tensorflow/compiler/mlir/lite/sparsity/testdata/sparse_tensor.bin
|
||||
third_party/tflite/src/tensorflow/core/graph/regularization/testdata/bert1/saved_model.pb
|
||||
third_party/tflite/src/tensorflow/core/graph/regularization/testdata/bert2/saved_model.pb
|
||||
third_party/tflite/src/tensorflow/core/ir/importexport/tests/saved_model/savedmodel_v1/saved_model.pb
|
||||
@@ -68150,40 +68188,6 @@ third_party/tflite/src/tensorflow/lite/testdata/while_op_with_forwarding_input.b
|
||||
third_party/tflite/src/tensorflow/lite/testdata/zero_size_constant.bin
|
||||
third_party/tflite/src/tensorflow/lite/toco/logging/testdata/toco_log_after.pb
|
||||
third_party/tflite/src/tensorflow/lite/toco/logging/testdata/toco_log_before.pb
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/add_with_const_input.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/argmax.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/broadcast_to.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/concat.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/custom_op.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/fc.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/fc_qat.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/gather_nd.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/lstm_calibrated.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/lstm_calibrated2.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/lstm_quantized.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/lstm_quantized2.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/maximum.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/minimum.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/mixed.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/mixed16x8.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/multi_input_add_reshape.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/pack.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/quantized_with_gather.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/resource_vars_calibrated.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/single_avg_pool_min_minus_5_max_plus_5.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/single_conv_no_bias.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/single_conv_weights_min_0_max_plus_10.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/single_conv_weights_min_minus_127_max_plus_127.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/single_softmax_min_minus_5_max_plus_5.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/split.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/svdf_calibrated.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/svdf_quantized.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/transpose.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/unidirectional_sequence_lstm_calibrated.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/unidirectional_sequence_lstm_quantized.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/unpack.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/weight_shared_between_convs.bin
|
||||
third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/where.bin
|
||||
third_party/tflite/src/tensorflow/python/checkpoint/testdata/table_legacy_saveable_object.data-00000-of-00001
|
||||
third_party/tflite/src/tensorflow/python/checkpoint/testdata/table_legacy_saveable_object.index
|
||||
third_party/tflite/src/tensorflow/python/compiler/mlir/multi_add.tflite
|
||||
@@ -68761,6 +68765,7 @@ third_party/webrtc/test/fuzzers/corpora/rtp-corpus/rtp-7
|
||||
third_party/webrtc/test/fuzzers/corpora/rtp-corpus/rtp-8
|
||||
third_party/webrtc/test/fuzzers/corpora/rtp-depacketizer-av1-assemble-frame-corpus/av1-assemble-frame-0
|
||||
third_party/webrtc/test/fuzzers/corpora/rtpdump-corpus/vp8/vp8.rtpdump
|
||||
third_party/webrtc/test/fuzzers/corpora/rtpdump-corpus/vp9/b353565743.rtpdump
|
||||
third_party/webrtc/test/fuzzers/corpora/rtpdump-corpus/vp9/vp9.rtpdump
|
||||
third_party/webrtc/test/fuzzers/corpora/sctp-packet-corpus/cookie-ack-sack.bin
|
||||
third_party/webrtc/test/fuzzers/corpora/sctp-packet-corpus/cookie-echo-data-data-data.bin
|
||||
@@ -68927,6 +68932,7 @@ third_party/zstd/src/tests/dict-files/zero-weight-dict
|
||||
third_party/zstd/src/tests/golden-compression/huffman-compressed-larger
|
||||
third_party/zstd/src/tests/golden-compression/large-literal-and-match-lengths
|
||||
third_party/zstd/src/tests/golden-decompression-errors/off0.bin.zst
|
||||
third_party/zstd/src/tests/golden-decompression-errors/truncated_huff_state.zst
|
||||
third_party/zstd/src/tests/golden-decompression-errors/zeroSeq_extraneous.zst
|
||||
third_party/zstd/src/tests/golden-decompression/block-128k.zst
|
||||
third_party/zstd/src/tests/golden-decompression/empty-block.zst
|
||||
|
||||
@@ -140,15 +140,6 @@ def clone(args): # pylint: disable=too-many-branches, too-many-statements
|
||||
|
||||
# Follow tarball procedure:
|
||||
# https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipes/publish_tarball.py
|
||||
get_logger().info('Downloading node modules')
|
||||
run([
|
||||
sys.executable,
|
||||
str(dtpath / 'download_from_google_storage.py'), '--no_resume', '--extract', '--no_auth',
|
||||
'--bucket', 'chromium-nodejs', '-s',
|
||||
str(args.output / 'third_party' / 'node' / 'node_modules.tar.gz.sha1')
|
||||
],
|
||||
check=True)
|
||||
|
||||
get_logger().info('Downloading pgo profiles')
|
||||
run([
|
||||
sys.executable,
|
||||
|
||||
@@ -35,19 +35,20 @@
|
||||
|
||||
if not self._get_option('process_all_deps', False):
|
||||
should_process = should_process and _should_process(condition)
|
||||
@@ -820,6 +822,11 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -820,6 +822,12 @@ class Dependency(gclient_utils.WorkItem,
|
||||
should_process_object = should_process and _should_process(
|
||||
merged_condition)
|
||||
|
||||
+ if not name.startswith("src/build/linux/") or \
|
||||
+ not f"{self._get_option('sysroot', 'None')}-sysroot" in name:
|
||||
+ if name != "src/third_party/node/node_modules" and \
|
||||
+ (not name.startswith("src/build/linux/") or \
|
||||
+ not f"{self._get_option('sysroot', 'None')}-sysroot" in name):
|
||||
+ continue
|
||||
+ should_process_object = True
|
||||
+ merged_condition = 'True'
|
||||
gcs_deps.append(
|
||||
GcsDependency(parent=self,
|
||||
name=name,
|
||||
@@ -929,6 +936,8 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -931,6 +939,8 @@ class Dependency(gclient_utils.WorkItem,
|
||||
|
||||
self._gn_args_from = local_scope.get('gclient_gn_args_from')
|
||||
self._gn_args_file = local_scope.get('gclient_gn_args_file')
|
||||
@@ -56,7 +57,7 @@
|
||||
self._gn_args = local_scope.get('gclient_gn_args', [])
|
||||
# It doesn't make sense to set all of these, since setting gn_args_from
|
||||
# to another DEPS will make gclient ignore any other local gn_args*
|
||||
@@ -3923,6 +3932,7 @@ def CMDsync(parser, args):
|
||||
@@ -3935,6 +3945,7 @@ def CMDsync(parser, args):
|
||||
dest='experiments',
|
||||
default=[],
|
||||
help='Which experiments should be enabled.')
|
||||
|
||||
Reference in New Issue
Block a user