mirror of
https://github.com/morgan9e/helium
synced 2026-04-15 00:44:06 +09:00
Update to Chromium 103.0.5060.53
This commit is contained in:
@@ -1 +1 @@
|
||||
102.0.5005.115
|
||||
103.0.5060.53
|
||||
|
||||
@@ -60,8 +60,6 @@ PRUNING_EXCLUDE_PATTERNS = [
|
||||
# Exclusion for Android
|
||||
'build/android/chromium-debug.keystore',
|
||||
'third_party/icu/android/icudtl.dat',
|
||||
'third_party/icu/android_small/icudtl.dat',
|
||||
'third_party/icu/android_small/icudtl_extra.dat',
|
||||
'third_party/icu/common/icudtb.dat',
|
||||
# Exclusions for safe file extensions
|
||||
'*.avif',
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2214,7 +2214,6 @@ static_library("browser") {
|
||||
@@ -2236,7 +2236,6 @@ static_library("browser") {
|
||||
"//components/reputation/core:proto",
|
||||
"//components/resources",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -8,7 +8,7 @@
|
||||
"//components/safe_browsing/content/browser:safe_browsing_service",
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
@@ -3754,8 +3753,6 @@ static_library("browser") {
|
||||
@@ -3793,8 +3792,6 @@ static_library("browser") {
|
||||
"download/download_commands.h",
|
||||
"download/download_crx_util.cc",
|
||||
"download/download_crx_util.h",
|
||||
@@ -50,16 +50,16 @@
|
||||
#include "chrome/browser/shell_integration.h"
|
||||
#include "chrome/browser/site_isolation/prefs_observer.h"
|
||||
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
|
||||
@@ -394,8 +393,6 @@ void BrowserProcessImpl::StartTearDown()
|
||||
@@ -393,8 +392,6 @@ void BrowserProcessImpl::StartTearDown()
|
||||
|
||||
metrics_services_manager_.reset();
|
||||
intranet_redirect_detector_.reset();
|
||||
- if (safe_browsing_service_.get())
|
||||
- safe_browsing_service()->ShutDown();
|
||||
network_time_tracker_.reset();
|
||||
#if BUILDFLAG(ENABLE_PLUGINS)
|
||||
plugins_resource_service_.reset();
|
||||
@@ -1029,14 +1026,6 @@ StatusTray* BrowserProcessImpl::status_t
|
||||
|
||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -1025,14 +1022,6 @@ StatusTray* BrowserProcessImpl::status_t
|
||||
return status_tray_.get();
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
subresource_filter::RulesetService*
|
||||
BrowserProcessImpl::subresource_filter_ruleset_service() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -1283,26 +1272,6 @@ void BrowserProcessImpl::CreateBackgroun
|
||||
@@ -1273,26 +1262,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
|
||||
@@ -188,7 +188,6 @@ class BrowserProcessImpl : public Browse
|
||||
@@ -180,7 +180,6 @@ class BrowserProcessImpl : public Browse
|
||||
std::unique_ptr<BackgroundModeManager> manager) override;
|
||||
#endif
|
||||
StatusTray* status_tray() override;
|
||||
@@ -111,7 +111,7 @@
|
||||
subresource_filter::RulesetService* subresource_filter_ruleset_service()
|
||||
override;
|
||||
|
||||
@@ -335,9 +334,6 @@ class BrowserProcessImpl : public Browse
|
||||
@@ -327,9 +326,6 @@ class BrowserProcessImpl : public Browse
|
||||
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
|
||||
#endif
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
host_content_settings_map_);
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -959,34 +959,6 @@ void SetApplicationLocaleOnIOThread(cons
|
||||
@@ -962,34 +962,6 @@ void SetApplicationLocaleOnIOThread(cons
|
||||
GetIOThreadApplicationLocale() = locale;
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
|
||||
AppLoadedInTabSource ClassifyAppLoadedInTabSource(
|
||||
@@ -1495,7 +1467,6 @@ void ChromeContentBrowserClient::PostAft
|
||||
@@ -1499,7 +1471,6 @@ void ChromeContentBrowserClient::PostAft
|
||||
InitNetworkContextsParentDirectory();
|
||||
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
@@ -187,7 +187,7 @@
|
||||
}
|
||||
|
||||
bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
|
||||
@@ -4290,14 +4261,9 @@ ChromeContentBrowserClient::CreateThrott
|
||||
@@ -4351,14 +4322,9 @@ ChromeContentBrowserClient::CreateThrott
|
||||
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
|
||||
handle, handle->GetWebContents()->GetBrowserContext()));
|
||||
|
||||
@@ -203,7 +203,7 @@
|
||||
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
|
||||
base::BindOnce(
|
||||
&ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
|
||||
@@ -4332,16 +4298,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
@@ -4393,16 +4359,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
&throttles);
|
||||
#endif
|
||||
|
||||
@@ -245,7 +245,7 @@
|
||||
} // namespace
|
||||
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -430,13 +430,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
|
||||
@@ -438,13 +438,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
|
||||
|
||||
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
|
||||
download_manager_ = dm;
|
||||
@@ -259,7 +259,7 @@
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -790,17 +783,6 @@ void ChromeDownloadManagerDelegate::Choo
|
||||
@@ -797,17 +790,6 @@ void ChromeDownloadManagerDelegate::Choo
|
||||
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
|
||||
base::FilePath* filename,
|
||||
const GURL& source_url) {
|
||||
@@ -297,7 +297,7 @@
|
||||
is_being_revived_(false) {}
|
||||
|
||||
} // namespace
|
||||
@@ -417,13 +417,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
@@ -410,13 +410,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
data->should_prefer_opening_in_browser_ = preference;
|
||||
}
|
||||
|
||||
@@ -314,7 +314,7 @@
|
||||
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
|
||||
data->danger_level_ = danger_level;
|
||||
}
|
||||
@@ -643,9 +643,6 @@ bool DownloadItemModel::IsCommandEnabled
|
||||
@@ -636,9 +636,6 @@ bool DownloadItemModel::IsCommandEnabled
|
||||
// filename. Don't base an "Always open" decision based on it. Also
|
||||
// exclude extensions.
|
||||
return download_->CanOpenDownload() &&
|
||||
@@ -342,7 +342,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -479,10 +472,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
|
||||
@@ -471,10 +464,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
|
||||
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
|
||||
const base::FilePath& file_name) {
|
||||
base::FilePath::StringType extension = file_name.Extension();
|
||||
@@ -369,7 +369,7 @@
|
||||
// If no mime type or explicitly specified a name, don't replace file
|
||||
// extension.
|
||||
if (sniffed_mime_type.empty() || !suggested_filename.empty())
|
||||
@@ -1124,30 +1117,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
@@ -1128,30 +1121,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
download_->HasUserGesture())
|
||||
return DownloadFileType::NOT_DANGEROUS;
|
||||
|
||||
@@ -403,7 +403,7 @@
|
||||
absl::optional<base::Time>
|
||||
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
|
||||
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
|
||||
@@ -36,7 +36,6 @@
|
||||
@@ -35,7 +35,6 @@
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/download/download_core_service.h"
|
||||
#include "chrome/browser/download/download_core_service_factory.h"
|
||||
@@ -411,7 +411,7 @@
|
||||
#include "chrome/browser/download/download_file_icon_extractor.h"
|
||||
#include "chrome/browser/download/download_open_prompt.h"
|
||||
#include "chrome/browser/download/download_prefs.h"
|
||||
@@ -1277,9 +1276,6 @@ DownloadsAcceptDangerFunction::Downloads
|
||||
@@ -1261,9 +1260,6 @@ DownloadsAcceptDangerFunction::Downloads
|
||||
|
||||
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
|
||||
|
||||
@@ -421,7 +421,7 @@
|
||||
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
|
||||
std::unique_ptr<downloads::AcceptDanger::Params> params(
|
||||
downloads::AcceptDanger::Params::Create(args()));
|
||||
@@ -1317,42 +1313,7 @@ void DownloadsAcceptDangerFunction::Prom
|
||||
@@ -1301,42 +1297,7 @@ void DownloadsAcceptDangerFunction::Prom
|
||||
return;
|
||||
}
|
||||
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
|
||||
@@ -694,7 +694,7 @@
|
||||
// SimpleURLLoader -> (owned loader, extension id).
|
||||
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
@@ -861,9 +861,6 @@ void ChromeMetricsServiceClient::Registe
|
||||
@@ -863,9 +863,6 @@ void ChromeMetricsServiceClient::Registe
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<HttpsEngagementMetricsProvider>());
|
||||
|
||||
@@ -718,7 +718,7 @@
|
||||
// static
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -324,7 +324,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -330,7 +330,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
CertDbInitializerFactory::GetInstance();
|
||||
#endif
|
||||
@@ -728,7 +728,7 @@
|
||||
#endif
|
||||
--- a/chrome/browser/profiles/profile_impl.cc
|
||||
+++ b/chrome/browser/profiles/profile_impl.cc
|
||||
@@ -91,7 +91,6 @@
|
||||
@@ -89,7 +89,6 @@
|
||||
#include "chrome/browser/profiles/profile_metrics.h"
|
||||
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
|
||||
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
|
||||
@@ -736,7 +736,7 @@
|
||||
#include "chrome/browser/sessions/exit_type_service.h"
|
||||
#include "chrome/browser/sharing/sharing_service_factory.h"
|
||||
#include "chrome/browser/signin/identity_manager_factory.h"
|
||||
@@ -623,17 +622,6 @@ void ProfileImpl::LoadPrefsForNormalStar
|
||||
@@ -618,17 +617,6 @@ void ProfileImpl::LoadPrefsForNormalStar
|
||||
|
||||
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
|
||||
pref_validation_delegate;
|
||||
@@ -756,7 +756,7 @@
|
||||
CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
|
||||
--- a/chrome/browser/profiles/profiles_state.cc
|
||||
+++ b/chrome/browser/profiles/profiles_state.cc
|
||||
@@ -255,9 +255,6 @@ void RemoveBrowsingDataForProfile(const
|
||||
@@ -256,9 +256,6 @@ void RemoveBrowsingDataForProfile(const
|
||||
// The BrowsingDataRemover relies on many objects that aren't created in unit
|
||||
// tests. Previously this code would depend on content::ResourceDispatcherHost
|
||||
// but that's gone, so do a similar hack for now.
|
||||
@@ -802,7 +802,7 @@
|
||||
source_set("test_support") {
|
||||
--- a/chrome/browser/ssl/security_state_tab_helper.cc
|
||||
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
|
||||
@@ -180,89 +180,6 @@ bool SecurityStateTabHelper::UsedPolicyI
|
||||
@@ -168,89 +168,6 @@ bool SecurityStateTabHelper::UsedPolicyI
|
||||
|
||||
security_state::MaliciousContentStatus
|
||||
SecurityStateTabHelper::GetMaliciousContentStatus() const {
|
||||
@@ -894,7 +894,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -4219,7 +4219,6 @@ static_library("ui") {
|
||||
@@ -4241,7 +4241,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",
|
||||
@@ -904,7 +904,7 @@
|
||||
"views/download/download_item_view.cc",
|
||||
--- a/chrome/browser/ui/tab_helpers.cc
|
||||
+++ b/chrome/browser/ui/tab_helpers.cc
|
||||
@@ -390,22 +390,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
@@ -392,22 +392,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
// See https://crbug.com/910288.
|
||||
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
|
||||
web_contents);
|
||||
@@ -946,8 +946,8 @@
|
||||
- ShowDangerPrompt(file);
|
||||
}
|
||||
|
||||
void DownloadsDOMHandler::AcceptIncognitoWarning(const std::string& id) {
|
||||
@@ -326,12 +322,6 @@ void DownloadsDOMHandler::RemoveDownload
|
||||
void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
|
||||
@@ -320,12 +316,6 @@ void DownloadsDOMHandler::RemoveDownload
|
||||
IdSet ids;
|
||||
|
||||
for (auto* download : to_remove) {
|
||||
@@ -960,7 +960,7 @@
|
||||
DownloadItemModel item_model(download);
|
||||
if (!item_model.ShouldShowInShelf() ||
|
||||
download->GetState() == download::DownloadItem::IN_PROGRESS) {
|
||||
@@ -405,44 +395,6 @@ void DownloadsDOMHandler::FinalizeRemova
|
||||
@@ -399,44 +389,6 @@ void DownloadsDOMHandler::FinalizeRemova
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1015,7 +1015,7 @@
|
||||
#include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h"
|
||||
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
|
||||
#include "content/public/browser/web_contents_observer.h"
|
||||
@@ -95,18 +94,6 @@ class DownloadsDOMHandler : public conte
|
||||
@@ -94,18 +93,6 @@ class DownloadsDOMHandler : public conte
|
||||
// null-checking |original_notifier_|.
|
||||
content::DownloadManager* GetOriginalNotifierManager() const;
|
||||
|
||||
@@ -1188,7 +1188,7 @@
|
||||
html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
|
||||
--- a/chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ b/chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -95,7 +95,6 @@
|
||||
@@ -96,7 +96,6 @@
|
||||
#include "components/paint_preview/buildflags/buildflags.h"
|
||||
#include "components/password_manager/core/common/password_manager_features.h"
|
||||
#include "components/safe_browsing/buildflags.h"
|
||||
@@ -1196,6 +1196,19 @@
|
||||
#include "components/spellcheck/spellcheck_buildflags.h"
|
||||
#include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
|
||||
#include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
|
||||
@@ -424,12 +423,8 @@ void ChromeContentRendererClient::Render
|
||||
subresource_filter_ruleset_dealer_ =
|
||||
std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
|
||||
|
||||
- phishing_model_setter_ =
|
||||
- std::make_unique<safe_browsing::PhishingModelSetterImpl>();
|
||||
-
|
||||
thread->AddObserver(chrome_observer_.get());
|
||||
thread->AddObserver(subresource_filter_ruleset_dealer_.get());
|
||||
- thread->AddObserver(phishing_model_setter_.get());
|
||||
|
||||
thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
|
||||
|
||||
--- a/components/security_interstitials/content/cert_report_helper.cc
|
||||
+++ b/components/security_interstitials/content/cert_report_helper.cc
|
||||
@@ -177,7 +177,6 @@ void CertReportHelper::FinishCertCollect
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/components/autofill/core/browser/autofill_download_manager.cc
|
||||
+++ b/components/autofill/core/browser/autofill_download_manager.cc
|
||||
@@ -802,94 +802,6 @@ std::tuple<GURL, std::string> AutofillDo
|
||||
@@ -801,94 +801,6 @@ std::tuple<GURL, std::string> AutofillDo
|
||||
}
|
||||
|
||||
bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
|
||||
|
||||
@@ -22,25 +22,6 @@
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -503,18 +498,6 @@ void ComponentLoader::AddDefaultComponen
|
||||
AddHangoutServicesExtension();
|
||||
#endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
|
||||
|
||||
- bool install_feedback = enable_background_extensions_during_testing;
|
||||
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
- install_feedback = true;
|
||||
-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
- if (install_feedback) {
|
||||
- AddWithNameAndDescription(
|
||||
- IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")),
|
||||
- l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_APP_TITLE),
|
||||
- // Description string
|
||||
- l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_PAGE_TITLE));
|
||||
- }
|
||||
-
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
if (command_line->HasSwitch(switches::kLoadGuestModeTestExtension)) {
|
||||
base::FilePath path = base::FilePath(command_line->GetSwitchValueASCII(
|
||||
--- a/chrome/browser/extensions/external_component_loader.cc
|
||||
+++ b/chrome/browser/extensions/external_component_loader.cc
|
||||
@@ -30,9 +30,6 @@ ExternalComponentLoader::~ExternalCompon
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
--- a/components/web_resource/web_resource_service.cc
|
||||
+++ b/components/web_resource/web_resource_service.cc
|
||||
@@ -120,44 +120,7 @@ bool WebResourceService::GetFetchSchedul
|
||||
// Initializes the fetching of data from the resource server. Data
|
||||
// load calls OnSimpleLoaderComplete.
|
||||
void WebResourceService::StartFetch() {
|
||||
- // Set to false so that next fetch can be scheduled after this fetch or
|
||||
- // if we receive notification that resource is allowed.
|
||||
- fetch_scheduled_ = false;
|
||||
- // Check whether fetching is allowed.
|
||||
- if (!resource_request_allowed_notifier_->ResourceRequestsAllowed())
|
||||
- return;
|
||||
-
|
||||
- // First, put our next cache load on the MessageLoop.
|
||||
- ScheduleFetch(cache_update_delay_ms_);
|
||||
-
|
||||
- // Set cache update time in preferences.
|
||||
- prefs_->SetString(last_update_time_pref_name_,
|
||||
- base::NumberToString(base::Time::Now().ToDoubleT()));
|
||||
-
|
||||
- // If we are still fetching data, exit.
|
||||
- if (in_fetch_)
|
||||
- return;
|
||||
- in_fetch_ = true;
|
||||
-
|
||||
- GURL web_resource_server =
|
||||
- application_locale_.empty()
|
||||
- ? web_resource_server_
|
||||
- : google_util::AppendGoogleLocaleParam(web_resource_server_,
|
||||
- application_locale_);
|
||||
-
|
||||
- DVLOG(1) << "WebResourceService StartFetch " << web_resource_server;
|
||||
- auto resource_request = std::make_unique<network::ResourceRequest>();
|
||||
- resource_request->url = web_resource_server;
|
||||
- // Do not let url fetcher affect existing state in system context
|
||||
- // (by setting cookies, for example).
|
||||
- resource_request->load_flags = net::LOAD_DISABLE_CACHE;
|
||||
- resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
|
||||
- simple_url_loader_ = network::SimpleURLLoader::Create(
|
||||
- std::move(resource_request), traffic_annotation_);
|
||||
- simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
|
||||
- url_loader_factory_.get(),
|
||||
- base::BindOnce(&WebResourceService::OnSimpleLoaderComplete,
|
||||
- base::Unretained(this)));
|
||||
+ in_fetch_ = false;
|
||||
}
|
||||
|
||||
void WebResourceService::EndFetch() {
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/updater/configurator.cc
|
||||
+++ b/chrome/updater/configurator.cc
|
||||
@@ -91,7 +91,7 @@ int Configurator::UpdateDelay() const {
|
||||
@@ -92,7 +92,7 @@ int Configurator::UpdateDelay() const {
|
||||
}
|
||||
|
||||
std::vector<GURL> Configurator::UpdateUrl() const {
|
||||
|
||||
@@ -343,7 +343,7 @@ by default.
|
||||
// Mime type to create a directory.
|
||||
--- a/components/feedback/feedback_uploader.cc
|
||||
+++ b/components/feedback/feedback_uploader.cc
|
||||
@@ -38,7 +38,7 @@ constexpr base::FilePath::CharType kFeed
|
||||
@@ -37,7 +37,7 @@ constexpr base::FilePath::CharType kFeed
|
||||
FILE_PATH_LITERAL("Feedback Reports");
|
||||
|
||||
constexpr char kFeedbackPostUrl[] =
|
||||
@@ -395,7 +395,7 @@ by default.
|
||||
"http://clientservices.googleapis.com/uma/v2";
|
||||
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
|
||||
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
|
||||
@@ -61,7 +61,7 @@ const int ClientSideDetectionService::kN
|
||||
@@ -63,7 +63,7 @@ const int ClientSideDetectionService::kN
|
||||
const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
|
||||
|
||||
const char ClientSideDetectionService::kClientReportPhishingUrl[] =
|
||||
@@ -425,7 +425,7 @@ by default.
|
||||
+ "trk:238:https://safesearch.googleapis.com/v1:classify";
|
||||
|
||||
std::string BuildResponse(bool is_porn) {
|
||||
base::Value dict(base::Value::Type::DICTIONARY);
|
||||
base::Value::Dict dict;
|
||||
--- a/components/translate/core/browser/translate_url_fetcher.cc
|
||||
+++ b/components/translate/core/browser/translate_url_fetcher.cc
|
||||
@@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const
|
||||
@@ -469,23 +469,23 @@ by default.
|
||||
const char kDownstreamUrl[] = "/down?";
|
||||
const char kUpstreamUrl[] = "/up?";
|
||||
|
||||
--- a/content/browser/webauth/authenticator_common.cc
|
||||
+++ b/content/browser/webauth/authenticator_common.cc
|
||||
@@ -92,9 +92,9 @@ enum class RequestExtension {
|
||||
namespace {
|
||||
--- a/content/browser/webauth/webauth_request_security_checker.h
|
||||
+++ b/content/browser/webauth/webauth_request_security_checker.h
|
||||
@@ -42,9 +42,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
|
||||
// Legacy App IDs, which google.com origins are allowed to assert for
|
||||
// compatibility reasons.
|
||||
static constexpr char kGstaticAppId[] =
|
||||
- "https://www.gstatic.com/securitykey/origins.json";
|
||||
+ "trk:276:https://www.gstatic.com/securitykey/origins.json";
|
||||
static constexpr char kGstaticCorpAppId[] =
|
||||
- "https://www.gstatic.com/securitykey/a/google.com/origins.json";
|
||||
+ "trk:277:https://www.gstatic.com/securitykey/a/google.com/origins.json";
|
||||
|
||||
constexpr char kGstaticAppId[] =
|
||||
- "https://www.gstatic.com/securitykey/origins.json";
|
||||
+ "trk:276:https://www.gstatic.com/securitykey/origins.json";
|
||||
constexpr char kGstaticCorpAppId[] =
|
||||
- "https://www.gstatic.com/securitykey/a/google.com/origins.json";
|
||||
+ "trk:277:https://www.gstatic.com/securitykey/a/google.com/origins.json";
|
||||
|
||||
WebAuthenticationDelegate* GetWebAuthenticationDelegate() {
|
||||
return GetContentClient()->browser()->GetWebAuthenticationDelegate();
|
||||
explicit WebAuthRequestSecurityChecker(RenderFrameHost* host);
|
||||
WebAuthRequestSecurityChecker(const WebAuthRequestSecurityChecker&) = delete;
|
||||
--- a/content/shell/browser/shell_browser_main_parts.cc
|
||||
+++ b/content/shell/browser/shell_browser_main_parts.cc
|
||||
@@ -86,7 +86,7 @@ GURL GetStartupURL() {
|
||||
@@ -85,7 +85,7 @@ GURL GetStartupURL() {
|
||||
#else
|
||||
const base::CommandLine::StringVector& args = command_line->GetArgs();
|
||||
if (args.empty())
|
||||
|
||||
@@ -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
|
||||
@@ -216,6 +216,10 @@ void ClientSideDetectionService::StartCl
|
||||
@@ -207,6 +207,10 @@ void ClientSideDetectionService::StartCl
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
|
||||
// Fill in metadata about which model we used.
|
||||
*request->mutable_population() = delegate_->GetUserPopulation();
|
||||
|
||||
@@ -295,6 +299,7 @@ void ClientSideDetectionService::StartCl
|
||||
@@ -286,6 +290,7 @@ void ClientSideDetectionService::StartCl
|
||||
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
|
||||
base::Unretained(WebUIInfoSingleton::GetInstance()),
|
||||
std::move(request), access_token));
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# chrome://discards/ attempts to use d3 to display the graph
|
||||
--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
|
||||
+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
|
||||
@@ -286,6 +286,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
|
||||
@@ -285,6 +285,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
|
||||
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
|
||||
|
||||
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
|
||||
@@ -65,11 +65,11 @@
|
||||
if (state_ == REQUESTING) {
|
||||
--- a/components/update_client/update_checker.cc
|
||||
+++ b/components/update_client/update_checker.cc
|
||||
@@ -108,6 +108,7 @@ void UpdateCheckerImpl::CheckForUpdates(
|
||||
const IdToComponentPtrMap& components,
|
||||
@@ -97,6 +97,7 @@ void UpdateCheckerImpl::CheckForUpdates(
|
||||
scoped_refptr<UpdateContext> context,
|
||||
const base::flat_map<std::string, std::string>& additional_attributes,
|
||||
UpdateCheckCallback update_check_callback) {
|
||||
+ return;
|
||||
DCHECK(thread_checker_.CalledOnValidThread());
|
||||
|
||||
ids_checked_ = ids_checked;
|
||||
update_check_callback_ = std::move(update_check_callback);
|
||||
|
||||
@@ -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
|
||||
@@ -1004,6 +1004,8 @@ component("net") {
|
||||
@@ -999,6 +999,8 @@ component("net") {
|
||||
"url_request/report_sender.h",
|
||||
"url_request/static_http_user_agent_settings.cc",
|
||||
"url_request/static_http_user_agent_settings.h",
|
||||
@@ -181,7 +181,7 @@
|
||||
#include "net/url_request/url_request_context.h"
|
||||
#include "net/url_request/url_request_context_storage.h"
|
||||
#include "net/url_request/url_request_job_factory.h"
|
||||
@@ -628,6 +629,9 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
@@ -631,6 +632,9 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
}
|
||||
protocol_handlers_.clear();
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/google_apis/gaia/gaia_auth_fetcher.cc
|
||||
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
|
||||
@@ -292,66 +292,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
|
||||
@@ -292,65 +292,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
|
||||
network::mojom::CredentialsMode credentials_mode,
|
||||
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
|
||||
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
|
||||
@@ -16,8 +16,7 @@
|
||||
- DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url(),
|
||||
- gaia_gurl.DeprecatedGetOriginAsURL())
|
||||
- << gaia_gurl;
|
||||
- url::Origin origin =
|
||||
- url::Origin::Create(GaiaUrls::GetInstance()->gaia_url());
|
||||
- url::Origin origin = GaiaUrls::GetInstance()->gaia_origin();
|
||||
- resource_request->site_for_cookies =
|
||||
- net::SiteForCookies::FromOrigin(origin);
|
||||
- resource_request->trusted_params =
|
||||
|
||||
@@ -485,7 +485,7 @@
|
||||
bool IsGoogleHostname(const GURL& url) {
|
||||
--- a/components/search_engines/template_url.cc
|
||||
+++ b/components/search_engines/template_url.cc
|
||||
@@ -532,11 +532,7 @@ std::u16string TemplateURLRef::SearchTer
|
||||
@@ -533,11 +533,7 @@ std::u16string TemplateURLRef::SearchTer
|
||||
bool TemplateURLRef::HasGoogleBaseURLs(
|
||||
const SearchTermsData& search_terms_data) const {
|
||||
ParseIfNecessary(search_terms_data);
|
||||
@@ -578,7 +578,7 @@
|
||||
} // namespace variations
|
||||
--- a/net/base/url_util.cc
|
||||
+++ b/net/base/url_util.cc
|
||||
@@ -455,27 +455,6 @@ bool HasGoogleHost(const GURL& url) {
|
||||
@@ -456,27 +456,6 @@ bool HasGoogleHost(const GURL& url) {
|
||||
}
|
||||
|
||||
bool IsGoogleHost(base::StringPiece host) {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -346,7 +346,6 @@ if (!is_android && !is_mac) {
|
||||
@@ -353,7 +353,6 @@ if (!is_android && !is_mac) {
|
||||
}
|
||||
|
||||
data_deps += [
|
||||
@@ -15,7 +15,7 @@
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
}
|
||||
@@ -1173,7 +1172,6 @@ if (is_win) {
|
||||
@@ -1180,7 +1179,6 @@ if (is_win) {
|
||||
":optimization_guide_library",
|
||||
":swiftshader_library",
|
||||
":widevine_cdm_library",
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2Init, false);
|
||||
--- a/components/privacy_sandbox/privacy_sandbox_settings.cc
|
||||
+++ b/components/privacy_sandbox/privacy_sandbox_settings.cc
|
||||
@@ -339,48 +339,10 @@ std::vector<GURL> PrivacySandboxSettings
|
||||
@@ -351,48 +351,10 @@ bool PrivacySandboxSettings::IsSharedSto
|
||||
}
|
||||
|
||||
bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/chrome_pages.cc
|
||||
+++ b/chrome/browser/ui/chrome_pages.cc
|
||||
@@ -520,32 +520,6 @@ GURL GetOSSettingsUrl(const std::string&
|
||||
@@ -525,32 +525,6 @@ GURL GetOSSettingsUrl(const std::string&
|
||||
void ShowBrowserSignin(Browser* browser,
|
||||
signin_metrics::AccessPoint access_point,
|
||||
signin::ConsentLevel consent_level) {
|
||||
|
||||
@@ -1,26 +1,5 @@
|
||||
# Disable additional URLs that are not caught by the "trk" scheme
|
||||
|
||||
--- a/chrome/browser/plugins/plugins_resource_service.cc
|
||||
+++ b/chrome/browser/plugins/plugins_resource_service.cc
|
||||
@@ -53,9 +53,6 @@ const int kStartResourceFetchDelayMs = 6
|
||||
// Delay between calls to update the cache 1 day and 2 minutes in testing mode.
|
||||
const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
|
||||
|
||||
-const char kPluginsServerUrl[] =
|
||||
- "https://www.gstatic.com/chrome/config/plugins_3/";
|
||||
-
|
||||
GURL GetPluginsServerURL() {
|
||||
std::string filename;
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
@@ -70,7 +67,7 @@ GURL GetPluginsServerURL() {
|
||||
#error Unknown platform
|
||||
#endif
|
||||
|
||||
- return GURL(kPluginsServerUrl + filename);
|
||||
+ return GURL("about:blank");
|
||||
}
|
||||
|
||||
} // namespace
|
||||
--- a/rlz/lib/financial_ping.cc
|
||||
+++ b/rlz/lib/financial_ping.cc
|
||||
@@ -336,7 +336,7 @@ FinancialPing::PingResponse FinancialPin
|
||||
|
||||
@@ -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
|
||||
@@ -555,10 +555,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
@@ -561,10 +561,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
GetOriginsRequiringDedicatedProcess() {
|
||||
std::vector<url::Origin> list;
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
|
||||
bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
|
||||
DCHECK(loader);
|
||||
@@ -377,10 +368,6 @@ void ExtensionDownloader::DoStartAllPend
|
||||
@@ -327,10 +318,6 @@ void ExtensionDownloader::DoStartAllPend
|
||||
}
|
||||
pending_tasks_.clear();
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
}
|
||||
|
||||
void ExtensionDownloader::SetIdentityManager(
|
||||
@@ -401,9 +388,7 @@ void ExtensionDownloader::SetBackoffPoli
|
||||
@@ -351,9 +338,7 @@ void ExtensionDownloader::SetBackoffPoli
|
||||
|
||||
void ExtensionDownloader::UpdateURLStats(const GURL& update_url,
|
||||
Manifest::Type extension_type) {
|
||||
@@ -128,7 +128,7 @@
|
||||
url_stats_.no_url_count++;
|
||||
} else {
|
||||
url_stats_.other_url_count++;
|
||||
@@ -440,11 +425,6 @@ bool ExtensionDownloader::AddExtensionDa
|
||||
@@ -390,11 +375,6 @@ bool ExtensionDownloader::AddExtensionDa
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
// Skip extensions with empty IDs.
|
||||
if (task.id.empty()) {
|
||||
DLOG(WARNING) << "Found extension with empty ID";
|
||||
@@ -455,7 +435,7 @@ bool ExtensionDownloader::AddExtensionDa
|
||||
@@ -405,7 +385,7 @@ bool ExtensionDownloader::AddExtensionDa
|
||||
UpdateURLStats(task.update_url, task.type);
|
||||
if (task.update_url.is_empty()) {
|
||||
// Fill in default update URL.
|
||||
@@ -149,7 +149,7 @@
|
||||
}
|
||||
|
||||
DCHECK(!task.update_url.is_empty());
|
||||
@@ -865,20 +845,6 @@ void ExtensionDownloader::HandleManifest
|
||||
@@ -814,20 +794,6 @@ void ExtensionDownloader::HandleManifest
|
||||
update->info);
|
||||
}
|
||||
|
||||
@@ -170,7 +170,7 @@
|
||||
NotifyExtensionsDownloadStageChanged(
|
||||
no_updates, ExtensionDownloaderDelegate::Stage::FINISHED);
|
||||
NotifyExtensionsDownloadFailed(
|
||||
@@ -1437,11 +1403,7 @@ bool ExtensionDownloader::IterateFetchCr
|
||||
@@ -1385,11 +1351,7 @@ bool ExtensionDownloader::IterateFetchCr
|
||||
// fetch.
|
||||
switch (fetch->credentials) {
|
||||
case ExtensionFetch::CREDENTIALS_NONE:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -332,12 +332,7 @@ const base::Feature kKeepForceInstalledP
|
||||
@@ -326,12 +326,7 @@ const base::Feature kDmTokenDeletion{"Dm
|
||||
// Enable DNS over HTTPS (DoH).
|
||||
const base::Feature kDnsOverHttps {
|
||||
"DnsOverHttps",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/chrome/test/chromedriver/BUILD.gn
|
||||
+++ b/chrome/test/chromedriver/BUILD.gn
|
||||
@@ -335,11 +335,7 @@ source_set("lib") {
|
||||
@@ -333,11 +333,7 @@ source_set("lib") {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
executable("$chromedriver_output") {
|
||||
testonly = true
|
||||
@@ -361,16 +357,6 @@ executable("$chromedriver_output") {
|
||||
@@ -359,16 +355,6 @@ executable("$chromedriver_output") {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -615,8 +615,6 @@ static_library("browser") {
|
||||
@@ -626,8 +626,6 @@ static_library("browser") {
|
||||
"internal_auth.h",
|
||||
"interstitials/chrome_settings_page_helper.cc",
|
||||
"interstitials/chrome_settings_page_helper.h",
|
||||
@@ -11,7 +11,7 @@
|
||||
"invalidation/profile_invalidation_provider_factory.cc",
|
||||
"invalidation/profile_invalidation_provider_factory.h",
|
||||
"language/language_model_manager_factory.cc",
|
||||
@@ -1960,7 +1958,6 @@ static_library("browser") {
|
||||
@@ -1980,7 +1978,6 @@ static_library("browser") {
|
||||
"//chrome/browser/net:probe_message_proto",
|
||||
"//chrome/browser/new_tab_page/modules/drive:mojo_bindings",
|
||||
"//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
|
||||
@@ -19,7 +19,7 @@
|
||||
"//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
|
||||
"//chrome/browser/notifications",
|
||||
"//chrome/browser/notifications/scheduler:factory",
|
||||
@@ -3774,10 +3771,6 @@ static_library("browser") {
|
||||
@@ -3813,10 +3810,6 @@ static_library("browser") {
|
||||
"download/offline_item_model_manager_factory.h",
|
||||
"enterprise/connectors/analysis/analysis_service_settings.cc",
|
||||
"enterprise/connectors/analysis/analysis_service_settings.h",
|
||||
@@ -30,7 +30,7 @@
|
||||
"enterprise/connectors/analysis/content_analysis_dialog.cc",
|
||||
"enterprise/connectors/analysis/content_analysis_dialog.h",
|
||||
"enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
|
||||
@@ -4024,10 +4017,6 @@ static_library("browser") {
|
||||
@@ -4067,10 +4060,6 @@ static_library("browser") {
|
||||
"new_tab_page/modules/photos/photos_service.h",
|
||||
"new_tab_page/modules/photos/photos_service_factory.cc",
|
||||
"new_tab_page/modules/photos/photos_service_factory.h",
|
||||
@@ -41,7 +41,7 @@
|
||||
"new_tab_page/modules/task_module/task_module_handler.cc",
|
||||
"new_tab_page/modules/task_module/task_module_handler.h",
|
||||
"new_tab_page/modules/task_module/task_module_service.cc",
|
||||
@@ -7380,9 +7369,14 @@ static_library("browser") {
|
||||
@@ -7464,9 +7453,14 @@ static_library("browser") {
|
||||
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
|
||||
"//components/safe_browsing/content/browser/download:download_stats",
|
||||
"//components/safe_browsing/content/common:file_type_policies",
|
||||
@@ -73,7 +73,7 @@
|
||||
auto delegate = std::make_unique<AccuracyServiceDelegate>(profile);
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -4298,11 +4298,13 @@ ChromeContentBrowserClient::CreateThrott
|
||||
@@ -4359,11 +4359,13 @@ ChromeContentBrowserClient::CreateThrott
|
||||
&throttles);
|
||||
#endif
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@@ -5699,26 +5701,7 @@ ChromeContentBrowserClient::GetSafeBrows
|
||||
@@ -5760,26 +5762,7 @@ ChromeContentBrowserClient::GetSafeBrows
|
||||
const std::vector<std::string>& allowlist_domains) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
}
|
||||
|
||||
safe_browsing::RealTimeUrlLookupServiceBase*
|
||||
@@ -5739,11 +5722,6 @@ ChromeContentBrowserClient::GetUrlLookup
|
||||
@@ -5800,11 +5783,6 @@ ChromeContentBrowserClient::GetUrlLookup
|
||||
GetForProfile(profile);
|
||||
}
|
||||
#endif
|
||||
@@ -200,16 +200,16 @@
|
||||
--- a/chrome/browser/devtools/devtools_window.cc
|
||||
+++ b/chrome/browser/devtools/devtools_window.cc
|
||||
@@ -70,6 +70,7 @@
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/common/content_client.h"
|
||||
#include "content/public/common/url_constants.h"
|
||||
#include "net/base/escape.h"
|
||||
+#include "net/cert/x509_certificate.h"
|
||||
#include "third_party/blink/public/common/input/web_gesture_event.h"
|
||||
#include "third_party/blink/public/common/input/web_input_event.h"
|
||||
#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
|
||||
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -130,7 +130,6 @@ using content::DownloadManager;
|
||||
@@ -132,7 +132,6 @@ using content::DownloadManager;
|
||||
using download::DownloadItem;
|
||||
using download::DownloadPathReservationTracker;
|
||||
using download::PathValidationResult;
|
||||
@@ -217,16 +217,16 @@
|
||||
using safe_browsing::DownloadProtectionService;
|
||||
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
|
||||
|
||||
@@ -1519,8 +1518,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
||||
@@ -1526,8 +1525,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
||||
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
|
||||
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
|
||||
#endif
|
||||
-
|
||||
- DownloadItemModel(item).SetDangerLevel(target_info->danger_level);
|
||||
}
|
||||
if (ShouldBlockFile(target_info->danger_type, item)) {
|
||||
if (ShouldBlockFile(target_info->danger_type)) {
|
||||
MaybeReportDangerousDownloadBlocked(
|
||||
@@ -1655,7 +1652,6 @@ void ChromeDownloadManagerDelegate::Mayb
|
||||
@@ -1661,7 +1658,6 @@ void ChromeDownloadManagerDelegate::Mayb
|
||||
service->MaybeSendDangerousDownloadOpenedReport(download,
|
||||
show_download_in_folder);
|
||||
}
|
||||
@@ -234,7 +234,7 @@
|
||||
if (!download->GetAutoOpened()) {
|
||||
download::DownloadContent download_content =
|
||||
download::DownloadContentFromMimeType(download->GetMimeType(), false);
|
||||
@@ -1663,6 +1659,7 @@ void ChromeDownloadManagerDelegate::Mayb
|
||||
@@ -1669,6 +1665,7 @@ void ChromeDownloadManagerDelegate::Mayb
|
||||
download->GetDangerType(), download_content, base::Time::Now(),
|
||||
download->GetEndTime(), show_download_in_folder);
|
||||
}
|
||||
@@ -242,7 +242,7 @@
|
||||
}
|
||||
|
||||
void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
|
||||
@@ -1732,8 +1729,7 @@ void ChromeDownloadManagerDelegate::Chec
|
||||
@@ -1738,8 +1735,7 @@ void ChromeDownloadManagerDelegate::Chec
|
||||
DCHECK(download_item);
|
||||
DCHECK(download_item->IsSavePackageDownload());
|
||||
|
||||
@@ -275,7 +275,7 @@
|
||||
void RecordOpenedDangerousConfirmDialog(
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -877,12 +877,14 @@ void DownloadTargetDeterminer::CheckVisi
|
||||
@@ -881,12 +881,14 @@ void DownloadTargetDeterminer::CheckVisi
|
||||
bool visited_referrer_before) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
|
||||
@@ -290,7 +290,7 @@
|
||||
danger_level_ = GetDangerLevel(
|
||||
visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
|
||||
if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
|
||||
@@ -1122,6 +1124,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
@@ -1126,6 +1128,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
|
||||
absl::optional<base::Time>
|
||||
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
|
||||
@@ -298,7 +298,7 @@
|
||||
safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
|
||||
safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
|
||||
GetProfile());
|
||||
@@ -1130,6 +1133,9 @@ DownloadTargetDeterminer::GetLastDownloa
|
||||
@@ -1134,6 +1137,9 @@ DownloadTargetDeterminer::GetLastDownloa
|
||||
safe_browsing::SafeBrowsingMetricsCollector::
|
||||
EventType::DANGEROUS_DOWNLOAD_BYPASS)
|
||||
: absl::nullopt;
|
||||
@@ -318,9 +318,22 @@
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/enterprise/common/proto/connectors.pb.h"
|
||||
#include "components/policy/core/common/chrome_schema.h"
|
||||
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc
|
||||
@@ -83,10 +83,7 @@ absl::optional<GURL> ContentAnalysisDown
|
||||
}
|
||||
|
||||
bool ContentAnalysisDownloadsDelegate::BypassRequiresJustification() const {
|
||||
- if (!base::FeatureList::IsEnabled(kBypassJustificationEnabled))
|
||||
return false;
|
||||
-
|
||||
- return bypass_justification_required_;
|
||||
}
|
||||
|
||||
std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel()
|
||||
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
|
||||
@@ -461,19 +461,6 @@ absl::optional<std::string> ConnectorsSe
|
||||
@@ -470,19 +470,6 @@ absl::optional<std::string> ConnectorsSe
|
||||
return absl::nullopt;
|
||||
}
|
||||
|
||||
@@ -342,7 +355,7 @@
|
||||
}
|
||||
--- a/chrome/browser/enterprise/connectors/connectors_service.h
|
||||
+++ b/chrome/browser/enterprise/connectors/connectors_service.h
|
||||
@@ -80,12 +80,6 @@ class ConnectorsService : public KeyedSe
|
||||
@@ -83,12 +83,6 @@ class ConnectorsService : public KeyedSe
|
||||
// is no token to use.
|
||||
absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
|
||||
|
||||
@@ -357,18 +370,19 @@
|
||||
// precedence.
|
||||
--- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
|
||||
@@ -41,9 +41,6 @@ void CommonSignalsDecorator::Decorate(Si
|
||||
// Get signals from policy values.
|
||||
signals.set_built_in_dns_client_enabled(
|
||||
@@ -44,10 +44,6 @@ void CommonSignalsDecorator::Decorate(ba
|
||||
signals.Set(
|
||||
device_signals::names::kBuiltInDnsClientEnabled,
|
||||
enterprise_signals::utils::GetBuiltInDnsClientEnabled(local_state_));
|
||||
- signals.set_safe_browsing_protection_level(static_cast<int32_t>(
|
||||
- enterprise_signals::utils::GetSafeBrowsingProtectionLevel(
|
||||
- profile_prefs_)));
|
||||
|
||||
- signals.Set(device_signals::names::kSafeBrowsingProtectionLevel,
|
||||
- static_cast<int32_t>(
|
||||
- enterprise_signals::utils::GetSafeBrowsingProtectionLevel(
|
||||
- profile_prefs_)));
|
||||
absl::optional<bool> third_party_blocking_enabled =
|
||||
enterprise_signals::utils::GetThirdPartyBlockingEnabled(local_state_);
|
||||
@@ -58,15 +55,6 @@ void CommonSignalsDecorator::Decorate(Si
|
||||
signals.set_chrome_cleanup_enabled(chrome_cleanup_enabled.value());
|
||||
if (third_party_blocking_enabled.has_value()) {
|
||||
@@ -62,16 +58,6 @@ void CommonSignalsDecorator::Decorate(ba
|
||||
chrome_cleanup_enabled.value());
|
||||
}
|
||||
|
||||
- absl::optional<safe_browsing::PasswordProtectionTrigger>
|
||||
@@ -376,7 +390,8 @@
|
||||
- enterprise_signals::utils::GetPasswordProtectionWarningTrigger(
|
||||
- profile_prefs_);
|
||||
- if (password_protection_warning_trigger.has_value()) {
|
||||
- signals.set_password_protection_warning_trigger(
|
||||
- signals.Set(
|
||||
- device_signals::names::kPasswordProtectionWarningTrigger,
|
||||
- static_cast<int32_t>(password_protection_warning_trigger.value()));
|
||||
- }
|
||||
-
|
||||
@@ -511,7 +526,7 @@
|
||||
} // namespace utils
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -300,10 +300,6 @@ static_library("extensions") {
|
||||
@@ -302,10 +302,6 @@ static_library("extensions") {
|
||||
"api/runtime/chrome_runtime_api_delegate.h",
|
||||
"api/safe_browsing_private/safe_browsing_private_api.cc",
|
||||
"api/safe_browsing_private/safe_browsing_private_api.h",
|
||||
@@ -522,7 +537,7 @@
|
||||
"api/safe_browsing_private/safe_browsing_util.cc",
|
||||
"api/safe_browsing_private/safe_browsing_util.h",
|
||||
"api/scripting/scripting_api.cc",
|
||||
@@ -638,8 +634,6 @@ static_library("extensions") {
|
||||
@@ -634,8 +630,6 @@ static_library("extensions") {
|
||||
"menu_manager_factory.h",
|
||||
"navigation_observer.cc",
|
||||
"navigation_observer.h",
|
||||
@@ -533,7 +548,7 @@
|
||||
"pending_extension_info.cc",
|
||||
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
@@ -72,17 +72,8 @@ api::enterprise_reporting_private::Conte
|
||||
@@ -85,17 +85,8 @@ api::enterprise_reporting_private::Conte
|
||||
: nullptr;
|
||||
info.os_firewall = ToInfoSettingValue(signals.os_firewall);
|
||||
info.system_dns_servers = std::move(signals.system_dns_servers);
|
||||
@@ -553,7 +568,7 @@
|
||||
|
||||
--- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
|
||||
+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
|
||||
@@ -125,7 +125,6 @@ void EnsureBrowserContextKeyedServiceFac
|
||||
@@ -124,7 +124,6 @@ void EnsureBrowserContextKeyedServiceFac
|
||||
#endif
|
||||
extensions::PreferenceAPI::GetFactoryInstance();
|
||||
extensions::ProcessesAPI::GetFactoryInstance();
|
||||
@@ -563,7 +578,7 @@
|
||||
extensions::SessionStateChangedEventDispatcher::GetFactoryInstance();
|
||||
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
||||
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
||||
@@ -612,51 +612,22 @@ void ChromeExtensionsBrowserClient::Noti
|
||||
@@ -614,51 +614,22 @@ void ChromeExtensionsBrowserClient::Noti
|
||||
content::BrowserContext* context,
|
||||
const ExtensionId& extension_id,
|
||||
const std::string& code) const {
|
||||
@@ -627,7 +642,7 @@
|
||||
#include "chrome/browser/extensions/pending_extension_manager.h"
|
||||
#include "chrome/browser/extensions/permissions_updater.h"
|
||||
#include "chrome/browser/extensions/shared_module_service.h"
|
||||
@@ -207,7 +206,6 @@ void ExtensionService::BlocklistExtensio
|
||||
@@ -208,7 +207,6 @@ void ExtensionService::BlocklistExtensio
|
||||
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
|
||||
extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
|
||||
extension_prefs_);
|
||||
@@ -635,7 +650,7 @@
|
||||
}
|
||||
|
||||
bool ExtensionService::OnExternalExtensionUpdateUrlFound(
|
||||
@@ -370,7 +368,6 @@ ExtensionService::ExtensionService(Profi
|
||||
@@ -371,7 +369,6 @@ ExtensionService::ExtensionService(Profi
|
||||
safe_browsing_verdict_handler_(extension_prefs,
|
||||
ExtensionRegistry::Get(profile),
|
||||
this),
|
||||
@@ -860,7 +875,7 @@
|
||||
#include "chrome/browser/ui/file_system_access_dialogs.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "components/content_settings/core/browser/host_content_settings_map.h"
|
||||
@@ -305,83 +303,6 @@ BindResultCallbackToCurrentSequence(
|
||||
@@ -307,83 +305,6 @@ BindResultCallbackToCurrentSequence(
|
||||
base::SequencedTaskRunnerHandle::Get(), std::move(callback));
|
||||
}
|
||||
|
||||
@@ -944,7 +959,7 @@
|
||||
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
|
||||
return id.empty() ? kDefaultLastPickedDirectoryKey
|
||||
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
|
||||
@@ -1137,28 +1058,6 @@ void ChromeFileSystemAccessPermissionCon
|
||||
@@ -1160,28 +1081,6 @@ void ChromeFileSystemAccessPermissionCon
|
||||
std::move(callback)));
|
||||
}
|
||||
|
||||
@@ -996,7 +1011,7 @@
|
||||
#include "components/url_formatter/elide_url.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/desktop_capture.h"
|
||||
@@ -106,6 +107,7 @@ void DisplayMediaAccessHandler::HandleRe
|
||||
@@ -107,6 +108,7 @@ void DisplayMediaAccessHandler::HandleRe
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1004,7 +1019,7 @@
|
||||
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
|
||||
// warnings until user interaction. If the current page has a delayed warning,
|
||||
// it'll have a user interaction observer attached. Show the warning
|
||||
@@ -121,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe
|
||||
@@ -122,6 +124,7 @@ void DisplayMediaAccessHandler::HandleRe
|
||||
observer->OnDesktopCaptureRequest();
|
||||
return;
|
||||
}
|
||||
@@ -1030,7 +1045,7 @@
|
||||
NotificationHandler::Type::EXTENSION,
|
||||
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
|
||||
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
|
||||
@@ -33,7 +33,6 @@
|
||||
@@ -34,7 +34,6 @@
|
||||
#include "chrome/browser/password_manager/password_scripts_fetcher_factory.h"
|
||||
#include "chrome/browser/password_manager/password_store_factory.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
@@ -1038,7 +1053,7 @@
|
||||
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
|
||||
#include "chrome/browser/signin/identity_manager_factory.h"
|
||||
#include "chrome/browser/sync/sync_service_factory.h"
|
||||
@@ -114,11 +113,11 @@
|
||||
@@ -117,11 +116,11 @@
|
||||
#if BUILDFLAG(FULL_SAFE_BROWSING)
|
||||
#include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
|
||||
#include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
|
||||
@@ -1051,7 +1066,7 @@
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
#include "chrome/browser/android/tab_android.h"
|
||||
@@ -850,6 +849,7 @@ autofill::LanguageCode ChromePasswordMan
|
||||
@@ -875,6 +874,7 @@ autofill::LanguageCode ChromePasswordMan
|
||||
return autofill::LanguageCode();
|
||||
}
|
||||
|
||||
@@ -1059,7 +1074,7 @@
|
||||
safe_browsing::PasswordProtectionService*
|
||||
ChromePasswordManagerClient::GetPasswordProtectionService() const {
|
||||
return safe_browsing::ChromePasswordProtectionService::
|
||||
@@ -885,13 +885,9 @@ void ChromePasswordManagerClient::CheckP
|
||||
@@ -910,13 +910,9 @@ void ChromePasswordManagerClient::CheckP
|
||||
web_contents(), web_contents()->GetLastCommittedURL(), username,
|
||||
password_type, matching_reused_credentials, password_field_exists);
|
||||
}
|
||||
@@ -1074,7 +1089,7 @@
|
||||
}
|
||||
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
@@ -900,36 +896,10 @@ void ChromePasswordManagerClient::MaybeR
|
||||
@@ -925,36 +921,10 @@ void ChromePasswordManagerClient::MaybeR
|
||||
bool is_federated,
|
||||
const url::Origin& federated_origin,
|
||||
const std::u16string& login_user_name) const {
|
||||
@@ -1111,7 +1126,7 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1398,9 +1368,11 @@ void ChromePasswordManagerClient::OnPast
|
||||
@@ -1458,9 +1428,11 @@ void ChromePasswordManagerClient::OnPast
|
||||
}
|
||||
|
||||
was_on_paste_called_ = true;
|
||||
@@ -1124,7 +1139,7 @@
|
||||
|
||||
void ChromePasswordManagerClient::RenderFrameCreated(
|
||||
content::RenderFrameHost* render_frame_host) {
|
||||
@@ -1435,7 +1407,9 @@ void ChromePasswordManagerClient::OnInpu
|
||||
@@ -1495,7 +1467,9 @@ void ChromePasswordManagerClient::OnInpu
|
||||
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
|
||||
OnPaste();
|
||||
} else {
|
||||
@@ -1134,7 +1149,7 @@
|
||||
}
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
}
|
||||
@@ -1474,6 +1448,7 @@ bool ChromePasswordManagerClient::IsPass
|
||||
@@ -1534,6 +1508,7 @@ bool ChromePasswordManagerClient::IsPass
|
||||
is_enabled = false;
|
||||
}
|
||||
|
||||
@@ -1142,7 +1157,7 @@
|
||||
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
|
||||
// warnings until user interaction. If the current page has a delayed warning,
|
||||
// it'll have a user interaction observer attached. Disable password
|
||||
@@ -1484,6 +1459,7 @@ bool ChromePasswordManagerClient::IsPass
|
||||
@@ -1544,6 +1519,7 @@ bool ChromePasswordManagerClient::IsPass
|
||||
observer->OnPasswordSaveOrAutofillDenied();
|
||||
is_enabled = false;
|
||||
}
|
||||
@@ -1152,7 +1167,7 @@
|
||||
password_manager::BrowserSavePasswordProgressLogger logger(
|
||||
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
|
||||
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
|
||||
@@ -216,13 +216,14 @@ class ChromePasswordManagerClient
|
||||
@@ -217,13 +217,14 @@ class ChromePasswordManagerClient
|
||||
void AnnotateNavigationEntry(bool has_password_field) override;
|
||||
autofill::LanguageCode GetPageLanguage() const override;
|
||||
|
||||
@@ -1168,7 +1183,7 @@
|
||||
|
||||
void CheckProtectedPasswordEntry(
|
||||
password_manager::metrics_util::PasswordType reused_password_type,
|
||||
@@ -230,6 +231,7 @@ class ChromePasswordManagerClient
|
||||
@@ -231,6 +232,7 @@ class ChromePasswordManagerClient
|
||||
const std::vector<password_manager::MatchingReusedCredential>&
|
||||
matching_reused_credentials,
|
||||
bool password_field_exists) override;
|
||||
@@ -1296,7 +1311,7 @@
|
||||
}
|
||||
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -92,6 +92,7 @@
|
||||
@@ -91,6 +91,7 @@
|
||||
#include "components/policy/core/common/schema.h"
|
||||
#include "components/policy/policy_constants.h"
|
||||
#include "components/proxy_config/proxy_policy_handler.h"
|
||||
@@ -1304,7 +1319,7 @@
|
||||
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
|
||||
#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
|
||||
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
@@ -1732,8 +1733,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
@@ -1737,8 +1738,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
handlers->AddHandler(
|
||||
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
|
||||
chrome_schema));
|
||||
@@ -1313,7 +1328,7 @@
|
||||
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
|
||||
@@ -1790,13 +1789,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
@@ -1795,13 +1794,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
|
||||
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
|
||||
|
||||
@@ -1329,7 +1344,7 @@
|
||||
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
+++ b/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -248,7 +248,6 @@
|
||||
@@ -253,7 +253,6 @@
|
||||
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
|
||||
#include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
|
||||
#include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
|
||||
@@ -1337,7 +1352,7 @@
|
||||
#include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h"
|
||||
#include "chrome/browser/new_tab_page/promos/promo_service.h"
|
||||
#include "chrome/browser/search/background/ntp_custom_background_service.h"
|
||||
@@ -1386,7 +1385,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
@@ -1373,7 +1372,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
NewTabPageHandler::RegisterProfilePrefs(registry);
|
||||
NewTabPageUI::RegisterProfilePrefs(registry);
|
||||
NewTabUI::RegisterProfilePrefs(registry);
|
||||
@@ -1347,7 +1362,7 @@
|
||||
PinnedTabCodec::RegisterProfilePrefs(registry);
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -536,7 +536,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -543,7 +543,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
SystemExtensionsProviderFactory::GetInstance();
|
||||
#endif
|
||||
TabRestoreServiceFactory::GetInstance();
|
||||
@@ -1357,7 +1372,7 @@
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
--- a/chrome/browser/reputation/reputation_service.cc
|
||||
+++ b/chrome/browser/reputation/reputation_service.cc
|
||||
@@ -120,9 +120,7 @@ void ReputationService::GetReputationSta
|
||||
@@ -119,9 +119,7 @@ void ReputationService::GetReputationSta
|
||||
ReputationCheckCallback callback) {
|
||||
DCHECK(url.SchemeIsHTTPOrHTTPS());
|
||||
|
||||
@@ -1533,7 +1548,7 @@
|
||||
} // namespace
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -546,7 +546,6 @@ static_library("ui") {
|
||||
@@ -551,7 +551,6 @@ static_library("ui") {
|
||||
"//components/renderer_context_menu",
|
||||
"//components/resources",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -1541,7 +1556,7 @@
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
"//components/safe_browsing/core/browser/db:database_manager",
|
||||
@@ -4667,8 +4666,6 @@ static_library("ui") {
|
||||
@@ -4691,8 +4690,6 @@ static_library("ui") {
|
||||
"views/safe_browsing/password_reuse_modal_warning_dialog.h",
|
||||
"views/safe_browsing/prompt_for_scanning_modal_dialog.cc",
|
||||
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
|
||||
@@ -1549,7 +1564,7 @@
|
||||
- "views/safe_browsing/tailored_security_unconsented_modal.h",
|
||||
"views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc",
|
||||
"views/send_tab_to_self/send_tab_to_self_bubble_device_button.h",
|
||||
"views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc",
|
||||
"views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc",
|
||||
--- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
|
||||
+++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -1557,10 +1572,10 @@
|
||||
#include "components/javascript_dialogs/tab_modal_dialog_view.h"
|
||||
#include "components/navigation_metrics/navigation_metrics.h"
|
||||
+#include "components/safe_browsing/buildflags.h"
|
||||
#include "components/ukm/content/source_url_recorder.h"
|
||||
#include "content/public/browser/devtools_agent_host.h"
|
||||
#include "content/public/browser/navigation_handle.h"
|
||||
@@ -36,6 +37,7 @@ JavaScriptTabModalDialogManagerDelegateD
|
||||
#include "content/public/browser/render_frame_host.h"
|
||||
@@ -35,6 +36,7 @@ JavaScriptTabModalDialogManagerDelegateD
|
||||
|
||||
void JavaScriptTabModalDialogManagerDelegateDesktop::WillRunDialog() {
|
||||
BrowserList::AddObserver(this);
|
||||
@@ -1568,7 +1583,7 @@
|
||||
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
|
||||
// warnings until user interaction. If the current page has a delayed warning,
|
||||
// it'll have a user interaction observer attached. Show the warning
|
||||
@@ -46,6 +48,7 @@ void JavaScriptTabModalDialogManagerDele
|
||||
@@ -45,6 +47,7 @@ void JavaScriptTabModalDialogManagerDele
|
||||
if (observer) {
|
||||
observer->OnJavaScriptDialog();
|
||||
}
|
||||
@@ -1649,7 +1664,7 @@
|
||||
}
|
||||
--- a/chrome/browser/ui/views/download/download_item_view.cc
|
||||
+++ b/chrome/browser/ui/views/download/download_item_view.cc
|
||||
@@ -837,9 +837,7 @@ void DownloadItemView::UpdateLabels() {
|
||||
@@ -836,9 +836,7 @@ void DownloadItemView::UpdateLabels() {
|
||||
deep_scanning_label_->SetVisible(mode_ ==
|
||||
download::DownloadItemMode::kDeepScanning);
|
||||
if (deep_scanning_label_->GetVisible()) {
|
||||
@@ -1660,7 +1675,7 @@
|
||||
? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
|
||||
: IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
|
||||
const std::u16string filename = ElidedFilename(*deep_scanning_label_);
|
||||
@@ -886,11 +884,15 @@ void DownloadItemView::UpdateButtons() {
|
||||
@@ -885,11 +883,15 @@ void DownloadItemView::UpdateButtons() {
|
||||
}
|
||||
|
||||
const bool allow_open_during_deep_scan =
|
||||
@@ -1676,7 +1691,7 @@
|
||||
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
|
||||
prompt_to_scan || allow_open_during_deep_scan);
|
||||
|
||||
@@ -1421,7 +1423,9 @@ void DownloadItemView::ShowContextMenuIm
|
||||
@@ -1423,7 +1425,9 @@ void DownloadItemView::ShowContextMenuIm
|
||||
}
|
||||
|
||||
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
|
||||
@@ -1688,7 +1703,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
||||
@@ -367,7 +367,6 @@ void DownloadsDOMHandler::OpenDuringScan
|
||||
@@ -361,7 +361,6 @@ void DownloadsDOMHandler::OpenDuringScan
|
||||
if (download) {
|
||||
DownloadItemModel model(download);
|
||||
model.SetOpenWhenComplete(true);
|
||||
@@ -1698,7 +1713,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
|
||||
@@ -843,12 +843,6 @@ base::Value ManagementUIHandler::GetThre
|
||||
@@ -845,12 +845,6 @@ base::Value ManagementUIHandler::GetThre
|
||||
&info);
|
||||
}
|
||||
|
||||
@@ -1723,7 +1738,7 @@
|
||||
#include "components/safe_browsing/core/browser/db/database_manager.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
|
||||
@@ -198,11 +200,13 @@ void ShareServiceImpl::Share(const std::
|
||||
@@ -200,11 +202,13 @@ void ShareServiceImpl::Share(const std::
|
||||
|
||||
// Check if at least one file is marked by the download protection service
|
||||
// to send a ping to check this file type.
|
||||
@@ -1737,7 +1752,7 @@
|
||||
|
||||
// In the case where the original blob handle was to a native file (of
|
||||
// unknown size), the serialized data does not contain an accurate file
|
||||
@@ -212,6 +216,7 @@ void ShareServiceImpl::Share(const std::
|
||||
@@ -214,6 +218,7 @@ void ShareServiceImpl::Share(const std::
|
||||
}
|
||||
|
||||
DCHECK(!safe_browsing_request_);
|
||||
@@ -1745,7 +1760,7 @@
|
||||
if (should_check_url && g_browser_process->safe_browsing_service()) {
|
||||
safe_browsing_request_.emplace(
|
||||
g_browser_process->safe_browsing_service()->database_manager(),
|
||||
@@ -221,6 +226,7 @@ void ShareServiceImpl::Share(const std::
|
||||
@@ -223,6 +228,7 @@ void ShareServiceImpl::Share(const std::
|
||||
std::move(files), std::move(callback)));
|
||||
return;
|
||||
}
|
||||
@@ -1755,7 +1770,7 @@
|
||||
std::move(callback),
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -1314,7 +1314,6 @@ if (!is_android) {
|
||||
@@ -1333,7 +1333,6 @@ if (!is_android) {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -1763,7 +1778,7 @@
|
||||
"//components/safe_browsing/content/browser:safe_browsing_service",
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
"//components/safe_browsing/content/browser/password_protection:test_support",
|
||||
@@ -5819,7 +5818,6 @@ test("unit_tests") {
|
||||
@@ -5676,7 +5675,6 @@ test("unit_tests") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -1773,7 +1788,7 @@
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
|
||||
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
|
||||
@@ -415,7 +415,7 @@ void ContentPasswordManagerDriver::Check
|
||||
@@ -417,7 +417,7 @@ void ContentPasswordManagerDriver::Check
|
||||
if (!password_manager::bad_message::CheckFrameNotPrerendering(
|
||||
render_frame_host_))
|
||||
return;
|
||||
@@ -1784,7 +1799,7 @@
|
||||
}
|
||||
--- a/components/password_manager/core/browser/password_manager_client.h
|
||||
+++ b/components/password_manager/core/browser/password_manager_client.h
|
||||
@@ -374,11 +374,14 @@ class PasswordManagerClient {
|
||||
@@ -379,11 +379,14 @@ class PasswordManagerClient {
|
||||
// Returns the current best guess as to the page's display language.
|
||||
virtual autofill::LanguageCode GetPageLanguage() const;
|
||||
|
||||
@@ -1800,7 +1815,7 @@
|
||||
// Checks the safe browsing reputation of the webpage when the
|
||||
// user focuses on a username/password field. This is used for reporting
|
||||
// only, and won't trigger a warning.
|
||||
@@ -386,6 +389,7 @@ class PasswordManagerClient {
|
||||
@@ -391,6 +394,7 @@ class PasswordManagerClient {
|
||||
const GURL& frame_url) = 0;
|
||||
#endif
|
||||
|
||||
@@ -1808,7 +1823,7 @@
|
||||
// Checks the safe browsing reputation of the webpage where password reuse
|
||||
// happens. This is called by the PasswordReuseDetectionManager when a
|
||||
// protected password is typed on the wrong domain. This may trigger a
|
||||
@@ -398,6 +402,7 @@ class PasswordManagerClient {
|
||||
@@ -403,6 +407,7 @@ class PasswordManagerClient {
|
||||
const std::string& username,
|
||||
const std::vector<MatchingReusedCredential>& matching_reused_credentials,
|
||||
bool password_field_exists) = 0;
|
||||
@@ -1849,14 +1864,14 @@
|
||||
+# }
|
||||
--- a/components/safe_browsing/content/common/safe_browsing.mojom
|
||||
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
|
||||
@@ -120,7 +120,6 @@ enum PhishingDetectorResult {
|
||||
INVALID_SCORE = 4,
|
||||
@@ -132,7 +132,6 @@ interface PhishingDetector {
|
||||
=> (PhishingDetectorResult result, string request_proto);
|
||||
};
|
||||
|
||||
-[EnableIf=full_safe_browsing]
|
||||
// Interface for setting the CSD model and to start phishing classification.
|
||||
interface PhishingDetector {
|
||||
// A classification model for client-side phishing detection.
|
||||
// Interface for setting a phishing model. This is scoped to an entire
|
||||
// RenderProcess.
|
||||
interface PhishingModelSetter {
|
||||
--- a/components/safe_browsing/core/browser/BUILD.gn
|
||||
+++ b/components/safe_browsing/core/browser/BUILD.gn
|
||||
@@ -11,8 +11,6 @@ source_set("browser") {
|
||||
@@ -1889,7 +1904,7 @@
|
||||
if (sync_observer_) {
|
||||
--- a/content/browser/file_system_access/safe_move_helper.cc
|
||||
+++ b/content/browser/file_system_access/safe_move_helper.cc
|
||||
@@ -154,14 +154,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe
|
||||
@@ -163,14 +163,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1904,7 +1919,7 @@
|
||||
}
|
||||
|
||||
void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) {
|
||||
@@ -181,44 +175,6 @@ void SafeMoveHelper::ComputeHashForSourc
|
||||
@@ -190,44 +184,6 @@ void SafeMoveHelper::ComputeHashForSourc
|
||||
std::move(wrapped_callback), source_url()));
|
||||
}
|
||||
|
||||
@@ -1951,7 +1966,7 @@
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
--- a/content/browser/file_system_access/safe_move_helper.h
|
||||
+++ b/content/browser/file_system_access/safe_move_helper.h
|
||||
@@ -52,9 +52,6 @@ class CONTENT_EXPORT SafeMoveHelper {
|
||||
@@ -53,9 +53,6 @@ class CONTENT_EXPORT SafeMoveHelper {
|
||||
private:
|
||||
SEQUENCE_CHECKER(sequence_checker_);
|
||||
|
||||
@@ -2005,7 +2020,7 @@
|
||||
declare_args() {
|
||||
--- a/weblayer/BUILD.gn
|
||||
+++ b/weblayer/BUILD.gn
|
||||
@@ -462,7 +462,6 @@ source_set("weblayer_lib_base") {
|
||||
@@ -471,7 +471,6 @@ source_set("weblayer_lib_base") {
|
||||
"//components/prefs",
|
||||
"//components/profile_metrics",
|
||||
"//components/safe_browsing/content/browser",
|
||||
|
||||
@@ -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
|
||||
@@ -125,7 +125,7 @@ bool CheckDuplicateEntries(const Transpo
|
||||
@@ -126,7 +126,7 @@ bool CheckDuplicateEntries(const Transpo
|
||||
bool CheckNoopEntries(const TransportSecurityStateEntries& entries) {
|
||||
for (const auto& entry : entries) {
|
||||
if (!entry->force_https && entry->pinset.empty() && !entry->expect_ct) {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// TODO(amalova): Make sure NetworkContextParams is configured correctly when
|
||||
--- a/chrome/app/settings_strings.grdp
|
||||
+++ b/chrome/app/settings_strings.grdp
|
||||
@@ -1842,69 +1842,9 @@
|
||||
@@ -1845,69 +1845,9 @@
|
||||
<message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC_COOKIES_PAGE" desc="On the cookies page, the secondary text next to the checkbox that enables prediction of network actions.">
|
||||
Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites.
|
||||
</message>
|
||||
@@ -224,7 +224,7 @@
|
||||
user_manager::KnownUser known_user(g_browser_process->local_state());
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -236,7 +236,6 @@
|
||||
@@ -237,7 +237,6 @@
|
||||
#include "components/safe_browsing/core/browser/realtime/url_lookup_service.h"
|
||||
#include "components/safe_browsing/core/browser/url_checker_delegate.h"
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
@@ -249,12 +249,12 @@
|
||||
#include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
|
||||
#include "components/safe_browsing/core/common/proto/csd.pb.h"
|
||||
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
#include "components/security_state/core/features.h"
|
||||
#include "components/security_state/core/security_state.h"
|
||||
#include "components/services/quarantine/test_support.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
--- a/chrome/browser/download/download_item_model.cc
|
||||
+++ b/chrome/browser/download/download_item_model.cc
|
||||
@@ -830,6 +830,7 @@ void DownloadItemModel::ExecuteCommand(D
|
||||
@@ -817,6 +817,7 @@ void DownloadItemModel::ExecuteCommand(D
|
||||
DownloadUIModel::ExecuteCommand(download_commands, command);
|
||||
break;
|
||||
case DownloadCommands::DEEP_SCAN:
|
||||
@@ -262,7 +262,7 @@
|
||||
safe_browsing::SafeBrowsingService* sb_service =
|
||||
g_browser_process->safe_browsing_service();
|
||||
if (!sb_service)
|
||||
@@ -855,6 +856,7 @@ void DownloadItemModel::ExecuteCommand(D
|
||||
@@ -842,6 +843,7 @@ void DownloadItemModel::ExecuteCommand(D
|
||||
safe_browsing::DeepScanningRequest::DeepScanTrigger::
|
||||
TRIGGER_APP_PROMPT,
|
||||
safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
|
||||
@@ -306,7 +306,7 @@
|
||||
#include "components/signin/public/base/consent_level.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#include "components/user_prefs/user_prefs.h"
|
||||
@@ -391,8 +390,7 @@ std::string ConnectorsService::GetManage
|
||||
@@ -400,8 +399,7 @@ std::string ConnectorsService::GetManage
|
||||
|
||||
absl::optional<policy::PolicyScope> scope = absl::nullopt;
|
||||
for (const char* scope_pref :
|
||||
@@ -316,7 +316,7 @@
|
||||
ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED),
|
||||
ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY),
|
||||
ConnectorScopePref(AnalysisConnector::PRINT),
|
||||
@@ -444,20 +442,6 @@ std::string ConnectorsService::GetManage
|
||||
@@ -453,20 +451,6 @@ std::string ConnectorsService::GetManage
|
||||
|
||||
absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck()
|
||||
const {
|
||||
@@ -406,7 +406,7 @@
|
||||
class PolicyBlocklistService;
|
||||
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
@@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte
|
||||
@@ -90,45 +90,10 @@ api::enterprise_reporting_private::Conte
|
||||
info.browser_version = std::move(signals.browser_version);
|
||||
info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
|
||||
|
||||
@@ -495,7 +495,7 @@
|
||||
#include "components/spellcheck/browser/pref_names.h"
|
||||
#include "components/translate/core/browser/translate_pref_names.h"
|
||||
#include "extensions/browser/api/content_settings/content_settings_service.h"
|
||||
@@ -110,11 +109,6 @@ const PrefMappingEntry kPrefMapping[] =
|
||||
@@ -114,11 +113,6 @@ const PrefMappingEntry kPrefMapping[] =
|
||||
APIPermissionID::kPrivacy},
|
||||
{"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy,
|
||||
APIPermissionID::kPrivacy},
|
||||
@@ -507,7 +507,7 @@
|
||||
{"searchSuggestEnabled", prefs::kSearchSuggestEnabled,
|
||||
APIPermissionID::kPrivacy, APIPermissionID::kPrivacy},
|
||||
{"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService,
|
||||
@@ -845,18 +839,6 @@ ExtensionFunction::ResponseAction SetPre
|
||||
@@ -1001,18 +995,6 @@ ExtensionFunction::ResponseAction SetPre
|
||||
base::Value(browser_pref_value->GetBool()));
|
||||
}
|
||||
|
||||
@@ -523,10 +523,10 @@
|
||||
- scope, base::Value(false));
|
||||
- }
|
||||
-
|
||||
preference_api->SetExtensionControlledPref(
|
||||
extension_id(), browser_pref, scope,
|
||||
base::Value::FromUniquePtrValue(std::move(browser_pref_value)));
|
||||
@@ -909,18 +891,6 @@ ExtensionFunction::ResponseAction ClearP
|
||||
base::Value val =
|
||||
base::Value::FromUniquePtrValue(std::move(browser_pref_value));
|
||||
|
||||
@@ -1108,17 +1090,6 @@ ExtensionFunction::ResponseAction ClearP
|
||||
PreferenceAPI::Get(browser_context())
|
||||
->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
|
||||
|
||||
@@ -541,10 +541,9 @@
|
||||
- ->RemoveExtensionControlledPref(extension_id(),
|
||||
- prefs::kSafeBrowsingEnhanced, scope);
|
||||
- }
|
||||
-
|
||||
return RespondNow(NoArguments());
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
if (pref_path != crosapi::mojom::PrefPath::kUnknown &&
|
||||
did_just_control_pref) {
|
||||
--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
|
||||
+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
|
||||
@@ -31,7 +31,6 @@
|
||||
@@ -591,7 +590,7 @@
|
||||
#include "components/url_matcher/url_util.h"
|
||||
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
|
||||
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
|
||||
@@ -36,7 +36,6 @@
|
||||
@@ -37,7 +37,6 @@
|
||||
#include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
|
||||
#include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h"
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
@@ -609,7 +608,7 @@
|
||||
#include "components/search_engines/default_search_manager.h"
|
||||
#include "components/spellcheck/browser/pref_names.h"
|
||||
#include "components/translate/core/browser/translate_pref_names.h"
|
||||
@@ -295,16 +294,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
||||
@@ -301,16 +300,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
||||
settings_api::PrefType::PREF_TYPE_BOOLEAN;
|
||||
|
||||
// Security page
|
||||
@@ -716,7 +715,7 @@
|
||||
int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) {
|
||||
--- a/chrome/browser/net/profile_network_context_service.cc
|
||||
+++ b/chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -46,7 +46,6 @@
|
||||
@@ -47,7 +47,6 @@
|
||||
#include "components/pref_registry/pref_registry_syncable.h"
|
||||
#include "components/prefs/pref_registry_simple.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
@@ -724,7 +723,7 @@
|
||||
#include "content/public/browser/browser_context.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/network_service_instance.h"
|
||||
@@ -806,15 +805,8 @@ void ProfileNetworkContextService::Confi
|
||||
@@ -807,15 +806,8 @@ void ProfileNetworkContextService::Confi
|
||||
network_context_params->enable_certificate_reporting = true;
|
||||
network_context_params->enable_expect_ct_reporting = true;
|
||||
|
||||
@@ -914,7 +913,7 @@
|
||||
}
|
||||
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -94,12 +94,9 @@
|
||||
@@ -93,12 +93,9 @@
|
||||
#include "components/proxy_config/proxy_policy_handler.h"
|
||||
#include "components/safe_browsing/buildflags.h"
|
||||
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
|
||||
@@ -927,7 +926,7 @@
|
||||
#include "components/spellcheck/spellcheck_buildflags.h"
|
||||
#include "components/sync/base/pref_names.h"
|
||||
#include "components/sync/driver/sync_policy_handler.h"
|
||||
@@ -207,9 +204,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
@@ -206,9 +203,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
{ key::kDefaultPopupsSetting,
|
||||
prefs::kManagedDefaultPopupsSetting,
|
||||
base::Value::Type::INTEGER },
|
||||
@@ -937,7 +936,7 @@
|
||||
{ key::kEditBookmarksEnabled,
|
||||
bookmarks::prefs::kEditBookmarksEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -230,9 +224,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
@@ -226,9 +220,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
prefs::kPrintingEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(ENABLE_PRINTING)
|
||||
@@ -947,7 +946,7 @@
|
||||
{ key::kSavingBrowserHistoryDisabled,
|
||||
prefs::kSavingBrowserHistoryDisabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -291,9 +282,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
@@ -287,9 +278,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
{ key::kAdsSettingForIntrusiveAdsSites,
|
||||
prefs::kManagedDefaultAdsSetting,
|
||||
base::Value::Type::INTEGER },
|
||||
@@ -957,7 +956,7 @@
|
||||
{ key::kAllowCrossOriginAuthPrompt,
|
||||
prefs::kAllowCrossOriginAuthPrompt,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -482,15 +470,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
@@ -483,15 +471,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
{ key::kPasswordDismissCompromisedAlertEnabled,
|
||||
password_manager::prefs::kPasswordDismissCompromisedAlertEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -973,7 +972,7 @@
|
||||
{ key::kPolicyRefreshRate,
|
||||
policy_prefs::kUserPolicyRefreshRate,
|
||||
base::Value::Type::INTEGER },
|
||||
@@ -526,9 +505,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
@@ -527,9 +506,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
{ key::kRestoreOnStartupURLs,
|
||||
prefs::kURLsToRestoreOnStartup,
|
||||
base::Value::Type::LIST },
|
||||
@@ -983,7 +982,7 @@
|
||||
{ key::kSafeSitesFilterBehavior,
|
||||
policy_prefs::kSafeSitesFilterBehavior,
|
||||
base::Value::Type::INTEGER },
|
||||
@@ -653,12 +629,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
@@ -649,12 +625,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
{ key::kAdditionalDnsQueryTypesEnabled,
|
||||
prefs::kAdditionalDnsQueryTypesEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -996,7 +995,7 @@
|
||||
{ key::kForceGoogleSafeSearch,
|
||||
prefs::kForceGoogleSafeSearch,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -816,9 +786,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
@@ -821,9 +791,6 @@ const PolicyToPreferenceMapEntry kSimple
|
||||
{ key::kMaxConnectionsPerProxy,
|
||||
prefs::kMaxConnectionsPerProxy,
|
||||
base::Value::Type::INTEGER },
|
||||
@@ -1006,7 +1005,7 @@
|
||||
{ key::kDefaultWebBluetoothGuardSetting,
|
||||
prefs::kManagedDefaultWebBluetoothGuardSetting,
|
||||
base::Value::Type::INTEGER },
|
||||
@@ -1782,12 +1749,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
@@ -1787,12 +1754,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
|
||||
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
|
||||
|
||||
@@ -1019,7 +1018,7 @@
|
||||
|
||||
handlers->AddHandler(
|
||||
std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
|
||||
@@ -1959,17 +1920,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
@@ -1964,17 +1925,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
|
||||
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
|
||||
base::Value::Type::BOOLEAN));
|
||||
@@ -1047,15 +1046,15 @@
|
||||
#include "components/search_engines/template_url_prepopulate_data.h"
|
||||
#include "components/security_interstitials/content/insecure_form_blocking_page.h"
|
||||
#include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
|
||||
@@ -1014,7 +1013,6 @@ void RegisterLocalState(PrefRegistrySimp
|
||||
@@ -1003,7 +1002,6 @@ void RegisterLocalState(PrefRegistrySimp
|
||||
ProfileNetworkContextService::RegisterLocalStatePrefs(registry);
|
||||
profiles::RegisterPrefs(registry);
|
||||
RegisterScreenshotPrefs(registry);
|
||||
- safe_browsing::RegisterLocalStatePrefs(registry);
|
||||
secure_origin_allowlist::RegisterPrefs(registry);
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
SerialPolicyAllowedPorts::RegisterPrefs(registry);
|
||||
@@ -1275,8 +1273,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs(
|
||||
registry);
|
||||
@@ -1261,8 +1259,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
|
||||
QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
|
||||
RegisterBrowserUserPrefs(registry);
|
||||
@@ -1085,7 +1084,7 @@
|
||||
prefs::kEnableTouchpadThreeFingerClick, true},
|
||||
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
|
||||
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
||||
@@ -49,10 +49,8 @@
|
||||
@@ -50,10 +50,8 @@
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/prefs/pref_store.h"
|
||||
#include "components/prefs/pref_value_store.h"
|
||||
@@ -1096,7 +1095,7 @@
|
||||
#include "components/sync/base/model_type.h"
|
||||
#include "components/sync/base/pref_names.h"
|
||||
#include "components/sync_preferences/pref_model_associator.h"
|
||||
@@ -122,8 +120,6 @@ const prefs::TrackedPreferenceMetadata k
|
||||
@@ -123,8 +121,6 @@ const prefs::TrackedPreferenceMetadata k
|
||||
{5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT,
|
||||
PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL},
|
||||
#endif
|
||||
@@ -1105,7 +1104,7 @@
|
||||
{7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD,
|
||||
PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
@@ -147,8 +143,6 @@ const prefs::TrackedPreferenceMetadata k
|
||||
@@ -148,8 +144,6 @@ const prefs::TrackedPreferenceMetadata k
|
||||
PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
|
||||
// kSyncRemainingRollbackTries is deprecated and will be removed a few
|
||||
// releases after M50.
|
||||
@@ -1114,7 +1113,7 @@
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
{19, prefs::kSwReporterPromptVersion, EnforcementLevel::ENFORCE_ON_LOAD,
|
||||
PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
|
||||
@@ -157,10 +151,6 @@ const prefs::TrackedPreferenceMetadata k
|
||||
@@ -158,10 +152,6 @@ const prefs::TrackedPreferenceMetadata k
|
||||
{22, prefs::kSwReporterPromptSeed, EnforcementLevel::ENFORCE_ON_LOAD,
|
||||
PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
|
||||
#endif
|
||||
@@ -1223,7 +1222,7 @@
|
||||
ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted);
|
||||
--- a/chrome/browser/profiles/profile_impl.cc
|
||||
+++ b/chrome/browser/profiles/profile_impl.cc
|
||||
@@ -149,7 +149,6 @@
|
||||
@@ -144,7 +144,6 @@
|
||||
#include "components/prefs/scoped_user_pref_update.h"
|
||||
#include "components/profile_metrics/browser_profile_type.h"
|
||||
#include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
|
||||
@@ -1241,7 +1240,7 @@
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
||||
#include "components/sync/base/stop_source.h"
|
||||
@@ -2228,8 +2227,7 @@ void ProfileManager::AddProfileToStorage
|
||||
@@ -2263,8 +2262,7 @@ void ProfileManager::AddProfileToStorage
|
||||
entry->SetAuthInfo(account_info.gaia, username,
|
||||
is_consented_primary_account);
|
||||
|
||||
@@ -1251,7 +1250,7 @@
|
||||
|
||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
// Sign out if force-sign-in policy is enabled and profile is not signed
|
||||
@@ -2284,14 +2282,13 @@ void ProfileManager::AddProfileToStorage
|
||||
@@ -2319,14 +2317,13 @@ void ProfileManager::AddProfileToStorage
|
||||
|
||||
init_params.is_ephemeral = IsEphemeral(profile);
|
||||
init_params.is_signed_in_with_credential_provider =
|
||||
@@ -1269,7 +1268,7 @@
|
||||
prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName);
|
||||
--- a/chrome/browser/profiles/profile_window.cc
|
||||
+++ b/chrome/browser/profiles/profile_window.cc
|
||||
@@ -41,7 +41,6 @@
|
||||
@@ -42,7 +42,6 @@
|
||||
#include "chrome/common/url_constants.h"
|
||||
#include "components/flags_ui/pref_service_flags_storage.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
@@ -1279,7 +1278,7 @@
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
--- a/chrome/browser/profiles/profiles_state.cc
|
||||
+++ b/chrome/browser/profiles/profiles_state.cc
|
||||
@@ -42,7 +42,6 @@
|
||||
@@ -43,7 +43,6 @@
|
||||
#include <algorithm>
|
||||
#include "chrome/browser/profiles/gaia_info_update_service.h"
|
||||
#include "chrome/browser/profiles/gaia_info_update_service_factory.h"
|
||||
@@ -1304,7 +1303,7 @@
|
||||
</cr-dialog>
|
||||
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
||||
@@ -565,7 +565,7 @@
|
||||
@@ -595,7 +595,7 @@
|
||||
</category-setting-exceptions>
|
||||
</settings-subpage>
|
||||
</template>
|
||||
@@ -1443,7 +1442,7 @@
|
||||
- </template>
|
||||
--- a/chrome/browser/resources/settings/privacy_page/security_page.ts
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
|
||||
@@ -200,17 +200,6 @@ export class SettingsSecurityPageElement
|
||||
@@ -199,17 +199,6 @@ export class SettingsSecurityPageElement
|
||||
|
||||
override ready() {
|
||||
super.ready();
|
||||
@@ -1461,7 +1460,7 @@
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -259,8 +248,7 @@ export class SettingsSecurityPageElement
|
||||
@@ -258,8 +247,7 @@ export class SettingsSecurityPageElement
|
||||
}
|
||||
|
||||
private getDisabledExtendedSafeBrowsing_(): boolean {
|
||||
@@ -1997,7 +1996,7 @@
|
||||
|
||||
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
|
||||
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
|
||||
@@ -79,7 +79,6 @@
|
||||
@@ -78,7 +78,6 @@
|
||||
#include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
|
||||
#include "components/safe_browsing/core/browser/verdict_cache_manager.h"
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
@@ -2150,6 +2149,16 @@
|
||||
#include "components/security_interstitials/content/unsafe_resource_util.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
--- a/chrome/browser/send_tab_to_self/send_tab_to_self_util.cc
|
||||
+++ b/chrome/browser/send_tab_to_self/send_tab_to_self_util.cc
|
||||
@@ -11,7 +11,6 @@
|
||||
#include "components/send_tab_to_self/features.h"
|
||||
#include "components/send_tab_to_self/send_tab_to_self_model.h"
|
||||
#include "components/send_tab_to_self/send_tab_to_self_sync_service.h"
|
||||
-#include "components/signin/public/base/signin_pref_names.h"
|
||||
#include "components/signin/public/identity_manager/account_info.h"
|
||||
#include "components/sync/driver/sync_service.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
@@ -20,7 +20,6 @@
|
||||
@@ -2292,7 +2301,7 @@
|
||||
#include "google_apis/gaia/gaia_urls.h"
|
||||
--- a/chrome/browser/signin/primary_account_policy_manager.cc
|
||||
+++ b/chrome/browser/signin/primary_account_policy_manager.cc
|
||||
@@ -14,7 +14,6 @@
|
||||
@@ -15,7 +15,6 @@
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/signin/public/base/signin_metrics.h"
|
||||
@@ -2300,7 +2309,7 @@
|
||||
#include "components/signin/public/identity_manager/account_info.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#include "components/signin/public/identity_manager/identity_utils.h"
|
||||
@@ -178,23 +177,11 @@ void PrimaryAccountPolicyManager::Initia
|
||||
@@ -179,23 +178,11 @@ void PrimaryAccountPolicyManager::Initia
|
||||
EnsurePrimaryAccountAllowedForProfile(
|
||||
profile_, signin_metrics::SIGNIN_NOT_ALLOWED_ON_PROFILE_INIT);
|
||||
|
||||
@@ -2324,7 +2333,7 @@
|
||||
}
|
||||
|
||||
void PrimaryAccountPolicyManager::OnGoogleServicesUsernamePatternChanged() {
|
||||
@@ -219,11 +206,6 @@ void PrimaryAccountPolicyManager::Ensure
|
||||
@@ -220,11 +207,6 @@ void PrimaryAccountPolicyManager::Ensure
|
||||
|
||||
CoreAccountInfo primary_account =
|
||||
identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
|
||||
@@ -2350,7 +2359,7 @@
|
||||
PrefChangeRegistrar local_state_pref_registrar_;
|
||||
--- a/chrome/browser/signin/primary_account_policy_manager_unittest.cc
|
||||
+++ b/chrome/browser/signin/primary_account_policy_manager_unittest.cc
|
||||
@@ -14,7 +14,6 @@
|
||||
@@ -13,7 +13,6 @@
|
||||
#include "chrome/test/base/testing_browser_process.h"
|
||||
#include "chrome/test/base/testing_profile.h"
|
||||
#include "chrome/test/base/testing_profile_manager.h"
|
||||
@@ -2380,7 +2389,7 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
is_main_profile_ = client->GetInitialPrimaryAccount().has_value();
|
||||
#endif
|
||||
@@ -128,16 +122,6 @@ CoreAccountInfo SigninManager::ComputeUn
|
||||
@@ -124,16 +118,6 @@ CoreAccountInfo SigninManager::ComputeUn
|
||||
signin::ConsentLevel::kSync);
|
||||
}
|
||||
|
||||
@@ -2418,7 +2427,7 @@
|
||||
// Display the signin promo if the user is not signed in.
|
||||
--- a/chrome/browser/signin/signin_ui_util.cc
|
||||
+++ b/chrome/browser/signin/signin_ui_util.cc
|
||||
@@ -39,7 +39,6 @@
|
||||
@@ -40,7 +40,6 @@
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/signin/public/base/consent_level.h"
|
||||
#include "components/signin/public/base/signin_metrics.h"
|
||||
@@ -2489,7 +2498,7 @@
|
||||
#include "components/variations/variations_associated_data.h"
|
||||
--- a/chrome/browser/ssl/sct_reporting_service.cc
|
||||
+++ b/chrome/browser/ssl/sct_reporting_service.cc
|
||||
@@ -12,7 +12,6 @@
|
||||
@@ -13,7 +13,6 @@
|
||||
#include "chrome/common/chrome_features.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
@@ -2497,7 +2506,7 @@
|
||||
#include "content/public/browser/network_service_instance.h"
|
||||
#include "content/public/browser/storage_partition.h"
|
||||
#include "google_apis/google_api_keys.h"
|
||||
@@ -199,18 +198,6 @@ void SetSCTAuditingEnabledForStoragePart
|
||||
@@ -200,18 +199,6 @@ void SetSCTAuditingEnabledForStoragePart
|
||||
} // namespace
|
||||
|
||||
network::mojom::SCTAuditingMode SCTReportingService::GetReportingMode() {
|
||||
@@ -2567,7 +2576,7 @@
|
||||
// Copy supervised user settings to prefs.
|
||||
--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
|
||||
+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
|
||||
@@ -37,7 +37,6 @@
|
||||
@@ -38,7 +38,6 @@
|
||||
#include "components/autofill/core/common/autofill_features.h"
|
||||
#include "components/autofill/core/common/autofill_payments_features.h"
|
||||
#include "components/signin/public/base/signin_buildflags.h"
|
||||
@@ -2577,15 +2586,15 @@
|
||||
#include "components/sync/driver/sync_service.h"
|
||||
--- a/chrome/browser/ui/browser_command_controller.cc
|
||||
+++ b/chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -57,7 +57,6 @@
|
||||
#include "components/prefs/pref_service.h"
|
||||
@@ -58,7 +58,6 @@
|
||||
#include "components/services/screen_ai/buildflags/buildflags.h"
|
||||
#include "components/sessions/core/tab_restore_service.h"
|
||||
#include "components/signin/public/base/signin_buildflags.h"
|
||||
-#include "components/signin/public/base/signin_pref_names.h"
|
||||
#include "content/public/browser/native_web_keyboard_event.h"
|
||||
#include "content/public/browser/navigation_controller.h"
|
||||
#include "content/public/browser/navigation_entry.h"
|
||||
@@ -214,10 +213,6 @@ BrowserCommandController::BrowserCommand
|
||||
@@ -215,10 +214,6 @@ BrowserCommandController::BrowserCommand
|
||||
&BrowserCommandController::UpdateCommandsForFullscreenMode,
|
||||
base::Unretained(this)));
|
||||
#endif
|
||||
@@ -2635,7 +2644,7 @@
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#endif
|
||||
|
||||
@@ -524,13 +523,7 @@ void ShowBrowserSignin(Browser* browser,
|
||||
@@ -529,13 +528,7 @@ void ShowBrowserSignin(Browser* browser,
|
||||
|
||||
void ShowBrowserSigninOrSettings(Browser* browser,
|
||||
signin_metrics::AccessPoint access_point) {
|
||||
@@ -2661,7 +2670,7 @@
|
||||
#include "components/unified_consent/pref_names.h"
|
||||
#include "components/version_info/channel.h"
|
||||
|
||||
@@ -128,9 +126,6 @@ bool HasNonDefaultPrivacySetting(Profile
|
||||
@@ -137,9 +135,6 @@ bool HasNonDefaultPrivacySetting(Profile
|
||||
auto* prefs = profile->GetPrefs();
|
||||
|
||||
std::vector<std::string> prefs_to_check = {
|
||||
@@ -2671,7 +2680,7 @@
|
||||
prefs::kEnableDoNotTrack,
|
||||
password_manager::prefs::kPasswordLeakDetectionEnabled,
|
||||
prefs::kCookieControlsMode,
|
||||
@@ -148,13 +143,9 @@ bool HasNonDefaultPrivacySetting(Profile
|
||||
@@ -157,13 +152,9 @@ bool HasNonDefaultPrivacySetting(Profile
|
||||
// Users consenting to sync automatically enable UKM collection
|
||||
auto* ukm_pref = prefs->FindPreference(
|
||||
unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
|
||||
@@ -2703,10 +2712,10 @@
|
||||
#include "components/signin/core/browser/signin_error_controller.h"
|
||||
#include "components/signin/public/base/consent_level.h"
|
||||
-#include "components/signin/public/base/signin_pref_names.h"
|
||||
#include "components/signin/public/base/signin_switches.h"
|
||||
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "components/vector_icons/vector_icons.h"
|
||||
@@ -508,7 +507,6 @@ void ProfileMenuView::BuildAutofillButto
|
||||
@@ -511,7 +510,6 @@ void ProfileMenuView::BuildAutofillButto
|
||||
|
||||
void ProfileMenuView::BuildSyncInfo() {
|
||||
Profile* profile = browser()->profile();
|
||||
@@ -2716,14 +2725,14 @@
|
||||
if (!SyncServiceFactory::IsSyncAllowed(profile)) {
|
||||
--- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
|
||||
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
|
||||
@@ -60,7 +60,6 @@
|
||||
@@ -61,7 +61,6 @@
|
||||
#include "components/google/core/common/google_util.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/signin/public/base/consent_level.h"
|
||||
-#include "components/signin/public/base/signin_pref_names.h"
|
||||
#include "components/signin/public/identity_manager/identity_test_utils.h"
|
||||
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
||||
#include "components/sync/driver/sync_service.h"
|
||||
#include "components/sync/driver/sync_user_settings.h"
|
||||
--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
|
||||
+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
|
||||
@@ -122,7 +122,6 @@ PasswordReuseModalWarningDialog::Passwor
|
||||
@@ -2899,10 +2908,10 @@
|
||||
#include "components/signin/public/base/consent_level.h"
|
||||
#include "components/signin/public/base/signin_metrics.h"
|
||||
-#include "components/signin/public/base/signin_pref_names.h"
|
||||
#include "components/signin/public/identity_manager/account_info.h"
|
||||
#include "components/signin/public/identity_manager/accounts_mutator.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
||||
@@ -301,10 +300,6 @@ void PeopleHandler::RegisterMessages() {
|
||||
@@ -303,10 +302,6 @@ void PeopleHandler::RegisterMessages() {
|
||||
void PeopleHandler::OnJavascriptAllowed() {
|
||||
PrefService* prefs = profile_->GetPrefs();
|
||||
profile_pref_registrar_.Init(prefs);
|
||||
@@ -2933,7 +2942,7 @@
|
||||
#include "components/signin/public/base/signin_buildflags.h"
|
||||
#include "components/strings/grit/components_chromium_strings.h"
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
@@ -1473,44 +1472,6 @@ void AddPrivacyStrings(content::WebUIDat
|
||||
@@ -1475,44 +1474,6 @@ void AddPrivacyStrings(content::WebUIDat
|
||||
{"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
|
||||
{"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
|
||||
{"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
|
||||
@@ -2978,7 +2987,7 @@
|
||||
{"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
|
||||
{"syncAndGoogleServicesPrivacyDescription",
|
||||
IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
|
||||
@@ -2811,11 +2772,6 @@ void AddSiteSettingsStrings(content::Web
|
||||
@@ -2833,11 +2794,6 @@ void AddSiteSettingsStrings(content::Web
|
||||
html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
|
||||
|
||||
html_source->AddBoolean(
|
||||
@@ -3092,7 +3101,7 @@
|
||||
}
|
||||
--- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
|
||||
+++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
|
||||
@@ -47,7 +47,6 @@
|
||||
@@ -44,7 +44,6 @@
|
||||
#include "components/policy/core/common/management/management_service.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/signin/public/base/signin_metrics.h"
|
||||
@@ -3100,7 +3109,7 @@
|
||||
#include "components/signin/public/identity_manager/accounts_mutator.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
||||
@@ -226,8 +225,7 @@ TurnSyncOnHelper::TurnSyncOnHelper(
|
||||
@@ -222,8 +221,7 @@ TurnSyncOnHelper::TurnSyncOnHelper(
|
||||
// last authenticated account of the current profile, then Chrome will show a
|
||||
// confirmation dialog before starting sync.
|
||||
// TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
|
||||
@@ -3234,9 +3243,9 @@
|
||||
#include "components/password_manager/core/browser/psl_matching_helper.h"
|
||||
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
#include "google_apis/gaia/gaia_auth_util.h"
|
||||
#include "google_apis/gaia/gaia_urls.h"
|
||||
#include "url/origin.h"
|
||||
@@ -216,9 +215,7 @@ PasswordReuseDetector::CheckNonGaiaEnter
|
||||
|
||||
namespace password_manager {
|
||||
@@ -210,9 +209,7 @@ PasswordReuseDetector::CheckNonGaiaEnter
|
||||
// Skips password reuse check if |domain| matches enterprise login URL or
|
||||
// enterprise change password URL.
|
||||
GURL page_url(domain);
|
||||
@@ -3280,7 +3289,7 @@
|
||||
void PasswordReuseManagerImpl::OnGetPasswordStoreResults(
|
||||
--- a/components/password_manager/core/browser/password_store.cc
|
||||
+++ b/components/password_manager/core/browser/password_store.cc
|
||||
@@ -40,7 +40,6 @@
|
||||
@@ -41,7 +41,6 @@
|
||||
#include "components/password_manager/core/common/password_manager_features.h"
|
||||
#include "components/password_manager/core/common/password_manager_pref_names.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
@@ -3298,7 +3307,7 @@
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#include "components/sync/base/user_selectable_type.h"
|
||||
#include "components/sync/driver/sync_user_settings.h"
|
||||
@@ -88,11 +87,6 @@ bool IsGaiaCredentialPage(const std::str
|
||||
@@ -91,11 +90,6 @@ bool IsGaiaCredentialPage(const std::str
|
||||
|
||||
bool ShouldSaveEnterprisePasswordHash(const PasswordForm& form,
|
||||
const PrefService& prefs) {
|
||||
@@ -3342,7 +3351,7 @@
|
||||
#include "components/security_interstitials/content/unsafe_resource_util.h"
|
||||
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
|
||||
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
|
||||
@@ -27,7 +27,6 @@
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
#include "components/safe_browsing/core/common/proto/client_model.pb.h"
|
||||
#include "components/safe_browsing/core/common/proto/csd.pb.h"
|
||||
@@ -3465,7 +3474,7 @@
|
||||
|
||||
--- a/components/safe_browsing/content/browser/ui_manager.cc
|
||||
+++ b/components/safe_browsing/content/browser/ui_manager.cc
|
||||
@@ -17,7 +17,6 @@
|
||||
@@ -18,7 +18,6 @@
|
||||
#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
|
||||
#include "components/safe_browsing/core/browser/ping_manager.h"
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
@@ -3485,7 +3494,7 @@
|
||||
#include "components/security_interstitials/content/unsafe_resource_util.h"
|
||||
--- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
|
||||
+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
|
||||
@@ -32,7 +32,6 @@
|
||||
@@ -33,7 +33,6 @@
|
||||
#include "components/safe_browsing/core/browser/referrer_chain_provider.h"
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
#include "components/safe_browsing/core/common/proto/csd.pb.h"
|
||||
@@ -3493,7 +3502,25 @@
|
||||
#include "content/public/browser/global_routing_id.h"
|
||||
#include "services/network/public/mojom/cookie_manager.mojom.h"
|
||||
#if BUILDFLAG(FULL_SAFE_BROWSING)
|
||||
@@ -2050,18 +2049,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
|
||||
@@ -1372,17 +1371,7 @@ std::string SerializeHitReport(const Hit
|
||||
}
|
||||
hit_report_dict.Set("threat_source", threat_source);
|
||||
std::string extended_reporting_level;
|
||||
- switch (hit_report.extended_reporting_level) {
|
||||
- case ExtendedReportingLevel::SBER_LEVEL_OFF:
|
||||
extended_reporting_level = "SBER_LEVEL_OFF";
|
||||
- break;
|
||||
- case ExtendedReportingLevel::SBER_LEVEL_LEGACY:
|
||||
- extended_reporting_level = "SBER_LEVEL_LEGACY";
|
||||
- break;
|
||||
- case ExtendedReportingLevel::SBER_LEVEL_SCOUT:
|
||||
- extended_reporting_level = "SBER_LEVEL_SCOUT";
|
||||
- break;
|
||||
- }
|
||||
hit_report_dict.Set("extended_reporting_level", extended_reporting_level);
|
||||
hit_report_dict.Set("is_enhanced_protection",
|
||||
hit_report.is_enhanced_protection);
|
||||
@@ -2274,18 +2263,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
|
||||
AllowJavascript();
|
||||
DCHECK(!args.empty());
|
||||
std::string callback_id = args[0].GetString();
|
||||
@@ -3624,7 +3651,7 @@
|
||||
"%s/%s?client=%s&appver=%s&pver=4.0", kSbReportsURLPrefix, method.c_str(),
|
||||
@@ -99,8 +98,6 @@ std::string GetReportUrl(const V4Protoco
|
||||
base::StringAppendF(&url, "&key=%s",
|
||||
net::EscapeQueryParamValue(api_key, true).c_str());
|
||||
base::EscapeQueryParamValue(api_key, true).c_str());
|
||||
}
|
||||
- if (reporting_level)
|
||||
- url.append(base::StringPrintf("&ext=%d", *reporting_level));
|
||||
@@ -4513,6 +4540,27 @@
|
||||
private:
|
||||
std::unique_ptr<MetricsHelper> metrics_helper_;
|
||||
// Link to the help center.
|
||||
--- a/components/send_tab_to_self/entry_point_display_reason.cc
|
||||
+++ b/components/send_tab_to_self/entry_point_display_reason.cc
|
||||
@@ -8,7 +8,6 @@
|
||||
#include "components/send_tab_to_self/features.h"
|
||||
#include "components/send_tab_to_self/send_tab_to_self_model.h"
|
||||
#include "components/send_tab_to_self/send_tab_to_self_sync_service.h"
|
||||
-#include "components/signin/public/base/signin_pref_names.h"
|
||||
#include "components/signin/public/identity_manager/account_info.h"
|
||||
#include "components/sync/driver/sync_service.h"
|
||||
#include "url/gurl.h"
|
||||
@@ -19,9 +18,7 @@ namespace {
|
||||
|
||||
bool ShouldOfferSignin(syncer::SyncService* sync_service,
|
||||
PrefService* pref_service) {
|
||||
- return pref_service->GetBoolean(prefs::kSigninAllowed) && sync_service &&
|
||||
- sync_service->GetAccountInfo().IsEmpty() &&
|
||||
- !sync_service->IsLocalSyncEnabled();
|
||||
+ return false;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
--- a/components/signin/core/browser/account_investigator.cc
|
||||
+++ b/components/signin/core/browser/account_investigator.cc
|
||||
@@ -13,7 +13,6 @@
|
||||
@@ -4616,19 +4664,9 @@
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/signin/public/base/signin_client.h"
|
||||
-#include "components/signin/public/base/signin_pref_names.h"
|
||||
#include "components/signin/public/identity_manager/accounts_mutator.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
|
||||
namespace signin {
|
||||
|
||||
--- a/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
|
||||
+++ b/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
#include "components/prefs/pref_registry_simple.h"
|
||||
#include "components/signin/public/base/account_consistency_method.h"
|
||||
-#include "components/signin/public/base/signin_pref_names.h"
|
||||
#include "components/signin/public/base/test_signin_client.h"
|
||||
#include "components/sync_preferences/testing_pref_service_syncable.h"
|
||||
#include "google_apis/gaia/gaia_auth_util.h"
|
||||
--- a/components/signin/core/browser/signin_investigator.cc
|
||||
+++ b/components/signin/core/browser/signin_investigator.cc
|
||||
@@ -7,7 +7,6 @@
|
||||
@@ -5394,7 +5432,7 @@
|
||||
#include "components/signin/public/identity_manager/identity_test_utils.h"
|
||||
--- a/tools/metrics/histograms/enums.xml
|
||||
+++ b/tools/metrics/histograms/enums.xml
|
||||
@@ -90466,7 +90466,6 @@ Full version information for the fingerp
|
||||
@@ -93076,7 +93076,6 @@ Full version information for the fingerp
|
||||
<int value="3" label="kRestoreOnStartup"/>
|
||||
<int value="4" label="kURLsToRestoreOnStartup"/>
|
||||
<int value="5" label="extensions::pref_names::kExtensions"/>
|
||||
@@ -5402,7 +5440,7 @@
|
||||
<int value="7" label="kSearchProviderOverrides"/>
|
||||
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
|
||||
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
|
||||
@@ -90481,10 +90480,7 @@ Full version information for the fingerp
|
||||
@@ -93091,10 +93090,7 @@ Full version information for the fingerp
|
||||
<int value="18" label="kSafeBrowsingIncidentsSent"/>
|
||||
<int value="19" label="kSwReporterPromptVersion"/>
|
||||
<int value="20" label="kSwReporterPromptReason"/>
|
||||
|
||||
@@ -27,4 +27,4 @@
|
||||
+ "new_tab_url": "about:blank",
|
||||
"type": "SEARCH_ENGINE_GOOGLE",
|
||||
"preconnect_to_search_url" : "ALLOWED",
|
||||
"id": 1
|
||||
"prefetch_likely_navigations" : "ALLOWED",
|
||||
|
||||
@@ -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
|
||||
@@ -135,6 +135,7 @@
|
||||
@@ -140,6 +140,7 @@
|
||||
#include "components/spellcheck/common/spellcheck_common.h"
|
||||
#include "components/spellcheck/spellcheck_buildflags.h"
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
@@ -9,16 +9,16 @@
|
||||
#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"
|
||||
@@ -1727,6 +1728,8 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -1726,6 +1727,8 @@ void RenderViewContextMenu::AppendPageIt
|
||||
if (has_sharing_menu_items)
|
||||
menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
}
|
||||
|
||||
+ const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
|
||||
+ if (command_line.HasSwitch(translate::switches::kTranslateScriptURL)) {
|
||||
ChromeTranslateClient* chrome_translate_client =
|
||||
ChromeTranslateClient::FromWebContents(embedder_web_contents_);
|
||||
const bool canTranslate =
|
||||
@@ -1748,6 +1751,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -1747,6 +1750,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
IDC_CONTENT_CONTEXT_TRANSLATE,
|
||||
l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2390,6 +2390,7 @@ static_library("browser") {
|
||||
@@ -2412,6 +2412,7 @@ static_library("browser") {
|
||||
"//third_party/libyuv",
|
||||
"//third_party/metrics_proto",
|
||||
"//third_party/re2",
|
||||
@@ -44,7 +44,7 @@
|
||||
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -231,6 +231,7 @@ source_set("browser") {
|
||||
@@ -234,6 +234,7 @@ source_set("browser") {
|
||||
"//third_party/libyuv",
|
||||
"//third_party/re2",
|
||||
"//third_party/sqlite",
|
||||
@@ -55,14 +55,14 @@
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -76,6 +76,7 @@
|
||||
#include "components/services/storage/public/cpp/quota_error_or.h"
|
||||
#include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
|
||||
#include "components/services/storage/public/mojom/indexed_db_control.mojom.h"
|
||||
#include "components/tracing/common/tracing_switches.h"
|
||||
+#include "components/ungoogled/ungoogled_switches.h"
|
||||
#include "components/viz/common/switches.h"
|
||||
#include "components/viz/host/gpu_client.h"
|
||||
#include "content/browser/bad_message.h"
|
||||
@@ -3287,6 +3288,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3242,6 +3243,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kEnableWebGLDraftExtensions,
|
||||
switches::kEnableWebGLImageChromium,
|
||||
switches::kFileUrlPathAlias,
|
||||
@@ -73,7 +73,7 @@
|
||||
switches::kForceGpuMemAvailableMb,
|
||||
--- a/content/child/BUILD.gn
|
||||
+++ b/content/child/BUILD.gn
|
||||
@@ -103,6 +103,7 @@ target(link_target_type, "child") {
|
||||
@@ -102,6 +102,7 @@ target(link_target_type, "child") {
|
||||
"//third_party/blink/public/common",
|
||||
"//third_party/blink/public/strings",
|
||||
"//third_party/ced",
|
||||
@@ -91,10 +91,10 @@
|
||||
#include "ui/accessibility/accessibility_features.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#include "ui/events/blink/blink_features.h"
|
||||
@@ -481,6 +482,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -472,6 +473,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
{wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo,
|
||||
true},
|
||||
{wrf::EnableDirectSockets, switches::kRestrictedApiOrigins, false},
|
||||
{wrf::EnableDirectSockets, switches::kIsolatedAppOrigins, false},
|
||||
+ {wrf::EnableFingerprintingClientRectsNoise,
|
||||
+ switches::kFingerprintingClientRectsNoise, true},
|
||||
+ {wrf::EnableFingerprintingCanvasMeasureTextNoise,
|
||||
@@ -104,7 +104,7 @@
|
||||
if (command_line.HasSwitch(mapping.switch_name))
|
||||
--- a/third_party/blink/public/platform/web_runtime_features.h
|
||||
+++ b/third_party/blink/public/platform/web_runtime_features.h
|
||||
@@ -216,6 +216,8 @@ class WebRuntimeFeatures {
|
||||
@@ -212,6 +212,8 @@ class WebRuntimeFeatures {
|
||||
BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
|
||||
@@ -121,9 +121,9 @@
|
||||
#include "base/notreached.h"
|
||||
+#include "base/rand_util.h"
|
||||
#include "base/time/time.h"
|
||||
#include "cc/animation/animation_timeline.h"
|
||||
#include "cc/input/overscroll_behavior.h"
|
||||
#include "cc/input/scroll_snap_data.h"
|
||||
@@ -885,6 +886,14 @@ Range* Document::CreateRangeAdjustedToTr
|
||||
@@ -888,6 +889,14 @@ Range* Document::CreateRangeAdjustedToTr
|
||||
Position::BeforeNode(*shadow_host));
|
||||
}
|
||||
|
||||
@@ -138,7 +138,7 @@
|
||||
SelectorQueryCache& Document::GetSelectorQueryCache() {
|
||||
if (!selector_query_cache_)
|
||||
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
|
||||
@@ -2167,6 +2176,15 @@ void Document::UpdateStyleAndLayoutTreeF
|
||||
@@ -2197,6 +2206,15 @@ void Document::UpdateStyleAndLayoutTreeF
|
||||
#if DCHECK_IS_ON()
|
||||
AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
|
||||
#endif
|
||||
@@ -156,7 +156,7 @@
|
||||
void Document::InvalidateStyleAndLayoutForFontUpdates() {
|
||||
--- a/third_party/blink/renderer/core/dom/document.h
|
||||
+++ b/third_party/blink/renderer/core/dom/document.h
|
||||
@@ -496,6 +496,10 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -498,6 +498,10 @@ class CORE_EXPORT Document : public Cont
|
||||
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
AtomicString visibilityState() const;
|
||||
bool IsPageVisible() const;
|
||||
bool hidden() const;
|
||||
@@ -2229,6 +2233,9 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -2237,6 +2241,9 @@ class CORE_EXPORT Document : public Cont
|
||||
|
||||
base::ElapsedTimer start_time_;
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
HeapVector<Member<ScriptElementBase>> current_script_stack_;
|
||||
--- a/third_party/blink/renderer/core/dom/element.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/element.cc
|
||||
@@ -2073,6 +2073,11 @@ DOMRectList* Element::getClientRects() {
|
||||
@@ -2118,6 +2118,11 @@ DOMRectList* Element::getClientRects() {
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
|
||||
*element_layout_object);
|
||||
@@ -191,7 +191,7 @@
|
||||
return MakeGarbageCollected<DOMRectList>(quads);
|
||||
}
|
||||
|
||||
@@ -2090,6 +2095,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
@@ -2135,6 +2140,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
|
||||
*element_layout_object);
|
||||
@@ -203,7 +203,7 @@
|
||||
|
||||
--- a/third_party/blink/renderer/core/dom/range.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/range.cc
|
||||
@@ -1598,11 +1598,21 @@ DOMRectList* Range::getClientRects() con
|
||||
@@ -1601,11 +1601,21 @@ DOMRectList* Range::getClientRects() con
|
||||
Vector<gfx::QuadF> quads;
|
||||
GetBorderAndTextQuads(quads);
|
||||
|
||||
@@ -266,7 +266,7 @@
|
||||
const TextDirection&,
|
||||
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
|
||||
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
|
||||
@@ -917,9 +917,15 @@ TextMetrics* CanvasRenderingContext2D::m
|
||||
@@ -920,9 +920,15 @@ TextMetrics* CanvasRenderingContext2D::m
|
||||
TextDirection direction =
|
||||
ToTextDirection(GetState().GetDirection(), canvas());
|
||||
|
||||
@@ -285,7 +285,7 @@
|
||||
void CanvasRenderingContext2D::fillFormattedText(
|
||||
--- a/third_party/blink/renderer/platform/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/platform/BUILD.gn
|
||||
@@ -1638,6 +1638,7 @@ component("platform") {
|
||||
@@ -1637,6 +1637,7 @@ component("platform") {
|
||||
"//components/paint_preview/common",
|
||||
"//components/power_scheduler",
|
||||
"//components/search_engines:search_engine_utils",
|
||||
@@ -295,7 +295,7 @@
|
||||
"//components/webrtc:net_address_utils",
|
||||
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
|
||||
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
|
||||
@@ -677,4 +677,12 @@ void WebRuntimeFeatures::EnableWebAuthen
|
||||
@@ -659,4 +659,12 @@ void WebRuntimeFeatures::EnableWebAuthen
|
||||
enable);
|
||||
}
|
||||
|
||||
@@ -310,8 +310,8 @@
|
||||
} // namespace blink
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -1137,6 +1137,12 @@
|
||||
name: "Focusgroup",
|
||||
@@ -1099,6 +1099,12 @@
|
||||
status: "experimental",
|
||||
},
|
||||
{
|
||||
+ name: "FingerprintingClientRectsNoise",
|
||||
|
||||
@@ -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
|
||||
@@ -3290,6 +3290,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3245,6 +3245,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
|
||||
@@ -486,6 +486,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -477,6 +477,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
switches::kFingerprintingClientRectsNoise, true},
|
||||
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
|
||||
switches::kFingerprintingCanvasMeasureTextNoise, true},
|
||||
@@ -55,7 +55,7 @@ approach to change color components.
|
||||
if (command_line.HasSwitch(mapping.switch_name))
|
||||
--- a/third_party/blink/public/platform/web_runtime_features.h
|
||||
+++ b/third_party/blink/public/platform/web_runtime_features.h
|
||||
@@ -218,6 +218,7 @@ class WebRuntimeFeatures {
|
||||
@@ -214,6 +214,7 @@ class WebRuntimeFeatures {
|
||||
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
|
||||
@@ -85,7 +85,7 @@ approach to change color components.
|
||||
return image_data;
|
||||
--- a/third_party/blink/renderer/platform/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/platform/BUILD.gn
|
||||
@@ -1596,7 +1596,9 @@ component("platform") {
|
||||
@@ -1595,7 +1595,9 @@ component("platform") {
|
||||
"//third_party/blink/renderer:non_test_config",
|
||||
]
|
||||
|
||||
@@ -98,7 +98,7 @@ approach to change color components.
|
||||
"//third_party/blink/renderer/platform/blob",
|
||||
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
|
||||
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
|
||||
@@ -685,4 +685,8 @@ void WebRuntimeFeatures::EnableFingerpri
|
||||
@@ -667,4 +667,8 @@ void WebRuntimeFeatures::EnableFingerpri
|
||||
RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
|
||||
}
|
||||
|
||||
@@ -322,7 +322,7 @@ approach to change color components.
|
||||
// Methods overridden by all sub-classes
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -1143,6 +1143,9 @@
|
||||
@@ -1105,6 +1105,9 @@
|
||||
name: "FingerprintingCanvasMeasureTextNoise",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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
|
||||
@@ -2138,6 +2138,7 @@ static_library("browser") {
|
||||
@@ -2159,6 +2159,7 @@ static_library("browser") {
|
||||
"//components/net_log",
|
||||
"//components/network_hints/common:mojo_bindings",
|
||||
"//components/network_session_configurator/browser",
|
||||
@@ -78,7 +78,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
#include "ppapi/buildflags/buildflags.h"
|
||||
#include "printing/buildflags/buildflags.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
@@ -344,6 +348,18 @@ void BrowserProcessImpl::Init() {
|
||||
@@ -343,6 +347,18 @@ void BrowserProcessImpl::Init() {
|
||||
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
|
||||
base::BindRepeating(&ApplyMetricsReportingPolicy));
|
||||
|
||||
@@ -99,7 +99,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -1595,6 +1595,10 @@ const char kUnthrottledNestedTimeoutDesc
|
||||
@@ -1632,6 +1632,10 @@ const char kUnthrottledNestedTimeoutDesc
|
||||
"websites abusing the API will still eventually have their setTimeouts "
|
||||
"clamped.";
|
||||
|
||||
@@ -112,7 +112,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
|
||||
@@ -900,6 +900,9 @@ extern const char kLogJsConsoleMessagesD
|
||||
@@ -917,6 +917,9 @@ extern const char kLogJsConsoleMessagesD
|
||||
extern const char kUnthrottledNestedTimeoutName[];
|
||||
extern const char kUnthrottledNestedTimeoutDescription[];
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
|
||||
|
||||
--- a/chrome/browser/profiles/profile_manager.cc
|
||||
+++ b/chrome/browser/profiles/profile_manager.cc
|
||||
@@ -1399,7 +1399,7 @@ void ProfileManager::InitProfileUserPref
|
||||
@@ -1414,7 +1414,7 @@ void ProfileManager::InitProfileUserPref
|
||||
profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
|
||||
supervised_user_id);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -1292,7 +1292,7 @@ void ChromeContentBrowserClient::Registe
|
||||
@@ -1295,7 +1295,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
|
||||
@@ -338,7 +338,7 @@ void ProfileNetworkContextService::Updat
|
||||
@@ -339,7 +339,7 @@ void ProfileNetworkContextService::Updat
|
||||
void ProfileNetworkContextService::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -140,7 +140,7 @@
|
||||
|
||||
--- a/components/password_manager/core/browser/password_manager.cc
|
||||
+++ b/components/password_manager/core/browser/password_manager.cc
|
||||
@@ -210,10 +210,10 @@ bool HasMutedCredentials(const std::vect
|
||||
@@ -211,10 +211,10 @@ bool HasMutedCredentials(const std::vect
|
||||
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
|
||||
@@ -1620,8 +1620,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
@@ -1633,8 +1633,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
// and preferences have been registered since some of the import code depends
|
||||
// on preferences.
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
|
||||
@@ -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
|
||||
@@ -867,7 +867,7 @@ static base::mac::ScopedObjCClassSwizzle
|
||||
@@ -868,7 +868,7 @@ static base::mac::ScopedObjCClassSwizzle
|
||||
CFStringRef checkInterval = CFSTR("checkInterval");
|
||||
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
|
||||
if (!plist) {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
|
||||
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
|
||||
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
|
||||
@@ -469,6 +471,7 @@ Browser::Browser(const CreateParams& par
|
||||
@@ -474,6 +476,7 @@ Browser::Browser(const CreateParams& par
|
||||
omit_from_session_restore_(params.omit_from_session_restore),
|
||||
should_trigger_session_restore_(params.should_trigger_session_restore),
|
||||
cancel_download_confirmation_state_(NOT_PROMPTED),
|
||||
@@ -34,7 +34,7 @@
|
||||
unload_controller_.ResetTryToCloseWindow();
|
||||
}
|
||||
|
||||
@@ -2725,6 +2729,62 @@ bool Browser::CanCloseWithInProgressDown
|
||||
@@ -2732,6 +2736,62 @@ bool Browser::CanCloseWithInProgressDown
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
|
||||
if (cancel_downloads) {
|
||||
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
|
||||
@@ -2743,6 +2803,22 @@ void Browser::InProgressDownloadResponse
|
||||
@@ -2750,6 +2810,22 @@ void Browser::InProgressDownloadResponse
|
||||
|
||||
std::move(warn_before_closing_callback_)
|
||||
.Run(WarnBeforeClosingResult::kDoNotClose);
|
||||
@@ -122,7 +122,7 @@
|
||||
void Browser::FinishWarnBeforeClosing(WarnBeforeClosingResult result) {
|
||||
--- a/chrome/browser/ui/browser.h
|
||||
+++ b/chrome/browser/ui/browser.h
|
||||
@@ -26,6 +26,7 @@
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper_observer.h"
|
||||
#include "chrome/browser/ui/browser_navigator_params.h"
|
||||
#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
|
||||
@@ -130,7 +130,7 @@
|
||||
#include "chrome/browser/ui/signin_view_controller.h"
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
||||
#include "chrome/browser/ui/unload_controller.h"
|
||||
@@ -1010,12 +1011,17 @@ class Browser : public TabStripModelObse
|
||||
@@ -1030,12 +1031,17 @@ class Browser : public TabStripModelObse
|
||||
// Returns true if the window can close, false otherwise.
|
||||
bool CanCloseWithInProgressDownloads();
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
// Called when all warnings have completed when attempting to close the
|
||||
// browser directly (e.g. via hotkey, close button, terminate signal, etc.)
|
||||
// Used as a WarnBeforeClosingCallback by ShouldCloseWindow().
|
||||
@@ -1178,6 +1184,8 @@ class Browser : public TabStripModelObse
|
||||
@@ -1202,6 +1208,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
|
||||
@@ -780,6 +780,9 @@ bool HandleNewTabPageLocationOverride(
|
||||
@@ -783,6 +783,9 @@ bool HandleNewTabPageLocationOverride(
|
||||
|
||||
std::string ntp_location =
|
||||
profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride);
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/i18n/break_iterator.h"
|
||||
#include "base/i18n/case_conversion.h"
|
||||
@@ -646,6 +647,9 @@ void SearchProvider::Run(bool query_is_p
|
||||
@@ -658,6 +659,9 @@ void SearchProvider::Run(bool query_is_p
|
||||
}
|
||||
|
||||
void SearchProvider::DoHistoryQuery(bool minimal_changes) {
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
return true;
|
||||
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
@@ -311,7 +311,8 @@ void LocationBarView::Init() {
|
||||
#endif // BUILDFLAG(ENABLE_SIDE_SEARCH)
|
||||
@@ -306,7 +306,8 @@ void LocationBarView::Init() {
|
||||
params.types_enabled.push_back(PageActionIconType::kSideSearch);
|
||||
params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
|
||||
params.types_enabled.push_back(PageActionIconType::kClickToCall);
|
||||
- params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator);
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/utility_process_host.cc
|
||||
+++ b/content/browser/utility_process_host.cc
|
||||
@@ -225,6 +225,7 @@ bool UtilityProcessHost::StartProcess()
|
||||
@@ -232,6 +232,7 @@ bool UtilityProcessHost::StartProcess()
|
||||
|
||||
// Browser command-line switches to propagate to the utility process.
|
||||
static const char* const kSwitchNames[] = {
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
}
|
||||
|
||||
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
|
||||
@@ -1516,6 +1524,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
@@ -1533,6 +1541,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
|
||||
void TemplateURLService::Init(const Initializer* initializers,
|
||||
int num_initializers) {
|
||||
@@ -111,7 +111,7 @@
|
||||
if (client_)
|
||||
client_->SetOwner(this);
|
||||
|
||||
@@ -1654,6 +1664,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
@@ -1671,6 +1681,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
|
||||
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
|
||||
const std::string& host) const {
|
||||
@@ -123,7 +123,7 @@
|
||||
return true;
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -716,6 +716,8 @@ class TemplateURLService : public WebDat
|
||||
@@ -723,6 +723,8 @@ class TemplateURLService : public WebDat
|
||||
// ---------- Browser state related members ---------------------------------
|
||||
raw_ptr<PrefService> prefs_ = nullptr;
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/containers/adapters.h"
|
||||
#include "base/containers/contains.h"
|
||||
@@ -1461,6 +1462,8 @@ void TabStrip::OnMouseEventInTab(views::
|
||||
@@ -1466,6 +1467,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
|
||||
@@ -1208,7 +1208,8 @@ void BrowserCommandController::InitComma
|
||||
@@ -1207,7 +1207,8 @@ void BrowserCommandController::InitComma
|
||||
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
|
||||
normal_window);
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -1070,10 +1070,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
@@ -1074,10 +1074,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
return DownloadConfirmationReason::SAVE_AS;
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/content/renderer/render_view_impl.cc
|
||||
+++ b/content/renderer/render_view_impl.cc
|
||||
@@ -75,6 +75,9 @@ WindowOpenDisposition RenderViewImpl::Na
|
||||
@@ -74,6 +74,9 @@ WindowOpenDisposition RenderViewImpl::Na
|
||||
case blink::kWebNavigationPolicyNewWindow:
|
||||
return WindowOpenDisposition::NEW_WINDOW;
|
||||
case blink::kWebNavigationPolicyNewPopup:
|
||||
|
||||
@@ -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
|
||||
@@ -311,7 +311,8 @@ class SSLClientSocketImpl::SSLContext {
|
||||
@@ -312,7 +312,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 */);
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "base/lazy_instance.h"
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/numerics/safe_conversions.h"
|
||||
@@ -270,6 +271,13 @@ IDNConversionResult IDNToUnicodeWithAdju
|
||||
@@ -311,6 +312,13 @@ IDNConversionResult IDNToUnicodeWithAdju
|
||||
host16.reserve(host.length());
|
||||
host16.insert(host16.end(), host.begin(), host.end());
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -255,6 +255,7 @@ void ToolbarView::Init() {
|
||||
@@ -251,6 +251,7 @@ void ToolbarView::Init() {
|
||||
// Do not create the extensions or browser actions container if it is a guest
|
||||
// profile (only regular and incognito profiles host extensions).
|
||||
if (!browser_->profile()->IsGuestSession()) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -895,6 +895,7 @@ BrowserView::BrowserView(std::unique_ptr
|
||||
@@ -900,6 +900,7 @@ BrowserView::BrowserView(std::unique_ptr
|
||||
contents_container_ = AddChildView(std::move(contents_container));
|
||||
set_contents_view(contents_container_);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -284,14 +284,30 @@ void ToolbarView::Init() {
|
||||
@@ -280,14 +280,30 @@ void ToolbarView::Init() {
|
||||
|
||||
std::unique_ptr<ToolbarAccountIconContainerView>
|
||||
toolbar_account_icon_container;
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/net/base/features.cc
|
||||
+++ b/net/base/features.cc
|
||||
@@ -293,5 +293,7 @@ const base::Feature kClampCookieExpiryTo
|
||||
"ClampCookieExpiryTo400Days",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
@@ -303,5 +303,7 @@ const base::Feature kStaticKeyPinningEnf
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
#endif
|
||||
|
||||
+const base::Feature kSetIpv6ProbeFalse{"SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
+
|
||||
@@ -23,9 +23,9 @@
|
||||
} // namespace net
|
||||
--- a/net/base/features.h
|
||||
+++ b/net/base/features.h
|
||||
@@ -430,6 +430,8 @@ NET_EXPORT extern const base::Feature kS
|
||||
// future.
|
||||
NET_EXPORT extern const base::Feature kClampCookieExpiryTo400Days;
|
||||
@@ -433,6 +433,8 @@ NET_EXPORT extern const base::Feature kC
|
||||
// Controls whether static key pinning is enforced.
|
||||
NET_EXPORT extern const base::Feature kStaticKeyPinningEnforcement;
|
||||
|
||||
+NET_EXPORT extern const base::Feature kSetIpv6ProbeFalse;
|
||||
+
|
||||
@@ -46,7 +46,7 @@
|
||||
enum DnsResolveStatus {
|
||||
RESOLVE_STATUS_DNS_SUCCESS = 0,
|
||||
RESOLVE_STATUS_PROC_SUCCESS,
|
||||
@@ -4130,7 +4125,7 @@ bool HostResolverManager::IsIPv6Reachabl
|
||||
@@ -4103,7 +4098,7 @@ bool HostResolverManager::IsIPv6Reachabl
|
||||
(tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
|
||||
kIPv6ProbePeriodMs) {
|
||||
SetLastIPv6ProbeResult(
|
||||
|
||||
@@ -272,7 +272,7 @@
|
||||
bool CanEdit(const TemplateURL* url) const;
|
||||
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
@@ -108,21 +108,25 @@ void TemplateURLTableModel::Remove(int i
|
||||
@@ -115,21 +115,25 @@ void TemplateURLTableModel::Remove(int i
|
||||
void TemplateURLTableModel::Add(int index,
|
||||
const std::u16string& short_name,
|
||||
const std::u16string& keyword,
|
||||
@@ -303,7 +303,7 @@
|
||||
DCHECK(index >= 0 && index <= RowCount());
|
||||
DCHECK(!url.empty());
|
||||
TemplateURL* template_url = GetTemplateURL(index);
|
||||
@@ -131,7 +135,8 @@ void TemplateURLTableModel::ModifyTempla
|
||||
@@ -138,7 +142,8 @@ void TemplateURLTableModel::ModifyTempla
|
||||
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
|
||||
template_url->SupportsReplacement(
|
||||
template_url_service_->search_terms_data()));
|
||||
@@ -429,7 +429,7 @@
|
||||
|
||||
--- a/components/search_engines/template_url_service.cc
|
||||
+++ b/components/search_engines/template_url_service.cc
|
||||
@@ -644,7 +644,8 @@ void TemplateURLService::IncrementUsageC
|
||||
@@ -653,7 +653,8 @@ void TemplateURLService::IncrementUsageC
|
||||
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -439,7 +439,7 @@
|
||||
DCHECK(!IsCreatedByExtension(url));
|
||||
DCHECK(!keyword.empty());
|
||||
DCHECK(!search_url.empty());
|
||||
@@ -659,6 +660,7 @@ void TemplateURLService::ResetTemplateUR
|
||||
@@ -668,6 +669,7 @@ void TemplateURLService::ResetTemplateUR
|
||||
data.safe_for_autoreplace = false;
|
||||
data.last_modified = clock_->Now();
|
||||
data.is_active = TemplateURLData::ActiveStatus::kTrue;
|
||||
@@ -449,7 +449,7 @@
|
||||
}
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -254,7 +254,8 @@ class TemplateURLService : public WebDat
|
||||
@@ -258,7 +258,8 @@ class TemplateURLService : public WebDat
|
||||
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
|
||||
@@ -3109,7 +3109,13 @@ const FeatureEntry::FeatureVariation kDe
|
||||
@@ -3131,7 +3131,13 @@ const FeatureEntry::FeatureVariation kDe
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
@@ -150,7 +150,7 @@
|
||||
} // namespace download
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -85,7 +85,6 @@ source_set("browser") {
|
||||
@@ -87,7 +87,6 @@ source_set("browser") {
|
||||
"//components/permissions:permissions_common",
|
||||
"//components/power_scheduler",
|
||||
"//components/services/filesystem:lib",
|
||||
@@ -160,7 +160,7 @@
|
||||
"//components/services/storage/dom_storage:local_storage_proto",
|
||||
--- a/content/browser/file_system_access/safe_move_helper.cc
|
||||
+++ b/content/browser/file_system_access/safe_move_helper.cc
|
||||
@@ -13,7 +13,6 @@
|
||||
@@ -14,7 +14,6 @@
|
||||
#include "base/threading/sequenced_task_runner_handle.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
@@ -168,7 +168,7 @@
|
||||
#include "content/browser/file_system_access/file_system_access_error.h"
|
||||
#include "content/public/browser/content_browser_client.h"
|
||||
#include "content/public/browser/global_routing_id.h"
|
||||
@@ -197,20 +196,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
|
||||
@@ -206,20 +205,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
|
||||
// not exist anymore. In case of error, the source file URL will point to a
|
||||
// valid filesystem location.
|
||||
base::OnceCallback<void(base::File::Error)> result_callback;
|
||||
@@ -189,7 +189,7 @@
|
||||
manager_->DoFileSystemOperation(
|
||||
FROM_HERE, &storage::FileSystemOperationRunner::Move,
|
||||
std::move(result_callback), source_url(), dest_url(), options_,
|
||||
@@ -226,7 +213,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
|
||||
@@ -235,7 +222,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
|
||||
void SafeMoveHelper::DidFileDoQuarantine(
|
||||
const storage::FileSystemURL& target_url,
|
||||
const GURL& referrer_url,
|
||||
@@ -197,7 +197,7 @@
|
||||
base::File::Error result) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
|
||||
@@ -257,37 +243,9 @@ void SafeMoveHelper::DidFileDoQuarantine
|
||||
@@ -266,37 +252,9 @@ void SafeMoveHelper::DidFileDoQuarantine
|
||||
referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
|
||||
? referrer_url
|
||||
: GURL();
|
||||
@@ -237,7 +237,7 @@
|
||||
|
||||
--- a/content/browser/file_system_access/safe_move_helper.h
|
||||
+++ b/content/browser/file_system_access/safe_move_helper.h
|
||||
@@ -58,10 +58,8 @@ class CONTENT_EXPORT SafeMoveHelper {
|
||||
@@ -59,10 +59,8 @@ class CONTENT_EXPORT SafeMoveHelper {
|
||||
void DidFileDoQuarantine(
|
||||
const storage::FileSystemURL& target_url,
|
||||
const GURL& referrer_url,
|
||||
@@ -270,7 +270,7 @@
|
||||
const base::FilePath& path,
|
||||
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.h
|
||||
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h
|
||||
@@ -13,7 +13,6 @@
|
||||
@@ -14,7 +14,6 @@
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
@@ -278,7 +278,7 @@
|
||||
#include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
|
||||
#include "ipc/ipc_listener.h"
|
||||
#include "ipc/ipc_platform_file.h"
|
||||
@@ -93,12 +92,6 @@ class PepperFileIOHost : public ppapi::h
|
||||
@@ -94,12 +93,6 @@ class PepperFileIOHost : public ppapi::h
|
||||
const base::FilePath& path,
|
||||
base::File::Error error_code);
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/components/url_formatter/url_formatter.cc
|
||||
+++ b/components/url_formatter/url_formatter.cc
|
||||
@@ -492,14 +492,14 @@ bool HasTwoViewSourceSchemes(base::Strin
|
||||
@@ -533,15 +533,15 @@ bool HasTwoViewSourceSchemes(base::Strin
|
||||
} // namespace
|
||||
|
||||
const FormatUrlType kFormatUrlOmitNothing = 0;
|
||||
@@ -14,6 +14,7 @@
|
||||
-const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
|
||||
-const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7;
|
||||
-const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8;
|
||||
-const FormatUrlType kFormatUrlOmitMobilePrefix = 1 << 9;
|
||||
+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
|
||||
+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
|
||||
+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
|
||||
@@ -22,6 +23,7 @@
|
||||
+const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6;
|
||||
+const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7;
|
||||
+const FormatUrlType kFormatUrlOmitMailToScheme = 0 << 8;
|
||||
+const FormatUrlType kFormatUrlOmitMobilePrefix = 0 << 9;
|
||||
|
||||
const FormatUrlType kFormatUrlOmitDefaults =
|
||||
kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
--- a/components/optimization_guide/core/optimization_guide_features.cc
|
||||
+++ b/components/optimization_guide/core/optimization_guide_features.cc
|
||||
@@ -88,7 +88,7 @@ const base::Feature kOptimizationHintsFi
|
||||
@@ -87,7 +87,7 @@ const base::Feature kOptimizationHintsFi
|
||||
|
||||
// Enables fetching from a remote Optimization Guide Service.
|
||||
const base::Feature kRemoteOptimizationGuideFetching{
|
||||
- "OptimizationHintsFetching", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+ "OptimizationHintsFetching", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kRemoteOptimizationGuideFetchingAnonymousDataConsent {
|
||||
"OptimizationHintsFetchingAnonymousDataConsent",
|
||||
const base::Feature kRemoteOptimizationGuideFetchingAnonymousDataConsent{
|
||||
"OptimizationHintsFetchingAnonymousDataConsent",
|
||||
|
||||
@@ -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
|
||||
@@ -3693,8 +3693,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3694,8 +3694,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
pname, IdentifiabilityBenignStringToken(
|
||||
String(ContextGL()->GetString(GL_RENDERER))));
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
}
|
||||
SynthesizeGLError(
|
||||
GL_INVALID_ENUM, "getParameter",
|
||||
@@ -3708,8 +3707,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3709,8 +3708,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
|
||||
@@ -485,7 +485,7 @@ const base::Feature kComputePressure{"Co
|
||||
@@ -490,7 +490,7 @@ const base::Feature kComputePressure{"Co
|
||||
// Prefetch request properties are updated to be privacy-preserving. See
|
||||
// crbug.com/988956.
|
||||
const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/browser_commands.cc
|
||||
+++ b/chrome/browser/ui/browser_commands.cc
|
||||
@@ -448,11 +448,6 @@ int GetContentRestrictions(const Browser
|
||||
@@ -443,11 +443,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;
|
||||
}
|
||||
@@ -1355,8 +1350,7 @@ bool CanSavePage(const Browser* browser)
|
||||
@@ -1350,8 +1345,7 @@ bool CanSavePage(const Browser* browser)
|
||||
DownloadPrefs::DownloadRestriction::ALL_FILES) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
AddChildView(std::make_unique<views::InkDropContainerView>());
|
||||
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
@@ -1733,8 +1733,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
@@ -1738,8 +1738,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
|
||||
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
|
||||
if (mouse.IsOnlyMiddleMouseButton()) {
|
||||
@@ -22,7 +22,7 @@
|
||||
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
|
||||
CHECK(clipboard);
|
||||
std::u16string clipboard_text;
|
||||
@@ -1742,7 +1740,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
@@ -1747,7 +1745,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
/* data_dst = */ nullptr, &clipboard_text);
|
||||
if (!clipboard_text.empty())
|
||||
controller_->CreateNewTabWithLocation(clipboard_text);
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
base::Value supported_platforms(base::Value::Type::LIST);
|
||||
AddOsStrings(entry.supported_platforms, &supported_platforms);
|
||||
@@ -882,6 +887,7 @@ bool FlagsState::IsSupportedFeature(cons
|
||||
@@ -883,6 +888,7 @@ bool FlagsState::IsSupportedFeature(cons
|
||||
if (!entry.InternalNameMatches(name))
|
||||
continue;
|
||||
if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
--- a/components/search_engines/util.cc
|
||||
+++ b/components/search_engines/util.cc
|
||||
@@ -396,7 +396,7 @@ void GetSearchProvidersUsingLoadedEngine
|
||||
@@ -483,7 +483,7 @@ void GetSearchProvidersUsingLoadedEngine
|
||||
|
||||
const int prepopulate_resource_keyword_version =
|
||||
TemplateURLPrepopulateData::GetDataVersion(prefs);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
@@ -61,7 +61,6 @@ static const char* kBadFlags[] = {
|
||||
@@ -60,7 +60,6 @@ static const char* kBadFlags[] = {
|
||||
// These flags disable sandbox-related security.
|
||||
sandbox::policy::switches::kDisableGpuSandbox,
|
||||
sandbox::policy::switches::kDisableSeccompFilterSandbox,
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
label="$i18n{passwordsAutosigninLabel}"
|
||||
sub-label="$i18n{passwordsAutosigninDescription}">
|
||||
</settings-toggle-button>
|
||||
+<if expr="false">
|
||||
+<if expr="False">
|
||||
<div id="checkPasswordsBannerContainer" class="cr-row"
|
||||
hidden$="[[!shouldShowBanner_]]">
|
||||
<picture>
|
||||
@@ -177,7 +177,7 @@
|
||||
}
|
||||
</style>
|
||||
-<if expr="not chromeos_ash and not chromeos_lacros">
|
||||
+<if expr="false">
|
||||
+<if expr="False">
|
||||
<!-- Signout is not supported yet on lacros, https://crbug.com/1217645 -->
|
||||
<settings-toggle-button id="signinAllowedToggle"
|
||||
class="hr"
|
||||
@@ -243,7 +243,7 @@
|
||||
Profile* profile = browser()->profile();
|
||||
if (profile->IsOffTheRecord() || profile->IsGuestSession())
|
||||
return gfx::ImageSkia();
|
||||
@@ -457,8 +458,7 @@ void ProfileMenuView::BuildIdentity() {
|
||||
@@ -460,8 +461,7 @@ void ProfileMenuView::BuildIdentity() {
|
||||
menu_subtitle_);
|
||||
} else {
|
||||
menu_title_ = std::u16string();
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
core/inox-patchset/0001-fix-building-without-safebrowsing.patch
|
||||
core/inox-patchset/0003-disable-autofill-download-manager.patch
|
||||
core/inox-patchset/0005-disable-default-extensions.patch
|
||||
core/inox-patchset/0007-disable-web-resource-service.patch
|
||||
core/inox-patchset/0009-disable-google-ipv6-probes.patch
|
||||
core/inox-patchset/0015-disable-update-pings.patch
|
||||
core/inox-patchset/0021-disable-rlz.patch
|
||||
|
||||
43
pruning.list
43
pruning.list
@@ -73,7 +73,7 @@ chrome/browser/resources/chromeos/accessibility/select_to_speak/earcons/null_sel
|
||||
chrome/browser/resources/media/mei_preload/preloaded_data.pb
|
||||
chrome/browser/ui/app_list/search/search_result_ranker/20190722_example_preprocessor_config.pb
|
||||
chrome/browser/ui/app_list/search/search_result_ranker/search_ranker_assets/20190923_example_preprocessor_config.pb
|
||||
chrome/build/pgo_profiles/chrome-linux-5005-1653490340-736db1732ea5f3959ee14f875a1211fdb84a54af.profdata
|
||||
chrome/build/pgo_profiles/chrome-linux-5060-1655228597-bbe06f169cac6956903f78358c30d94a01938b2e.profdata
|
||||
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/Network Share Test.lnk
|
||||
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/New folder - Shortcut.lnk
|
||||
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/long_name.lnk
|
||||
@@ -8082,14 +8082,13 @@ third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-AES-GM
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-AES-KW.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-AES-KWP.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-AES-XTS.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-TDES-CBC.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-TDES-ECB.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/CMAC-AES.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ECDSA.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/HMAC-SHA-1.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/HMAC-SHA2-224.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/HMAC-SHA2-256.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/HMAC-SHA2-384.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/HMAC-SHA2-512-256.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/HMAC-SHA2-512.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/KAS-KDF.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/RSA.bz2
|
||||
@@ -8111,14 +8110,13 @@ third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-AES-GMA
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-AES-KW.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-AES-KWP.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-AES-XTS.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-TDES-CBC.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-TDES-ECB.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/CMAC-AES.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ECDSA.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/HMAC-SHA-1.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/HMAC-SHA2-224.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/HMAC-SHA2-256.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/HMAC-SHA2-384.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/HMAC-SHA2-512-256.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/HMAC-SHA2-512.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/KAS-ECC-SSC.bz2
|
||||
third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/KAS-FFC-SSC.bz2
|
||||
@@ -8337,6 +8335,20 @@ third_party/catapult/tracing/skp_data/google_homepage.skp
|
||||
third_party/catapult/tracing/skp_data/lthi_cats.skp
|
||||
third_party/checkstyle/checkstyle-all.jar
|
||||
third_party/closure_compiler/compiler/compiler.jar
|
||||
third_party/cpuinfo/src/test/dmesg/alldocube-iwork8.log
|
||||
third_party/cpuinfo/src/test/dmesg/galaxy-a3-2016-eu.log
|
||||
third_party/cpuinfo/src/test/dmesg/galaxy-grand-prime-value-edition.log
|
||||
third_party/cpuinfo/src/test/dmesg/galaxy-j1-2016.log
|
||||
third_party/cpuinfo/src/test/dmesg/galaxy-s7-global.log
|
||||
third_party/cpuinfo/src/test/dmesg/galaxy-s7-us.log
|
||||
third_party/cpuinfo/src/test/dmesg/galaxy-s8-us.log
|
||||
third_party/cpuinfo/src/test/dmesg/huawei-mate-8.log
|
||||
third_party/cpuinfo/src/test/dmesg/huawei-mate-9.log
|
||||
third_party/cpuinfo/src/test/dmesg/huawei-p9-lite.log
|
||||
third_party/cpuinfo/src/test/dmesg/iconia-one-10.log
|
||||
third_party/cpuinfo/src/test/dmesg/oppo-r9.log
|
||||
third_party/cpuinfo/src/test/dmesg/xperia-c4-dual.log
|
||||
third_party/cpuinfo/src/test/dmesg/zenfone-2.log
|
||||
third_party/crashpad/crashpad/handler/win/z7_test.dll
|
||||
third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/crashpad_snapshot_test_both_dt_hash_styles.so
|
||||
third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/ret42
|
||||
@@ -8345,7 +8357,6 @@ third_party/crashpad/crashpad/snapshot/ios/testdata/crash-5726011582644224
|
||||
third_party/crashpad/crashpad/snapshot/ios/testdata/crash-6605504629637120
|
||||
third_party/crashpad/crashpad/util/net/testdata/binary_http_body.dat
|
||||
third_party/dawn/test/tint/bug/tint/804.spv
|
||||
third_party/dawn/test/tint/bug/tint/807.spv
|
||||
third_party/dawn/third_party/webgpu-cts/deploy_key.enc
|
||||
third_party/dawn/third_party/webgpu-cts/src/resources/red-green.bt601.vp9.webm
|
||||
third_party/dawn/third_party/webgpu-cts/src/resources/red-green.mp4
|
||||
@@ -8673,7 +8684,6 @@ third_party/depot_tools/external_bin/gsutil/gsutil_4.68/gsutil/third_party/rsa/r
|
||||
third_party/depot_tools/external_bin/gsutil/gsutil_4.68/gsutil/third_party/rsa/rsa/__pycache__/randnum.cpython-38.pyc
|
||||
third_party/depot_tools/external_bin/gsutil/gsutil_4.68/gsutil/third_party/rsa/rsa/__pycache__/transform.cpython-38.pyc
|
||||
third_party/depot_tools/external_bin/gsutil/gsutil_4.68/gsutil/third_party/six/__pycache__/six.cpython-38.pyc
|
||||
third_party/depot_tools/ninja-linux32
|
||||
third_party/depot_tools/ninja-linux64
|
||||
third_party/depot_tools/ninja-mac
|
||||
third_party/depot_tools/ninja.exe
|
||||
@@ -10953,6 +10963,7 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuz
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5728971283496960
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5746142327865344
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5750379279548416
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5508865908670464
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5641053680173056
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5643036478930944
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5686186874503168
|
||||
@@ -11161,6 +11172,7 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5522792714993664
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5549945449480192
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5568200165687296
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609112151916544
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5616763250278400
|
||||
@@ -11259,6 +11271,7 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6276691949518848
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6315334756335616
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6316256152780800
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6365271012540416
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6372147008241664
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6382598554255360
|
||||
third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6421315436281856
|
||||
@@ -14554,6 +14567,8 @@ third_party/libzip/src/regress/zip64-3mf.zip
|
||||
third_party/libzip/src/regress/zip64.zip
|
||||
third_party/llvm/clang-tools-extra/clangd/test/index-serialization/Inputs/sample.idx
|
||||
third_party/llvm/clang/test/CodeGen/Inputs/thinlto-distributed-backend-skip.bc
|
||||
third_party/llvm/clang/test/Driver/Inputs/dummy-bc.bc
|
||||
third_party/llvm/clang/test/Driver/Inputs/dummy-elf.o
|
||||
third_party/llvm/clang/test/Driver/Inputs/openmp_static_device_link/lib.bc
|
||||
third_party/llvm/clang/test/Driver/at_file.c.args.utf16le
|
||||
third_party/llvm/clang/test/Misc/Inputs/serialized-diags-stable.dia
|
||||
@@ -16338,6 +16353,18 @@ third_party/pywebsocket3/src/test/cert/client_cert.p12
|
||||
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/rust/gimli/v0_26/crate/fixtures/self/debug_abbrev
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_aranges
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_info
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_inlined
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_line
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_loc
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_pubnames
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_pubtypes
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_ranges
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_str
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/eh_frame
|
||||
third_party/rust/gimli/v0_26/crate/fixtures/self/eh_frame_hdr
|
||||
third_party/rust/libloading/v0_7/crate/tests/nagisa32.dll
|
||||
third_party/rust/libloading/v0_7/crate/tests/nagisa64.dll
|
||||
third_party/rust/regex/v1/crate/src/testdata/basic.dat
|
||||
@@ -16868,6 +16895,7 @@ third_party/tflite/src/tensorflow/lite/testdata/call_once_mul.bin
|
||||
third_party/tflite/src/tensorflow/lite/testdata/conv3d_huge_im2col.bin
|
||||
third_party/tflite/src/tensorflow/lite/testdata/conv_huge_im2col.bin
|
||||
third_party/tflite/src/tensorflow/lite/testdata/custom_lstm.bin
|
||||
third_party/tflite/src/tensorflow/lite/testdata/custom_sinh.bin
|
||||
third_party/tflite/src/tensorflow/lite/testdata/double_flex.bin
|
||||
third_party/tflite/src/tensorflow/lite/testdata/dynamic_shapes.bin
|
||||
third_party/tflite/src/tensorflow/lite/testdata/empty_model.bin
|
||||
@@ -17073,6 +17101,7 @@ third_party/tflite_support/src/tensorflow_lite_support/metadata/python/tests/tes
|
||||
third_party/tflite_support/src/tensorflow_lite_support/metadata/python/tests/testdata/object_detector/coco_ssd_mobilenet_v1_1.0_quant_2018_06_29_score_calibration.tflite
|
||||
third_party/tflite_support/src/tensorflow_lite_support/metadata/python/tests/testdata/object_detector/efficientdet_lite0_v1.tflite
|
||||
third_party/tflite_support/src/tensorflow_lite_support/metadata/python/tests/testdata/object_detector/ssd_mobilenet_v1.tflite
|
||||
third_party/tflite_support/src/tensorflow_lite_support/scann_ondevice/cc/test/testdata/dummy_index.ldb
|
||||
third_party/vulkan-deps/glslang/src/Test/badChars.frag
|
||||
third_party/vulkan-deps/glslang/src/Test/remap.invalid-spirv-1.spv
|
||||
third_party/vulkan-deps/glslang/src/Test/remap.invalid-spirv-2.spv
|
||||
|
||||
Reference in New Issue
Block a user