mirror of
https://github.com/imputnet/helium.git
synced 2026-10-23 03:32:26 -05:00
merge: update ungoogled-chromium to 146.0.7680.65
This commit is contained in:
56 files changed
+1442
-1029
No files matched your search
@@ -1 +1 @@
|
||||
145.0.7632.116
|
||||
146.0.7680.65
|
||||
+254
-126
File diff suppressed because it is too large.
Load diff
@@ -9,7 +9,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2548,6 +2548,7 @@ static_library("browser") {
|
||||
@@ -2528,6 +2528,7 @@ static_library("browser") {
|
||||
"//third_party/libyuv",
|
||||
"//third_party/metrics_proto",
|
||||
"//third_party/re2",
|
||||
@@ -19,7 +19,7 @@
|
||||
"//third_party/widevine/cdm:headers",
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -187,6 +187,7 @@
|
||||
@@ -188,6 +188,7 @@
|
||||
#include "components/translate/core/common/translate_util.h"
|
||||
#include "components/trusted_vault/features.h"
|
||||
#include "components/ui_devtools/switches.h"
|
||||
@@ -44,7 +44,7 @@
|
||||
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -298,6 +298,7 @@ source_set("browser") {
|
||||
@@ -299,6 +299,7 @@ source_set("browser") {
|
||||
"//third_party/re2",
|
||||
"//third_party/snappy",
|
||||
"//third_party/sqlite",
|
||||
@@ -54,7 +54,7 @@
|
||||
"//tools/v8_context_snapshot:buildflags",
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -84,6 +84,7 @@
|
||||
@@ -83,6 +83,7 @@
|
||||
#include "components/services/storage/public/cpp/quota_error_or.h"
|
||||
#include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
|
||||
#include "components/tracing/common/tracing_switches.h"
|
||||
@@ -62,7 +62,7 @@
|
||||
#include "components/viz/common/switches.h"
|
||||
#include "components/viz/host/gpu_client.h"
|
||||
#include "components/viz/host/host_frame_sink_manager.h"
|
||||
@@ -3730,6 +3731,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3709,6 +3710,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kEnableWebGLImageChromium,
|
||||
switches::kEnableWebGPUDeveloperFeatures,
|
||||
switches::kFileUrlPathAlias,
|
||||
@@ -73,7 +73,7 @@
|
||||
switches::kForceHighContrast,
|
||||
--- a/content/child/BUILD.gn
|
||||
+++ b/content/child/BUILD.gn
|
||||
@@ -109,6 +109,7 @@ target(link_target_type, "child") {
|
||||
@@ -113,6 +113,7 @@ target(link_target_type, "child") {
|
||||
"//third_party/blink/public/common:buildflags",
|
||||
"//third_party/blink/public/strings",
|
||||
"//third_party/ced",
|
||||
@@ -91,7 +91,7 @@
|
||||
#include "ui/accessibility/accessibility_features.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#include "ui/events/blink/blink_features.h"
|
||||
@@ -488,6 +489,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -489,6 +490,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
true},
|
||||
{wrf::EnableWebAudioBypassOutputBufferingOptOut,
|
||||
blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
|
||||
@@ -104,7 +104,7 @@
|
||||
for (const auto& mapping : switchToFeatureMapping) {
|
||||
--- a/third_party/blink/public/platform/web_runtime_features.h
|
||||
+++ b/third_party/blink/public/platform/web_runtime_features.h
|
||||
@@ -71,6 +71,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe
|
||||
@@ -70,6 +70,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe
|
||||
|
||||
static void EnableLocalNetworkAccessWebRTC(bool);
|
||||
|
||||
@@ -124,9 +124,9 @@
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
#include "base/time/time.h"
|
||||
#include "base/trace_event/trace_event.h"
|
||||
@@ -1089,6 +1090,11 @@ Document::Document(const DocumentInit& i
|
||||
TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this),
|
||||
TRACE_EVENT_FLAG_FLOW_OUT);
|
||||
@@ -1043,6 +1044,11 @@ Document::Document(const DocumentInit& i
|
||||
data_(MakeGarbageCollected<DocumentData>(GetExecutionContext())) {
|
||||
TRACE_EVENT("blink", "Document::Document", perfetto::Flow::FromPointer(this));
|
||||
DCHECK(agent_);
|
||||
+ if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
|
||||
+ // Precompute -0.0003% to 0.0003% noise factor for get*ClientRect*() fingerprinting
|
||||
@@ -136,7 +136,7 @@
|
||||
if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) &&
|
||||
features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) {
|
||||
script_runner_delayer_->Activate();
|
||||
@@ -1222,6 +1228,14 @@ const Position Document::PositionAdjuste
|
||||
@@ -1176,6 +1182,14 @@ const Position Document::PositionAdjuste
|
||||
return Position::BeforeNode(*shadow_host);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
selector_query_cache_ = MakeGarbageCollected<SelectorQueryCache>();
|
||||
--- a/third_party/blink/renderer/core/dom/document.h
|
||||
+++ b/third_party/blink/renderer/core/dom/document.h
|
||||
@@ -570,6 +570,10 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -571,6 +571,10 @@ class CORE_EXPORT Document : public Cont
|
||||
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
V8VisibilityState visibilityState() const;
|
||||
String visibilityStateAsString() const;
|
||||
bool IsPageVisible() const;
|
||||
@@ -2821,6 +2825,9 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -2842,6 +2846,9 @@ class CORE_EXPORT Document : public Cont
|
||||
|
||||
base::ElapsedTimer start_time_;
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
// - ScriptSchedulingType::kInOrder
|
||||
--- a/third_party/blink/renderer/core/dom/element.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/element.cc
|
||||
@@ -3440,6 +3440,9 @@ Vector<gfx::RectF> Element::GetClientRec
|
||||
@@ -3444,6 +3444,9 @@ Vector<gfx::RectF> Element::GetClientRec
|
||||
}
|
||||
Vector<gfx::RectF> result;
|
||||
for (auto& quad : quads) {
|
||||
@@ -186,7 +186,7 @@
|
||||
result.emplace_back(quad.BoundingBox());
|
||||
}
|
||||
return result;
|
||||
@@ -3469,6 +3472,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
@@ -3473,6 +3476,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
|
||||
*element_layout_object);
|
||||
@@ -264,7 +264,7 @@
|
||||
const TextDirection& direction,
|
||||
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
@@ -103,6 +103,9 @@
|
||||
@@ -102,6 +102,9 @@
|
||||
// https://github.com/include-what-you-use/include-what-you-use/issues/1122
|
||||
// IWYU pragma: no_include "base/numerics/clamped_math.h"
|
||||
|
||||
@@ -274,7 +274,7 @@
|
||||
namespace blink {
|
||||
|
||||
class MemoryManagedPaintCanvas;
|
||||
@@ -1171,9 +1174,22 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
@@ -1165,9 +1168,22 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
TextDirection direction =
|
||||
ToTextDirection(state.GetDirection(), host, computed_style);
|
||||
|
||||
@@ -300,7 +300,7 @@
|
||||
String BaseRenderingContext2D::lang() const {
|
||||
--- a/third_party/blink/renderer/platform/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/platform/BUILD.gn
|
||||
@@ -1809,6 +1809,7 @@ component("platform") {
|
||||
@@ -1812,6 +1812,7 @@ component("platform") {
|
||||
"//components/paint_preview/common",
|
||||
"//components/search_engines:search_engine_utils",
|
||||
"//components/translate/core/language_detection",
|
||||
@@ -310,7 +310,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
|
||||
@@ -72,4 +72,12 @@ void WebRuntimeFeatures::EnableLocalNetw
|
||||
@@ -68,4 +68,12 @@ void WebRuntimeFeatures::EnableLocalNetw
|
||||
RuntimeEnabledFeatures::SetLocalNetworkAccessWebRTCEnabled(enable);
|
||||
}
|
||||
|
||||
@@ -335,7 +335,7 @@
|
||||
#include "third_party/skia/include/core/SkImage.h"
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2541,6 +2541,12 @@
|
||||
@@ -2626,6 +2626,12 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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
|
||||
@@ -2226,6 +2226,7 @@ static_library("browser") {
|
||||
@@ -2213,6 +2213,7 @@ static_library("browser") {
|
||||
"//components/net_log",
|
||||
"//components/network_hints/common:mojo_bindings",
|
||||
"//components/network_session_configurator/browser",
|
||||
@@ -65,7 +65,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
#include "base/synchronization/waitable_event.h"
|
||||
#include "base/task/sequenced_task_runner.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
@@ -116,6 +118,7 @@
|
||||
@@ -119,6 +121,7 @@
|
||||
#include "components/metrics/metrics_service.h"
|
||||
#include "components/metrics_services_manager/metrics_services_manager.h"
|
||||
#include "components/metrics_services_manager/metrics_services_manager_client.h"
|
||||
@@ -73,7 +73,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
#include "components/network_time/network_time_tracker.h"
|
||||
#include "components/os_crypt/async/browser/os_crypt_async.h"
|
||||
#include "components/permissions/permissions_client.h"
|
||||
@@ -152,6 +155,7 @@
|
||||
@@ -156,6 +159,7 @@
|
||||
#include "extensions/common/constants.h"
|
||||
#include "media/media_buildflags.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
@@ -81,7 +81,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
#include "printing/buildflags/buildflags.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "services/network/public/cpp/network_switches.h"
|
||||
@@ -464,6 +468,18 @@ void BrowserProcessImpl::Init() {
|
||||
@@ -470,6 +474,18 @@ void BrowserProcessImpl::Init() {
|
||||
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
|
||||
base::BindRepeating(&ApplyMetricsReportingPolicy));
|
||||
|
||||
@@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -2718,6 +2718,10 @@ inline constexpr char kLogJsConsoleMessa
|
||||
@@ -2765,6 +2765,10 @@ inline constexpr char kLogJsConsoleMessa
|
||||
"Enable logging JS console messages in system logs, please note that they "
|
||||
"may contain PII.";
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
|
||||
|
||||
--- a/chrome/browser/ui/startup/infobar_utils.cc
|
||||
+++ b/chrome/browser/ui/startup/infobar_utils.cc
|
||||
@@ -180,10 +180,6 @@ void AddInfoBarsIfNecessary(BrowserWindo
|
||||
@@ -186,10 +186,6 @@ void AddInfoBarsIfNecessary(BrowserWindo
|
||||
infobars::ContentInfoBarManager* infobar_manager =
|
||||
infobars::ContentInfoBarManager::FromWebContents(web_contents);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
|
||||
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
|
||||
@@ -925,94 +925,6 @@ std::tuple<GURL, std::string> AutofillCr
|
||||
@@ -916,94 +916,6 @@ std::tuple<GURL, std::string> AutofillCr
|
||||
}
|
||||
|
||||
bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -457,14 +457,6 @@ group("gn_all") {
|
||||
@@ -456,14 +456,6 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3773,8 +3773,6 @@ static_library("browser") {
|
||||
@@ -3749,8 +3749,6 @@ static_library("browser") {
|
||||
"download/download_auto_open_policy_handler.cc",
|
||||
"download/download_auto_open_policy_handler.h",
|
||||
"download/download_commands.cc",
|
||||
@@ -11,7 +11,7 @@
|
||||
"download/download_dir_util.cc",
|
||||
--- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
|
||||
@@ -393,10 +393,6 @@ void CreateAndAddChromeThrottlesForNavig
|
||||
@@ -418,10 +418,6 @@ void CreateAndAddChromeThrottlesForNavig
|
||||
Profile::FromBrowserContext(context)),
|
||||
SafeSearchFactory::GetForBrowserContext(context)));
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
// Whether the download is currently being revived.
|
||||
bool is_being_revived_ = false;
|
||||
@@ -465,13 +465,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
@@ -466,13 +466,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
data->should_prefer_opening_in_browser_ = preference;
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
#include "chrome/browser/ui/browser.h"
|
||||
#include "chrome/browser/ui/browser_window.h"
|
||||
#endif
|
||||
@@ -1365,9 +1364,6 @@ DownloadsAcceptDangerFunction::Downloads
|
||||
@@ -1367,9 +1366,6 @@ DownloadsAcceptDangerFunction::Downloads
|
||||
|
||||
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() = default;
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
|
||||
std::optional<downloads::AcceptDanger::Params> params =
|
||||
downloads::AcceptDanger::Params::Create(args());
|
||||
@@ -1415,50 +1411,13 @@ void DownloadsAcceptDangerFunction::Prom
|
||||
@@ -1417,50 +1413,13 @@ void DownloadsAcceptDangerFunction::Prom
|
||||
}
|
||||
RecordApiFunctions(DownloadsFunctionName::kDownloadsFunctionAcceptDanger);
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
@@ -186,7 +186,7 @@
|
||||
class DownloadsShowFunction : public ExtensionFunction {
|
||||
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
@@ -717,18 +717,6 @@ void WebstorePrivateBeginInstallWithMani
|
||||
@@ -728,18 +728,6 @@ void WebstorePrivateBeginInstallWithMani
|
||||
|
||||
void WebstorePrivateBeginInstallWithManifest3Function::
|
||||
ReportFrictionAcceptedEvent() {
|
||||
@@ -223,7 +223,7 @@
|
||||
|
||||
if (enable_extensions) {
|
||||
deps += [ "//chrome/browser/ui/web_applications" ]
|
||||
@@ -624,6 +626,7 @@ static_library("advanced_protection") {
|
||||
@@ -626,6 +628,7 @@ static_library("advanced_protection") {
|
||||
}
|
||||
|
||||
source_set("metrics_collector") {
|
||||
@@ -231,7 +231,7 @@
|
||||
sources = [
|
||||
"safe_browsing_metrics_collector_factory.cc",
|
||||
"safe_browsing_metrics_collector_factory.h",
|
||||
@@ -643,6 +646,7 @@ source_set("metrics_collector") {
|
||||
@@ -645,6 +648,7 @@ source_set("metrics_collector") {
|
||||
"//components/safe_browsing/core/common:safe_browsing_prefs",
|
||||
"//content/public/browser",
|
||||
]
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
void BackgroundModeManager::RegisterProfile(Profile* profile) {
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -1421,7 +1421,7 @@ void ChromeContentBrowserClient::Registe
|
||||
@@ -1449,7 +1449,7 @@ void ChromeContentBrowserClient::Registe
|
||||
void ChromeContentBrowserClient::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
|
||||
@@ -22,7 +22,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
|
||||
@@ -607,7 +607,7 @@ void ProfileNetworkContextService::Confi
|
||||
@@ -593,7 +593,7 @@ void ProfileNetworkContextService::Confi
|
||||
void ProfileNetworkContextService::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
|
||||
@@ -66,7 +66,7 @@
|
||||
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
|
||||
--- a/components/autofill/core/common/autofill_prefs.cc
|
||||
+++ b/components/autofill/core/common/autofill_prefs.cc
|
||||
@@ -31,7 +31,7 @@ constexpr char kAutofillRanQuasiDuplicat
|
||||
@@ -35,7 +35,7 @@ constexpr char kAutofillRanExtraDeduplic
|
||||
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -75,7 +75,7 @@
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
registry->RegisterIntegerPref(
|
||||
kAutofillLastVersionDeduped, 0,
|
||||
@@ -59,7 +59,7 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
@@ -63,7 +63,7 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
kAutofillHasSeenIban, false,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -86,7 +86,7 @@
|
||||
kAutofillPaymentCvcStorage, true,
|
||||
--- a/components/bookmarks/browser/bookmark_utils.cc
|
||||
+++ b/components/bookmarks/browser/bookmark_utils.cc
|
||||
@@ -449,7 +449,7 @@ bool DoesBookmarkContainWords(const std:
|
||||
@@ -450,7 +450,7 @@ bool DoesBookmarkContainWords(const std:
|
||||
|
||||
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -108,7 +108,7 @@
|
||||
|
||||
--- a/components/password_manager/core/browser/password_manager.cc
|
||||
+++ b/components/password_manager/core/browser/password_manager.cc
|
||||
@@ -548,10 +548,10 @@ PasswordForm CreateFormForLeakCheck(cons
|
||||
@@ -547,10 +547,10 @@ PasswordForm CreateFormForLeakCheck(cons
|
||||
void PasswordManager::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
|
||||
@@ -101,7 +101,7 @@ by default.
|
||||
scoped_refptr<base::SequencedTaskRunner> task_runner)
|
||||
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
@@ -529,7 +529,7 @@ void WebRtcLogUploader::UploadCompressed
|
||||
@@ -473,7 +473,7 @@ void WebRtcLogUploader::UploadCompressed
|
||||
}
|
||||
})");
|
||||
|
||||
@@ -249,20 +249,29 @@ by default.
|
||||
url::Component query(0, static_cast<int>(str.length())), key, value;
|
||||
--- a/components/history/core/browser/web_history_service.cc
|
||||
+++ b/components/history/core/browser/web_history_service.cc
|
||||
@@ -44,13 +44,13 @@ namespace history {
|
||||
@@ -47,19 +47,19 @@ namespace history {
|
||||
namespace {
|
||||
|
||||
const char kHistoryQueryHistoryUrl[] =
|
||||
const char kOldQueryHistoryUrl[] =
|
||||
- "https://history.google.com/history/api/lookup?client=chrome";
|
||||
+ "trk:139:https://history.google.com/history/api/lookup?client=chrome";
|
||||
+ "trk:134:https://history.google.com/history/api/lookup?client=chrome";
|
||||
const char kNewQueryHistoryUrl[] =
|
||||
- "https://footprints-pa.googleapis.com/v1/read_chrome_history";
|
||||
+ "trk:135:https://footprints-pa.googleapis.com/v1/read_chrome_history";
|
||||
|
||||
const char kHistoryDeleteHistoryUrl[] =
|
||||
const char kOldHistoryDeleteHistoryUrl[] =
|
||||
- "https://history.google.com/history/api/delete?client=chrome";
|
||||
+ "trk:140:https://history.google.com/history/api/delete?client=chrome";
|
||||
+ "trk:136:https://history.google.com/history/api/delete?client=chrome";
|
||||
const char kNewHistoryDeleteHistoryUrl[] =
|
||||
- "https://footprints-pa.googleapis.com/v1/delete_chrome_history";
|
||||
+ "trk:137:https://footprints-pa.googleapis.com/v1/delete_chrome_history";
|
||||
|
||||
const char kQueryWebAndAppActivityUrl[] =
|
||||
const char kOldQueryWebAndAppActivityUrl[] =
|
||||
- "https://history.google.com/history/api/lookup?client=web_app";
|
||||
+ "trk:138:https://history.google.com/history/api/lookup?client=web_app";
|
||||
const char kNewQueryWebAndAppActivityUrl[] =
|
||||
- "https://footprints-pa.googleapis.com/v1/get_facs";
|
||||
+ "trk:139:https://footprints-pa.googleapis.com/v1/get_facs";
|
||||
|
||||
const char kQueryOtherFormsOfBrowsingHistoryUrlSuffix[] = "/historystatus";
|
||||
|
||||
@@ -298,7 +307,7 @@ by default.
|
||||
+ "trk:238:https://safesearch.googleapis.com/v1:classify";
|
||||
|
||||
std::string BuildResponse(bool is_porn) {
|
||||
base::Value::Dict dict;
|
||||
base::DictValue dict;
|
||||
--- a/components/translate/core/browser/translate_url_fetcher.cc
|
||||
+++ b/components/translate/core/browser/translate_url_fetcher.cc
|
||||
@@ -101,6 +101,7 @@ bool TranslateURLFetcher::Request(const
|
||||
@@ -311,7 +320,7 @@ by default.
|
||||
std::move(resource_request),
|
||||
--- a/components/translate/core/common/translate_util.cc
|
||||
+++ b/components/translate/core/common/translate_util.cc
|
||||
@@ -13,7 +13,7 @@
|
||||
@@ -28,7 +28,7 @@ constexpr int kMaxNumberOfAutoNever = 2;
|
||||
|
||||
namespace translate {
|
||||
|
||||
@@ -675,17 +684,17 @@ by default.
|
||||
const int kMaxSecurePort = 65535;
|
||||
|
||||
std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) {
|
||||
--- a/remoting/protocol/jingle_messages.cc
|
||||
+++ b/remoting/protocol/jingle_messages.cc
|
||||
@@ -28,7 +28,7 @@ const char kJabberNamespace[] = "jabber:
|
||||
const char kJingleNamespace[] = "urn:xmpp:jingle:1";
|
||||
--- a/remoting/protocol/jingle_message_xml_converter.cc
|
||||
+++ b/remoting/protocol/jingle_message_xml_converter.cc
|
||||
@@ -37,7 +37,7 @@ const jingle_xmpp::StaticQName kQNameRea
|
||||
const jingle_xmpp::StaticQName kQNameContent = {kJingleNamespace, "content"};
|
||||
|
||||
// Namespace for transport messages when using standard ICE.
|
||||
-const char kIceTransportNamespace[] = "google:remoting:ice";
|
||||
+const char kIceTransportNamespace[] = "trk:100:google:remoting:ice";
|
||||
|
||||
const char kWebrtcTransportNamespace[] = "google:remoting:webrtc";
|
||||
|
||||
const jingle_xmpp::StaticQName kQNameIceTransport = {kIceTransportNamespace,
|
||||
"transport"};
|
||||
const jingle_xmpp::StaticQName kQNameIceCredentials = {kIceTransportNamespace,
|
||||
--- a/rlz/lib/lib_values.cc
|
||||
+++ b/rlz/lib/lib_values.cc
|
||||
@@ -45,7 +45,7 @@ const char kSetDccResponseVariable[] = "
|
||||
|
||||
@@ -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
|
||||
@@ -1829,30 +1829,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
@@ -1858,30 +1858,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
// and preferences have been registered since some of the import code depends
|
||||
// on preferences.
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
# Paths from the root of the tree to directories to skip.
|
||||
PRUNE_PATHS = set([
|
||||
# Placeholder directory only, not third-party code.
|
||||
@@ -1006,7 +1014,7 @@ def _DiscoverMetadatas(args):
|
||||
@@ -1010,7 +1018,7 @@ def _DiscoverMetadatas(args):
|
||||
LogParseDirErrors(errors)
|
||||
|
||||
metadatas.sort(key=lambda m: (m['Name'].lower(), m['dir']))
|
||||
@@ -65,7 +65,7 @@
|
||||
return metadatas, had_errors
|
||||
|
||||
|
||||
@@ -1083,8 +1091,8 @@ def GenerateCredits(args, metadatas):
|
||||
@@ -1087,8 +1095,8 @@ def GenerateCredits(args, metadatas):
|
||||
entries_contents = '\n'.join([entry['content'] for entry in entries])
|
||||
|
||||
reciprocal_contents = EvaluateTemplate(reciprocal_template, {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
--- a/chrome/browser/ui/browser.cc
|
||||
+++ b/chrome/browser/ui/browser.cc
|
||||
@@ -141,6 +141,7 @@
|
||||
@@ -140,6 +140,7 @@
|
||||
#include "chrome/browser/ui/views/frame/browser_view.h"
|
||||
#include "chrome/browser/ui/views/frame/contents_web_view.h"
|
||||
#include "chrome/browser/ui/views/frame/multi_contents_view.h"
|
||||
+#include "chrome/browser/ui/views/message_box_dialog.h"
|
||||
#include "chrome/browser/ui/views/side_panel/side_panel_ui.h"
|
||||
#include "chrome/browser/ui/views/status_bubble_views.h"
|
||||
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
|
||||
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
|
||||
@@ -598,6 +599,7 @@ Browser::Browser(const CreateParams& par
|
||||
@@ -587,6 +588,7 @@ Browser::Browser(const CreateParams& par
|
||||
should_trigger_session_restore_(params.should_trigger_session_restore),
|
||||
cancel_download_confirmation_state_(
|
||||
CancelDownloadConfirmationState::kNotPrompted),
|
||||
@@ -16,43 +16,24 @@
|
||||
override_bounds_(params.initial_bounds),
|
||||
initial_show_state_(params.initial_show_state),
|
||||
initial_workspace_(params.initial_workspace),
|
||||
@@ -985,20 +987,22 @@ Browser::WarnBeforeClosingResult Browser
|
||||
@@ -974,10 +976,12 @@ Browser::WarnBeforeClosingResult Browser
|
||||
return WarnBeforeClosingResult::kOkToClose;
|
||||
}
|
||||
|
||||
- // `CanCloseWithInProgressDownloads()` may trigger a modal dialog.
|
||||
- bool can_close_with_downloads = CanCloseWithInProgressDownloads();
|
||||
- if (can_close_with_downloads &&
|
||||
- !ShouldShowCookieMigrationNoticeForBrowser(*this)) {
|
||||
- if (can_close_with_downloads) {
|
||||
- return WarnBeforeClosingResult::kOkToClose;
|
||||
- }
|
||||
+ if (CanCloseWithMultipleTabs()) {
|
||||
+ // `CanCloseWithInProgressDownloads()` may trigger a modal dialog.
|
||||
+ bool can_close_with_downloads = CanCloseWithInProgressDownloads();
|
||||
+ if (can_close_with_downloads &&
|
||||
+ !ShouldShowCookieMigrationNoticeForBrowser(*this)) {
|
||||
+ return WarnBeforeClosingResult::kOkToClose;
|
||||
+ }
|
||||
|
||||
- // If there is no download warning, show the cookie migration notice now.
|
||||
- // Otherwise, the download warning is being shown. Cookie migration notice
|
||||
- // will be shown after, if needed.
|
||||
- if (can_close_with_downloads) {
|
||||
- ShowCookieClearOnExitMigrationNotice(
|
||||
- *this, base::BindOnce(&Browser::CookieMigrationNoticeResponse,
|
||||
- weak_factory_.GetWeakPtr()));
|
||||
+ // If there is no download warning, show the cookie migration notice now.
|
||||
+ // Otherwise, the download warning is being shown. Cookie migration notice
|
||||
+ // will be shown after, if needed.
|
||||
+ if (can_close_with_downloads) {
|
||||
+ ShowCookieClearOnExitMigrationNotice(
|
||||
+ *this, base::BindOnce(&Browser::CookieMigrationNoticeResponse,
|
||||
+ weak_factory_.GetWeakPtr()));
|
||||
+ return WarnBeforeClosingResult::kOkToClose;
|
||||
+ }
|
||||
}
|
||||
|
||||
DCHECK(!warn_before_closing_callback_)
|
||||
@@ -1052,6 +1056,7 @@ bool Browser::TryToCloseWindow(
|
||||
@@ -1031,6 +1035,7 @@ bool Browser::TryToCloseWindow(
|
||||
void Browser::ResetTryToCloseWindow() {
|
||||
cancel_download_confirmation_state_ =
|
||||
CancelDownloadConfirmationState::kNotPrompted;
|
||||
@@ -60,7 +41,7 @@
|
||||
unload_controller_.ResetTryToCloseWindow();
|
||||
}
|
||||
|
||||
@@ -3556,6 +3561,58 @@ bool Browser::CanCloseWithInProgressDown
|
||||
@@ -3538,6 +3543,59 @@ bool Browser::CanCloseWithInProgressDown
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -80,14 +61,15 @@
|
||||
+
|
||||
+ // Figure out how many windows are open total
|
||||
+ int total_window_count = 0;
|
||||
+ for (Browser* browser : *BrowserList::GetInstance()) {
|
||||
+ GlobalBrowserCollection::GetInstance()->ForEach([&total_window_count, this](BrowserWindowInterface* browser) {
|
||||
+ // Don't count this browser window or any other in the process of closing.
|
||||
+ // Window closing may be delayed, and windows that are in the process of
|
||||
+ // closing don't count against our totals.
|
||||
+ if (browser == this || browser->IsAttemptingToCloseBrowser())
|
||||
+ continue;
|
||||
+ total_window_count++;
|
||||
+ }
|
||||
+ if (browser != this && !browser->capabilities()->IsAttemptingToCloseBrowser()) {
|
||||
+ total_window_count++;
|
||||
+ }
|
||||
+ return true;
|
||||
+ });
|
||||
+
|
||||
+ const auto flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("close-confirmation");
|
||||
+ bool show_confirmation_last_window = flag_value == "last";
|
||||
@@ -119,7 +101,7 @@
|
||||
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
|
||||
if (cancel_downloads) {
|
||||
cancel_download_confirmation_state_ =
|
||||
@@ -3584,6 +3641,22 @@ void Browser::InProgressDownloadResponse
|
||||
@@ -3559,6 +3617,22 @@ void Browser::InProgressDownloadResponse
|
||||
|
||||
std::move(warn_before_closing_callback_)
|
||||
.Run(WarnBeforeClosingResult::kDoNotClose);
|
||||
@@ -141,7 +123,7 @@
|
||||
+ .Run(WarnBeforeClosingResult::kDoNotClose);
|
||||
}
|
||||
|
||||
void Browser::CookieMigrationNoticeResponse(bool proceed_closing) {
|
||||
void Browser::FinishWarnBeforeClosing(WarnBeforeClosingResult result) {
|
||||
--- a/chrome/browser/ui/browser.h
|
||||
+++ b/chrome/browser/ui/browser.h
|
||||
@@ -33,6 +33,7 @@
|
||||
@@ -152,7 +134,7 @@
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model.h"
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
||||
#include "chrome/browser/ui/unload_controller.h"
|
||||
@@ -1146,12 +1147,17 @@ class Browser : public TabStripModelObse
|
||||
@@ -1135,12 +1136,17 @@ class Browser : public TabStripModelObse
|
||||
// Returns true if the window can close, false otherwise.
|
||||
bool CanCloseWithInProgressDownloads();
|
||||
|
||||
@@ -170,7 +152,7 @@
|
||||
// Called when the user has decided whether to proceed or not with the browser
|
||||
// closure, in case the cookie migration notice was shown. |proceed_closing|
|
||||
// is true if the browser can be closed.
|
||||
@@ -1327,6 +1333,8 @@ class Browser : public TabStripModelObse
|
||||
@@ -1311,6 +1317,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
|
||||
@@ -800,11 +800,15 @@ bool HandleNewTabPageLocationOverride(
|
||||
@@ -815,11 +815,15 @@ bool HandleNewTabPageLocationOverride(
|
||||
|
||||
// Don't change the URL when incognito mode.
|
||||
if (profile->IsOffTheRecord()) {
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "third_party/blink/public/common/input/web_menu_source_type.h"
|
||||
#include "third_party/blink/public/platform/web_input_event_result.h"
|
||||
#include "third_party/blink/renderer/core/annotation/annotation_agent_impl.h"
|
||||
@@ -1448,10 +1449,14 @@ FrameSelection& SelectionController::Sel
|
||||
@@ -1461,10 +1462,14 @@ FrameSelection& SelectionController::Sel
|
||||
}
|
||||
|
||||
bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_widget.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_widget.cc
|
||||
@@ -615,5 +615,7 @@ bool BrowserWidget::RegenerateFrameOnThe
|
||||
@@ -609,6 +609,8 @@ bool BrowserWidget::RegenerateFrameOnThe
|
||||
}
|
||||
|
||||
bool BrowserWidget::IsIncognitoBrowser() const {
|
||||
@@ -8,6 +8,7 @@
|
||||
+ return false;
|
||||
return browser_view_->browser()->profile()->IsIncognitoProfile();
|
||||
}
|
||||
|
||||
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
||||
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
||||
@@ -49,6 +49,7 @@
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/format_macros.h"
|
||||
#include "base/functional/bind.h"
|
||||
@@ -553,6 +554,15 @@ AutocompleteController::AutocompleteCont
|
||||
@@ -554,6 +555,15 @@ AutocompleteController::AutocompleteCont
|
||||
metrics::OmniboxEventProto::UNKNOWN_POSITION),
|
||||
config_(config) {
|
||||
config_.provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
|
||||
@@ -49,9 +49,9 @@
|
||||
+ const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering");
|
||||
+ config_.provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |
|
||||
+ AutocompleteProvider::TYPE_HISTORY_URL | AutocompleteProvider::TYPE_BOOKMARK | AutocompleteProvider::TYPE_BUILTIN;
|
||||
+ if (!base::Contains(flag_value, "bookmarks"))
|
||||
+ if (!flag_value.contains("bookmarks"))
|
||||
+ config_.provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;
|
||||
+ if (!base::Contains(flag_value, "chrome"))
|
||||
+ if (!flag_value.contains("chrome"))
|
||||
+ config_.provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;
|
||||
+ }
|
||||
|
||||
@@ -91,21 +91,20 @@
|
||||
if (minimal_changes)
|
||||
--- a/components/url_formatter/url_fixer.cc
|
||||
+++ b/components/url_formatter/url_fixer.cc
|
||||
@@ -10,6 +10,8 @@
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <string_view>
|
||||
|
||||
#include "base/check_op.h"
|
||||
+#include "base/containers/contains.h"
|
||||
+#include "base/command_line.h"
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/files/file_util.h"
|
||||
@@ -644,6 +646,8 @@ GURL FixupURLInternal(const std::string&
|
||||
@@ -643,6 +644,8 @@ GURL FixupURLInternal(const std::string&
|
||||
|
||||
FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
|
||||
if (chrome_url && !parts.host.is_valid()) {
|
||||
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") ||
|
||||
+ base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome"))
|
||||
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering").contains("chrome"))
|
||||
url.append(kChromeUIDefaultHost);
|
||||
}
|
||||
FixupPort(trimmed, parts.port, &url);
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/tab_helpers.cc
|
||||
+++ b/chrome/browser/ui/tab_helpers.cc
|
||||
@@ -564,7 +564,9 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
@@ -562,7 +562,9 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
profile, web_contents);
|
||||
#endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
|
||||
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
|
||||
@@ -25,7 +25,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/chrome/renderer/chrome_render_frame_observer.cc
|
||||
+++ b/chrome/renderer/chrome_render_frame_observer.cc
|
||||
@@ -269,14 +269,16 @@ void ChromeRenderFrameObserver::DidFinis
|
||||
@@ -271,14 +271,16 @@ void ChromeRenderFrameObserver::DidFinis
|
||||
if (frame->Parent() || frame->IsInFencedFrameTree())
|
||||
return;
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
}
|
||||
|
||||
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
|
||||
@@ -2491,6 +2499,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
@@ -2497,6 +2505,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
}
|
||||
|
||||
void TemplateURLService::Init() {
|
||||
@@ -101,7 +101,7 @@
|
||||
if (client_) {
|
||||
client_->SetOwner(this);
|
||||
}
|
||||
@@ -2656,6 +2666,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
@@ -2662,6 +2672,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
|
||||
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
|
||||
const std::string& host) const {
|
||||
@@ -113,7 +113,7 @@
|
||||
return true;
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -912,6 +912,8 @@ class TemplateURLService final : public
|
||||
@@ -914,6 +914,8 @@ class TemplateURLService final : public
|
||||
|
||||
raw_ref<TemplateURLPrepopulateData::Resolver> prepopulate_data_resolver_;
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// BrowserView::GetAccessibleTabLabel to get the updated accessible name.
|
||||
--- a/chrome/browser/ui/views/tabs/tab.h
|
||||
+++ b/chrome/browser/ui/views/tabs/tab.h
|
||||
@@ -102,6 +102,7 @@ class Tab : public gfx::AnimationDelegat
|
||||
@@ -104,6 +104,7 @@ class Tab : public gfx::AnimationDelegat
|
||||
void OnMouseEntered(const ui::MouseEvent& event) override;
|
||||
void OnMouseExited(const ui::MouseEvent& event) override;
|
||||
void OnGestureEvent(ui::GestureEvent* event) override;
|
||||
@@ -51,6 +51,9 @@
|
||||
if (tab_container_) {
|
||||
tab_container_->UpdateHoverCard(tab, update_type);
|
||||
}
|
||||
if (tab_container_) {
|
||||
tab_container_->UpdateHoverCard(tab, update_type);
|
||||
}
|
||||
--- a/chrome/browser/ungoogled_flag_choices.h
|
||||
+++ b/chrome/browser/ungoogled_flag_choices.h
|
||||
@@ -70,4 +70,13 @@ const FeatureEntry::Choice kCloseConfirm
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/browser_features.cc
|
||||
+++ b/chrome/browser/browser_features.cc
|
||||
@@ -262,4 +262,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
|
||||
@@ -265,4 +265,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
|
||||
// show both in Chrome Tabs and Windows.
|
||||
BASE_FEATURE(kRemovalOfIWAsFromTabCapture, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
} // namespace features
|
||||
--- a/chrome/browser/browser_features.h
|
||||
+++ b/chrome/browser/browser_features.h
|
||||
@@ -113,6 +113,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
|
||||
@@ -115,6 +115,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
|
||||
// module, e.g.
|
||||
// //chrome/browser/<foo_module>/features.h
|
||||
//
|
||||
@@ -45,11 +45,11 @@
|
||||
+ chrome_browsing_data_remover::DATA_TYPE_SITE_DATA;
|
||||
+}
|
||||
+
|
||||
uint64_t GetOriginTypeMask(const base::Value::List& data_types) {
|
||||
uint64_t GetOriginTypeMask(const base::ListValue& data_types) {
|
||||
uint64_t result = 0;
|
||||
for (const auto& data_type : data_types) {
|
||||
@@ -329,9 +345,10 @@ void ChromeBrowsingDataLifetimeManager::
|
||||
const base::Value::List& data_types = profile_->GetPrefs()->GetList(
|
||||
const base::ListValue& data_types = profile_->GetPrefs()->GetList(
|
||||
browsing_data::prefs::kClearBrowsingDataOnExitList);
|
||||
|
||||
- if (!data_types.empty() &&
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
|
||||
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
|
||||
@@ -19,6 +19,7 @@
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include "base/check.h"
|
||||
#include "base/check_op.h"
|
||||
|
||||
@@ -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
|
||||
@@ -1129,10 +1129,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
@@ -1130,10 +1130,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
return DownloadConfirmationReason::SAVE_AS;
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
||||
@@ -69,7 +69,7 @@
|
||||
// Don't prompt for file types that are marked for opening automatically.
|
||||
--- a/chrome/browser/extensions/extension_management.cc
|
||||
+++ b/chrome/browser/extensions/extension_management.cc
|
||||
@@ -335,6 +335,13 @@ bool ExtensionManagement::IsInstallation
|
||||
@@ -336,6 +336,13 @@ bool ExtensionManagement::IsInstallation
|
||||
bool ExtensionManagement::IsOffstoreInstallAllowed(
|
||||
const GURL& url,
|
||||
const GURL& referrer_url) const {
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/content/renderer/render_frame_impl.cc
|
||||
+++ b/content/renderer/render_frame_impl.cc
|
||||
@@ -1192,6 +1192,8 @@ WindowOpenDisposition NavigationPolicyTo
|
||||
@@ -1211,6 +1211,8 @@ WindowOpenDisposition NavigationPolicyTo
|
||||
case blink::kWebNavigationPolicyNewWindow:
|
||||
return WindowOpenDisposition::NEW_WINDOW;
|
||||
case blink::kWebNavigationPolicyNewPopup:
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/startup/infobar_utils.cc
|
||||
+++ b/chrome/browser/ui/startup/infobar_utils.cc
|
||||
@@ -142,6 +142,7 @@ void AddInfoBarsIfNecessary(BrowserWindo
|
||||
@@ -148,6 +148,7 @@ void AddInfoBarsIfNecessary(BrowserWindo
|
||||
|
||||
// Web apps should not display the session restore bubble (crbug.com/1264121)
|
||||
const bool should_display_bubble =
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
--- a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
|
||||
+++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
|
||||
--- a/chrome/browser/ui/views/extensions/extensions_toolbar_desktop.cc
|
||||
+++ b/chrome/browser/ui/views/extensions/extensions_toolbar_desktop.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/functional/callback_helpers.h"
|
||||
@@ -36,6 +37,7 @@
|
||||
@@ -37,6 +38,7 @@
|
||||
#include "chrome/browser/ui/views/side_panel/extensions/extension_side_panel_coordinator.h"
|
||||
#include "chrome/browser/ui/views/side_panel/side_panel_ui.h"
|
||||
#include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h"
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/feature_engagement/public/event_constants.h"
|
||||
@@ -467,6 +469,17 @@ void ExtensionsToolbarContainer::AnchorA
|
||||
@@ -439,6 +441,17 @@ void ExtensionsToolbarDesktop::AnchorAnd
|
||||
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
|
||||
anchor_view && anchor_view->GetVisible() ? anchor_view
|
||||
: GetExtensionsButton());
|
||||
@@ -34,10 +34,10 @@
|
||||
widget->Show();
|
||||
}
|
||||
|
||||
@@ -927,6 +940,9 @@ void ExtensionsToolbarContainer::UpdateC
|
||||
@@ -918,6 +931,9 @@ void ExtensionsToolbarDesktop::UpdateCon
|
||||
}
|
||||
|
||||
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
|
||||
bool ExtensionsToolbarDesktop::ShouldContainerBeVisible() const {
|
||||
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-extensions-menu"))
|
||||
+ return false;
|
||||
+
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -728,6 +728,9 @@ class BrowserView::ExclusiveAccessContex
|
||||
@@ -745,6 +745,9 @@ class BrowserView::ExclusiveAccessContex
|
||||
void UpdateExclusiveAccessBubble(
|
||||
const ExclusiveAccessBubbleParams& params,
|
||||
ExclusiveAccessBubbleHideCallback first_hide_callback) override {
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/components/embedder_support/user_agent_utils.cc
|
||||
+++ b/components/embedder_support/user_agent_utils.cc
|
||||
@@ -166,6 +166,8 @@ const std::string& GetWindowsPlatformVer
|
||||
@@ -195,6 +195,8 @@ const blink::UserAgentBrandList GetUserA
|
||||
// It helps us avoid introducing individual enterprise policy controls for
|
||||
// sending unified platform for the user agent string.
|
||||
bool ShouldSendUserAgentUnifiedPlatform() {
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo))
|
||||
+ return true;
|
||||
bool reduce_minor_version = base::FeatureList::IsEnabled(
|
||||
return base::FeatureList::IsEnabled(
|
||||
blink::features::kReduceUserAgentMinorVersion);
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -650,6 +652,8 @@ std::string GetPlatformForUAMetadata() {
|
||||
}
|
||||
@@ -636,6 +638,8 @@ std::string GetPlatformForUAMetadata() {
|
||||
}
|
||||
|
||||
blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) {
|
||||
@@ -51,7 +51,7 @@
|
||||
// Feature declarations and associated constants (feature params, et cetera)
|
||||
--- a/third_party/blink/renderer/core/execution_context/navigator_base.cc
|
||||
+++ b/third_party/blink/renderer/core/execution_context/navigator_base.cc
|
||||
@@ -74,6 +74,8 @@ void NavigatorBase::Trace(Visitor* visit
|
||||
@@ -70,6 +70,8 @@ void NavigatorBase::Trace(Visitor* visit
|
||||
}
|
||||
|
||||
unsigned int NavigatorBase::hardwareConcurrency() const {
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
#include "third_party/blink/public/common/permissions_policy/document_policy_features.h"
|
||||
#include "third_party/blink/public/common/switches.h"
|
||||
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
|
||||
@@ -624,6 +625,8 @@ void FrameFetchContext::ModifyRequestFor
|
||||
@@ -630,6 +631,8 @@ void FrameFetchContext::ModifyRequestFor
|
||||
void FrameFetchContext::AddClientHintsIfNecessary(
|
||||
const std::optional<float> resource_width,
|
||||
ResourceRequest& request) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -468,6 +468,17 @@ void ToolbarView::Init() {
|
||||
@@ -446,6 +446,17 @@ void ToolbarView::Init() {
|
||||
browser_->profile()->IsGuestSession() ||
|
||||
browser_->profile()->IsRegularProfile();
|
||||
#endif
|
||||
|
||||
@@ -36,13 +36,13 @@
|
||||
+ {blink::features::kSpoofWebGLVendor, "Qualcomm"},
|
||||
+};
|
||||
+const FeatureEntry::FeatureVariation kSpoofWebGLChoices[] = {
|
||||
+ {"Blank", kSpoofWebGL_Blank, std::size(kSpoofWebGL_Blank), nullptr},
|
||||
+ {"AMD Radeon R9 200", kSpoofWebGL_Amd, std::size(kSpoofWebGL_Amd), nullptr},
|
||||
+ {"Apple", kSpoofWebGL_Apple, std::size(kSpoofWebGL_Apple), nullptr},
|
||||
+ {"Intel", kSpoofWebGL_Intel, std::size(kSpoofWebGL_Intel), nullptr},
|
||||
+ {"Mesa LLVMpipe", kSpoofWebGL_Mesa, std::size(kSpoofWebGL_Mesa), nullptr},
|
||||
+ {"NVIDIA GeForce GTX 980", kSpoofWebGL_Nvidia, std::size(kSpoofWebGL_Nvidia), nullptr},
|
||||
+ {"Qualcomm Adreno 610", kSpoofWebGL_Qualcomm, std::size(kSpoofWebGL_Qualcomm), nullptr},
|
||||
+ {"Blank", kSpoofWebGL_Blank, nullptr},
|
||||
+ {"AMD Radeon R9 200", kSpoofWebGL_Amd, nullptr},
|
||||
+ {"Apple", kSpoofWebGL_Apple, nullptr},
|
||||
+ {"Intel", kSpoofWebGL_Intel, nullptr},
|
||||
+ {"Mesa LLVMpipe", kSpoofWebGL_Mesa, nullptr},
|
||||
+ {"NVIDIA GeForce GTX 980", kSpoofWebGL_Nvidia, nullptr},
|
||||
+ {"Qualcomm Adreno 610", kSpoofWebGL_Qualcomm, nullptr},
|
||||
+};
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -86,7 +86,7 @@
|
||||
// Feature declarations and associated constants (feature params, et cetera)
|
||||
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
|
||||
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
|
||||
@@ -3976,6 +3976,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3977,6 +3977,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
return ScriptValue::CreateNull(script_state->GetIsolate());
|
||||
case WebGLDebugRendererInfo::kUnmaskedRendererWebgl:
|
||||
if (ExtensionEnabled(kWebGLDebugRendererInfoName)) {
|
||||
@@ -95,7 +95,7 @@
|
||||
return WebGLAny(script_state,
|
||||
String(ContextGL()->GetString(GL_RENDERER)));
|
||||
}
|
||||
@@ -3985,6 +3987,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3986,6 +3988,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
return ScriptValue::CreateNull(script_state->GetIsolate());
|
||||
case WebGLDebugRendererInfo::kUnmaskedVendorWebgl:
|
||||
if (ExtensionEnabled(kWebGLDebugRendererInfoName)) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -5162,10 +5162,12 @@ const FeatureEntry::Choice kOmniboxAutof
|
||||
@@ -4672,10 +4672,12 @@ const FeatureEntry::FeatureVariation
|
||||
#include "chrome/browser/ungoogled_flag_choices.h"
|
||||
#include "chrome/browser/bromite_flag_choices.h"
|
||||
#include "chrome/browser/ungoogled_platform_flag_choices.h"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/renderer_host/navigation_request.cc
|
||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||
@@ -173,6 +173,7 @@
|
||||
@@ -175,6 +175,7 @@
|
||||
#include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h"
|
||||
#include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h"
|
||||
#include "services/network/public/cpp/permissions_policy/permissions_policy_features.h"
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "services/network/public/cpp/resource_request_body.h"
|
||||
#include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h"
|
||||
#include "services/network/public/cpp/url_loader_completion_status.h"
|
||||
@@ -392,10 +393,10 @@ void AddAdditionalRequestHeaders(
|
||||
@@ -394,10 +395,10 @@ void AddAdditionalRequestHeaders(
|
||||
net::HttpRequestHeaders::kUserAgent,
|
||||
ComputeUserAgentValue(user_agent_override));
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
if (NeedsHTTPOrigin(headers, method)) {
|
||||
--- a/content/renderer/render_frame_impl.cc
|
||||
+++ b/content/renderer/render_frame_impl.cc
|
||||
@@ -137,6 +137,7 @@
|
||||
@@ -136,6 +136,7 @@
|
||||
#include "services/network/public/cpp/content_decoding_interceptor.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "services/network/public/cpp/not_implemented_url_loader_factory.h"
|
||||
@@ -52,7 +52,7 @@
|
||||
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
|
||||
#include "services/network/public/mojom/fetch_api.mojom.h"
|
||||
#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
|
||||
@@ -4519,10 +4520,13 @@ void RenderFrameImpl::FinalizeRequestInt
|
||||
@@ -4541,10 +4542,13 @@ void RenderFrameImpl::FinalizeRequestInt
|
||||
|
||||
request.SetHasUserGesture(frame_->HasTransientUserActivation());
|
||||
|
||||
@@ -100,9 +100,9 @@
|
||||
|
||||
--- a/services/network/public/cpp/BUILD.gn
|
||||
+++ b/services/network/public/cpp/BUILD.gn
|
||||
@@ -124,6 +124,8 @@ component("cpp") {
|
||||
"private_network_access_check_result.cc",
|
||||
"private_network_access_check_result.h",
|
||||
@@ -126,6 +126,8 @@ component("cpp") {
|
||||
"parsed_headers.cc",
|
||||
"parsed_headers.h",
|
||||
"record_ontransfersizeupdate_utils.h",
|
||||
+ "referrer_sanitizer.cc",
|
||||
+ "referrer_sanitizer.h",
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
// https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html.
|
||||
--- a/net/dns/host_resolver_manager.cc
|
||||
+++ b/net/dns/host_resolver_manager.cc
|
||||
@@ -152,11 +152,6 @@ const size_t kMaxHostLength = 4096;
|
||||
@@ -151,11 +151,6 @@ const size_t kMaxHostLength = 4096;
|
||||
// cached.
|
||||
const int kIPv6ProbePeriodMs = 1000;
|
||||
|
||||
|
||||
@@ -271,7 +271,7 @@
|
||||
bool CanEdit(const TemplateURL* url) const;
|
||||
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
@@ -211,21 +211,25 @@ void TemplateURLTableModel::Remove(size_
|
||||
@@ -210,21 +210,25 @@ void TemplateURLTableModel::Remove(size_
|
||||
void TemplateURLTableModel::Add(size_t index,
|
||||
const std::u16string& short_name,
|
||||
const std::u16string& keyword,
|
||||
@@ -302,7 +302,7 @@
|
||||
DCHECK(index <= RowCount());
|
||||
DCHECK(!url.empty());
|
||||
TemplateURL* template_url = GetTemplateURL(index);
|
||||
@@ -234,7 +238,8 @@ void TemplateURLTableModel::ModifyTempla
|
||||
@@ -233,7 +237,8 @@ void TemplateURLTableModel::ModifyTempla
|
||||
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
|
||||
template_url->SupportsReplacement(
|
||||
template_url_service_->search_terms_data()));
|
||||
@@ -334,7 +334,7 @@
|
||||
void ReloadIcon(size_t index);
|
||||
--- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
|
||||
@@ -51,6 +51,7 @@ namespace {
|
||||
@@ -52,6 +52,7 @@ namespace {
|
||||
const char kSearchEngineField[] = "searchEngine";
|
||||
const char kKeywordField[] = "keyword";
|
||||
const char kQueryUrlField[] = "queryUrl";
|
||||
@@ -342,16 +342,16 @@
|
||||
|
||||
// Dummy number used for indicating that a new search engine is added.
|
||||
const int kNewSearchEngineIndex = -1;
|
||||
@@ -257,6 +258,8 @@ base::Value::Dict SearchEnginesHandler::
|
||||
@@ -258,6 +259,8 @@ base::DictValue SearchEnginesHandler::Cr
|
||||
Profile* profile = Profile::FromWebUI(web_ui());
|
||||
dict.Set("url",
|
||||
template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
|
||||
+ dict.Set("suggestionsUrl", template_url->suggestions_url_ref().DisplayURL(
|
||||
+ UIThreadSearchTermsData()));
|
||||
dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
|
||||
(template_url->starter_pack_id() > 0)));
|
||||
GURL icon_url = template_url->favicon_url();
|
||||
@@ -423,12 +426,14 @@ void SearchEnginesHandler::HandleSearchE
|
||||
dict.Set("urlLocked",
|
||||
((template_url->prepopulate_id() > 0) ||
|
||||
(template_url->starter_pack_id() !=
|
||||
@@ -427,12 +430,14 @@ void SearchEnginesHandler::HandleSearchE
|
||||
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -369,7 +369,7 @@
|
||||
}
|
||||
|
||||
edit_controller_.reset();
|
||||
@@ -458,6 +463,8 @@ bool SearchEnginesHandler::CheckFieldVal
|
||||
@@ -462,6 +467,8 @@ bool SearchEnginesHandler::CheckFieldVal
|
||||
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
|
||||
} else if (field_name.compare(kQueryUrlField) == 0) {
|
||||
is_valid = edit_controller_->IsURLValid(field_value);
|
||||
@@ -378,7 +378,7 @@
|
||||
} else {
|
||||
NOTREACHED();
|
||||
}
|
||||
@@ -480,18 +487,21 @@ void SearchEnginesHandler::HandleSearchE
|
||||
@@ -484,18 +491,21 @@ void SearchEnginesHandler::HandleSearchE
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -417,7 +417,7 @@
|
||||
void RegisterMessages() override;
|
||||
@@ -80,8 +81,8 @@ class SearchEnginesHandler : public Sett
|
||||
// to WebUI. Called from WebUI.
|
||||
void HandleValidateSearchEngineInput(const base::Value::List& args);
|
||||
void HandleValidateSearchEngineInput(const base::ListValue& args);
|
||||
|
||||
- // Checks whether the given user input field (searchEngine, keyword, queryUrl)
|
||||
- // is populated with a valid value.
|
||||
@@ -428,7 +428,7 @@
|
||||
|
||||
--- a/components/search_engines/template_url_service.cc
|
||||
+++ b/components/search_engines/template_url_service.cc
|
||||
@@ -1036,7 +1036,8 @@ void TemplateURLService::IncrementUsageC
|
||||
@@ -1038,7 +1038,8 @@ void TemplateURLService::IncrementUsageC
|
||||
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -438,7 +438,7 @@
|
||||
DCHECK(!IsCreatedByExtension(*url));
|
||||
DCHECK(!keyword.empty());
|
||||
DCHECK(!search_url.empty());
|
||||
@@ -1060,6 +1061,7 @@ void TemplateURLService::ResetTemplateUR
|
||||
@@ -1062,6 +1063,7 @@ void TemplateURLService::ResetTemplateUR
|
||||
data.last_modified = clock_->Now();
|
||||
data.is_active = TemplateURLData::ActiveStatus::kTrue;
|
||||
data.policy_origin = TemplateURLData::PolicyOrigin::kNoPolicy;
|
||||
@@ -448,7 +448,7 @@
|
||||
syncer::kSeparateLocalAndAccountSearchEngines)
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -345,7 +345,8 @@ class TemplateURLService final : public
|
||||
@@ -347,7 +347,8 @@ class TemplateURLService final : public
|
||||
void ResetTemplateURL(TemplateURL* url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -5158,7 +5158,13 @@ const FeatureEntry::Choice kOmniboxAutof
|
||||
@@ -4668,7 +4668,13 @@ const FeatureEntry::FeatureVariation
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
std::u16string real_url(text.substr(after_scheme_and_colon));
|
||||
--- a/components/url_formatter/url_fixer.cc
|
||||
+++ b/components/url_formatter/url_fixer.cc
|
||||
@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string&
|
||||
@@ -597,6 +597,10 @@ GURL FixupURLInternal(const std::string&
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
|
||||
--- a/content/browser/child_process_security_policy_impl.cc
|
||||
+++ b/content/browser/child_process_security_policy_impl.cc
|
||||
@@ -936,6 +936,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
|
||||
@@ -1032,6 +1032,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
|
||||
RegisterWebSafeScheme(url::kWssScheme);
|
||||
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
|
||||
RegisterWebSafeScheme(url::kDataScheme);
|
||||
@@ -70,7 +70,7 @@
|
||||
// other origins, so we should not treat them as web safe. Remove callers of
|
||||
--- a/net/BUILD.gn
|
||||
+++ b/net/BUILD.gn
|
||||
@@ -1156,6 +1156,8 @@ component("net") {
|
||||
@@ -1160,6 +1160,8 @@ component("net") {
|
||||
"url_request/static_http_user_agent_settings.cc",
|
||||
"url_request/static_http_user_agent_settings.h",
|
||||
"url_request/storage_access_status_cache.h",
|
||||
@@ -181,7 +181,7 @@
|
||||
#include "net/url_request/url_request_context.h"
|
||||
#include "net/url_request/url_request_job_factory.h"
|
||||
#include "url/url_constants.h"
|
||||
@@ -632,6 +633,8 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
@@ -626,6 +627,8 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
std::move(scheme_handler.second));
|
||||
}
|
||||
protocol_handlers_.clear();
|
||||
|
||||
@@ -1,56 +1,59 @@
|
||||
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
@@ -117,22 +117,10 @@ void TemplateURLTableModel::Reload() {
|
||||
@@ -116,22 +116,10 @@ void TemplateURLTableModel::Reload() {
|
||||
extension_entries;
|
||||
// Keywords that can be made the default first.
|
||||
for (TemplateURL* template_url : urls) {
|
||||
- // Skip @gemini if feature disabled.
|
||||
- if (template_url->starter_pack_id() ==
|
||||
- template_url_starter_pack_data::kGemini &&
|
||||
- template_url_starter_pack_data::StarterPackId::kGemini &&
|
||||
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) {
|
||||
- continue;
|
||||
- }
|
||||
- // Skip @page if feature disabled.
|
||||
- if (template_url->starter_pack_id() ==
|
||||
- template_url_starter_pack_data::kPage &&
|
||||
- template_url_starter_pack_data::StarterPackId::kPage &&
|
||||
- !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page) {
|
||||
- continue;
|
||||
- }
|
||||
- // Skip @aimode if feature disabled.
|
||||
- if (template_url->starter_pack_id() ==
|
||||
- template_url_starter_pack_data::kAiMode &&
|
||||
- template_url_starter_pack_data::StarterPackId::kAiMode &&
|
||||
- !ai_mode_enabled_) {
|
||||
+ // Disable all Google AI starter pack options
|
||||
+ if (template_url->starter_pack_id() == template_url_starter_pack_data::kGemini ||
|
||||
+ template_url->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
|
||||
+ template_url->starter_pack_id() == template_url_starter_pack_data::kPage) {
|
||||
+ if (template_url->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kGemini ||
|
||||
+ template_url->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kAiMode ||
|
||||
+ template_url->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kPage) {
|
||||
continue;
|
||||
}
|
||||
|
||||
--- a/components/omnibox/browser/featured_search_provider.cc
|
||||
+++ b/components/omnibox/browser/featured_search_provider.cc
|
||||
@@ -295,20 +295,10 @@ void FeaturedSearchProvider::AddFeatured
|
||||
for (TemplateURL* turl : turls) {
|
||||
if (turl->starter_pack_id() > 0 &&
|
||||
@@ -300,23 +300,10 @@ void FeaturedSearchProvider::AddFeatured
|
||||
if (turl->starter_pack_id() !=
|
||||
template_url_starter_pack_data::StarterPackId::kNone &&
|
||||
turl->is_active() == TemplateURLData::ActiveStatus::kTrue) {
|
||||
- // Skip @gemini if feature disabled.
|
||||
- if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini &&
|
||||
- if (turl->starter_pack_id() ==
|
||||
- template_url_starter_pack_data::StarterPackId::kGemini &&
|
||||
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) {
|
||||
- continue;
|
||||
- }
|
||||
- // Skip @page if feature disabled.
|
||||
- if (turl->starter_pack_id() == template_url_starter_pack_data::kPage &&
|
||||
- if (turl->starter_pack_id() ==
|
||||
- template_url_starter_pack_data::StarterPackId::kPage &&
|
||||
- !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page) {
|
||||
- continue;
|
||||
- }
|
||||
- // Skip @aimode if feature disabled.
|
||||
- if (turl->starter_pack_id() == template_url_starter_pack_data::kAiMode &&
|
||||
- if (turl->starter_pack_id() ==
|
||||
- template_url_starter_pack_data::StarterPackId::kAiMode &&
|
||||
- !OmniboxFieldTrial::IsAimStarterPackEnabled(
|
||||
- client_->GetAimEligibilityService())) {
|
||||
+ // Disable all Google AI starter pack options
|
||||
+ if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini ||
|
||||
+ turl->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
|
||||
+ turl->starter_pack_id() == template_url_starter_pack_data::kPage) {
|
||||
+ if (turl->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kGemini ||
|
||||
+ turl->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kAiMode ||
|
||||
+ turl->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kPage) {
|
||||
continue;
|
||||
}
|
||||
// The history starter pack engine is disabled in incognito mode.
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
|
||||
+++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
|
||||
@@ -140,35 +140,6 @@ bool AreNewChromeLabsExperimentsAvailabl
|
||||
@@ -139,35 +139,6 @@ bool AreNewChromeLabsExperimentsAvailabl
|
||||
}
|
||||
|
||||
bool IsChromeLabsEnabled() {
|
||||
@@ -21,7 +21,7 @@
|
||||
- chrome_labs_prefs::kChromeLabsActivationThresholdDefaultValue) {
|
||||
- g_browser_process->local_state()->SetInteger(
|
||||
- chrome_labs_prefs::kChromeLabsActivationThreshold,
|
||||
- base::RandInt(1, 100));
|
||||
- base::RandIntInclusive(1, 100));
|
||||
- }
|
||||
-
|
||||
- // The percentage of users that should see the feature.
|
||||
|
||||
@@ -570,7 +570,7 @@
|
||||
bool IsProbablyGoogleSearchUrl(const GURL& url) {
|
||||
--- a/components/search_engines/template_url.cc
|
||||
+++ b/components/search_engines/template_url.cc
|
||||
@@ -625,10 +625,7 @@ std::u16string TemplateURLRef::SearchTer
|
||||
@@ -624,10 +624,7 @@ std::u16string TemplateURLRef::SearchTer
|
||||
bool TemplateURLRef::HasGoogleBaseURLs(
|
||||
const SearchTermsData& search_terms_data) const {
|
||||
ParseIfNecessary(search_terms_data);
|
||||
@@ -689,9 +689,9 @@
|
||||
} // namespace variations
|
||||
--- a/content/browser/preloading/prefetch/prefetch_container.cc
|
||||
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
|
||||
@@ -860,23 +860,6 @@ void PrefetchContainer::UpdateResourceRe
|
||||
resource_request_->referrer = GURL(redirect_info.new_referrer);
|
||||
resource_request_->referrer_policy = redirect_info.new_referrer_policy;
|
||||
@@ -899,23 +899,6 @@ void PrefetchContainer::UpdateResourceRe
|
||||
|
||||
resource_request_->UpdateOnRedirect(redirect_info);
|
||||
|
||||
- // Remove `variations::kClientDataHeader` from `resource_request_->headers`,
|
||||
- // to keep the existing behavior. While `AddXClientDataHeader()` adds
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -369,7 +369,6 @@ if (!is_android && !is_mac) {
|
||||
@@ -370,7 +370,6 @@ if (!is_android && !is_mac) {
|
||||
}
|
||||
|
||||
data_deps += [
|
||||
@@ -15,7 +15,7 @@
|
||||
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
@@ -1181,7 +1180,6 @@ if (is_win) {
|
||||
@@ -1179,7 +1178,6 @@ if (is_win) {
|
||||
":optimization_guide_library",
|
||||
":swiftshader_binaries",
|
||||
":widevine_cdm_library",
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
--- a/chrome/browser/resources/BUILD.gn
|
||||
+++ b/chrome/browser/resources/BUILD.gn
|
||||
@@ -112,7 +112,6 @@ group("resources") {
|
||||
@@ -111,7 +111,6 @@ group("resources") {
|
||||
if (is_mac) {
|
||||
public_deps += [
|
||||
"unexportable_keys_internals:resources",
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
storage_partition_->GetCdmStorageDataModel()->GetUsagePerAllStorageKeys(
|
||||
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
|
||||
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
|
||||
@@ -132,7 +132,7 @@ std::set<browsing_topics::Topic> GetTopi
|
||||
@@ -131,7 +131,7 @@ std::set<browsing_topics::Topic> GetTopi
|
||||
|
||||
// static
|
||||
bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
|
||||
@@ -52,7 +52,7 @@
|
||||
}
|
||||
|
||||
// static
|
||||
@@ -862,7 +862,7 @@ void PrivacySandboxSettingsImpl::SetTopi
|
||||
@@ -861,7 +861,7 @@ void PrivacySandboxSettingsImpl::SetTopi
|
||||
}
|
||||
|
||||
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
|
||||
@@ -61,7 +61,7 @@
|
||||
}
|
||||
|
||||
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
|
||||
@@ -931,11 +931,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
|
||||
@@ -930,11 +930,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
|
||||
return Status::kIncognitoProfile;
|
||||
}
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
// static
|
||||
--- a/content/browser/interest_group/ad_auction_service_impl.cc
|
||||
+++ b/content/browser/interest_group/ad_auction_service_impl.cc
|
||||
@@ -191,11 +191,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
|
||||
@@ -190,11 +190,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
|
||||
void AdAuctionServiceImpl::CreateMojoService(
|
||||
RenderFrameHost* render_frame_host,
|
||||
mojo::PendingReceiver<blink::mojom::AdAuctionService> receiver) {
|
||||
@@ -175,7 +175,7 @@
|
||||
void AdAuctionServiceImpl::JoinInterestGroup(
|
||||
--- a/content/browser/storage_partition_impl.cc
|
||||
+++ b/content/browser/storage_partition_impl.cc
|
||||
@@ -1511,38 +1511,7 @@ void StoragePartitionImpl::Initialize(
|
||||
@@ -1512,38 +1512,7 @@ void StoragePartitionImpl::Initialize(
|
||||
|
||||
bucket_manager_ = std::make_unique<BucketManager>(this);
|
||||
|
||||
@@ -214,7 +214,7 @@
|
||||
|
||||
GeneratedCodeCacheSettings settings =
|
||||
GetContentClient()->browser()->GetGeneratedCodeCacheSettings(
|
||||
@@ -1571,8 +1540,6 @@ void StoragePartitionImpl::Initialize(
|
||||
@@ -1572,8 +1541,6 @@ void StoragePartitionImpl::Initialize(
|
||||
|
||||
font_access_manager_ = FontAccessManager::Create();
|
||||
|
||||
@@ -223,7 +223,7 @@
|
||||
|
||||
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
|
||||
if (is_in_memory()) {
|
||||
@@ -1596,11 +1563,6 @@ void StoragePartitionImpl::Initialize(
|
||||
@@ -1597,11 +1564,6 @@ void StoragePartitionImpl::Initialize(
|
||||
std::make_unique<SharedStorageHeaderObserver>(this);
|
||||
}
|
||||
|
||||
@@ -237,7 +237,7 @@
|
||||
void StoragePartitionImpl::ResetSessionStorageConnections() {
|
||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -4224,12 +4224,6 @@ void WebContentsImpl::Init(const WebCont
|
||||
@@ -4208,12 +4208,6 @@ void WebContentsImpl::Init(const WebCont
|
||||
DateTimeChooser::CreateDateTimeChooser(this);
|
||||
#endif
|
||||
|
||||
@@ -248,8 +248,8 @@
|
||||
- AttributionHost::CreateForWebContents(this);
|
||||
- }
|
||||
|
||||
SchedulerLoopQuarantineWebContentsObserver::MaybeCreateForWebContents(this);
|
||||
RedirectChainDetector::CreateForWebContents(this);
|
||||
BtmWebContentsObserver::MaybeCreateForWebContents(this);
|
||||
--- a/content/services/auction_worklet/private_aggregation_bindings.cc
|
||||
+++ b/content/services/auction_worklet/private_aggregation_bindings.cc
|
||||
@@ -407,53 +407,6 @@ PrivateAggregationBindings::~PrivateAggr
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
@@ -179,31 +179,13 @@ void WebRtcLogUploader::OnLoggingStopped
|
||||
@@ -174,31 +174,13 @@ void WebRtcLogUploader::OnLoggingStopped
|
||||
DCHECK(meta_data.get());
|
||||
DCHECK(!upload_done_data.paths.directory.empty());
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
- std::string local_log_id;
|
||||
-
|
||||
if (base::PathExists(upload_done_data.paths.directory)) {
|
||||
webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.paths.directory);
|
||||
webrtc_logging::DeleteOldWebRtcLogFiles({upload_done_data.paths.directory});
|
||||
-
|
||||
- local_log_id =
|
||||
- base::NumberToString(base::Time::Now().InSecondsFSinceUnixEpoch());
|
||||
@@ -29,18 +29,18 @@
|
||||
- upload_done_data.local_log_id = local_log_id;
|
||||
|
||||
if (is_text_log_upload_allowed) {
|
||||
- PrepareMultipartPostData(compressed_log, std::move(meta_data),
|
||||
- PrepareMultipartPostData(content_name, compressed_log, std::move(meta_data),
|
||||
- std::move(upload_done_data));
|
||||
+ NotifyUploadDoneAndLogStats(net::HTTP_OK, net::OK, "", std::move(upload_done_data));
|
||||
} else {
|
||||
main_task_runner_->PostTask(
|
||||
FROM_HERE,
|
||||
@@ -220,28 +202,7 @@ void WebRtcLogUploader::PrepareMultipart
|
||||
@@ -216,28 +198,7 @@ void WebRtcLogUploader::PrepareMultipart
|
||||
DCHECK(!compressed_log.empty());
|
||||
DCHECK(meta_data.get());
|
||||
|
||||
- std::unique_ptr<std::string> post_data(new std::string());
|
||||
- SetupMultipart(post_data.get(), compressed_log,
|
||||
- SetupMultipart(post_data.get(), content_name, compressed_log,
|
||||
- upload_done_data.paths.incoming_rtp_dump,
|
||||
- upload_done_data.paths.outgoing_rtp_dump, *meta_data.get());
|
||||
-
|
||||
@@ -64,12 +64,12 @@
|
||||
+ NotifyUploadDoneAndLogStats(net::HTTP_OK, net::OK, "", std::move(upload_done_data));
|
||||
}
|
||||
|
||||
void WebRtcLogUploader::UploadStoredLog(
|
||||
@@ -308,48 +269,6 @@ void WebRtcLogUploader::LoggingStoppedDo
|
||||
void WebRtcLogUploader::LoggingStoppedDoStore(
|
||||
@@ -251,48 +212,6 @@ void WebRtcLogUploader::LoggingStoppedDo
|
||||
DCHECK(log_buffer.get());
|
||||
DCHECK(!log_paths.directory.empty());
|
||||
|
||||
- webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.directory);
|
||||
- webrtc_logging::DeleteOldWebRtcLogFiles({log_paths.directory});
|
||||
-
|
||||
- base::FilePath log_list_path =
|
||||
- webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory(
|
||||
@@ -122,6 +122,6 @@
|
||||
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
|
||||
- registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, true);
|
||||
+ registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, false);
|
||||
|
||||
// We need to register the type of these preferences in order to query
|
||||
// them even though they're only typically controlled via policy.
|
||||
registry->RegisterListPref(
|
||||
prefs::kWebRTCDiagnosticLogCollectionAllowedForOrigins,
|
||||
base::ListValue());
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
@@ -34,7 +36,7 @@ void ExtensionMigrator::StartLoading() {
|
||||
if (should_have_extension) {
|
||||
base::Value::Dict entry;
|
||||
base::DictValue entry;
|
||||
entry.Set(ExternalProviderImpl::kExternalUpdateUrl,
|
||||
- extension_urls::GetWebstoreUpdateUrl().spec());
|
||||
+ chrome_blank_.spec());
|
||||
@@ -158,7 +158,7 @@
|
||||
ExtensionIdSet extension_ids_with_errors;
|
||||
for (const auto& failure : failures)
|
||||
extension_ids_with_errors.insert(failure.first.id);
|
||||
@@ -1418,11 +1386,7 @@ bool ExtensionDownloader::IterateFetchCr
|
||||
@@ -1422,11 +1390,7 @@ bool ExtensionDownloader::IterateFetchCr
|
||||
// fetch.
|
||||
switch (fetch->credentials) {
|
||||
case ExtensionFetch::CREDENTIALS_NONE:
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
--- a/net/dns/public/doh_provider_entry.cc
|
||||
+++ b/net/dns/public/doh_provider_entry.cc
|
||||
@@ -181,30 +181,6 @@ const DohProviderEntry::List& DohProvide
|
||||
@@ -205,30 +205,6 @@ const DohProviderEntry::List& DohProvide
|
||||
/*display_globally=*/false,
|
||||
/*display_countries=*/{"EE", "DE"},
|
||||
LoggingLevel::kNormal},
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
|
||||
@@ -141,7 +141,7 @@ bool ReloadButton::GetMenuEnabled() cons
|
||||
@@ -141,7 +141,7 @@ bool ReloadButton::GetDevToolsStatusForT
|
||||
}
|
||||
|
||||
void ReloadButton::SetMenuEnabled(bool is_menu_enabled) {
|
||||
- is_menu_enabled_ = is_menu_enabled;
|
||||
+ is_menu_enabled_ = true;
|
||||
void ReloadButton::SetDevToolsStatus(bool is_dev_tools_connected) {
|
||||
- is_dev_tools_connected_ = is_dev_tools_connected;
|
||||
+ is_dev_tools_connected_ = true;
|
||||
UpdateAccessibleHasPopup();
|
||||
UpdateCachedTooltipText();
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/favicon/favicon_utils.h"
|
||||
#include "chrome/browser/resource_coordinator/tab_lifecycle_unit_external.h"
|
||||
@@ -62,6 +63,8 @@
|
||||
@@ -66,6 +67,8 @@
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/feature_engagement/public/feature_constants.h"
|
||||
#include "components/feature_engagement/public/tracker.h"
|
||||
@@ -57,12 +57,12 @@
|
||||
+ void CreateNewTabWithLocation(const std::u16string& loc) override;
|
||||
void OnStartedDragging() override;
|
||||
void OnStoppedDragging() override;
|
||||
void OnKeyboardFocusedTabChanged(std::optional<int> index) override;
|
||||
void TabKeyboardFocusChangedTo(const tabs::TabInterface* tab) override;
|
||||
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
@@ -86,6 +86,8 @@
|
||||
@@ -87,6 +87,8 @@
|
||||
#include "components/tab_groups/tab_group_id.h"
|
||||
#include "components/tab_groups/tab_group_visual_data.h"
|
||||
#include "components/tabs/public/split_tab_id.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
+#include "ui/base/clipboard/clipboard.h"
|
||||
+#include "ui/base/clipboard/clipboard_constants.h"
|
||||
@@ -92,7 +92,7 @@
|
||||
}
|
||||
--- a/chrome/browser/ui/views/tabs/tab_strip_controller.h
|
||||
+++ b/chrome/browser/ui/views/tabs/tab_strip_controller.h
|
||||
@@ -156,6 +156,11 @@ class TabStripController {
|
||||
@@ -151,6 +151,11 @@ class TabStripController {
|
||||
// Creates the new tab.
|
||||
virtual void CreateNewTab(NewTabTypes context) = 0;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
|
||||
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
|
||||
@@ -878,19 +878,6 @@ void ExtensionInfoGenerator::FillExtensi
|
||||
@@ -860,19 +860,6 @@ void ExtensionInfoGenerator::FillExtensi
|
||||
toolbar_actions_model->IsActionPinned(extension.id());
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
// `CanUploadAsAccountExtension` should already check for the feature flag
|
||||
--- a/chrome/browser/extensions/extension_management.cc
|
||||
+++ b/chrome/browser/extensions/extension_management.cc
|
||||
@@ -371,31 +371,7 @@ bool ExtensionManagement::IsAllowedManif
|
||||
@@ -372,31 +372,7 @@ bool ExtensionManagement::IsAllowedManif
|
||||
int manifest_version,
|
||||
const std::string& extension_id,
|
||||
Manifest::Type manifest_type) {
|
||||
@@ -54,7 +54,7 @@
|
||||
}
|
||||
|
||||
bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
|
||||
@@ -416,26 +392,8 @@ bool ExtensionManagement::IsExemptFromMV
|
||||
@@ -417,26 +393,8 @@ bool ExtensionManagement::IsExemptFromMV
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -122,15 +122,15 @@
|
||||
// Returns true if the given `stage` is one in which extension enablement should
|
||||
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
|
||||
@@ -484,7 +484,7 @@ content::WebUIDataSource* CreateAndAddEx
|
||||
@@ -488,7 +488,7 @@ content::WebUIDataSource* CreateAndAddEx
|
||||
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
|
||||
source->AddBoolean(
|
||||
"safetyHubThreeDotDetails",
|
||||
- base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails));
|
||||
+ false);
|
||||
source->AddBoolean("enableGlobalScopedShortcuts", IsGlobalShortcutEnabled());
|
||||
|
||||
// MV2 deprecation.
|
||||
auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
|
||||
--- a/extensions/common/extension.cc
|
||||
+++ b/extensions/common/extension.cc
|
||||
@@ -97,13 +97,6 @@ bool IsManifestSupported(int manifest_ve
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -561,8 +561,6 @@ static_library("browser") {
|
||||
@@ -552,8 +552,6 @@ static_library("browser") {
|
||||
"idle/idle_detection_permission_context.h",
|
||||
"interstitials/chrome_settings_page_helper.cc",
|
||||
"interstitials/chrome_settings_page_helper.h",
|
||||
@@ -10,8 +10,8 @@
|
||||
- "interstitials/enterprise_util.h",
|
||||
"invalidation/profile_invalidation_provider_factory.cc",
|
||||
"invalidation/profile_invalidation_provider_factory.h",
|
||||
"k_anonymity_service/k_anonymity_service_client.cc",
|
||||
@@ -2332,7 +2330,6 @@ static_library("browser") {
|
||||
"k_anonymity_service/k_anonymity_service_factory.cc",
|
||||
@@ -2314,7 +2312,6 @@ static_library("browser") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing/content/browser",
|
||||
"//components/safe_browsing/content/browser:safe_browsing_service",
|
||||
@@ -19,7 +19,7 @@
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
"//components/safe_browsing/content/common/proto:download_file_types_proto",
|
||||
@@ -3944,10 +3941,6 @@ static_library("browser") {
|
||||
@@ -3920,10 +3917,6 @@ static_library("browser") {
|
||||
"new_tab_page/modules/modules_switches.h",
|
||||
"new_tab_page/modules/new_tab_page_modules.cc",
|
||||
"new_tab_page/modules/new_tab_page_modules.h",
|
||||
@@ -30,15 +30,15 @@
|
||||
"new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc",
|
||||
"new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h",
|
||||
"new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc",
|
||||
@@ -8610,7 +8603,6 @@ static_library("browser_generated_files"
|
||||
"//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info",
|
||||
"//chrome/browser/new_tab_page/chrome_colors:generate_colors_info",
|
||||
@@ -8602,7 +8595,6 @@ static_library("browser_generated_files"
|
||||
public_deps += [
|
||||
"//chrome/browser/lens/core/mojom:mojo_bindings",
|
||||
"//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings",
|
||||
- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
|
||||
"//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings",
|
||||
"//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings",
|
||||
"//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings",
|
||||
@@ -9077,8 +9069,6 @@ static_library("test_support") {
|
||||
@@ -9075,8 +9067,6 @@ static_library("test_support") {
|
||||
"//components/reporting/util:status",
|
||||
"//components/reporting/util:status_macros",
|
||||
"//components/reporting/util:task_runner_context",
|
||||
@@ -84,7 +84,7 @@
|
||||
#include "content/public/browser/download_item_utils.h"
|
||||
#include "content/public/browser/download_manager.h"
|
||||
|
||||
@@ -278,14 +277,6 @@ void DownloadBubbleUIController::Process
|
||||
@@ -274,14 +273,6 @@ void DownloadBubbleUIController::Process
|
||||
switch (command) {
|
||||
case DownloadCommands::KEEP:
|
||||
case DownloadCommands::DISCARD: {
|
||||
@@ -109,7 +109,7 @@
|
||||
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
|
||||
|
||||
#if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION)
|
||||
@@ -1982,7 +1981,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
||||
@@ -1989,7 +1988,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
||||
DownloadItemModel model(item);
|
||||
model.DetermineAndSetShouldPreferOpeningInBrowser(
|
||||
target_info.target_path, target_info.is_filetype_handled_safely);
|
||||
@@ -117,7 +117,7 @@
|
||||
}
|
||||
if (ShouldBlockFile(item, target_info.danger_type)) {
|
||||
MaybeReportDangerousDownloadBlocked(
|
||||
@@ -2063,49 +2061,20 @@ bool ChromeDownloadManagerDelegate::IsOp
|
||||
@@ -2070,49 +2068,20 @@ bool ChromeDownloadManagerDelegate::IsOp
|
||||
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
|
||||
download::DownloadItem* item,
|
||||
download::DownloadDangerType danger_type) const {
|
||||
@@ -173,7 +173,7 @@
|
||||
<< static_cast<int>(download_restriction);
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -1264,14 +1264,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
@@ -1265,14 +1265,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
|
||||
std::optional<base::Time>
|
||||
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
|
||||
@@ -332,7 +332,7 @@
|
||||
std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel()
|
||||
--- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
|
||||
@@ -171,70 +171,12 @@ void FilesRequestHandler::FileRequestCal
|
||||
@@ -174,63 +174,12 @@ void FilesRequestHandler::FileRequestCal
|
||||
}
|
||||
|
||||
bool FilesRequestHandler::UploadDataImpl() {
|
||||
@@ -353,17 +353,10 @@
|
||||
- base::BindOnce(&FilesRequestHandler::CreateFileOpeningJob,
|
||||
- weak_ptr_factory_.GetWeakPtr(), std::move(tasks)));
|
||||
-
|
||||
- switch (AccessPointToEnterpriseConnector(access_point_)) {
|
||||
- case enterprise_connectors::FILE_ATTACHED:
|
||||
- base::UmaHistogramCustomCounts(kFileAttachCount, paths_.size(), 1, 1000,
|
||||
- 100);
|
||||
- break;
|
||||
- case enterprise_connectors::FILE_TRANSFER:
|
||||
- base::UmaHistogramCustomCounts(kFileTransferCount, paths_.size(), 1,
|
||||
- 1000, 100);
|
||||
- break;
|
||||
- default:
|
||||
- break;
|
||||
- if (auto prefix = AccessPointToUmaHistogramPrefix(access_point_);
|
||||
- !prefix.empty()) {
|
||||
- base::UmaHistogramCustomCounts(prefix + ".FileCount", paths_.size(), 1,
|
||||
- 1000, 100);
|
||||
- }
|
||||
-
|
||||
- return true;
|
||||
@@ -403,7 +396,7 @@
|
||||
void FilesRequestHandler::OnGotFileInfo(
|
||||
std::unique_ptr<BinaryUploadRequest> request,
|
||||
size_t index,
|
||||
@@ -281,19 +223,6 @@ void FilesRequestHandler::OnGotFileInfo(
|
||||
@@ -277,19 +226,6 @@ void FilesRequestHandler::OnGotFileInfo(
|
||||
void FilesRequestHandler::FinishRequestEarly(
|
||||
std::unique_ptr<BinaryUploadRequest> request,
|
||||
ScanRequestUploadResult result) {
|
||||
@@ -438,7 +431,7 @@
|
||||
void OnGotFileInfo(std::unique_ptr<BinaryUploadRequest> request,
|
||||
--- a/chrome/browser/enterprise/connectors/connectors_manager.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/connectors_manager.cc
|
||||
@@ -182,26 +182,7 @@ void ConnectorsManager::OnPrefChanged(An
|
||||
@@ -169,26 +169,7 @@ void ConnectorsManager::OnAnalysisPrefCh
|
||||
}
|
||||
|
||||
DataRegion ConnectorsManager::GetDataRegion(AnalysisConnector connector) const {
|
||||
@@ -464,7 +457,7 @@
|
||||
-#endif
|
||||
}
|
||||
|
||||
void ConnectorsManager::StartObservingPrefs(PrefService* pref_service) {
|
||||
} // namespace enterprise_connectors
|
||||
--- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc
|
||||
@@ -26,24 +26,6 @@ enum class PasswordProtectionTrigger {
|
||||
@@ -525,7 +518,7 @@
|
||||
|
||||
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
||||
@@ -277,20 +277,7 @@ void RealtimeReportingClient::SetProfile
|
||||
@@ -278,20 +278,7 @@ void RealtimeReportingClient::SetProfile
|
||||
}
|
||||
|
||||
std::string RealtimeReportingClient::GetProfileUserName() {
|
||||
@@ -639,7 +632,7 @@
|
||||
signal_response.profile_id = profile_id_service_->GetProfileId();
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -403,8 +403,6 @@ source_set("extensions") {
|
||||
@@ -398,8 +398,6 @@ source_set("extensions") {
|
||||
"mv2_experiment_stage.h",
|
||||
"navigation_extension_enabler.cc",
|
||||
"navigation_extension_enabler.h",
|
||||
@@ -669,7 +662,7 @@
|
||||
info.enterprise_profile_id = signals.enterprise_profile_id;
|
||||
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
|
||||
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
|
||||
@@ -390,8 +390,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
||||
@@ -410,8 +410,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
||||
settings_api::PrefType::kBoolean;
|
||||
(*s_allowlist)[::kGeneratedHttpsFirstModePref] =
|
||||
settings_api::PrefType::kNumber;
|
||||
@@ -680,10 +673,10 @@
|
||||
|
||||
--- a/chrome/browser/extensions/chrome_extension_system.cc
|
||||
+++ b/chrome/browser/extensions/chrome_extension_system.cc
|
||||
@@ -466,8 +466,6 @@ void ChromeExtensionSystem::InstallUpdat
|
||||
@@ -478,8 +478,6 @@ void ChromeExtensionSystem::InstallUpdat
|
||||
void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes(
|
||||
const std::string& extension_id,
|
||||
const base::Value::Dict& attributes) {
|
||||
const base::DictValue& attributes) {
|
||||
- extension_service()->PerformActionBasedOnOmahaAttributes(extension_id,
|
||||
- attributes);
|
||||
}
|
||||
@@ -713,7 +706,7 @@
|
||||
|
||||
--- a/chrome/browser/extensions/extension_service.cc
|
||||
+++ b/chrome/browser/extensions/extension_service.cc
|
||||
@@ -54,7 +54,6 @@
|
||||
@@ -53,7 +53,6 @@
|
||||
#include "chrome/browser/extensions/installed_loader.h"
|
||||
#include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
|
||||
#include "chrome/browser/extensions/mv2_experiment_stage.h"
|
||||
@@ -721,7 +714,7 @@
|
||||
#include "chrome/browser/extensions/profile_util.h"
|
||||
#include "chrome/browser/extensions/sync/extension_sync_service.h"
|
||||
#include "chrome/browser/extensions/updater/chrome_extension_downloader_factory.h"
|
||||
@@ -218,9 +217,6 @@ ExtensionService::ExtensionService(
|
||||
@@ -219,9 +218,6 @@ ExtensionService::ExtensionService(
|
||||
extension_telemetry_service_verdict_handler_(extension_prefs,
|
||||
registry_,
|
||||
extension_registrar_),
|
||||
@@ -731,7 +724,7 @@
|
||||
force_installed_tracker_(registry_, profile_),
|
||||
force_installed_metrics_(registry_, profile_, &force_installed_tracker_),
|
||||
corrupted_extension_reinstaller_(
|
||||
@@ -407,11 +403,6 @@ void ExtensionService::LoadExtensionsFro
|
||||
@@ -416,11 +412,6 @@ void ExtensionService::LoadExtensionsFro
|
||||
<< "--load-extension is not allowed in Google Chrome, ignoring.";
|
||||
return;
|
||||
#else // BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -743,13 +736,13 @@
|
||||
if (ShouldBlockCommandLineExtension(*profile_)) {
|
||||
// TODO(crbug.com/401529219): Deprecate this restriction once
|
||||
// --load-extension removal on Chrome builds is fully launched.
|
||||
@@ -467,17 +458,6 @@ void ExtensionService::LoadSigninProfile
|
||||
@@ -476,17 +467,6 @@ void ExtensionService::LoadSigninProfile
|
||||
}
|
||||
#endif
|
||||
|
||||
-void ExtensionService::PerformActionBasedOnOmahaAttributes(
|
||||
- const std::string& extension_id,
|
||||
- const base::Value::Dict& attributes) {
|
||||
- const base::DictValue& attributes) {
|
||||
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
- omaha_attributes_handler_.PerformActionBasedOnOmahaAttributes(extension_id,
|
||||
- attributes);
|
||||
@@ -769,20 +762,20 @@
|
||||
#include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h"
|
||||
-#include "chrome/browser/extensions/omaha_attributes_handler.h"
|
||||
#include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
|
||||
#include "chrome/browser/policy/cloud/extension_install_policy_service.h"
|
||||
#include "chrome/browser/profiles/profile_manager_observer.h"
|
||||
#include "chrome/browser/upgrade_detector/upgrade_observer.h"
|
||||
@@ -165,10 +164,6 @@ class ExtensionService : public Extensio
|
||||
@@ -170,10 +169,6 @@ class ExtensionService : public Extensio
|
||||
// KeyedService two-phase shutdown.
|
||||
void Shutdown();
|
||||
|
||||
- // Performs action based on Omaha attributes for the extension.
|
||||
- void PerformActionBasedOnOmahaAttributes(const std::string& extension_id,
|
||||
- const base::Value::Dict& attributes);
|
||||
- const base::DictValue& attributes);
|
||||
-
|
||||
// Performs action based on verdicts received from the Extension Telemetry
|
||||
// server. Currently, these verdicts are limited to off-store extensions.
|
||||
void PerformActionBasedOnExtensionTelemetryServiceVerdicts(
|
||||
@@ -383,8 +378,6 @@ class ExtensionService : public Extensio
|
||||
@@ -388,8 +383,6 @@ class ExtensionService : public Extensio
|
||||
ExtensionTelemetryServiceVerdictHandler
|
||||
extension_telemetry_service_verdict_handler_;
|
||||
|
||||
@@ -842,9 +835,29 @@
|
||||
UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled",
|
||||
extension->location());
|
||||
}
|
||||
--- a/chrome/browser/feedback/report_unsafe_site_dialog.cc
|
||||
+++ b/chrome/browser/feedback/report_unsafe_site_dialog.cc
|
||||
@@ -9,16 +9,13 @@
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
|
||||
namespace feedback {
|
||||
|
||||
// static
|
||||
bool ReportUnsafeSiteDialog::IsEnabled(const Profile& profile) {
|
||||
const PrefService* prefs = profile.GetPrefs();
|
||||
- return base::FeatureList::IsEnabled(features::kReportUnsafeSite) &&
|
||||
- prefs->GetBoolean(prefs::kUserFeedbackAllowed) &&
|
||||
- safe_browsing::IsSafeBrowsingEnabled(*prefs);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
} // namespace feedback
|
||||
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
@@ -862,13 +862,6 @@ void ChromeMetricsServiceClient::Registe
|
||||
@@ -861,13 +861,6 @@ void ChromeMetricsServiceClient::Registe
|
||||
metrics_service_->RegisterMetricsProvider(MakeDemographicMetricsProvider(
|
||||
metrics::MetricsLogUploader::MetricServiceType::UMA));
|
||||
|
||||
@@ -1096,7 +1109,7 @@
|
||||
return PredictionSource::kNoCpssModel;
|
||||
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -2579,8 +2579,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
@@ -2586,8 +2586,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
handlers->AddHandler(
|
||||
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
|
||||
chrome_schema));
|
||||
@@ -1107,7 +1120,7 @@
|
||||
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
+++ b/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -267,7 +267,6 @@
|
||||
@@ -269,7 +269,6 @@
|
||||
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
|
||||
#include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h"
|
||||
#include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h"
|
||||
@@ -1115,7 +1128,7 @@
|
||||
#include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h"
|
||||
#include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h"
|
||||
#include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h"
|
||||
@@ -1838,7 +1837,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
@@ -1897,7 +1896,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
||||
NewTabFooterUI::RegisterProfilePrefs(registry);
|
||||
NewTabPageHandler::RegisterProfilePrefs(registry);
|
||||
NewTabPageUI::RegisterProfilePrefs(registry);
|
||||
@@ -1125,7 +1138,7 @@
|
||||
promos_utils::RegisterProfilePrefs(registry);
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -885,9 +885,7 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -896,9 +896,7 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
enterprise_connectors::TelomereEventRouterFactory::GetInstance();
|
||||
}
|
||||
#endif
|
||||
@@ -1135,35 +1148,6 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
BUILDFLAG(IS_WIN)
|
||||
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
|
||||
--- a/chrome/browser/push_messaging/push_messaging_service_factory.cc
|
||||
+++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
|
||||
@@ -19,7 +19,6 @@
|
||||
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
|
||||
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
||||
#include "components/gcm_driver/instance_id/instance_id_profile_service.h"
|
||||
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
|
||||
// static
|
||||
PushMessagingServiceImpl* PushMessagingServiceFactory::GetForProfile(
|
||||
@@ -73,17 +72,7 @@ PushMessagingServiceFactory::BuildServic
|
||||
content::BrowserContext* context) const {
|
||||
Profile* profile = Profile::FromBrowserContext(context);
|
||||
CHECK(!profile->IsOffTheRecord());
|
||||
- // Reporting service worker network requests should only be done for ESB
|
||||
- // users. The check below is the first ESB check. A second ESB check is
|
||||
- // performed before anything about the service worker is sent off device to
|
||||
- // Safe Browsing. If at the time of the second check the user is found to no
|
||||
- // longer be an ESB user, no Safe Browsing report will be sent.
|
||||
- bool includeSafeBrowsingDatabase =
|
||||
- g_browser_process && g_browser_process->safe_browsing_service() &&
|
||||
- safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs());
|
||||
return std::make_unique<PushMessagingServiceImpl>(
|
||||
profile,
|
||||
- includeSafeBrowsingDatabase
|
||||
- ? g_browser_process->safe_browsing_service()->database_manager()
|
||||
- : nullptr);
|
||||
+ nullptr);
|
||||
}
|
||||
--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
|
||||
@@ -143,7 +143,7 @@ export class SettingsPrivacyPageIndexEle
|
||||
@@ -1207,7 +1191,7 @@
|
||||
# "Safe Browsing Basic" files used for safe browsing in full mode
|
||||
--- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
|
||||
+++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
|
||||
@@ -72,10 +72,6 @@ void FileOpeningJob::ProcessNextTask(bas
|
||||
@@ -73,10 +73,6 @@ void FileOpeningJob::ProcessNextTask(bas
|
||||
if (tasks_[i].taken.exchange(true, std::memory_order_relaxed))
|
||||
continue;
|
||||
|
||||
@@ -1413,15 +1397,15 @@
|
||||
|
||||
--- a/chrome/browser/safe_browsing/generated_security_settings_bundle_pref.cc
|
||||
+++ b/chrome/browser/safe_browsing/generated_security_settings_bundle_pref.cc
|
||||
@@ -10,7 +10,6 @@
|
||||
#include "chrome/common/extensions/api/settings_private.h"
|
||||
@@ -11,7 +11,6 @@
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
|
||||
namespace settings_api = extensions::api::settings_private;
|
||||
namespace safe_browsing {
|
||||
|
||||
@@ -23,66 +22,20 @@ GeneratedSecuritySettingsBundlePref::Gen
|
||||
@@ -19,59 +18,20 @@ GeneratedSecuritySettingsBundlePref::Gen
|
||||
Profile* profile)
|
||||
: profile_(profile) {
|
||||
user_prefs_registrar_.Init(profile->GetPrefs());
|
||||
@@ -1453,24 +1437,17 @@
|
||||
- PrefService* local_state = g_browser_process->local_state();
|
||||
-
|
||||
- // This is how the bundle controls each security setting.
|
||||
- if (selection == static_cast<int>(SecuritySettingsBundleSetting::ENHANCED)) {
|
||||
- // Keep this section sorted by feature name and label each section with
|
||||
- // the feature.
|
||||
-
|
||||
- // Secure DNS Setting
|
||||
- if (base::FeatureList::IsEnabled(
|
||||
- safe_browsing::kBundledSecuritySettingsSecureDnsV2)) {
|
||||
- // Secure DNS Setting.
|
||||
- // TODO(crbug.com/460180440): migrate to a per-profile setting.
|
||||
- const bool fallback_to_doh =
|
||||
- selection == static_cast<int>(SecuritySettingsBundleSetting::ENHANCED);
|
||||
- local_state->SetString(prefs::kDnsOverHttpsMode,
|
||||
- SecureDnsConfig::kModeAutomatic);
|
||||
- local_state->SetString(prefs::kDnsOverHttpsTemplates, "");
|
||||
- local_state->SetBoolean(prefs::kDnsOverHttpsAutomaticModeFallbackToDoh,
|
||||
- true);
|
||||
- } else {
|
||||
- // Secure DNS Setting
|
||||
- local_state->SetString(prefs::kDnsOverHttpsMode,
|
||||
- SecureDnsConfig::kModeAutomatic);
|
||||
- local_state->SetString(prefs::kDnsOverHttpsTemplates, "");
|
||||
- local_state->SetBoolean(prefs::kDnsOverHttpsAutomaticModeFallbackToDoh,
|
||||
- false);
|
||||
- fallback_to_doh);
|
||||
- }
|
||||
-
|
||||
return extensions::settings_private::SetPrefResult::SUCCESS;
|
||||
@@ -1619,7 +1596,7 @@
|
||||
// certificate. So, when users click proceed on an interstitial, move the tab
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -4318,8 +4318,6 @@ static_library("ui") {
|
||||
@@ -4320,8 +4320,6 @@ static_library("ui") {
|
||||
"views/safe_browsing/password_reuse_modal_warning_dialog.h",
|
||||
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
|
||||
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
|
||||
@@ -1694,7 +1671,7 @@
|
||||
|
||||
unused_site_permissions_manager_ =
|
||||
std::make_unique<UnusedSitePermissionsManager>(browser_context, prefs);
|
||||
@@ -608,5 +581,5 @@ bool RevokedPermissionsService::IsUnused
|
||||
@@ -607,5 +580,5 @@ bool RevokedPermissionsService::IsUnused
|
||||
}
|
||||
|
||||
bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() {
|
||||
@@ -1713,7 +1690,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/toasts/toast_service.cc
|
||||
+++ b/chrome/browser/ui/toasts/toast_service.cc
|
||||
@@ -36,7 +36,6 @@
|
||||
@@ -38,7 +38,6 @@
|
||||
#include "components/plus_addresses/core/browser/grit/plus_addresses_strings.h"
|
||||
#include "components/plus_addresses/core/common/features.h"
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
@@ -1721,7 +1698,7 @@
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "components/tabs/public/tab_interface.h"
|
||||
#include "components/vector_icons/vector_icons.h"
|
||||
@@ -160,57 +159,6 @@ void ToastService::RegisterToasts(
|
||||
@@ -142,57 +141,6 @@ void ToastService::RegisterToasts(
|
||||
.Build());
|
||||
}
|
||||
|
||||
@@ -1844,7 +1821,7 @@
|
||||
|
||||
@@ -89,43 +86,6 @@ void HatsHandler::RegisterMessages() {
|
||||
*/
|
||||
void HatsHandler::HandleSecurityPageHatsRequest(const base::Value::List& args) {
|
||||
void HatsHandler::HandleSecurityPageHatsRequest(const base::ListValue& args) {
|
||||
AllowJavascript();
|
||||
-
|
||||
- CHECK_EQ(4U, args.size());
|
||||
@@ -1888,8 +1865,8 @@
|
||||
/**
|
||||
@@ -140,10 +100,6 @@ SurveyStringData HatsHandler::GetSecurit
|
||||
Profile* profile,
|
||||
const base::Value::List& args) {
|
||||
const base::Value::List& interactions = args[0].GetList();
|
||||
const base::ListValue& args) {
|
||||
const base::ListValue& interactions = args[0].GetList();
|
||||
- auto safe_browsing_state = static_cast<SafeBrowsingState>(args[1].GetInt());
|
||||
-
|
||||
- auto security_settings_bundle_setting =
|
||||
@@ -1897,7 +1874,7 @@
|
||||
|
||||
std::string security_page_interactions = "";
|
||||
std::set<SecurityPageV2Interaction> interaction_set;
|
||||
@@ -189,62 +145,14 @@ SurveyStringData HatsHandler::GetSecurit
|
||||
@@ -242,62 +198,14 @@ SurveyStringData HatsHandler::GetSecurit
|
||||
security_page_interactions = base::JoinString(interaction_strings, ", ");
|
||||
|
||||
std::string safe_browsing_state_before = "";
|
||||
@@ -1973,7 +1950,7 @@
|
||||
}
|
||||
SafetyHubHandler::~SafetyHubHandler() = default;
|
||||
|
||||
@@ -834,14 +830,4 @@ void SafetyHubHandler::OnJavascriptAllow
|
||||
@@ -831,14 +827,4 @@ void SafetyHubHandler::OnJavascriptAllow
|
||||
void SafetyHubHandler::OnJavascriptDisallowed() {}
|
||||
|
||||
void SafetyHubHandler::OnSafeBrowsingEnhancedChanged() {
|
||||
@@ -1990,7 +1967,7 @@
|
||||
}
|
||||
--- a/chrome/browser/ui/webui/settings/security_settings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/security_settings_provider.cc
|
||||
@@ -8,26 +8,22 @@
|
||||
@@ -8,30 +8,25 @@
|
||||
#include "chrome/browser/safe_browsing/generated_safe_browsing_pref.h"
|
||||
#include "chrome/browser/ssl/https_upgrades_util.h"
|
||||
#include "components/safe_browsing/core/common/features.h"
|
||||
@@ -2005,6 +1982,11 @@
|
||||
html_source->AddBoolean(
|
||||
"enableBundledSecuritySettings",
|
||||
- base::FeatureList::IsEnabled(safe_browsing::kBundledSecuritySettings));
|
||||
+ false);
|
||||
html_source->AddBoolean(
|
||||
"enableBundledSecuritySettingsSecureDnsV2",
|
||||
- base::FeatureList::IsEnabled(
|
||||
- safe_browsing::kBundledSecuritySettingsSecureDnsV2));
|
||||
+ false);
|
||||
html_source->AddBoolean("enableHttpsFirstModeNewSettings",
|
||||
IsBalancedModeAvailable());
|
||||
@@ -2022,7 +2004,7 @@
|
||||
// security-related-settings (not the strings) to this function.
|
||||
--- a/chrome/common/webui_url_constants.cc
|
||||
+++ b/chrome/common/webui_url_constants.cc
|
||||
@@ -130,7 +130,6 @@ base::span<const base::cstring_view> Chr
|
||||
@@ -131,7 +131,6 @@ base::span<const base::cstring_view> Chr
|
||||
kChromeUISuggestInternalsHost,
|
||||
#endif
|
||||
kChromeUINTPTilesInternalsHost,
|
||||
@@ -2032,7 +2014,7 @@
|
||||
kChromeUITabSearchHost,
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -2859,7 +2859,6 @@ if (!is_android) {
|
||||
@@ -2900,7 +2900,6 @@ if (!is_android) {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -2040,7 +2022,7 @@
|
||||
"//components/safe_browsing/content/browser:credit_card_form_event",
|
||||
"//components/safe_browsing/content/browser:safe_browsing_service",
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
@@ -7291,7 +7290,6 @@ test("unit_tests") {
|
||||
@@ -7364,7 +7363,6 @@ test("unit_tests") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -2124,7 +2106,7 @@
|
||||
|
||||
--- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
|
||||
+++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
|
||||
@@ -301,18 +301,12 @@ void ChromeProfileRequestGenerator::OnAg
|
||||
@@ -294,18 +294,12 @@ void ChromeProfileRequestGenerator::OnAg
|
||||
profile_signals.built_in_dns_client_enabled);
|
||||
profile_signals_report->set_chrome_remote_desktop_app_blocked(
|
||||
profile_signals.chrome_remote_desktop_app_blocked);
|
||||
@@ -2216,7 +2198,7 @@
|
||||
# Indicates support for content analysis against a cloud agent for Enterprise
|
||||
# Connector policies.
|
||||
enterprise_cloud_content_analysis =
|
||||
- is_win || is_mac || is_linux || is_chromeos
|
||||
- is_win || is_mac || is_linux || is_chromeos || is_ios
|
||||
+ false
|
||||
|
||||
# Indicates support for content analysis against a cloud agent for Enterprise
|
||||
@@ -2255,7 +2237,7 @@
|
||||
- }
|
||||
}
|
||||
|
||||
const base::Value::List* enabled_opt_in_events_value =
|
||||
const base::ListValue* enabled_opt_in_events_value =
|
||||
--- a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc
|
||||
+++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc
|
||||
@@ -312,12 +312,7 @@ bool LeakDetectionCheck::IsURLBlockedByP
|
||||
@@ -2274,7 +2256,7 @@
|
||||
} // namespace password_manager
|
||||
--- a/components/safe_browsing/content/common/safe_browsing.mojom
|
||||
+++ b/components/safe_browsing/content/common/safe_browsing.mojom
|
||||
@@ -174,7 +174,6 @@ interface PhishingDetector {
|
||||
@@ -177,7 +177,6 @@ interface PhishingDetector {
|
||||
|
||||
// Interface for setting a phishing model. This is scoped to an entire
|
||||
// RenderProcess.
|
||||
@@ -2333,7 +2315,7 @@
|
||||
#include "components/safe_browsing/core/common/utils.h"
|
||||
#include "google_apis/google_api_keys.h"
|
||||
#include "net/base/net_errors.h"
|
||||
@@ -117,21 +116,7 @@ constexpr net::NetworkTrafficAnnotationT
|
||||
@@ -126,21 +125,7 @@ constexpr net::NetworkTrafficAnnotationT
|
||||
bool IsEnabled(PrefService* pref_service,
|
||||
std::optional<std::string> country,
|
||||
bool are_background_lookups_allowed) {
|
||||
@@ -2356,7 +2338,7 @@
|
||||
}
|
||||
|
||||
GURL GetKeyFetchingUrl() {
|
||||
@@ -406,42 +391,9 @@ void OhttpKeyService::MaybeStartServerTr
|
||||
@@ -443,42 +428,9 @@ void OhttpKeyService::MaybeStartServerTr
|
||||
}
|
||||
|
||||
void OhttpKeyService::PopulateKeyFromPref() {
|
||||
@@ -2502,7 +2484,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -521,25 +519,10 @@ void TailoredSecurityService::Shutdown()
|
||||
@@ -529,25 +527,10 @@ void TailoredSecurityService::Shutdown()
|
||||
}
|
||||
|
||||
void TailoredSecurityService::TailoredSecurityTimestampUpdateCallback() {
|
||||
@@ -2746,7 +2728,7 @@
|
||||
return RespondNow(Error(std::move(error)));
|
||||
--- a/extensions/browser/api/web_request/extension_web_request_event_router.cc
|
||||
+++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc
|
||||
@@ -1137,14 +1137,6 @@ int WebRequestEventRouter::OnBeforeReque
|
||||
@@ -1143,14 +1143,6 @@ int WebRequestEventRouter::OnBeforeReque
|
||||
DCHECK(action.redirect_url);
|
||||
OnDNRActionMatched(browser_context, *request, action);
|
||||
*new_url = GetNewUrl(action.redirect_url.value(), browser_context);
|
||||
@@ -2933,12 +2915,12 @@
|
||||
// static
|
||||
--- a/extensions/browser/updater/update_service.cc
|
||||
+++ b/extensions/browser/updater/update_service.cc
|
||||
@@ -131,13 +131,6 @@ void UpdateService::OnCrxStateChange(Upd
|
||||
@@ -132,13 +132,6 @@ void UpdateService::OnCrxStateChange(Upd
|
||||
break;
|
||||
}
|
||||
|
||||
- if (should_perform_action_on_omaha_attributes) {
|
||||
- base::Value::Dict attributes = GetExtensionOmahaAttributes(item);
|
||||
- base::DictValue attributes = GetExtensionOmahaAttributes(item);
|
||||
- // Note that it's important to perform actions even if |attributes| is
|
||||
- // empty, missing values may default to false and have associated logic.
|
||||
- ExtensionSystem::Get(browser_context_)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "content/public/browser/render_process_host.h"
|
||||
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
|
||||
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
|
||||
@@ -96,6 +96,7 @@ void PrefProvider::RegisterProfilePrefs(
|
||||
@@ -98,6 +98,7 @@ void PrefProvider::RegisterProfilePrefs(
|
||||
ContentSettingsPattern::kContentSettingsPatternVersion);
|
||||
registry->RegisterBooleanPref(prefs::kInContextCookieControlsOpened, false);
|
||||
registry->RegisterBooleanPref(kGeolocationMigrateExceptionsPref, false);
|
||||
@@ -33,7 +33,7 @@
|
||||
WebsiteSettingsRegistry::GetInstance();
|
||||
--- a/components/content_settings/core/common/pref_names.h
|
||||
+++ b/components/content_settings/core/common/pref_names.h
|
||||
@@ -277,6 +277,8 @@ inline constexpr char kDesktopSiteWindow
|
||||
@@ -281,6 +281,8 @@ inline constexpr char kDesktopSiteWindow
|
||||
"desktop_site.window_setting";
|
||||
#endif
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
--- a/components/omnibox/common/omnibox_features.cc
|
||||
+++ b/components/omnibox/common/omnibox_features.cc
|
||||
@@ -247,7 +247,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
|
||||
@@ -249,7 +249,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
|
||||
BASE_FEATURE(kOmniboxSiteSearch, DISABLED);
|
||||
|
||||
// Enables additional site search providers for the Site search Starter Pack.
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
--- a/chrome/app/settings_chromium_strings.grdp
|
||||
+++ b/chrome/app/settings_chromium_strings.grdp
|
||||
@@ -365,13 +365,13 @@ Chromium understands forms better and ca
|
||||
@@ -355,13 +355,13 @@
|
||||
|
||||
<!-- Performance Page -->
|
||||
<message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
|
||||
@@ -52,7 +52,7 @@
|
||||
<!-- Languages Page -->
|
||||
--- a/chrome/app/settings_strings.grdp
|
||||
+++ b/chrome/app/settings_strings.grdp
|
||||
@@ -1135,7 +1135,7 @@
|
||||
@@ -1101,7 +1101,7 @@
|
||||
Active site
|
||||
</message>
|
||||
<message name="IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP" desc="Help text shown on the second tab of the tab discarding exception list add dialog. Explains how to use the filter format to add an exclusion rule to the list.">
|
||||
@@ -61,7 +61,7 @@
|
||||
</message>
|
||||
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
|
||||
Power
|
||||
@@ -1159,7 +1159,7 @@
|
||||
@@ -1125,7 +1125,7 @@
|
||||
Inactive tabs appearance
|
||||
</message>
|
||||
<message name="IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK" desc="Label for a performance settings toggle description that controls whether the inactive tab UI is shown. Also contains a link to the help center article.">
|
||||
@@ -70,7 +70,7 @@
|
||||
</message>
|
||||
<message name="IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_TITLE" desc="Title for the link row that points to tab hover preview card apperance settings.">
|
||||
Tab hover preview card appearance
|
||||
@@ -1171,7 +1171,7 @@
|
||||
@@ -1137,7 +1137,7 @@
|
||||
Performance issue alerts
|
||||
</message>
|
||||
<message name="IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION" desc="Label for a performance settings toggle that controls whether performance intervention notifications should be shown and link to learn more about performance issue alerts.">
|
||||
@@ -240,7 +240,7 @@
|
||||
<template is="dom-if" if="[[!isYourSavedInfoSubpage_]]">
|
||||
--- a/chrome/browser/resources/settings/autofill_page/payments_section.ts
|
||||
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.ts
|
||||
@@ -316,14 +316,6 @@ export class SettingsPaymentsSectionElem
|
||||
@@ -329,14 +329,6 @@ export class SettingsPaymentsSectionElem
|
||||
// Record that the user opened the payments settings.
|
||||
chrome.metricsPrivate.recordUserAction('AutofillCreditCardsViewed');
|
||||
|
||||
@@ -426,7 +426,7 @@
|
||||
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
|
||||
--- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
|
||||
+++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
|
||||
@@ -376,7 +376,6 @@ void RecentTabsSubMenuModel::Build() {
|
||||
@@ -377,7 +377,6 @@ void RecentTabsSubMenuModel::Build() {
|
||||
AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
history_separator_index_ = GetItemCount() - 1;
|
||||
BuildLocalEntries();
|
||||
@@ -436,7 +436,7 @@
|
||||
void RecentTabsSubMenuModel::BuildLocalEntries() {
|
||||
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
@@ -997,16 +997,6 @@ void ExtensionsMenuModel::Build(Browser*
|
||||
@@ -1006,16 +1006,6 @@ void ExtensionsMenuModel::Build(Browser*
|
||||
SetElementIdentifierAt(
|
||||
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
|
||||
kManageExtensionsMenuItem);
|
||||
@@ -455,7 +455,7 @@
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
@@ -1298,13 +1298,15 @@ void BookmarkMenuDelegate::BuildOtherNod
|
||||
@@ -1334,13 +1334,15 @@ void BookmarkMenuDelegate::BuildOtherNod
|
||||
menu->AppendMenuItem(
|
||||
IDC_SHOW_BOOKMARK_SIDE_PANEL,
|
||||
l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
|
||||
@@ -533,7 +533,7 @@
|
||||
// Constrain title width manually since it doesn't have FlexSpecification.
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -1114,40 +1114,20 @@ void AddPerformanceStrings(content::WebU
|
||||
@@ -1105,40 +1105,20 @@ void AddPerformanceStrings(content::WebU
|
||||
IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
|
||||
{"performanceInterventionEnabledLabel",
|
||||
IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
|
||||
@@ -583,7 +583,7 @@
|
||||
|
||||
html_source->AddString(
|
||||
"tabDiscardTimerFiveMinutes",
|
||||
@@ -1193,11 +1173,6 @@ void AddPerformanceStrings(content::WebU
|
||||
@@ -1184,11 +1164,6 @@ void AddPerformanceStrings(content::WebU
|
||||
base::NumberToString16(
|
||||
performance_manager::user_tuning::BatterySaverModeManager::
|
||||
kLowBatteryThresholdPercent)));
|
||||
@@ -597,7 +597,7 @@
|
||||
chrome::kDiscardRingTreatmentLearnMoreUrl);
|
||||
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
|
||||
@@ -609,24 +609,17 @@ SettingsUI::SettingsUI(content::WebUI* w
|
||||
@@ -607,24 +607,17 @@ SettingsUI::SettingsUI(content::WebUI* w
|
||||
->UserIsActivePasswordChangeUser()},
|
||||
};
|
||||
|
||||
@@ -627,7 +627,7 @@
|
||||
html_source->AddBoolean(
|
||||
--- a/media/base/media_switches.cc
|
||||
+++ b/media/base/media_switches.cc
|
||||
@@ -806,7 +806,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
|
||||
@@ -828,7 +828,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
|
||||
BASE_FEATURE(kOnDeviceWebSpeechGeminiNano, base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
// Enables the Live Caption feature on supported devices.
|
||||
@@ -636,14 +636,13 @@
|
||||
|
||||
// Logs a DumpWithoutCrashing() call each time the Speech On-Device API (SODA)
|
||||
// fails to load. Used to diagnose issues when rolling out new versions of the
|
||||
--- a/ui/views/controls/menu/menu_item_view.cc
|
||||
+++ b/ui/views/controls/menu/menu_item_view.cc
|
||||
@@ -874,7 +874,7 @@ void MenuItemView::SetAlerted() {
|
||||
}
|
||||
--- a/ui/views/controls/menu/menu_item_view.h
|
||||
+++ b/ui/views/controls/menu/menu_item_view.h
|
||||
@@ -321,7 +321,6 @@ class VIEWS_EXPORT MenuItemView : public
|
||||
int GetCommand() const { return command_; }
|
||||
|
||||
bool MenuItemView::ShouldShowNewBadge() const {
|
||||
- return is_new_;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
bool MenuItemView::IsTraversableByKeyboard() const {
|
||||
void set_new_badge_type(std::optional<ui::NewBadgeType> new_badge_type) {
|
||||
- new_badge_type_ = new_badge_type;
|
||||
}
|
||||
std::optional<ui::NewBadgeType> new_badge_type() const {
|
||||
return new_badge_type_;
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,15 +1,15 @@
|
||||
# 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
|
||||
@@ -181,6 +181,7 @@
|
||||
@@ -180,6 +180,7 @@
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "components/supervised_user/core/browser/supervised_user_preferences.h"
|
||||
#include "components/supervised_user/core/browser/supervised_user_service.h"
|
||||
#include "components/supervised_user/core/browser/supervised_user_url_filter.h"
|
||||
#include "components/supervised_user/core/browser/supervised_user_url_filtering_service.h"
|
||||
+#include "components/translate/core/common/translate_switches.h"
|
||||
#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"
|
||||
@@ -2312,6 +2313,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -2336,6 +2337,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
}
|
||||
|
||||
if (CanTranslate(/*menu_logging=*/true)) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -321,6 +321,7 @@
|
||||
@@ -329,6 +329,7 @@
|
||||
#include "content/public/browser/internal_webui_config.h"
|
||||
#include "content/public/browser/isolated_web_apps_policy.h"
|
||||
#include "content/public/browser/legacy_tech_cookie_issue_details.h"
|
||||
@@ -10,17 +10,27 @@
|
||||
#include "content/public/browser/overlay_window.h"
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -1018,6 +1018,7 @@ source_set("extensions") {
|
||||
@@ -1026,6 +1026,7 @@ source_set("extensions") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
+ "//components/safe_browsing/content/common/proto:download_file_types_proto",
|
||||
"//components/safe_browsing/core/common/proto:csd_proto",
|
||||
"//components/search_engines",
|
||||
"//components/services/app_service",
|
||||
"//components/services/unzip/public/cpp",
|
||||
--- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
+++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "build/build_config.h"
|
||||
#include "chrome/app/chrome_command_ids.h"
|
||||
+#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/ui/browser_commands.h"
|
||||
#include "chrome/browser/ui/browser_window/public/browser_window_features.h"
|
||||
#include "chrome/browser/ui/tabs/features.h"
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -529,6 +529,7 @@ static_library("url_constants") {
|
||||
@@ -530,6 +530,7 @@ static_library("url_constants") {
|
||||
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
|
||||
"//components/password_manager/content/common",
|
||||
"//components/safe_browsing/core/common",
|
||||
@@ -30,7 +40,7 @@
|
||||
|
||||
--- a/components/component_updater/installer_policies/BUILD.gn
|
||||
+++ b/components/component_updater/installer_policies/BUILD.gn
|
||||
@@ -45,6 +45,7 @@ static_library("installer_policies_no_co
|
||||
@@ -40,6 +40,7 @@ static_library("installer_policies_no_co
|
||||
"//components/update_client",
|
||||
"//mojo/public/cpp/base:protobuf_support",
|
||||
"//services/network/public/cpp",
|
||||
@@ -40,7 +50,7 @@
|
||||
# Disallow depending on content.
|
||||
--- a/components/contextual_tasks/internal/BUILD.gn
|
||||
+++ b/components/contextual_tasks/internal/BUILD.gn
|
||||
@@ -45,6 +45,7 @@ source_set("internal") {
|
||||
@@ -43,6 +43,7 @@ source_set("internal") {
|
||||
"//components/sync/model",
|
||||
"//components/url_formatter",
|
||||
"//net",
|
||||
|
||||
+26
-8
@@ -92,8 +92,7 @@ chrome/browser/resources/chromeos/accessibility/common/earcons/wrap.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/common/earcons/wrap_edge.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/common/testing/fake_facegaze_assets_dlc.tar.xz
|
||||
chrome/browser/resources/chromeos/accessibility/common/testing/fake_pumpkin_dlc.tar.xz
|
||||
chrome/browser/resources/chromeos/accessibility/select_to_speak/mv2/earcons/null_selection.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/select_to_speak/mv3/earcons/null_selection.ogg
|
||||
chrome/browser/resources/chromeos/accessibility/select_to_speak/earcons/null_selection.ogg
|
||||
chrome/browser/resources/media/mei_preload/preloaded_data.pb
|
||||
chrome/browser/ui/ash/focus_mode/test/data/certificate_sha1.crt
|
||||
chrome/credential_provider/eventlog/gcp_eventlog_messages.mc
|
||||
@@ -7401,7 +7400,23 @@ third_party/crashpad/crashpad/snapshot/ios/testdata/crash-5726011582644224
|
||||
third_party/crashpad/crashpad/snapshot/ios/testdata/crash-6605504629637120
|
||||
third_party/crashpad/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8
|
||||
third_party/crashpad/crashpad/util/net/testdata/binary_http_body.dat
|
||||
third_party/crossbench-web-tests/synthetic/powerline/Chrome-Scheduler-Optimization-Benchmarks.ogg
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-fashion-1080p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-fashion-240p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-fashion-360p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-fashion-480p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-fashion-720p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-motor-240p.webm
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-motor-360p.webm
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-motor-480p.webm
|
||||
third_party/crossbench-web-tests/synthetic/powerline/adv-motor-720p.webm
|
||||
third_party/crossbench-web-tests/synthetic/powerline/con-corgi-1080p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/con-corgi-480p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/con-corgi-720p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/con-corgi-x265-1080p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/con-corgi-x265-720p.mp4
|
||||
third_party/crossbench-web-tests/synthetic/powerline/podcast.m4a
|
||||
third_party/crossbench-web-tests/synthetic/powerline/podcast.ogg
|
||||
third_party/crossbench-web-tests/synthetic/powerline/podcast.opus
|
||||
third_party/crossbench/crossbench/probes/profiling/time-profile.tracetemplate
|
||||
third_party/crossbench/tests/crossbench/plt/pb/battery/ac_powered.pb
|
||||
third_party/crossbench/tests/crossbench/plt/pb/battery/battery_powered.pb
|
||||
@@ -10442,10 +10457,6 @@ third_party/litert/src/litert/js/packages/core/testdata/delegate_compatibility_t
|
||||
third_party/litert/src/litert/js/packages/core/testdata/mixed_input_model.tflite
|
||||
third_party/litert/src/litert/js/packages/core/testdata/multi_signature_model.tflite
|
||||
third_party/litert/src/litert/js/packages/core/testdata/torchvision_mobilenet_v2.tflite
|
||||
third_party/litert/src/litert/samples/async_segmentation/models/selfie_multiclass_256x256.tflite
|
||||
third_party/litert/src/litert/samples/async_segmentation/models/selfie_multiclass_256x256_SM8650.tflite
|
||||
third_party/litert/src/litert/samples/async_segmentation/models/selfie_multiclass_256x256_SM8750.tflite
|
||||
third_party/litert/src/litert/samples/async_segmentation/test_images/image.jpeg
|
||||
third_party/litert/src/litert/samples/semantic_similarity/libs/libLiteRtOpenClAccelerator.so
|
||||
third_party/litert/src/litert/test/testdata/FFW-2-bit.tflite
|
||||
third_party/litert/src/litert/test/testdata/MTKEXT_CONV_2D.tflite
|
||||
@@ -10457,6 +10468,7 @@ third_party/litert/src/litert/test/testdata/island_partial.tflite
|
||||
third_party/litert/src/litert/test/testdata/k_einsum.tflite
|
||||
third_party/litert/src/litert/test/testdata/l2_norm_composite.tflite
|
||||
third_party/litert/src/litert/test/testdata/lookup_rope.tflite
|
||||
third_party/litert/src/litert/test/testdata/matmul_quant.tflite
|
||||
third_party/litert/src/litert/test/testdata/mobilenet_v2_1.0_224.tflite
|
||||
third_party/litert/src/litert/test/testdata/model_magic_test.tflite
|
||||
third_party/litert/src/litert/test/testdata/mul_quant.tflite
|
||||
@@ -10961,7 +10973,6 @@ third_party/quic_trace/src/examples/example.json.gz
|
||||
third_party/quic_trace/src/examples/example.qtr
|
||||
third_party/r8/custom_d8.jar
|
||||
third_party/r8/custom_r8.jar
|
||||
third_party/rust/chromium_crates_io/vendor/cxx-v1/.cache/clangd/index/cxx.h.766F44E49C49CFB2.idx
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-v0_3/tests/input-chunking-sensitivity-example1.zz
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-v0_3/tests/input-chunking-sensitivity-example2.zz
|
||||
third_party/rust/chromium_crates_io/vendor/fdeflate-v0_3/tests/input-chunking-sensitivity-example3.zz
|
||||
@@ -10969,6 +10980,7 @@ third_party/rust/chromium_crates_io/vendor/flate2-v1/examples/hello_world.txt.gz
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-v1/tests/corrupt-gz-file.bin
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-v1/tests/good-file.gz
|
||||
third_party/rust/chromium_crates_io/vendor/flate2-v1/tests/multi.gz
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_3/tests/testdata/fuzzer_smallbuffer_overflow.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_dense_crash-9486fb7c8a93b12c12a62166b43d31640c0208a9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_dense_minimized-from-9486fb7c8a93b12c12a62166b43d31640c0208a9
|
||||
third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/tests/fuzz/testdata/deserialize_sparse_crash-0da59c0434eaf35e5a6b470fa9244bb79c72b000
|
||||
@@ -11555,6 +11567,12 @@ third_party/tflite/src/tensorflow/core/kernels/fuzzing/corpus/string_split_v2/89
|
||||
third_party/tflite/src/tensorflow/core/kernels/fuzzing/corpus/string_split_v2/d5606def44fdbb9385dd764612069db0
|
||||
third_party/tflite/src/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin
|
||||
third_party/tflite/src/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin
|
||||
third_party/tflite/src/tensorflow/core/lib/jxl/testdata/random_128x96_gray_q100.jxl
|
||||
third_party/tflite/src/tensorflow/core/lib/jxl/testdata/random_128x96_gray_q50.jxl
|
||||
third_party/tflite/src/tensorflow/core/lib/jxl/testdata/random_128x96_rbg_q100.jxl
|
||||
third_party/tflite/src/tensorflow/core/lib/jxl/testdata/random_128x96_rbg_q50.jxl
|
||||
third_party/tflite/src/tensorflow/core/lib/jxl/testdata/random_128x96_rbga_q100.jxl
|
||||
third_party/tflite/src/tensorflow/core/lib/jxl/testdata/random_128x96_rbga_q50.jxl
|
||||
third_party/tflite/src/tensorflow/core/profiler/internal/testdata/ckpt.data-00000-of-00001
|
||||
third_party/tflite/src/tensorflow/core/profiler/internal/testdata/ckpt.index
|
||||
third_party/tflite/src/tensorflow/core/profiler/internal/testdata/ckpt.meta
|
||||
|
||||
Reference in new issue
Block a user