mirror of
https://github.com/imputnet/helium.git
synced 2026-10-19 01:39:56 -05:00
Update to Chromium 155.0.8059.39
This commit is contained in:
68 files changed
+1362
-1324
No files matched your search
@@ -1 +1 @@
|
||||
154.0.8037.97
|
||||
155.0.8059.39
|
||||
@@ -65,6 +65,8 @@ PRUNING_EXCLUDE_PATTERNS = [
|
||||
'third_party/node/node_modules/@rollup/wasm-node/dist/wasm-node/bindings_wasm_bg.wasm',
|
||||
# Exclusion for performance tracing
|
||||
'third_party/perfetto/src/trace_processor/importers/proto/atoms.descriptor',
|
||||
# Exclusion for jxl blue noise dither table
|
||||
'third_party/rust/chromium_crates_io/vendor/jxl-v0_7/src/util/dither_32x32.bin',
|
||||
# Exclusion for zoneinfo64
|
||||
'third_party/rust/chromium_crates_io/vendor/zoneinfo64-v0_3/src/data/zoneinfo64.res',
|
||||
# Exclusions for safe file extensions
|
||||
|
||||
+434
-540
File diff suppressed because it is too large.
Load diff
@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
|
||||
|
||||
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
||||
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
||||
@@ -65,7 +65,7 @@ public abstract class ChromeFeatureList
|
||||
@@ -66,7 +66,7 @@ public abstract class ChromeFeatureList
|
||||
* instead.
|
||||
*/
|
||||
public static String getFieldTrialParamByFeature(String featureName, String paramName) {
|
||||
@@ -19,7 +19,7 @@ Subject: Disable fetching of all field trials
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -80,8 +80,7 @@ public abstract class ChromeFeatureList
|
||||
@@ -81,8 +81,7 @@ public abstract class ChromeFeatureList
|
||||
*/
|
||||
public static boolean getFieldTrialParamByFeatureAsBoolean(
|
||||
String featureName, String paramName, boolean defaultValue) {
|
||||
@@ -29,7 +29,7 @@ Subject: Disable fetching of all field trials
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -109,8 +108,7 @@ public abstract class ChromeFeatureList
|
||||
@@ -110,8 +109,7 @@ public abstract class ChromeFeatureList
|
||||
*/
|
||||
public static int getFieldTrialParamByFeatureAsInt(
|
||||
String featureName, String paramName, int defaultValue) {
|
||||
@@ -39,7 +39,7 @@ Subject: Disable fetching of all field trials
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -137,8 +135,7 @@ public abstract class ChromeFeatureList
|
||||
@@ -138,8 +136,7 @@ public abstract class ChromeFeatureList
|
||||
*/
|
||||
public static double getFieldTrialParamByFeatureAsDouble(
|
||||
String featureName, String paramName, double defaultValue) {
|
||||
@@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials
|
||||
/**
|
||||
--- a/components/variations/service/variations_service.cc
|
||||
+++ b/components/variations/service/variations_service.cc
|
||||
@@ -268,22 +268,7 @@ bool GetInstanceManipulations(const net:
|
||||
@@ -269,22 +269,7 @@ bool GetInstanceManipulations(const net:
|
||||
// Variations seed fetching is only enabled in official Chrome builds, if a URL
|
||||
// is specified on the command line, and for testing.
|
||||
bool IsFetchingEnabled() {
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
--- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
|
||||
@@ -430,10 +430,6 @@ void CreateAndAddChromeThrottlesForNavig
|
||||
@@ -431,15 +431,6 @@ void CreateAndAddChromeThrottlesForNavig
|
||||
Profile::FromBrowserContext(context)),
|
||||
SafeSearchFactory::GetForBrowserContext(context)));
|
||||
|
||||
- // Before setting up SSL error detection, configure SSLErrorHandler to invoke
|
||||
- // the relevant extension API whenever an SSL interstitial is shown.
|
||||
- SSLErrorHandler::SetClientCallbackOnInterstitialsShown(
|
||||
- base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent));
|
||||
- base::BindRepeating([](content::WebContents* web_contents,
|
||||
- const GURL& page_url, const std::string& reason,
|
||||
- int net_error_code) {
|
||||
- MaybeTriggerSecurityInterstitialShownEvent(
|
||||
- web_contents, page_url, reason, net_error_code, "");
|
||||
- }));
|
||||
registry.AddThrottle(std::make_unique<SSLErrorNavigationThrottle>(
|
||||
registry, base::BindOnce(&HandleSSLErrorWrapper),
|
||||
base::BindOnce(&IsInWebApp),
|
||||
@@ -37,7 +42,7 @@
|
||||
} // namespace
|
||||
--- a/chrome/browser/download/download_item_model.cc
|
||||
+++ b/chrome/browser/download/download_item_model.cc
|
||||
@@ -129,7 +129,7 @@ class DownloadItemModelData : public bas
|
||||
@@ -130,7 +130,7 @@ class DownloadItemModelData : public bas
|
||||
|
||||
// Danger level of the file determined based on the file type and whether
|
||||
// there was a user action associated with the download.
|
||||
@@ -46,7 +51,7 @@
|
||||
|
||||
// Whether the download is currently being revived.
|
||||
bool is_being_revived_ = false;
|
||||
@@ -468,13 +468,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
@@ -469,13 +469,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
data->should_prefer_opening_in_browser_ = preference;
|
||||
}
|
||||
|
||||
@@ -81,7 +86,7 @@
|
||||
|
||||
if (enable_extensions) {
|
||||
deps += [ "//chrome/browser/ui/web_applications" ]
|
||||
@@ -723,6 +725,7 @@ static_library("advanced_protection") {
|
||||
@@ -721,6 +723,7 @@ static_library("advanced_protection") {
|
||||
}
|
||||
|
||||
source_set("metrics_collector") {
|
||||
@@ -89,7 +94,7 @@
|
||||
sources = [
|
||||
"safe_browsing_metrics_collector_factory.cc",
|
||||
"safe_browsing_metrics_collector_factory.h",
|
||||
@@ -742,6 +745,7 @@ source_set("metrics_collector") {
|
||||
@@ -740,6 +743,7 @@ source_set("metrics_collector") {
|
||||
"//components/safe_browsing/core/common:safe_browsing_prefs",
|
||||
"//content/public/browser",
|
||||
]
|
||||
@@ -140,7 +145,7 @@
|
||||
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
|
||||
--- a/chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ b/chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -113,7 +113,6 @@
|
||||
@@ -114,7 +114,6 @@
|
||||
#include "components/pdf/common/pdf_util.h"
|
||||
#include "components/permissions/features.h"
|
||||
#include "components/safe_browsing/buildflags.h"
|
||||
@@ -165,9 +170,9 @@
|
||||
}
|
||||
|
||||
-void BlocklistStateFetcher::SetSafeBrowsingConfig(
|
||||
- const safe_browsing::V4ProtocolConfig& config) {
|
||||
- const safe_browsing::SBProtocolConfig& config) {
|
||||
- safe_browsing_config_ =
|
||||
- std::make_unique<safe_browsing::V4ProtocolConfig>(config);
|
||||
- std::make_unique<safe_browsing::SBProtocolConfig>(config);
|
||||
-}
|
||||
-
|
||||
void BlocklistStateFetcher::OnURLLoaderComplete(
|
||||
@@ -179,7 +184,7 @@
|
||||
|
||||
virtual void Request(const std::string& id, RequestCallback callback);
|
||||
|
||||
- void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config);
|
||||
- void SetSafeBrowsingConfig(const safe_browsing::SBProtocolConfig& config);
|
||||
-
|
||||
protected:
|
||||
void OnURLLoaderComplete(network::SimpleURLLoader* url_loader,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
|
||||
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
|
||||
@@ -935,94 +935,6 @@ std::tuple<GURL, std::string> AutofillCr
|
||||
@@ -933,94 +933,6 @@ std::tuple<GURL, std::string> AutofillCr
|
||||
}
|
||||
|
||||
bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
|
||||
+++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
|
||||
@@ -38,7 +38,6 @@ bool IsComponentExtensionAllowlisted(con
|
||||
constexpr auto kAllowed = base::MakeFixedFlatSet<std::string_view>({
|
||||
extension_misc::kAimEligibilityExtensionId,
|
||||
extension_misc::kContextualTasksExtensionId,
|
||||
extension_misc::kGlicExtensionId,
|
||||
- extension_misc::kInAppPaymentsSupportAppId,
|
||||
@@ -10,7 +10,7 @@
|
||||
extension_misc::kAssessmentAssistantExtensionId,
|
||||
--- a/chrome/browser/extensions/component_loader.cc
|
||||
+++ b/chrome/browser/extensions/component_loader.cc
|
||||
@@ -453,13 +453,6 @@ void ComponentLoader::AddWebStoreApp() {
|
||||
@@ -600,13 +600,6 @@ void ComponentLoader::AddWebStoreApp() {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
// Note: If there is an ongoing request, abandon it. It's possible that
|
||||
--- a/chrome/browser/profile_resetter/profile_resetter.cc
|
||||
+++ b/chrome/browser/profile_resetter/profile_resetter.cc
|
||||
@@ -105,17 +105,6 @@ ProfileResetter::ProfileResetter(Profile
|
||||
@@ -104,17 +104,6 @@ ProfileResetter::ProfileResetter(Profile
|
||||
cookies_remover_(nullptr) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
DCHECK(profile_);
|
||||
@@ -72,7 +72,7 @@
|
||||
// Builds the URL for the Affiliation API's lookup method.
|
||||
--- a/components/assist_ranker/ranker_url_fetcher.cc
|
||||
+++ b/components/assist_ranker/ranker_url_fetcher.cc
|
||||
@@ -35,6 +35,7 @@ bool RankerURLFetcher::Request(
|
||||
@@ -31,6 +31,7 @@ bool RankerURLFetcher::Request(
|
||||
const GURL& url,
|
||||
RankerURLFetcher::Callback callback,
|
||||
network::mojom::URLLoaderFactory* url_loader_factory) {
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
return metrics::OmniboxInputType::URL;
|
||||
--- a/chrome/browser/history/history_utils.cc
|
||||
+++ b/chrome/browser/history/history_utils.cc
|
||||
@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url)
|
||||
@@ -27,6 +27,7 @@ bool CanAddURLToHistory(const GURL& url)
|
||||
url.SchemeIs(content::kChromeUIScheme) ||
|
||||
url.SchemeIs(content::kChromeUIUntrustedScheme) ||
|
||||
url.SchemeIs(content::kViewSourceScheme) ||
|
||||
@@ -60,7 +60,7 @@
|
||||
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
|
||||
--- a/content/browser/security/cpsp/child_process_security_policy_impl.cc
|
||||
+++ b/content/browser/security/cpsp/child_process_security_policy_impl.cc
|
||||
@@ -1239,6 +1239,7 @@ void ChildProcessSecurityPolicyImpl::Reg
|
||||
@@ -1212,6 +1212,7 @@ void ChildProcessSecurityPolicyImpl::Reg
|
||||
RegisterWebSafeScheme(url::kWssScheme);
|
||||
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
|
||||
RegisterWebSafeScheme(url::kDataScheme);
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
--- a/third_party/devtools-frontend/src/front_end/Images/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/Images/BUILD.gn
|
||||
@@ -28,7 +28,7 @@ node_action("generate_css_vars") {
|
||||
}
|
||||
|
||||
node_action("optimize_images") {
|
||||
- script = "node_modules/rollup/dist/bin/rollup"
|
||||
+ script = "../../node/node_modules/@rollup/wasm-node/dist/bin/rollup"
|
||||
|
||||
_bundled_entrypoint = target_gen_dir + "/Images.prebundle.js"
|
||||
_output_file_location = target_gen_dir + "/Images.js"
|
||||
--- a/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn
|
||||
@@ -26,7 +26,7 @@ devtools_module("web-vitals-injected") {
|
||||
}
|
||||
|
||||
node_action("bundled_library") {
|
||||
- script = "node_modules/rollup/dist/bin/rollup"
|
||||
+ script = "../../node/node_modules/@rollup/wasm-node/dist/bin/rollup"
|
||||
|
||||
_bundled_entrypoint = target_gen_dir + "/web-vitals-injected.js"
|
||||
_output_file_location = target_gen_dir + "/web-vitals-injected.generated.js"
|
||||
--- a/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn
|
||||
@@ -57,7 +57,7 @@ devtools_entrypoint("bundle") {
|
||||
}
|
||||
|
||||
node_action("bundled_library") {
|
||||
- script = "node_modules/rollup/dist/bin/rollup"
|
||||
+ script = "../../node/node_modules/@rollup/wasm-node/dist/bin/rollup"
|
||||
|
||||
_bundled_entrypoint = target_gen_dir + "/injected.js"
|
||||
_output_file_location = target_gen_dir + "/injected.generated.js"
|
||||
--- a/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn
|
||||
@@ -38,7 +38,7 @@ action("build_inspector_overlay") {
|
||||
"$target_gen_dir/tool_window_controls.css",
|
||||
"$target_gen_dir/main.js",
|
||||
devtools_location_prepend + "inspector_overlay/loadCSS.rollup.js",
|
||||
- devtools_location_prepend + "node_modules/rollup/dist/bin/rollup",
|
||||
+ devtools_location_prepend + "../../node/node_modules/@rollup/wasm-node/dist/bin/rollup",
|
||||
]
|
||||
|
||||
outputs = [ "$resources_out_dir/main.js" ]
|
||||
--- a/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
|
||||
+++ b/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
|
||||
@@ -56,7 +56,7 @@ def rollup(input_path, output_path, file
|
||||
[devtools_paths.node_path(),
|
||||
devtools_paths.rollup_path()] +
|
||||
['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] +
|
||||
- ['--plugin', rollup_plugin, '--plugin', 'terser'],
|
||||
+ ['--plugin', rollup_plugin, '--plugin', path.join(devtools_paths.node_modules_path(), '@rollup', 'plugin-terser', 'dist', 'cjs', 'index.js')],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
universal_newlines=True,
|
||||
--- a/third_party/devtools-frontend/src/scripts/devtools_paths.py
|
||||
+++ b/third_party/devtools-frontend/src/scripts/devtools_paths.py
|
||||
@@ -65,8 +65,11 @@ def license_checker_path():
|
||||
|
||||
def rollup_path():
|
||||
return path.join(
|
||||
- node_modules_path(),
|
||||
- 'rollup',
|
||||
+ third_party_path(),
|
||||
+ 'node',
|
||||
+ 'node_modules',
|
||||
+ '@rollup',
|
||||
+ 'wasm-node',
|
||||
'dist',
|
||||
'bin',
|
||||
'rollup',
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2570,7 +2570,6 @@ source_set("browser") {
|
||||
@@ -2574,7 +2574,6 @@ source_set("browser") {
|
||||
"//chrome/browser/profile_resetter:impl",
|
||||
"//chrome/browser/record_replay",
|
||||
"//chrome/browser/record_replay:impl",
|
||||
@@ -11,7 +11,7 @@
|
||||
"//chrome/browser/sharing_hub",
|
||||
"//chrome/browser/sharing_hub:impl",
|
||||
"//chrome/browser/smart_card",
|
||||
@@ -2619,7 +2618,6 @@ source_set("browser") {
|
||||
@@ -2623,7 +2622,6 @@ source_set("browser") {
|
||||
"//chrome/browser/ui/waap:window_metrics_manager",
|
||||
"//chrome/browser/ui/web_applications:impl",
|
||||
"//chrome/browser/ui/webui/app_service_internals",
|
||||
@@ -83,7 +83,7 @@
|
||||
}
|
||||
--- a/chrome/browser/actor/actor_keyed_service.cc
|
||||
+++ b/chrome/browser/actor/actor_keyed_service.cc
|
||||
@@ -842,13 +842,6 @@ bool ActorKeyedService::IsActiveOnTab(co
|
||||
@@ -856,13 +856,6 @@ bool ActorKeyedService::IsActiveOnTab(co
|
||||
|
||||
ActorTask* ActorKeyedService::GetTaskFromTab(
|
||||
const tabs::TabInterface& tab) const {
|
||||
@@ -99,7 +99,7 @@
|
||||
|
||||
--- a/chrome/browser/browser_process.h
|
||||
+++ b/chrome/browser/browser_process.h
|
||||
@@ -333,8 +333,6 @@ class BrowserProcess {
|
||||
@@ -331,8 +331,6 @@ class BrowserProcess {
|
||||
virtual void set_usb_system_tray_icon_for_test(
|
||||
std::unique_ptr<UsbSystemTrayIcon> icon) = 0;
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
// Obtain the browser instance of OSCryptAsync, which should be used for data
|
||||
--- a/chrome/browser/browser_process_impl.cc
|
||||
+++ b/chrome/browser/browser_process_impl.cc
|
||||
@@ -84,7 +84,6 @@
|
||||
@@ -85,7 +85,6 @@
|
||||
#include "chrome/browser/serial/serial_policy_allowed_ports.h"
|
||||
#include "chrome/browser/shell_integration.h"
|
||||
#include "chrome/browser/site_isolation/prefs_observer.h"
|
||||
@@ -118,7 +118,7 @@
|
||||
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
|
||||
#include "chrome/browser/startup_data.h"
|
||||
#include "chrome/browser/status_icons/status_tray.h"
|
||||
@@ -260,12 +259,10 @@ void OnLocalStatePrefsLoaded();
|
||||
@@ -261,12 +260,10 @@ void OnLocalStatePrefsLoaded();
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
#include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
|
||||
#include "chrome/browser/hid/hid_pinned_notification.h"
|
||||
@@ -158,7 +158,7 @@
|
||||
bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
|
||||
--- a/chrome/browser/browser_process_impl.h
|
||||
+++ b/chrome/browser/browser_process_impl.h
|
||||
@@ -57,9 +57,6 @@ class SiteIsolationPrefsObserver;
|
||||
@@ -58,9 +58,6 @@ class SiteIsolationPrefsObserver;
|
||||
class SystemNotificationHelper;
|
||||
class StartupData;
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
|
||||
namespace breadcrumbs {
|
||||
class ApplicationBreadcrumbsLogger;
|
||||
@@ -99,9 +96,6 @@ namespace speech {
|
||||
@@ -101,9 +98,6 @@ namespace speech {
|
||||
class SodaInstaller;
|
||||
} // namespace speech
|
||||
|
||||
@@ -187,7 +187,7 @@
|
||||
#endif
|
||||
|
||||
os_crypt_async::OSCryptAsync* os_crypt_async() override;
|
||||
@@ -468,12 +460,6 @@ class BrowserProcessImpl : public Browse
|
||||
@@ -467,12 +459,6 @@ class BrowserProcessImpl : public Browse
|
||||
// to ensure that SodaInstallerImpl gets destructed first.
|
||||
std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
|
||||
|
||||
@@ -211,7 +211,7 @@
|
||||
#include "chrome/browser/web_applications/sub_apps/sub_apps_service_impl.h"
|
||||
#endif
|
||||
|
||||
@@ -392,27 +390,6 @@ void BindMediaFoundationPreferences(
|
||||
@@ -382,27 +380,6 @@ void BindMediaFoundationPreferences(
|
||||
}
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -239,7 +239,7 @@
|
||||
|
||||
void BindModelBroker(
|
||||
content::RenderFrameHost* frame_host,
|
||||
@@ -586,10 +563,6 @@ void PopulateChromeFrameBinders(
|
||||
@@ -576,10 +553,6 @@ void PopulateChromeFrameBinders(
|
||||
&web_app::SubAppsServiceImpl::CreateIfAllowed);
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
--- a/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
|
||||
+++ b/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
|
||||
@@ -523,9 +523,6 @@ void PopulateChromeWebUIFrameBindersPart
|
||||
@@ -527,9 +527,6 @@ void PopulateChromeWebUIFrameBindersPart
|
||||
::mojom::app_service_internals::AppServiceInternalsPageHandler,
|
||||
AppServiceInternalsUI>(map);
|
||||
|
||||
@@ -264,7 +264,7 @@
|
||||
access_code_cast::mojom::PageHandlerFactory,
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -5532,9 +5532,6 @@ ChromeContentBrowserClient::CreateCommit
|
||||
@@ -5591,9 +5591,6 @@ ChromeContentBrowserClient::CreateCommit
|
||||
&conditions);
|
||||
#endif
|
||||
|
||||
@@ -276,7 +276,7 @@
|
||||
}
|
||||
--- a/chrome/browser/component_updater/BUILD.gn
|
||||
+++ b/chrome/browser/component_updater/BUILD.gn
|
||||
@@ -214,13 +214,6 @@ source_set("impl") {
|
||||
@@ -228,13 +228,6 @@ source_set("impl") {
|
||||
]
|
||||
}
|
||||
|
||||
@@ -292,7 +292,7 @@
|
||||
sources += [ "hyphenation_component_installer.cc" ]
|
||||
--- a/chrome/browser/component_updater/registration.cc
|
||||
+++ b/chrome/browser/component_updater/registration.cc
|
||||
@@ -60,8 +60,6 @@
|
||||
@@ -65,8 +65,6 @@
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
#include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h"
|
||||
@@ -301,7 +301,7 @@
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
@@ -202,9 +200,6 @@ void RegisterComponentsForUpdate() {
|
||||
@@ -207,9 +205,6 @@ void RegisterComponentsForUpdate() {
|
||||
RegisterRealTimeUrlChecksAllowlistComponent(cus);
|
||||
#endif // BUIDLFLAG(IS_ANDROID)
|
||||
|
||||
@@ -313,7 +313,7 @@
|
||||
|
||||
--- a/chrome/browser/glic/glic_selection_observer.cc
|
||||
+++ b/chrome/browser/glic/glic_selection_observer.cc
|
||||
@@ -1092,20 +1092,6 @@ void GlicSelectionObserver::OnAskGeminiW
|
||||
@@ -1256,20 +1256,6 @@ void GlicSelectionObserver::OnAskGeminiW
|
||||
}
|
||||
|
||||
std::string skill_prompt;
|
||||
@@ -334,7 +334,7 @@
|
||||
|
||||
if (skill_prompt.empty()) {
|
||||
Profile* profile =
|
||||
@@ -1127,28 +1113,6 @@ void GlicSelectionObserver::OnAskGeminiW
|
||||
@@ -1290,28 +1276,6 @@ void GlicSelectionObserver::OnAskGeminiW
|
||||
std::vector<GlicSelectionWidgetDelegate::SkillOption>
|
||||
GlicSelectionObserver::GetContextualSkills() {
|
||||
std::vector<GlicSelectionWidgetDelegate::SkillOption> result;
|
||||
@@ -365,7 +365,7 @@
|
||||
|
||||
--- a/chrome/browser/glic/host/glic_skills_manager_impl.cc
|
||||
+++ b/chrome/browser/glic/host/glic_skills_manager_impl.cc
|
||||
@@ -497,39 +497,6 @@ bool GlicSkillsClientSession::Require1PS
|
||||
@@ -504,39 +504,6 @@ bool GlicSkillsClientSession::Require1PS
|
||||
|
||||
void GlicSkillsClientSession::UpdateSkillPreviews(
|
||||
std::optional<tabs::TabInterface*> updated_tab) {
|
||||
@@ -576,7 +576,7 @@
|
||||
|
||||
--- a/chrome/browser/password_manager/password_change_delegate_impl.cc
|
||||
+++ b/chrome/browser/password_manager/password_change_delegate_impl.cc
|
||||
@@ -344,12 +344,6 @@ void PasswordChangeDelegateImpl::StartPa
|
||||
@@ -342,12 +342,6 @@ void PasswordChangeDelegateImpl::StartPa
|
||||
&PasswordChangeDelegateImpl::OnLoginStateCheckedWithoutPIResult,
|
||||
weak_ptr_factory_.GetWeakPtr()));
|
||||
|
||||
@@ -589,6 +589,18 @@
|
||||
}
|
||||
|
||||
void PasswordChangeDelegateImpl::OnLoginStateCheckedWithoutPIResult(
|
||||
--- a/chrome/browser/pdf/BUILD.gn
|
||||
+++ b/chrome/browser/pdf/BUILD.gn
|
||||
@@ -247,9 +247,6 @@ if (!is_android) {
|
||||
deps += [
|
||||
"//chrome/browser/download:test_support",
|
||||
"//chrome/browser/permissions",
|
||||
- "//chrome/browser/screen_ai:screen_ai_install_state",
|
||||
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
|
||||
- "//services/screen_ai/public/cpp:utilities",
|
||||
"//ui/accessibility:test_support",
|
||||
]
|
||||
|
||||
--- a/chrome/browser/pdf/pdf_extension_util.cc
|
||||
+++ b/chrome/browser/pdf/pdf_extension_util.cc
|
||||
@@ -142,7 +142,6 @@ base::DictValue GetPdfViewerStrings() {
|
||||
@@ -624,7 +636,7 @@
|
||||
#include "chrome/browser/permissions/pref_based_quiet_permission_ui_selector.h"
|
||||
#include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
|
||||
#include "chrome/browser/permissions/system/system_permission_settings.h"
|
||||
@@ -551,8 +550,6 @@ ChromePermissionsClient::CreatePermissio
|
||||
@@ -553,8 +552,6 @@ ChromePermissionsClient::CreatePermissio
|
||||
#endif
|
||||
selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
|
||||
Profile::FromBrowserContext(browser_context)));
|
||||
@@ -633,7 +645,7 @@
|
||||
return selectors;
|
||||
}
|
||||
|
||||
@@ -574,8 +571,6 @@ void ChromePermissionsClient::OnPromptRe
|
||||
@@ -576,8 +573,6 @@ void ChromePermissionsClient::OnPromptRe
|
||||
|
||||
Profile* profile =
|
||||
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
||||
@@ -676,7 +688,7 @@
|
||||
model_data.request_metadata.request_type;
|
||||
--- a/chrome/browser/prefs/BUILD.gn
|
||||
+++ b/chrome/browser/prefs/BUILD.gn
|
||||
@@ -387,7 +387,6 @@ source_set("impl") {
|
||||
@@ -388,7 +388,6 @@ source_set("impl") {
|
||||
"//chrome/browser/desktop_to_mobile_promos:utils",
|
||||
"//chrome/browser/device_identity",
|
||||
"//chrome/browser/new_tab_page",
|
||||
@@ -686,7 +698,7 @@
|
||||
"//chrome/browser/sharing_hub",
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
+++ b/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -1727,9 +1727,6 @@ void RegisterLocalState(PrefRegistrySimp
|
||||
@@ -1680,9 +1680,6 @@ void RegisterLocalState(PrefRegistrySimp
|
||||
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
|
||||
#endif
|
||||
|
||||
@@ -716,7 +728,7 @@
|
||||
"//chrome/browser/sharing_hub",
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -136,7 +136,6 @@
|
||||
@@ -135,7 +135,6 @@
|
||||
#include "chrome/browser/metrics/profile_metrics_service_factory.h"
|
||||
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
|
||||
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
|
||||
@@ -724,7 +736,7 @@
|
||||
#include "chrome/browser/navigation_predictor/search_engine_preconnector.h"
|
||||
#include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h"
|
||||
#include "chrome/browser/net/dns_probe_service_factory.h"
|
||||
@@ -397,7 +396,6 @@
|
||||
@@ -395,7 +394,6 @@
|
||||
#include "chrome/browser/record_replay/task_parameters_extractor_factory.h"
|
||||
#include "chrome/browser/record_replay/task_service_factory.h"
|
||||
#include "chrome/browser/record_replay/task_store_factory.h"
|
||||
@@ -732,7 +744,7 @@
|
||||
#include "chrome/browser/search/instant_service_factory.h"
|
||||
#include "chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.h"
|
||||
#include "chrome/browser/speech/speech_recognition_client_browser_interface_factory.h"
|
||||
@@ -1195,7 +1193,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1190,7 +1188,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
|
||||
net::ServerCertificateDatabaseServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -740,7 +752,7 @@
|
||||
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
|
||||
HistorySyncOptinServiceFactory::GetInstance();
|
||||
ProfileManagementDisclaimerServiceFactory::GetInstance();
|
||||
@@ -1258,9 +1255,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1253,9 +1250,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
// TODO(b/502297163): Implement for Android.
|
||||
OneTimePermissionsTrackerFactory::GetInstance();
|
||||
#endif
|
||||
@@ -750,7 +762,7 @@
|
||||
OptimizationGuideGlobalStateHolderKeyedServiceFactory::GetInstance();
|
||||
OptimizationGuideKeyedServiceFactory::GetInstance();
|
||||
OriginKeyedPermissionActionServiceFactory::GetInstance();
|
||||
@@ -1359,7 +1353,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1354,7 +1348,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
policy::UserPolicyOidcSigninServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -758,7 +770,7 @@
|
||||
PredictionServiceFactory::GetInstance();
|
||||
predictors::AutocompleteActionPredictorFactory::GetInstance();
|
||||
predictors::LoadingPredictorFactory::GetInstance();
|
||||
@@ -1443,10 +1436,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1438,10 +1431,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
SafetyHubMenuNotificationServiceFactory::GetInstance();
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
SafetyHubHatsServiceFactory::GetInstance();
|
||||
@@ -769,7 +781,7 @@
|
||||
#endif
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
if (ash::features::IsScannerEnabled()) {
|
||||
@@ -1570,7 +1559,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -1565,7 +1554,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
TopSitesFactory::GetInstance();
|
||||
translate::TranslateRankerFactory::GetInstance();
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
@@ -779,7 +791,7 @@
|
||||
ttc::TtcKeyedServiceFactory::GetInstance();
|
||||
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
|
||||
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
|
||||
@@ -226,11 +226,6 @@ void OffTheRecordProfileImpl::Init() {
|
||||
@@ -225,11 +225,6 @@ void OffTheRecordProfileImpl::Init() {
|
||||
// AccessibilityLabelsService has a default prefs behavior in incognito.
|
||||
AccessibilityLabelsService::InitOffTheRecordPrefs(this);
|
||||
|
||||
@@ -793,7 +805,7 @@
|
||||
// System Profile.
|
||||
--- a/chrome/browser/profiles/profile_impl.cc
|
||||
+++ b/chrome/browser/profiles/profile_impl.cc
|
||||
@@ -924,11 +924,6 @@ void ProfileImpl::DoFinalInit(CreateMode
|
||||
@@ -923,11 +923,6 @@ void ProfileImpl::DoFinalInit(CreateMode
|
||||
// The password settings service needs to start listening to settings
|
||||
// changes from Google Mobile Services, as early as possible.
|
||||
PasswordManagerSettingsServiceFactory::GetForProfile(this);
|
||||
@@ -815,7 +827,7 @@
|
||||
#include "chrome/browser/prefs/incognito_mode_prefs.h"
|
||||
#include "chrome/browser/profiles/delete_profile_helper.h"
|
||||
#include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
|
||||
@@ -1614,9 +1613,6 @@ void ProfileManager::DoFinalInitForServi
|
||||
@@ -1610,9 +1609,6 @@ void ProfileManager::DoFinalInitForServi
|
||||
// Ensure NavigationPredictorKeyedService is started.
|
||||
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
|
||||
|
||||
@@ -840,7 +852,7 @@
|
||||
${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
|
||||
--- a/chrome/browser/skills/BUILD.gn
|
||||
+++ b/chrome/browser/skills/BUILD.gn
|
||||
@@ -61,13 +61,9 @@ source_set("public") {
|
||||
@@ -62,13 +62,9 @@ source_set("public") {
|
||||
source_set("ui") {
|
||||
sources = [
|
||||
"skills_dialog_launcher.cc",
|
||||
@@ -990,7 +1002,7 @@
|
||||
is_installed = speech::SodaInstaller::GetInstance()->IsSodaInstalled(
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -1475,7 +1475,6 @@ static_library("ui") {
|
||||
@@ -1666,7 +1666,6 @@ static_library("ui") {
|
||||
"//chrome/browser/lens/region_search",
|
||||
"//chrome/browser/reading_list",
|
||||
"//chrome/browser/safe_browsing",
|
||||
@@ -998,7 +1010,7 @@
|
||||
"//chrome/browser/smart_card",
|
||||
"//chrome/browser/support_tool",
|
||||
"//chrome/browser/tab_group_sync:utils",
|
||||
@@ -2909,7 +2908,6 @@ static_library("ui") {
|
||||
@@ -3122,7 +3121,6 @@ static_library("ui") {
|
||||
"//chrome/browser/ui/views/zoom",
|
||||
"//chrome/browser/ui/webauthn:impl",
|
||||
"//chrome/browser/ui/webui/app_service_internals",
|
||||
@@ -1026,7 +1038,7 @@
|
||||
"//chrome/common",
|
||||
--- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
|
||||
+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
|
||||
@@ -199,22 +199,3 @@ void ChromePDFDocumentHelperClient::SetP
|
||||
@@ -189,22 +189,3 @@ void ChromePDFDocumentHelperClient::SetP
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1061,7 +1073,7 @@
|
||||
const std::u16string& text);
|
||||
--- a/chrome/browser/ui/tabs/public/tab_features.h
|
||||
+++ b/chrome/browser/ui/tabs/public/tab_features.h
|
||||
@@ -165,12 +165,6 @@ namespace webapps {
|
||||
@@ -173,12 +173,6 @@ namespace webapps {
|
||||
class AppBannerManagerDesktop;
|
||||
} // namespace webapps
|
||||
|
||||
@@ -1074,7 +1086,7 @@
|
||||
namespace sync_sessions {
|
||||
class SyncSessionsRouterTabHelper;
|
||||
} // namespace sync_sessions
|
||||
@@ -679,10 +673,6 @@ class TabFeatures {
|
||||
@@ -691,10 +685,6 @@ class TabFeatures {
|
||||
std::unique_ptr<contextual_tasks::ContextualTasksTabVisitTracker>
|
||||
contextual_tasks_tab_visit_tracker_;
|
||||
|
||||
@@ -1087,7 +1099,7 @@
|
||||
std::unique_ptr<enterprise_reporting::SaasUsageNavigationObserver>
|
||||
--- a/chrome/browser/ui/tabs/tab_features.cc
|
||||
+++ b/chrome/browser/ui/tabs/tab_features.cc
|
||||
@@ -428,11 +428,6 @@ void TabFeatures::Init(TabInterface& tab
|
||||
@@ -441,11 +441,6 @@ void TabFeatures::Init(TabInterface& tab
|
||||
GetUserDataFactory().CreateInstance<actor::ui::ActorUiTabController>(
|
||||
tab, tab, actor::ActorKeyedService::Get(profile));
|
||||
}
|
||||
@@ -1099,7 +1111,7 @@
|
||||
} // IsInNormalWindow() end.
|
||||
|
||||
if (base::FeatureList::IsEnabled(features::kGlicActor)) {
|
||||
@@ -700,10 +695,6 @@ void TabFeatures::Init(TabInterface& tab
|
||||
@@ -719,10 +714,6 @@ void TabFeatures::Init(TabInterface& tab
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1112,7 +1124,7 @@
|
||||
std::make_unique<indigo::IndigoPageActionController>(
|
||||
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
|
||||
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
|
||||
@@ -1109,40 +1109,6 @@ void MaybeRegisterChromeFeaturePromos(
|
||||
@@ -1081,40 +1081,6 @@ void MaybeRegisterChromeFeaturePromos(
|
||||
"Triggered when the PDF Viewer opens.")));
|
||||
#endif // BUILDFLAG(ENABLE_PDF_INK2)
|
||||
|
||||
@@ -1155,17 +1167,17 @@
|
||||
registry.RegisterFeature(std::move(
|
||||
--- a/chrome/browser/ui/webui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/webui/BUILD.gn
|
||||
@@ -113,7 +113,6 @@ source_set("configs") {
|
||||
@@ -114,7 +114,6 @@ source_set("configs") {
|
||||
"//chrome/browser/actor/ui:actor_overlay_web_view",
|
||||
"//chrome/browser/ui/webui/access_code_cast",
|
||||
"//chrome/browser/ui/webui/app_service_internals",
|
||||
- "//chrome/browser/ui/webui/autofill_ml_internals",
|
||||
"//chrome/browser/ui/webui/color_pipeline_internals",
|
||||
"//chrome/browser/ui/webui/critical_actions",
|
||||
"//chrome/browser/ui/webui/history",
|
||||
"//chrome/browser/ui/webui/infobar_internals",
|
||||
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
|
||||
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
|
||||
@@ -338,7 +338,6 @@ void RegisterChromeWebUIConfigs() {
|
||||
@@ -353,7 +353,6 @@ void RegisterChromeWebUIConfigs() {
|
||||
map.AddWebUIConfig(std::make_unique<media_router::AccessCodeCastUIConfig>());
|
||||
map.AddWebUIConfig(std::make_unique<actor::ui::ActorOverlayUIConfig>());
|
||||
map.AddWebUIConfig(std::make_unique<AppServiceInternalsUIConfig>());
|
||||
@@ -1302,7 +1314,7 @@
|
||||
"//chrome/browser/ui:accelerator_table",
|
||||
--- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
|
||||
@@ -24,8 +24,6 @@
|
||||
@@ -23,8 +23,6 @@
|
||||
#include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
|
||||
#include "chrome/browser/language/language_model_manager_factory.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
@@ -1311,7 +1323,7 @@
|
||||
#include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
|
||||
#include "chrome/browser/translate/chrome_translate_client.h"
|
||||
#include "chrome/browser/ui/read_anything/read_anything_controller.h"
|
||||
@@ -404,14 +402,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
|
||||
@@ -405,14 +403,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
|
||||
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
|
||||
SetDefaultLanguageCode(prefs_lang);
|
||||
|
||||
@@ -1328,7 +1340,7 @@
|
||||
!features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) {
|
||||
--- a/chrome/renderer/BUILD.gn
|
||||
+++ b/chrome/renderer/BUILD.gn
|
||||
@@ -340,8 +340,6 @@ static_library("renderer") {
|
||||
@@ -344,8 +344,6 @@ static_library("renderer") {
|
||||
deps += [ "//chrome/common/wallet:mojo_bindings" ]
|
||||
} else {
|
||||
sources += [
|
||||
@@ -1337,7 +1349,7 @@
|
||||
"accessibility/phrase_segmentation/base_phrase_segmenter.cc",
|
||||
"accessibility/phrase_segmentation/base_phrase_segmenter.h",
|
||||
"accessibility/phrase_segmentation/dependency_parser_model.cc",
|
||||
@@ -358,16 +356,6 @@ static_library("renderer") {
|
||||
@@ -362,21 +360,6 @@ static_library("renderer") {
|
||||
"accessibility/phrase_segmentation/tokenized_sentence.h",
|
||||
"accessibility/phrase_segmentation/tokenizer.cc",
|
||||
"accessibility/phrase_segmentation/tokenizer.h",
|
||||
@@ -1349,12 +1361,17 @@
|
||||
- "accessibility/read_anything/read_anything_app_controller.h",
|
||||
- "accessibility/read_anything/read_anything_app_model.cc",
|
||||
- "accessibility/read_anything/read_anything_app_model.h",
|
||||
- "accessibility/read_anything/read_anything_distiller.h",
|
||||
- "accessibility/read_anything/read_anything_distiller_factory.cc",
|
||||
- "accessibility/read_anything/read_anything_distiller_factory.h",
|
||||
- "accessibility/read_anything/read_anything_node_utils.cc",
|
||||
- "accessibility/read_anything/read_anything_node_utils.h",
|
||||
- "accessibility/read_anything/screen2x_distiller.cc",
|
||||
- "accessibility/read_anything/screen2x_distiller.h",
|
||||
"media/chrome_speech_recognition_client.cc",
|
||||
"media/chrome_speech_recognition_client.h",
|
||||
"password_manager/remote_actor_credential_sharing_extension.cc",
|
||||
@@ -385,7 +373,6 @@ static_library("renderer") {
|
||||
@@ -394,7 +377,6 @@ static_library("renderer") {
|
||||
"//components/record_replay/content/renderer",
|
||||
"//components/trusted_vault",
|
||||
"//services/screen_ai/buildflags",
|
||||
@@ -1364,15 +1381,15 @@
|
||||
"//third_party/tensorflow-text",
|
||||
--- a/chrome/renderer/chrome_render_frame_observer.cc
|
||||
+++ b/chrome/renderer/chrome_render_frame_observer.cc
|
||||
@@ -84,7 +84,6 @@
|
||||
#include "url/gurl.h"
|
||||
@@ -88,7 +88,6 @@
|
||||
#include "url/url_constants.h"
|
||||
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
-#include "chrome/renderer/accessibility/read_anything/read_anything_app_controller.h"
|
||||
#include "chrome/renderer/searchbox/searchbox_extension.h"
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -375,14 +374,6 @@ void ChromeRenderFrameObserver::DidClear
|
||||
@@ -385,14 +384,6 @@ void ChromeRenderFrameObserver::DidClear
|
||||
SearchBoxExtension::Install(render_frame()->GetWebFrame());
|
||||
}
|
||||
|
||||
@@ -1389,7 +1406,7 @@
|
||||
guest_view::SlimWebViewBindings::MaybeInstall(*render_frame());
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -2160,9 +2160,6 @@ if (!is_android) {
|
||||
@@ -1907,9 +1907,6 @@ if (!is_android) {
|
||||
"//chrome/browser/safe_browsing:blocking_page_platform_test_support",
|
||||
"//chrome/browser/safe_browsing:browser_tests",
|
||||
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
|
||||
@@ -1399,7 +1416,7 @@
|
||||
"//chrome/browser/search",
|
||||
"//chrome/browser/search:browser_tests",
|
||||
"//chrome/browser/search:test_support",
|
||||
@@ -2779,8 +2776,6 @@ if (!is_android) {
|
||||
@@ -2537,8 +2534,6 @@ if (!is_android) {
|
||||
"//services/preferences/public/cpp",
|
||||
"//services/preferences/public/cpp/tracked",
|
||||
"//services/preferences/tracked:features",
|
||||
@@ -1408,15 +1425,15 @@
|
||||
"//services/service_manager/public/cpp",
|
||||
"//services/strings",
|
||||
"//services/test/echo/public/mojom",
|
||||
@@ -6713,7 +6708,6 @@ test("unit_tests") {
|
||||
@@ -6275,7 +6270,6 @@ test("unit_tests") {
|
||||
# TODO(crbug.com/417513088): Maybe merge with the non-android `deps`
|
||||
# declaration above?
|
||||
deps += [
|
||||
- "../browser/screen_ai:screen_ai_install_state",
|
||||
"//chrome:packed_resources",
|
||||
"//chrome/browser/apps:icon_standardizer",
|
||||
"//chrome/browser/apps/app_service",
|
||||
@@ -6754,7 +6748,6 @@ test("unit_tests") {
|
||||
"//chrome/browser/apps/app_service:app_registry_cache_waiter",
|
||||
@@ -6315,7 +6309,6 @@ test("unit_tests") {
|
||||
"//chrome/browser/profile_resetter:fake_profile_resetter",
|
||||
"//chrome/browser/profile_resetter:unit_tests",
|
||||
"//chrome/browser/resources/new_tab_page_instant:resources_grit",
|
||||
@@ -1426,7 +1443,7 @@
|
||||
"//chrome/browser/sensor:unit_tests",
|
||||
--- a/chrome/utility/BUILD.gn
|
||||
+++ b/chrome/utility/BUILD.gn
|
||||
@@ -149,7 +149,6 @@ static_library("utility") {
|
||||
@@ -151,7 +151,6 @@ static_library("utility") {
|
||||
"//components/user_data_importer/content",
|
||||
"//components/user_data_importer/utility:bookmarks",
|
||||
"//services/proxy_resolver:lib",
|
||||
@@ -1436,7 +1453,7 @@
|
||||
|
||||
--- a/chrome/utility/services.cc
|
||||
+++ b/chrome/utility/services.cc
|
||||
@@ -68,8 +68,6 @@
|
||||
@@ -69,8 +69,6 @@
|
||||
#include "components/mirroring/service/mirroring_service.h"
|
||||
#include "services/proxy_resolver/proxy_resolver_factory_impl.h" // nogncheck
|
||||
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
|
||||
@@ -1445,7 +1462,7 @@
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(ENABLE_MEDIA_REMOTING_REDIRECTION)
|
||||
@@ -294,10 +292,6 @@ auto RunReadingModeMetricsService(
|
||||
@@ -295,10 +293,6 @@ auto RunReadingModeMetricsService(
|
||||
std::move(receiver));
|
||||
}
|
||||
|
||||
@@ -1456,7 +1473,7 @@
|
||||
#endif
|
||||
|
||||
#if (BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) && \
|
||||
@@ -496,7 +490,6 @@ void RegisterMainThreadServices(mojo::Se
|
||||
@@ -497,7 +491,6 @@ void RegisterMainThreadServices(mojo::Se
|
||||
services.Add(RunProfileImporter);
|
||||
services.Add(RunMirroringService);
|
||||
services.Add(RunReadingModeMetricsService);
|
||||
@@ -1466,7 +1483,7 @@
|
||||
#if BUILDFLAG(ENABLE_MEDIA_REMOTING_REDIRECTION)
|
||||
--- a/components/BUILD.gn
|
||||
+++ b/components/BUILD.gn
|
||||
@@ -639,7 +639,6 @@ test("components_unittests") {
|
||||
@@ -638,7 +638,6 @@ test("components_unittests") {
|
||||
"//components/one_time_tokens/core/browser:unit_tests",
|
||||
"//components/page_info:unit_tests",
|
||||
"//components/password_manager/core/browser/actor_login:unit_tests",
|
||||
@@ -1485,7 +1502,7 @@
|
||||
GeoIpCountryCode country_code;
|
||||
LanguageCode current_page_language;
|
||||
std::unique_ptr<BufferingLogManager> log_manager;
|
||||
@@ -920,10 +918,8 @@ void AutofillManager::RunMlModels(
|
||||
@@ -878,10 +876,8 @@ void AutofillManager::RunMlModels(
|
||||
}));
|
||||
switch (source) {
|
||||
case HeuristicSource::kAutofillMachineLearning:
|
||||
@@ -1496,7 +1513,7 @@
|
||||
break;
|
||||
case HeuristicSource::kRegexes:
|
||||
NOTREACHED();
|
||||
@@ -1137,12 +1133,6 @@ void AutofillManager::UpdateFormCache(
|
||||
@@ -1058,12 +1054,6 @@ void AutofillManager::UpdateFormCache(
|
||||
|
||||
auto apply_predictions = [](FormStructure& form_structure,
|
||||
const AsyncContext& context, size_t i) {
|
||||
@@ -1509,7 +1526,7 @@
|
||||
if (!context.regex_predictions.empty()) {
|
||||
context.regex_predictions[i].ApplyTo(form_structure.fields());
|
||||
}
|
||||
@@ -1236,26 +1226,6 @@ void AutofillManager::LogCurrentFieldTyp
|
||||
@@ -1157,26 +1147,6 @@ void AutofillManager::LogCurrentFieldTyp
|
||||
|
||||
void AutofillManager::SubscribeToMlModelChanges(
|
||||
FieldClassificationModelHandler& handler) {
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
} // namespace domain_reliability
|
||||
--- a/chrome/browser/net/profile_network_context_service.cc
|
||||
+++ b/chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -184,8 +184,7 @@ class ChromeDomainReliabilityDelegate
|
||||
@@ -185,8 +185,7 @@ class ChromeDomainReliabilityDelegate
|
||||
~ChromeDomainReliabilityDelegate() override = default;
|
||||
|
||||
bool IsDomainReliabilityAllowed() const override {
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
}
|
||||
|
||||
base::TimeDelta GCMClientImpl::GetTimeToNextCheckin() const {
|
||||
@@ -1124,25 +1050,6 @@ void GCMClientImpl::Send(const std::stri
|
||||
@@ -1120,25 +1046,6 @@ void GCMClientImpl::Send(const std::stri
|
||||
const OutgoingMessage& message) {
|
||||
DCHECK_EQ(state_, READY);
|
||||
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
page_->OnRequestCreated(std::move(mojom_request));
|
||||
--- a/chrome/common/google_url_loader_throttle.cc
|
||||
+++ b/chrome/common/google_url_loader_throttle.cc
|
||||
@@ -25,10 +25,6 @@
|
||||
@@ -26,10 +26,6 @@
|
||||
#include "services/network/public/mojom/x_frame_options.mojom.h"
|
||||
#include "url/origin.h"
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
|
||||
#include "chrome/common/bound_session_request_throttled_handler.h"
|
||||
#include "net/cookies/cookie_util.h"
|
||||
@@ -173,71 +169,6 @@ void GoogleURLLoaderThrottle::DetachFrom
|
||||
@@ -174,71 +170,6 @@ void GoogleURLLoaderThrottle::DetachFrom
|
||||
void GoogleURLLoaderThrottle::WillStartRequest(
|
||||
network::ResourceRequest* request,
|
||||
bool* defer) {
|
||||
@@ -111,7 +111,7 @@
|
||||
}
|
||||
|
||||
void GoogleURLLoaderThrottle::WillRedirectRequest(
|
||||
@@ -245,102 +176,12 @@ void GoogleURLLoaderThrottle::WillRedire
|
||||
@@ -246,102 +177,12 @@ void GoogleURLLoaderThrottle::WillRedire
|
||||
const network::mojom::URLResponseHead& response_head,
|
||||
bool* defer,
|
||||
network::HttpRequestHeadersUpdateParams* headers_update_params) {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -385,7 +385,6 @@ if (!is_android && !is_mac) {
|
||||
@@ -381,7 +381,6 @@ if (!is_android && !is_mac) {
|
||||
}
|
||||
|
||||
data_deps += [
|
||||
@@ -15,7 +15,7 @@
|
||||
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
|
||||
"//components/privacy_sandbox/privacy_sandbox_attestations/preload:component",
|
||||
"//third_party/widevine/cdm",
|
||||
@@ -1382,7 +1381,6 @@ if (is_win) {
|
||||
@@ -1385,7 +1384,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
|
||||
@@ -134,7 +134,6 @@ group("resources") {
|
||||
@@ -135,7 +135,6 @@ group("resources") {
|
||||
if (is_mac) {
|
||||
public_deps += [
|
||||
"unexportable_keys_internals:resources",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -386,7 +386,6 @@ if (!is_android && !is_mac) {
|
||||
@@ -382,7 +382,6 @@ if (!is_android && !is_mac) {
|
||||
|
||||
data_deps += [
|
||||
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
|
||||
@@ -8,7 +8,7 @@
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
|
||||
@@ -1382,7 +1381,6 @@ if (is_win) {
|
||||
@@ -1385,7 +1384,6 @@ if (is_win) {
|
||||
":swiftshader_binaries",
|
||||
":widevine_cdm_library",
|
||||
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle",
|
||||
@@ -18,7 +18,7 @@
|
||||
if (is_chrome_branded) {
|
||||
--- a/chrome/browser/resources/BUILD.gn
|
||||
+++ b/chrome/browser/resources/BUILD.gn
|
||||
@@ -134,7 +134,6 @@ group("resources") {
|
||||
@@ -135,7 +135,6 @@ group("resources") {
|
||||
if (is_mac) {
|
||||
public_deps += [
|
||||
"unexportable_keys_internals:resources",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/rlz/lib/financial_ping.cc
|
||||
+++ b/rlz/lib/financial_ping.cc
|
||||
@@ -306,7 +306,7 @@ FinancialPing::PingResponse FinancialPin
|
||||
@@ -298,7 +298,7 @@ FinancialPing::PingResponse FinancialPin
|
||||
response->clear();
|
||||
|
||||
std::string url =
|
||||
@@ -13,7 +13,7 @@
|
||||
// wininet implementation.
|
||||
--- a/rlz/lib/lib_values.cc
|
||||
+++ b/rlz/lib/lib_values.cc
|
||||
@@ -45,7 +45,6 @@ const char kSetDccResponseVariable[] = "
|
||||
@@ -43,7 +43,6 @@ const char kSetDccResponseVariable[] = "
|
||||
//
|
||||
|
||||
const char kFinancialPingPath[] = "/tools/pso/ping";
|
||||
@@ -23,7 +23,7 @@
|
||||
// Ping times in 100-nanosecond intervals.
|
||||
--- a/rlz/lib/lib_values.h
|
||||
+++ b/rlz/lib/lib_values.h
|
||||
@@ -72,7 +72,6 @@ extern const char kSetDccResponseVariabl
|
||||
@@ -75,7 +75,6 @@ extern const char kSetDccResponseVariabl
|
||||
//
|
||||
|
||||
extern const char kFinancialPingPath[];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
|
||||
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
|
||||
@@ -684,12 +684,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
@@ -683,12 +683,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
GetOriginsRequiringDedicatedProcess() {
|
||||
std::vector<url::Origin> list;
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
fetch->oauth2_attempt_count++;
|
||||
--- a/extensions/common/extension_urls.cc
|
||||
+++ b/extensions/common/extension_urls.cc
|
||||
@@ -83,8 +83,6 @@ GURL AppendUtmSource(const GURL& url, st
|
||||
@@ -86,8 +86,6 @@ GURL AppendUtmSource(const GURL& url, st
|
||||
|
||||
GURL GetWebstoreExtensionsCategoryURL() {
|
||||
GURL base_url = GetNewWebstoreLaunchURL();
|
||||
|
||||
@@ -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
|
||||
@@ -872,16 +872,6 @@ void ExtensionInfoGenerator::FillExtensi
|
||||
@@ -896,16 +896,6 @@ void ExtensionInfoGenerator::FillExtensi
|
||||
toolbar_actions_model->IsActionPinned(extension.id());
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
AccountExtensionTracker::Get(profile)->CanUploadAsAccountExtension(
|
||||
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
|
||||
@@ -503,7 +503,7 @@ content::WebUIDataSource* CreateAndAddEx
|
||||
@@ -506,7 +506,7 @@ content::WebUIDataSource* CreateAndAddEx
|
||||
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
|
||||
source->AddBoolean(
|
||||
"safetyHubThreeDotDetails",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -1070,8 +1070,6 @@ if (is_win) {
|
||||
@@ -1072,8 +1072,6 @@ if (is_win) {
|
||||
|
||||
bundle_data("chrome_framework_resources") {
|
||||
sources = [
|
||||
@@ -24,7 +24,7 @@
|
||||
"//components/safe_browsing/core/browser/db:v5_get_hash_protocol_manager",
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -4915,7 +4915,6 @@ template("performance_test_suite_templat
|
||||
@@ -4556,7 +4556,6 @@ template("performance_test_suite_templat
|
||||
data_deps += [
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//components/tracing:tracing_perftests",
|
||||
@@ -32,7 +32,7 @@
|
||||
"//testing:run_perf_test",
|
||||
"//ui/views:views_perftests",
|
||||
]
|
||||
@@ -5713,9 +5712,6 @@ test("unit_tests") {
|
||||
@@ -5345,9 +5344,6 @@ test("unit_tests") {
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
"//components/safe_browsing/content/browser:client_side_detection_images_cache",
|
||||
@@ -44,7 +44,19 @@
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
--- a/chrome/test/chromedriver/BUILD.gn
|
||||
+++ b/chrome/test/chromedriver/BUILD.gn
|
||||
@@ -417,7 +417,7 @@ source_set("lib") {
|
||||
@@ -269,11 +269,9 @@ source_set("automation_client_lib") {
|
||||
# Also compile the generated files.
|
||||
sources += get_target_outputs(":embed_js_in_cpp")
|
||||
sources += get_target_outputs(":embed_mobile_devices_in_cpp")
|
||||
- sources += get_target_outputs(":embed_bidimapper_in_cpp")
|
||||
sources += get_target_outputs(":embed_user_data_dir_in_cpp")
|
||||
|
||||
deps = [
|
||||
- ":embed_bidimapper_in_cpp",
|
||||
":embed_js_in_cpp",
|
||||
":embed_mobile_devices_in_cpp",
|
||||
":embed_user_data_dir_in_cpp",
|
||||
@@ -417,7 +415,7 @@ source_set("lib") {
|
||||
configs += [ "//build/config/compiler:no_exit_time_destructors" ]
|
||||
}
|
||||
|
||||
@@ -53,6 +65,46 @@
|
||||
# Linux
|
||||
executable("chromedriver_server.unstripped") {
|
||||
testonly = true
|
||||
--- a/chrome/test/chromedriver/session_commands.cc
|
||||
+++ b/chrome/test/chromedriver/session_commands.cc
|
||||
@@ -27,7 +27,6 @@
|
||||
#include "base/types/expected.h"
|
||||
#include "base/values.h"
|
||||
#include "chrome/test/chromedriver/basic_types.h"
|
||||
-#include "chrome/test/chromedriver/bidimapper/bidimapper.h"
|
||||
#include "chrome/test/chromedriver/capabilities.h"
|
||||
#include "chrome/test/chromedriver/chrome/bidi_tracker.h"
|
||||
#include "chrome/test/chromedriver/chrome/browser_info.h"
|
||||
@@ -436,29 +435,6 @@ Status InitSessionHelper(const InitSessi
|
||||
return status;
|
||||
}
|
||||
|
||||
- // Start the mapper.
|
||||
- base::FilePath bidi_mapper_path =
|
||||
- cmd_line->GetSwitchValuePath("bidi-mapper-path");
|
||||
-
|
||||
- std::string mapper_script = kMapperScript;
|
||||
-
|
||||
- if (!bidi_mapper_path.empty()) {
|
||||
- VLOG(0) << "Custom BiDi mapper path specified: " << bidi_mapper_path;
|
||||
-
|
||||
- if (!base::ReadFileToString(bidi_mapper_path, &mapper_script)) {
|
||||
- return Status(StatusCode::kUnknownError,
|
||||
- "Failed to read the specified BiDi mapper path: " +
|
||||
- bidi_mapper_path.AsUTF8Unsafe());
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- bool enable_unsafe_extension_debugging =
|
||||
- capabilities.switches.HasSwitch("enable-unsafe-extension-debugging");
|
||||
- status = bidi_mapper_web_view->StartBidiServer(
|
||||
- mapper_script, enable_unsafe_extension_debugging);
|
||||
- if (status.IsError()) {
|
||||
- return status;
|
||||
- }
|
||||
|
||||
// Execute session.new for the newly-created mapper instance.
|
||||
base::DictValue bidi_cmd;
|
||||
--- a/chrome/test/variations/BUILD.gn
|
||||
+++ b/chrome/test/variations/BUILD.gn
|
||||
@@ -18,7 +18,6 @@ python_library("test_utils") {
|
||||
@@ -76,7 +128,7 @@
|
||||
AutocompleteInput input(text, page_classification, *scheme_classifier_);
|
||||
--- a/components/update_client/BUILD.gn
|
||||
+++ b/components/update_client/BUILD.gn
|
||||
@@ -368,8 +368,6 @@ source_set("unit_tests") {
|
||||
@@ -371,8 +371,6 @@ source_set("unit_tests") {
|
||||
"//third_party/puffin:libpuffpatch",
|
||||
"//third_party/re2",
|
||||
]
|
||||
@@ -87,7 +139,7 @@
|
||||
fuzzer_test("update_client_protocol_serializer_fuzzer") {
|
||||
--- a/content/shell/BUILD.gn
|
||||
+++ b/content/shell/BUILD.gn
|
||||
@@ -849,10 +849,6 @@ if (is_apple) {
|
||||
@@ -850,10 +850,6 @@ if (is_apple) {
|
||||
deps = [ "//third_party/icu:icudata" ]
|
||||
}
|
||||
|
||||
@@ -111,7 +163,7 @@
|
||||
declare_args() {
|
||||
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
|
||||
@@ -202,7 +202,6 @@ group("unittests") {
|
||||
@@ -179,7 +179,6 @@ group("unittests") {
|
||||
"panels/timeline:unittests",
|
||||
"panels/timeline/components:unittests",
|
||||
"panels/timeline/components/insights:unittests",
|
||||
@@ -121,7 +173,7 @@
|
||||
"panels/timeline/track_appenders:unittests",
|
||||
--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/core/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/core/BUILD.gn
|
||||
@@ -42,5 +42,4 @@ ts_library("unittests") {
|
||||
@@ -39,5 +39,4 @@ devtools_foundation_module("unittests")
|
||||
"../testing:bundle",
|
||||
]
|
||||
|
||||
@@ -129,7 +181,7 @@
|
||||
}
|
||||
--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/metrics/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/metrics/BUILD.gn
|
||||
@@ -59,5 +59,4 @@ ts_library("unittests") {
|
||||
@@ -56,5 +56,4 @@ devtools_foundation_module("unittests")
|
||||
"../testing:bundle",
|
||||
]
|
||||
|
||||
@@ -137,7 +189,7 @@
|
||||
}
|
||||
--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/BUILD.gn
|
||||
@@ -56,5 +56,4 @@ ts_library("unittests") {
|
||||
@@ -53,5 +53,4 @@ devtools_foundation_module("unittests")
|
||||
"../testing:bundle",
|
||||
]
|
||||
|
||||
@@ -145,7 +197,7 @@
|
||||
}
|
||||
--- a/third_party/puffin/BUILD.gn
|
||||
+++ b/third_party/puffin/BUILD.gn
|
||||
@@ -121,7 +121,6 @@ test("puffin_unittests") {
|
||||
@@ -122,7 +122,6 @@ test("puffin_unittests") {
|
||||
"src/unittest_common.cc",
|
||||
"src/utils_unittest.cc",
|
||||
]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2232,8 +2232,6 @@ source_set("browser") {
|
||||
@@ -2236,8 +2236,6 @@ source_set("browser") {
|
||||
"//chrome/browser/resource_coordinator",
|
||||
"//chrome/browser/resource_coordinator:impl",
|
||||
"//chrome/browser/resources/accessibility:resources",
|
||||
@@ -11,7 +11,7 @@
|
||||
"//chrome/browser/search_engine_choice",
|
||||
"//chrome/browser/search_engine_choice:impl",
|
||||
"//chrome/browser/search_provider_logos",
|
||||
@@ -3328,12 +3326,6 @@ source_set("browser") {
|
||||
@@ -3334,12 +3332,6 @@ source_set("browser") {
|
||||
deps += [ "//chrome/browser/chrome_for_testing" ]
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
# This target intentionally has no sources of its own and no
|
||||
# allow_circular_includes_from; it only aggregates dependencies. Do NOT add
|
||||
@@ -3910,8 +3902,6 @@ static_library("test_support") {
|
||||
@@ -3915,8 +3907,6 @@ static_library("test_support") {
|
||||
"//components/reporting/util:status",
|
||||
"//components/reporting/util:status_macros",
|
||||
"//components/reporting/util:task_runner_context",
|
||||
@@ -128,7 +128,7 @@
|
||||
// Profile this preference is generated for.
|
||||
--- a/chrome/browser/download/BUILD.gn
|
||||
+++ b/chrome/browser/download/BUILD.gn
|
||||
@@ -579,9 +579,6 @@ if (!is_android) {
|
||||
@@ -581,9 +581,6 @@ if (!is_android) {
|
||||
"//components/infobars/content",
|
||||
"//components/lookalikes/core:safety_tips",
|
||||
"//components/page_load_metrics/browser:test_support",
|
||||
@@ -165,7 +165,7 @@
|
||||
// Launch a HaTS survey. Note this needs to come before the command is
|
||||
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -187,7 +187,6 @@ using content::DownloadManager;
|
||||
@@ -190,7 +190,6 @@ using content::DownloadManager;
|
||||
using download::DownloadItem;
|
||||
using download::DownloadPathReservationTracker;
|
||||
using download::PathValidationResult;
|
||||
@@ -173,7 +173,7 @@
|
||||
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
|
||||
|
||||
#if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION)
|
||||
@@ -2217,7 +2216,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
||||
@@ -2262,7 +2261,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
||||
DownloadItemModel model(item);
|
||||
model.DetermineAndSetShouldPreferOpeningInBrowser(
|
||||
target_info.target_path, target_info.is_filetype_handled_safely);
|
||||
@@ -181,7 +181,7 @@
|
||||
}
|
||||
if (ShouldBlockFile(item, target_info.danger_type)) {
|
||||
MaybeReportDangerousDownloadBlocked(
|
||||
@@ -2298,50 +2296,20 @@ bool ChromeDownloadManagerDelegate::IsOp
|
||||
@@ -2343,50 +2341,20 @@ bool ChromeDownloadManagerDelegate::IsOp
|
||||
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
|
||||
download::DownloadItem* item,
|
||||
download::DownloadDangerType danger_type) const {
|
||||
@@ -238,7 +238,7 @@
|
||||
<< static_cast<int>(download_restriction);
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -1314,14 +1314,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
@@ -1353,14 +1353,7 @@ base::FilePath DownloadTargetDeterminer:
|
||||
|
||||
std::optional<base::Time>
|
||||
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
|
||||
@@ -375,7 +375,7 @@
|
||||
base::TimeDelta GetIgnoreDownloadBubbleWarningDelay() {
|
||||
--- a/chrome/browser/enterprise/BUILD.gn
|
||||
+++ b/chrome/browser/enterprise/BUILD.gn
|
||||
@@ -420,7 +420,6 @@ source_set("impl") {
|
||||
@@ -425,7 +425,6 @@ source_set("impl") {
|
||||
"data_protection/data_protection_navigation_observer.cc",
|
||||
"data_protection/data_protection_page_user_data.cc",
|
||||
"data_protection/data_protection_url_lookup_service_factory.cc",
|
||||
@@ -558,7 +558,7 @@
|
||||
} // namespace data_controls
|
||||
--- a/chrome/browser/enterprise/data_protection/BUILD.gn
|
||||
+++ b/chrome/browser/enterprise/data_protection/BUILD.gn
|
||||
@@ -46,11 +46,6 @@ source_set("unit_tests") {
|
||||
@@ -45,11 +45,6 @@ source_set("unit_tests") {
|
||||
"//ui/base/clipboard:clipboard_test_support",
|
||||
]
|
||||
|
||||
@@ -572,7 +572,7 @@
|
||||
sources += [ "print_utils_unittest.cc" ]
|
||||
--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
|
||||
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
|
||||
@@ -208,9 +208,7 @@ void LogVerdictSource(
|
||||
@@ -239,9 +239,7 @@ void LogVerdictSource(
|
||||
|
||||
bool IsScreenshotAllowedByDataControls(content::BrowserContext* context,
|
||||
const GURL& url) {
|
||||
@@ -722,7 +722,7 @@
|
||||
signal_response.profile_id = profile_id_service_->GetProfileId();
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -386,8 +386,6 @@ source_set("extensions") {
|
||||
@@ -388,8 +388,6 @@ source_set("extensions") {
|
||||
"menu_manager_factory.h",
|
||||
"navigation_extension_enabler.cc",
|
||||
"navigation_extension_enabler.h",
|
||||
@@ -765,7 +765,7 @@
|
||||
} // namespace
|
||||
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
@@ -205,16 +205,8 @@ api::enterprise_reporting_private::Conte
|
||||
@@ -260,16 +260,8 @@ api::enterprise_reporting_private::Conte
|
||||
signals.chrome_remote_desktop_app_blocked;
|
||||
info.os_firewall = ToInfoSettingValue(signals.os_firewall);
|
||||
info.system_dns_servers = std::move(signals.system_dns_servers);
|
||||
@@ -798,7 +798,7 @@
|
||||
profile_, ContentSettingsType::NOTIFICATIONS);
|
||||
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
|
||||
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
|
||||
@@ -476,8 +476,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
||||
@@ -480,8 +480,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
||||
settings_api::PrefType::kNumber;
|
||||
(*s_allowlist)[::prefs::kHttpsFirstModeBundleToastQueued] =
|
||||
settings_api::PrefType::kBoolean;
|
||||
@@ -1061,7 +1061,7 @@
|
||||
#include "components/security_interstitials/core/unsafe_resource.h"
|
||||
#include "content/public/browser/devtools_agent_host.h"
|
||||
#include "content/public/browser/render_frame_host.h"
|
||||
@@ -1218,102 +1217,6 @@ class GlicWebClientHandler
|
||||
@@ -1286,102 +1285,6 @@ class GlicWebClientHandler
|
||||
void ProcessCounterAbuseVerdict(
|
||||
int32_t tab_id,
|
||||
mojom::CounterAbuseVerdictPtr verdict) override {
|
||||
@@ -1424,7 +1424,7 @@
|
||||
return PredictionSource::kNoCpssModel;
|
||||
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -2671,8 +2671,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
@@ -2677,8 +2677,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
||||
handlers->AddHandler(
|
||||
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
|
||||
chrome_schema));
|
||||
@@ -1435,7 +1435,7 @@
|
||||
std::make_unique<URLAllowlistPolicyHandler>(key::kURLAllowlist));
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -974,7 +974,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -967,7 +967,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#endif
|
||||
#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) || BUILDFLAG(IS_ANDROID) || \
|
||||
BUILDFLAG(FULL_SAFE_BROWSING)
|
||||
@@ -1443,7 +1443,7 @@
|
||||
#endif
|
||||
enterprise_connectors::ConnectorsServiceFactory::GetInstance();
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@@ -994,7 +993,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -987,7 +986,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#endif
|
||||
#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) || BUILDFLAG(IS_ANDROID) || \
|
||||
BUILDFLAG(FULL_SAFE_BROWSING)
|
||||
@@ -1800,7 +1800,7 @@
|
||||
} // namespace safe_browsing
|
||||
--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
|
||||
+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
|
||||
@@ -75,34 +75,7 @@ RealTimeUrlLookupServiceFactory::~RealTi
|
||||
@@ -76,34 +76,7 @@ RealTimeUrlLookupServiceFactory::~RealTi
|
||||
std::unique_ptr<KeyedService>
|
||||
RealTimeUrlLookupServiceFactory::BuildServiceInstanceForBrowserContext(
|
||||
content::BrowserContext* context) const {
|
||||
@@ -1874,7 +1874,7 @@
|
||||
base::TimeDelta GetMinAgeOfInitialVisitForFamiliarity(Profile* profile) {
|
||||
--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
|
||||
+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
|
||||
@@ -125,15 +125,6 @@ CreateSettingsPageHelper() {
|
||||
@@ -127,15 +127,6 @@ CreateSettingsPageHelper() {
|
||||
CreateChromeSettingsPageHelper();
|
||||
}
|
||||
|
||||
@@ -1890,7 +1890,7 @@
|
||||
} // namespace
|
||||
|
||||
std::unique_ptr<SSLBlockingPage>
|
||||
@@ -151,10 +142,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
||||
@@ -153,10 +144,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
||||
web_contents, request_url,
|
||||
overridable ? "ssl_overridable" : "ssl_nonoverridable", overridable));
|
||||
|
||||
@@ -1901,7 +1901,7 @@
|
||||
auto controller_client = std::make_unique<SSLErrorControllerClient>(
|
||||
web_contents, ssl_info, cert_error, request_url,
|
||||
std::move(metrics_helper), CreateSettingsPageHelper());
|
||||
@@ -185,9 +172,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
||||
@@ -187,9 +174,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
||||
web_contents, request_url,
|
||||
overridable ? "ssl_overridable" : "ssl_nonoverridable", overridable));
|
||||
|
||||
@@ -1911,7 +1911,7 @@
|
||||
|
||||
auto controller_client = std::make_unique<SSLErrorControllerClient>(
|
||||
web_contents, ssl_info, cert_error, request_url,
|
||||
@@ -251,10 +235,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
||||
@@ -253,10 +237,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
||||
const std::string& mitm_software_name) {
|
||||
Profile* profile =
|
||||
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
||||
@@ -1922,7 +1922,7 @@
|
||||
auto page = std::make_unique<MITMSoftwareBlockingPage>(
|
||||
web_contents, cert_error, request_url,
|
||||
/*can_show_enhanced_protection_message=*/true, ssl_info,
|
||||
@@ -274,10 +254,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
||||
@@ -276,10 +256,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
||||
net::Error cert_error,
|
||||
const GURL& request_url,
|
||||
const net::SSLInfo& ssl_info) {
|
||||
@@ -2154,12 +2154,13 @@
|
||||
}
|
||||
--- a/chrome/browser/ssl/ssl_error_controller_client.cc
|
||||
+++ b/chrome/browser/ssl/ssl_error_controller_client.cc
|
||||
@@ -79,8 +79,6 @@ void SSLErrorControllerClient::GoBack()
|
||||
@@ -80,9 +80,6 @@ void SSLErrorControllerClient::GoBack()
|
||||
|
||||
void SSLErrorControllerClient::Proceed() {
|
||||
content::WebContents* const web_contents = this->web_contents();
|
||||
- MaybeTriggerSecurityInterstitialProceededEvent(web_contents, request_url_,
|
||||
- "SSL_ERROR", cert_error_);
|
||||
- MaybeTriggerSecurityInterstitialProceededEvent(
|
||||
- web_contents, request_url_, "SSL_ERROR", cert_error_,
|
||||
- base::UTF16ToUTF8(web_contents->GetTitle()));
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
// Web Apps should not be allowed to run if there is a problem with their
|
||||
// certificate. So, when users click proceed on an interstitial, move the tab
|
||||
@@ -2176,7 +2177,7 @@
|
||||
"risk_util.cc",
|
||||
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
|
||||
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
|
||||
@@ -1273,9 +1273,7 @@ ChromeAutofillClient::ChromeAutofillClie
|
||||
@@ -1282,9 +1282,7 @@ ChromeAutofillClient::ChromeAutofillClie
|
||||
ablation_study_(g_browser_process->local_state()),
|
||||
identity_credential_delegate_(web_contents),
|
||||
otp_field_detector_(std::make_unique<OtpFieldDetector>(this)),
|
||||
@@ -2199,7 +2200,7 @@
|
||||
"//chrome/browser/ui/browser_web_contents_delegate",
|
||||
--- a/chrome/browser/ui/page_info/chrome_page_info_delegate.cc
|
||||
+++ b/chrome/browser/ui/page_info/chrome_page_info_delegate.cc
|
||||
@@ -461,23 +461,6 @@ void ChromePageInfoDelegate::OpenSafeBro
|
||||
@@ -462,23 +462,6 @@ void ChromePageInfoDelegate::OpenSafeBro
|
||||
}
|
||||
|
||||
void ChromePageInfoDelegate::OnSuspiciousSiteBackToSafety() {
|
||||
@@ -2223,7 +2224,7 @@
|
||||
if (!web_contents_) {
|
||||
return;
|
||||
}
|
||||
@@ -504,21 +487,6 @@ void ChromePageInfoDelegate::OnSuspiciou
|
||||
@@ -505,21 +488,6 @@ void ChromePageInfoDelegate::OnSuspiciou
|
||||
}
|
||||
|
||||
void ChromePageInfoDelegate::OnSuspiciousSiteMarkAsSafe() {
|
||||
@@ -2339,7 +2340,7 @@
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "components/tabs/public/tab_interface.h"
|
||||
#include "components/translate/core/browser/translate_manager.h"
|
||||
@@ -160,60 +159,6 @@ void ToastService::RegisterToasts(
|
||||
@@ -175,60 +174,6 @@ void ToastService::RegisterToasts(
|
||||
.AddGlobalScoped()
|
||||
.Build());
|
||||
|
||||
@@ -2859,7 +2860,7 @@
|
||||
safe_browsing::hash_realtime_utils::
|
||||
--- a/chrome/browser/webshare/BUILD.gn
|
||||
+++ b/chrome/browser/webshare/BUILD.gn
|
||||
@@ -138,7 +138,6 @@ if (is_win || is_chromeos || is_mac) {
|
||||
@@ -139,7 +139,6 @@ if (is_win || is_chromeos || is_mac) {
|
||||
"//chrome/browser",
|
||||
"//chrome/browser/safe_browsing:test_support",
|
||||
"//chrome/test:test_support",
|
||||
@@ -2869,7 +2870,7 @@
|
||||
"//content/public/browser",
|
||||
--- a/chrome/common/webui_url_constants.cc
|
||||
+++ b/chrome/common/webui_url_constants.cc
|
||||
@@ -181,7 +181,6 @@ base::span<const base::cstring_view> Chr
|
||||
@@ -183,7 +183,6 @@ base::span<const base::cstring_view> Chr
|
||||
kChromeUISubresourceFilterInternalsHost,
|
||||
kChromeUISuggestInternalsHost,
|
||||
kChromeUINTPTilesInternalsHost,
|
||||
@@ -2879,7 +2880,7 @@
|
||||
kChromeUITabSearchHost,
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -2157,7 +2157,6 @@ if (!is_android) {
|
||||
@@ -1904,7 +1904,6 @@ if (!is_android) {
|
||||
"//chrome/browser/renderer_host:browser_tests",
|
||||
"//chrome/browser/resource_coordinator:mojo_bindings",
|
||||
"//chrome/browser/safe_browsing:advanced_protection",
|
||||
@@ -2887,7 +2888,7 @@
|
||||
"//chrome/browser/safe_browsing:browser_tests",
|
||||
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
|
||||
"//chrome/browser/search",
|
||||
@@ -2638,7 +2637,6 @@ if (!is_android) {
|
||||
@@ -2396,7 +2395,6 @@ if (!is_android) {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -2895,7 +2896,7 @@
|
||||
"//components/safe_browsing/content/browser:safe_browsing_service",
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
"//components/safe_browsing/content/browser/password_protection:test_support",
|
||||
@@ -5711,7 +5709,6 @@ test("unit_tests") {
|
||||
@@ -5343,7 +5341,6 @@ test("unit_tests") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -2903,7 +2904,7 @@
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
"//components/safe_browsing/content/browser/password_protection:mock_password_protection",
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
@@ -8831,7 +8828,6 @@ if (!is_android && !is_chromeos_device)
|
||||
@@ -8358,7 +8355,6 @@ if (!is_android && !is_chromeos_device)
|
||||
"//components/privacy_sandbox:privacy_sandbox_prefs",
|
||||
"//components/reading_list/core",
|
||||
"//components/resources",
|
||||
@@ -2984,7 +2985,7 @@
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
#include "components/device_signals/core/common/win/win_types.h"
|
||||
@@ -277,12 +276,8 @@ struct ProfileSignalsResponse : BaseSign
|
||||
@@ -275,12 +274,8 @@ struct ProfileSignalsResponse : BaseSign
|
||||
|
||||
bool built_in_dns_client_enabled = false;
|
||||
bool chrome_remote_desktop_app_blocked = false;
|
||||
@@ -2999,7 +3000,7 @@
|
||||
|
||||
--- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
|
||||
+++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
|
||||
@@ -361,18 +361,12 @@ void ChromeProfileRequestGenerator::OnAg
|
||||
@@ -355,18 +355,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);
|
||||
@@ -3150,7 +3151,7 @@
|
||||
case STRING:
|
||||
--- a/components/enterprise/connectors/core/cloud_content_scanning/resumable_uploader_base.cc
|
||||
+++ b/components/enterprise/connectors/core/cloud_content_scanning/resumable_uploader_base.cc
|
||||
@@ -274,10 +274,6 @@ void ResumableUploadRequestBase::SendMet
|
||||
@@ -413,10 +413,6 @@ void ResumableUploadRequestBase::SendMet
|
||||
resource_request->url = base_url_;
|
||||
resource_request->method = "POST";
|
||||
SetMetadataRequestHeaders(resource_request.get());
|
||||
@@ -3318,6 +3319,31 @@
|
||||
#include "components/safe_browsing/core/browser/db/hash_prefix_container.h"
|
||||
#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
|
||||
|
||||
--- a/components/safe_browsing/core/browser/db/sb_local_database_manager.cc
|
||||
+++ b/components/safe_browsing/core/browser/db/sb_local_database_manager.cc
|
||||
@@ -386,12 +386,10 @@ void SBLocalDatabaseManager::CollectData
|
||||
SBLocalDatabaseManager::SBLocalDatabaseManager(
|
||||
base::PassKey<SBLocalDatabaseManager, SBLocalDatabaseManagerTest>,
|
||||
const base::FilePath& base_path,
|
||||
- ExtendedReportingLevelCallback extended_reporting_level_callback,
|
||||
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
|
||||
scoped_refptr<base::SequencedTaskRunner> io_task_runner,
|
||||
scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests)
|
||||
: SBLocalDatabaseManager(base_path,
|
||||
- extended_reporting_level_callback,
|
||||
std::move(ui_task_runner),
|
||||
std::move(io_task_runner),
|
||||
std::move(task_runner_for_tests)) {}
|
||||
--- a/components/safe_browsing/core/browser/db/sb_local_database_manager.h
|
||||
+++ b/components/safe_browsing/core/browser/db/sb_local_database_manager.h
|
||||
@@ -57,7 +57,6 @@ class SBLocalDatabaseManager : public Sa
|
||||
SBLocalDatabaseManager(
|
||||
base::PassKey<SBLocalDatabaseManager, SBLocalDatabaseManagerTest>,
|
||||
const base::FilePath& base_path,
|
||||
- ExtendedReportingLevelCallback extended_reporting_level_callback,
|
||||
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
|
||||
scoped_refptr<base::SequencedTaskRunner> io_task_runner,
|
||||
scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests);
|
||||
--- a/components/safe_browsing/core/browser/db/sb_protocol_manager_util.cc
|
||||
+++ b/components/safe_browsing/core/browser/db/sb_protocol_manager_util.cc
|
||||
@@ -231,82 +231,56 @@ PlatformType GetCurrentPlatformType() {
|
||||
@@ -3415,7 +3441,7 @@
|
||||
}
|
||||
|
||||
std::string GetUmaSuffixForStore(const base::FilePath& file_path) {
|
||||
@@ -316,7 +290,6 @@ std::string GetUmaSuffixForStore(const b
|
||||
@@ -317,7 +291,6 @@ std::string GetUmaSuffixForStore(const b
|
||||
}
|
||||
|
||||
PrefixSize GetV5ListPrefixSize(const ListIdentifier& list_identifier) {
|
||||
@@ -3423,7 +3449,7 @@
|
||||
return GetV5PrefixSizeForThreatType(list_identifier.sb_threat_type());
|
||||
}
|
||||
|
||||
@@ -370,7 +343,6 @@ PrefixSize GetV5PrefixSizeForThreatType(
|
||||
@@ -371,7 +344,6 @@ PrefixSize GetV5PrefixSizeForThreatType(
|
||||
}
|
||||
|
||||
std::string GetV5ListName(const ListIdentifier& list_identifier) {
|
||||
@@ -3431,15 +3457,15 @@
|
||||
switch (list_identifier.sb_threat_type()) {
|
||||
case SBThreatType::SB_THREAT_TYPE_EXTENSION:
|
||||
return "mcrx-16b";
|
||||
@@ -526,7 +498,6 @@ ListIdentifier::ListIdentifier(PlatformT
|
||||
@@ -545,7 +517,6 @@ ListIdentifier::ListIdentifier(PlatformT
|
||||
threat_entry_type_(threat_entry_type),
|
||||
threat_type_(threat_type),
|
||||
uses_v5_api_(false) {
|
||||
- CHECK(!base::FeatureList::IsEnabled(safe_browsing::kLocalListsUseSBv5));
|
||||
DCHECK(PlatformType_IsValid(platform_type));
|
||||
DCHECK(ThreatEntryType_IsValid(threat_entry_type));
|
||||
DCHECK(ThreatType_IsValid(threat_type));
|
||||
@@ -539,7 +510,6 @@ ListIdentifier::ListIdentifier(const Lis
|
||||
CHECK(PlatformType_IsValid(platform_type), base::NotFatalUntil::M162);
|
||||
CHECK(ThreatEntryType_IsValid(threat_entry_type), base::NotFatalUntil::M162);
|
||||
CHECK(ThreatType_IsValid(threat_type), base::NotFatalUntil::M162);
|
||||
@@ -558,7 +529,6 @@ ListIdentifier::ListIdentifier(const Lis
|
||||
|
||||
ListIdentifier::ListIdentifier(SBThreatType sb_threat_type)
|
||||
: sb_threat_type_(sb_threat_type), uses_v5_api_(true) {
|
||||
@@ -3467,9 +3493,9 @@
|
||||
|
||||
--- a/components/safe_browsing/core/browser/db/v5_update_protocol_manager.h
|
||||
+++ b/components/safe_browsing/core/browser/db/v5_update_protocol_manager.h
|
||||
@@ -23,7 +23,6 @@
|
||||
@@ -22,7 +22,6 @@
|
||||
#include "components/safe_browsing/core/browser/db/sb_protocol_manager_util.h"
|
||||
#include "components/safe_browsing/core/browser/db/sb_update_protocol_manager.h"
|
||||
#include "components/safe_browsing/core/browser/db/v4_protocol_config.h"
|
||||
#include "components/safe_browsing/core/common/proto/safebrowsingv5.pb.h"
|
||||
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
|
||||
@@ -3767,7 +3793,7 @@
|
||||
void SSLBlockingPageBase::PopulateEnhancedProtectionMessage(
|
||||
--- a/components/sync_preferences/common_syncable_prefs_database.cc
|
||||
+++ b/components/sync_preferences/common_syncable_prefs_database.cc
|
||||
@@ -420,9 +420,6 @@ constexpr auto kCommonSyncablePrefsAllow
|
||||
@@ -422,9 +422,6 @@ constexpr auto kCommonSyncablePrefsAllow
|
||||
{autofill::prefs::kAutofillPaymentCardBenefits,
|
||||
{syncable_prefs_ids::kAutofillPaymentCardBenefits, syncer::PREFERENCES,
|
||||
PrefSensitivity::kNone, MergeBehavior::kNone}},
|
||||
@@ -3943,8 +3969,8 @@
|
||||
--- a/extensions/browser/blocklist_state_fetcher.cc
|
||||
+++ b/extensions/browser/blocklist_state_fetcher.cc
|
||||
@@ -44,7 +44,6 @@ void BlocklistStateFetcher::Request(cons
|
||||
std::optional<safe_browsing::V4ProtocolConfig> config =
|
||||
ExtensionsBrowserClient::Get()->GetV4ProtocolConfig();
|
||||
std::optional<safe_browsing::SBProtocolConfig> config =
|
||||
ExtensionsBrowserClient::Get()->GetSBProtocolConfig();
|
||||
if (config) {
|
||||
- SetSafeBrowsingConfig(*config);
|
||||
} else {
|
||||
@@ -3966,7 +3992,7 @@
|
||||
}
|
||||
--- a/extensions/browser/extension_registrar.cc
|
||||
+++ b/extensions/browser/extension_registrar.cc
|
||||
@@ -881,119 +881,27 @@ void ExtensionRegistrar::UnblockAllExten
|
||||
@@ -892,119 +892,27 @@ void ExtensionRegistrar::UnblockAllExten
|
||||
|
||||
void ExtensionRegistrar::OnBlocklistStateRemoved(
|
||||
const std::string& extension_id) {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/net/tools/transport_security_state_generator/transport_security_state_generator.cc
|
||||
+++ b/net/tools/transport_security_state_generator/transport_security_state_generator.cc
|
||||
@@ -145,7 +145,7 @@ bool CheckDuplicatePinEntries(const PinE
|
||||
@@ -149,7 +149,7 @@ bool CheckDuplicatePinEntries(const PinE
|
||||
bool CheckNoopEntries(const TransportSecurityStateEntries& entries) {
|
||||
for (const auto& entry : entries) {
|
||||
if (!entry->force_https) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/accelerator_table.cc
|
||||
+++ b/chrome/browser/ui/accelerator_table.cc
|
||||
@@ -137,7 +137,6 @@ const AcceleratorMapping kAcceleratorMap
|
||||
@@ -141,7 +141,6 @@ const AcceleratorMapping kAcceleratorMap
|
||||
{ui::VKEY_OEM_PLUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_PLUS},
|
||||
{ui::VKEY_ADD, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_PLUS},
|
||||
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,6 +1,6 @@
|
||||
--- a/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
|
||||
+++ b/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
|
||||
@@ -172,26 +172,11 @@
|
||||
@@ -173,26 +173,11 @@
|
||||
},
|
||||
|
||||
"google": {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "components/translate/core/browser/translate_download_manager.h"
|
||||
#include "components/translate/core/browser/translate_manager.h"
|
||||
#include "components/translate/core/browser/translate_prefs.h"
|
||||
@@ -2695,6 +2696,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -2698,6 +2699,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
}
|
||||
|
||||
if (CanTranslate(/*menu_logging=*/true)) {
|
||||
@@ -47,7 +47,7 @@
|
||||
request_pending_ = true;
|
||||
--- a/components/translate/core/browser/translate_manager.cc
|
||||
+++ b/components/translate/core/browser/translate_manager.cc
|
||||
@@ -915,8 +915,9 @@ void TranslateManager::FilterIsTranslate
|
||||
@@ -932,8 +932,9 @@ void TranslateManager::FilterIsTranslate
|
||||
TriggerDecision::kDisabledOffline);
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -1245,6 +1245,7 @@ source_set("core") {
|
||||
@@ -1236,6 +1236,7 @@ source_set("core") {
|
||||
"//components/tracing:background_tracing_utils",
|
||||
"//components/ui_devtools",
|
||||
"//components/ukm",
|
||||
@@ -19,7 +19,7 @@
|
||||
"//components/update_client:network_impl",
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -210,6 +210,7 @@
|
||||
@@ -209,6 +209,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
|
||||
@@ -335,6 +335,7 @@ source_set("browser") {
|
||||
@@ -336,6 +336,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 @@
|
||||
@@ -85,6 +85,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"
|
||||
@@ -3916,6 +3917,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3914,6 +3915,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kEnableWebGLDraftExtensions,
|
||||
switches::kEnableWebGPUDeveloperFeatures,
|
||||
switches::kFileUrlPathAlias,
|
||||
@@ -73,7 +73,7 @@
|
||||
switches::kForceHighContrast,
|
||||
--- a/content/child/BUILD.gn
|
||||
+++ b/content/child/BUILD.gn
|
||||
@@ -114,6 +114,7 @@ target(link_target_type, "child") {
|
||||
@@ -115,6 +115,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"
|
||||
@@ -409,6 +410,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -371,6 +372,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
{wrf::EnableMediaSession, switches::kDisableMediaSessionAPI, false},
|
||||
#endif
|
||||
@@ -101,7 +101,7 @@
|
||||
+ switches::kFingerprintingCanvasMeasureTextNoise, true},
|
||||
};
|
||||
|
||||
for (const auto& mapping : switchToFeatureMapping) {
|
||||
for (const auto& mapping : switch_to_feature_mapping) {
|
||||
--- a/third_party/blink/public/platform/web_runtime_features.h
|
||||
+++ b/third_party/blink/public/platform/web_runtime_features.h
|
||||
@@ -70,6 +70,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe
|
||||
@@ -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
|
||||
@@ -598,6 +598,10 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -600,6 +600,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;
|
||||
@@ -2910,6 +2914,9 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -2916,6 +2920,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
|
||||
@@ -3449,6 +3449,9 @@ Vector<gfx::RectF> Element::GetClientRec
|
||||
@@ -3446,6 +3446,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;
|
||||
@@ -3478,6 +3481,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
@@ -3475,6 +3478,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
|
||||
@@ -112,6 +112,9 @@
|
||||
@@ -113,6 +113,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;
|
||||
@@ -1191,9 +1194,22 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
@@ -1188,9 +1191,22 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
TextDirection direction =
|
||||
ToTextDirection(state.GetDirection(), host, computed_style);
|
||||
|
||||
@@ -325,8 +325,8 @@
|
||||
} // namespace blink
|
||||
--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
|
||||
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "base/compiler_specific.h"
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "base/logging.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "third_party/blink/renderer/platform/image-encoders/image_encoder_utils.h"
|
||||
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
|
||||
@@ -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
|
||||
@@ -3060,6 +3060,12 @@
|
||||
@@ -3088,6 +3088,12 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -34,7 +34,7 @@ approach to change color components.
|
||||
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -3919,6 +3919,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3917,6 +3917,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kFileUrlPathAlias,
|
||||
switches::kFingerprintingClientRectsNoise,
|
||||
switches::kFingerprintingCanvasMeasureTextNoise,
|
||||
@@ -44,7 +44,7 @@ approach to change color components.
|
||||
switches::kForceHighContrast,
|
||||
--- a/content/child/runtime_features.cc
|
||||
+++ b/content/child/runtime_features.cc
|
||||
@@ -414,6 +414,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -376,6 +376,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
switches::kFingerprintingClientRectsNoise, true},
|
||||
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
|
||||
switches::kFingerprintingCanvasMeasureTextNoise, true},
|
||||
@@ -52,7 +52,7 @@ approach to change color components.
|
||||
+ switches::kFingerprintingCanvasImageDataNoise, true},
|
||||
};
|
||||
|
||||
for (const auto& mapping : switchToFeatureMapping) {
|
||||
for (const auto& mapping : switch_to_feature_mapping) {
|
||||
--- a/third_party/blink/public/platform/web_runtime_features.h
|
||||
+++ b/third_party/blink/public/platform/web_runtime_features.h
|
||||
@@ -72,6 +72,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe
|
||||
@@ -314,7 +314,7 @@ approach to change color components.
|
||||
SkJpegEncoder::Options options;
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -3066,6 +3066,9 @@
|
||||
@@ -3094,6 +3094,9 @@
|
||||
name: "FingerprintingCanvasMeasureTextNoise",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2384,6 +2384,7 @@ source_set("browser") {
|
||||
@@ -2388,6 +2388,7 @@ source_set("browser") {
|
||||
"//components/mirroring/service:mirroring_service",
|
||||
"//components/multistep_filter/core:features",
|
||||
"//components/navigation_interception",
|
||||
@@ -64,7 +64,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"
|
||||
@@ -117,6 +119,7 @@
|
||||
@@ -118,6 +120,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"
|
||||
@@ -72,15 +72,15 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
#include "components/network_time/network_time_tracker.h"
|
||||
#include "components/os_crypt/async/browser/os_crypt_async.h"
|
||||
#include "components/permissions/permissions_client.h"
|
||||
@@ -153,6 +156,7 @@
|
||||
@@ -154,6 +157,7 @@
|
||||
#include "extensions/common/constants.h"
|
||||
#include "media/media_buildflags.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
+#include "net/socket/client_socket_pool_manager.h"
|
||||
#include "printing/buildflags/buildflags.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "ui/base/idle/idle.h"
|
||||
@@ -524,6 +528,18 @@ void BrowserProcessImpl::Init() {
|
||||
#include "services/network/public/cpp/shared_url_loader_factory.h"
|
||||
@@ -526,6 +530,18 @@ void BrowserProcessImpl::Init() {
|
||||
base::Unretained(this)));
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -3390,6 +3390,10 @@ inline constexpr char kMacAccessibilityT
|
||||
@@ -3362,6 +3362,10 @@ inline constexpr char kMacAccessibilityT
|
||||
"Enables support for performing text editing operations through "
|
||||
"the AXTextOperation accessibility API.";
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
--- a/chrome/browser/background/extensions/background_mode_manager.cc
|
||||
+++ b/chrome/browser/background/extensions/background_mode_manager.cc
|
||||
@@ -347,7 +347,7 @@ BackgroundModeManager::~BackgroundModeMa
|
||||
@@ -348,7 +348,7 @@ BackgroundModeManager::~BackgroundModeMa
|
||||
|
||||
// static
|
||||
void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
|
||||
@@ -12,7 +12,7 @@
|
||||
void BackgroundModeManager::RegisterProfile(Profile* profile) {
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -1588,7 +1588,7 @@ void ChromeContentBrowserClient::Registe
|
||||
@@ -1612,7 +1612,7 @@ void ChromeContentBrowserClient::Registe
|
||||
void ChromeContentBrowserClient::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
|
||||
@@ -23,7 +23,7 @@
|
||||
// used for mapping the command-line flags).
|
||||
--- a/chrome/browser/net/profile_network_context_service.cc
|
||||
+++ b/chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -652,7 +652,7 @@ void ProfileNetworkContextService::Confi
|
||||
@@ -653,7 +653,7 @@ void ProfileNetworkContextService::Confi
|
||||
void ProfileNetworkContextService::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
|
||||
@@ -45,7 +45,7 @@
|
||||
// Enum representing possible values of the Preload Pages opt-in state. These
|
||||
--- a/chrome/browser/profiles/profile.cc
|
||||
+++ b/chrome/browser/profiles/profile.cc
|
||||
@@ -338,7 +338,7 @@ const char Profile::kProfileKey[] = "__P
|
||||
@@ -332,7 +332,7 @@ const char Profile::kProfileKey[] = "__P
|
||||
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
prefs::kSearchSuggestEnabled,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/search/search.cc
|
||||
+++ b/chrome/browser/search/search.cc
|
||||
@@ -179,33 +179,8 @@ struct NewTabURLDetails {
|
||||
@@ -194,33 +194,8 @@ struct NewTabURLDetails {
|
||||
const GURL local_url(default_is_google
|
||||
? chrome::ChromeUINewTabPageURLAsGURL()
|
||||
: GURL(chrome::kChromeUINewTabPageThirdPartyURL));
|
||||
|
||||
+1
-1
@@ -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
|
||||
@@ -1957,30 +1957,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
@@ -1980,30 +1980,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
// and preferences have been registered since some of the import code depends
|
||||
// on preferences.
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
|
||||
@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
|
||||
|
||||
--- a/chrome/browser/app_controller_mac.mm
|
||||
+++ b/chrome/browser/app_controller_mac.mm
|
||||
@@ -1236,7 +1236,7 @@ class AppControllerProfileObserver : pub
|
||||
@@ -1239,7 +1239,7 @@ class AppControllerProfileObserver : pub
|
||||
base::apple::ScopedCFTypeRef<CFPropertyListRef> plist(
|
||||
CFPreferencesCopyAppValue(checkInterval, app));
|
||||
if (!plist.get()) {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/types/to_address.h"
|
||||
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
|
||||
@@ -220,6 +221,10 @@ void BookmarkBarController::OnSplitTabCh
|
||||
@@ -221,6 +222,10 @@ void BookmarkBarController::OnSplitTabCh
|
||||
}
|
||||
|
||||
bool BookmarkBarController::ShouldShowBookmarkBar() const {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
|
||||
#include "chrome/browser/ui/web_applications/web_app_tabbed_utils.h"
|
||||
#include "chrome/browser/web_applications/policy/web_app_policy_manager.h"
|
||||
@@ -477,6 +479,8 @@ bool UnloadController::TryToCloseWindow(
|
||||
@@ -478,6 +480,8 @@ bool UnloadController::TryToCloseWindow(
|
||||
void UnloadController::ResetTryToCloseWindow() {
|
||||
cancel_download_confirmation_state_ =
|
||||
CancelDownloadConfirmationState::kNotPrompted;
|
||||
@@ -25,7 +25,7 @@
|
||||
if (!is_calling_before_unload_handlers()) {
|
||||
return;
|
||||
}
|
||||
@@ -793,10 +797,12 @@ UnloadController::MaybeWarnBeforeClosing
|
||||
@@ -794,10 +798,12 @@ UnloadController::MaybeWarnBeforeClosing
|
||||
return WarnBeforeClosingResult::kOkToClose;
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
}
|
||||
|
||||
DCHECK(!warn_before_closing_callback_)
|
||||
@@ -894,6 +900,60 @@ bool UnloadController::CanCloseWithInPro
|
||||
@@ -895,6 +901,60 @@ bool UnloadController::CanCloseWithInPro
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
base::WeakPtr<UnloadController> UnloadController::GetWeakPtr() {
|
||||
return weak_factory_.GetWeakPtr();
|
||||
}
|
||||
@@ -919,6 +979,22 @@ void UnloadController::InProgressDownloa
|
||||
@@ -920,6 +980,22 @@ void UnloadController::InProgressDownloa
|
||||
|
||||
std::move(warn_before_closing_callback_)
|
||||
.Run(WarnBeforeClosingResult::kDoNotClose);
|
||||
@@ -128,15 +128,15 @@
|
||||
void UnloadController::FinishWarnBeforeClosing(WarnBeforeClosingResult result) {
|
||||
--- a/chrome/browser/ui/unload_controller.h
|
||||
+++ b/chrome/browser/ui/unload_controller.h
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "base/memory/weak_ptr.h"
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "chrome/browser/tab_contents/web_contents_collection.h"
|
||||
#include "chrome/browser/ui/browser_window/public/browser_window_interface.h"
|
||||
#include "chrome/browser/ui/download_close_type.h"
|
||||
+#include "chrome/browser/ui/simple_message_box.h"
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
||||
#include "ui/base/unowned_user_data/scoped_unowned_user_data.h"
|
||||
|
||||
@@ -269,6 +270,9 @@ class UnloadController : public WebConte
|
||||
@@ -255,6 +256,9 @@ class UnloadController : public WebConte
|
||||
// Returns true if the window can close, false otherwise.
|
||||
bool CanCloseWithInProgressDownloads();
|
||||
|
||||
@@ -146,7 +146,7 @@
|
||||
base::WeakPtr<UnloadController> GetWeakPtr();
|
||||
|
||||
private:
|
||||
@@ -288,6 +292,8 @@ class UnloadController : public WebConte
|
||||
@@ -274,6 +278,8 @@ class UnloadController : public WebConte
|
||||
// downloads running.
|
||||
void InProgressDownloadResponse(bool cancel_downloads);
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
private:
|
||||
void RenderProcessGone(content::WebContents* web_contents,
|
||||
base::TerminationStatus status) override;
|
||||
@@ -377,6 +383,9 @@ class UnloadController : public WebConte
|
||||
@@ -363,6 +369,9 @@ class UnloadController : public WebConte
|
||||
CancelDownloadConfirmationState cancel_download_confirmation_state_ =
|
||||
CancelDownloadConfirmationState::kNotPrompted;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -901,11 +901,15 @@ bool HandleNewTabPageLocationOverride(
|
||||
@@ -911,11 +911,15 @@ bool HandleNewTabPageLocationOverride(
|
||||
|
||||
// Don't change the URL when incognito mode.
|
||||
if (profile->IsOffTheRecord()) {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -3680,7 +3680,10 @@ bool RenderProcessHostImpl::ShouldSendGp
|
||||
@@ -3677,7 +3677,10 @@ bool RenderProcessHostImpl::ShouldSendGp
|
||||
}
|
||||
|
||||
bool RenderProcessHostImpl::IsJitDisabled() {
|
||||
@@ -23,7 +23,7 @@
|
||||
}
|
||||
|
||||
bool RenderProcessHostImpl::AreV8OptimizationsDisabled() {
|
||||
@@ -3808,6 +3811,9 @@ void RenderProcessHostImpl::AppendRender
|
||||
@@ -3805,6 +3808,9 @@ void RenderProcessHostImpl::AppendRender
|
||||
if (IsJitDisabled()) {
|
||||
AppendToCommaSeparatedSwitch(
|
||||
command_line, blink::switches::kJavaScriptFlags, "--jitless");
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "third_party/blink/public/platform/web_input_event_result.h"
|
||||
#include "third_party/blink/renderer/core/annotation/annotation_agent_impl.h"
|
||||
#include "third_party/blink/renderer/core/dom/document.h"
|
||||
@@ -1491,10 +1492,14 @@ FrameSelection& SelectionController::Sel
|
||||
@@ -1503,10 +1504,14 @@ FrameSelection& SelectionController::Sel
|
||||
}
|
||||
|
||||
bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
@@ -103,6 +104,7 @@ class FrameGrabHandle : public views::Vi
|
||||
@@ -105,6 +106,7 @@ class FrameGrabHandle : public views::Vi
|
||||
// Reserve some space for the frame to be grabbed by, even if the tabstrip
|
||||
// is full.
|
||||
// TODO(tbergquist): Define this relative to the NTB insets again.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_widget.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_widget.cc
|
||||
@@ -611,6 +611,8 @@ bool BrowserWidget::RegenerateFrameOnThe
|
||||
@@ -613,6 +613,8 @@ bool BrowserWidget::RegenerateFrameOnThe
|
||||
}
|
||||
|
||||
bool BrowserWidget::IsIncognitoBrowser() const {
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
--- a/chrome/browser/ui/tab_helpers.cc
|
||||
+++ b/chrome/browser/ui/tab_helpers.cc
|
||||
@@ -603,7 +603,9 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
@@ -604,7 +604,9 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
profile, web_contents);
|
||||
#endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
|
||||
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
|
||||
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("disable-search-engine-collection")) {
|
||||
SearchEngineTabHelper::CreateForWebContents(web_contents);
|
||||
+ }
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
if (contextual_tasks::IsContextualTasksUIEnabled()) {
|
||||
// Manages User-Agent override for tab navigations to AIM / AI URLs.
|
||||
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
|
||||
if (base::FeatureList::IsEnabled(switches::kEnableSearchAIModeSigninPromo) &&
|
||||
base::FeatureList::IsEnabled(contextual_tasks::kContextualTasks)) {
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -12,4 +12,8 @@
|
||||
@@ -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
|
||||
@@ -305,14 +305,16 @@ void ChromeRenderFrameObserver::DidFinis
|
||||
@@ -315,14 +315,16 @@ void ChromeRenderFrameObserver::DidFinis
|
||||
if (frame->Parent() || frame->IsInFencedFrameTree())
|
||||
return;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/metrics/user_metrics.h"
|
||||
@@ -976,6 +977,13 @@ void Tab::SetSplit(std::optional<split_t
|
||||
@@ -983,6 +984,13 @@ void Tab::SetSplit(std::optional<split_t
|
||||
UpdateAccessibleName();
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "base/check.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/functional/callback.h"
|
||||
@@ -2042,6 +2043,8 @@ void TabStrip::OnGroupContentsChanged(co
|
||||
@@ -2043,6 +2044,8 @@ void TabStrip::OnGroupContentsChanged(co
|
||||
|
||||
void TabStrip::UpdateHoverCard(HoverCardAnchorTarget* anchor_target,
|
||||
HoverCardUpdateType update_type) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/browser_features.cc
|
||||
+++ b/chrome/browser/browser_features.cc
|
||||
@@ -230,4 +230,5 @@ BASE_FEATURE(kAutoDeElevate, base::FEATU
|
||||
@@ -231,4 +231,5 @@ BASE_FEATURE(kAutoDeElevate, base::FEATU
|
||||
// show both in Chrome Tabs and Windows.
|
||||
BASE_FEATURE(kRemovalOfIWAsFromTabCapture, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc
|
||||
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
|
||||
@@ -452,6 +452,12 @@ void BrowserTabStripModelDelegate::Close
|
||||
@@ -464,6 +464,12 @@ void BrowserTabStripModelDelegate::Close
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "base/containers/flat_map.h"
|
||||
#include "base/containers/span.h"
|
||||
#include "base/dcheck_is_on.h"
|
||||
@@ -3294,9 +3295,17 @@ void TabStripModel::ExecuteCloseTabs(
|
||||
@@ -3312,9 +3313,17 @@ void TabStripModel::ExecuteCloseTabs(
|
||||
base::RepeatingCallback<std::vector<tabs::TabInterface*>()>
|
||||
get_tabs_to_close,
|
||||
uint32_t close_types) {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "extensions/buildflags/buildflags.h"
|
||||
#include "extensions/common/constants.h"
|
||||
#include "net/base/filename_util.h"
|
||||
@@ -1178,10 +1179,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
@@ -1198,10 +1199,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
return DownloadConfirmationReason::SAVE_AS;
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
||||
@@ -30,7 +30,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
|
||||
@@ -309,6 +309,13 @@ bool ExtensionManagement::IsInstallation
|
||||
@@ -319,6 +319,13 @@ bool ExtensionManagement::IsInstallation
|
||||
bool ExtensionManagement::IsOffstoreInstallAllowed(
|
||||
const GURL& url,
|
||||
const GURL& referrer_url) const {
|
||||
@@ -73,7 +73,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/extensions/browser/extension_util.cc
|
||||
+++ b/extensions/browser/extension_util.cc
|
||||
@@ -576,6 +576,14 @@ bool AnyCurrentlyInstalledExtensionIsFro
|
||||
@@ -594,6 +594,14 @@ bool AnyCurrentlyInstalledExtensionIsFro
|
||||
});
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
bool IsExtensionDownload(const download::DownloadItem& download_item) {
|
||||
if (download_item.GetTargetDisposition() ==
|
||||
download::DownloadItem::TARGET_DISPOSITION_PROMPT) {
|
||||
@@ -583,7 +591,7 @@ bool IsExtensionDownload(const download:
|
||||
@@ -601,7 +609,7 @@ bool IsExtensionDownload(const download:
|
||||
}
|
||||
|
||||
if (download_item.GetMimeType() == Extension::kMimeType) {
|
||||
@@ -99,7 +99,7 @@
|
||||
}
|
||||
--- a/extensions/browser/extension_util.h
|
||||
+++ b/extensions/browser/extension_util.h
|
||||
@@ -180,6 +180,10 @@ bool IsAppLaunchableWithoutEnabling(cons
|
||||
@@ -187,6 +187,10 @@ bool IsAppLaunchableWithoutEnabling(cons
|
||||
bool AnyCurrentlyInstalledExtensionIsFromWebstore(
|
||||
content::BrowserContext* context);
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/containers/flat_set.h"
|
||||
#include "base/feature_list.h"
|
||||
@@ -1348,7 +1349,8 @@ void HistoryBackend::InitImpl(
|
||||
@@ -1390,7 +1391,8 @@ void HistoryBackend::InitImpl(
|
||||
db_->GetStartDate(&first_recorded_time_);
|
||||
|
||||
// Start expiring old stuff.
|
||||
@@ -31,7 +31,7 @@
|
||||
}
|
||||
|
||||
void HistoryBackend::CloseAllDatabases() {
|
||||
@@ -1582,6 +1584,8 @@ void HistoryBackend::AddPagesWithDetails
|
||||
@@ -1625,6 +1627,8 @@ void HistoryBackend::AddPagesWithDetails
|
||||
}
|
||||
|
||||
bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -761,6 +761,9 @@ class BrowserView::ExclusiveAccessContex
|
||||
@@ -767,6 +767,9 @@ class BrowserView::ExclusiveAccessContex
|
||||
void UpdateExclusiveAccessBubble(
|
||||
const ExclusiveAccessBubbleParams& params,
|
||||
ExclusiveAccessBubbleHideCallback first_hide_callback) override {
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// uncollapsed min width, because otherwise the close buttons in a grouped
|
||||
--- a/chrome/browser/ui/views/tabs/tab.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab.cc
|
||||
@@ -1352,7 +1352,7 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1359,7 +1359,7 @@ void Tab::UpdateIconVisibility() {
|
||||
const bool should_show_close_button =
|
||||
!IsLockedForOnTask(controller_->GetBrowserWindowInterface());
|
||||
#else
|
||||
|
||||
@@ -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
|
||||
@@ -70,6 +70,8 @@ void NavigatorBase::Trace(Visitor* visit
|
||||
@@ -85,6 +85,8 @@ void NavigatorBase::Trace(Visitor* visit
|
||||
}
|
||||
|
||||
unsigned int NavigatorBase::hardwareConcurrency() const {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/functional/callback_helpers.h"
|
||||
@@ -170,6 +171,18 @@ DragOperation GetDropEffect(const ui::Dr
|
||||
@@ -172,6 +173,18 @@ DragOperation GetDropEffect(const ui::Dr
|
||||
return DragOperation::kMove;
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
} // namespace
|
||||
|
||||
BrowserRootView::DropInfo::DropInfo() = default;
|
||||
@@ -182,7 +195,9 @@ BrowserRootView::DropInfo::~DropInfo() {
|
||||
@@ -184,7 +197,9 @@ BrowserRootView::DropInfo::~DropInfo() {
|
||||
|
||||
BrowserRootView::BrowserRootView(BrowserView* browser_view,
|
||||
views::Widget* widget)
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
BrowserRootView::~BrowserRootView() {
|
||||
// It's possible to destroy the browser while a drop is active. In this case,
|
||||
@@ -324,7 +339,7 @@ bool BrowserRootView::OnMouseWheel(const
|
||||
@@ -326,7 +341,7 @@ bool BrowserRootView::OnMouseWheel(const
|
||||
|
||||
// Scroll-event-changes-tab is incompatible with vertical tabstrip, so
|
||||
// disable it if the latter feature is enabled.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -592,6 +592,17 @@ void ToolbarView::Init() {
|
||||
@@ -598,6 +598,17 @@ void ToolbarView::Init() {
|
||||
avatar_ = AddChildView(std::make_unique<AvatarToolbarButton>(browser_));
|
||||
bool show_avatar_toolbar_button =
|
||||
AvatarToolbarButtonInterface::CanShowForProfile(browser_->GetProfile());
|
||||
|
||||
@@ -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
|
||||
@@ -4200,6 +4200,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -4216,6 +4216,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)));
|
||||
}
|
||||
@@ -4209,6 +4211,8 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -4225,6 +4227,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
|
||||
@@ -4986,10 +4986,12 @@ constexpr char kEnterpriseIsolatedModeIn
|
||||
@@ -5041,10 +5041,12 @@ constexpr char kEnterpriseIsolatedModeIn
|
||||
#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
|
||||
@@ -190,6 +190,7 @@
|
||||
@@ -193,6 +193,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"
|
||||
@@ -415,10 +416,10 @@ void AddAdditionalRequestHeaders(
|
||||
@@ -418,10 +419,10 @@ void AddAdditionalRequestHeaders(
|
||||
net::HttpRequestHeaders::kUserAgent,
|
||||
ComputeUserAgentValue(user_agent_override));
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
|
||||
#include "services/network/public/cpp/web_sandbox_flags.h"
|
||||
#include "services/network/public/mojom/fetch_api.mojom.h"
|
||||
@@ -4744,10 +4745,13 @@ void RenderFrameImpl::FinalizeRequestInt
|
||||
@@ -4747,10 +4748,13 @@ void RenderFrameImpl::FinalizeRequestInt
|
||||
|
||||
request.SetHasUserGesture(frame_->HasTransientUserActivation());
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
}
|
||||
--- a/services/network/public/cpp/BUILD.gn
|
||||
+++ b/services/network/public/cpp/BUILD.gn
|
||||
@@ -125,6 +125,8 @@ component("cpp") {
|
||||
@@ -139,6 +139,8 @@ component("cpp") {
|
||||
"parsed_headers.cc",
|
||||
"parsed_headers.h",
|
||||
"record_ontransfersizeupdate_utils.h",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4982,7 +4982,13 @@ constexpr char kEnterpriseIsolatedModeIn
|
||||
@@ -5037,7 +5037,13 @@ constexpr char kEnterpriseIsolatedModeIn
|
||||
"force-enterprise-isolated-mode";
|
||||
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3242,6 +3242,10 @@ source_set("browser") {
|
||||
@@ -3248,6 +3248,10 @@ source_set("browser") {
|
||||
# ... get modularized.
|
||||
"//chrome/browser/ui/extensions:impl",
|
||||
]
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
#include "components/download/public/common/download_stats.h"
|
||||
-#include "components/services/quarantine/quarantine.h"
|
||||
#include "crypto/hash.h"
|
||||
#include "crypto/secure_hash.h"
|
||||
|
||||
@@ -585,106 +584,12 @@ DownloadInterruptReason BaseFile::Publis
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -583,106 +582,12 @@ DownloadInterruptReason BaseFile::Publis
|
||||
}
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
}
|
||||
|
||||
void BaseFile::AnnotateWithSourceInformation(
|
||||
@@ -694,33 +599,8 @@ void BaseFile::AnnotateWithSourceInforma
|
||||
@@ -692,33 +597,8 @@ void BaseFile::AnnotateWithSourceInforma
|
||||
const std::optional<url::Origin>& request_initiator,
|
||||
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
|
||||
OnAnnotationDoneCallback on_annotation_done_callback) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/browser_features.cc
|
||||
+++ b/chrome/browser/browser_features.cc
|
||||
@@ -41,7 +41,7 @@ BASE_FEATURE(kBookmarkTriggerForPrefetch
|
||||
@@ -42,7 +42,7 @@ BASE_FEATURE(kBookmarkTriggerForPrefetch
|
||||
// On builds where CT is enabled, this flag is also used as an emergency kill
|
||||
// switch.
|
||||
BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/browser_commands.cc
|
||||
+++ b/chrome/browser/ui/browser_commands.cc
|
||||
@@ -1421,9 +1421,6 @@ void NewTabToRight(BrowserWindowInterfac
|
||||
@@ -1414,9 +1414,6 @@ void NewTabToRight(BrowserWindowInterfac
|
||||
}
|
||||
|
||||
void NewTabFromClipboardURL(BrowserWindowInterface* browser) {
|
||||
@@ -10,7 +10,7 @@
|
||||
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
|
||||
CHECK(clipboard)
|
||||
<< "Clipboard instance is not available, cannot proceed with "
|
||||
@@ -1453,8 +1450,6 @@ void NewTabFromClipboardURL(BrowserWindo
|
||||
@@ -1446,8 +1443,6 @@ void NewTabFromClipboardURL(BrowserWindo
|
||||
}
|
||||
},
|
||||
browser->GetWeakPtr()));
|
||||
@@ -21,7 +21,7 @@
|
||||
void CloseTab(BrowserWindowInterface* browser) {
|
||||
--- a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc
|
||||
@@ -244,13 +244,11 @@ HorizontalTabStripRegionViewOld::Horizon
|
||||
@@ -247,13 +247,11 @@ HorizontalTabStripRegionViewOld::Horizon
|
||||
new_tab_button_->GetViewAccessibility().SetName(
|
||||
l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_browser_main.cc
|
||||
+++ b/chrome/browser/chrome_browser_main.cc
|
||||
@@ -1305,6 +1305,7 @@ int ChromeBrowserMainParts::PreCreateThr
|
||||
@@ -1340,6 +1340,7 @@ int ChromeBrowserMainParts::PreCreateThr
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
|
||||
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/version/version_ui.h"
|
||||
#include "components/enterprise/buildflags/buildflags.h"
|
||||
@@ -311,6 +312,7 @@ void RegisterChromeWebUIConfigs() {
|
||||
@@ -324,6 +325,7 @@ void RegisterChromeWebUIConfigs() {
|
||||
map.AddWebUIConfig(std::make_unique<SuggestInternalsUIConfig>());
|
||||
map.AddWebUIConfig(std::make_unique<SyncInternalsUIConfig>());
|
||||
map.AddWebUIConfig(std::make_unique<TranslateInternalsUIConfig>());
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
--- a/components/omnibox/common/omnibox_features.cc
|
||||
+++ b/components/omnibox/common/omnibox_features.cc
|
||||
@@ -363,7 +363,7 @@ BASE_FEATURE(kOmniboxSearchPrefetchOnEnt
|
||||
@@ -372,7 +372,7 @@ BASE_FEATURE(kOmniboxSearchPrefetchOnEnt
|
||||
BASE_FEATURE(kOmniboxSiteSearch, DISABLED);
|
||||
|
||||
// Enables additional site search providers for the Site search Starter Pack.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
@@ -89,7 +89,6 @@ const char* const kBadFlags[] = {
|
||||
@@ -94,7 +94,6 @@ const char* const kBadFlags[] = {
|
||||
sandbox::policy::switches::kDisableGpuSandbox,
|
||||
sandbox::policy::switches::kDisableLandlockSandbox,
|
||||
sandbox::policy::switches::kDisableSeccompFilterSandbox,
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
# the 'Vist Chrome Web Store' entry in the extensions section of the main menu
|
||||
# the side panel entry in All Bookmarks
|
||||
# the 'Learn more' link on crashed tabs
|
||||
# Session restore default infobar
|
||||
# non-functional AI options
|
||||
# disable LiveCaption flag by default, this also removes non-functional Live Caption checkbox from media controls
|
||||
# the new feature badges
|
||||
@@ -51,7 +52,7 @@
|
||||
<!-- Languages Page -->
|
||||
--- a/chrome/app/settings_strings.grdp
|
||||
+++ b/chrome/app/settings_strings.grdp
|
||||
@@ -1115,7 +1115,7 @@
|
||||
@@ -1146,7 +1146,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.">
|
||||
@@ -60,7 +61,7 @@
|
||||
</message>
|
||||
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
|
||||
Power
|
||||
@@ -1139,7 +1139,7 @@
|
||||
@@ -1170,7 +1170,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.">
|
||||
@@ -69,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
|
||||
@@ -1151,7 +1151,7 @@
|
||||
@@ -1182,7 +1182,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.">
|
||||
@@ -95,7 +96,7 @@
|
||||
<span>$i18n{noSearchResults}</span>
|
||||
--- a/chrome/browser/resources/extensions/sidebar.html.ts
|
||||
+++ b/chrome/browser/resources/extensions/sidebar.html.ts
|
||||
@@ -45,24 +45,6 @@ export function getHtml(this: Extensions
|
||||
@@ -48,24 +48,6 @@ export function getHtml(this: Extensions
|
||||
<cr-ripple></cr-ripple>
|
||||
</a>
|
||||
</cr-menu-selector>
|
||||
@@ -106,7 +107,7 @@
|
||||
- .innerHTML="${this.computeModernWebGuidancePromoText_()}">
|
||||
- </span>
|
||||
- </div>
|
||||
-`: ''}
|
||||
-` : ''}
|
||||
-<div class="separator"></div>
|
||||
-<div class="cr-nav-menu-item" id="moreExtensions">
|
||||
- <cr-icon id="web-store-icon" icon="extensions-icons:web_store-custom">
|
||||
@@ -154,20 +155,20 @@
|
||||
declare global {
|
||||
--- a/chrome/browser/resources/history/side_bar.html.ts
|
||||
+++ b/chrome/browser/resources/history/side_bar.html.ts
|
||||
@@ -22,13 +22,6 @@ export function getHtml(this: HistorySid
|
||||
@@ -20,13 +20,6 @@ export function getHtml(this: HistorySid
|
||||
$i18n{historyMenuItem}
|
||||
<cr-ripple></cr-ripple>
|
||||
</a>
|
||||
- <a id="syncedTabs" role="menuitem" href="/syncedTabs"
|
||||
- class="page-item cr-nav-menu-item"
|
||||
- path="syncedTabs" @click="${this.onItemClick_}">
|
||||
- class="page-item cr-nav-menu-item" path="syncedTabs"
|
||||
- @click="${this.onItemClick_}">
|
||||
- <cr-icon icon="cr:devices"></cr-icon>
|
||||
- $i18n{openTabsMenuItem}
|
||||
- <cr-ripple></cr-ripple>
|
||||
- </a>
|
||||
<a role="menuitem" id="clear-browsing-data"
|
||||
class="cr-nav-menu-item"
|
||||
<a role="menuitem" id="clear-browsing-data" class="cr-nav-menu-item"
|
||||
href="chrome://settings/clearBrowserData"
|
||||
@click="${this.onClearBrowsingDataClick_}"
|
||||
--- a/chrome/browser/resources/history/side_bar.ts
|
||||
+++ b/chrome/browser/resources/history/side_bar.ts
|
||||
@@ -31,7 +31,6 @@ export interface HistorySideBarElement {
|
||||
@@ -266,7 +267,7 @@
|
||||
<div class="separator"></div>
|
||||
--- a/chrome/browser/resources/settings/autofill_page/payments/payments_page.html
|
||||
+++ b/chrome/browser/resources/settings/autofill_page/payments/payments_page.html
|
||||
@@ -112,11 +112,6 @@
|
||||
@@ -111,11 +111,6 @@
|
||||
on-settings-boolean-control-change="onCanMakePaymentChange_">
|
||||
</settings-toggle-button>
|
||||
|
||||
@@ -280,7 +281,7 @@
|
||||
|
||||
--- a/chrome/browser/resources/settings/autofill_page/payments/payments_page.ts
|
||||
+++ b/chrome/browser/resources/settings/autofill_page/payments/payments_page.ts
|
||||
@@ -358,14 +358,6 @@ export class SettingsPaymentsPageElement
|
||||
@@ -357,14 +357,6 @@ export class SettingsPaymentsPageElement
|
||||
// Record that the user opened the payments settings.
|
||||
chrome.metricsPrivate.recordUserAction('AutofillCreditCardsViewed');
|
||||
|
||||
@@ -474,7 +475,7 @@
|
||||
|
||||
--- a/chrome/browser/resources/settings/privacy_page/security/security_page.html
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/security/security_page.html
|
||||
@@ -115,13 +115,6 @@
|
||||
@@ -121,13 +121,6 @@
|
||||
<div class="cr-row first">
|
||||
<h2 class="cr-title-text">$i18n{advancedPageTitle}</h2>
|
||||
</div>
|
||||
@@ -488,7 +489,7 @@
|
||||
<template is="dom-if" if="[[!enableHttpsFirstModeNewSettings_]]" restamp>
|
||||
<settings-toggle-button id="httpsOnlyModeToggle"
|
||||
pref="{{prefs.generated.https_first_mode_enabled}}"
|
||||
@@ -172,10 +165,4 @@
|
||||
@@ -178,10 +171,4 @@
|
||||
on-click="onManageCertificatesClick_" external>
|
||||
</cr-link-row>
|
||||
|
||||
@@ -523,11 +524,11 @@
|
||||
- ${this.learnMoreUrl ? html`
|
||||
+ ${false ? html`
|
||||
<cr-icon-button iron-icon="cr:help" suppress-rtl-flip
|
||||
id="infoButton"
|
||||
aria-label="${this.getLearnMoreAriaLabel_()}"
|
||||
aria-description="$i18n{opensInNewTab}"
|
||||
--- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
|
||||
+++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
|
||||
@@ -471,7 +471,6 @@ void RecentTabsSubMenuModel::Build() {
|
||||
@@ -474,7 +474,6 @@ void RecentTabsSubMenuModel::Build() {
|
||||
|
||||
AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
BuildLocalEntries();
|
||||
@@ -537,7 +538,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
@@ -1193,16 +1193,6 @@ void ExtensionsMenuModel::Build(BrowserW
|
||||
@@ -1044,16 +1044,6 @@ void ExtensionsMenuModel::Build(BrowserW
|
||||
SetElementIdentifierAt(
|
||||
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
|
||||
kManageExtensionsMenuItem);
|
||||
@@ -556,7 +557,7 @@
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
@@ -1358,13 +1358,15 @@ void BookmarkMenuDelegate::BuildOtherNod
|
||||
@@ -1352,13 +1352,15 @@ void BookmarkMenuDelegate::BuildOtherNod
|
||||
menu->AppendMenuItem(
|
||||
IDC_SHOW_BOOKMARK_SIDE_PANEL,
|
||||
l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
|
||||
@@ -617,9 +618,21 @@
|
||||
|
||||
void SadTabView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
|
||||
// Constrain title width manually since it doesn't have FlexSpecification.
|
||||
--- a/chrome/browser/ui/views/session_restore_infobar/session_restore_infobar_controller.cc
|
||||
+++ b/chrome/browser/ui/views/session_restore_infobar/session_restore_infobar_controller.cc
|
||||
@@ -77,9 +77,6 @@ InfobarMessageType SessionRestoreInfobar
|
||||
kContinueWhereLeftOff:
|
||||
return InfobarMessageType::kTurnOffFromRestart;
|
||||
case SessionRestoreInfobarModel::SessionRestoreMessageValue::kOpenNewTabPage:
|
||||
- if (model_->IsDefaultSessionRestorePref()) {
|
||||
- return InfobarMessageType::kTurnOnSessionRestore;
|
||||
- }
|
||||
return InfobarMessageType::kNone;
|
||||
case SessionRestoreInfobarModel::SessionRestoreMessageValue::
|
||||
kOpenSpecificPages:
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -1335,40 +1335,20 @@ void AddPerformanceStrings(content::WebU
|
||||
@@ -1341,40 +1341,20 @@ void AddPerformanceStrings(content::WebU
|
||||
{"cpuPerformanceTierMid", IDS_SETTINGS_CPU_PERFORMANCE_TIER_MID},
|
||||
{"cpuPerformanceTierHigh", IDS_SETTINGS_CPU_PERFORMANCE_TIER_HIGH},
|
||||
{"cpuPerformanceTierUltra", IDS_SETTINGS_CPU_PERFORMANCE_TIER_ULTRA},
|
||||
@@ -669,7 +682,7 @@
|
||||
|
||||
html_source->AddString(
|
||||
"tabDiscardTimerFiveMinutes",
|
||||
@@ -1414,11 +1394,6 @@ void AddPerformanceStrings(content::WebU
|
||||
@@ -1420,11 +1400,6 @@ void AddPerformanceStrings(content::WebU
|
||||
base::NumberToString16(
|
||||
performance_manager::user_tuning::BatterySaverModeManager::
|
||||
kLowBatteryThresholdPercent)));
|
||||
@@ -683,7 +696,7 @@
|
||||
chrome::kDiscardRingTreatmentLearnMoreUrl);
|
||||
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
|
||||
@@ -622,23 +622,10 @@ SettingsUI::SettingsUI(content::WebUI* w
|
||||
@@ -623,23 +623,10 @@ SettingsUI::SettingsUI(content::WebUI* w
|
||||
html_source->AddString("aiSuggestionsHelpCenterArticleLink",
|
||||
contextual_cueing::kHelpCenterArticleLink.Get());
|
||||
|
||||
@@ -709,7 +722,7 @@
|
||||
}
|
||||
|
||||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
@@ -654,11 +641,9 @@ SettingsUI::SettingsUI(content::WebUI* w
|
||||
@@ -655,11 +642,9 @@ SettingsUI::SettingsUI(content::WebUI* w
|
||||
// Within the AI subpage are separate sections for Glic and for all other AI
|
||||
// features, the visibility of these are separately controlled but we want to
|
||||
// show the subpage if any of the AI features or Glic are enabled.
|
||||
@@ -736,7 +749,7 @@
|
||||
BASE_FEATURE(kLiveCaptionAutomaticLanguageDownload,
|
||||
--- a/ui/views/controls/menu/menu_item_view.h
|
||||
+++ b/ui/views/controls/menu/menu_item_view.h
|
||||
@@ -357,7 +357,6 @@ class VIEWS_EXPORT MenuItemView : public
|
||||
@@ -366,7 +366,6 @@ class VIEWS_EXPORT MenuItemView : public
|
||||
int GetCommand() const { return command_; }
|
||||
|
||||
void set_new_badge_type(std::optional<ui::NewBadgeType> new_badge_type) {
|
||||
|
||||
@@ -33,7 +33,6 @@ core/ungoogled-chromium/doh-changes.patch
|
||||
core/ungoogled-chromium/extensions-manifestv2.patch
|
||||
core/ungoogled-chromium/remove-f1-shortcut.patch
|
||||
core/ungoogled-chromium/move-js-optimizer-unfamiliar-sites.patch
|
||||
core/ungoogled-chromium/build-with-wasm-rollup.patch
|
||||
core/ungoogled-chromium/remove-navigation-source-param.patch
|
||||
core/ungoogled-chromium/disable-tos-dialog.patch
|
||||
core/bromite/disable-fetching-field-trials.patch
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -363,6 +363,7 @@
|
||||
@@ -361,6 +361,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,7 +10,7 @@
|
||||
#include "content/public/browser/permission_controller.h"
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -1052,6 +1052,7 @@ source_set("extensions") {
|
||||
@@ -1054,6 +1054,7 @@ source_set("extensions") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
@@ -20,7 +20,7 @@
|
||||
"//components/services/unzip/public/cpp",
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -547,6 +547,7 @@ static_library("url_constants") {
|
||||
@@ -552,6 +552,7 @@ static_library("url_constants") {
|
||||
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
|
||||
"//components/password_manager/content/common",
|
||||
"//components/safe_browsing/core/common",
|
||||
|
||||
+171
-31
@@ -2355,6 +2355,8 @@ third_party/blink/renderer/core/testing/data/exported-names.wasm
|
||||
third_party/blink/renderer/core/testing/data/invalid-module.wasm
|
||||
third_party/blink/renderer/core/testing/data/non_UTF8.wasm
|
||||
third_party/blink/renderer/core/testing/data/test.webm
|
||||
third_party/blink/renderer/platform/testing/data/00.1.ift_gk
|
||||
third_party/blink/renderer/platform/testing/data/04.1.ift_gk
|
||||
third_party/blink/renderer/platform/text_codec_fuzzer_seed_corpus/0091b89571c844a754df4bdd133ad4d5b628e51d
|
||||
third_party/blink/renderer/platform/text_codec_fuzzer_seed_corpus/017fd5359998719d5fa3b3df5fc7b72fdb163936
|
||||
third_party/blink/renderer/platform/text_codec_fuzzer_seed_corpus/031ccb60903b3cd5780b6d3743051e216068b7cc
|
||||
@@ -8177,11 +8179,13 @@ third_party/harfbuzz/src/test/api/fonts/repacker_expected.otf
|
||||
third_party/harfbuzz/src/test/fuzzing/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6461128124465152
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/037322204d9bc87b6b0b0f2342c97caa9c5fd479
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/0509e80afb379d16560e9e47bdd7d888bebdebc6
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/1365781b41cb64df3676cf79dd9f11f783facfe3
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/1746cad6bc3fb2b355db50a5af37c9b58d9ad376
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/205edd09bd3d141cc9580f650109556cc28b22cb
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/217a934cfe15c548b572c203dceb2befdf026462
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/3511ff5c1647150595846ac414c595cccac34f18
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/3653331f3f13ff5b1b271c5c5583ace4c757005c
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/43979b90b2dd929723cf4fe1715990bcb9c9a56b
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/558661aa659912f4d30ecd27bd09835171a8e2b0
|
||||
@@ -8323,6 +8327,7 @@ third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fu
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6723367514144768
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-gpu-fuzzer-4655044879515648
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-gpu-fuzzer-4820484278255616
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-gpu-fuzzer-5336988644081664
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-gpu-fuzzer-5419605043773440
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-gpu-fuzzer-5918954634936320
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-gpu-fuzzer-6336503637934080
|
||||
@@ -8336,6 +8341,7 @@ third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-ra
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4797078076456960
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4826864710647808
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4872362293264384
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4912367159541760
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-5078588000108544
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-5216672087867392
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-5513551012495360
|
||||
@@ -8344,12 +8350,14 @@ third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-ra
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-5983746921922560
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6111992183324672
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6252581608554496
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6328536122851328
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6344015149858816
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6454028543524864
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6538157574389760
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6597066439852032
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-repacker-fuzzer-4579249263345664
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-repacker-fuzzer-4877513265119232
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-repacker-fuzzer-5009721206833152
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-repacker-fuzzer-6490945267564544
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-repacker-fuzzer-6697168080338944
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-4523349576908800
|
||||
@@ -8437,6 +8445,7 @@ third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-su
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4552226966994944
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4575222591520768
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4681956043390976
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4688270404157440
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4801020053291008
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4846730722738176
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4875306193518592.fuzz
|
||||
@@ -8633,6 +8642,8 @@ third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-su
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6136125075750912
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6394290358976512
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-vector-fuzzer-4521131913838592
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-vector-fuzzer-4700345193005056
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-vector-fuzzer-4886959609413632
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-vector-fuzzer-5448347908636672
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-vector-fuzzer-5620949889384448
|
||||
third_party/harfbuzz/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-vector-fuzzer-5622008821121024
|
||||
@@ -8882,6 +8893,7 @@ third_party/harfbuzz/src/test/shape/data/aots/fonts/lookupflag_ignore_base_f1.ot
|
||||
third_party/harfbuzz/src/test/shape/data/aots/fonts/lookupflag_ignore_combination_f1.otf
|
||||
third_party/harfbuzz/src/test/shape/data/aots/fonts/lookupflag_ignore_ligatures_f1.otf
|
||||
third_party/harfbuzz/src/test/shape/data/aots/fonts/lookupflag_ignore_marks_f1.otf
|
||||
third_party/harfbuzz/src/test/shape/data/in-house/fonts/3113f846b81ea15c02e05a1c14fa65f9fd342143.otf
|
||||
third_party/harfbuzz/src/test/shape/data/in-house/fonts/DFONT.dfont
|
||||
third_party/harfbuzz/src/test/shape/data/in-house/fonts/FallbackPlus-Javanese-no-GDEF.otf
|
||||
third_party/harfbuzz/src/test/shape/data/in-house/fonts/NotoSansCJK-VF.abc.otf
|
||||
@@ -11764,15 +11776,39 @@ third_party/litert/src/litert/js/packages/core/testdata/fallback_model.tflite
|
||||
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/support_lib/javatests/com/google/ai/edge/litert/support/assets/add.tflite
|
||||
third_party/litert/src/litert/support_lib/javatests/com/google/ai/edge/litert/support/assets/mobilenet_v1_1.0_224.tflite
|
||||
third_party/litert/src/litert/support_lib/javatests/com/google/ai/edge/litert/support/text/tokenizers/assets/30k-clean.model
|
||||
third_party/litert/src/litert/support_lib/metadata/javatests/com/google/ai/edge/litert/support/assets/mobilenet_v1_1.0_224_quant.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/audio_classifier/two_heads.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/audio_classifier/yamnet_tfhub.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/audio_classifier/yamnet_wavin_quantized_mel_relu6.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/audio_embedder/yamnet_embedding.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/image_classifier/mobilenet_v2_1.0_224.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/image_classifier/mobilenet_v2_1.0_224_quant.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/image_segmenter/deeplabv3.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/mobilenet_v2_1.0_224_quant.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/nl_classifier/movie_review.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/object_detector/coco_ssd_mobilenet_v1_1.0_quant_2018_06_29_no_metadata.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/object_detector/coco_ssd_mobilenet_v1_1.0_quant_2018_06_29_score_calibration.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/object_detector/efficientdet_lite0_v1.tflite
|
||||
third_party/litert/src/litert/support_lib/metadata/python/tests/testdata/object_detector/ssd_mobilenet_v1.tflite
|
||||
third_party/litert/src/litert/test/testdata/FFW-2-bit.tflite
|
||||
third_party/litert/src/litert/test/testdata/MTKEXT_CONV_2D.tflite
|
||||
third_party/litert/src/litert/test/testdata/add_cst.tflite
|
||||
third_party/litert/src/litert/test/testdata/add_simple.tflite
|
||||
third_party/litert/src/litert/test/testdata/attention.tflite
|
||||
third_party/litert/src/litert/test/testdata/attn_vec_einsum.tflite
|
||||
third_party/litert/src/litert/test/testdata/blockwise_quantized.tflite
|
||||
third_party/litert/src/litert/test/testdata/constant_output_tensor.tflite
|
||||
third_party/litert/src/litert/test/testdata/cos_mul.tflite
|
||||
third_party/litert/src/litert/test/testdata/cst_multi_subgraph.tflite
|
||||
third_party/litert/src/litert/test/testdata/custom_sinh.bin
|
||||
third_party/litert/src/litert/test/testdata/dynamic_add_model.tflite
|
||||
third_party/litert/src/litert/test/testdata/dynamic_shape_tensor.tflite
|
||||
third_party/litert/src/litert/test/testdata/dynamic_string_custom_ops.tflite
|
||||
third_party/litert/src/litert/test/testdata/ff.tflite
|
||||
third_party/litert/src/litert/test/testdata/fully_connected_3d.tflite
|
||||
third_party/litert/src/litert/test/testdata/gather_string.tflite
|
||||
third_party/litert/src/litert/test/testdata/group_norm_2_groups_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/island_partial.tflite
|
||||
@@ -11785,49 +11821,155 @@ third_party/litert/src/litert/test/testdata/max_unpooling_2d_valid.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
|
||||
third_party/litert/src/litert/test/testdata/mul_simple.tflite
|
||||
third_party/litert/src/litert/test/testdata/multi_composite.tflite
|
||||
third_party/litert/src/litert/test/testdata/multi_op_multi_subgraph.tflite
|
||||
third_party/litert/src/litert/test/testdata/multi_subgraph.tflite
|
||||
third_party/litert/src/litert/test/testdata/multi_subgraph_mul.tflite
|
||||
third_party/litert/src/litert/test/testdata/multi_subgraph_mul_2.tflite
|
||||
third_party/litert/src/litert/test/testdata/multi_use_cst.tflite
|
||||
third_party/litert/src/litert/test/testdata/nested_composite.tflite
|
||||
third_party/litert/src/litert/test/testdata/norm.tflite
|
||||
third_party/litert/src/litert/test/testdata/one_mul.tflite
|
||||
third_party/litert/src/litert/test/testdata/precompiled_mediatek_model.tflite
|
||||
third_party/litert/src/litert/test/testdata/q_einsum.tflite
|
||||
third_party/litert/src/litert/test/testdata/qwen_fc_blockwise_quantized.tflite
|
||||
third_party/litert/src/litert/test/testdata/reverse_signature_model.tflite
|
||||
third_party/litert/src/litert/test/testdata/rms_norm.tflite
|
||||
third_party/litert/src/litert/test/testdata/rms_norm_composite.tflite
|
||||
third_party/litert/src/litert/test/testdata/rms_norm_composite_2.tflite
|
||||
third_party/litert/src/litert/test/testdata/rms_norm_composite_3.tflite
|
||||
third_party/litert/src/litert/test/testdata/rope.tflite
|
||||
third_party/litert/src/litert/test/testdata/scala_reshape.tflite
|
||||
third_party/litert/src/litert/test/testdata/sdpa.tflite
|
||||
third_party/litert/src/litert/test/testdata/shared_input_cpu_npu.tflite
|
||||
third_party/litert/src/litert/test/testdata/shared_input_cpu_npu_google_tensor_precompiled.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_abs_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_add3d_cst_int32.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_add_dynamic_shape.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_add_fused_relu_n1_1_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_add_op.sm8750.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_add_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_add_op_google_tensor_p25_precompiled.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_add_op_qc_v75_precompiled.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_add_uint16_qualcomm.bin
|
||||
third_party/litert/src/litert/test/testdata/simple_arg_max_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_arg_min_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_atan2_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_average_poll_2d.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_average_pool_2d_fused_relu.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_batch_matmul_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_broadcast_to_op_boolean.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_broadcast_to_op_fp32.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_cascade_model_npu.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_cast_and_add_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_cast_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_ceil_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_composite.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_concatenation_fused_relu6_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_concatenation_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_conv_2d_fused_relu_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_conv_2d_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_conv_3d_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_cos_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_cumsum.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_depth_to_space_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_depthwise_conv_2d_fused_relu.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_depthwise_conv_2d_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_div_fused_tanh.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_div_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_dynamic_update_slice_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_elu_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_embedding_lookup_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_equal_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_exp_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_floor_div.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_floor_mod.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_floor_mod_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_floor_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_fully_connected_fused_relu6_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_fully_connected_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_gather_nd.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_gather_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_gelu_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_greater_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_group_norm_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_hard_swish_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_l2_norm.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_leaky_relu_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_less_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_log_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_log_softmax_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_logical_and_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_logical_or_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_logistic.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_max_pool_2d.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_max_pool_2d_fused_relu.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_mean_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_mirror_pad_reflect_dyanmic_shape.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_mirror_pad_reflect_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_mirror_pad_symmetric_dynamic_shape.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_mirror_pad_symmetric_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_mixed_cascade_model_npu.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_model.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_model_custom_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_model_google_tensor.bin
|
||||
third_party/litert/src/litert/test/testdata/simple_model_mtk.bin
|
||||
third_party/litert/src/litert/test/testdata/simple_model_npu.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_model_npu_google_tensor_precompiled.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_model_npu_mediatek_mt6989_precompiled.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_model_qualcomm.bin
|
||||
third_party/litert/src/litert/test/testdata/simple_model_qualcomm_sm8650_precompiled.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_mul_fused_relu.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_mul_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_multi_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_neg_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_not_equal.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_pack_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_pad.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_pad_v2.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_pow_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_prelu_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_quantized_ops.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_reduceall_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_reduceany_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_reducemax_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_reducemin_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_relu0to1_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_relu1_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_relu6_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_relu_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_reshape_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_resize_bilinear_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_resize_nearest_neighbor_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_reverse_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_round_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_rsqrt_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_scatter_nd_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_select_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_select_v2_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_shlo_composite.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_sign_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_sin_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_slice_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_softmax_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_space_to_depth_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_split_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_sqrt_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_squeeze.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_stablehlo_scatter_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_strided_slice_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_sub_fused_relu_N1_1_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_sub_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_sum_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_tanh_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_tile_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_topk_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_topk_op_runtime_k.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_transpose_conv_fused_tanh.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_transpose_conv_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_transpose_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/simple_unpack_op.tflite
|
||||
third_party/litert/src/litert/test/testdata/single_add_default_a16w8_recipe_quantized.tflite
|
||||
third_party/litert/src/litert/test/testdata/single_add_default_a8w8_recipe_quantized.tflite
|
||||
third_party/litert/src/litert/test/testdata/single_mul_default_a16w8_recipe_quantized.tflite
|
||||
@@ -11836,6 +11978,7 @@ third_party/litert/src/litert/test/testdata/single_rsqrt_default_a16w8_recipe_qu
|
||||
third_party/litert/src/litert/test/testdata/single_rsqrt_default_a8w8_recipe_quantized.tflite
|
||||
third_party/litert/src/litert/test/testdata/sqrt_mean_mul_multiple.tflite
|
||||
third_party/litert/src/litert/test/testdata/sqrt_mean_mul_ops.tflite
|
||||
third_party/litert/src/litert/test/testdata/squared_difference.tflite
|
||||
third_party/litert/src/litert/test/testdata/static_a8w8_quantized_sdpa.tflite
|
||||
third_party/litert/src/litert/test/testdata/static_w8_a16_quantized_attn_vec_einsum.tflite
|
||||
third_party/litert/src/litert/test/testdata/static_w8_a16_quantized_k_einsum.tflite
|
||||
@@ -11847,6 +11990,13 @@ third_party/litert/src/litert/test/testdata/topo_sort_fork_violation.tflite
|
||||
third_party/litert/src/litert/test/testdata/topo_sort_interleaved.tflite
|
||||
third_party/litert/src/litert/test/testdata/torchaudio_conformer.tflite
|
||||
third_party/litert/src/litert/test/testdata/transformer.tflite
|
||||
third_party/litert/src/litert/test/testdata/two_adds.tflite
|
||||
third_party/litert/src/litert/test/testdata/two_partition.tflite
|
||||
third_party/litert/src/litert/test/testdata/unranked_tensor.tflite
|
||||
third_party/litert/src/litert/test/testdata/unsupported_composite.tflite
|
||||
third_party/litert/src/litert/test/testdata/unsupported_composite_2.tflite
|
||||
third_party/litert/src/litert/test/testdata/unsupported_composite_3.tflite
|
||||
third_party/litert/src/litert/test/testdata/unsupported_composite_4.tflite
|
||||
third_party/litert/src/litert/test/testdata/v_einsum.tflite
|
||||
third_party/litert/src/tensor/examples/segmentation/image.jpeg
|
||||
third_party/litert/src/tensor/examples/segmentation/selfie_multiclass_256x256.tflite
|
||||
@@ -11891,30 +12041,6 @@ third_party/litert/src/tflite/delegates/xnnpack/odml_sdpa_composite_gqa.tflite.b
|
||||
third_party/litert/src/tflite/delegates/xnnpack/odml_sdpa_composite_mha.tflite.bin
|
||||
third_party/litert/src/tflite/delegates/xnnpack/odml_sdpa_composite_mqa.tflite.bin
|
||||
third_party/litert/src/tflite/experimental/acceleration/compatibility/gpu_compatibility.bin
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/chair_224_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/city_224_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/early_color_photo_face_128_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/early_color_photo_faces_320_320_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/face_in_painting_128_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/face_in_snow_128_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/faces_in_painting_320_320_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/faces_in_snow_320_320_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/flowers_192_192_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/food_224_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/person_192_192_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/plant_224_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/rural_192_192_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/shoe_224_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/single_face_128_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/single_face_320_320_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/snowman_128_224_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/snowman_320_320_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/street_192_192_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/data/toys_192_192_3.jpeg
|
||||
third_party/litert/src/tflite/experimental/acceleration/mini_benchmark/models/blazeface_mlkit_v1.tfl
|
||||
third_party/litert/src/tflite/ios/testdata/extended_filename/input.a
|
||||
third_party/litert/src/tflite/java/demo/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/litert/src/tflite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar
|
||||
third_party/litert/src/tflite/java/src/testdata/add.bin
|
||||
third_party/litert/src/tflite/java/src/testdata/add_unknown_dimensions.bin
|
||||
third_party/litert/src/tflite/java/src/testdata/float32.bin
|
||||
@@ -11976,8 +12102,8 @@ third_party/litert/src/tflite/testdata/unidirectional_sequence_lstm.bin
|
||||
third_party/litert/src/tflite/testdata/while_op_with_forwarding_input.bin
|
||||
third_party/litert/src/tflite/testdata/with_metadata.bin
|
||||
third_party/litert/src/tflite/testdata/zero_size_constant.bin
|
||||
third_party/litert/src/tflite/toco/logging/testdata/toco_log_after.pb
|
||||
third_party/litert/src/tflite/toco/logging/testdata/toco_log_before.pb
|
||||
third_party/llvm-libc/src/test/src/math/exhaustive/cos.bin
|
||||
third_party/llvm-libc/src/test/src/math/exhaustive/sin.bin
|
||||
third_party/lzma_sdk/google/fuzzer_corpus/compressed_exe.7z
|
||||
third_party/lzma_sdk/google/fuzzer_corpus/file_folder_file.7z
|
||||
third_party/lzma_sdk/google/test_data/archive_named_folder.7z
|
||||
@@ -12337,13 +12463,26 @@ third_party/rust/chromium_crates_io/vendor/fdeflate-v0_3/tests/input-chunking-se
|
||||
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
|
||||
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_6/tests/testdata/5_frames_numbered_jxli.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_6/tests/testdata/fuzzer_smallbuffer_overflow.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_6/tests/testdata/ooo_jxlp_with_trailing_bytes.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_6/tests/testdata/zero_length_skippable_box.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/5_frames_numbered_jxli.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/context_map_num_histograms_overflow.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/exif.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/exif_brob.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/exif_brob_trailing_finite.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/exif_brob_trailing_infinite.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/exif_trailing_finite.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/exif_trailing_infinite.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/fuzzer_smallbuffer_overflow.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/incomplete_ooo_jxlp.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/modular_palette_empty_meta_channel.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/modular_rle_fast_path.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/modular_rle_fast_path_without_lz77.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/multiple_aux.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/patches_ec_upsampling_dim_shift.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/truncated_squeeze_flush_missing_tiles.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/vardct_grayscale_unused_channel.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/jxl-v0_7/tests/testdata/zero_length_skippable_box.jxl
|
||||
third_party/rust/chromium_crates_io/vendor/resb-v0_1/examples/data/zoneinfo64.res
|
||||
third_party/rust/chromium_crates_io/vendor/unicode-ident-v1/tests/fst/xid_continue.fst
|
||||
third_party/rust/chromium_crates_io/vendor/unicode-ident-v1/tests/fst/xid_start.fst
|
||||
@@ -12410,6 +12549,7 @@ third_party/skia/resources/icc_profiles/fuzz/zero_a.icc
|
||||
third_party/skia/resources/icc_profiles/fuzz/zero_g.icc
|
||||
third_party/skia/resources/icc_profiles/misc/AdobeColorSpin.icc
|
||||
third_party/skia/resources/icc_profiles/misc/AdobeRGB.icc
|
||||
third_party/skia/resources/icc_profiles/misc/AppleHagc.icc
|
||||
third_party/skia/resources/icc_profiles/misc/Apple_Color_LCD.icc
|
||||
third_party/skia/resources/icc_profiles/misc/Apple_Wide_Color.icc
|
||||
third_party/skia/resources/icc_profiles/misc/Apple_pq_hagc_hdgm2.icc
|
||||
|
||||
+13
-13
@@ -18,7 +18,7 @@
|
||||
+call python3 "%~dp0gclient.py" %*
|
||||
--- a/gclient.py
|
||||
+++ b/gclient.py
|
||||
@@ -124,8 +124,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
|
||||
@@ -125,8 +125,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
|
||||
# one, e.g. if a spec explicitly says `cache_dir = None`.)
|
||||
UNSET_CACHE_DIR = object()
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
PREVIOUS_SYNC_COMMITS = "GCLIENT_PREVIOUS_SYNC_COMMITS"
|
||||
|
||||
@@ -445,6 +445,7 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -457,6 +457,7 @@ class Dependency(gclient_utils.WorkItem,
|
||||
git_dependencies_state=gclient_eval.DEPS,
|
||||
print_outbuf=False,
|
||||
):
|
||||
@@ -37,7 +37,7 @@
|
||||
gclient_utils.WorkItem.__init__(self, name)
|
||||
DependencySettings.__init__(
|
||||
self,
|
||||
@@ -849,6 +850,7 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -861,6 +862,7 @@ class Dependency(gclient_utils.WorkItem,
|
||||
|
||||
condition = dep_value.get("condition")
|
||||
dep_type = dep_value.get("dep_type")
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
if not self._get_option("process_all_deps", False):
|
||||
should_process = should_process and _should_process(condition)
|
||||
@@ -908,6 +910,12 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -920,6 +922,12 @@ class Dependency(gclient_utils.WorkItem,
|
||||
merged_condition
|
||||
)
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
gcs_deps.append(
|
||||
GcsDependency(
|
||||
parent=self,
|
||||
@@ -1039,6 +1047,8 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -1051,6 +1059,8 @@ class Dependency(gclient_utils.WorkItem,
|
||||
|
||||
self._gn_args_from = local_scope.get("gclient_gn_args_from")
|
||||
self._gn_args_file = local_scope.get("gclient_gn_args_file")
|
||||
@@ -67,7 +67,7 @@
|
||||
self._gn_args = local_scope.get("gclient_gn_args", [])
|
||||
# It doesn't make sense to set all of these, since setting gn_args_from
|
||||
# to another DEPS will make gclient ignore any other local gn_args*
|
||||
@@ -4579,6 +4589,7 @@ def CMDsync(parser, args):
|
||||
@@ -4666,6 +4676,7 @@ def CMDsync(parser, args):
|
||||
default=[],
|
||||
help="Specify to skip processing of a certain type of dep.",
|
||||
)
|
||||
@@ -85,9 +85,9 @@
|
||||
import errno
|
||||
import glob
|
||||
import json
|
||||
@@ -27,6 +26,15 @@ import git_common
|
||||
import scm
|
||||
@@ -28,6 +27,15 @@ import scm
|
||||
import subprocess2
|
||||
import trace_utils
|
||||
|
||||
+try:
|
||||
+ from enum import StrEnum
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
class NoUsableRevError(gclient_utils.Error):
|
||||
"""Raised if requested revision isn't found in checkout."""
|
||||
@@ -270,7 +278,7 @@ def _canonical_git_repo(url):
|
||||
@@ -271,7 +279,7 @@ def _canonical_git_repo(url):
|
||||
)
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
"""How checkouts relate to the git cache when cache_dir is set."""
|
||||
|
||||
# clone --shared, fetch URL stays on the mirror; the checkout only works
|
||||
@@ -1186,9 +1194,7 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -1194,9 +1202,7 @@ class GitWrapper(SCMWrapper):
|
||||
self._SetFetchConfig(options)
|
||||
|
||||
# Fetch upstream if we don't already have |revision|.
|
||||
@@ -121,7 +121,7 @@
|
||||
self._Fetch(options, prune=options.force)
|
||||
|
||||
if not scm.GIT.IsValidRevision(
|
||||
@@ -1205,7 +1211,7 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -1213,7 +1219,7 @@ class GitWrapper(SCMWrapper):
|
||||
|
||||
# This is a big hammer, debatable if it should even be here...
|
||||
if options.force or options.reset:
|
||||
@@ -130,7 +130,7 @@
|
||||
if options.upstream and upstream_branch:
|
||||
target = upstream_branch
|
||||
self._Scrub(target, options)
|
||||
@@ -1220,7 +1226,6 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -1228,7 +1234,6 @@ class GitWrapper(SCMWrapper):
|
||||
# to the checkout step.
|
||||
if not (options.force or options.reset):
|
||||
self._CheckClean(revision)
|
||||
@@ -138,7 +138,7 @@
|
||||
|
||||
if not current_revision:
|
||||
current_revision = self._Capture(
|
||||
@@ -2051,8 +2056,7 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -2068,8 +2073,7 @@ class GitWrapper(SCMWrapper):
|
||||
fetch_cmd.append("--no-tags")
|
||||
elif quiet:
|
||||
fetch_cmd.append("--quiet")
|
||||
|
||||
@@ -56,6 +56,7 @@ CONTINGENT_PATHS = (
|
||||
# GCS sources
|
||||
'buildtools/linux64-format/',
|
||||
'third_party/blink/renderer/core/css/perftest_data/',
|
||||
'third_party/chromium-bidi/node_modules/',
|
||||
'third_party/js_code_coverage/',
|
||||
'third_party/llvm-libclang/',
|
||||
'third_party/openscreen/src/buildtools/linux64-format/',
|
||||
|
||||
Reference in new issue
Block a user