0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Patches for v109

Browse source 
Build fixes

Use helper macros to define base::Features
This commit is contained in:
csagan5 2023-01-27 10:25:10 +01:00
parent 6f40f8341a
commit 791bedf061
156 changed files with 3941 additions and 14560 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/LASTCHANGE
View file

@ -1 +1 @@
56775bdf8d12f9d3e1a99fcf1dde6a7417522963- cec76421893e88a89e38c0ab1356c84317b69067-

2
build/RELEASE
View file

@ -1 +1 @@
108.0.5359.156 109.0.5414.127

2
build/RELEASE_COMMIT
View file

@ -1 +1 @@
1b133d62395a6ad11c65997a1c24acffb3f73d9e 45d9f715605c58955812062372d27717b58d2c8f

1
build/bromite.gn_args
View file

@ -1,6 +1,7 @@
android_channel="stable" android_channel="stable"
blink_symbol_level=1 blink_symbol_level=1
build_contextual_search=false build_contextual_search=false
build_with_internal_optimization_guide=false
build_with_tflite_lib=false build_with_tflite_lib=false
chrome_pgo_phase=0 chrome_pgo_phase=0
dcheck_always_on=false dcheck_always_on=false

2
build/bromite_patches_list.txt
View file

@ -197,8 +197,8 @@ Disable-add-to-home-screen-prompt.patch
Remove-HTTP-referrals-in-cross-origin-navigation.patch Remove-HTTP-referrals-in-cross-origin-navigation.patch
Enable-ECH-by-default.patch Enable-ECH-by-default.patch
Disable-StartSurface-feature.patch Disable-StartSurface-feature.patch
Clamp-time-resolution-in-requestAnimationFrame.patch
Enable-PermuteTLSExtensions-by-default.patch Enable-PermuteTLSExtensions-by-default.patch
Enable-third-party-storage-partitioning.patch Enable-third-party-storage-partitioning.patch
Restore-adaptive-button-in-top-toolbar-customization.patch Restore-adaptive-button-in-top-toolbar-customization.patch
build-include-machine_learning-only-with-tflite_lib.patch
Automated-domain-substitution.patch Automated-domain-substitution.patch

1
build/chromium.gn_args
View file

@ -1,6 +1,7 @@
android_channel="stable" android_channel="stable"
blink_symbol_level=1 blink_symbol_level=1
build_contextual_search=false build_contextual_search=false
build_with_internal_optimization_guide=false
build_with_tflite_lib=false build_with_tflite_lib=false
chrome_pgo_phase=0 chrome_pgo_phase=0
dcheck_always_on=false dcheck_always_on=false

1
build/chromium_patches_list.txt
View file

@ -8,3 +8,4 @@ Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
enable-ftrivial-auto-var-init-zero.patch enable-ftrivial-auto-var-init-zero.patch
Disable-feeds-support-by-default.patch Disable-feeds-support-by-default.patch
Chromium-package-name.patch Chromium-package-name.patch
build-include-machine_learning-only-with-tflite_lib.patch

8
build/patches/AImageReader-CFI-crash-mitigations.patch
View file

@ -84,7 +84,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -2501,9 +2501,9 @@ @@ -2515,9 +2515,9 @@
"expiry_milestone": 115 "expiry_milestone": 115
}, },
{ {
@ -231,7 +231,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc --- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc +++ b/media/base/media_switches.cc
@@ -750,6 +750,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment, @@ -758,6 +758,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,
// Allows automatically disabling hardware secure Content Decryption Module // Allows automatically disabling hardware secure Content Decryption Module
// (CDM) after failures or crashes to fallback to software secure CDMs. If this // (CDM) after failures or crashes to fallback to software secure CDMs. If this
// feature is disabled, the fallback will never happen and users could be stuck // feature is disabled, the fallback will never happen and users could be stuck
@ -246,11 +246,11 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
diff --git a/media/base/media_switches.h b/media/base/media_switches.h diff --git a/media/base/media_switches.h b/media/base/media_switches.h
--- a/media/base/media_switches.h --- a/media/base/media_switches.h
+++ b/media/base/media_switches.h +++ b/media/base/media_switches.h
@@ -232,6 +232,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); @@ -235,6 +235,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding);
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput); +MEDIA_EXPORT extern const base::Feature kAImageReaderVideoOutput;
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVp9kSVCHWDecoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVp9kSVCHWDecoding);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kWakeLockOptimisationHiddenMuted); MEDIA_EXPORT BASE_DECLARE_FEATURE(kWakeLockOptimisationHiddenMuted);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebContentsCaptureHiDpi); MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebContentsCaptureHiDpi);

32
build/patches/Add-AllowUserCertificates-flag.patch
View file

@ -12,10 +12,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/browser/flag_descriptions.h | 3 +++ chrome/browser/flag_descriptions.h | 3 +++
chrome/browser/flags/android/chrome_feature_list.cc | 5 +++++ chrome/browser/flags/android/chrome_feature_list.cc | 5 +++++
chrome/browser/flags/android/chrome_feature_list.h | 1 + chrome/browser/flags/android/chrome_feature_list.h | 1 +
.../chromium/chrome/browser/flags/CachedFeatureFlags.java | 1 +
.../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++ .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++
net/android/java/src/org/chromium/net/X509Util.java | 5 +++++ net/android/java/src/org/chromium/net/X509Util.java | 5 +++++
10 files changed, 31 insertions(+) 9 files changed, 30 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@ -28,7 +27,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.printing.PrintManagerDelegateImpl; import org.chromium.printing.PrintManagerDelegateImpl;
import org.chromium.printing.PrintingController; import org.chromium.printing.PrintingController;
import org.chromium.printing.PrintingControllerImpl; import org.chromium.printing.PrintingControllerImpl;
@@ -951,6 +952,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -961,6 +962,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
UpdateMenuItemHelper.getInstance().onStart(); UpdateMenuItemHelper.getInstance().onStart();
ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeActivitySessionTracker.getInstance().onStartWithNative();
ChromeCachedFlags.getInstance().cacheNativeFlags(); ChromeCachedFlags.getInstance().cacheNativeFlags();
@ -40,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
@@ -78,6 +78,7 @@ public class ChromeCachedFlags { @@ -77,6 +77,7 @@ public class ChromeCachedFlags {
add(ChromeFeatureList.sAndroidAuxiliarySearch); add(ChromeFeatureList.sAndroidAuxiliarySearch);
add(ChromeFeatureList.sAnonymousUpdateChecks); add(ChromeFeatureList.sAnonymousUpdateChecks);
add(ChromeFeatureList.sAppMenuMobileSiteOption); add(ChromeFeatureList.sAppMenuMobileSiteOption);
@ -51,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -8830,6 +8830,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -8936,6 +8936,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)}, FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)},
#endif // BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_WIN)
@ -93,15 +92,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { @@ -153,6 +153,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&feed::kFeedNoViewCache,
&feed::kFeedReplaceAll, &feed::kFeedReplaceAll,
&feed::kFeedShowSignInCommand,
&feed::kInterestFeedContentSuggestions, &feed::kInterestFeedContentSuggestions,
+ &kAllowUserCertificates, + &kAllowUserCertificates,
&feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
&feed::kInterestFeedV2, &feed::kInterestFeedV2,
&feed::kInterestFeedV2Autoplay, &feed::kInterestFeedV2Autoplay,
@@ -468,6 +469,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents, @@ -469,6 +470,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,
"AllowNewIncognitoTabIntents", "AllowNewIncognitoTabIntents",
base::FEATURE_ENABLED_BY_DEFAULT); base::FEATURE_ENABLED_BY_DEFAULT);
@ -123,21 +122,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
BASE_DECLARE_FEATURE(kAndroidScrollOptimizations); BASE_DECLARE_FEATURE(kAndroidScrollOptimizations);
BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification); BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);
BASE_DECLARE_FEATURE(kAssistantConsentModal); BASE_DECLARE_FEATURE(kAssistantConsentModal);
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
@@ -50,6 +50,7 @@ public class CachedFeatureFlags {
ImmutableMap.<String, Boolean>builder()
.put(ChromeFeatureList.ANONYMOUS_UPDATE_CHECKS, true)
.put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false)
+ .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false)
.put(ChromeFeatureList.BACK_GESTURE_REFACTOR, false)
.put(ChromeFeatureList.CCT_BRAND_TRANSPARENCY, false)
.put(ChromeFeatureList.CCT_INCOGNITO, true)
diff --git 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 diff --git 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
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- 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 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -193,6 +193,7 @@ public abstract class ChromeFeatureList { @@ -162,6 +162,7 @@ public abstract class ChromeFeatureList {
} }
/* Alphabetical: */ /* Alphabetical: */
@ -145,8 +133,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner"; public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner";
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 = public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
@@ -648,6 +649,8 @@ public abstract class ChromeFeatureList { @@ -612,6 +613,8 @@ public abstract class ChromeFeatureList {
public static final String FEED_REPLACE_ALL = "FeedReplaceAll"; "SkipServiceWorkerForInstallPromot";
/* Alphabetical: */ /* Alphabetical: */
+ public static final CachedFlag sAllowUserCertificates = + public static final CachedFlag sAllowUserCertificates =

2
build/patches/Add-English-only-search-engine.patch
View file

@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
--- a/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json
@@ -137,6 +137,27 @@ @@ -138,6 +138,27 @@
"id": 1 "id": 1
}, },

6
build/patches/Add-IsCleartextPermitted-flag.patch
View file

@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -9070,6 +9070,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -9171,6 +9171,10 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kRequestDesktopSiteExceptionsName, flag_descriptions::kRequestDesktopSiteExceptionsName,
flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid, flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid,
FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -1710,6 +1710,10 @@ const char kHttpsOnlyModeDescription[] = @@ -1651,6 +1651,10 @@ const char kHttpsOnlyModeDescription[] =
"Adds a setting under chrome://settings/security to opt-in to HTTPS-First " "Adds a setting under chrome://settings/security to opt-in to HTTPS-First "
"Mode."; "Mode.";
@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -960,6 +960,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; @@ -935,6 +935,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeName[];
extern const char kHttpsOnlyModeDescription[]; extern const char kHttpsOnlyModeDescription[];

12
build/patches/Add-a-proxy-configuration-page.patch
View file

@ -187,7 +187,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc
@@ -165,6 +165,8 @@ @@ -167,6 +167,8 @@
#include "rlz/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h"
#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/abseil-cpp/absl/types/optional.h"
@ -196,7 +196,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#if BUILDFLAG(ENABLE_BACKGROUND_MODE) #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
#include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/background/background_mode_manager.h"
#endif #endif
@@ -1013,6 +1015,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { @@ -1055,6 +1057,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
chrome::enterprise_util::RegisterLocalStatePrefs(registry); chrome::enterprise_util::RegisterLocalStatePrefs(registry);
component_updater::RegisterPrefs(registry); component_updater::RegisterPrefs(registry);
embedder_support::OriginTrialPrefs::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@ -641,7 +641,7 @@ new file mode 100644
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -285,6 +285,8 @@ static_library("ui") { @@ -287,6 +287,8 @@ static_library("ui") {
"webui/metrics_internals/metrics_internals_ui.h", "webui/metrics_internals/metrics_internals_ui.h",
"webui/net_export_ui.cc", "webui/net_export_ui.cc",
"webui/net_export_ui.h", "webui/net_export_ui.h",
@ -661,7 +661,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
#include "chrome/browser/ui/webui/predictors/predictors_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
#include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h" #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
#include "chrome/browser/ui/webui/signin_internals_ui.h" #include "chrome/browser/ui/webui/signin_internals_ui.h"
@@ -795,6 +796,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, @@ -801,6 +802,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<MetricsInternalsUI>; return &NewWebUI<MetricsInternalsUI>;
if (url.host_piece() == chrome::kChromeUINetExportHost) if (url.host_piece() == chrome::kChromeUINetExportHost)
return &NewWebUI<NetExportUI>; return &NewWebUI<NetExportUI>;
@ -1141,7 +1141,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
const char kChromeUIChromeURLsHost[] = "chrome-urls"; const char kChromeUIChromeURLsHost[] = "chrome-urls";
const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
const char kChromeUIComponentsHost[] = "components"; const char kChromeUIComponentsHost[] = "components";
@@ -439,6 +441,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { @@ -446,6 +448,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
kChromeUILockScreenNetworkHost, kChromeUILockScreenNetworkHost,
kChromeUILockScreenStartReauthHost, kChromeUILockScreenStartReauthHost,
kChromeUIMobileSetupHost, kChromeUIMobileSetupHost,
@ -1149,7 +1149,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
kChromeUIMultiDeviceSetupHost, kChromeUIMultiDeviceSetupHost,
kChromeUINetworkHost, kChromeUINetworkHost,
kChromeUINotificationTesterHost, kChromeUINotificationTesterHost,
@@ -704,6 +707,7 @@ const char* const kChromeHostURLs[] = { @@ -718,6 +721,7 @@ const char* const kChromeHostURLs[] = {
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_CHROMEOS_ASH) #if !BUILDFLAG(IS_CHROMEOS_ASH)
kChromeUIAppLauncherPageHost, kChromeUIAppLauncherPageHost,

120
build/patches/Add-an-always-incognito-mode.patch
View file

@ -93,7 +93,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
--- a/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni
@@ -652,6 +652,7 @@ chrome_java_resources = [ @@ -650,6 +650,7 @@ chrome_java_resources = [
"java/res/xml/main_preferences.xml", "java/res/xml/main_preferences.xml",
"java/res/xml/manage_sync_preferences.xml", "java/res/xml/manage_sync_preferences.xml",
"java/res/xml/phone_as_a_security_key_accessory_filter.xml", "java/res/xml/phone_as_a_security_key_accessory_filter.xml",
@ -112,7 +112,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
"java/src/org/chromium/chrome/browser/ActivityTabProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
"java/src/org/chromium/chrome/browser/ActivityUtils.java", "java/src/org/chromium/chrome/browser/ActivityUtils.java",
@@ -914,6 +915,7 @@ chrome_java_sources = [ @@ -907,6 +908,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@ -246,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.IntentHandler.TabOpenType;
import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout;
@@ -578,8 +579,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent @@ -579,8 +580,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
mTabModelOrchestrator.onNativeLibraryReady(getTabContentManager()); mTabModelOrchestrator.onNativeLibraryReady(getTabContentManager());
// For saving non-incognito tab closures for Recent Tabs. // For saving non-incognito tab closures for Recent Tabs.
@ -257,7 +257,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
if (TabUiFeatureUtilities.isTabletGridTabSwitcherEnabled(this)) { if (TabUiFeatureUtilities.isTabletGridTabSwitcherEnabled(this)) {
mTabModelSelector.addObserver(new TabModelSelectorObserver() { mTabModelSelector.addObserver(new TabModelSelectorObserver() {
@@ -1904,8 +1906,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent @@ -1918,8 +1920,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
Bundle savedInstanceState = getSavedInstanceState(); Bundle savedInstanceState = getSavedInstanceState();
// We determine the model as soon as possible so every systems get initialized coherently. // We determine the model as soon as possible so every systems get initialized coherently.
@ -280,7 +280,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent; import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides; import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
import org.chromium.chrome.browser.device.DeviceClassManager; import org.chromium.chrome.browser.device.DeviceClassManager;
@@ -1808,6 +1809,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -1839,6 +1840,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
throw new IllegalStateException( throw new IllegalStateException(
"Attempting to access TabCreator before initialization"); "Attempting to access TabCreator before initialization");
} }
@ -312,7 +312,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
/** /**
* Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
* items based on activity state. * items based on activity state.
@@ -560,6 +565,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate @@ -567,6 +572,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
} }
private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
@ -326,7 +326,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
// We have to iterate all menu items since same menu item ID may be associated with more // We have to iterate all menu items since same menu item ID may be associated with more
// than one menu items. // than one menu items.
boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU; boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU;
@@ -636,7 +648,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate @@ -641,7 +653,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
} }
if (item.getItemId() == R.id.recent_tabs_menu_id) { if (item.getItemId() == R.id.recent_tabs_menu_id) {
@ -343,7 +343,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
} }
if (item.getItemId() == R.id.menu_group_tabs) { if (item.getItemId() == R.id.menu_group_tabs) {
item.setVisible(isMenuGroupTabsVisible); item.setVisible(isMenuGroupTabsVisible);
@@ -876,7 +896,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate @@ -878,7 +898,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
// is not persisted when adding to the homescreen. // is not persisted when adding to the homescreen.
// * If creating shortcuts it not supported by the current home screen. // * If creating shortcuts it not supported by the current home screen.
return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme
@ -365,7 +365,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType; import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType;
@@ -364,6 +365,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { @@ -355,6 +356,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
boolean hasSaveImage = false; boolean hasSaveImage = false;
mShowEphemeralTabNewLabel = null; mShowEphemeralTabNewLabel = null;
@ -375,7 +375,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>(); List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>();
if (mParams.isAnchor()) { if (mParams.isAnchor()) {
@@ -382,6 +386,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { @@ -373,6 +377,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP)); linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));
} }
} }
@ -383,7 +383,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) { if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) {
linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB)); linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB));
} }
@@ -406,7 +411,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { @@ -397,7 +402,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
} }
} }
if (FirstRunStatus.getFirstRunFlowComplete()) { if (FirstRunStatus.getFirstRunFlowComplete()) {
@ -461,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
@@ -855,7 +858,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @@ -884,7 +887,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
@Override @Override
public boolean isIncognito() { public boolean isIncognito() {
@ -473,7 +473,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
@@ -34,6 +34,7 @@ import org.chromium.base.annotations.NativeMethods; @@ -33,6 +33,7 @@ import org.chromium.base.annotations.NativeMethods;
import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.metrics.RecordUserAction;
import org.chromium.chrome.R; import org.chromium.chrome.R;
@ -481,7 +481,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.IntentHandler;
import org.chromium.chrome.browser.app.download.home.DownloadActivity; import org.chromium.chrome.browser.app.download.home.DownloadActivity;
@@ -74,6 +75,10 @@ import org.chromium.url.GURL; @@ -73,6 +74,10 @@ import org.chromium.url.GURL;
import java.io.File; import java.io.File;
@ -492,7 +492,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
/** /**
* A class containing some utility static methods. * A class containing some utility static methods.
*/ */
@@ -318,7 +323,16 @@ public class DownloadUtils { @@ -317,7 +322,16 @@ public class DownloadUtils {
// Offline pages isn't supported in Incognito. This should be checked before calling // Offline pages isn't supported in Incognito. This should be checked before calling
// OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found
// for incognito profile. // for incognito profile.
@ -841,7 +841,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
@@ -254,6 +255,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity @@ -253,6 +254,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
if (fragment instanceof AdPersonalizationRemovedFragment) { if (fragment instanceof AdPersonalizationRemovedFragment) {
((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager()); ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager());
} }
@ -963,7 +963,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -122,6 +122,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto @@ -121,6 +121,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto
import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.DeviceFormFactor;
@ -972,7 +972,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
import org.chromium.ui.base.IntentRequestTracker; import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modaldialog.ModalDialogManager;
@@ -482,7 +484,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @@ -491,7 +493,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler(); mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler();
mEmptyBackgroundViewWrapper = mEmptyBackgroundViewWrapper =
new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(), new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(),
@ -995,7 +995,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
/** /**
* This class creates various kinds of new tabs and adds them to the right {@link TabModel}. * This class creates various kinds of new tabs and adds them to the right {@link TabModel}.
*/ */
@@ -312,7 +316,6 @@ public class ChromeTabCreator extends TabCreator { @@ -326,7 +330,6 @@ public class ChromeTabCreator extends TabCreator {
// TODO(crbug.com/1081924): Clean up the launches from SearchActivity/Chrome. // TODO(crbug.com/1081924): Clean up the launches from SearchActivity/Chrome.
public Tab launchUrlFromExternalApp( public Tab launchUrlFromExternalApp(
LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) { LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) {
@ -1052,7 +1052,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -38,6 +38,7 @@ import org.chromium.base.supplier.OneshotSupplier; @@ -37,6 +37,7 @@ import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.base.supplier.Supplier; import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider;
@ -1060,7 +1060,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.IntentHandler;
import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController; import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;
import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
@@ -523,7 +524,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve @@ -520,7 +521,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return ret; return ret;
} }
}, },
@ -1118,7 +1118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -4837,6 +4837,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -4870,6 +4870,10 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOfflinePagesLivePageSharingName, flag_descriptions::kOfflinePagesLivePageSharingName,
flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
@ -1228,9 +1228,9 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
#include "components/content_settings/core/browser/content_settings_pref_provider.h" #include "components/content_settings/core/browser/content_settings_pref_provider.h"
#include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/permissions/features.h" #include "components/permissions/features.h"
@@ -95,9 +96,23 @@ scoped_refptr<RefcountedKeyedService> @@ -112,9 +113,23 @@ scoped_refptr<RefcountedKeyedService>
if (profile->IsOffTheRecord() && !profile->IsGuestSession()) should_record_metrics && ash::ProfileHelper::IsUserProfile(profile);
GetForProfile(original_profile); #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+ bool always_incognito_enabled = false; + bool always_incognito_enabled = false;
+ bool force_save_site_settings = false; + bool force_save_site_settings = false;
@ -1250,10 +1250,10 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
- profile->IsOffTheRecord() || profile->IsGuestSession(), - profile->IsOffTheRecord() || profile->IsGuestSession(),
+ !force_save_site_settings && (profile->IsOffTheRecord() || profile->IsGuestSession()), + !force_save_site_settings && (profile->IsOffTheRecord() || profile->IsGuestSession()),
+ force_save_site_settings, + force_save_site_settings,
/*store_last_modified=*/true, /*store_last_modified=*/true, profile->ShouldRestoreOldSessionCookies(),
profile->ShouldRestoreOldSessionCookies())); should_record_metrics));
@@ -107,6 +122,9 @@ scoped_refptr<RefcountedKeyedService> @@ -124,6 +139,9 @@ scoped_refptr<RefcountedKeyedService>
HostContentSettingsMap::WEBUI_ALLOWLIST_PROVIDER, HostContentSettingsMap::WEBUI_ALLOWLIST_PROVIDER,
std::move(allowlist_provider)); std::move(allowlist_provider));
@ -1266,7 +1266,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -3907,6 +3907,12 @@ const char kOfflinePagesLivePageSharingDescription[] = @@ -3815,6 +3815,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
"Enables to share current loaded page as offline page by saving as MHTML " "Enables to share current loaded page as offline page by saving as MHTML "
"first."; "first.";
@ -1282,7 +1282,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -2227,6 +2227,9 @@ extern const char kNotificationPermissionRationaleDescription[]; @@ -2189,6 +2189,9 @@ extern const char kNotificationPermissionRationaleDescription[];
extern const char kOfflinePagesLivePageSharingName[]; extern const char kOfflinePagesLivePageSharingName[];
extern const char kOfflinePagesLivePageSharingDescription[]; extern const char kOfflinePagesLivePageSharingDescription[];
@ -1295,7 +1295,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -561,8 +561,8 @@ BASE_FEATURE(kCCTNewDownloadTab, @@ -562,8 +562,8 @@ BASE_FEATURE(kCCTNewDownloadTab,
BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kCCTIncognitoAvailableToThirdParty, BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
@ -1319,7 +1319,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
#else #else
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_finder.h"
@@ -459,6 +462,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { @@ -473,6 +476,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
history::HistoryService* HistoryTabHelper::GetHistoryService() { history::HistoryService* HistoryTabHelper::GetHistoryService() {
Profile* profile = Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext()); Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@ -1333,7 +1333,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
if (profile->IsOffTheRecord()) if (profile->IsOffTheRecord())
return nullptr; return nullptr;
@@ -466,6 +476,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { @@ -480,6 +490,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
profile, ServiceAccessType::IMPLICIT_ACCESS); profile, ServiceAccessType::IMPLICIT_ACCESS);
} }
@ -1357,10 +1357,10 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor
#include "content/public/browser/web_contents_user_data.h" #include "content/public/browser/web_contents_user_data.h"
+#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h" +#include "components/prefs/pref_service.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace history { namespace history {
struct HistoryAddPageArgs; @@ -52,6 +54,11 @@ class HistoryTabHelper
@@ -51,6 +53,11 @@ class HistoryTabHelper
force_eligible_tab_for_testing_ = force; force_eligible_tab_for_testing_ = force;
} }
@ -1372,7 +1372,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor
private: private:
explicit HistoryTabHelper(content::WebContents* web_contents); explicit HistoryTabHelper(content::WebContents* web_contents);
friend class content::WebContentsUserData<HistoryTabHelper>; friend class content::WebContentsUserData<HistoryTabHelper>;
@@ -83,9 +90,6 @@ class HistoryTabHelper @@ -84,9 +91,6 @@ class HistoryTabHelper
void OnLanguageDetermined( void OnLanguageDetermined(
const translate::LanguageDetectionDetails& details) override; const translate::LanguageDetectionDetails& details) override;
@ -1620,7 +1620,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc
@@ -229,6 +229,7 @@ @@ -230,6 +230,7 @@
#include "components/feed/core/shared_prefs/pref_names.h" #include "components/feed/core/shared_prefs/pref_names.h"
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
@ -1628,7 +1628,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
#include "chrome/browser/android/explore_sites/history_statistics_reporter.h" #include "chrome/browser/android/explore_sites/history_statistics_reporter.h"
#include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
@@ -1390,6 +1391,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -1437,6 +1438,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
variations::VariationsService::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry);
video_tutorials::RegisterPrefs(registry); video_tutorials::RegisterPrefs(registry);
@ -1637,8 +1637,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
+ /*default_value=*/false); + /*default_value=*/false);
+ HistoryTabHelper::RegisterProfilePrefs(registry); + HistoryTabHelper::RegisterProfilePrefs(registry);
#else // BUILDFLAG(IS_ANDROID) #else // BUILDFLAG(IS_ANDROID)
AppShortcutManager::RegisterProfilePrefs(registry);
browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
BrowserFeaturePromoSnoozeService::RegisterProfilePrefs(registry);
diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn
--- a/chrome/browser/ui/android/native_page/BUILD.gn --- a/chrome/browser/ui/android/native_page/BUILD.gn
+++ b/chrome/browser/ui/android/native_page/BUILD.gn +++ b/chrome/browser/ui/android/native_page/BUILD.gn
@ -1744,9 +1744,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
@@ -178,6 +178,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro @@ -178,6 +178,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
protected GURL mVisibleGurl = GURL.emptyGURL();
protected String mFormattedFullUrl; protected String mFormattedFullUrl;
protected String mUrlForDisplay; protected String mUrlForDisplay;
private boolean mOmniboxUpdatedConnectionSecurityIndicatorsEnabled;
+ private boolean mIsAlwaysIncognito; + private boolean mIsAlwaysIncognito;
/** /**
@ -1775,9 +1775,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
mOptimizationsEnabled = mOptimizationsEnabled =
- ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_SCROLL_OPTIMIZATIONS); - ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_SCROLL_OPTIMIZATIONS);
+ ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_SCROLL_OPTIMIZATIONS) && !mIsAlwaysIncognito; + ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_SCROLL_OPTIMIZATIONS) && !mIsAlwaysIncognito;
mOmniboxUpdatedConnectionSecurityIndicatorsEnabled = ChromeFeatureList.isEnabled(
ChromeFeatureList.OMNIBOX_UPDATED_CONNECTION_SECURITY_INDICATORS);
mLastUsedNonOTRProfile = Profile.getLastUsedRegularProfile(); mLastUsedNonOTRProfile = Profile.getLastUsedRegularProfile();
mNativeLocationBarModelAndroid = LocationBarModelJni.get().init(LocationBarModel.this);
diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn
--- a/chrome/browser/ui/messages/android/BUILD.gn --- a/chrome/browser/ui/messages/android/BUILD.gn
+++ b/chrome/browser/ui/messages/android/BUILD.gn +++ b/chrome/browser/ui/messages/android/BUILD.gn
@ -1824,7 +1824,7 @@ new file mode 100644
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc
@@ -3458,6 +3458,12 @@ const char kShowCaretBrowsingDialog[] = @@ -3451,6 +3451,12 @@ const char kShowCaretBrowsingDialog[] =
const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; const char kLacrosLaunchSwitch[] = "lacros_launch_switch";
#endif #endif
@ -1840,7 +1840,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h --- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h
@@ -1219,6 +1219,8 @@ extern const char kDiscountConsentShowInterestIn[]; @@ -1224,6 +1224,8 @@ extern const char kDiscountConsentShowInterestIn[];
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
extern const char kWebXRImmersiveArEnabled[]; extern const char kWebXRImmersiveArEnabled[];
@ -1849,7 +1849,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
#endif #endif
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
@@ -1256,6 +1258,10 @@ extern const char kPrivacyGuideViewed[]; @@ -1262,6 +1264,10 @@ extern const char kPrivacyGuideViewed[];
extern const char kCorsNonWildcardRequestHeadersSupport[]; extern const char kCorsNonWildcardRequestHeadersSupport[];
@ -1909,15 +1909,15 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
--- a/components/content_settings/core/browser/host_content_settings_map.cc --- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -243,6 +243,7 @@ const char* ContentSettingToString(ContentSetting setting) { @@ -243,6 +243,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
HostContentSettingsMap::HostContentSettingsMap( bool is_off_the_record,
PrefService* prefs, bool store_last_modified,
bool is_off_the_record, bool restore_session,
+ bool force_save_site_settings, + bool force_save_site_settings,
bool store_last_modified, bool should_record_metrics)
bool restore_session)
: RefcountedKeyedService(base::ThreadTaskRunnerHandle::Get()), : RefcountedKeyedService(base::ThreadTaskRunnerHandle::Get()),
@@ -251,6 +252,7 @@ HostContentSettingsMap::HostContentSettingsMap( #ifndef NDEBUG
@@ -250,6 +251,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
#endif #endif
prefs_(prefs), prefs_(prefs),
is_off_the_record_(is_off_the_record), is_off_the_record_(is_off_the_record),
@ -1925,7 +1925,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
store_last_modified_(store_last_modified), store_last_modified_(store_last_modified),
allow_invalid_secondary_pattern_for_testing_(false) { allow_invalid_secondary_pattern_for_testing_(false) {
TRACE_EVENT0("startup", "HostContentSettingsMap::HostContentSettingsMap"); TRACE_EVENT0("startup", "HostContentSettingsMap::HostContentSettingsMap");
@@ -262,7 +264,7 @@ HostContentSettingsMap::HostContentSettingsMap( @@ -261,7 +263,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
policy_provider->AddObserver(this); policy_provider->AddObserver(this);
auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>( auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@ -1943,9 +1943,9 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
bool is_off_the_record, bool is_off_the_record,
+ bool force_save_site_settings, + bool force_save_site_settings,
bool store_last_modified, bool store_last_modified,
bool restore_session); bool restore_session,
bool should_record_metrics);
@@ -442,6 +443,8 @@ class HostContentSettingsMap : public content_settings::Observer, @@ -443,6 +444,8 @@ class HostContentSettingsMap : public content_settings::Observer,
// Whether this settings map is for an incognito or guest session. // Whether this settings map is for an incognito or guest session.
bool is_off_the_record_; bool is_off_the_record_;
@ -2003,7 +2003,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone
diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
--- a/components/omnibox/browser/base_search_provider.cc --- a/components/omnibox/browser/base_search_provider.cc
+++ b/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc
@@ -273,7 +273,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest( @@ -274,7 +274,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest(
} }
// Don't make a suggest request if in incognito mode. // Don't make a suggest request if in incognito mode.
@ -2015,7 +2015,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn
diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
--- a/components/omnibox/browser/search_provider.cc --- a/components/omnibox/browser/search_provider.cc
+++ b/components/omnibox/browser/search_provider.cc +++ b/components/omnibox/browser/search_provider.cc
@@ -832,7 +832,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const { @@ -822,7 +822,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const {
// keyword input to a keyword suggest server, if any.) // keyword input to a keyword suggest server, if any.)
const TemplateURL* default_url = providers_.GetDefaultProviderURL(); const TemplateURL* default_url = providers_.GetDefaultProviderURL();
const TemplateURL* keyword_url = providers_.GetKeywordProviderURL(); const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();
@ -2035,7 +2035,7 @@ diff --git a/weblayer/browser/host_content_settings_map_factory.cc b/weblayer/br
user_prefs::UserPrefs::Get(context), context->IsOffTheRecord(), user_prefs::UserPrefs::Get(context), context->IsOffTheRecord(),
+ /*force_save_site_settings*/false, + /*force_save_site_settings*/false,
/*store_last_modified=*/true, /*store_last_modified=*/true,
/*restore_session=*/false); /*restore_session=*/false,
/*should_record_metrics=*/!context->IsOffTheRecord());
-- --
2.25.1 2.25.1

94
build/patches/Add-bookmark-import-export-actions.patch
View file

@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
} }
SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate(); SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
@@ -135,6 +141,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId> @@ -149,6 +155,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
void showLoadingUi() { void showLoadingUi() {
setTitle(null); setTitle(null);
setNavigationButton(NAVIGATION_BUTTON_NONE); setNavigationButton(NAVIGATION_BUTTON_NONE);
@ -207,7 +207,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.search_menu_id).setVisible(false);
getMenu().findItem(R.id.edit_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false);
} }
@@ -144,6 +152,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId> @@ -158,6 +166,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
super.showNormalView(); super.showNormalView();
if (mDelegate == null) { if (mDelegate == null) {
@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.search_menu_id).setVisible(false);
getMenu().findItem(R.id.edit_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false);
} }
@@ -173,6 +183,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId> @@ -187,6 +197,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
@Override @Override
public void onFolderStateSet(BookmarkId folder) { public void onFolderStateSet(BookmarkId folder) {
mCurrentFolder = mDelegate.getModel().getBookmarkById(folder); mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
@ -249,7 +249,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair; import android.util.Pair;
@@ -42,6 +55,32 @@ import java.util.HashMap; @@ -40,6 +53,32 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/** /**
* Provides the communication channel for Android to fetch and manipulate the * Provides the communication channel for Android to fetch and manipulate the
* bookmark model stored in native. * bookmark model stored in native.
@@ -442,6 +481,209 @@ class BookmarkBridge { @@ -405,6 +444,209 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType()); mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType());
} }
@ -492,7 +492,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/** /**
* Synchronously gets a list of bookmarks that match the specified search query. * Synchronously gets a list of bookmarks that match the specified search query.
* @param query Keyword used for searching bookmarks. * @param query Keyword used for searching bookmarks.
@@ -990,6 +1232,39 @@ class BookmarkBridge { @@ -869,6 +1111,39 @@ class BookmarkBridge {
depthList.add(depth); depthList.add(depth);
} }
@ -532,7 +532,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) { private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>(); List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
for (int i = 0; i < left.length; i++) { for (int i = 0; i < left.length; i++) {
@@ -1061,6 +1336,9 @@ class BookmarkBridge { @@ -901,6 +1176,9 @@ class BookmarkBridge {
int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type); int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type);
void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type, void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type,
List<BookmarkId> bookmarksList); List<BookmarkId> bookmarksList);
@ -704,7 +704,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -1887,6 +1887,13 @@ static_library("browser") { @@ -1877,6 +1877,13 @@ static_library("browser") {
] ]
} }
@ -718,16 +718,16 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
configs += [ configs += [
"//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wexit_time_destructors",
"//build/config:precompiled_headers", "//build/config:precompiled_headers",
@@ -2904,6 +2911,8 @@ static_library("browser") { @@ -2894,6 +2901,8 @@ static_library("browser") {
"autofill/manual_filling_controller.h", "content_creation/reactions/internal/reaction_service_factory.h",
"autofill/manual_filling_controller_impl.cc", "content_settings/request_desktop_site_web_contents_observer_android.cc",
"autofill/manual_filling_controller_impl.h", "content_settings/request_desktop_site_web_contents_observer_android.h",
+ "bookmarks/bookmark_html_writer.cc", + "bookmarks/bookmark_html_writer.cc",
+ "bookmarks/bookmark_html_writer.h", + "bookmarks/bookmark_html_writer.h",
"autofill/manual_filling_utils.cc", "crash_upload_list/crash_upload_list_android.cc",
"autofill/manual_filling_utils.h", "crash_upload_list/crash_upload_list_android.h",
"autofill/manual_filling_view_interface.h", "creator/android/creator_api_bridge.cc",
@@ -3583,8 +3592,6 @@ static_library("browser") { @@ -3551,8 +3560,6 @@ static_library("browser") {
"badging/badge_manager_factory.h", "badging/badge_manager_factory.h",
"banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.cc",
"banners/app_banner_manager_desktop.h", "banners/app_banner_manager_desktop.h",
@ -739,7 +739,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -9039,6 +9039,12 @@ const FeatureEntry kFeatureEntries[] = { @@ -9140,6 +9140,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
#endif #endif
@ -755,7 +755,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
--- a/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -60,6 +60,25 @@ @@ -55,6 +55,25 @@
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
@ -781,7 +781,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
using base::android::AttachCurrentThread; using base::android::AttachCurrentThread;
using base::android::ConvertUTF16ToJavaString; using base::android::ConvertUTF16ToJavaString;
using base::android::ConvertUTF8ToJavaString; using base::android::ConvertUTF8ToJavaString;
@@ -77,8 +96,92 @@ using bookmarks::android::JavaBookmarkIdGetType; @@ -72,8 +91,92 @@ using bookmarks::android::JavaBookmarkIdGetType;
using content::BrowserThread; using content::BrowserThread;
using power_bookmarks::PowerBookmarkMeta; using power_bookmarks::PowerBookmarkMeta;
@ -874,7 +874,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
class BookmarkTitleComparer { class BookmarkTitleComparer {
public: public:
explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge, explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge,
@@ -164,6 +267,10 @@ BookmarkBridge::~BookmarkBridge() { @@ -158,6 +261,10 @@ BookmarkBridge::~BookmarkBridge() {
if (partner_bookmarks_shim_) if (partner_bookmarks_shim_)
partner_bookmarks_shim_->RemoveObserver(this); partner_bookmarks_shim_->RemoveObserver(this);
reading_list_manager_->RemoveObserver(this); reading_list_manager_->RemoveObserver(this);
@ -885,7 +885,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
} }
void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) { void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
@@ -574,6 +681,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( @@ -568,6 +675,182 @@ jint BookmarkBridge::GetTotalBookmarkCount(
return count; return count;
} }
@ -1079,7 +1079,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_observer.h" #include "chrome/browser/profiles/profile_observer.h"
#include "chrome/browser/reading_list/android/reading_list_manager.h" #include "chrome/browser/reading_list/android/reading_list_manager.h"
@@ -27,6 +28,9 @@ @@ -26,6 +27,9 @@
#include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_change_registrar.h"
#include "url/android/gurl_android.h" #include "url/android/gurl_android.h"
@ -1089,7 +1089,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
namespace bookmarks { namespace bookmarks {
class BookmarkModel; class BookmarkModel;
class ManagedBookmarkService; class ManagedBookmarkService;
@@ -42,7 +46,8 @@ class Profile; @@ -40,7 +44,8 @@ class Profile;
class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
public PartnerBookmarksShim::Observer, public PartnerBookmarksShim::Observer,
public ReadingListManager::Observer, public ReadingListManager::Observer,
@ -1099,7 +1099,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
public: public:
BookmarkBridge(JNIEnv* env, BookmarkBridge(JNIEnv* env,
const base::android::JavaRef<jobject>& obj, const base::android::JavaRef<jobject>& obj,
@@ -62,6 +67,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, @@ -60,6 +65,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
bool IsDoingExtensiveChanges(JNIEnv* env, bool IsDoingExtensiveChanges(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj); const base::android::JavaParamRef<jobject>& obj);
@ -1112,7 +1112,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
jboolean IsEditBookmarksEnabled(JNIEnv* env); jboolean IsEditBookmarksEnabled(JNIEnv* env);
void LoadEmptyPartnerBookmarkShimForTesting( void LoadEmptyPartnerBookmarkShimForTesting(
@@ -159,6 +170,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, @@ -157,6 +168,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
jlong id, jlong id,
jint type); jint type);
@ -1128,7 +1128,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
void SetBookmarkTitle(JNIEnv* env, void SetBookmarkTitle(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj, const base::android::JavaParamRef<jobject>& obj,
jlong id, jlong id,
@@ -372,12 +392,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, @@ -348,12 +368,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
void DestroyJavaObject(); void DestroyJavaObject();
raw_ptr<Profile> profile_; raw_ptr<Profile> profile_;
@ -1145,7 +1145,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
// Information about the Partner bookmarks (must check for IsLoaded()). // Information about the Partner bookmarks (must check for IsLoaded()).
// This is owned by profile. // This is owned by profile.
@@ -389,6 +413,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, @@ -365,6 +389,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
// Observes the profile destruction and creation. // Observes the profile destruction and creation.
base::ScopedObservation<Profile, ProfileObserver> profile_observation_{this}; base::ScopedObservation<Profile, ProfileObserver> profile_observation_{this};
@ -1153,9 +1153,9 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
+ void FileSelectedImplOnUIThread(const base::FilePath& path, + void FileSelectedImplOnUIThread(const base::FilePath& path,
+ const std::string& contents); + const std::string& contents);
+ +
// A means of accessing metadata about bookmarks. // Weak pointers for creating callbacks that won't call into a destroyed
raw_ptr<OptimizationGuideKeyedService> opt_guide_; // object.
base::WeakPtrFactory<BookmarkBridge> weak_ptr_factory_;
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc --- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@ -1251,7 +1251,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -6836,6 +6836,11 @@ const char kVcControlsUiDescription[] = @@ -6643,6 +6643,11 @@ const char kVcControlsUiDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -1266,7 +1266,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -3942,6 +3942,9 @@ extern const char kDisableLacrosTtsSupportDescription[]; @@ -3851,6 +3851,9 @@ extern const char kDisableLacrosTtsSupportDescription[];
extern const char kVcControlsUiName[]; extern const char kVcControlsUiName[];
extern const char kVcControlsUiDescription[]; extern const char kVcControlsUiDescription[];
@ -1279,7 +1279,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { @@ -186,6 +186,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kCastDeviceFilter, &kCastDeviceFilter,
&kClearOmniboxFocusAfterNavigation, &kClearOmniboxFocusAfterNavigation,
&kCloseTabSuggestions, &kCloseTabSuggestions,
@ -1287,7 +1287,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kCriticalPersistedTabData, &kCriticalPersistedTabData,
&kCommerceCoupons, &kCommerceCoupons,
&kCCTBackgroundTab, &kCCTBackgroundTab,
@@ -1114,6 +1115,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent, @@ -1107,6 +1108,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,
"WebApkTrampolineOnInitialIntent", "WebApkTrampolineOnInitialIntent",
base::FEATURE_ENABLED_BY_DEFAULT); base::FEATURE_ENABLED_BY_DEFAULT);
@ -1302,7 +1302,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -161,6 +161,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn); @@ -158,6 +158,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn);
BASE_DECLARE_FEATURE(kTabStripRedesign); BASE_DECLARE_FEATURE(kTabStripRedesign);
BASE_DECLARE_FEATURE(kTabSwitcherOnReturn); BASE_DECLARE_FEATURE(kTabSwitcherOnReturn);
BASE_DECLARE_FEATURE(kTabToGTSAnimation); BASE_DECLARE_FEATURE(kTabToGTSAnimation);
@ -1313,7 +1313,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
diff --git 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 diff --git 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
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- 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 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -620,6 +620,7 @@ public abstract class ChromeFeatureList { @@ -580,6 +580,7 @@ public abstract class ChromeFeatureList {
public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID = public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
"UseLibunwindstackNativeUnwinderAndroid"; "UseLibunwindstackNativeUnwinderAndroid";
public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy"; public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
@ -1391,7 +1391,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
/** /**
* Whether Chrome is set as the default browser. * Whether Chrome is set as the default browser.
@@ -1049,6 +1051,7 @@ public final class ChromePreferenceKeys { @@ -1037,6 +1039,7 @@ public final class ChromePreferenceKeys {
AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED, AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED,
APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@ -1601,10 +1601,10 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
boolean shouldUsePhotoPicker = shouldUsePhotoPicker(); boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
- if (shouldUsePhotoPicker) { - if (shouldUsePhotoPicker) {
+ if (shouldUsePhotoPicker || shouldShowHtmlTypes()) { + if (shouldUsePhotoPicker || shouldShowHtmlTypes()) {
if (BuildInfo.isAtLeastT()) { // The permission scenario for accessing media has evolved a bit over the years:
if (!window.hasPermission(PermissionConstants.READ_MEDIA_IMAGES) // Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was
&& shouldShowImageTypes()) { // later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and
@@ -325,7 +332,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick @@ -333,7 +340,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
} }
// TODO(finnur): Remove once we figure out the cause of crbug.com/950024. // TODO(finnur): Remove once we figure out the cause of crbug.com/950024.
@ -1613,7 +1613,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
if (permissions.length != requestPermissions.length) { if (permissions.length != requestPermissions.length) {
throw new RuntimeException( throw new RuntimeException(
String.format("Permissions arrays misaligned: %d != %d", String.format("Permissions arrays misaligned: %d != %d",
@@ -339,7 +346,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick @@ -347,7 +354,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
} }
} }
@ -1622,7 +1622,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
if (permissions[i].equals(storagePermission) if (permissions[i].equals(storagePermission)
|| permissions[i].equals(PermissionConstants.READ_MEDIA_IMAGES) || permissions[i].equals(PermissionConstants.READ_MEDIA_IMAGES)
|| permissions[i].equals( || permissions[i].equals(
@@ -544,6 +551,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick @@ -553,6 +560,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
} }
if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType); if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
} }
@ -1630,7 +1630,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
return mimeTypes; return mimeTypes;
} }
@@ -872,6 +880,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick @@ -881,6 +889,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
return countAcceptTypesFor(superType) == mFileTypes.size(); return countAcceptTypesFor(superType) == mFileTypes.size();
} }
@ -1644,9 +1644,9 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/strings/android_ui_strings.grd diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/strings/android_ui_strings.grd
--- a/ui/android/java/strings/android_ui_strings.grd --- a/ui/android/java/strings/android_ui_strings.grd
+++ b/ui/android/java/strings/android_ui_strings.grd +++ b/ui/android/java/strings/android_ui_strings.grd
@@ -181,6 +181,9 @@ @@ -184,6 +184,9 @@
<message name="IDS_OPENING_ANDROID_MEDIA_PICKER" desc="Toast when the browser is unable to open the Android Media picker (when uploading files). [CHAR_LIMIT=32]"> <message name="IDS_PERMISSION_DENIED_ERROR" desc="Toast when the browser is unable to open a file for upload due to missing permission. [CHAR_LIMIT=NONE]">
Unable to open the photo picker Unable to select media due to denied permissions
</message> </message>
+ <message name="IDS_SAVING_FILE_ERROR" desc="Toast when the browser is unable to save a file. [CHAR-LIMIT=32]"> + <message name="IDS_SAVING_FILE_ERROR" desc="Toast when the browser is unable to save a file. [CHAR-LIMIT=32]">
+ Failed to save selected file + Failed to save selected file

4
build/patches/Add-custom-tab-intents-privacy-option.patch
View file

@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
// Since configureIntentForResizableCustomTab() might change the componenet/class // Since configureIntentForResizableCustomTab() might change the componenet/class
// associated with the passed intent, it needs to be called after #setClassName(context, // associated with the passed intent, it needs to be called after #setClassName(context,
// CustomTabActivity.class.getName()); // CustomTabActivity.class.getName());
@@ -433,6 +443,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega @@ -438,6 +448,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
if (Intent.ACTION_VIEW.equals(newIntent.getAction()) if (Intent.ACTION_VIEW.equals(newIntent.getAction())
&& !IntentHandler.wasIntentSenderChrome(newIntent)) { && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@ -196,7 +196,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4788,6 +4788,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p @@ -4783,6 +4783,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_NEAR_OOM_REDUCTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can be reloaded."> <message name="IDS_NEAR_OOM_REDUCTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can be reloaded.">
Show original Show original
</message> </message>

8
build/patches/Add-exit-menu-item.patch
View file

@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
</group> </group>
<!-- Items shown only in the tab switcher --> <!-- Items shown only in the tab switcher -->
@@ -190,6 +193,9 @@ found in the LICENSE file. @@ -187,6 +190,9 @@ found in the LICENSE file.
<item android:id="@id/preferences_id" <item android:id="@id/preferences_id"
android:title="@string/menu_settings" android:title="@string/menu_settings"
android:icon="@drawable/settings_cog" /> android:icon="@drawable/settings_cog" />
@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -224,6 +224,8 @@ import java.util.HashSet; @@ -225,6 +225,8 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
/** /**
* This is the main activity for ChromeMobile when not running in document mode. All the tabs * This is the main activity for ChromeMobile when not running in document mode. All the tabs
* are accessible via a chrome specific tab switching UI. * are accessible via a chrome specific tab switching UI.
@@ -2188,6 +2190,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent @@ -2202,6 +2204,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
} else if (id == R.id.close_tab) { } else if (id == R.id.close_tab) {
getCurrentTabModel().closeTab(currentTab, true, false, true); getCurrentTabModel().closeTab(currentTab, true, false, true);
RecordUserAction.record("MobileTabClosed"); RecordUserAction.record("MobileTabClosed");
@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.ChromeActivitySessionTracker; import org.chromium.chrome.browser.ChromeActivitySessionTracker;
import org.chromium.chrome.browser.ChromeApplicationImpl; import org.chromium.chrome.browser.ChromeApplicationImpl;
import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate; import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
@@ -2292,6 +2293,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -2332,6 +2333,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return true; return true;
} }

8
build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
View file

@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -525,6 +525,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { @@ -539,6 +539,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
@ -40,7 +40,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = {
{"mode", "always-none"}}; {"mode", "always-none"}};
const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = { const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = {
@@ -4371,7 +4387,11 @@ const FeatureEntry kFeatureEntries[] = { @@ -4428,7 +4444,11 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsLinux | kOsWin, kOsMac | kOsLinux | kOsWin,
FEATURE_VALUE_TYPE(features::kSystemNotifications)}, FEATURE_VALUE_TYPE(features::kSystemNotifications)},
#endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH)
@ -65,7 +65,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
#include "base/feature_list.h" #include "base/feature_list.h"
#include "base/format_macros.h" #include "base/format_macros.h"
#include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_functions.h"
@@ -338,6 +340,15 @@ AutocompleteController::AutocompleteController( @@ -337,6 +339,15 @@ AutocompleteController::AutocompleteController(
is_cros_launcher_(is_cros_launcher), is_cros_launcher_(is_cros_launcher),
search_service_worker_signal_sent_(false), search_service_worker_signal_sent_(false),
template_url_service_(provider_client_->GetTemplateURLService()) { template_url_service_(provider_client_->GetTemplateURLService()) {
@ -105,7 +105,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
#include "base/feature_list.h" #include "base/feature_list.h"
#include "base/i18n/break_iterator.h" #include "base/i18n/break_iterator.h"
#include "base/i18n/case_conversion.h" #include "base/i18n/case_conversion.h"
@@ -677,6 +678,9 @@ void SearchProvider::Run(bool query_is_private) { @@ -671,6 +672,9 @@ void SearchProvider::Run(bool query_is_private) {
} }
void SearchProvider::DoHistoryQuery(bool minimal_changes) { void SearchProvider::DoHistoryQuery(bool minimal_changes) {

6
build/patches/Add-flag-for-save-data-header.patch
View file

@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -4981,7 +4981,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -5018,7 +5018,10 @@ const FeatureEntry kFeatureEntries[] = {
{"force-text-direction", flag_descriptions::kForceTextDirectionName, {"force-text-direction", flag_descriptions::kForceTextDirectionName,
flag_descriptions::kForceTextDirectionDescription, kOsAll, flag_descriptions::kForceTextDirectionDescription, kOsAll,
MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -1261,6 +1261,10 @@ const char kDeprecateAltBasedSixPackDescription[] = @@ -1222,6 +1222,10 @@ const char kDeprecateAltBasedSixPackDescription[] =
"Show deprecation notifications and disable functionality for Alt based " "Show deprecation notifications and disable functionality for Alt based "
"six pack deprecations. The Search based versions continue to work."; "six pack deprecations. The Search based versions continue to work.";
@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -662,6 +662,9 @@ extern const char kDeprecateAltClickDescription[]; @@ -650,6 +650,9 @@ extern const char kDeprecateAltClickDescription[];
extern const char kDeprecateAltBasedSixPackName[]; extern const char kDeprecateAltBasedSixPackName[];
extern const char kDeprecateAltBasedSixPackDescription[]; extern const char kDeprecateAltBasedSixPackDescription[];

8
build/patches/Add-flag-to-configure-maximum-connections-per-host.patch
View file

@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -1040,6 +1040,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { @@ -1097,6 +1097,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = {
switches::kForceDisplayColorProfile, "hdr10"}, switches::kForceDisplayColorProfile, "hdr10"},
}; };
@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
const FeatureEntry::Choice kMemlogModeChoices[] = { const FeatureEntry::Choice kMemlogModeChoices[] = {
{flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
{flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode, {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode,
@@ -4884,6 +4889,9 @@ const FeatureEntry kFeatureEntries[] = { @@ -4917,6 +4922,9 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kAndroidPictureInPictureAPIName, flag_descriptions::kAndroidPictureInPictureAPIName,
flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid, flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid,
FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)}, FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)},
@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -1875,6 +1875,10 @@ const char kUnthrottledNestedTimeoutDescription[] = @@ -1830,6 +1830,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
"websites abusing the API will still eventually have their setTimeouts " "websites abusing the API will still eventually have their setTimeouts "
"clamped."; "clamped.";
@ -60,7 +60,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -1050,6 +1050,9 @@ extern const char kLogJsConsoleMessagesDescription[]; @@ -1037,6 +1037,9 @@ extern const char kLogJsConsoleMessagesDescription[];
extern const char kUnthrottledNestedTimeoutName[]; extern const char kUnthrottledNestedTimeoutName[];
extern const char kUnthrottledNestedTimeoutDescription[]; extern const char kUnthrottledNestedTimeoutDescription[];

8
build/patches/Add-flag-to-control-video-playback-resume-feature.patch
View file

@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -3661,6 +3661,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -3730,6 +3730,10 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)},
#endif // ENABLE_EXTENSIONS #endif // ENABLE_EXTENSIONS
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -1363,6 +1363,11 @@ const char kEnablePenetratingImageSelectionDescription[] = @@ -1317,6 +1317,11 @@ const char kEnablePenetratingImageSelectionDescription[] =
"Enables image options to be surfaced in the context menu for nodes " "Enables image options to be surfaced in the context menu for nodes "
"covered by transparent overlays."; "covered by transparent overlays.";
@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -744,6 +744,9 @@ extern const char kEnablePortalsDescription[]; @@ -722,6 +722,9 @@ extern const char kEnablePortalsDescription[];
extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginName[];
extern const char kEnablePortalsCrossOriginDescription[]; extern const char kEnablePortalsCrossOriginDescription[];
@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc --- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc +++ b/media/base/media_switches.cc
@@ -302,12 +302,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad, @@ -316,12 +316,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad,
// Let videos be resumed via remote controls (for example, the notification) // Let videos be resumed via remote controls (for example, the notification)
// when in background. // when in background.
BASE_FEATURE(kResumeBackgroundVideo, BASE_FEATURE(kResumeBackgroundVideo,

8
build/patches/Add-flag-to-disable-IPv6-probes.patch
View file

@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -6036,6 +6036,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -6166,6 +6166,10 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName,
flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -3578,6 +3578,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] = @@ -3517,6 +3517,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] =
"Enables sending real-time engagement signals (e.g. scroll) through " "Enables sending real-time engagement signals (e.g. scroll) through "
"CustomTabsCallback."; "CustomTabsCallback.";
@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -807,6 +807,9 @@ extern const char kEnableWasmLazyCompilationName[]; @@ -788,6 +788,9 @@ extern const char kEnableWasmLazyCompilationName[];
extern const char kEnableWasmLazyCompilationDescription[]; extern const char kEnableWasmLazyCompilationDescription[];
extern const char kEnableWasmTieringName[]; extern const char kEnableWasmTieringName[];
@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
#include "net/log/net_log_with_source.h" #include "net/log/net_log_with_source.h"
#include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_factory.h"
#include "net/socket/datagram_client_socket.h" #include "net/socket/datagram_client_socket.h"
@@ -3727,8 +3728,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { @@ -3758,8 +3759,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
if (last_ipv6_probe_time_.is_null() || if (last_ipv6_probe_time_.is_null() ||
(tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) { kIPv6ProbePeriodMs) {

6
build/patches/Add-flag-to-disable-external-intent-requests.patch
View file

@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -3621,6 +3621,9 @@ const FeatureEntry kFeatureEntries[] = { @@ -3692,6 +3692,9 @@ const FeatureEntry kFeatureEntries[] = {
{"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
flag_descriptions::kUiPartialSwapDescription, kOsAll, flag_descriptions::kUiPartialSwapDescription, kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -3966,6 +3966,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; @@ -3874,6 +3874,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support";
const char kPhotoPickerVideoSupportDescription[] = const char kPhotoPickerVideoSupportDescription[] =
"Enables video files to be shown in the Photo Picker dialog"; "Enables video files to be shown in the Photo Picker dialog";
@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -2274,6 +2274,9 @@ extern const char kQueryTilesNTPDescription[]; @@ -2236,6 +2236,9 @@ extern const char kQueryTilesNTPDescription[];
extern const char kQueryTilesOnStartName[]; extern const char kQueryTilesOnStartName[];
extern const char kQueryTilesOnStartDescription[]; extern const char kQueryTilesOnStartDescription[];
extern const char kQueryTilesSingleTierName[]; extern const char kQueryTilesSingleTierName[];

18
build/patches/Add-flag-to-disable-vibration.patch
View file

@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -7467,6 +7467,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -7623,6 +7623,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
#endif #endif
@ -33,8 +33,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -6463,6 +6463,9 @@ extern const char kLacrosScreenCoordinatesDescription[]; @@ -6271,6 +6271,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] =
"moveBy, moveTo or session restore.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
+const char kEnableVibrationName[] = "Vibration"; +const char kEnableVibrationName[] = "Vibration";
@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -3938,6 +3938,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; @@ -3847,6 +3847,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
extern const char kWebUITabStripTabDragIntegrationDescription[]; extern const char kWebUITabStripTabDragIntegrationDescription[];
#endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
--- a/content/child/runtime_features.cc --- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc
@@ -101,6 +101,7 @@ void SetRuntimeFeatureDefaultsForPlatform( @@ -102,6 +102,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) if (command_line.HasSwitch(switches::kDisableMediaSessionAPI))
WebRuntimeFeatures::EnableMediaSession(false); WebRuntimeFeatures::EnableMediaSession(false);
@ -69,13 +69,13 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc --- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -130,6 +130,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls, @@ -131,6 +131,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls,
#endif #endif
); );
+// Enables vibration; an user gesture will still be required if enabled. +// Enables vibration; an user gesture will still be required if enabled.
+BASE_FEATURE(kVibration, +BASE_FEATURE(kVibration,
+ "Vibration", + "Vibration",
+ base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT);
+ +
// When this feature is enabled, private network requests initiated from // When this feature is enabled, private network requests initiated from
@ -88,7 +88,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co
kCompositorLockTimeout; kCompositorLockTimeout;
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
+CONTENT_EXPORT BASE_DECLARE_FEATURE(kVibration); +CONTENT_EXPORT extern const base::Feature kVibration;
+ +
#if BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_MAC)
@ -141,7 +141,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1827,6 +1827,10 @@ @@ -1903,6 +1903,10 @@
name: "OrientationEvent", name: "OrientationEvent",
status: {"Android": "stable"}, status: {"Android": "stable"},
}, },

54
build/patches/Add-lifetime-options-for-permissions.patch
View file

@ -181,8 +181,8 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -411,10 +411,7 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -415,10 +415,7 @@ void ChromeBrowserMainExtraPartsProfiles::
LacrosFirstRunServiceFactory::GetInstance(); FirstRunServiceFactory::GetInstance();
#endif #endif
LanguageModelManagerFactory::GetInstance(); LanguageModelManagerFactory::GetInstance();
- if (base::FeatureList::IsEnabled( - if (base::FeatureList::IsEnabled(
@ -190,13 +190,13 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
- LastTabStandingTrackerFactory::GetInstance(); - LastTabStandingTrackerFactory::GetInstance();
- } - }
+ LastTabStandingTrackerFactory::GetInstance(); + LastTabStandingTrackerFactory::GetInstance();
login_detection::LoginDetectionKeyedServiceFactory::GetInstance();
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
LoginUIServiceFactory::GetInstance(); captions::LiveCaptionControllerFactory::GetInstance();
if (base::FeatureList::IsEnabled(media::kLiveTranslate))
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc
@@ -491,6 +491,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { @@ -487,6 +487,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
PolicyAuditorBridge::CreateForWebContents(web_contents); PolicyAuditorBridge::CreateForWebContents(web_contents);
PluginObserverAndroid::CreateForWebContents(web_contents); PluginObserverAndroid::CreateForWebContents(web_contents);
video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents); video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents);
@ -270,7 +270,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
private void setUpClearDataPreference() { private void setUpClearDataPreference() {
ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA); ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA);
long usage = mSite.getTotalUsage(); long usage = mSite.getTotalUsage();
@@ -963,6 +969,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment @@ -970,6 +976,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
if (contentType == mHighlightedPermission) { if (contentType == mHighlightedPermission) {
switchPreference.setBackgroundColor(mHighlightColor); switchPreference.setBackgroundColor(mHighlightColor);
} }
@ -454,7 +454,7 @@ diff --git a/components/content_settings/core/common/content_settings_constraint
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
--- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
@@ -360,9 +360,9 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr @@ -344,9 +344,9 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr
*/ */
@CalledByNative @CalledByNative
private void addPermissionSection(String name, String nameMidSentence, int type, private void addPermissionSection(String name, String nameMidSentence, int type,
@ -543,7 +543,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
@@ -208,7 +213,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( @@ -208,7 +213,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title), env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title),
ConvertUTF16ToJavaString(env, object_title), ConvertUTF16ToJavaString(env, object_title),
static_cast<jint>(chosen_object->ui_info.content_settings_type), static_cast<jint>(chosen_object->ui_info->content_settings_type),
- static_cast<jint>(CONTENT_SETTING_ALLOW)); - static_cast<jint>(CONTENT_SETTING_ALLOW));
+ static_cast<jint>(CONTENT_SETTING_ALLOW), + static_cast<jint>(CONTENT_SETTING_ALLOW),
+ /* is_user_session */ false); + /* is_user_session */ false);
@ -565,7 +565,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
--- a/components/page_info/page_info.h --- a/components/page_info/page_info.h
+++ b/components/page_info/page_info.h +++ b/components/page_info/page_info.h
@@ -180,6 +180,7 @@ class PageInfo : private content_settings::CookieControlsView { @@ -181,6 +181,7 @@ class PageInfo : private content_settings::CookieControlsView {
content_settings::SettingSource source = content_settings::SettingSource source =
content_settings::SETTING_SOURCE_NONE; content_settings::SETTING_SOURCE_NONE;
bool is_one_time = false; bool is_one_time = false;
@ -829,7 +829,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co
diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc
--- a/components/permissions/contexts/geolocation_permission_context_android.cc --- a/components/permissions/contexts/geolocation_permission_context_android.cc
+++ b/components/permissions/contexts/geolocation_permission_context_android.cc +++ b/components/permissions/contexts/geolocation_permission_context_android.cc
@@ -153,6 +153,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( @@ -157,6 +157,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
ContentSetting content_setting, ContentSetting content_setting,
bool is_one_time) { bool is_one_time) {
DCHECK(!is_one_time); DCHECK(!is_one_time);
@ -849,7 +849,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
bool is_default_search = IsRequestingOriginDSE(requesting_origin); bool is_default_search = IsRequestingOriginDSE(requesting_origin);
if (content_setting == CONTENT_SETTING_ALLOW && if (content_setting == CONTENT_SETTING_ALLOW &&
!location_settings_->IsSystemLocationSettingEnabled()) { !location_settings_->IsSystemLocationSettingEnabled()) {
@@ -165,7 +178,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( @@ -169,7 +182,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
if (IsInLocationSettingsBackOff(is_default_search)) { if (IsInLocationSettingsBackOff(is_default_search)) {
FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, FinishNotifyPermissionSet(id, requesting_origin, embedding_origin,
std::move(callback), false /* persist */, std::move(callback), false /* persist */,
@ -859,7 +859,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
LogLocationSettingsMetric( LogLocationSettingsMetric(
kLocationSettingsSuppressMetricBase, is_default_search, kLocationSettingsSuppressMetricBase, is_default_search,
LocationSettingsBackOffLevel(is_default_search)); LocationSettingsBackOffLevel(is_default_search));
@@ -190,7 +204,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( @@ -193,7 +207,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
!location_settings_dialog_callback_.is_null()) { !location_settings_dialog_callback_.is_null()) {
FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, FinishNotifyPermissionSet(id, requesting_origin, embedding_origin,
std::move(callback), false /* persist */, std::move(callback), false /* persist */,
@ -869,7 +869,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
// This case should be very rare, so just pretend it was a denied prompt // This case should be very rare, so just pretend it was a denied prompt
// for metrics purposes. // for metrics purposes.
LogLocationSettingsMetric( LogLocationSettingsMetric(
@@ -207,12 +222,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( @@ -210,12 +225,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
base::BindOnce( base::BindOnce(
&GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown, &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown,
weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin, weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin,
@ -885,7 +885,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
} }
PermissionResult PermissionResult
@@ -379,6 +395,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( @@ -382,6 +398,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
const GURL& embedding_origin, const GURL& embedding_origin,
bool persist, bool persist,
ContentSetting content_setting, ContentSetting content_setting,
@ -893,7 +893,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
LocationSettingsDialogOutcome prompt_outcome) { LocationSettingsDialogOutcome prompt_outcome) {
bool is_default_search = IsRequestingOriginDSE(requesting_origin); bool is_default_search = IsRequestingOriginDSE(requesting_origin);
if (prompt_outcome == GRANTED) { if (prompt_outcome == GRANTED) {
@@ -402,7 +419,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( @@ -405,7 +422,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
FinishNotifyPermissionSet( FinishNotifyPermissionSet(
location_settings_dialog_request_id_, requesting_origin, embedding_origin, location_settings_dialog_request_id_, requesting_origin, embedding_origin,
@ -902,8 +902,8 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
+ is_one_time, lifetime_option); + is_one_time, lifetime_option);
location_settings_dialog_request_id_ = location_settings_dialog_request_id_ =
PermissionRequestID(0, 0, PermissionRequestID::RequestLocalId()); PermissionRequestID(content::GlobalRenderFrameHostId(0, 0),
@@ -414,10 +432,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( @@ -418,10 +436,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
const GURL& embedding_origin, const GURL& embedding_origin,
BrowserPermissionCallback callback, BrowserPermissionCallback callback,
bool persist, bool persist,
@ -1057,7 +1057,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h
--- a/components/permissions/permission_context_base.h --- a/components/permissions/permission_context_base.h
+++ b/components/permissions/permission_context_base.h +++ b/components/permissions/permission_context_base.h
@@ -139,6 +139,14 @@ class PermissionContextBase : public content_settings::Observer { @@ -138,6 +138,14 @@ class PermissionContextBase : public content_settings::Observer {
// Updates stored content setting if persist is set, updates tab indicators // Updates stored content setting if persist is set, updates tab indicators
// and runs the callback to finish the request. // and runs the callback to finish the request.
@ -1072,7 +1072,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
virtual void NotifyPermissionSet(const PermissionRequestID& id, virtual void NotifyPermissionSet(const PermissionRequestID& id,
const GURL& requesting_origin, const GURL& requesting_origin,
const GURL& embedding_origin, const GURL& embedding_origin,
@@ -159,6 +167,11 @@ class PermissionContextBase : public content_settings::Observer { @@ -158,6 +166,11 @@ class PermissionContextBase : public content_settings::Observer {
// Store the decided permission as a content setting. // Store the decided permission as a content setting.
// virtual since the permission might be stored with different restrictions // virtual since the permission might be stored with different restrictions
// (for example for desktop notifications). // (for example for desktop notifications).
@ -1084,7 +1084,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
virtual void UpdateContentSetting(const GURL& requesting_origin, virtual void UpdateContentSetting(const GURL& requesting_origin,
const GURL& embedding_origin, const GURL& embedding_origin,
ContentSetting content_setting, ContentSetting content_setting,
@@ -191,6 +204,14 @@ class PermissionContextBase : public content_settings::Observer { @@ -190,6 +203,14 @@ class PermissionContextBase : public content_settings::Observer {
PermissionRequest::PermissionDecidedCallback permission_decided_callback, PermissionRequest::PermissionDecidedCallback permission_decided_callback,
base::OnceClosure delete_callback) const; base::OnceClosure delete_callback) const;
@ -1099,7 +1099,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
ContentSettingsType content_settings_type() const { ContentSettingsType content_settings_type() const {
return content_settings_type_; return content_settings_type_;
} }
@@ -217,7 +238,8 @@ class PermissionContextBase : public content_settings::Observer { @@ -216,7 +237,8 @@ class PermissionContextBase : public content_settings::Observer {
const GURL& embedding_origin, const GURL& embedding_origin,
BrowserPermissionCallback callback, BrowserPermissionCallback callback,
ContentSetting content_setting, ContentSetting content_setting,
@ -1307,13 +1307,13 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
} }
NotifyRequestDecided(PermissionAction::DENIED); NotifyRequestDecided(PermissionAction::DENIED);
@@ -967,25 +978,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( @@ -971,25 +982,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
void PermissionRequestManager::PermissionGrantedIncludingDuplicates( void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
PermissionRequest* request, PermissionRequest* request,
- bool is_one_time) { - bool is_one_time) {
+ bool is_one_time, content_settings::LifetimeMode lifetime_option) { + bool is_one_time, content_settings::LifetimeMode lifetime_option) {
DCHECK_EQ(1ul, base::STLCount(requests_, request) + DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
pending_permission_requests_.Count(request)) pending_permission_requests_.Count(request))
<< "Only requests in [pending_permission_]requests_ can have duplicates"; << "Only requests in [pending_permission_]requests_ can have duplicates";
- request->PermissionGranted(is_one_time); - request->PermissionGranted(is_one_time);
@ -1327,7 +1327,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
void PermissionRequestManager::PermissionDeniedIncludingDuplicates( void PermissionRequestManager::PermissionDeniedIncludingDuplicates(
- PermissionRequest* request) { - PermissionRequest* request) {
+ PermissionRequest* request, bool is_one_time, content_settings::LifetimeMode lifetime_option) { + PermissionRequest* request, bool is_one_time, content_settings::LifetimeMode lifetime_option) {
DCHECK_EQ(1ul, base::STLCount(requests_, request) + DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
pending_permission_requests_.Count(request)) pending_permission_requests_.Count(request))
<< "Only requests in [pending_permission_]requests_ can have duplicates"; << "Only requests in [pending_permission_]requests_ can have duplicates";
- request->PermissionDenied(); - request->PermissionDenied();
@ -1339,7 +1339,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
} }
void PermissionRequestManager::CancelledIncludingDuplicates( void PermissionRequestManager::CancelledIncludingDuplicates(
@@ -1187,7 +1198,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { @@ -1215,7 +1226,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
void PermissionRequestManager::DoAutoResponseForTesting() { void PermissionRequestManager::DoAutoResponseForTesting() {
switch (auto_response_for_test_) { switch (auto_response_for_test_) {
case ACCEPT_ONCE: case ACCEPT_ONCE:
@ -1351,7 +1351,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
diff --git a/components/permissions/permission_request_manager.h b/components/permissions/permission_request_manager.h diff --git a/components/permissions/permission_request_manager.h b/components/permissions/permission_request_manager.h
--- a/components/permissions/permission_request_manager.h --- a/components/permissions/permission_request_manager.h
+++ b/components/permissions/permission_request_manager.h +++ b/components/permissions/permission_request_manager.h
@@ -141,8 +141,10 @@ class PermissionRequestManager @@ -155,8 +155,10 @@ class PermissionRequestManager
GURL GetRequestingOrigin() const override; GURL GetRequestingOrigin() const override;
GURL GetEmbeddingOrigin() const override; GURL GetEmbeddingOrigin() const override;
void Accept() override; void Accept() override;
@ -1363,7 +1363,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
void Dismiss() override; void Dismiss() override;
void Ignore() override; void Ignore() override;
bool WasCurrentRequestAlreadyDisplayed() override; bool WasCurrentRequestAlreadyDisplayed() override;
@@ -303,9 +305,12 @@ class PermissionRequestManager @@ -317,9 +319,12 @@ class PermissionRequestManager
// Calls PermissionGranted on a request and all its duplicates. // Calls PermissionGranted on a request and all its duplicates.
void PermissionGrantedIncludingDuplicates(PermissionRequest* request, void PermissionGrantedIncludingDuplicates(PermissionRequest* request,

44
build/patches/Add-menu-item-to-bookmark-all-tabs.patch
View file

@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
import org.chromium.chrome.browser.compositor.layouts.Layout; import org.chromium.chrome.browser.compositor.layouts.Layout;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
@@ -2203,6 +2204,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent @@ -2217,6 +2218,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(), CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
() -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false); () -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false);
RecordUserAction.record("MobileMenuCloseAllTabs"); RecordUserAction.record("MobileMenuCloseAllTabs");
@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
} else if (id == R.id.close_all_incognito_tabs_menu_id) { } else if (id == R.id.close_all_incognito_tabs_menu_id) {
// Close only incognito tabs // Close only incognito tabs
CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(), CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
@@ -2255,6 +2258,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent @@ -2269,6 +2272,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
mTabModalHandler.onOmniboxFocusChanged(hasFocus); mTabModalHandler.onOmniboxFocusChanged(hasFocus);
} }
@ -121,7 +121,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkId;
import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.bookmarks.BookmarkItem;
import org.chromium.components.bookmarks.BookmarkType; import org.chromium.components.bookmarks.BookmarkType;
@@ -86,6 +91,8 @@ import java.io.File; @@ -84,6 +89,8 @@ import java.io.File;
* bookmark model stored in native. * bookmark model stored in native.
*/ */
class BookmarkBridge { class BookmarkBridge {
@ -130,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private final Profile mProfile; private final Profile mProfile;
private boolean mIsDestroyed; private boolean mIsDestroyed;
private boolean mIsDoingExtensiveChanges; private boolean mIsDoingExtensiveChanges;
@@ -393,6 +400,16 @@ class BookmarkBridge { @@ -356,6 +363,16 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this); mNativeBookmarkBridge, BookmarkBridge.this);
} }
@ -147,7 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/** /**
* @return Id representing the special "other" folder from bookmark model. * @return Id representing the special "other" folder from bookmark model.
*/ */
@@ -1030,6 +1047,49 @@ class BookmarkBridge { @@ -957,6 +974,49 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this, title, url); mNativeBookmarkBridge, BookmarkBridge.this, title, url);
} }
@ -197,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/** /**
* @param url The URL of the reading list item. * @param url The URL of the reading list item.
* @return The reading list item with the URL, or null if no such reading list item. * @return The reading list item with the URL, or null if no such reading list item.
@@ -1327,6 +1387,7 @@ class BookmarkBridge { @@ -1167,6 +1227,7 @@ class BookmarkBridge {
void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller, void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,
List<BookmarkId> folderList, List<Integer> depthList); List<BookmarkId> folderList, List<Integer> depthList);
BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller); BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
--- a/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -437,6 +437,11 @@ void BookmarkBridge::GetTopLevelFolderIDs( @@ -431,6 +431,11 @@ void BookmarkBridge::GetTopLevelFolderIDs(
top_level_folders.push_back(node.get()); top_level_folders.push_back(node.get());
} }
@ -241,7 +241,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) { for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) {
if (node->is_folder()) if (node->is_folder())
top_level_folders.push_back(node.get()); top_level_folders.push_back(node.get());
@@ -484,6 +489,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( @@ -478,6 +483,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
// Vector to temporarily contain all child bookmarks at same level for sorting // Vector to temporarily contain all child bookmarks at same level for sorting
std::vector<const BookmarkNode*> bookmarks = { std::vector<const BookmarkNode*> bookmarks = {
bookmark_model_->mobile_node(), bookmark_model_->mobile_node(),
@ -249,7 +249,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
bookmark_model_->bookmark_bar_node(), bookmark_model_->bookmark_bar_node(),
bookmark_model_->other_node(), bookmark_model_->other_node(),
}; };
@@ -536,6 +542,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId( @@ -530,6 +536,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId(
return folder_id_obj; return folder_id_obj;
} }
@ -270,7 +270,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h
--- a/chrome/browser/bookmarks/android/bookmark_bridge.h --- a/chrome/browser/bookmarks/android/bookmark_bridge.h
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.h +++ b/chrome/browser/bookmarks/android/bookmark_bridge.h
@@ -121,6 +121,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, @@ -119,6 +119,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
JNIEnv* env, JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj); const base::android::JavaParamRef<jobject>& obj);
@ -349,9 +349,9 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3606,6 +3606,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p @@ -3603,6 +3603,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_TRACK_PRICES" desc="Menu item for tracking prices on tabs. [CHAR_LIMIT=27]"> <message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
Track prices Select tabs
</message> </message>
+ <message name="IDS_MENU_BOOKMARK_ALL_TABS" desc="Menu item to bookmark all tabs. [CHAR-LIMIT=27]"> + <message name="IDS_MENU_BOOKMARK_ALL_TABS" desc="Menu item to bookmark all tabs. [CHAR-LIMIT=27]">
+ Bookmark all tabs + Bookmark all tabs
@ -559,13 +559,13 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
TitledUrlIndex* index() { return index_.get(); } TitledUrlIndex* index() { return index_.get(); }
std::unique_ptr<TitledUrlIndex> owned_index() { return std::move(index_); } std::unique_ptr<TitledUrlIndex> owned_index() { return std::move(index_); }
@@ -110,6 +111,7 @@ class BookmarkLoadDetails { @@ -110,6 +111,7 @@ class BookmarkLoadDetails {
raw_ptr<BookmarkPermanentNode> bb_node_ = nullptr; raw_ptr<BookmarkPermanentNode, DanglingUntriaged> bb_node_ = nullptr;
raw_ptr<BookmarkPermanentNode> other_folder_node_ = nullptr; raw_ptr<BookmarkPermanentNode, DanglingUntriaged> other_folder_node_ =
raw_ptr<BookmarkPermanentNode> mobile_folder_node_ = nullptr; nullptr;
+ BookmarkPermanentNode* tabs_collection_folder_node_ = nullptr; + BookmarkPermanentNode* tabs_collection_folder_node_ = nullptr;
raw_ptr<BookmarkPermanentNode, DanglingUntriaged> mobile_folder_node_ =
nullptr;
LoadManagedNodeCallback load_managed_node_callback_; LoadManagedNodeCallback load_managed_node_callback_;
std::unique_ptr<TitledUrlIndex> index_;
BookmarkNode::MetaInfoMap model_meta_info_map_;
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
--- a/components/bookmarks/browser/bookmark_model.cc --- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc
@ -603,13 +603,13 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
return node == root_; return node == root_;
@@ -445,6 +451,7 @@ class BookmarkModel : public BookmarkUndoProvider, @@ -445,6 +451,7 @@ class BookmarkModel : public BookmarkUndoProvider,
raw_ptr<BookmarkPermanentNode> bookmark_bar_node_ = nullptr; raw_ptr<BookmarkPermanentNode, DanglingUntriaged> bookmark_bar_node_ =
raw_ptr<BookmarkPermanentNode> other_node_ = nullptr; nullptr;
raw_ptr<BookmarkPermanentNode> mobile_node_ = nullptr; raw_ptr<BookmarkPermanentNode, DanglingUntriaged> other_node_ = nullptr;
+ raw_ptr<BookmarkPermanentNode> tabs_collection_node_ = nullptr; + raw_ptr<BookmarkPermanentNode> tabs_collection_node_ = nullptr;
raw_ptr<BookmarkPermanentNode, DanglingUntriaged> mobile_node_ = nullptr;
// The maximum ID assigned to the bookmark nodes in the model. // The maximum ID assigned to the bookmark nodes in the model.
int64_t next_node_id_ = 1;
diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc
--- a/components/bookmarks/browser/bookmark_node.cc --- a/components/bookmarks/browser/bookmark_node.cc
+++ b/components/bookmarks/browser/bookmark_node.cc +++ b/components/bookmarks/browser/bookmark_node.cc

8
build/patches/Add-menu-item-to-view-source.patch
View file

@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -2229,6 +2229,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent @@ -2243,6 +2243,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER); NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
} }
RecordUserAction.record("MobileMenuDownloadManager"); RecordUserAction.record("MobileMenuDownloadManager");
@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -2445,6 +2445,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -2485,6 +2485,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return true; return true;
} }
@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
@@ -543,6 +543,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate @@ -550,6 +550,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
isChromeScheme, isFileScheme, isContentScheme, isIncognito, url)); isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme); updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
updateAutoDarkMenuItem(menu, currentTab, isChromeScheme); updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
@@ -1242,6 +1243,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate @@ -1244,6 +1245,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
stopPriceTrackingMenuItem.setVisible(false); stopPriceTrackingMenuItem.setVisible(false);
} }

12
build/patches/Add-option-to-force-tablet-UI.patch
View file

@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -430,6 +430,7 @@ public final class ChromePreferenceKeys { @@ -418,6 +418,7 @@ public final class ChromePreferenceKeys {
AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM; AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;
public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
@ -135,7 +135,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
disallowed_extension_deps_ = [ disallowed_extension_deps_ = [
# Components should largely not depend on //extensions. Since // extensions # Components should largely not depend on //extensions. Since // extensions
# is not a component target and is linked with //chrome, depending on most # is not a component target and is linked with //chrome, depending on most
@@ -671,7 +671,7 @@ test("components_unittests") { @@ -686,7 +686,7 @@ test("components_unittests") {
# On other platforms, no components should depend on Chrome. # On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on # Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds. # extensions targets for non-lacros builds.
@ -144,7 +144,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
assert_no_deps = [ "//chrome/*" ] assert_no_deps = [ "//chrome/*" ]
assert_no_deps += disallowed_extension_deps_ assert_no_deps += disallowed_extension_deps_
} }
@@ -950,7 +950,7 @@ if (!is_ios) { @@ -966,7 +966,7 @@ if (!is_ios) {
# dependency. On other platforms, no components should depend on Chrome. # dependency. On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on # Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds. # extensions targets for non-lacros builds.
@ -180,7 +180,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
private TextScalePreference mTextScalePref; private TextScalePreference mTextScalePref;
private PageZoomPreference mPageZoomDefaultZoomPref; private PageZoomPreference mPageZoomDefaultZoomPref;
private ChromeSwitchPreference mPageZoomAlwaysShowPref; private ChromeSwitchPreference mPageZoomAlwaysShowPref;
@@ -105,6 +107,12 @@ public class AccessibilitySettings @@ -106,6 +108,12 @@ public class AccessibilitySettings
getPreferenceScreen().removePreference(readerForAccessibilityPref); getPreferenceScreen().removePreference(readerForAccessibilityPref);
} }
@ -193,7 +193,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
ChromeBaseCheckBoxPreference accessibilityTabSwitcherPref = ChromeBaseCheckBoxPreference accessibilityTabSwitcherPref =
(ChromeBaseCheckBoxPreference) findPreference( (ChromeBaseCheckBoxPreference) findPreference(
AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER); AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER);
@@ -153,6 +161,8 @@ public class AccessibilitySettings @@ -162,6 +170,8 @@ public class AccessibilitySettings
mFontSizePrefs.setUserFontScaleFactor((Float) newValue); mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
} else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue); mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
@ -217,7 +217,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
--- a/ui/android/BUILD.gn --- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn
@@ -374,6 +374,8 @@ android_library("ui_no_recycler_view_java") { @@ -373,6 +373,8 @@ android_library("ui_no_recycler_view_java") {
deps = [ deps = [
":ui_java_resources", ":ui_java_resources",
":ui_utils_java", ":ui_utils_java",

2
build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
View file

@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4420,6 +4420,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p @@ -4415,6 +4415,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image."> <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
IMAGE IMAGE
</message> </message>

8
build/patches/Add-option-to-use-home-page-as-NTP.patch
View file

@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin; import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
import org.chromium.chrome.browser.ntp.NewTabPageUtils; import org.chromium.chrome.browser.ntp.NewTabPageUtils;
import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper; import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper;
@@ -297,6 +298,12 @@ public class ChromeTabCreator extends TabCreator { @@ -311,6 +312,12 @@ public class ChromeTabCreator extends TabCreator {
* @return the created tab. * @return the created tab.
*/ */
public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) { public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
@ -134,7 +134,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -441,6 +441,7 @@ public final class ChromePreferenceKeys { @@ -429,6 +429,7 @@ public final class ChromePreferenceKeys {
public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL = public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL =
"Chrome.Homepage.PartnerCustomizedDefaultGurl"; "Chrome.Homepage.PartnerCustomizedDefaultGurl";
@ -181,7 +181,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc
@@ -60,6 +60,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; @@ -61,6 +61,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode";
// A boolean specifying whether the New Tab page is the home page or not. // A boolean specifying whether the New Tab page is the home page or not.
const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage"; const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
@ -195,7 +195,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h --- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h
@@ -388,6 +388,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[]; @@ -389,6 +389,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[];
extern const char kUsedPolicyCertificates[]; extern const char kUsedPolicyCertificates[];
#endif // BUILDFLAG(IS_CHROMEOS) #endif // BUILDFLAG(IS_CHROMEOS)
extern const char kShowHomeButton[]; extern const char kShowHomeButton[];

8
build/patches/Add-site-engagement-flag.patch
View file

@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -142,6 +142,7 @@ @@ -144,6 +144,7 @@
#include "components/segmentation_platform/public/features.h" #include "components/segmentation_platform/public/features.h"
#include "components/send_tab_to_self/features.h" #include "components/send_tab_to_self/features.h"
#include "components/services/heap_profiling/public/cpp/switches.h" #include "components/services/heap_profiling/public/cpp/switches.h"
@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "components/shared_highlighting/core/common/shared_highlighting_features.h"
#include "components/signin/core/browser/dice_account_reconcilor_delegate.h" #include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
#include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_buildflags.h"
@@ -9174,6 +9175,11 @@ const FeatureEntry kFeatureEntries[] = { @@ -9283,6 +9284,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid, flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)}, FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -3461,6 +3461,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = @@ -3407,6 +3407,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] =
"Skips starting the service worker and run the fetch handler if the fetch " "Skips starting the service worker and run the fetch handler if the fetch "
"handler is recognized as skippable."; "handler is recognized as skippable.";
@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -1975,6 +1975,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[]; @@ -1957,6 +1957,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[];
extern const char kSkipServiceWorkerFetchHandlerName[]; extern const char kSkipServiceWorkerFetchHandlerName[];
extern const char kSkipServiceWorkerFetchHandlerDescription[]; extern const char kSkipServiceWorkerFetchHandlerDescription[];

2
build/patches/Add-support-for-ISupportHelpAndFeedback.patch
View file

@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment;
import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer; import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer;
@@ -329,9 +330,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity @@ -328,9 +329,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
finish(); finish();
return true; return true;
} else if (item.getItemId() == R.id.menu_id_general_help) { } else if (item.getItemId() == R.id.menu_id_general_help) {

14
build/patches/Add-webGL-site-setting.patch
View file

@ -222,7 +222,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
--- a/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -669,6 +669,20 @@ void ContentSettingsRegistry::Init() { @@ -633,6 +633,20 @@ void ContentSettingsRegistry::Init() {
ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::INHERIT_IN_INCOGNITO,
ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::PERSISTENT,
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
@ -258,7 +258,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
--- a/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc
@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( @@ -208,7 +208,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
content_type == ContentSettingsType::AUTOPLAY || content_type == ContentSettingsType::AUTOPLAY ||
content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::MIXEDSCRIPT ||
content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||
@ -268,7 +268,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
} }
void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
@@ -218,6 +219,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( @@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url);
FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(timezone_override_rules, outermost_main_frame_url);
FilterRulesForType(autoplay_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url);
@ -381,7 +381,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -65,6 +65,29 @@ @@ -67,6 +67,29 @@
namespace blink { namespace blink {
@ -414,7 +414,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
--- a/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -96,6 +96,7 @@ class SecurityOrigin; @@ -101,6 +101,7 @@ class SecurityOrigin;
class ScriptState; class ScriptState;
class ScriptWrappable; class ScriptWrappable;
class TrustedTypePolicyFactory; class TrustedTypePolicyFactory;
@ -422,7 +422,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
enum ReasonForCallingCanExecuteScripts { enum ReasonForCallingCanExecuteScripts {
kAboutToExecuteScript, kAboutToExecuteScript,
@@ -104,6 +105,10 @@ enum ReasonForCallingCanExecuteScripts { @@ -109,6 +110,10 @@ enum ReasonForCallingCanExecuteScripts {
enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag }; enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
@ -476,7 +476,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(), FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
builder); builder);
builder.Append('.'); builder.Append('.');
@@ -578,6 +566,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( @@ -579,6 +567,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
const CanvasContextCreationAttributesCore& attributes, const CanvasContextCreationAttributesCore& attributes,
Platform::ContextType context_type, Platform::ContextType context_type,
Platform::GraphicsInfo* graphics_info) { Platform::GraphicsInfo* graphics_info) {

8
build/patches/Add-webRTC-site-settings.patch
View file

@ -218,7 +218,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
--- a/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -683,6 +683,20 @@ void ContentSettingsRegistry::Init() { @@ -647,6 +647,20 @@ void ContentSettingsRegistry::Init() {
/*show_into_info_page*/ true, /*show_into_info_page*/ true,
/*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL, /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL,
/*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE); /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE);
@ -254,7 +254,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
--- a/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc
@@ -207,7 +207,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( @@ -209,7 +209,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::MIXEDSCRIPT ||
content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||
content_type == ContentSettingsType::TIMEZONE_OVERRIDE || content_type == ContentSettingsType::TIMEZONE_OVERRIDE ||
@ -264,7 +264,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
} }
void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
@@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( @@ -222,6 +223,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(timezone_override_rules, outermost_main_frame_url);
FilterRulesForType(autoplay_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url);
FilterRulesForType(webgl_rules, outermost_main_frame_url); FilterRulesForType(webgl_rules, outermost_main_frame_url);
@ -385,7 +385,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
#include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/platform/web_url.h"
#include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
#include "third_party/blink/public/web/web_document.h" #include "third_party/blink/public/web/web_document.h"
@@ -765,6 +766,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( @@ -804,6 +805,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
// origin. // origin.
WebRTCIPHandlingPolicy policy = WebRTCIPHandlingPolicy policy =
GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy); GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);

28
build/patches/Allow-building-without-enable_reporting.patch
View file

@ -184,7 +184,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
--- a/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -12373,12 +12373,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( @@ -11993,12 +11993,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
base::Value::Dict body; base::Value::Dict body;
if (!reason.empty()) if (!reason.empty())
body.Set("reason", reason); body.Set("reason", reason);
@ -201,21 +201,21 @@ diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/b
--- a/content/browser/web_package/signed_exchange_reporter.cc --- a/content/browser/web_package/signed_exchange_reporter.cc
+++ b/content/browser/web_package/signed_exchange_reporter.cc +++ b/content/browser/web_package/signed_exchange_reporter.cc
@@ -127,6 +127,7 @@ bool ShouldDowngradeReport(const char* result_string, @@ -127,6 +127,7 @@ bool ShouldDowngradeReport(const char* result_string,
void ReportResult(int frame_tree_node_id, void ReportResult(
network::mojom::SignedExchangeReportPtr report, int frame_tree_node_id,
const net::NetworkAnonymizationKey& network_isolation_key) { network::mojom::SignedExchangeReportPtr report,
+#if BUILDFLAG(ENABLE_REPORTING) +#if BUILDFLAG(ENABLE_REPORTING)
const net::NetworkAnonymizationKey& network_anonymization_key) {
FrameTreeNode* frame_tree_node = FrameTreeNode* frame_tree_node =
FrameTreeNode::GloballyFindByID(frame_tree_node_id); FrameTreeNode::GloballyFindByID(frame_tree_node_id);
if (!frame_tree_node) @@ -141,6 +142,7 @@ void ReportResult(
@@ -141,6 +142,7 @@ void ReportResult(int frame_tree_node_id, frame_host->GetBrowserContext()->GetStoragePartition(site_instance);
DCHECK(partition); DCHECK(partition);
partition->GetNetworkContext()->QueueSignedExchangeReport( partition->GetNetworkContext()->QueueSignedExchangeReport(
std::move(report), network_isolation_key);
+#endif +#endif
std::move(report), network_anonymization_key);
} }
} // namespace
diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc b/content/public/common/content_switch_dependent_feature_overrides.cc diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc b/content/public/common/content_switch_dependent_feature_overrides.cc
--- a/content/public/common/content_switch_dependent_feature_overrides.cc --- a/content/public/common/content_switch_dependent_feature_overrides.cc
+++ b/content/public/common/content_switch_dependent_feature_overrides.cc +++ b/content/public/common/content_switch_dependent_feature_overrides.cc
@ -246,7 +246,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
diff --git a/services/network/network_context.h b/services/network/network_context.h diff --git a/services/network/network_context.h b/services/network/network_context.h
--- a/services/network/network_context.h --- a/services/network/network_context.h
+++ b/services/network/network_context.h +++ b/services/network/network_context.h
@@ -461,10 +461,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext @@ -465,10 +465,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
const absl::optional<base::UnguessableToken>& reporting_source, const absl::optional<base::UnguessableToken>& reporting_source,
const net::NetworkAnonymizationKey& network_anonymization_key, const net::NetworkAnonymizationKey& network_anonymization_key,
const absl::optional<std::string>& user_agent, const absl::optional<std::string>& user_agent,
@ -262,7 +262,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
--- a/services/network/public/mojom/BUILD.gn --- a/services/network/public/mojom/BUILD.gn
+++ b/services/network/public/mojom/BUILD.gn +++ b/services/network/public/mojom/BUILD.gn
@@ -1120,7 +1120,6 @@ mojom("mojom") { @@ -1168,7 +1168,6 @@ mojom("mojom") {
export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
export_header_blink = "third_party/blink/public/platform/web_common.h" export_header_blink = "third_party/blink/public/platform/web_common.h"
if (enable_reporting) { if (enable_reporting) {
@ -273,7 +273,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
--- a/services/network/public/mojom/network_context.mojom --- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom
@@ -1064,6 +1064,7 @@ interface NetworkContext { @@ -1072,6 +1072,7 @@ interface NetworkContext {
// provided |network_isolation_key|. // provided |network_isolation_key|.
// //
// Spec: https://w3c.github.io/reporting/#concept-reports // Spec: https://w3c.github.io/reporting/#concept-reports
@ -281,7 +281,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
QueueReport(string type, QueueReport(string type,
string group, string group,
url.mojom.Url url, url.mojom.Url url,
@@ -1077,6 +1078,7 @@ interface NetworkContext { @@ -1085,6 +1086,7 @@ interface NetworkContext {
// Note that this queued report will never be delivered if no reporting // Note that this queued report will never be delivered if no reporting
// endpoint matching is registered for with the provided // endpoint matching is registered for with the provided
// |network_isolation_key|. // |network_isolation_key|.
@ -300,7 +300,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
#include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h" #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h"
#include "services/network/public/cpp/features.h" #include "services/network/public/cpp/features.h"
#include "services/network/public/mojom/content_security_policy.mojom-blink.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
@@ -2307,9 +2308,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { @@ -2328,9 +2329,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
return base::UnguessableToken::Null(); return base::UnguessableToken::Null();
} }
@ -326,7 +326,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
#include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h" #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h"
#include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
#include "third_party/blink/public/common/frame/frame_ad_evidence.h" #include "third_party/blink/public/common/frame/frame_ad_evidence.h"
@@ -593,9 +593,9 @@ class CORE_EXPORT LocalFrame final @@ -596,9 +596,9 @@ class CORE_EXPORT LocalFrame final
} }
SmoothScrollSequencer& GetSmoothScrollSequencer(); SmoothScrollSequencer& GetSmoothScrollSequencer();

16
build/patches/Allow-playing-audio-in-background.patch
View file

@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
--- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
@@ -1226,6 +1226,12 @@ bool WebMediaPlayerImpl::HasAudio() const { @@ -1237,6 +1237,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
return pipeline_metadata_.has_audio; return pipeline_metadata_.has_audio;
} }
@ -24,23 +24,23 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
void WebMediaPlayerImpl::EnabledAudioTracksChanged( void WebMediaPlayerImpl::EnabledAudioTracksChanged(
const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) { const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
DCHECK(main_task_runner_->BelongsToCurrentThread()); DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -3627,7 +3633,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { @@ -2175,7 +2181,11 @@ void WebMediaPlayerImpl::OnBufferingStateChange(
// Audio only stream is allowed to play when in background. void WebMediaPlayerImpl::CreateVideoDecodeStatsReporter() {
// TODO: We should check IsBackgroundOptimizationCandidate here. But we need // TODO(chcunningham): destroy reporter if we initially have video but the
// to move the logic of checking video frames out of that function. // track gets disabled. Currently not possible in default desktop Chrome.
- if (!HasVideo()) - if (!HasVideo())
+ +
+ //pipeline_metadata_.has_video is true for MediaPlayerRenderer, + //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
+ //see media/base/pipeline_metadata.h. This is a workaround to allow audio + //see media/base/pipeline_metadata.h. This is a workaround to allow audio
+ //streams be played in background. + //streams be played in background.
+ if (!HasVideoNonEmptySize()) + if (!HasVideoNonEmptySize())
return false; return;
if (using_media_player_renderer_ && // Only record stats from the local pipeline.
diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h
--- a/third_party/blink/renderer/platform/media/web_media_player_impl.h --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h
@@ -195,6 +195,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl @@ -197,6 +197,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
bool HasVideo() const override; bool HasVideo() const override;
bool HasAudio() const override; bool HasAudio() const override;

2
build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch
View file

@ -48,7 +48,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
--- a/third_party/blink/renderer/modules/webaudio/audio_context.cc --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
@@ -508,7 +508,9 @@ double AudioContext::baseLatency() const { @@ -546,7 +546,9 @@ double AudioContext::baseLatency() const {
DCHECK(IsMainThread()); DCHECK(IsMainThread());
DCHECK(destination()); DCHECK(destination());

14812
build/patches/Automated-domain-substitution.patch
View file

File diff suppressed because it is too large Load diff

8
build/patches/Block-gateway-attacks-via-websockets.patch
View file

@ -23,8 +23,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -693,4 +693,20 @@ bool ExecutionContext::RequireTrustedTypes() const { @@ -720,4 +720,20 @@ void ExecutionContext::WriteIntoTrace(
return require_safe_types_; proto->set_type(GetContextType(*this));
} }
+String ExecutionContext::addressSpaceForBindings() const { +String ExecutionContext::addressSpaceForBindings() const {
@ -47,7 +47,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
--- a/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -396,6 +396,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>, @@ -401,6 +401,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space); void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet(); HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@ -69,7 +69,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
@@ -552,6 +552,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { @@ -578,6 +578,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
return should_block_request; return should_block_request;
} }

8
build/patches/Block-qjz9zk-or-trk-requests.patch
View file

@ -119,7 +119,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
diff --git a/net/BUILD.gn b/net/BUILD.gn diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn --- a/net/BUILD.gn
+++ b/net/BUILD.gn +++ b/net/BUILD.gn
@@ -1030,6 +1030,8 @@ component("net") { @@ -1032,6 +1032,8 @@ component("net") {
"url_request/url_request_http_job.cc", "url_request/url_request_http_job.cc",
"url_request/url_request_http_job.h", "url_request/url_request_http_job.h",
"url_request/url_request_interceptor.cc", "url_request/url_request_interceptor.cc",
@ -210,9 +210,9 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
#include "url/origin.h" #include "url/origin.h"
+#include "url/url_constants.h" +#include "url/url_constants.h"
using base::Time; namespace net {
using std::string;
@@ -597,6 +599,12 @@ URLRequest::URLRequest(const GURL& url, @@ -593,6 +595,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment. // Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet()); DCHECK(base::ThreadTaskRunnerHandle::IsSet());

10
build/patches/Bookmarks-select-all-menu-entry.patch
View file

@ -37,8 +37,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/** /**
* Main action bar of bookmark UI. It is responsible for displaying title and buttons * Main action bar of bookmark UI. It is responsible for displaying title and buttons
@@ -132,6 +133,17 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId> @@ -146,6 +147,17 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
/*openInNewTab=*/true, /*incognito=*/true); }
selectionDelegate.clearSelection(); selectionDelegate.clearSelection();
return true; return true;
+ } else if (menuItem.getItemId() == R.id.select_all_menu_id) { + } else if (menuItem.getItemId() == R.id.select_all_menu_id) {
@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
} }
assert false : "Unhandled menu click."; assert false : "Unhandled menu click.";
@@ -141,6 +153,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId> @@ -155,6 +167,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
void showLoadingUi() { void showLoadingUi() {
setTitle(null); setTitle(null);
setNavigationButton(NAVIGATION_BUTTON_NONE); setNavigationButton(NAVIGATION_BUTTON_NONE);
@ -63,7 +63,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
getMenu().findItem(R.id.import_menu_id).setVisible(false); getMenu().findItem(R.id.import_menu_id).setVisible(false);
getMenu().findItem(R.id.export_menu_id).setVisible(false); getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.search_menu_id).setVisible(false);
@@ -152,6 +165,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId> @@ -166,6 +179,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
super.showNormalView(); super.showNormalView();
if (mDelegate == null) { if (mDelegate == null) {
@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
getMenu().findItem(R.id.import_menu_id).setVisible(false); getMenu().findItem(R.id.import_menu_id).setVisible(false);
getMenu().findItem(R.id.export_menu_id).setVisible(false); getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.search_menu_id).setVisible(false);
@@ -183,6 +197,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId> @@ -197,6 +211,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
@Override @Override
public void onFolderStateSet(BookmarkId folder) { public void onFolderStateSet(BookmarkId folder) {
mCurrentFolder = mDelegate.getModel().getBookmarkById(folder); mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);

12
build/patches/Bromite-auto-updater.patch
View file

@ -50,7 +50,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
--- a/build/config/android/rules.gni --- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni +++ b/build/config/android/rules.gni
@@ -2242,6 +2242,9 @@ if (enable_java_templates) { @@ -2285,6 +2285,9 @@ if (enable_java_templates && is_android) {
if (defined(testonly) && testonly) { if (defined(testonly) && testonly) {
defines += [ "_IS_FOR_TEST" ] defines += [ "_IS_FOR_TEST" ]
} }
@ -63,7 +63,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni
@@ -812,6 +812,9 @@ chrome_java_sources = [ @@ -805,6 +805,9 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java", "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java",
"java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java", "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java",
"java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java", "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java",
@ -1251,7 +1251,7 @@ new file mode 100644
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -251,6 +251,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { @@ -255,6 +255,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kNewWindowAppMenu, &kNewWindowAppMenu,
&kNotificationPermissionVariant, &kNotificationPermissionVariant,
&kPageAnnotationsService, &kPageAnnotationsService,
@ -1259,7 +1259,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kBookmarksImprovedSaveFlow, &kBookmarksImprovedSaveFlow,
&kBookmarksRefresh, &kBookmarksRefresh,
&kBackGestureRefactorAndroid, &kBackGestureRefactorAndroid,
@@ -693,6 +694,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens, @@ -698,6 +699,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens,
"ContextMenuTranslateWithGoogleLens", "ContextMenuTranslateWithGoogleLens",
base::FEATURE_DISABLED_BY_DEFAULT); base::FEATURE_DISABLED_BY_DEFAULT);
@ -1273,7 +1273,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -91,6 +91,7 @@ BASE_DECLARE_FEATURE(kGridTabSwitcherForTablets); @@ -92,6 +92,7 @@ BASE_DECLARE_FEATURE(kGridTabSwitcherForTablets);
BASE_DECLARE_FEATURE(kHandleMediaIntents); BASE_DECLARE_FEATURE(kHandleMediaIntents);
BASE_DECLARE_FEATURE(kImmersiveUiMode); BASE_DECLARE_FEATURE(kImmersiveUiMode);
BASE_DECLARE_FEATURE(kIncognitoReauthenticationForAndroid); BASE_DECLARE_FEATURE(kIncognitoReauthenticationForAndroid);
@ -1284,7 +1284,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
diff --git 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 diff --git 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
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- 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 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -385,6 +385,7 @@ public abstract class ChromeFeatureList { @@ -349,6 +349,7 @@ public abstract class ChromeFeatureList {
"IncognitoReauthenticationForAndroid"; "IncognitoReauthenticationForAndroid";
public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot"; public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
public static final String INFOBAR_SCROLL_OPTIMIZATION = "InfobarScrollOptimization"; public static final String INFOBAR_SCROLL_OPTIMIZATION = "InfobarScrollOptimization";

30
build/patches/Bromite-subresource-adblocker.patch
View file

@ -64,7 +64,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -372,6 +372,7 @@ if (current_toolchain == default_toolchain) { @@ -382,6 +382,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/android/modules/image_editor/provider:java", "//chrome/android/modules/image_editor/provider:java",
"//chrome/android/modules/stack_unwinder/provider:java", "//chrome/android/modules/stack_unwinder/provider:java",
"//chrome/android/webapk/libs/client:client_java", "//chrome/android/webapk/libs/client:client_java",
@ -83,7 +83,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
"java/res/layout/auto_sign_in_first_run_dialog.xml", "java/res/layout/auto_sign_in_first_run_dialog.xml",
"java/res/layout/autofill_billing_address_dropdown.xml", "java/res/layout/autofill_billing_address_dropdown.xml",
"java/res/layout/autofill_card_unmask_prompt.xml", "java/res/layout/autofill_card_unmask_prompt.xml",
@@ -641,6 +642,7 @@ chrome_java_resources = [ @@ -639,6 +640,7 @@ chrome_java_resources = [
"java/res/values/values.xml", "java/res/values/values.xml",
"java/res/xml/about_chrome_preferences.xml", "java/res/xml/about_chrome_preferences.xml",
"java/res/xml/account_management_preferences.xml", "java/res/xml/account_management_preferences.xml",
@ -94,7 +94,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni
@@ -907,6 +907,8 @@ chrome_java_sources = [ @@ -900,6 +900,8 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java", "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
"java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
"java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@ -437,7 +437,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -12468,6 +12468,16 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -12565,6 +12565,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
Never show this again. Never show this again.
</message> </message>
@ -557,7 +557,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
--- a/chrome/browser/chrome_browser_main.cc --- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc
@@ -415,6 +415,9 @@ StartupProfileInfo CreateInitialProfile( @@ -416,6 +416,9 @@ StartupProfileInfo CreateInitialProfile(
// missing code in the above test. // missing code in the above test.
CHECK(profile_info.profile) << "Cannot get default profile."; CHECK(profile_info.profile) << "Cannot get default profile.";
@ -595,7 +595,7 @@ diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/brows
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
@@ -278,6 +278,14 @@ public class CachedFeatureFlags { @@ -190,6 +190,14 @@ public class CachedFeatureFlags {
ChromeFeatureList.isEnabled(ChromeFeatureList.BACKGROUND_THREAD_POOL)); ChromeFeatureList.isEnabled(ChromeFeatureList.BACKGROUND_THREAD_POOL));
} }
@ -610,7 +610,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
/** /**
* Caches flags that must take effect on startup but are set via native code. * Caches flags that must take effect on startup but are set via native code.
*/ */
@@ -524,5 +532,7 @@ public class CachedFeatureFlags { @@ -427,5 +435,7 @@ public class CachedFeatureFlags {
@NativeMethods @NativeMethods
interface Natives { interface Natives {
boolean isNetworkServiceWarmUpEnabled(); boolean isNetworkServiceWarmUpEnabled();
@ -621,7 +621,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc
@@ -421,6 +421,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( @@ -422,6 +422,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
ssl_config_service_manager_(local_state_), ssl_config_service_manager_(local_state_),
proxy_config_monitor_(local_state_), proxy_config_monitor_(local_state_),
stub_resolver_config_reader_(local_state_) { stub_resolver_config_reader_(local_state_) {
@ -630,7 +630,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
// QuicAllowed was not part of Android policy. // QuicAllowed was not part of Android policy.
const base::Value* value = const base::Value* value =
@@ -499,6 +501,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { @@ -500,6 +502,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
StubResolverConfigReader::RegisterPrefs(registry); StubResolverConfigReader::RegisterPrefs(registry);
@ -680,7 +680,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc
@@ -2383,6 +2383,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; @@ -2390,6 +2390,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
// capture devices without prompt. // capture devices without prompt.
const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
@ -693,7 +693,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h --- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h
@@ -32,6 +32,7 @@ extern const char kDownloadBubbleEnabled[]; @@ -33,6 +33,7 @@ extern const char kDownloadBubbleEnabled[];
extern const char kForceEphemeralProfiles[]; extern const char kForceEphemeralProfiles[];
extern const char kHomePageIsNewTabPage[]; extern const char kHomePageIsNewTabPage[];
extern const char kHomePage[]; extern const char kHomePage[];
@ -731,7 +731,7 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
"component_updater_service.cc", "component_updater_service.cc",
"component_updater_service.h", "component_updater_service.h",
"component_updater_service_internal.h", "component_updater_service_internal.h",
@@ -37,6 +43,7 @@ static_library("component_updater") { @@ -39,6 +45,7 @@ static_library("component_updater") {
"//components/prefs", "//components/prefs",
"//components/update_client", "//components/update_client",
"//components/version_info", "//components/version_info",
@ -1871,7 +1871,7 @@ diff --git a/content/browser/renderer_host/navigation_throttle_runner.cc b/conte
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -28,8 +28,8 @@ BASE_FEATURE(kAnonymousIframeOriginTrial, @@ -34,8 +34,8 @@ BASE_FEATURE(kAttributionReportingCrossAppWeb,
// Apply lazy-loading to ad frames which have embeds likely impacting Core Web // Apply lazy-loading to ad frames which have embeds likely impacting Core Web
// Vitals. // Vitals.
BASE_FEATURE(kAutomaticLazyFrameLoadingToAds, BASE_FEATURE(kAutomaticLazyFrameLoadingToAds,
@ -1882,7 +1882,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
// The timeout value that forces loading iframes that are lazy loaded by // The timeout value that forces loading iframes that are lazy loaded by
// LazyAds. After this timeout, the frame loading is triggered even when the // LazyAds. After this timeout, the frame loading is triggered even when the
@@ -49,8 +49,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyAds( @@ -55,8 +55,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyAds(
// Apply lazy-loading to frames which have embeds likely impacting Core Web // Apply lazy-loading to frames which have embeds likely impacting Core Web
// Vitals. // Vitals.
BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbeds, BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbeds,
@ -1893,7 +1893,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
// The timeout value that forces loading iframes that are lazy loaded by // The timeout value that forces loading iframes that are lazy loaded by
// LazyEmbeds. After this timeout, the frame loading is triggered even when the // LazyEmbeds. After this timeout, the frame loading is triggered even when the
@@ -72,8 +72,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyEmbeds( @@ -78,8 +78,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyEmbeds(
// to gather Blink.AutomaticLazyLoadFrame.LazyEmbedFrameCount UKM data even when // to gather Blink.AutomaticLazyLoadFrame.LazyEmbedFrameCount UKM data even when
// kAutomaticLazyFrameLoadingToEmbeds is disabled. // kAutomaticLazyFrameLoadingToEmbeds is disabled.
BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbedUrls, BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbedUrls,

40
build/patches/Clamp-time-resolution-in-requestAnimationFrame.patch
View file

@ -1,40 +0,0 @@
From: uazo <uazo@users.noreply.github.com>
Date: Mon, 3 Oct 2022 09:39:07 +0000
Subject: Clamp time resolution in requestAnimationFrame
Aligns requestAnimationFrame's WebWorker callback to the W3C specification
See https://bugs.chromium.org/p/chromium/issues/detail?id=1236113
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../animation_frame/worker_animation_frame_provider.cc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc b/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
--- a/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
+++ b/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
@@ -7,6 +7,8 @@
#include "base/trace_event/trace_event.h"
#include "third_party/blink/renderer/core/execution_context/agent.h"
#include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h"
+#include "third_party/blink/renderer/core/workers/worker_global_scope.h"
+#include "third_party/blink/renderer/platform/wtf/casting.h"
#include "third_party/blink/renderer/core/timing/worker_global_scope_performance.h"
#include "third_party/blink/renderer/platform/scheduler/public/event_loop.h"
#include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
@@ -63,7 +65,11 @@ void WorkerAnimationFrameProvider::BeginFrame(const viz::BeginFrameArgs& args) {
}
}
- double time = (args.frame_time - base::TimeTicks()).InMillisecondsF();
+ auto* global_scope = DynamicTo<WorkerGlobalScope>(provider->context_.Get());
+ DCHECK(global_scope);
+ double time = Performance::ClampTimeResolution(
+ args.frame_time - global_scope->TimeOrigin(),
+ provider->context_->CrossOriginIsolatedCapability());
provider->callback_collection_.ExecuteFrameCallbacks(time, time);
}
provider->begin_frame_provider_->FinishBeginFrame(args);
--
2.25.1

8
build/patches/Client-hints-overrides.patch
View file

@ -62,7 +62,7 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc --- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -247,8 +247,8 @@ BASE_FEATURE(kCrashReporting, @@ -257,8 +257,8 @@ BASE_FEATURE(kCrashReporting,
// Enables support for the `Critical-CH` response header. // Enables support for the `Critical-CH` response header.
// https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch
BASE_FEATURE(kCriticalClientHint, BASE_FEATURE(kCriticalClientHint,
@ -76,7 +76,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc
--- a/services/network/public/cpp/client_hints.cc --- a/services/network/public/cpp/client_hints.cc
+++ b/services/network/public/cpp/client_hints.cc +++ b/services/network/public/cpp/client_hints.cc
@@ -105,6 +105,7 @@ const DecodeMap& GetDecodeMap() { @@ -113,6 +113,7 @@ const DecodeMap& GetDecodeMap() {
absl::optional<std::vector<network::mojom::WebClientHintsType>> absl::optional<std::vector<network::mojom::WebClientHintsType>>
ParseClientHintsHeader(const std::string& header) { ParseClientHintsHeader(const std::string& header) {
@ -99,8 +99,8 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc
--- a/third_party/blink/common/client_hints/client_hints.cc --- a/third_party/blink/common/client_hints/client_hints.cc
+++ b/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc
@@ -113,6 +113,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount = @@ -105,6 +105,7 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
std::size(kWebEffectiveConnectionTypeMapping); }
bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
+ if ((true)) return false; + if ((true)) return false;

28
build/patches/Content-settings-infrastructure.patch
View file

@ -686,7 +686,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
configureGlobalToggles(); configureGlobalToggles();
if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) { if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) {
RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered"); RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered");
@@ -508,6 +513,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -509,6 +514,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
BrowserContextHandle browserContextHandle = BrowserContextHandle browserContextHandle =
getSiteSettingsDelegate().getBrowserContextHandle(); getSiteSettingsDelegate().getBrowserContextHandle();
PrefService prefService = UserPrefs.get(browserContextHandle); PrefService prefService = UserPrefs.get(browserContextHandle);
@ -698,7 +698,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
if (BINARY_TOGGLE_KEY.equals(preference.getKey())) { if (BINARY_TOGGLE_KEY.equals(preference.getKey())) {
assert !mCategory.isManaged(); assert !mCategory.isManaged();
@@ -672,6 +682,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -673,6 +683,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
} else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) { } else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
resource = R.string.website_settings_category_timezone_override_allowed; resource = R.string.website_settings_category_timezone_override_allowed;
} }
@ -707,7 +707,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
assert resource > 0; assert resource > 0;
return getString(resource); return getString(resource);
} }
@@ -790,6 +802,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -791,6 +803,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
allowSpecifyingExceptions = true; allowSpecifyingExceptions = true;
} else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) { } else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
allowSpecifyingExceptions = true; allowSpecifyingExceptions = true;
@ -717,7 +717,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} }
if (allowSpecifyingExceptions) { if (allowSpecifyingExceptions) {
getPreferenceScreen().addPreference(new AddExceptionPreference(getStyledContext(), getPreferenceScreen().addPreference(new AddExceptionPreference(getStyledContext(),
@@ -961,6 +976,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -962,6 +977,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
TriStateSiteSettingsPreference triStateToggle = TriStateSiteSettingsPreference triStateToggle =
(TriStateSiteSettingsPreference) getPreferenceScreen().findPreference( (TriStateSiteSettingsPreference) getPreferenceScreen().findPreference(
TRI_STATE_TOGGLE_KEY); TRI_STATE_TOGGLE_KEY);
@ -728,7 +728,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
if (triStateToggle != null) if (triStateToggle != null)
return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK); return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK);
@@ -1039,6 +1058,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -1040,6 +1059,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
if (mCategory.getType() != SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) { if (mCategory.getType() != SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
screen.removePreference(screen.findPreference(TIMEOVERRIDE_INFO_TEXT)); screen.removePreference(screen.findPreference(TIMEOVERRIDE_INFO_TEXT));
} }
@ -736,7 +736,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
if (permissionBlockedByOs) { if (permissionBlockedByOs) {
maybeShowOsWarning(screen); maybeShowOsWarning(screen);
@@ -1170,7 +1190,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -1171,7 +1191,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
getSiteSettingsDelegate().getBrowserContextHandle(), contentType); getSiteSettingsDelegate().getBrowserContextHandle(), contentType);
int[] descriptionIds = int[] descriptionIds =
ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType); ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType);
@ -745,7 +745,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} }
private void configureTimeOverrideStateToggle( private void configureTimeOverrideStateToggle(
@@ -1281,6 +1301,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -1282,6 +1302,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@ContentSettingValues @ContentSettingValues
Integer value = site.getContentSetting(browserContextHandle, contentSettingsType); Integer value = site.getContentSetting(browserContextHandle, contentSettingsType);
@ -790,7 +790,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
Preference preference = new ChromeSwitchPreference(getStyledContext()); Preference preference = new ChromeSwitchPreference(getStyledContext());
preference.setKey(getPreferenceKey(type)); preference.setKey(getPreferenceKey(type));
@@ -945,16 +947,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment @@ -952,16 +954,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
private void setupContentSettingsPreference(Preference preference, private void setupContentSettingsPreference(Preference preference,
@ContentSettingValues @Nullable Integer value, boolean isEmbargoed) { @ContentSettingValues @Nullable Integer value, boolean isEmbargoed) {
@ -818,7 +818,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
switchPreference.setOnPreferenceChangeListener(this); switchPreference.setOnPreferenceChangeListener(this);
@ContentSettingsType @ContentSettingsType
int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey()); int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());
@@ -1206,7 +1214,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment @@ -1213,7 +1221,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
} }
mSite.setContentSetting(browserContextHandle, type, permission); mSite.setContentSetting(browserContextHandle, type, permission);
@ -976,7 +976,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
#include "media/base/android/media_drm_bridge.h" #include "media/base/android/media_drm_bridge.h"
@@ -680,7 +682,10 @@ void ContentSettingsRegistry::Register( @@ -644,7 +646,10 @@ void ContentSettingsRegistry::Register(
Platforms platforms, Platforms platforms,
ContentSettingsInfo::IncognitoBehavior incognito_behavior, ContentSettingsInfo::IncognitoBehavior incognito_behavior,
ContentSettingsInfo::StorageBehavior storage_behavior, ContentSettingsInfo::StorageBehavior storage_behavior,
@ -988,7 +988,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
// Ensure that nothing has been registered yet for the given type. // Ensure that nothing has been registered yet for the given type.
DCHECK(!website_settings_registry_->Get(type)); DCHECK(!website_settings_registry_->Get(type));
@@ -689,7 +694,9 @@ void ContentSettingsRegistry::Register( @@ -653,7 +658,9 @@ void ContentSettingsRegistry::Register(
website_settings_registry_->Register( website_settings_registry_->Register(
type, name, std::move(default_value), sync_status, type, name, std::move(default_value), sync_status,
WebsiteSettingsInfo::NOT_LOSSY, scoping_type, platforms, WebsiteSettingsInfo::NOT_LOSSY, scoping_type, platforms,
@ -1228,7 +1228,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
#include "components/omnibox/common/omnibox_features.h" #include "components/omnibox/common/omnibox_features.h"
#include "components/page_info/core/features.h" #include "components/page_info/core/features.h"
#include "components/page_info/page_info_ui_delegate.h" #include "components/page_info/page_info_ui_delegate.h"
@@ -572,6 +573,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) { @@ -577,6 +578,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
if (info.type == type) if (info.type == type)
return l10n_util::GetStringUTF16(info.string_id); return l10n_util::GetStringUTF16(info.string_id);
} }
@ -1241,7 +1241,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
NOTREACHED(); NOTREACHED();
return std::u16string(); return std::u16string();
} }
@@ -583,6 +590,12 @@ std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence( @@ -588,6 +595,12 @@ std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
if (info.type == type) if (info.type == type)
return l10n_util::GetStringUTF16(info.string_id_mid_sentence); return l10n_util::GetStringUTF16(info.string_id_mid_sentence);
} }
@ -1254,7 +1254,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
NOTREACHED(); NOTREACHED();
return std::u16string(); return std::u16string();
} }
@@ -970,6 +983,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) { @@ -975,6 +988,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
if (info.type == type) if (info.type == type)
return true; return true;
} }

2
build/patches/Dictionary-suggestions-for-the-Omnibox.patch
View file

@ -964,7 +964,7 @@ new file mode 100644
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
@@ -222,8 +222,7 @@ public abstract class UrlBar extends AutocompleteEditText { @@ -223,8 +223,7 @@ public abstract class UrlBar extends AutocompleteEditText {
setFocusableInTouchMode(mAllowFocus); setFocusableInTouchMode(mAllowFocus);
}); });

56
build/patches/Disable-AGSA-by-default.patch
View file

@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../browser/ntp/search/SearchBoxMediator.java | 1 - .../browser/ntp/search/SearchBoxMediator.java | 1 -
.../chrome/browser/share/LensUtils.java | 12 +-------- .../chrome/browser/share/LensUtils.java | 12 +--------
.../flags/android/chrome_feature_list.cc | 4 +-- .../flags/android/chrome_feature_list.cc | 4 +--
.../browser/flags/CachedFeatureFlags.java | 2 +- .../browser/flags/ChromeFeatureList.java | 2 +-
chrome/browser/ui/android/omnibox/BUILD.gn | 2 -- chrome/browser/ui/android/omnibox/BUILD.gn | 2 --
.../browser/omnibox/LocationBarMediator.java | 1 - .../browser/omnibox/LocationBarMediator.java | 1 -
13 files changed, 4 insertions(+), 78 deletions(-) 13 files changed, 4 insertions(+), 78 deletions(-)
@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -408,7 +408,6 @@ if (current_toolchain == default_toolchain) { @@ -420,7 +420,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/first_run/android:java", "//chrome/browser/first_run/android:java",
"//chrome/browser/flags:java", "//chrome/browser/flags:java",
"//chrome/browser/fullscreen/android:java", "//chrome/browser/fullscreen/android:java",
@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/history_clusters:java", "//chrome/browser/history_clusters:java",
"//chrome/browser/history_clusters:java_resources", "//chrome/browser/history_clusters:java_resources",
"//chrome/browser/image_descriptions:java", "//chrome/browser/image_descriptions:java",
@@ -1002,7 +1001,6 @@ if (current_toolchain == default_toolchain) { @@ -1015,7 +1014,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/flags:flags_junit_tests", "//chrome/browser/flags:flags_junit_tests",
"//chrome/browser/flags:java", "//chrome/browser/flags:java",
"//chrome/browser/fullscreen/android:java", "//chrome/browser/fullscreen/android:java",
@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/history_clusters:java", "//chrome/browser/history_clusters:java",
"//chrome/browser/image_descriptions:java", "//chrome/browser/image_descriptions:java",
"//chrome/browser/image_editor/public:java", "//chrome/browser/image_editor/public:java",
@@ -1517,7 +1515,6 @@ if (current_toolchain == default_toolchain) { @@ -1531,7 +1529,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/first_run/android:java", "//chrome/browser/first_run/android:java",
"//chrome/browser/flags:java", "//chrome/browser/flags:java",
"//chrome/browser/fullscreen/android:java", "//chrome/browser/fullscreen/android:java",
@ -60,15 +60,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabsConnection; @@ -43,7 +43,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
import org.chromium.chrome.browser.document.ChromeLauncherActivity;
import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler; import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler;
import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata; import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
-import org.chromium.chrome.browser.gsa.GSAState; -import org.chromium.chrome.browser.gsa.GSAState;
import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.Profile;
@@ -265,8 +264,6 @@ public class IntentHandler { @@ -267,8 +266,6 @@ public class IntentHandler {
private static int sReferrerId; private static int sReferrerId;
private static String sPendingIncognitoUrl; private static String sPendingIncognitoUrl;
@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
private static final String PACKAGE_GMAIL = "com.google.android.gm"; private static final String PACKAGE_GMAIL = "com.google.android.gm";
private static final String PACKAGE_PLUS = "com.google.android.apps.plus"; private static final String PACKAGE_PLUS = "com.google.android.apps.plus";
private static final String PACKAGE_HANGOUTS = "com.google.android.talk"; private static final String PACKAGE_HANGOUTS = "com.google.android.talk";
@@ -496,8 +493,6 @@ public class IntentHandler { @@ -498,8 +495,6 @@ public class IntentHandler {
return ExternalAppId.LINE; return ExternalAppId.LINE;
} else if (packageName.equals(PACKAGE_WHATSAPP)) { } else if (packageName.equals(PACKAGE_WHATSAPP)) {
return ExternalAppId.WHATSAPP; return ExternalAppId.WHATSAPP;
@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -112,10 +112,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager; @@ -113,10 +113,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
import org.chromium.chrome.browser.fullscreen.BrowserControlsManagerSupplier; import org.chromium.chrome.browser.fullscreen.BrowserControlsManagerSupplier;
import org.chromium.chrome.browser.fullscreen.FullscreenBackPressHandler; import org.chromium.chrome.browser.fullscreen.FullscreenBackPressHandler;
import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.fullscreen.FullscreenManager;
@ -100,7 +100,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.history.HistoryManagerUtils; import org.chromium.chrome.browser.history.HistoryManagerUtils;
import org.chromium.chrome.browser.init.AsyncInitializationActivity; import org.chromium.chrome.browser.init.AsyncInitializationActivity;
import org.chromium.chrome.browser.init.ProcessInitializationHandler; import org.chromium.chrome.browser.init.ProcessInitializationHandler;
@@ -374,8 +370,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -377,8 +373,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
private LaunchCauseMetrics mLaunchCauseMetrics; private LaunchCauseMetrics mLaunchCauseMetrics;
@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
// TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity. // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity.
private List<MenuOrKeyboardActionController.MenuOrKeyboardActionHandler> mMenuActionHandlers = private List<MenuOrKeyboardActionController.MenuOrKeyboardActionHandler> mMenuActionHandlers =
new ArrayList<>(); new ArrayList<>();
@@ -1172,10 +1166,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -1189,10 +1183,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@Override @Override
public void onStopWithNative() { public void onStopWithNative() {
@ -120,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
super.onStopWithNative(); super.onStopWithNative();
} }
@@ -1267,23 +1257,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -1284,23 +1274,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
.recordUserFontPrefOnStartup(); .recordUserFontPrefOnStartup();
}); });
@ -155,7 +155,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
import org.chromium.chrome.browser.lens.LensController; import org.chromium.chrome.browser.lens.LensController;
import org.chromium.chrome.browser.lens.LensEntryPoint; import org.chromium.chrome.browser.lens.LensEntryPoint;
import org.chromium.chrome.browser.lens.LensIntentParams; import org.chromium.chrome.browser.lens.LensIntentParams;
@@ -987,12 +986,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { @@ -978,12 +977,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE); LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE);
return false; return false;
} }
@ -196,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
@@ -360,14 +360,6 @@ public class ProcessInitializationHandler { @@ -356,14 +356,6 @@ public class ProcessInitializationHandler {
} }
}); });
@ -262,7 +262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -750,8 +750,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid, @@ -751,8 +751,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid,
base::FEATURE_DISABLED_BY_DEFAULT); base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kExperimentsForAgsa, BASE_FEATURE(kExperimentsForAgsa,
@ -273,18 +273,18 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java diff --git 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
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- 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/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -72,7 +72,7 @@ public class CachedFeatureFlags { @@ -662,7 +662,7 @@ public abstract class ChromeFeatureList {
.put(ChromeFeatureList.EARLY_LIBRARY_LOAD, true) new CachedFlag(DOWNLOADS_AUTO_RESUMPTION_NATIVE, true);
.put(ChromeFeatureList.ELASTIC_OVERSCROLL, true) public static final CachedFlag sEarlyLibraryLoad = new CachedFlag(EARLY_LIBRARY_LOAD, true);
.put(ChromeFeatureList.ELIDE_PRIORITIZATION_OF_PRE_NATIVE_BOOTSTRAP_TASKS, true) public static final CachedFlag sElasticOverscroll = new CachedFlag(ELASTIC_OVERSCROLL, true);
- .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, true) - public static final CachedFlag sExperimentsForAgsa = new CachedFlag(EXPERIMENTS_FOR_AGSA, true);
+ .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, false) + public static final CachedFlag sExperimentsForAgsa = new CachedFlag(EXPERIMENTS_FOR_AGSA, false);
.put(ChromeFeatureList.FEED_LOADING_PLACEHOLDER, false) public static final CachedFlag sFeedLoadingPlaceholder =
.put(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS, true) new CachedFlag(FEED_LOADING_PLACEHOLDER, false);
.put(ChromeFeatureList.IMMERSIVE_UI_MODE, false) public static final CachedFlag sFoldableJankFix = new CachedFlag(FOLDABLE_JANK_FIX, true);
diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn
--- a/chrome/browser/ui/android/omnibox/BUILD.gn --- a/chrome/browser/ui/android/omnibox/BUILD.gn
+++ b/chrome/browser/ui/android/omnibox/BUILD.gn +++ b/chrome/browser/ui/android/omnibox/BUILD.gn
@ -296,7 +296,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr
"//chrome/browser/history_clusters:java", "//chrome/browser/history_clusters:java",
"//chrome/browser/language/android:java", "//chrome/browser/language/android:java",
"//chrome/browser/lens:java", "//chrome/browser/lens:java",
@@ -440,7 +439,6 @@ robolectric_library("junit") { @@ -441,7 +440,6 @@ robolectric_library("junit") {
"//chrome/browser/commerce/merchant_viewer/android:java", "//chrome/browser/commerce/merchant_viewer/android:java",
"//chrome/browser/device:java", "//chrome/browser/device:java",
"//chrome/browser/flags:java", "//chrome/browser/flags:java",

2
build/patches/Disable-Accessibility-service-by-default.patch
View file

@ -58,7 +58,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
@@ -899,6 +899,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa @@ -900,6 +900,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
structure.setChildCount(0); structure.setChildCount(0);
return; return;
} }

13
build/patches/Disable-AsyncDNS-by-default.patch
View file

@ -7,24 +7,25 @@ This feature is detrimental to privacy, see also:
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
--- ---
chrome/common/chrome_features.cc | 8 ++------ chrome/common/chrome_features.cc | 9 ++-------
1 file changed, 2 insertions(+), 6 deletions(-) 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc
@@ -98,12 +98,8 @@ BASE_FEATURE(kAppShimNewCloseBehavior, @@ -98,13 +98,8 @@ BASE_FEATURE(kAppShimNewCloseBehavior,
// Enables the built-in DNS resolver. // Enables the built-in DNS resolver.
BASE_FEATURE(kAsyncDns, BASE_FEATURE(kAsyncDns,
- "AsyncDns", - "AsyncDns",
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_WIN)
- base::FEATURE_ENABLED_BY_DEFAULT - base::FEATURE_ENABLED_BY_DEFAULT
-#else -#else
- base::FEATURE_DISABLED_BY_DEFAULT - base::FEATURE_DISABLED_BY_DEFAULT
-#endif -#endif
+ "AsyncDns", // disabled by default + "AsyncDns", // disabled by default
+ base::FEATURE_DISABLED_BY_DEFAULT // in Bromite + base::FEATURE_DISABLED_BY_DEFAULT // in Bromite
); );
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

2
build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc --- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc +++ b/media/base/media_switches.cc
@@ -843,8 +843,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense, @@ -851,8 +851,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
// MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
// which will trigger provisioning process after MediaDrmBridge is created. // which will trigger provisioning process after MediaDrmBridge is created.
BASE_FEATURE(kMediaDrmPreprovisioning, BASE_FEATURE(kMediaDrmPreprovisioning,

6
build/patches/Disable-FLoC-and-privacy-sandbox.patch
View file

@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -3091,6 +3091,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed( @@ -3234,6 +3234,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
const url::Origin* source_origin, const url::Origin* source_origin,
const url::Origin* destination_origin, const url::Origin* destination_origin,
const url::Origin* reporting_origin) { const url::Origin* reporting_origin) {
@ -96,7 +96,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
--- a/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc
@@ -495,18 +495,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id, @@ -517,18 +517,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
if (!visit_id) if (!visit_id)
return; return;
@ -241,7 +241,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.h b/components/
+++ b/components/privacy_sandbox/privacy_sandbox_settings.h +++ b/components/privacy_sandbox/privacy_sandbox_settings.h
@@ -227,7 +227,6 @@ class PrivacySandboxSettings : public KeyedService { @@ -227,7 +227,6 @@ class PrivacySandboxSettings : public KeyedService {
scoped_refptr<content_settings::CookieSettings> cookie_settings_; scoped_refptr<content_settings::CookieSettings> cookie_settings_;
raw_ptr<PrefService> pref_service_; raw_ptr<PrefService, DanglingUntriaged> pref_service_;
PrefChangeRegistrar pref_change_registrar_; PrefChangeRegistrar pref_change_registrar_;
- bool incognito_profile_; - bool incognito_profile_;
}; };

4
build/patches/Disable-PrivacyGuide.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc
@@ -500,8 +500,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP, @@ -505,8 +505,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP,
// Enables or disables the Happiness Tracking System for Desktop Privacy Guide. // Enables or disables the Happiness Tracking System for Desktop Privacy Guide.
BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide, BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide,
@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
const base::FeatureParam<base::TimeDelta> const base::FeatureParam<base::TimeDelta>
kHappinessTrackingSurveysForDesktopPrivacyGuideTime{ kHappinessTrackingSurveysForDesktopPrivacyGuideTime{
&kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time", &kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time",
@@ -910,11 +910,11 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect, @@ -915,11 +915,11 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect,
"PrerenderFallbackToPreconnect", "PrerenderFallbackToPreconnect",
base::FEATURE_ENABLED_BY_DEFAULT); base::FEATURE_ENABLED_BY_DEFAULT);

2
build/patches/Disable-StartSurface-feature.patch
View file

@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -1081,8 +1081,8 @@ BASE_FEATURE(kShowExtendedPreloadingSetting, @@ -1070,8 +1070,8 @@ BASE_FEATURE(kShowExtendedPreloadingSetting,
base::FEATURE_ENABLED_BY_DEFAULT); base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kStartSurfaceAndroid, BASE_FEATURE(kStartSurfaceAndroid,

12
build/patches/Disable-TLS-resumption.patch
View file

@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -5016,6 +5016,12 @@ const FeatureEntry kFeatureEntries[] = { @@ -5053,6 +5053,12 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName, {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName,
flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll, flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll,
FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)}, FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)},
@ -55,7 +55,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -1036,6 +1036,14 @@ const char kEnableTLS13EarlyDataDescription[] = @@ -994,6 +994,14 @@ const char kEnableTLS13EarlyDataDescription[] =
"during the handshake when resuming a connection to a compatible TLS 1.3 " "during the handshake when resuming a connection to a compatible TLS 1.3 "
"server."; "server.";
@ -73,7 +73,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -595,6 +595,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[]; @@ -577,6 +577,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[];
extern const char kEnableTLS13EarlyDataName[]; extern const char kEnableTLS13EarlyDataName[];
extern const char kEnableTLS13EarlyDataDescription[]; extern const char kEnableTLS13EarlyDataDescription[];
@ -123,7 +123,7 @@ diff --git a/net/base/features.h b/net/base/features.h
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
--- a/net/http/http_network_session.cc --- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc
@@ -212,6 +212,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params, @@ -211,6 +211,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
next_protos_.push_back(kProtoHTTP11); next_protos_.push_back(kProtoHTTP11);
@ -236,7 +236,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
} }
transport_adapter_ = std::make_unique<SocketBIOAdapter>( transport_adapter_ = std::make_unique<SocketBIOAdapter>(
@@ -1074,6 +1102,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) { @@ -1077,6 +1105,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
: SSLHandshakeDetails::kTLS13Full; : SSLHandshakeDetails::kTLS13Full;
} }
} }
@ -272,7 +272,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details); UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
// Measure TLS connections that implement the renegotiation_info extension. // Measure TLS connections that implement the renegotiation_info extension.
@@ -1746,6 +1803,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const { @@ -1760,6 +1817,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
} }
bool SSLClientSocketImpl::IsCachingEnabled() const { bool SSLClientSocketImpl::IsCachingEnabled() const {

18
build/patches/Disable-all-predictors-code.patch
View file

@ -32,7 +32,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
@@ -320,7 +320,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( @@ -318,7 +318,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
void OptimizationGuideKeyedService::RegisterOptimizationTypes( void OptimizationGuideKeyedService::RegisterOptimizationTypes(
const std::vector<optimization_guide::proto::OptimizationType>& const std::vector<optimization_guide::proto::OptimizationType>&
optimization_types) { optimization_types) {
@ -43,7 +43,7 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc
@@ -883,8 +883,8 @@ BASE_FEATURE(kPermissionAuditing, @@ -889,8 +889,8 @@ BASE_FEATURE(kPermissionAuditing,
// Enables using the prediction service for permission prompts. We will keep // Enables using the prediction service for permission prompts. We will keep
// this feature in order to allow us to update the holdback chance via finch. // this feature in order to allow us to update the holdback chance via finch.
BASE_FEATURE(kPermissionPredictions, BASE_FEATURE(kPermissionPredictions,
@ -54,7 +54,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
// The holdback chance is 30% but it can also be configured/updated // The holdback chance is 30% but it can also be configured/updated
// through finch if needed. // through finch if needed.
@@ -895,8 +895,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance( @@ -901,8 +901,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
// Enables using the prediction service for geolocation permission prompts. // Enables using the prediction service for geolocation permission prompts.
BASE_FEATURE(kPermissionGeolocationPredictions, BASE_FEATURE(kPermissionGeolocationPredictions,
@ -185,7 +185,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
BASE_FEATURE(kPageContentAnnotationsValidation, BASE_FEATURE(kPageContentAnnotationsValidation,
"PageContentAnnotationsValidation", "PageContentAnnotationsValidation",
@@ -408,7 +404,7 @@ size_t MaxURLKeyedHintCacheSize() { @@ -414,7 +410,7 @@ size_t MaxURLKeyedHintCacheSize() {
bool ShouldPersistHintsToDisk() { bool ShouldPersistHintsToDisk() {
return GetFieldTrialParamByFeatureAsBool(kOptimizationHints, return GetFieldTrialParamByFeatureAsBool(kOptimizationHints,
@ -197,7 +197,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc
--- a/components/optimization_guide/core/prediction_model_download_manager.cc --- a/components/optimization_guide/core/prediction_model_download_manager.cc
+++ b/components/optimization_guide/core/prediction_model_download_manager.cc +++ b/components/optimization_guide/core/prediction_model_download_manager.cc
@@ -46,7 +46,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key"; @@ -45,7 +45,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key";
// we require models to come from. // we require models to come from.
constexpr uint8_t kPublisherKeyHash[] = { constexpr uint8_t kPublisherKeyHash[] = {
0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa, 0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa,
@ -206,7 +206,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a}; 0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a};
const net::NetworkTrafficAnnotationTag const net::NetworkTrafficAnnotationTag
kOptimizationGuidePredictionModelsTrafficAnnotation = kOptimizationGuidePredictionModelsTrafficAnnotation =
@@ -99,7 +99,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager( @@ -93,7 +93,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(
const base::FilePath& models_dir_path, const base::FilePath& models_dir_path,
scoped_refptr<base::SequencedTaskRunner> background_task_runner) scoped_refptr<base::SequencedTaskRunner> background_task_runner)
: download_service_(download_service), : download_service_(download_service),
@ -215,7 +215,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
api_key_(features::GetOptimizationGuideServiceAPIKey()), api_key_(features::GetOptimizationGuideServiceAPIKey()),
models_dir_path_(models_dir_path), models_dir_path_(models_dir_path),
background_task_runner_(background_task_runner) {} background_task_runner_(background_task_runner) {}
@@ -114,6 +114,7 @@ base::FilePath::StringType PredictionModelDownloadManager::ModelInfoFileName() { @@ -103,6 +103,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default;
void PredictionModelDownloadManager::StartDownload( void PredictionModelDownloadManager::StartDownload(
const GURL& download_url, const GURL& download_url,
proto::OptimizationTarget optimization_target) { proto::OptimizationTarget optimization_target) {
@ -223,7 +223,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
download::DownloadParams download_params; download::DownloadParams download_params;
download_params.client = download_params.client =
download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS; download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS;
@@ -250,6 +251,7 @@ void PredictionModelDownloadManager::OnDownloadFailed( @@ -239,6 +240,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(
absl::optional<std::pair<base::FilePath, base::FilePath>> absl::optional<std::pair<base::FilePath, base::FilePath>>
PredictionModelDownloadManager::VerifyDownload(const base::FilePath& file_path, PredictionModelDownloadManager::VerifyDownload(const base::FilePath& file_path,
bool delete_file_on_error) { bool delete_file_on_error) {
@ -279,7 +279,7 @@ diff --git a/components/permissions/features.cc b/components/permissions/feature
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -214,12 +214,8 @@ BASE_FEATURE(kMixedContentAutoupgrade, @@ -230,12 +230,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,
// predictor may preconnect/prefetch to resources/origins to make the // predictor may preconnect/prefetch to resources/origins to make the
// future navigations faster. // future navigations faster.
BASE_FEATURE(kNavigationPredictor, BASE_FEATURE(kNavigationPredictor,

4
build/patches/Disable-all-promo-dialogs.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -851,7 +851,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @@ -856,7 +856,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
* displayed. * displayed.
*/ */
private boolean triggerPromo(boolean intentWithEffect) { private boolean triggerPromo(boolean intentWithEffect) {
@ -19,7 +19,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) { if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) {
return false; return false;
} }
@@ -886,8 +886,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @@ -891,8 +891,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
preferenceManager.writeBoolean( preferenceManager.writeBoolean(
ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true); ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
} }

42
build/patches/Disable-conversion-measurement-api.patch
View file

@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -521,8 +521,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption, @@ -522,8 +522,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption,
base::FEATURE_DISABLED_BY_DEFAULT); base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kAppToWebAttribution, BASE_FEATURE(kAppToWebAttribution,
@ -103,7 +103,7 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
--- a/content/browser/attribution_reporting/attribution_host.cc --- a/content/browser/attribution_reporting/attribution_host.cc
+++ b/content/browser/attribution_reporting/attribution_host.cc +++ b/content/browser/attribution_reporting/attribution_host.cc
@@ -124,6 +124,7 @@ void AttributionHost::DidRedirectNavigation( @@ -126,6 +126,7 @@ void AttributionHost::DidRedirectNavigation(
return; return;
} }
@ -114,25 +114,25 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc
--- a/content/browser/attribution_reporting/attribution_report_network_sender.cc --- a/content/browser/attribution_reporting/attribution_report_network_sender.cc
+++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
@@ -110,13 +110,8 @@ void AttributionReportNetworkSender::SendReport( @@ -56,13 +56,8 @@ void AttributionReportNetworkSender::SendReport(
network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED; AttributionReport report,
simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode); bool is_debug_report,
ReportSentCallback sent_callback) {
- // Unretained is safe because the URLLoader is owned by |this| and will be - GURL url = report.ReportURL(is_debug_report);
- // deleted before |this|. - base::Value::Dict body = report.ReportBody();
- simple_url_loader_ptr->DownloadHeadersOnly( -
- url_loader_factory_.get(), - SendReport(std::move(url), body,
- base::BindOnce(&AttributionReportNetworkSender::OnReportSent, - base::BindOnce(&AttributionReportNetworkSender::OnReportSent,
- base::Unretained(this), std::move(it), std::move(report), - base::Unretained(this), std::move(report),
- is_debug_report, std::move(sent_callback))); - is_debug_report, std::move(sent_callback)));
+ // this is never called on Bromite but nothing would be sent if it were + // this is never called on Bromite but nothing would be sent if it were
+ OnReportSent(std::move(it), report, is_debug_report, std::move(sent_callback), nullptr); + OnReportSent(std::move(it), report, is_debug_report, std::move(sent_callback), nullptr);
} }
void AttributionReportNetworkSender::OnReportSent( void AttributionReportNetworkSender::SendReport(AttributionDebugReport report) {
@@ -125,6 +120,12 @@ void AttributionReportNetworkSender::OnReportSent( @@ -143,6 +138,12 @@ void AttributionReportNetworkSender::OnReportSent(
bool is_debug_report,
ReportSentCallback sent_callback, ReportSentCallback sent_callback,
UrlLoaderList::iterator it,
scoped_refptr<net::HttpResponseHeaders> headers) { scoped_refptr<net::HttpResponseHeaders> headers) {
+ if ((true)) { + if ((true)) {
+ std::move(sent_callback) + std::move(sent_callback)
@ -146,7 +146,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc
--- a/content/browser/attribution_reporting/attribution_storage_sql.cc --- a/content/browser/attribution_reporting/attribution_storage_sql.cc
+++ b/content/browser/attribution_reporting/attribution_storage_sql.cc +++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
@@ -422,6 +422,8 @@ DestinationLimitResult GetDestinationLimitResult( @@ -514,6 +514,8 @@ DestinationLimitResult GetDestinationLimitResult(
} }
} }
@ -155,7 +155,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
} // namespace } // namespace
// static // static
@@ -433,9 +435,9 @@ bool AttributionStorageSql::DeleteStorageForTesting( @@ -525,9 +527,9 @@ bool AttributionStorageSql::DeleteStorageForTesting(
AttributionStorageSql::AttributionStorageSql( AttributionStorageSql::AttributionStorageSql(
const base::FilePath& user_data_directory, const base::FilePath& user_data_directory,
std::unique_ptr<AttributionStorageDelegate> delegate) std::unique_ptr<AttributionStorageDelegate> delegate)
@ -171,7 +171,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
--- a/content/browser/storage_partition_impl.cc --- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc
@@ -1353,12 +1353,7 @@ void StoragePartitionImpl::Initialize( @@ -1358,12 +1358,7 @@ void StoragePartitionImpl::Initialize(
bucket_manager_ = std::make_unique<BucketManager>(this); bucket_manager_ = std::make_unique<BucketManager>(this);
@ -199,7 +199,7 @@ diff --git a/content/public/browser/navigation_controller.cc b/content/public/br
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -105,8 +105,8 @@ BASE_FEATURE(kBlockingDownloadsInAdFrameWithoutUserActivation, @@ -121,8 +121,8 @@ BASE_FEATURE(kBlockingDownloadsInAdFrameWithoutUserActivation,
// Controls whether the Conversion Measurement API infrastructure is enabled. // Controls whether the Conversion Measurement API infrastructure is enabled.
BASE_FEATURE(kConversionMeasurement, BASE_FEATURE(kConversionMeasurement,
@ -213,7 +213,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -176,6 +176,13 @@ @@ -201,6 +201,13 @@
}, },
data: [ data: [

2
build/patches/Disable-crash-reporting.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc --- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -241,8 +241,8 @@ BASE_FEATURE(kCooperativeScheduling, @@ -251,8 +251,8 @@ BASE_FEATURE(kCooperativeScheduling,
// Enables crash reporting via Reporting API. // Enables crash reporting via Reporting API.
// https://www.w3.org/TR/reporting/#crash-report // https://www.w3.org/TR/reporting/#crash-report
BASE_FEATURE(kCrashReporting, BASE_FEATURE(kCrashReporting,

28
build/patches/Disable-feeds-support-by-default.patch
View file

@ -5,14 +5,14 @@ Subject: Disable feeds support by default
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
--- ---
.../org/chromium/chrome/browser/feed/FeedFeatures.java | 8 +------- .../org/chromium/chrome/browser/feed/FeedFeatures.java | 8 +-------
.../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +- .../chromium/chrome/browser/flags/ChromeFeatureList.java | 2 +-
components/feed/feed_feature_list.cc | 8 ++++---- components/feed/feed_feature_list.cc | 8 ++++----
3 files changed, 6 insertions(+), 12 deletions(-) 3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
@@ -50,13 +50,7 @@ public final class FeedFeatures { @@ -48,13 +48,7 @@ public final class FeedFeatures {
* the user is signed in and confirms it's not a child profile. * the user is signed in and confirms it's not a child profile.
*/ */
public static boolean isWebFeedUIEnabled() { public static boolean isWebFeedUIEnabled() {
@ -27,18 +27,18 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe
} }
public static boolean shouldUseWebFeedAwarenessIPH() { public static boolean shouldUseWebFeedAwarenessIPH() {
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java diff --git 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
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- 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/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -78,7 +78,7 @@ public class CachedFeatureFlags { @@ -666,7 +666,7 @@ public abstract class ChromeFeatureList {
.put(ChromeFeatureList.INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false) new CachedFlag(INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false);
.put(ChromeFeatureList.INSTANCE_SWITCHER, true) public static final CachedFlag sInstanceSwitcher = new CachedFlag(INSTANCE_SWITCHER, true);
.put(ChromeFeatureList.INSTANT_START, false) public static final CachedFlag sInstantStart = new CachedFlag(INSTANT_START, false);
- .put(ChromeFeatureList.INTEREST_FEED_V2, true) - public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true);
+ .put(ChromeFeatureList.INTEREST_FEED_V2, false) + public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, false);
.put(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH, false) public static final CachedFlag sLensCameraAssistedSearch =
.put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true) new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, false);
.put(ChromeFeatureList.OMAHA_MIN_SDK_VERSION_ANDROID, false) public static final CachedFlag sNewWindowAppMenu = new CachedFlag(NEW_WINDOW_APP_MENU, true);
diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
--- a/components/feed/feed_feature_list.cc --- a/components/feed/feed_feature_list.cc
+++ b/components/feed/feed_feature_list.cc +++ b/components/feed/feed_feature_list.cc

8
build/patches/Disable-fetching-of-all-field-trials.patch
View file

@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn
--- a/android_webview/nonembedded/BUILD.gn --- a/android_webview/nonembedded/BUILD.gn
+++ b/android_webview/nonembedded/BUILD.gn +++ b/android_webview/nonembedded/BUILD.gn
@@ -106,7 +106,6 @@ android_library("services_java") { @@ -107,7 +107,6 @@ android_library("services_java") {
sources = [ sources = [
"java/src/org/chromium/android_webview/services/AwMinidumpUploadJobService.java", "java/src/org/chromium/android_webview/services/AwMinidumpUploadJobService.java",
"java/src/org/chromium/android_webview/services/AwMinidumpUploaderDelegate.java", "java/src/org/chromium/android_webview/services/AwMinidumpUploaderDelegate.java",
@ -31,7 +31,7 @@ diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/
"java/src/org/chromium/android_webview/services/ComponentUpdaterSafeModeUtils.java", "java/src/org/chromium/android_webview/services/ComponentUpdaterSafeModeUtils.java",
"java/src/org/chromium/android_webview/services/ComponentsProviderPathUtil.java", "java/src/org/chromium/android_webview/services/ComponentsProviderPathUtil.java",
"java/src/org/chromium/android_webview/services/ComponentsProviderService.java", "java/src/org/chromium/android_webview/services/ComponentsProviderService.java",
@@ -119,7 +118,6 @@ android_library("services_java") { @@ -120,7 +119,6 @@ android_library("services_java") {
"java/src/org/chromium/android_webview/services/SafeModeService.java", "java/src/org/chromium/android_webview/services/SafeModeService.java",
"java/src/org/chromium/android_webview/services/ServicesStatsHelper.java", "java/src/org/chromium/android_webview/services/ServicesStatsHelper.java",
"java/src/org/chromium/android_webview/services/StartupFeatureMetadataHolder.java", "java/src/org/chromium/android_webview/services/StartupFeatureMetadataHolder.java",
@ -173,7 +173,7 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v
diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
--- a/components/variations/service/variations_field_trial_creator.cc --- a/components/variations/service/variations_field_trial_creator.cc
+++ b/components/variations/service/variations_field_trial_creator.cc +++ b/components/variations/service/variations_field_trial_creator.cc
@@ -161,7 +161,8 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() { @@ -158,7 +158,8 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
// "--variations-server-url" switches are passed. It is however possible to // "--variations-server-url" switches are passed. It is however possible to
// apply the testing config as well as specify additional field trials (using // apply the testing config as well as specify additional field trials (using
// "--force-fieldtrials") by using the "--enable-field-trial-config" switch. // "--force-fieldtrials") by using the "--enable-field-trial-config" switch.
@ -218,7 +218,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
--- a/third_party/blink/renderer/core/loader/document_loader.cc --- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -173,13 +173,6 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials( @@ -174,13 +174,6 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
WebVector<int> CopyInitiatorOriginTrials( WebVector<int> CopyInitiatorOriginTrials(
const Vector<OriginTrialFeature>& initiator_origin_trial_features) { const Vector<OriginTrialFeature>& initiator_origin_trial_features) {
WebVector<int> result; WebVector<int> result;

2
build/patches/Disable-idle-detection.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc --- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -479,7 +479,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); @@ -501,7 +501,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
// This is intended as a kill switch for the Idle Detection feature. To enable // This is intended as a kill switch for the Idle Detection feature. To enable
// this feature, the experimental web platform features flag should be set, // this feature, the experimental web platform features flag should be set,
// or the site should obtain an Origin Trial token. // or the site should obtain an Origin Trial token.

2
build/patches/Disable-lock-icon-in-address-bar-by-default.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc
--- a/components/omnibox/common/omnibox_features.cc --- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc
@@ -433,8 +433,8 @@ BASE_FEATURE(kSiteSearchStarterPack, @@ -459,8 +459,8 @@ BASE_FEATURE(kSiteSearchStarterPack,
// Experiment to introduce new security indicators for HTTPS. // Experiment to introduce new security indicators for HTTPS.
BASE_FEATURE(kUpdatedConnectionSecurityIndicators, BASE_FEATURE(kUpdatedConnectionSecurityIndicators,

10
build/patches/Disable-media-router-and-remoting-by-default.patch
View file

@ -12,9 +12,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
--- a/chrome/browser/media/router/media_router_feature.cc --- a/chrome/browser/media/router/media_router_feature.cc
+++ b/chrome/browser/media/router/media_router_feature.cc +++ b/chrome/browser/media/router/media_router_feature.cc
@@ -59,26 +59,15 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop, @@ -60,26 +60,15 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
#endif // !BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
-namespace { -namespace {
-const PrefService::Preference* GetMediaRouterPref( -const PrefService::Preference* GetMediaRouterPref(
@ -45,7 +45,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
if (!base::FeatureList::IsEnabled(kMediaRouter)) if (!base::FeatureList::IsEnabled(kMediaRouter))
return false; return false;
@@ -106,7 +95,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) { @@ -107,7 +96,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
return allowed; return allowed;
} }
return true; return true;
@ -54,7 +54,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -119,7 +108,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -120,7 +109,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
PrefRegistry::PUBLIC); PrefRegistry::PUBLIC);
registry->RegisterBooleanPref( registry->RegisterBooleanPref(
@ -66,7 +66,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc
@@ -411,7 +411,7 @@ void ProfileImpl::RegisterProfilePrefs( @@ -413,7 +413,7 @@ void ProfileImpl::RegisterProfilePrefs(
#endif #endif
registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false); registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);

2
build/patches/Disable-plugins-enumeration.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -1920,9 +1920,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -1935,9 +1935,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
} }
PluginData* LocalFrame::GetPluginData() const { PluginData* LocalFrame::GetPluginData() const {

2
build/patches/Disable-references-to-fonts.googleapis.com.patch
View file

@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -299,7 +299,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest( @@ -301,7 +301,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
std::string DomDistillerViewerSource::GetContentSecurityPolicy( std::string DomDistillerViewerSource::GetContentSecurityPolicy(
network::mojom::CSPDirectiveName directive) { network::mojom::CSPDirectiveName directive) {
if (directive == network::mojom::CSPDirectiveName::StyleSrc) { if (directive == network::mojom::CSPDirectiveName::StyleSrc) {

298
build/patches/Disable-safe-browsing.patch
View file

@ -286,7 +286,7 @@ diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/and
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -338,8 +338,6 @@ static_library("browser") { @@ -316,8 +316,6 @@ static_library("browser") {
"complex_tasks/task_tab_helper.h", "complex_tasks/task_tab_helper.h",
"component_updater/autofill_regex_remover.cc", "component_updater/autofill_regex_remover.cc",
"component_updater/autofill_regex_remover.h", "component_updater/autofill_regex_remover.h",
@ -295,7 +295,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"component_updater/chrome_component_updater_configurator.cc", "component_updater/chrome_component_updater_configurator.cc",
"component_updater/chrome_component_updater_configurator.h", "component_updater/chrome_component_updater_configurator.h",
"component_updater/chrome_origin_trials_component_installer.cc", "component_updater/chrome_origin_trials_component_installer.cc",
@@ -352,8 +350,6 @@ static_library("browser") { @@ -330,8 +328,6 @@ static_library("browser") {
"component_updater/component_updater_utils.h", "component_updater/component_updater_utils.h",
"component_updater/crl_set_component_installer.cc", "component_updater/crl_set_component_installer.cc",
"component_updater/crl_set_component_installer.h", "component_updater/crl_set_component_installer.h",
@ -304,7 +304,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"component_updater/first_party_sets_component_installer.cc", "component_updater/first_party_sets_component_installer.cc",
"component_updater/first_party_sets_component_installer.h", "component_updater/first_party_sets_component_installer.h",
"component_updater/mei_preload_component_installer.cc", "component_updater/mei_preload_component_installer.cc",
@@ -1125,8 +1121,6 @@ static_library("browser") { @@ -1113,8 +1109,6 @@ static_library("browser") {
"permissions/adaptive_quiet_notification_permission_ui_enabler.h", "permissions/adaptive_quiet_notification_permission_ui_enabler.h",
"permissions/chrome_permissions_client.cc", "permissions/chrome_permissions_client.cc",
"permissions/chrome_permissions_client.h", "permissions/chrome_permissions_client.h",
@ -313,7 +313,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"permissions/crowd_deny_preload_data.cc", "permissions/crowd_deny_preload_data.cc",
"permissions/crowd_deny_preload_data.h", "permissions/crowd_deny_preload_data.h",
"permissions/crowd_deny_safe_browsing_request.cc", "permissions/crowd_deny_safe_browsing_request.cc",
@@ -1517,15 +1511,6 @@ static_library("browser") { @@ -1505,15 +1499,6 @@ static_library("browser") {
"renderer_host/chrome_navigation_ui_data.h", "renderer_host/chrome_navigation_ui_data.h",
"renderer_preferences_util.cc", "renderer_preferences_util.cc",
"renderer_preferences_util.h", "renderer_preferences_util.h",
@ -329,9 +329,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"resource_coordinator/resource_coordinator_parts.cc", "resource_coordinator/resource_coordinator_parts.cc",
"resource_coordinator/resource_coordinator_parts.h", "resource_coordinator/resource_coordinator_parts.h",
"resource_coordinator/session_restore_policy.cc", "resource_coordinator/session_restore_policy.cc",
@@ -2262,11 +2247,8 @@ static_library("browser") { @@ -2260,11 +2245,8 @@ static_library("browser") {
"//components/reporting/util:status",
"//components/reporting/util:status_macros", "//components/reporting/util:status_macros",
"//components/reporting/util:status_proto",
"//components/reporting/util:task_runner_context", "//components/reporting/util:task_runner_context",
- "//components/reputation/core", - "//components/reputation/core",
- "//components/reputation/core:proto", - "//components/reputation/core:proto",
@ -341,7 +341,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/browser/web_ui",
@@ -3245,12 +3227,6 @@ static_library("browser") { @@ -3208,12 +3190,6 @@ static_library("browser") {
"profiles/profile_manager_android.cc", "profiles/profile_manager_android.cc",
"profiles/profile_manager_android.h", "profiles/profile_manager_android.h",
"query_tiles/android/tile_provider_factory.cc", "query_tiles/android/tile_provider_factory.cc",
@ -354,7 +354,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"safe_browsing/android/password_reuse_controller_android.cc", "safe_browsing/android/password_reuse_controller_android.cc",
"safe_browsing/android/password_reuse_controller_android.h", "safe_browsing/android/password_reuse_controller_android.h",
"safe_browsing/android/safe_browsing_referring_app_bridge_android.cc", "safe_browsing/android/safe_browsing_referring_app_bridge_android.cc",
@@ -3733,8 +3709,6 @@ static_library("browser") { @@ -3701,8 +3677,6 @@ static_library("browser") {
"download/download_commands.h", "download/download_commands.h",
"download/download_crx_util.cc", "download/download_crx_util.cc",
"download/download_crx_util.h", "download/download_crx_util.h",
@ -363,9 +363,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"download/download_dir_policy_handler.cc", "download/download_dir_policy_handler.cc",
"download/download_dir_policy_handler.h", "download/download_dir_policy_handler.h",
"download/download_dir_util.cc", "download/download_dir_util.cc",
@@ -8259,8 +8233,6 @@ static_library("test_support") { @@ -8248,8 +8222,6 @@ static_library("test_support") {
"//components/reporting/util:status",
"//components/reporting/util:status_macros", "//components/reporting/util:status_macros",
"//components/reporting/util:status_proto",
"//components/reporting/util:task_runner_context", "//components/reporting/util:task_runner_context",
- "//components/reputation/core", - "//components/reputation/core",
- "//components/reputation/core:proto", - "//components/reputation/core:proto",
@ -535,7 +535,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -641,10 +641,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( @@ -633,10 +633,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr; network::mojom::NetworkContext* safe_browsing_context = nullptr;
@ -551,7 +551,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -113,6 +113,7 @@ @@ -117,6 +117,7 @@
#include "chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h" #include "chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h"
#include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h"
#include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/renderer_preferences_util.h"
@ -559,7 +559,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#include "chrome/browser/safe_browsing/certificate_reporting_service.h" #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
#include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
@@ -120,6 +121,7 @@ @@ -124,6 +125,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/url_checker_delegate_impl.h" #include "chrome/browser/safe_browsing/url_checker_delegate_impl.h"
#include "chrome/browser/safe_browsing/url_lookup_service_factory.h" #include "chrome/browser/safe_browsing/url_lookup_service_factory.h"
@ -567,7 +567,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#include "chrome/browser/search/search.h" #include "chrome/browser/search/search.h"
#include "chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.h" #include "chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.h"
#include "chrome/browser/sharing/sms/sms_remote_fetcher.h" #include "chrome/browser/sharing/sms/sms_remote_fetcher.h"
@@ -1025,9 +1027,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { @@ -1036,9 +1038,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
class CertificateReportingServiceCertReporter : public SSLCertReporter { class CertificateReportingServiceCertReporter : public SSLCertReporter {
public: public:
explicit CertificateReportingServiceCertReporter( explicit CertificateReportingServiceCertReporter(
@ -578,7 +578,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
CertificateReportingServiceCertReporter( CertificateReportingServiceCertReporter(
const CertificateReportingServiceCertReporter&) = delete; const CertificateReportingServiceCertReporter&) = delete;
@@ -1039,11 +1039,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter { @@ -1050,11 +1050,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter {
// SSLCertReporter implementation // SSLCertReporter implementation
void ReportInvalidCertificateChain( void ReportInvalidCertificateChain(
const std::string& serialized_report) override { const std::string& serialized_report) override {
@ -590,7 +590,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
}; };
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -1295,14 +1293,6 @@ void MaybeAddThrottle( @@ -1306,14 +1304,6 @@ void MaybeAddThrottle(
throttles->push_back(std::move(maybe_throttle)); throttles->push_back(std::move(maybe_throttle));
} }
@ -605,7 +605,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
void MaybeAddThrottles( void MaybeAddThrottles(
std::vector<std::unique_ptr<content::NavigationThrottle>> additional, std::vector<std::unique_ptr<content::NavigationThrottle>> additional,
std::vector<std::unique_ptr<content::NavigationThrottle>>* combined) { std::vector<std::unique_ptr<content::NavigationThrottle>>* combined) {
@@ -2394,7 +2384,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( @@ -2506,7 +2496,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
} }
#elif BUILDFLAG(IS_POSIX) #elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
@ -614,7 +614,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#elif BUILDFLAG(IS_CHROMEOS) #elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false; bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) { if (crash_reporter::IsCrashpadEnabled()) {
@@ -4681,6 +4671,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( @@ -4898,6 +4888,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
&throttles); &throttles);
#endif #endif
@ -622,7 +622,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
// g_browser_process->safe_browsing_service() may be null in unittests. // g_browser_process->safe_browsing_service() may be null in unittests.
safe_browsing::SafeBrowsingUIManager* ui_manager = safe_browsing::SafeBrowsingUIManager* ui_manager =
g_browser_process->safe_browsing_service() g_browser_process->safe_browsing_service()
@@ -4696,6 +4687,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( @@ -4913,6 +4904,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>( std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
handle)); handle));
} }
@ -630,7 +630,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -4936,7 +4928,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState( @@ -5153,7 +5145,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState(
void ChromeContentBrowserClient::InitOnUIThread() { void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -640,7 +640,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
// Initialize `network_contexts_parent_directory_`. // Initialize `network_contexts_parent_directory_`.
base::FilePath user_data_dir; base::FilePath user_data_dir;
@@ -6132,6 +6126,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( @@ -6332,6 +6326,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
const std::vector<std::string>& allowlist_domains) { const std::vector<std::string>& allowlist_domains) {
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
@ -648,7 +648,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
// Should not bypass safe browsing check if the check is for enterprise // Should not bypass safe browsing check if the check is for enterprise
// lookup. // lookup.
if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled) if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled)
@@ -6152,6 +6147,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( @@ -6352,6 +6347,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
} }
return safe_browsing_url_checker_delegate_; return safe_browsing_url_checker_delegate_;
@ -658,7 +658,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
} }
safe_browsing::RealTimeUrlLookupServiceBase* safe_browsing::RealTimeUrlLookupServiceBase*
@@ -6159,24 +6157,28 @@ ChromeContentBrowserClient::GetUrlLookupService( @@ -6359,24 +6357,28 @@ ChromeContentBrowserClient::GetUrlLookupService(
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
bool is_enterprise_lookup_enabled, bool is_enterprise_lookup_enabled,
bool is_consumer_lookup_enabled) { bool is_consumer_lookup_enabled) {
@ -691,7 +691,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
--- a/chrome/browser/chrome_content_browser_client.h --- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h
@@ -922,9 +922,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -934,9 +934,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
// Parts are deleted in the reverse order they are added. // Parts are deleted in the reverse order they are added.
std::vector<ChromeContentBrowserClientParts*> extra_parts_; std::vector<ChromeContentBrowserClientParts*> extra_parts_;
@ -772,10 +772,10 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
#include "components/component_updater/installer_policies/on_device_head_suggest_component_installer.h" #include "components/component_updater/installer_policies/on_device_head_suggest_component_installer.h"
#include "components/component_updater/installer_policies/optimization_hints_component_installer.h" #include "components/component_updater/installer_policies/optimization_hints_component_installer.h"
-#include "components/component_updater/installer_policies/safety_tips_component_installer.h" -#include "components/component_updater/installer_policies/safety_tips_component_installer.h"
#include "components/component_updater/installer_policies/url_param_classification_component_installer.h" #include "components/component_updater/url_param_filter_remover.h"
#include "components/nacl/common/buildflags.h" #include "components/nacl/common/buildflags.h"
#include "components/services/screen_ai/buildflags/buildflags.h" #include "components/services/screen_ai/buildflags/buildflags.h"
@@ -192,9 +190,6 @@ void RegisterComponentsForUpdate() { @@ -194,9 +192,6 @@ void RegisterComponentsForUpdate() {
MaybeRegisterPKIMetadataComponent(cus); MaybeRegisterPKIMetadataComponent(cus);
@ -785,7 +785,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
#if BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
RegisterSmartDimComponent(cus); RegisterSmartDimComponent(cus);
RegisterAppProvisioningComponent(cus); RegisterAppProvisioningComponent(cus);
@@ -215,8 +210,6 @@ void RegisterComponentsForUpdate() { @@ -217,8 +212,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state()); RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
@ -797,7 +797,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
--- a/chrome/browser/download/chrome_download_manager_delegate.cc --- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -42,15 +42,19 @@ @@ -43,15 +43,19 @@
#include "chrome/browser/download/mixed_content_download_blocking.h" #include "chrome/browser/download/mixed_content_download_blocking.h"
#include "chrome/browser/download/save_package_file_picker.h" #include "chrome/browser/download/save_package_file_picker.h"
#include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/common.h"
@ -817,7 +817,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
#include "chrome/common/buildflags.h" #include "chrome/common/buildflags.h"
@@ -71,9 +75,11 @@ @@ -72,9 +76,11 @@
#include "components/prefs/pref_member.h" #include "components/prefs/pref_member.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/buildflags.h"
@ -839,8 +839,8 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
+#endif +#endif
using ConnectionType = net::NetworkChangeNotifier::ConnectionType; using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
namespace { #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -348,12 +356,12 @@ void HandleMixedDownloadInfoBarResult( @@ -353,12 +361,12 @@ void HandleMixedDownloadInfoBarResult(
} }
#endif #endif
@ -854,7 +854,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (download_restriction != if (download_restriction !=
DownloadPrefs::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES && DownloadPrefs::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES &&
download_restriction != download_restriction !=
@@ -390,8 +398,8 @@ void MaybeReportDangerousDownloadBlocked( @@ -395,8 +403,8 @@ void MaybeReportDangerousDownloadBlocked(
danger_type, download->GetMimeType(), /*scan_id*/ "", danger_type, download->GetMimeType(), /*scan_id*/ "",
download->GetTotalBytes(), safe_browsing::EventResult::BLOCKED); download->GetTotalBytes(), safe_browsing::EventResult::BLOCKED);
} }
@ -864,7 +864,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#if BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(FULL_SAFE_BROWSING)
download::DownloadDangerType SavePackageDangerType( download::DownloadDangerType SavePackageDangerType(
@@ -449,13 +457,6 @@ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { @@ -454,13 +462,6 @@ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm; download_manager_ = dm;
@ -878,7 +878,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (download_manager_) { if (download_manager_) {
download_manager_->AddObserver(this); download_manager_->AddObserver(this);
} }
@@ -808,17 +809,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath( @@ -825,17 +826,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename, base::FilePath* filename,
const GURL& source_url) { const GURL& source_url) {
@ -896,7 +896,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
} }
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
@@ -890,9 +880,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) { @@ -907,9 +897,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
chrome::ShowSettingsSubPage(browser, "certificates"); chrome::ShowSettingsSubPage(browser, "certificates");
else else
browser->OpenURL(params); browser->OpenURL(params);
@ -906,7 +906,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
} }
@@ -948,18 +935,18 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() { @@ -965,18 +952,18 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
return std::string(chrome::kApplicationClientIDStringForAVScanning); return std::string(chrome::kApplicationClientIDStringForAVScanning);
} }
@ -927,7 +927,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
void ChromeDownloadManagerDelegate::GetMixedContentStatus( void ChromeDownloadManagerDelegate::GetMixedContentStatus(
download::DownloadItem* download, download::DownloadItem* download,
@@ -1504,8 +1491,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( @@ -1520,8 +1507,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
DownloadItemModel model(item); DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser( model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info->target_path, target_info->is_filetype_handled_safely); target_info->target_path, target_info->is_filetype_handled_safely);
@ -939,7 +939,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (ShouldBlockFile(item, target_info->danger_type)) { if (ShouldBlockFile(item, target_info->danger_type)) {
MaybeReportDangerousDownloadBlocked( MaybeReportDangerousDownloadBlocked(
download_prefs_->download_restriction(), "DANGEROUS_FILE_TYPE", download_prefs_->download_restriction(), "DANGEROUS_FILE_TYPE",
@@ -1514,6 +1504,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( @@ -1530,6 +1520,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
// A dangerous type would take precedence over the blocking of the file. // A dangerous type would take precedence over the blocking of the file.
target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS; target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS;
} }
@ -947,7 +947,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
base::FilePath target_path = target_info->target_path; base::FilePath target_path = target_info->target_path;
@@ -1583,6 +1574,7 @@ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( @@ -1599,6 +1590,7 @@ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
bool ChromeDownloadManagerDelegate::ShouldBlockFile( bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item, download::DownloadItem* item,
download::DownloadDangerType danger_type) const { download::DownloadDangerType danger_type) const {
@ -955,7 +955,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
DownloadPrefs::DownloadRestriction download_restriction = DownloadPrefs::DownloadRestriction download_restriction =
download_prefs_->download_restriction(); download_prefs_->download_restriction();
@@ -1633,7 +1625,7 @@ bool ChromeDownloadManagerDelegate::ShouldBlockFile( @@ -1649,7 +1641,7 @@ bool ChromeDownloadManagerDelegate::ShouldBlockFile(
LOG(ERROR) << "Invalid download restruction value: " LOG(ERROR) << "Invalid download restruction value: "
<< static_cast<int>(download_restriction); << static_cast<int>(download_restriction);
} }
@ -964,7 +964,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
return false; return false;
} }
@@ -1647,7 +1639,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport( @@ -1663,7 +1655,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
service->MaybeSendDangerousDownloadOpenedReport(download, service->MaybeSendDangerousDownloadOpenedReport(download,
show_download_in_folder); show_download_in_folder);
} }
@ -972,7 +972,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (!download->GetAutoOpened()) { if (!download->GetAutoOpened()) {
download::DownloadContent download_content = download::DownloadContent download_content =
download::DownloadContentFromMimeType(download->GetMimeType(), false); download::DownloadContentFromMimeType(download->GetMimeType(), false);
@@ -1655,6 +1646,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport( @@ -1671,6 +1662,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
download->GetDangerType(), download_content, base::Time::Now(), download->GetDangerType(), download_content, base::Time::Now(),
download->GetEndTime(), show_download_in_folder); download->GetEndTime(), show_download_in_folder);
} }
@ -983,7 +983,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
--- a/chrome/browser/download/chrome_download_manager_delegate.h --- a/chrome/browser/download/chrome_download_manager_delegate.h
+++ b/chrome/browser/download/chrome_download_manager_delegate.h +++ b/chrome/browser/download/chrome_download_manager_delegate.h
@@ -21,8 +21,10 @@ @@ -22,8 +22,10 @@
#include "chrome/browser/download/download_completion_blocker.h" #include "chrome/browser/download/download_completion_blocker.h"
#include "chrome/browser/download/download_target_determiner_delegate.h" #include "chrome/browser/download/download_target_determiner_delegate.h"
#include "chrome/browser/download/download_target_info.h" #include "chrome/browser/download/download_target_info.h"
@ -994,7 +994,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
#include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_danger_type.h"
#include "components/download/public/common/download_item.h" #include "components/download/public/common/download_item.h"
#include "components/download/public/common/download_path_reservation_tracker.h" #include "components/download/public/common/download_path_reservation_tracker.h"
@@ -150,7 +152,7 @@ class ChromeDownloadManagerDelegate @@ -151,7 +153,7 @@ class ChromeDownloadManagerDelegate
DownloadPrefs* download_prefs() { return download_prefs_.get(); } DownloadPrefs* download_prefs() { return download_prefs_.get(); }
@ -1003,7 +1003,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
// The state of a safebrowsing check. // The state of a safebrowsing check.
class SafeBrowsingState : public DownloadCompletionBlocker { class SafeBrowsingState : public DownloadCompletionBlocker {
public: public:
@@ -165,7 +167,6 @@ class ChromeDownloadManagerDelegate @@ -166,7 +168,6 @@ class ChromeDownloadManagerDelegate
// a download item. // a download item.
static const char kSafeBrowsingUserDataKey[]; static const char kSafeBrowsingUserDataKey[];
}; };
@ -1011,7 +1011,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
// Callback function after the DownloadProtectionService completes. // Callback function after the DownloadProtectionService completes.
void CheckClientDownloadDone(uint32_t download_id, void CheckClientDownloadDone(uint32_t download_id,
@@ -174,6 +175,7 @@ class ChromeDownloadManagerDelegate @@ -175,6 +176,7 @@ class ChromeDownloadManagerDelegate
// Callback function after scanning completes for a save package. // Callback function after scanning completes for a save package.
void CheckSavePackageScanningDone(uint32_t download_id, void CheckSavePackageScanningDone(uint32_t download_id,
safe_browsing::DownloadCheckResult result); safe_browsing::DownloadCheckResult result);
@ -1019,7 +1019,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
base::WeakPtr<ChromeDownloadManagerDelegate> GetWeakPtr(); base::WeakPtr<ChromeDownloadManagerDelegate> GetWeakPtr();
@@ -196,8 +198,10 @@ class ChromeDownloadManagerDelegate @@ -197,8 +199,10 @@ class ChromeDownloadManagerDelegate
virtual bool IsOpenInBrowserPreferreredForFile(const base::FilePath& path); virtual bool IsOpenInBrowserPreferreredForFile(const base::FilePath& path);
protected: protected:
@ -1086,7 +1086,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
is_being_revived_(false) {} is_being_revived_(false) {}
#if BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -490,6 +500,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { @@ -521,6 +531,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
data->should_prefer_opening_in_browser_ = preference; data->should_prefer_opening_in_browser_ = preference;
} }
@ -1094,7 +1094,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
const DownloadItemModelData* data = DownloadItemModelData::Get(download_); const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS; return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS;
@@ -500,6 +511,7 @@ void DownloadItemModel::SetDangerLevel( @@ -531,6 +542,7 @@ void DownloadItemModel::SetDangerLevel(
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level; data->danger_level_ = danger_level;
} }
@ -1102,7 +1102,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
download::DownloadItem::MixedContentStatus download::DownloadItem::MixedContentStatus
DownloadItemModel::GetMixedContentStatus() const { DownloadItemModel::GetMixedContentStatus() const {
@@ -719,9 +731,6 @@ bool DownloadItemModel::IsCommandEnabled( @@ -750,9 +762,6 @@ bool DownloadItemModel::IsCommandEnabled(
// filename. Don't base an "Always open" decision based on it. Also // filename. Don't base an "Always open" decision based on it. Also
// exclude extensions. // exclude extensions.
return download_->CanOpenDownload() && return download_->CanOpenDownload() &&
@ -1242,7 +1242,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
@@ -67,13 +69,16 @@ @@ -68,13 +70,16 @@
using content::BrowserThread; using content::BrowserThread;
using download::DownloadItem; using download::DownloadItem;
using download::DownloadPathReservationTracker; using download::DownloadPathReservationTracker;
@ -1259,7 +1259,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
// Condenses the results from HistoryService::GetVisibleVisitCountToHost() to a // Condenses the results from HistoryService::GetVisibleVisitCountToHost() to a
// single bool. A host is considered visited before if prior visible visits were // single bool. A host is considered visited before if prior visible visits were
// found in history and the first such visit was earlier than the most recent // found in history and the first such visit was earlier than the most recent
@@ -84,6 +89,7 @@ void VisitCountsToVisitedBefore(base::OnceCallback<void(bool)> callback, @@ -85,6 +90,7 @@ void VisitCountsToVisitedBefore(base::OnceCallback<void(bool)> callback,
result.success && result.count > 0 && result.success && result.count > 0 &&
(result.first_visit.LocalMidnight() < base::Time::Now().LocalMidnight())); (result.first_visit.LocalMidnight() < base::Time::Now().LocalMidnight()));
} }
@ -1267,7 +1267,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
// Keeps track of whether Adobe Reader is up to date. // Keeps track of whether Adobe Reader is up to date.
@@ -108,7 +114,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer( @@ -124,7 +130,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer(
create_target_directory_(false), create_target_directory_(false),
conflict_action_(conflict_action), conflict_action_(conflict_action),
danger_type_(download->GetDangerType()), danger_type_(download->GetDangerType()),
@ -1277,7 +1277,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
virtual_path_(initial_virtual_path), virtual_path_(initial_virtual_path),
is_filetype_handled_safely_(false), is_filetype_handled_safely_(false),
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
@@ -299,12 +307,14 @@ base::FilePath DownloadTargetDeterminer::GenerateFileName() const { @@ -315,12 +323,14 @@ base::FilePath DownloadTargetDeterminer::GenerateFileName() const {
download_->GetURL(), download_->GetContentDisposition(), referrer_charset, download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
suggested_filename, sniffed_mime_type, default_filename); suggested_filename, sniffed_mime_type, default_filename);
@ -1293,7 +1293,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
// If no mime type or explicitly specified a name, don't replace file // If no mime type or explicitly specified a name, don't replace file
// extension. // extension.
@@ -920,6 +930,7 @@ DownloadTargetDeterminer::Result @@ -946,6 +956,7 @@ DownloadTargetDeterminer::Result
return CONTINUE; return CONTINUE;
} }
@ -1301,7 +1301,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
// First determine the danger level assuming that the user doesn't have any // First determine the danger level assuming that the user doesn't have any
// prior visits to the referrer recoreded in history. The resulting danger // prior visits to the referrer recoreded in history. The resulting danger
// level would be ALLOW_ON_USER_GESTURE if the level depends on the visit // level would be ALLOW_ON_USER_GESTURE if the level depends on the visit
@@ -956,6 +967,7 @@ DownloadTargetDeterminer::Result @@ -982,6 +993,7 @@ DownloadTargetDeterminer::Result
// invalid, then assume the referrer has not been visited before. // invalid, then assume the referrer has not been visited before.
if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
@ -1309,7 +1309,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
return CONTINUE; return CONTINUE;
} }
@@ -963,6 +975,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( @@ -989,6 +1001,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
bool visited_referrer_before) { bool visited_referrer_before) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
@ -1317,7 +1317,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
safe_browsing::RecordDownloadFileTypeAttributes( safe_browsing::RecordDownloadFileTypeAttributes(
safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel(
virtual_path_.BaseName(), download_->GetURL(), virtual_path_.BaseName(), download_->GetURL(),
@@ -974,6 +987,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( @@ -1000,6 +1013,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
if (danger_level_ != DownloadFileType::NOT_DANGEROUS && if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
@ -1325,7 +1325,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
DoLoop(); DoLoop();
} }
@@ -1072,7 +1086,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( @@ -1098,7 +1112,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
<< " Intermediate:" << intermediate_path_.AsUTF8Unsafe() << " Intermediate:" << intermediate_path_.AsUTF8Unsafe()
<< " Confirmation reason:" << static_cast<int>(confirmation_reason_) << " Confirmation reason:" << static_cast<int>(confirmation_reason_)
<< " Danger type:" << danger_type_ << " Danger type:" << danger_type_
@ -1335,7 +1335,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
<< " Result:" << static_cast<int>(result); << " Result:" << static_cast<int>(result);
std::unique_ptr<DownloadTargetInfo> target_info(new DownloadTargetInfo); std::unique_ptr<DownloadTargetInfo> target_info(new DownloadTargetInfo);
@@ -1084,7 +1100,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( @@ -1110,7 +1126,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
? DownloadItem::TARGET_DISPOSITION_PROMPT ? DownloadItem::TARGET_DISPOSITION_PROMPT
: DownloadItem::TARGET_DISPOSITION_OVERWRITE); : DownloadItem::TARGET_DISPOSITION_OVERWRITE);
target_info->danger_type = danger_type_; target_info->danger_type = danger_type_;
@ -1345,7 +1345,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
target_info->intermediate_path = intermediate_path_; target_info->intermediate_path = intermediate_path_;
target_info->mime_type = mime_type_; target_info->mime_type = mime_type_;
target_info->is_filetype_handled_safely = is_filetype_handled_safely_; target_info->is_filetype_handled_safely = is_filetype_handled_safely_;
@@ -1177,54 +1195,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const { @@ -1203,54 +1221,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const {
DownloadItem::TARGET_DISPOSITION_PROMPT); DownloadItem::TARGET_DISPOSITION_PROMPT);
} }
@ -1401,7 +1401,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
} }
absl::optional<base::Time> absl::optional<base::Time>
@@ -1238,6 +1213,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -1264,6 +1239,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
EventType::DANGEROUS_DOWNLOAD_BYPASS) EventType::DANGEROUS_DOWNLOAD_BYPASS)
: absl::nullopt; : absl::nullopt;
} }
@ -1412,7 +1412,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h
--- a/chrome/browser/download/download_target_determiner.h --- a/chrome/browser/download/download_target_determiner.h
+++ b/chrome/browser/download/download_target_determiner.h +++ b/chrome/browser/download/download_target_determiner.h
@@ -20,7 +20,9 @@ @@ -19,7 +19,9 @@
#include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_danger_type.h"
#include "components/download/public/common/download_item.h" #include "components/download/public/common/download_item.h"
#include "components/download/public/common/download_path_reservation_tracker.h" #include "components/download/public/common/download_path_reservation_tracker.h"
@ -1422,7 +1422,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
#include "content/public/browser/download_manager_delegate.h" #include "content/public/browser/download_manager_delegate.h"
#include "ppapi/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h"
@@ -341,6 +343,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { @@ -340,6 +342,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
// operation. // operation.
bool HasPromptedForPath() const; bool HasPromptedForPath() const;
@ -1430,7 +1430,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
// Returns true if this download should show the "dangerous file" warning. // Returns true if this download should show the "dangerous file" warning.
// Various factors are considered, such as the type of the file, whether a // Various factors are considered, such as the type of the file, whether a
// user action initiated the download, and whether the user has explicitly // user action initiated the download, and whether the user has explicitly
@@ -350,6 +353,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { @@ -349,6 +352,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
// to true if the download requires explicit user consent. // to true if the download requires explicit user consent.
safe_browsing::DownloadFileType::DangerLevel GetDangerLevel( safe_browsing::DownloadFileType::DangerLevel GetDangerLevel(
PriorVisitsToReferrer visits) const; PriorVisitsToReferrer visits) const;
@ -1438,7 +1438,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
// Returns the timestamp of the last download bypass. // Returns the timestamp of the last download bypass.
absl::optional<base::Time> GetLastDownloadBypassTimestamp() const; absl::optional<base::Time> GetLastDownloadBypassTimestamp() const;
@@ -369,7 +373,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { @@ -368,7 +372,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
download::DownloadPathReservationTracker::FilenameConflictAction download::DownloadPathReservationTracker::FilenameConflictAction
conflict_action_; conflict_action_;
download::DownloadDangerType danger_type_; download::DownloadDangerType danger_type_;
@ -1565,7 +1565,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
#include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h" #include "chrome/browser/download/download_prefs.h"
@@ -1302,9 +1301,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {} @@ -1361,9 +1360,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {}
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@ -1575,7 +1575,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::unique_ptr<downloads::AcceptDanger::Params> params( std::unique_ptr<downloads::AcceptDanger::Params> params(
downloads::AcceptDanger::Params::Create(args())); downloads::AcceptDanger::Params::Create(args()));
@@ -1342,42 +1338,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) { @@ -1401,42 +1397,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) {
return; return;
} }
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@ -1661,7 +1661,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -1277,21 +1277,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() { @@ -1282,21 +1282,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() {
GetExtensionStatus::Params::Create(args())); GetExtensionStatus::Params::Create(args()));
EXTENSION_FUNCTION_VALIDATE(params); EXTENSION_FUNCTION_VALIDATE(params);
@ -1689,9 +1689,9 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -37,8 +37,11 @@ @@ -32,8 +32,11 @@
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h" #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
#include "chrome/browser/installable/installable_utils.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
+#if defined(FULL_SAFE_BROWSING) +#if defined(FULL_SAFE_BROWSING)
#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
@ -1701,23 +1701,23 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
#include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/browser/ui/file_system_access_dialogs.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
#include "chrome/common/pdf_util.h" #include "chrome/common/pdf_util.h"
@@ -48,7 +51,6 @@ @@ -42,7 +45,6 @@
#include "components/content_settings/core/common/content_settings_utils.h" #include "components/content_settings/core/common/content_settings.h"
#include "components/permissions/permission_util.h" #include "components/permissions/permission_util.h"
#include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/buildflags.h"
-#include "components/safe_browsing/content/common/file_type_policies.h" -#include "components/safe_browsing/content/common/file_type_policies.h"
#include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/disallow_activation_reason.h" #include "content/public/browser/disallow_activation_reason.h"
@@ -146,6 +148,7 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread( @@ -142,6 +144,7 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
origin, path, handle_type, std::move(callback), web_contents); origin, handle_type, std::move(callback), web_contents);
} }
+#if defined(FULL_SAFE_BROWSING) +#if defined(FULL_SAFE_BROWSING)
void ShowFileSystemAccessDangerousFileDialogOnUIThread( void ShowFileSystemAccessDangerousFileDialogOnUIThread(
content::GlobalRenderFrameHostId frame_id, content::GlobalRenderFrameHostId frame_id,
const url::Origin& origin, const url::Origin& origin,
@@ -174,6 +177,7 @@ void ShowFileSystemAccessDangerousFileDialogOnUIThread( @@ -170,6 +173,7 @@ void ShowFileSystemAccessDangerousFileDialogOnUIThread(
ShowFileSystemAccessDangerousFileDialog(origin, path, std::move(callback), ShowFileSystemAccessDangerousFileDialog(origin, path, std::move(callback),
web_contents); web_contents);
} }
@ -1725,15 +1725,15 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
// Sentinel used to indicate that no PathService key is specified for a path in // Sentinel used to indicate that no PathService key is specified for a path in
// the struct below. // the struct below.
@@ -344,6 +348,7 @@ BindResultCallbackToCurrentSequence( @@ -330,6 +334,7 @@ bool ShouldBlockAccessToPath(const base::FilePath& check_path,
base::SequencedTaskRunnerHandle::Get(), std::move(callback)); return true;
} }
+#if defined(FULL_SAFE_BROWSING) +#if defined(FULL_SAFE_BROWSING)
void DoSafeBrowsingCheckOnUIThread( void DoSafeBrowsingCheckOnUIThread(
content::GlobalRenderFrameHostId frame_id, content::GlobalRenderFrameHostId frame_id,
std::unique_ptr<content::FileSystemAccessWriteItem> item, std::unique_ptr<content::FileSystemAccessWriteItem> item,
@@ -422,6 +427,7 @@ InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) { @@ -408,6 +413,7 @@ InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) {
NOTREACHED(); NOTREACHED();
return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::kBlock; return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::kBlock;
} }
@ -1741,50 +1741,50 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
std::string GenerateLastPickedDirectoryKey(const std::string& id) { std::string GenerateLastPickedDirectoryKey(const std::string& id) {
return id.empty() ? kDefaultLastPickedDirectoryKey return id.empty() ? kDefaultLastPickedDirectoryKey
@@ -1204,6 +1210,7 @@ void ChromeFileSystemAccessPermissionContext::ConfirmSensitiveEntryAccess( @@ -1249,6 +1255,7 @@ void ChromeFileSystemAccessPermissionContext::CheckPathAgainstBlocklist(
frame_id, std::move(callback))); std::move(callback));
} }
+#if defined(FULL_SAFE_BROWSING) +#if defined(FULL_SAFE_BROWSING)
void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
std::unique_ptr<content::FileSystemAccessWriteItem> item, std::unique_ptr<content::FileSystemAccessWriteItem> item,
content::GlobalRenderFrameHostId frame_id, content::GlobalRenderFrameHostId frame_id,
@@ -1225,6 +1232,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( @@ -1271,6 +1278,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
}, base::SequencedTaskRunner::GetCurrentDefault(),
base::SequencedTaskRunnerHandle::Get(), std::move(callback)))); std::move(callback))));
} }
+#endif +#endif
void ChromeFileSystemAccessPermissionContext:: void ChromeFileSystemAccessPermissionContext::DidCheckPathAgainstBlocklist(
DidConfirmSensitiveDirectoryAccess( const url::Origin& origin,
@@ -1236,6 +1244,7 @@ void ChromeFileSystemAccessPermissionContext:: @@ -1282,6 +1290,7 @@ void ChromeFileSystemAccessPermissionContext::DidCheckPathAgainstBlocklist(
base::OnceCallback<void(SensitiveEntryResult)> callback, bool should_block) {
bool should_block) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+#if defined(FULL_SAFE_BROWSING) +#if defined(FULL_SAFE_BROWSING)
if (!should_block) { if (should_block) {
// If attempting to save a file with a dangerous extension, prompt the user auto result_callback = base::BindPostTask(
// to make them confirm they actually want to save the file. base::SequencedTaskRunner::GetCurrentDefault(), std::move(callback));
@@ -1261,6 +1270,7 @@ void ChromeFileSystemAccessPermissionContext:: @@ -1306,6 +1315,7 @@ void ChromeFileSystemAccessPermissionContext::DidCheckPathAgainstBlocklist(
std::move(callback).Run(SensitiveEntryResult::kAllowed); frame_id, origin, path, std::move(result_callback)));
return; return;
} }
+#endif +#endif
auto result_callback = std::move(callback).Run(SensitiveEntryResult::kAllowed);
BindResultCallbackToCurrentSequence(std::move(callback)); }
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#include "components/keyed_service/core/keyed_service.h"
#include "components/permissions/object_permission_context_base.h"
#include "components/permissions/permission_util.h"
+#include "components/safe_browsing/buildflags.h"
#include "content/public/browser/file_system_access_permission_context.h" #include "content/public/browser/file_system_access_permission_context.h"
#include "third_party/blink/public/mojom/file_system_access/file_system_access_manager.mojom-forward.h" #include "third_party/blink/public/mojom/file_system_access/file_system_access_manager.mojom-forward.h"
#include "third_party/blink/public/mojom/permissions/permission_status.mojom.h" #include "third_party/blink/public/mojom/permissions/permission_status.mojom.h"
@@ -88,10 +89,6 @@ class ChromeFileSystemAccessPermissionContext +#include "components/safe_browsing/buildflags.h"
class HostContentSettingsMap;
enum ContentSetting;
@@ -85,10 +86,6 @@ class ChromeFileSystemAccessPermissionContext
UserAction user_action, UserAction user_action,
content::GlobalRenderFrameHostId frame_id, content::GlobalRenderFrameHostId frame_id,
base::OnceCallback<void(SensitiveEntryResult)> callback) override; base::OnceCallback<void(SensitiveEntryResult)> callback) override;
@ -1818,7 +1818,7 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.cc b/chro
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -895,9 +895,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { @@ -899,9 +899,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
metrics_service_->RegisterMetricsProvider( metrics_service_->RegisterMetricsProvider(
std::make_unique<HttpsEngagementMetricsProvider>()); std::make_unique<HttpsEngagementMetricsProvider>());
@ -1831,7 +1831,7 @@ diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/br
diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc --- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
@@ -130,9 +130,6 @@ void TrialComparisonCertVerifierController::SendTrialReport( @@ -131,9 +131,6 @@ void TrialComparisonCertVerifierController::SendTrialReport(
std::string serialized_report; std::string serialized_report;
if (!report.Serialize(&serialized_report)) if (!report.Serialize(&serialized_report))
return; return;
@ -1970,7 +1970,7 @@ diff --git a/chrome/browser/permissions/chrome_permissions_client.h b/chrome/bro
diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrome/browser/permissions/permission_revocation_request.cc diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrome/browser/permissions/permission_revocation_request.cc
--- a/chrome/browser/permissions/permission_revocation_request.cc --- a/chrome/browser/permissions/permission_revocation_request.cc
+++ b/chrome/browser/permissions/permission_revocation_request.cc +++ b/chrome/browser/permissions/permission_revocation_request.cc
@@ -145,6 +145,7 @@ void PermissionRevocationRequest::CheckAndRevokeIfBlocklisted() { @@ -146,6 +146,7 @@ void PermissionRevocationRequest::CheckAndRevokeIfBlocklisted() {
return; return;
} }
@ -1978,7 +1978,7 @@ diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrom
CrowdDenyPreloadData* crowd_deny = CrowdDenyPreloadData::GetInstance(); CrowdDenyPreloadData* crowd_deny = CrowdDenyPreloadData::GetInstance();
permissions::PermissionUmaUtil::RecordCrowdDenyVersionAtAbuseCheckTime( permissions::PermissionUmaUtil::RecordCrowdDenyVersionAtAbuseCheckTime(
crowd_deny->version_on_disk()); crowd_deny->version_on_disk());
@@ -156,10 +157,14 @@ void PermissionRevocationRequest::CheckAndRevokeIfBlocklisted() { @@ -157,10 +158,14 @@ void PermissionRevocationRequest::CheckAndRevokeIfBlocklisted() {
url::Origin::Create(origin_), url::Origin::Create(origin_),
base::BindOnce(&PermissionRevocationRequest::OnSiteReputationReady, base::BindOnce(&PermissionRevocationRequest::OnSiteReputationReady,
weak_factory_.GetWeakPtr())); weak_factory_.GetWeakPtr()));
@ -1993,7 +1993,7 @@ diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrom
if (crowd_deny_request_start_time_.has_value()) { if (crowd_deny_request_start_time_.has_value()) {
crowd_deny_request_duration_ = crowd_deny_request_duration_ =
base::TimeTicks::Now() - crowd_deny_request_start_time_.value(); base::TimeTicks::Now() - crowd_deny_request_start_time_.value();
@@ -192,6 +197,7 @@ void PermissionRevocationRequest::OnSiteReputationReady( @@ -193,6 +198,7 @@ void PermissionRevocationRequest::OnSiteReputationReady(
return; return;
} }
} }
@ -2026,7 +2026,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#include "build/chromecast_buildflags.h" #include "build/chromecast_buildflags.h"
#include "build/chromeos_buildflags.h" #include "build/chromeos_buildflags.h"
#include "chrome/browser/about_flags.h" #include "chrome/browser/about_flags.h"
@@ -1294,7 +1295,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -1342,7 +1343,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
PushMessagingAppIdentifier::RegisterProfilePrefs(registry); PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
RegisterBrowserUserPrefs(registry); RegisterBrowserUserPrefs(registry);
@ -2047,18 +2047,18 @@ diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/priv
"java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandler.java", "java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandler.java",
"java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java", "java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java",
"java/src/org/chromium/chrome/browser/privacy_guide/SyncFragment.java", "java/src/org/chromium/chrome/browser/privacy_guide/SyncFragment.java",
@@ -44,7 +43,6 @@ robolectric_library("junit") { @@ -47,7 +46,6 @@ robolectric_library("junit") {
"junit/src/org/chromium/chrome/browser/privacy_guide/CookiesFragmentTest.java", "junit/src/org/chromium/chrome/browser/privacy_guide/CookiesFragmentTest.java",
"junit/src/org/chromium/chrome/browser/privacy_guide/MSBBFragmentTest.java", "junit/src/org/chromium/chrome/browser/privacy_guide/MSBBFragmentTest.java",
"junit/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapterTest.java", "junit/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapterTest.java",
- "junit/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragmentTest.java", - "junit/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragmentTest.java",
"junit/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImplTest.java", "junit/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImplTest.java",
"junit/src/org/chromium/chrome/browser/privacy_guide/SyncFragmentTest.java",
] ]
deps = [
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
--- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
+++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
@@ -122,9 +122,6 @@ public class PrivacyGuideFragment extends Fragment { @@ -130,9 +130,6 @@ public class PrivacyGuideFragment extends Fragment {
@Override @Override
public void onAttachFragment(@NonNull Fragment childFragment) { public void onAttachFragment(@NonNull Fragment childFragment) {
@ -2083,7 +2083,7 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
--- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
+++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
@@ -19,7 +19,7 @@ class StepDisplayHandlerImpl implements StepDisplayHandler { @@ -26,7 +26,7 @@ class StepDisplayHandlerImpl implements StepDisplayHandler {
@Override @Override
public boolean shouldDisplaySafeBrowsing() { public boolean shouldDisplaySafeBrowsing() {
@ -2095,7 +2095,7 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -82,7 +82,6 @@ @@ -83,7 +83,6 @@
#include "chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.h"
#include "chrome/browser/profiles/renderer_updater_factory.h" #include "chrome/browser/profiles/renderer_updater_factory.h"
#include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h" #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
@ -2103,7 +2103,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/safe_browsing/tailored_security/tailored_security_service_factory.h" #include "chrome/browser/safe_browsing/tailored_security/tailored_security_service_factory.h"
#include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -358,7 +357,6 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -362,7 +361,6 @@ void ChromeBrowserMainExtraPartsProfiles::
CertDbInitializerFactory::GetInstance(); CertDbInitializerFactory::GetInstance();
#endif #endif
#if BUILDFLAG(SAFE_BROWSING_AVAILABLE) #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
@ -2111,7 +2111,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#endif #endif
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
ChromeBrowsingDataLifetimeManagerFactory::GetInstance(); ChromeBrowsingDataLifetimeManagerFactory::GetInstance();
@@ -589,7 +587,9 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -598,7 +596,9 @@ void ChromeBrowserMainExtraPartsProfiles::
} }
#endif #endif
TabRestoreServiceFactory::GetInstance(); TabRestoreServiceFactory::GetInstance();
@ -2132,7 +2132,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
#include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sessions/exit_type_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
@@ -625,6 +624,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { @@ -629,6 +628,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate> mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate; pref_validation_delegate;
@ -2140,7 +2140,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service( scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service(
g_browser_process->safe_browsing_service()); g_browser_process->safe_browsing_service());
if (safe_browsing_service.get()) { if (safe_browsing_service.get()) {
@@ -636,7 +636,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { @@ -640,7 +640,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
pref_validation_delegate.InitWithNewPipeAndPassReceiver()); pref_validation_delegate.InitWithNewPipeAndPassReceiver());
} }
} }
@ -2483,7 +2483,7 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss
content::NavigationEntry* entry = content::NavigationEntry* entry =
web_contents()->GetController().GetVisibleEntry(); web_contents()->GetController().GetVisibleEntry();
if (!entry) if (!entry)
@@ -251,6 +246,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { @@ -252,6 +247,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break; break;
} }
} }
@ -2512,7 +2512,7 @@ diff --git a/chrome/browser/subresource_filter/chrome_content_subresource_filter
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -553,7 +553,6 @@ static_library("ui") { @@ -556,7 +556,6 @@ static_library("ui") {
"//components/renderer_context_menu", "//components/renderer_context_menu",
"//components/resources", "//components/resources",
"//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser",
@ -2520,7 +2520,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser/db:database_manager", "//components/safe_browsing/core/browser/db:database_manager",
@@ -4437,7 +4436,6 @@ static_library("ui") { @@ -4446,7 +4445,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h", "views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc", "views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h", "views/download/bubble/download_toolbar_button_view.h",
@ -2544,7 +2544,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<!-- Metrics settings --> <!-- Metrics settings -->
<message name="IDS_PREFS_METRICS_SETTINGS" desc="Title for the page that allows the user to control how much usage data Chrome uploads. [CHAR_LIMIT=32]"> <message name="IDS_PREFS_METRICS_SETTINGS" desc="Title for the page that allows the user to control how much usage data Chrome uploads. [CHAR_LIMIT=32]">
@@ -4837,9 +4831,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p @@ -4832,9 +4826,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
To use this setting <ph name="BEGIN_LINK">&lt;link&gt;</ph>Make searches and browsing better<ph name="END_LINK">&lt;/link&gt;</ph> must be turned on To use this setting <ph name="BEGIN_LINK">&lt;link&gt;</ph>Make searches and browsing better<ph name="END_LINK">&lt;/link&gt;</ph> must be turned on
</message> </message>
<!-- Usage Stats strings --> <!-- Usage Stats strings -->
@ -2557,7 +2557,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc
@@ -61,14 +61,18 @@ @@ -60,14 +60,18 @@
#include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_key.h" #include "chrome/browser/profiles/profile_key.h"
@ -2576,7 +2576,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sessions/session_tab_helper_factory.h" #include "chrome/browser/sessions/session_tab_helper_factory.h"
#include "chrome/browser/ssl/chrome_security_blocking_page_factory.h" #include "chrome/browser/ssl/chrome_security_blocking_page_factory.h"
@@ -132,9 +136,11 @@ @@ -131,9 +135,11 @@
#include "components/permissions/features.h" #include "components/permissions/features.h"
#include "components/permissions/permission_request_manager.h" #include "components/permissions/permission_request_manager.h"
#include "components/permissions/unused_site_permissions_service.h" #include "components/permissions/unused_site_permissions_service.h"
@ -2588,7 +2588,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "components/search/ntp_features.h" #include "components/search/ntp_features.h"
#include "components/site_engagement/content/site_engagement_helper.h" #include "components/site_engagement/content/site_engagement_helper.h"
#include "components/site_engagement/content/site_engagement_service.h" #include "components/site_engagement/content/site_engagement_service.h"
@@ -414,6 +420,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { @@ -410,6 +416,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
// See https://crbug.com/910288. // See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents); web_contents);
@ -2596,7 +2596,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents( safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents(
web_contents, HostContentSettingsMapFactory::GetForProfile(profile), web_contents, HostContentSettingsMapFactory::GetForProfile(profile),
safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
@@ -431,6 +438,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { @@ -427,6 +434,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents( safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
profile, web_contents); profile, web_contents);
ReputationWebContentsObserver::CreateForWebContents(web_contents); ReputationWebContentsObserver::CreateForWebContents(web_contents);
@ -2607,7 +2607,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -272,6 +272,7 @@ CreateHttpsOnlyModePage(content::WebContents* web_contents) { @@ -276,6 +276,7 @@ CreateHttpsOnlyModePage(content::WebContents* web_contents) {
request_url)); request_url));
} }
@ -2615,9 +2615,9 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
std::unique_ptr<safe_browsing::SafeBrowsingBlockingPage> std::unique_ptr<safe_browsing::SafeBrowsingBlockingPage>
CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) { CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) {
safe_browsing::SBThreatType threat_type = safe_browsing::SBThreatType threat_type =
@@ -330,7 +331,9 @@ CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) { @@ -352,7 +353,9 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWarnPage(
ui_manager->blocking_page_factory()->CreateSafeBrowsingPage( std::make_unique<EnterpriseWarnControllerClient>(web_contents,
ui_manager, web_contents, main_frame_url, {resource}, true)); kRequestUrl));
} }
+#endif +#endif
@ -2625,7 +2625,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
std::unique_ptr<TestSafeBrowsingBlockingPageQuiet> std::unique_ptr<TestSafeBrowsingBlockingPageQuiet>
CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) { CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
safe_browsing::SBThreatType threat_type = safe_browsing::SBThreatType threat_type =
@@ -385,6 +388,7 @@ CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) { @@ -407,6 +410,7 @@ CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
g_browser_process->safe_browsing_service()->ui_manager().get(), g_browser_process->safe_browsing_service()->ui_manager().get(),
web_contents, main_frame_url, resource, is_giant_webview)); web_contents, main_frame_url, resource, is_giant_webview));
} }
@ -2633,16 +2633,16 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage( std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
@@ -492,8 +496,6 @@ void InterstitialHTMLSource::StartDataRequest( @@ -514,8 +518,6 @@ void InterstitialHTMLSource::StartDataRequest(
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents); interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") { } else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
- } else if (path_without_query == "/safebrowsing") { - } else if (path_without_query == "/safebrowsing") {
- interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents); - interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents);
} else if (path_without_query == "/clock") { } else if (path_without_query == "/enterprise-block") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents); interstitial_delegate = CreateEnterpriseBlockPage(web_contents);
} else if (path_without_query == "/lookalike") { } else if (path_without_query == "/enterprise-warn") {
@@ -506,13 +508,7 @@ void InterstitialHTMLSource::StartDataRequest( @@ -532,13 +534,7 @@ void InterstitialHTMLSource::StartDataRequest(
interstitial_delegate = CreateInsecureFormPage(web_contents); interstitial_delegate = CreateInsecureFormPage(web_contents);
} else if (path_without_query == "/https_only") { } else if (path_without_query == "/https_only") {
interstitial_delegate = CreateHttpsOnlyModePage(web_contents); interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
@ -2697,7 +2697,7 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
--- a/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn
@@ -289,11 +289,6 @@ static_library("renderer") { @@ -290,11 +290,6 @@ static_library("renderer") {
deps += [ "//third_party/widevine/cdm:headers" ] deps += [ "//third_party/widevine/cdm:headers" ]
} }
@ -2722,7 +2722,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
#include "components/spellcheck/spellcheck_buildflags.h" #include "components/spellcheck/spellcheck_buildflags.h"
#include "components/subresource_filter/content/renderer/subresource_filter_agent.h" #include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
#include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
@@ -437,12 +439,8 @@ void ChromeContentRendererClient::RenderThreadStarted() { @@ -436,12 +438,8 @@ void ChromeContentRendererClient::RenderThreadStarted() {
subresource_filter_ruleset_dealer_ = subresource_filter_ruleset_dealer_ =
std::make_unique<subresource_filter::UnverifiedRulesetDealer>(); std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
@ -2758,7 +2758,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -931,7 +931,6 @@ if (is_android) { @@ -953,7 +953,6 @@ if (is_android) {
"//components/password_manager/content/browser:browser", "//components/password_manager/content/browser:browser",
"//components/policy:chrome_settings_proto_generated_compile", "//components/policy:chrome_settings_proto_generated_compile",
"//components/policy/core/browser:test_support", "//components/policy/core/browser:test_support",
@ -2766,7 +2766,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/safe_browsing/content/common:interfaces", "//components/safe_browsing/content/common:interfaces",
"//components/safe_browsing/content/renderer/phishing_classifier:phishing_classifier", "//components/safe_browsing/content/renderer/phishing_classifier:phishing_classifier",
"//components/safe_browsing/core/common/fbs:client_model", "//components/safe_browsing/core/common/fbs:client_model",
@@ -1406,7 +1405,6 @@ if (!is_android) { @@ -1429,7 +1428,6 @@ if (!is_android) {
"//components/resources", "//components/resources",
"//components/safe_browsing:buildflags", "//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser",
@ -2774,7 +2774,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support", "//components/safe_browsing/content/browser/password_protection:test_support",
@@ -5951,7 +5949,6 @@ test("unit_tests") { @@ -5990,7 +5988,6 @@ test("unit_tests") {
"//components/resources", "//components/resources",
"//components/safe_browsing:buildflags", "//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser",
@ -2785,7 +2785,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
diff --git a/components/BUILD.gn b/components/BUILD.gn diff --git a/components/BUILD.gn b/components/BUILD.gn
--- a/components/BUILD.gn --- a/components/BUILD.gn
+++ b/components/BUILD.gn +++ b/components/BUILD.gn
@@ -641,7 +641,6 @@ test("components_unittests") { @@ -651,7 +651,6 @@ test("components_unittests") {
if (safe_browsing_mode == 1) { if (safe_browsing_mode == 1) {
deps += [ deps += [
"//components/safe_browsing/content/browser:unit_tests", "//components/safe_browsing/content/browser:unit_tests",
@ -2831,12 +2831,12 @@ diff --git a/components/component_updater/installer_policies/BUILD.gn b/componen
- "safety_tips_component_installer.h", - "safety_tips_component_installer.h",
"trust_token_key_commitments_component_installer_policy.cc", "trust_token_key_commitments_component_installer_policy.cc",
"trust_token_key_commitments_component_installer_policy.h", "trust_token_key_commitments_component_installer_policy.h",
"url_param_classification_component_installer.cc", ]
diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
--- a/components/permissions/permission_request_manager.cc --- a/components/permissions/permission_request_manager.cc
+++ b/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc
@@ -680,10 +680,7 @@ PermissionRequestManager::PermissionRequestManager( @@ -682,10 +682,7 @@ PermissionRequestManager::PermissionRequestManager(
view_(nullptr), view_factory_(base::BindRepeating(&PermissionPrompt::Create)),
tab_is_hidden_(web_contents->GetVisibility() == tab_is_hidden_(web_contents->GetVisibility() ==
content::Visibility::HIDDEN), content::Visibility::HIDDEN),
- auto_response_for_test_(NONE), - auto_response_for_test_(NONE),
@ -2874,7 +2874,7 @@ diff --git a/components/safe_browsing/content/common/file_type_policies.cc b/com
diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc
--- a/components/safe_browsing/core/common/features.cc --- a/components/safe_browsing/core/common/features.cc
+++ b/components/safe_browsing/core/common/features.cc +++ b/components/safe_browsing/core/common/features.cc
@@ -200,8 +200,8 @@ BASE_FEATURE(kSevenZipEvaluationEnabled, @@ -189,8 +189,8 @@ BASE_FEATURE(kSimplifiedUrlDisplay,
base::FEATURE_DISABLED_BY_DEFAULT); base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kSuspiciousSiteTriggerQuotaFeature, BASE_FEATURE(kSuspiciousSiteTriggerQuotaFeature,
@ -2883,8 +2883,8 @@ diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_
+ "SafeBrowsingSuspiciousSiteTriggerQuota", // disabled by default + "SafeBrowsingSuspiciousSiteTriggerQuota", // disabled by default
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite + base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
BASE_FEATURE(kThreatDomDetailsTagAndAttributeFeature, BASE_FEATURE(kTailoredSecurityDesktopNotice,
"ThreatDomDetailsTagAttributes", "TailoredSecurityDesktopNotice",
diff --git a/components/security_interstitials/content/captive_portal_blocking_page.cc b/components/security_interstitials/content/captive_portal_blocking_page.cc diff --git a/components/security_interstitials/content/captive_portal_blocking_page.cc b/components/security_interstitials/content/captive_portal_blocking_page.cc
--- a/components/security_interstitials/content/captive_portal_blocking_page.cc --- a/components/security_interstitials/content/captive_portal_blocking_page.cc
+++ b/components/security_interstitials/content/captive_portal_blocking_page.cc +++ b/components/security_interstitials/content/captive_portal_blocking_page.cc
@ -3092,7 +3092,7 @@ diff --git a/content/public/browser/file_system_access_permission_context.h b/co
diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
--- a/weblayer/BUILD.gn --- a/weblayer/BUILD.gn
+++ b/weblayer/BUILD.gn +++ b/weblayer/BUILD.gn
@@ -477,11 +477,9 @@ source_set("weblayer_lib_base") { @@ -473,11 +473,9 @@ source_set("weblayer_lib_base") {
"//components/profile_metrics", "//components/profile_metrics",
"//components/reduce_accept_language/browser", "//components/reduce_accept_language/browser",
"//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser",
@ -3104,7 +3104,7 @@ diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
"//components/safe_browsing/core/browser:safe_browsing_metrics_collector", "//components/safe_browsing/core/browser:safe_browsing_metrics_collector",
"//components/safe_browsing/core/browser/db:database_manager", "//components/safe_browsing/core/browser/db:database_manager",
"//components/safe_browsing/core/common", "//components/safe_browsing/core/common",
@@ -625,8 +623,6 @@ source_set("weblayer_lib_base") { @@ -621,8 +619,6 @@ source_set("weblayer_lib_base") {
"browser/browser_controls_navigation_state_handler_delegate.h", "browser/browser_controls_navigation_state_handler_delegate.h",
"browser/browser_list_proxy.cc", "browser/browser_list_proxy.cc",
"browser/browser_list_proxy.h", "browser/browser_list_proxy.h",
@ -3116,7 +3116,7 @@ diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn
--- a/weblayer/test/BUILD.gn --- a/weblayer/test/BUILD.gn
+++ b/weblayer/test/BUILD.gn +++ b/weblayer/test/BUILD.gn
@@ -251,7 +251,6 @@ test("weblayer_browsertests") { @@ -249,7 +249,6 @@ test("weblayer_browsertests") {
"//components/page_info/android", "//components/page_info/android",
"//components/safe_browsing/android:safe_browsing_api_handler", "//components/safe_browsing/android:safe_browsing_api_handler",
"//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser",

10
build/patches/Disable-safety-check.patch
View file

@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -442,7 +442,6 @@ if (current_toolchain == default_toolchain) { @@ -454,7 +454,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/privacy_sandbox/android:java", "//chrome/browser/privacy_sandbox/android:java",
"//chrome/browser/profiles/android:java", "//chrome/browser/profiles/android:java",
"//chrome/browser/safe_browsing/android:java", "//chrome/browser/safe_browsing/android:java",
@ -21,7 +21,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/search_engines/android:java", "//chrome/browser/search_engines/android:java",
"//chrome/browser/search_resumption:java", "//chrome/browser/search_resumption:java",
"//chrome/browser/segmentation_platform:factory_java", "//chrome/browser/segmentation_platform:factory_java",
@@ -1032,8 +1031,6 @@ if (current_toolchain == default_toolchain) { @@ -1045,8 +1044,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/privacy_guide/android:java", "//chrome/browser/privacy_guide/android:java",
"//chrome/browser/privacy_guide/android:junit", "//chrome/browser/privacy_guide/android:junit",
"//chrome/browser/profiles/android:java", "//chrome/browser/profiles/android:java",
@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/search_engines/android:java", "//chrome/browser/search_engines/android:java",
"//chrome/browser/search_resumption:junit", "//chrome/browser/search_resumption:junit",
"//chrome/browser/segmentation_platform:factory_java", "//chrome/browser/segmentation_platform:factory_java",
@@ -1556,8 +1553,6 @@ if (current_toolchain == default_toolchain) { @@ -1570,8 +1567,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/profiles/android:java", "//chrome/browser/profiles/android:java",
"//chrome/browser/safe_browsing/android:java", "//chrome/browser/safe_browsing/android:java",
"//chrome/browser/safe_browsing/android:javatests", "//chrome/browser/safe_browsing/android:javatests",
@ -42,7 +42,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni
@@ -946,7 +946,6 @@ chrome_java_sources = [ @@ -939,7 +939,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -3346,7 +3346,6 @@ static_library("browser") { @@ -3310,7 +3310,6 @@ static_library("browser") {
"//chrome/browser/privacy_sandbox/android:jni_headers", "//chrome/browser/privacy_sandbox/android:jni_headers",
"//chrome/browser/reading_list/android", "//chrome/browser/reading_list/android",
"//chrome/browser/safe_browsing/android:safe_browsing_enums", "//chrome/browser/safe_browsing/android:safe_browsing_enums",

12
build/patches/Disable-smart-selection-by-default.patch
View file

@ -42,7 +42,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -188,6 +188,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { @@ -193,6 +193,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kCCTBrandTransparency, &kCCTBrandTransparency,
&kCCTClientDataHeader, &kCCTClientDataHeader,
&kCCTIncognito, &kCCTIncognito,
@ -50,7 +50,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kCCTIncognitoAvailableToThirdParty, &kCCTIncognitoAvailableToThirdParty,
&kCCTNewDownloadTab, &kCCTNewDownloadTab,
&kCCTPackageNameRecording, &kCCTPackageNameRecording,
@@ -996,6 +997,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn, @@ -985,6 +986,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn,
"DiscoverFeedMultiColumn", "DiscoverFeedMultiColumn",
base::FEATURE_DISABLED_BY_DEFAULT); base::FEATURE_DISABLED_BY_DEFAULT);
@ -64,7 +64,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -62,6 +62,7 @@ BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls); @@ -63,6 +63,7 @@ BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls);
BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting); BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting);
BASE_DECLARE_FEATURE(kChromeNewDownloadTab); BASE_DECLARE_FEATURE(kChromeNewDownloadTab);
BASE_DECLARE_FEATURE(kChromeShareLongScreenshot); BASE_DECLARE_FEATURE(kChromeShareLongScreenshot);
@ -75,8 +75,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
diff --git 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 diff --git 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
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- 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 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -255,6 +255,7 @@ public abstract class ChromeFeatureList { @@ -227,6 +227,7 @@ public abstract class ChromeFeatureList {
public static final String CCT_POST_MESSAGE_API = "CCTPostMessageAPI"; public static final String CCT_PREFETCH_DELAY_SHOW_ON_START = "CCTPrefetchDelayShowOnStart";
public static final String CCT_REAL_TIME_ENGAGEMENT_SIGNALS = "CCTRealTimeEngagementSignals"; public static final String CCT_REAL_TIME_ENGAGEMENT_SIGNALS = "CCTRealTimeEngagementSignals";
public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect"; public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect";
+ public static final String CHROME_SMART_SELECTION = "ChromeSmartSelection"; + public static final String CHROME_SMART_SELECTION = "ChromeSmartSelection";
@ -98,7 +98,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -3045,6 +3045,21 @@ @@ -3103,6 +3103,21 @@
] ]
} }
], ],

2
build/patches/Disable-some-signed-exchange-features.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc --- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -999,14 +999,14 @@ BASE_FEATURE(kSharedArrayBufferOnDesktop, @@ -1019,14 +1019,14 @@ BASE_FEATURE(kSharedArrayBufferOnDesktop,
// Signed Exchange Reporting for distributors // Signed Exchange Reporting for distributors
// https://www.chromestatus.com/feature/5687904902840320 // https://www.chromestatus.com/feature/5687904902840320
BASE_FEATURE(kSignedExchangeReportingForDistributors, BASE_FEATURE(kSignedExchangeReportingForDistributors,

22
build/patches/Disable-text-fragments-by-default.patch
View file

@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -6275,6 +6275,11 @@ const FeatureEntry kFeatureEntries[] = { @@ -6410,6 +6410,11 @@ const FeatureEntry kFeatureEntries[] = {
"")}, "")},
#endif #endif
@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -2706,6 +2706,11 @@ @@ -2735,6 +2735,11 @@
"owners": [ "robsc", "napper", "alanlxl" ], "owners": [ "robsc", "napper", "alanlxl" ],
"expiry_milestone": 130 "expiry_milestone": 130
}, },
@ -52,7 +52,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -1387,6 +1387,10 @@ extern const char kDropInputEventsBeforeFirstPaintDescription[] = @@ -1341,6 +1341,10 @@ extern const char kDropInputEventsBeforeFirstPaintDescription[] =
"intentionally interact with elements on that page. By dropping the events " "intentionally interact with elements on that page. By dropping the events "
"we prevent accidental interaction with a page the user has not seen yet."; "we prevent accidental interaction with a page the user has not seen yet.";
@ -66,7 +66,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -767,6 +767,9 @@ extern const char kReduceHorizontalFlingVelocityDescription[]; @@ -748,6 +748,9 @@ extern const char kReduceHorizontalFlingVelocityDescription[];
extern const char kRetailCouponsName[]; extern const char kRetailCouponsName[];
extern const char kRetailCouponsDescription[]; extern const char kRetailCouponsDescription[];
@ -91,7 +91,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
--- a/content/child/runtime_features.cc --- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc
@@ -270,6 +270,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() { @@ -271,6 +271,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
features::kSharedArrayBufferOnDesktop}, features::kSharedArrayBufferOnDesktop},
{wf::EnableSharedAutofill, autofill::features::kAutofillSharedAutofill}, {wf::EnableSharedAutofill, autofill::features::kAutofillSharedAutofill},
{wf::EnableTouchDragAndContextMenu, features::kTouchDragAndContextMenu}, {wf::EnableTouchDragAndContextMenu, features::kTouchDragAndContextMenu},
@ -102,7 +102,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -496,6 +496,11 @@ BASE_FEATURE(kDropInputEventsBeforeFirstPaint, @@ -516,6 +516,11 @@ BASE_FEATURE(kDropInputEventsBeforeFirstPaint,
"DropInputEventsBeforeFirstPaint", "DropInputEventsBeforeFirstPaint",
base::FEATURE_DISABLED_BY_DEFAULT); base::FEATURE_DISABLED_BY_DEFAULT);
@ -117,18 +117,18 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
--- a/third_party/blink/public/common/features.h --- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h
@@ -224,6 +224,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV); @@ -233,6 +233,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV);
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeLossyWebPImagesToYUV); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeLossyWebPImagesToYUV);
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebFontsCacheAwareTimeoutAdaption); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebFontsCacheAwareTimeoutAdaption);
+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kTextFragmentAnchor); +BLINK_COMMON_EXPORT extern const base::Feature kTextFragmentAnchor;
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAudioWorkletThreadRealtimePriority); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAudioWorkletThreadRealtimePriority);
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebAudioSinkSelection);
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
--- a/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc
@@ -4262,9 +4262,14 @@ void Document::SetURL(const KURL& url) { @@ -4290,9 +4290,14 @@ void Document::SetURL(const KURL& url) {
TRACE_EVENT1("navigation", "Document::SetURL", "url", TRACE_EVENT1("navigation", "Document::SetURL", "url",
new_url.GetString().Utf8()); new_url.GetString().Utf8());
@ -146,7 +146,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2583,10 +2583,9 @@ @@ -2699,10 +2699,9 @@
}, },
{ {
name: "TextFragmentIdentifiers", name: "TextFragmentIdentifiers",

14
build/patches/Disable-third-party-origin-trials.patch
View file

@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc b/components/embedder_support/origin_trials/origin_trial_policy_impl.cc diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc b/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
--- a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc --- a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
+++ b/components/embedder_support/origin_trials/origin_trial_policy_impl.cc +++ b/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
@@ -20,10 +20,10 @@ @@ -21,10 +21,10 @@
namespace embedder_support { namespace embedder_support {
@ -31,7 +31,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
0x51, 0x14, 0x66, 0xaa, 0x02, 0x53, 0x4e, 0x33, 0xa1, 0x15, 0x51, 0x14, 0x66, 0xaa, 0x02, 0x53, 0x4e, 0x33, 0xa1, 0x15,
}; };
@@ -54,7 +54,8 @@ OriginTrialPolicyImpl::OriginTrialPolicyImpl() { @@ -55,7 +55,8 @@ OriginTrialPolicyImpl::OriginTrialPolicyImpl() {
OriginTrialPolicyImpl::~OriginTrialPolicyImpl() = default; OriginTrialPolicyImpl::~OriginTrialPolicyImpl() = default;
bool OriginTrialPolicyImpl::IsOriginTrialsSupported() const { bool OriginTrialPolicyImpl::IsOriginTrialsSupported() const {
@ -60,7 +60,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
--- a/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc
@@ -7455,7 +7455,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { @@ -7495,7 +7495,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
void NavigationRequest::ForceEnableOriginTrials( void NavigationRequest::ForceEnableOriginTrials(
const std::vector<std::string>& trials) { const std::vector<std::string>& trials) {
DCHECK(!HasCommitted()); DCHECK(!HasCommitted());
@ -71,7 +71,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
--- a/content/renderer/render_frame_impl.cc --- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc
@@ -475,10 +475,6 @@ void FillNavigationParamsRequest( @@ -476,10 +476,6 @@ void FillNavigationParamsRequest(
common_params.initiator_origin.value(); common_params.initiator_origin.value();
} }
@ -159,7 +159,7 @@ diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/t
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
--- a/third_party/blink/renderer/core/loader/document_loader.cc --- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -160,13 +160,6 @@ namespace { @@ -161,13 +161,6 @@ namespace {
Vector<OriginTrialFeature> CopyInitiatorOriginTrials( Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
const WebVector<int>& initiator_origin_trial_features) { const WebVector<int>& initiator_origin_trial_features) {
Vector<OriginTrialFeature> result; Vector<OriginTrialFeature> result;
@ -173,7 +173,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
return result; return result;
} }
@@ -179,18 +172,12 @@ WebVector<int> CopyInitiatorOriginTrials( @@ -180,18 +173,12 @@ WebVector<int> CopyInitiatorOriginTrials(
Vector<String> CopyForceEnabledOriginTrials( Vector<String> CopyForceEnabledOriginTrials(
const WebVector<WebString>& force_enabled_origin_trials) { const WebVector<WebString>& force_enabled_origin_trials) {
Vector<String> result; Vector<String> result;
@ -192,7 +192,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
return result; return result;
} }
@@ -2663,10 +2650,6 @@ void DocumentLoader::CreateParserPostCommit() { @@ -2718,10 +2705,6 @@ void DocumentLoader::CreateParserPostCommit() {
OriginTrialFeature::kTouchEventFeatureDetection); OriginTrialFeature::kTouchEventFeatureDetection);
} }

10
build/patches/Disable-various-metrics.patch
View file

@ -101,7 +101,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -66,7 +66,6 @@ @@ -69,7 +69,6 @@
#include "chrome/browser/hid/chrome_hid_delegate.h" #include "chrome/browser/hid/chrome_hid_delegate.h"
#include "chrome/browser/interstitials/enterprise_util.h" #include "chrome/browser/interstitials/enterprise_util.h"
#include "chrome/browser/lifetime/browser_shutdown.h" #include "chrome/browser/lifetime/browser_shutdown.h"
@ -109,7 +109,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#include "chrome/browser/media/audio_service_util.h" #include "chrome/browser/media/audio_service_util.h"
#include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h" #include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"
@@ -4509,16 +4508,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( @@ -4726,16 +4725,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
content::NavigationHandle* handle) { content::NavigationHandle* handle) {
std::vector<std::unique_ptr<content::NavigationThrottle>> throttles; std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
@ -126,7 +126,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if BUILDFLAG(ENABLE_SUPERVISED_USERS) #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
MaybeAddThrottle( MaybeAddThrottle(
SupervisedUserNavigationThrottle::MaybeCreateThrottleFor(handle), SupervisedUserNavigationThrottle::MaybeCreateThrottleFor(handle),
@@ -4603,10 +4592,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( @@ -4820,10 +4809,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles); throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles);
} }
@ -140,7 +140,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
@@ -73,8 +73,8 @@ namespace internal { @@ -74,8 +74,8 @@ namespace internal {
// recording and reporting are enabled. If the feature is enabled, but no // recording and reporting are enabled. If the feature is enabled, but no
// consent is given, then there will be no recording or reporting. // consent is given, then there will be no recording or reporting.
BASE_FEATURE(kMetricsReportingFeature, BASE_FEATURE(kMetricsReportingFeature,
@ -151,7 +151,7 @@ diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
// Same as |kMetricsReportingFeature|, but this feature is associated with a // Same as |kMetricsReportingFeature|, but this feature is associated with a
@@ -83,8 +83,8 @@ BASE_FEATURE(kMetricsReportingFeature, @@ -84,8 +84,8 @@ BASE_FEATURE(kMetricsReportingFeature,
// the fix to not affect the overall sampling rate, this new feature was // the fix to not affect the overall sampling rate, this new feature was
// created. See crbug/1306481. // created. See crbug/1306481.
BASE_FEATURE(kPostFREFixMetricsReportingFeature, BASE_FEATURE(kPostFREFixMetricsReportingFeature,

2
build/patches/Do-not-build-API-keys-infobar.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -1304,8 +1304,6 @@ static_library("ui") { @@ -1301,8 +1301,6 @@ static_library("ui") {
"singleton_tabs.h", "singleton_tabs.h",
"startup/automation_infobar_delegate.cc", "startup/automation_infobar_delegate.cc",
"startup/automation_infobar_delegate.h", "startup/automation_infobar_delegate.h",

2
build/patches/Do-not-hide-component-extensions.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
--- a/extensions/common/extension.cc --- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc +++ b/extensions/common/extension.cc
@@ -465,9 +465,8 @@ bool Extension::ShouldDisplayInNewTabPage() const { @@ -463,9 +463,8 @@ bool Extension::ShouldDisplayInNewTabPage() const {
} }
bool Extension::ShouldExposeViaManagementAPI() const { bool Extension::ShouldExposeViaManagementAPI() const {

2
build/patches/Do-not-link-with-libatomic.patch
View file

@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/base/BUILD.gn b/base/BUILD.gn diff --git a/base/BUILD.gn b/base/BUILD.gn
--- a/base/BUILD.gn --- a/base/BUILD.gn
+++ b/base/BUILD.gn +++ b/base/BUILD.gn
@@ -1561,7 +1561,7 @@ mixed_component("base") { @@ -1571,7 +1571,7 @@ mixed_component("base") {
# more robust check for this. # more robust check for this.
if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) && if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
host_toolchain != "//build/toolchain/cros:host") { host_toolchain != "//build/toolchain/cros:host") {

2
build/patches/Do-not-store-passwords-by-default.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
--- a/components/password_manager/core/browser/password_manager.cc --- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc
@@ -228,14 +228,14 @@ bool IsSingleUsernameSubmission(const PasswordForm& submitted_form) { @@ -242,14 +242,14 @@ base::CallbackListSubscription AddSyncEnabledOrDisabledCallback(
void PasswordManager::RegisterProfilePrefs( void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) { user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref( registry->RegisterBooleanPref(

2
build/patches/DoH-improvements.patch
View file

@ -82,7 +82,7 @@ diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
--- a/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc
@@ -2933,6 +2933,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { @@ -2963,6 +2963,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) {
bool changed = dns_client_->SetConfigOverrides(std::move(overrides)); bool changed = dns_client_->SetConfigOverrides(std::move(overrides));
if (changed) { if (changed) {

16
build/patches/Enable-Certificate-Transparency.patch
View file

@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -9060,6 +9060,11 @@ const FeatureEntry kFeatureEntries[] = { @@ -9161,6 +9161,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebMidiDescription, kOsAll, flag_descriptions::kWebMidiDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWebMidi)}, FEATURE_VALUE_TYPE(features::kWebMidi)},
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
@ -53,7 +53,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -6874,6 +6874,10 @@ const char kAutofillCreditCardUploadDescription[] = @@ -6681,6 +6681,10 @@ const char kAutofillCreditCardUploadDescription[] =
#endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
@ -67,7 +67,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -3969,6 +3969,9 @@ extern const char kAutofillCreditCardUploadDescription[]; @@ -3878,6 +3878,9 @@ extern const char kAutofillCreditCardUploadDescription[];
#endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
@ -80,7 +80,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc
@@ -851,7 +851,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( @@ -856,7 +856,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
if (certificate_transparency_enabled_for_testing_.has_value()) if (certificate_transparency_enabled_for_testing_.has_value())
return certificate_transparency_enabled_for_testing_.value(); return certificate_transparency_enabled_for_testing_.value();
@ -88,7 +88,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
// TODO(carlosil): Figure out if we can/should remove the OFFICIAL_BUILD and // TODO(carlosil): Figure out if we can/should remove the OFFICIAL_BUILD and
// GOOGLE_CHROME_BRANDING checks now that enforcement does not rely on build // GOOGLE_CHROME_BRANDING checks now that enforcement does not rely on build
// dates, and allow embedders to enforce. // dates, and allow embedders to enforce.
@@ -865,9 +864,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { @@ -870,9 +869,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
#else #else
return true; return true;
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
@ -116,7 +116,7 @@ diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sc
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc
@@ -995,11 +995,7 @@ BASE_FEATURE(kSchedulerConfiguration, @@ -1000,11 +1000,7 @@ BASE_FEATURE(kSchedulerConfiguration,
// Controls whether SCT audit reports are queued and the rate at which they // Controls whether SCT audit reports are queued and the rate at which they
// should be sampled. Default sampling rate is 1/10,000 certificates. // should be sampled. Default sampling rate is 1/10,000 certificates.
@ -174,7 +174,7 @@ diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc
diff --git a/services/network/network_context.cc b/services/network/network_context.cc diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc --- a/services/network/network_context.cc
+++ b/services/network/network_context.cc +++ b/services/network/network_context.cc
@@ -2652,7 +2652,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -2663,7 +2663,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
// TransportSecurityState. Since no requests have been made yet, safe to do // TransportSecurityState. Since no requests have been made yet, safe to do
// this even after the call to Build(). // this even after the call to Build().
@ -194,7 +194,7 @@ diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/ne
// Only audit valid SCTs. This ensures that they come from a known log, have // Only audit valid SCTs. This ensures that they come from a known log, have
// a valid signature, and thus are expected to be public certificates. If // a valid signature, and thus are expected to be public certificates. If
@@ -327,6 +328,7 @@ void SCTAuditingHandler::AddReporter( @@ -326,6 +327,7 @@ void SCTAuditingHandler::AddReporter(
if (mode_ == mojom::SCTAuditingMode::kDisabled) { if (mode_ == mojom::SCTAuditingMode::kDisabled) {
return; return;
} }

6
build/patches/Enable-HEVC-by-default.patch
View file

@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc --- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc +++ b/media/base/media_switches.cc
@@ -289,8 +289,8 @@ BASE_FEATURE(kPictureInPicture, @@ -296,8 +296,8 @@ BASE_FEATURE(kPictureInPicture,
#if BUILDFLAG(ENABLE_PLATFORM_HEVC) #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
// Enables HEVC hardware accelerated decoding. // Enables HEVC hardware accelerated decoding.
BASE_FEATURE(kPlatformHEVCDecoderSupport, BASE_FEATURE(kPlatformHEVCDecoderSupport,
@ -20,8 +20,8 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
- base::FEATURE_ENABLED_BY_DEFAULT); - base::FEATURE_ENABLED_BY_DEFAULT);
+ "PlatformHEVCDecoderSupport", // must be enabled + "PlatformHEVCDecoderSupport", // must be enabled
+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite
#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC)
// Only decode preload=metadata elements upon visibility. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
// Enables HEVC hardware accelerated encoding for Windows and Mac.
-- --
2.25.1 2.25.1

2
build/patches/Enable-SPPI-for-devices-with-enough-memory.patch
View file

@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc
@@ -1045,12 +1045,8 @@ BASE_FEATURE(kSecurityKeyAttestationPrompt, @@ -1051,12 +1051,8 @@ BASE_FEATURE(kSecurityKeyAttestationPrompt,
// TODO(alexmos): Move this and the other site isolation features below to // TODO(alexmos): Move this and the other site isolation features below to
// browser_features, as they are only used on the browser side. // browser_features, as they are only used on the browser side.
BASE_FEATURE(kSitePerProcess, BASE_FEATURE(kSitePerProcess,

8
build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch
View file

@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -4560,9 +4560,6 @@ const FeatureEntry kFeatureEntries[] = { @@ -4616,9 +4616,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid, flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid,
FEATURE_VALUE_TYPE( FEATURE_VALUE_TYPE(
site_isolation::features::kSiteIsolationForPasswordSites)}, site_isolation::features::kSiteIsolationForPasswordSites)},
@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1425,7 +1425,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( @@ -1504,7 +1504,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath()); registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath());
registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0); registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0);
registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); registry->RegisterStringPref(prefs::kIsolateOrigins, std::string());
@ -40,7 +40,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true); registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true);
registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0); registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0);
} }
@@ -1439,7 +1439,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( @@ -1518,7 +1518,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
// user policy in addition to the same named ones in Local State (which are // user policy in addition to the same named ones in Local State (which are
// used for mapping the command-line flags). // used for mapping the command-line flags).
registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); registry->RegisterStringPref(prefs::kIsolateOrigins, std::string());
@ -71,7 +71,7 @@ diff --git a/components/site_isolation/site_isolation_policy.cc b/components/sit
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc --- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -1112,8 +1112,8 @@ BASE_FEATURE(kStopVideoCaptureOnScreenLock, @@ -1132,8 +1132,8 @@ BASE_FEATURE(kStopVideoCaptureOnScreenLock,
// Controls whether site isolation should use origins instead of scheme and // Controls whether site isolation should use origins instead of scheme and
// eTLD+1. // eTLD+1.
BASE_FEATURE(kStrictOriginIsolation, BASE_FEATURE(kStrictOriginIsolation,

2
build/patches/Enable-darken-websites-checkbox-in-themes.patch
View file

@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -1256,9 +1256,9 @@ @@ -1265,9 +1265,9 @@
"expiry_milestone": 114 "expiry_milestone": 114
}, },
{ {

2
build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
View file

@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
--- a/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn
@@ -330,6 +330,10 @@ config("compiler") { @@ -335,6 +335,10 @@ config("compiler") {
} }
} }

60
build/patches/Enable-native-Android-autofill.patch
View file

@ -42,7 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc
--- a/android_webview/browser/aw_contents.cc --- a/android_webview/browser/aw_contents.cc
+++ b/android_webview/browser/aw_contents.cc +++ b/android_webview/browser/aw_contents.cc
@@ -342,7 +342,8 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) { @@ -341,7 +341,8 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) {
enable_download_manager) enable_download_manager)
: base::BindRepeating(&autofill::BrowserDriverInitHook, : base::BindRepeating(&autofill::BrowserDriverInitHook,
AwAutofillClient::FromWebContents(web_contents), AwAutofillClient::FromWebContents(web_contents),
@ -56,13 +56,13 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -461,6 +461,7 @@ if (current_toolchain == default_toolchain) { @@ -461,6 +461,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/ui/android/layouts:java", "//chrome/browser/share/android:java_resources",
"//chrome/browser/ui/android/layouts/glue:java", "//chrome/browser/tab:java",
"//chrome/browser/ui/android/layouts/third_party/float_property:java", "//chrome/browser/tab_group:java",
+ "//components/android_autofill/browser:java", + "//components/android_autofill/browser:java",
"//chrome/browser/ui/android/logo:java", "//chrome/browser/tabmodel:factory_java",
"//chrome/browser/ui/android/management:java", "//chrome/browser/tabmodel:java",
"//chrome/browser/ui/android/multiwindow:java", "//chrome/browser/tabpersistence:java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@ -286,9 +286,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
@@ -32,6 +32,10 @@ import org.chromium.ui.dragdrop.DragStateTracker; @@ -21,6 +21,10 @@ import org.chromium.ui.dragdrop.DragAndDropBrowserDelegate;
import org.chromium.ui.dragdrop.DropDataProviderImpl; import org.chromium.ui.dragdrop.DragAndDropDelegate;
import org.chromium.ui.dragdrop.DropDataProviderUtils; import org.chromium.ui.dragdrop.DragStateTracker;
+import android.util.SparseArray; +import android.util.SparseArray;
+import android.view.autofill.AutofillValue; +import android.view.autofill.AutofillValue;
@ -297,9 +297,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
/** /**
* Implementation of the abstract class {@link ViewAndroidDelegate} for Chrome. * Implementation of the abstract class {@link ViewAndroidDelegate} for Chrome.
*/ */
@@ -216,4 +220,14 @@ public class TabViewAndroidDelegate extends ViewAndroidDelegate { @@ -164,4 +168,14 @@ public class TabViewAndroidDelegate extends ViewAndroidDelegate {
return intent; DragAndDropBrowserDelegate getDragAndDropBrowserDelegateForTesting() {
} return mDragAndDropBrowserDelegate;
} }
+ +
+ @Override + @Override
@ -315,7 +315,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -2494,6 +2494,13 @@ static_library("browser") { @@ -2492,6 +2492,13 @@ static_library("browser") {
deps += [ "//chrome/browser/error_reporting" ] deps += [ "//chrome/browser/error_reporting" ]
} }
@ -332,7 +332,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
--- a/chrome/browser/android/tab_android.cc --- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc +++ b/chrome/browser/android/tab_android.cc
@@ -70,6 +70,13 @@ @@ -69,6 +69,13 @@
#include "url/android/gurl_android.h" #include "url/android/gurl_android.h"
#include "url/gurl.h" #include "url/gurl.h"
@ -346,7 +346,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_
using base::android::AttachCurrentThread; using base::android::AttachCurrentThread;
using base::android::ConvertUTF8ToJavaString; using base::android::ConvertUTF8ToJavaString;
using base::android::JavaParamRef; using base::android::JavaParamRef;
@@ -505,3 +512,19 @@ static void JNI_TabImpl_Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { @@ -500,3 +507,19 @@ static void JNI_TabImpl_Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
// This will automatically bind to the Java object and pass ownership there. // This will automatically bind to the Java object and pass ownership there.
new TabAndroid(env, obj); new TabAndroid(env, obj);
} }
@ -410,7 +410,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc
@@ -168,6 +168,9 @@ @@ -167,6 +167,9 @@
#include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h" #include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h"
#include "chrome/browser/video_tutorials/video_tutorial_tab_helper.h" #include "chrome/browser/video_tutorials/video_tutorial_tab_helper.h"
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
@ -420,7 +420,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#else #else
#include "chrome/browser/accuracy_tips/accuracy_service_factory.h" #include "chrome/browser/accuracy_tips/accuracy_service_factory.h"
#include "chrome/browser/banners/app_banner_manager_desktop.h" #include "chrome/browser/banners/app_banner_manager_desktop.h"
@@ -330,7 +333,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { @@ -329,7 +332,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
base::BindRepeating( base::BindRepeating(
&autofill::BrowserDriverInitHook, &autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(web_contents), autofill::ChromeAutofillClient::FromWebContents(web_contents),
@ -445,7 +445,7 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/c
diff --git a/components/android_autofill/browser/android_autofill_manager.h b/components/android_autofill/browser/android_autofill_manager.h diff --git a/components/android_autofill/browser/android_autofill_manager.h b/components/android_autofill/browser/android_autofill_manager.h
--- a/components/android_autofill/browser/android_autofill_manager.h --- a/components/android_autofill/browser/android_autofill_manager.h
+++ b/components/android_autofill/browser/android_autofill_manager.h +++ b/components/android_autofill/browser/android_autofill_manager.h
@@ -82,17 +82,17 @@ class AndroidAutofillManager : public AutofillManager { @@ -89,17 +89,17 @@ class AndroidAutofillManager : public AutofillManager {
void SetCreditCardFillViaAutofillAssistantIntent( void SetCreditCardFillViaAutofillAssistantIntent(
const autofill_assistant::AutofillAssistantIntent intent) override; const autofill_assistant::AutofillAssistantIntent intent) override;
@ -516,7 +516,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
}); });
} }
@@ -426,6 +436,10 @@ void ContentAutofillDriver::AskForValuesToFill( @@ -427,6 +437,10 @@ void ContentAutofillDriver::AskForValuesToFill(
target->autofill_manager_->OnAskForValuesToFill( target->autofill_manager_->OnAskForValuesToFill(
form, field, bounding_box, query_id, autoselect_first_suggestion, form, field, bounding_box, query_id, autoselect_first_suggestion,
form_element_was_clicked); form_element_was_clicked);
@ -527,7 +527,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
}); });
} }
@@ -436,12 +450,16 @@ void ContentAutofillDriver::HidePopup() { @@ -437,12 +451,16 @@ void ContentAutofillDriver::HidePopup() {
DCHECK(!target->IsPrerendering()) DCHECK(!target->IsPrerendering())
<< "We should never affect UI while prerendering"; << "We should never affect UI while prerendering";
target->autofill_manager_->OnHidePopup(); target->autofill_manager_->OnHidePopup();
@ -544,7 +544,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
} }
void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) { void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) {
@@ -469,6 +487,8 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form, @@ -470,6 +488,8 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form,
const FormFieldData& field, const gfx::RectF& bounding_box) { const FormFieldData& field, const gfx::RectF& bounding_box) {
target->autofill_manager_->OnFocusOnFormField(form, field, target->autofill_manager_->OnFocusOnFormField(form, field,
bounding_box); bounding_box);
@ -553,7 +553,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
}); });
} }
@@ -481,6 +501,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form, @@ -482,6 +502,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form,
[](ContentAutofillDriver* target, const FormData& form, [](ContentAutofillDriver* target, const FormData& form,
base::TimeTicks timestamp) { base::TimeTicks timestamp) {
target->autofill_manager_->OnDidFillAutofillFormData(form, timestamp); target->autofill_manager_->OnDidFillAutofillFormData(form, timestamp);
@ -562,7 +562,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
}); });
} }
@@ -490,6 +512,8 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() { @@ -491,6 +513,8 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() {
autofill_router().DidPreviewAutofillFormData( autofill_router().DidPreviewAutofillFormData(
this, [](ContentAutofillDriver* target) { this, [](ContentAutofillDriver* target) {
target->autofill_manager_->OnDidPreviewAutofillFormData(); target->autofill_manager_->OnDidPreviewAutofillFormData();
@ -571,7 +571,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
}); });
} }
@@ -499,6 +523,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() { @@ -500,6 +524,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() {
autofill_router().DidEndTextFieldEditing( autofill_router().DidEndTextFieldEditing(
this, [](ContentAutofillDriver* target) { this, [](ContentAutofillDriver* target) {
target->autofill_manager_->OnDidEndTextFieldEditing(); target->autofill_manager_->OnDidEndTextFieldEditing();
@ -580,7 +580,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
}); });
} }
@@ -510,6 +536,8 @@ void ContentAutofillDriver::SelectFieldOptionsDidChange( @@ -511,6 +537,8 @@ void ContentAutofillDriver::SelectFieldOptionsDidChange(
this, GetFormWithFrameAndFormMetaData(raw_form), this, GetFormWithFrameAndFormMetaData(raw_form),
[](ContentAutofillDriver* target, const FormData& form) { [](ContentAutofillDriver* target, const FormData& form) {
target->autofill_manager_->OnSelectFieldOptionsDidChange(form); target->autofill_manager_->OnSelectFieldOptionsDidChange(form);
@ -589,7 +589,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
}); });
} }
@@ -597,6 +625,8 @@ void ContentAutofillDriver::DidNavigateFrame( @@ -616,6 +644,8 @@ void ContentAutofillDriver::DidNavigateFrame(
if (autofill_router_) // Can be nullptr only in tests. if (autofill_router_) // Can be nullptr only in tests.
autofill_router_->UnregisterDriver(this); autofill_router_->UnregisterDriver(this);
autofill_manager_->Reset(); autofill_manager_->Reset();
@ -616,7 +616,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com
content::RenderFrameHost* render_frame_host() { return render_frame_host_; } content::RenderFrameHost* render_frame_host() { return render_frame_host_; }
@@ -364,6 +367,10 @@ class ContentAutofillDriver : public AutofillDriver, @@ -373,6 +376,10 @@ class ContentAutofillDriver : public AutofillDriver,
// code. // code.
std::unique_ptr<AutofillManager> autofill_manager_ = nullptr; std::unique_ptr<AutofillManager> autofill_manager_ = nullptr;
@ -788,7 +788,7 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component
diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
--- a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java --- a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
+++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java +++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
@@ -32,6 +32,10 @@ import org.chromium.ui.dragdrop.DragStateTracker; @@ -31,6 +31,10 @@ import org.chromium.ui.dragdrop.DragStateTracker;
import org.chromium.ui.dragdrop.DropDataAndroid; import org.chromium.ui.dragdrop.DropDataAndroid;
import org.chromium.ui.mojom.CursorType; import org.chromium.ui.mojom.CursorType;
@ -799,7 +799,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b
/** /**
* Class to acquire, position, and remove anchor views from the implementing View. * Class to acquire, position, and remove anchor views from the implementing View.
*/ */
@@ -597,4 +601,8 @@ public class ViewAndroidDelegate { @@ -592,4 +596,8 @@ public class ViewAndroidDelegate {
public static void setDragAndDropDelegateForTest(DragAndDropDelegate testDelegate) { public static void setDragAndDropDelegateForTest(DragAndDropDelegate testDelegate) {
sDragAndDropTestDelegate = testDelegate; sDragAndDropTestDelegate = testDelegate;
} }

2
build/patches/Enable-prefetch-privacy-changes-by-default.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -509,8 +509,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal, @@ -529,8 +529,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal,
// Prefetch request properties are updated to be privacy-preserving. See // Prefetch request properties are updated to be privacy-preserving. See
// crbug.com/988956. // crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges, BASE_FEATURE(kPrefetchPrivacyChanges,

54
build/patches/Enable-share-intent.patch
View file

@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
--- a/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni
@@ -590,6 +590,7 @@ chrome_java_resources = [ @@ -588,6 +588,7 @@ chrome_java_resources = [
"java/res/layout/signin_activity.xml", "java/res/layout/signin_activity.xml",
"java/res/layout/status_indicator_container.xml", "java/res/layout/status_indicator_container.xml",
"java/res/layout/suggestions_tile_view_condensed.xml", "java/res/layout/suggestions_tile_view_condensed.xml",
@ -41,7 +41,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni
@@ -973,6 +973,7 @@ chrome_java_sources = [ @@ -966,6 +966,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java", "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java",
"java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
"java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
import org.chromium.chrome.browser.usb.UsbNotificationManager; import org.chromium.chrome.browser.usb.UsbNotificationManager;
import org.chromium.chrome.browser.util.AfterStartupTaskUtils; import org.chromium.chrome.browser.util.AfterStartupTaskUtils;
import org.chromium.chrome.browser.webapps.WebappRegistry; import org.chromium.chrome.browser.webapps.WebappRegistry;
@@ -417,6 +418,8 @@ public class ProcessInitializationHandler { @@ -413,6 +414,8 @@ public class ProcessInitializationHandler {
.resolveClearDataDialogResultRecorder()::makeDeferredRecordings); .resolveClearDataDialogResultRecorder()::makeDeferredRecordings);
deferredStartupHandler.addDeferredTask(WebApkUninstallUmaTracker::recordDeferredUma); deferredStartupHandler.addDeferredTask(WebApkUninstallUmaTracker::recordDeferredUma);
@ -311,7 +311,7 @@ new file mode 100644
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -6783,6 +6783,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -6940,6 +6940,10 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS) #endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
@ -325,7 +325,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -2783,6 +2783,11 @@ const char kIsolateOriginsDescription[] = @@ -2753,6 +2753,11 @@ const char kIsolateOriginsDescription[] =
"Requires dedicated processes for an additional set of origins, " "Requires dedicated processes for an additional set of origins, "
"specified as a comma-separated list."; "specified as a comma-separated list.";
@ -340,7 +340,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -1576,6 +1576,9 @@ extern const char kIsolateOriginsDescription[]; @@ -1565,6 +1565,9 @@ extern const char kIsolateOriginsDescription[];
extern const char kIsolationByDefaultName[]; extern const char kIsolationByDefaultName[];
extern const char kIsolationByDefaultDescription[]; extern const char kIsolationByDefaultDescription[];
@ -354,39 +354,39 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
--- a/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -273,6 +273,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { @@ -273,6 +273,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kRelatedSearchesAlternateUx, &kReachedCodeProfiler,
&kRelatedSearchesInBar, &kReaderModeInCCT,
&kRelatedSearchesSimplifiedUx, &kReengagementNotification,
+ &kSharedIntentUI, + &kSharedIntentUI,
&kRelatedSearchesUi, &kSearchReadyOmniboxFeature,
&kRequestDesktopSiteDefaults, &kRelatedSearches,
&kRequestDesktopSiteDefaultsControl, &kRelatedSearchesInBar,
@@ -936,6 +937,10 @@ BASE_FEATURE(kSafeModeForCachedFlags, @@ -936,6 +937,10 @@ BASE_FEATURE(kShowScrollableMVTOnNTPAndroid,
"SafeModeForCachedFlags", BASE_FEATURE(kSpannableInlineAutocomplete,
base::FEATURE_DISABLED_BY_DEFAULT); "SpannableInlineAutocomplete",
base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kSharedIntentUI, +BASE_FEATURE(kSharedIntentUI,
+ "SharedIntentUI", + "SharedIntentUI",
+ base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT);
+ +
BASE_FEATURE(kShareButtonInTopToolbar,
"ShareButtonInTopToolbar", BASE_FEATURE(kSpecialLocaleWrapper,
base::FEATURE_DISABLED_BY_DEFAULT); "SpecialLocaleWrapper",
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -142,6 +142,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoNewDevice); @@ -144,6 +144,7 @@ BASE_DECLARE_FEATURE(kFeedPositionAndroid);
BASE_DECLARE_FEATURE(kSearchEnginePromoNewDeviceV2); BASE_DECLARE_FEATURE(kSafeModeForCachedFlags);
BASE_DECLARE_FEATURE(kShareButtonInTopToolbar);
BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature); BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature);
BASE_DECLARE_FEATURE(kSearchResumptionModuleAndroid);
+BASE_DECLARE_FEATURE(kSharedIntentUI); +BASE_DECLARE_FEATURE(kSharedIntentUI);
BASE_DECLARE_FEATURE(kSharingHubLinkToggle); BASE_DECLARE_FEATURE(kSpannableInlineAutocomplete);
BASE_DECLARE_FEATURE(kShowScrollableMVTOnNTPAndroid); BASE_DECLARE_FEATURE(kSpecialLocaleWrapper);
BASE_DECLARE_FEATURE(kFeedPositionAndroid); BASE_DECLARE_FEATURE(kSpecialUserDecision);
diff --git 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 diff --git 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
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- 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 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -510,6 +510,7 @@ public abstract class ChromeFeatureList { @@ -473,6 +473,7 @@ public abstract class ChromeFeatureList {
public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts"; public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts";
public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler"; public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler";
public static final String READ_LATER = "ReadLater"; public static final String READ_LATER = "ReadLater";
@ -397,7 +397,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4855,6 +4855,19 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p @@ -4850,6 +4850,19 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
Copied to your clipboard Copied to your clipboard
</message> </message>

8
build/patches/Enable-third-party-storage-partitioning.patch
View file

@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc --- a/net/base/features.cc
+++ b/net/base/features.cc +++ b/net/base/features.cc
@@ -362,8 +362,8 @@ const base::FeatureParam<bool> kStorageAccessAPIAutoDenyOutsideFPS{ @@ -373,8 +373,8 @@ const base::FeatureParam<bool> kStorageAccessAPIAutoDenyOutsideFPS{
// Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.) // Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.)
// by the top level site to reduce fingerprinting. // by the top level site to reduce fingerprinting.
BASE_FEATURE(kThirdPartyStoragePartitioning, BASE_FEATURE(kThirdPartyStoragePartitioning,
@ -18,8 +18,8 @@ diff --git a/net/base/features.cc b/net/base/features.cc
- base::FEATURE_DISABLED_BY_DEFAULT); - base::FEATURE_DISABLED_BY_DEFAULT);
+ "ThirdPartyStoragePartitioning", // must be enabled + "ThirdPartyStoragePartitioning", // must be enabled
+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite
// Whether to use the new code paths needed to support partitioning Blob URLs.
BASE_FEATURE(kAlpsParsing, "AlpsParsing", base::FEATURE_ENABLED_BY_DEFAULT); // This exists as a kill-switch in case an issue is identified with the Blob
// URL implementation that causes breakage.
-- --
2.25.1 2.25.1

56
build/patches/Experimental-user-scripts-support.patch
View file

@ -226,7 +226,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -303,6 +303,9 @@ if (current_toolchain == default_toolchain) { @@ -312,6 +312,9 @@ if (current_toolchain == default_toolchain) {
"//third_party/androidx:androidx_gridlayout_gridlayout_java", "//third_party/androidx:androidx_gridlayout_gridlayout_java",
"//third_party/androidx:androidx_preference_preference_java", "//third_party/androidx:androidx_preference_preference_java",
] ]
@ -236,7 +236,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
} }
if (enable_vr) { if (enable_vr) {
@@ -607,6 +610,7 @@ if (current_toolchain == default_toolchain) { @@ -619,6 +622,7 @@ if (current_toolchain == default_toolchain) {
"//components/ukm/android:java", "//components/ukm/android:java",
"//components/url_formatter/android:url_formatter_java", "//components/url_formatter/android:url_formatter_java",
"//components/user_prefs/android:java", "//components/user_prefs/android:java",
@ -262,7 +262,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
@@ -72,6 +72,7 @@ import org.chromium.content_public.browser.WebContents; @@ -71,6 +71,7 @@ import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.widget.Toast; import org.chromium.ui.widget.Toast;
import org.chromium.url.GURL; import org.chromium.url.GURL;
@ -270,7 +270,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
import java.io.File; import java.io.File;
@@ -423,6 +424,11 @@ public class DownloadUtils { @@ -420,6 +421,11 @@ public class DownloadUtils {
public static boolean openFile(String filePath, String mimeType, String downloadGuid, public static boolean openFile(String filePath, String mimeType, String downloadGuid,
OTRProfileID otrProfileID, String originalUrl, String referrer, OTRProfileID otrProfileID, String originalUrl, String referrer,
@DownloadOpenSource int source, Context context) { @DownloadOpenSource int source, Context context) {
@ -294,7 +294,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
/** /**
* Handles the initialization dependences of the browser process. This is meant to handle the * Handles the initialization dependences of the browser process. This is meant to handle the
* initialization that is not tied to any particular Activity, and the logic that should only be * initialization that is not tied to any particular Activity, and the logic that should only be
@@ -308,6 +310,7 @@ public class ProcessInitializationHandler { @@ -304,6 +306,7 @@ public class ProcessInitializationHandler {
DefaultBrowserInfo.initBrowserFetcher(); DefaultBrowserInfo.initBrowserFetcher();
@ -305,7 +305,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
--- a/chrome/android/java_sources.gni --- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni
@@ -20,6 +20,7 @@ import("//chrome/common/features.gni") @@ -21,6 +21,7 @@ import("//chrome/common/features.gni")
import("//components/feed/features.gni") import("//components/feed/features.gni")
import("//components/offline_pages/buildflags/features.gni") import("//components/offline_pages/buildflags/features.gni")
import("//device/vr/buildflags/buildflags.gni") import("//device/vr/buildflags/buildflags.gni")
@ -313,7 +313,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
chrome_java_sources += public_autofill_assistant_java_sources chrome_java_sources += public_autofill_assistant_java_sources
@@ -52,3 +53,5 @@ if (enable_arcore) { @@ -54,3 +55,5 @@ if (enable_arcore) {
"java/src/org/chromium/chrome/browser/vr/ArDelegateImpl.java", "java/src/org/chromium/chrome/browser/vr/ArDelegateImpl.java",
] ]
} }
@ -322,7 +322,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -3503,6 +3503,11 @@ static_library("browser") { @@ -3469,6 +3469,11 @@ static_library("browser") {
] ]
deps += [ "//chrome/android/modules/dev_ui/provider:native" ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
} }
@ -337,7 +337,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -156,6 +156,7 @@ @@ -158,6 +158,7 @@
#include "components/translate/core/browser/translate_ranker_impl.h" #include "components/translate/core/browser/translate_ranker_impl.h"
#include "components/translate/core/common/translate_util.h" #include "components/translate/core/common/translate_util.h"
#include "components/ui_devtools/switches.h" #include "components/ui_devtools/switches.h"
@ -345,7 +345,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "components/version_info/version_info.h" #include "components/version_info/version_info.h"
#include "components/viz/common/features.h" #include "components/viz/common/features.h"
#include "components/viz/common/switches.h" #include "components/viz/common/switches.h"
@@ -7749,6 +7750,10 @@ const FeatureEntry kFeatureEntries[] = { @@ -7888,6 +7889,10 @@ const FeatureEntry kFeatureEntries[] = {
chromeos::features::kClipboardHistoryNudgeSessionReset)}, chromeos::features::kClipboardHistoryNudgeSessionReset)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -359,7 +359,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5085,7 +5085,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( @@ -5297,7 +5297,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
chrome::mojom::DynamicParams dynamic_params = { chrome::mojom::DynamicParams dynamic_params = {
profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch), profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch),
profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict), profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict),
@ -372,7 +372,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -6697,6 +6697,11 @@ const char kFollowingFeedSidepanelDescription[] = @@ -6514,6 +6514,11 @@ const char kFollowingFeedSidepanelDescription[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
@ -387,7 +387,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -3838,6 +3838,9 @@ extern const char kQuickCommandsDescription[]; @@ -3752,6 +3752,9 @@ extern const char kQuickCommandsDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// defined (OS_FUCHSIA) // defined (OS_FUCHSIA)
@ -400,7 +400,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc
@@ -251,6 +251,7 @@ @@ -252,6 +252,7 @@
#include "components/ntp_tiles/popular_sites_impl.h" #include "components/ntp_tiles/popular_sites_impl.h"
#include "components/permissions/contexts/geolocation_permission_context_android.h" #include "components/permissions/contexts/geolocation_permission_context_android.h"
#include "components/query_tiles/tile_service_prefs.h" #include "components/query_tiles/tile_service_prefs.h"
@ -408,7 +408,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#else // BUILDFLAG(IS_ANDROID) #else // BUILDFLAG(IS_ANDROID)
#include "chrome/browser/cart/cart_service.h" #include "chrome/browser/cart/cart_service.h"
#include "chrome/browser/device_api/device_service_impl.h" #include "chrome/browser/device_api/device_service_impl.h"
@@ -1323,6 +1324,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -1371,6 +1372,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
translate::TranslatePrefs::RegisterProfilePrefs(registry); translate::TranslatePrefs::RegisterProfilePrefs(registry);
omnibox::RegisterProfilePrefs(registry); omnibox::RegisterProfilePrefs(registry);
ZeroSuggestProvider::RegisterProfilePrefs(registry); ZeroSuggestProvider::RegisterProfilePrefs(registry);
@ -430,7 +430,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -261,6 +261,8 @@ @@ -264,6 +264,8 @@
#include "chrome/browser/enterprise/idle/idle_service_factory.h" #include "chrome/browser/enterprise/idle/idle_service_factory.h"
#endif #endif
@ -439,7 +439,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
namespace chrome { namespace chrome {
void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) { void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
@@ -620,6 +622,7 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -629,6 +631,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif #endif
WebDataServiceFactory::GetInstance(); WebDataServiceFactory::GetInstance();
webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
@ -459,7 +459,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
#if BUILDFLAG(ENABLE_SESSION_SERVICE) #if BUILDFLAG(ENABLE_SESSION_SERVICE)
#include "chrome/browser/sessions/app_session_service_factory.h" #include "chrome/browser/sessions/app_session_service_factory.h"
#include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/sessions/session_service_factory.h"
@@ -1705,6 +1707,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, @@ -1721,6 +1723,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
#endif #endif
#endif #endif
@ -534,7 +534,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui.h"
#include "content/public/common/content_client.h" #include "content/public/common/content_client.h"
@@ -834,6 +835,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, @@ -840,6 +841,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<UserActionsUI>; return &NewWebUI<UserActionsUI>;
if (url.host_piece() == chrome::kChromeUIVersionHost) if (url.host_piece() == chrome::kChromeUIVersionHost)
return &NewWebUI<VersionUI>; return &NewWebUI<VersionUI>;
@ -587,7 +587,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
--- a/chrome/renderer/chrome_content_renderer_client.cc --- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -250,6 +250,9 @@ @@ -249,6 +249,9 @@
#include "chrome/renderer/supervised_user/supervised_user_error_page_controller_delegate_impl.h" #include "chrome/renderer/supervised_user/supervised_user_error_page_controller_delegate_impl.h"
#endif #endif
@ -597,7 +597,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
using autofill::AutofillAgent; using autofill::AutofillAgent;
using autofill::PasswordAutofillAgent; using autofill::PasswordAutofillAgent;
using autofill::PasswordGenerationAgent; using autofill::PasswordGenerationAgent;
@@ -431,6 +434,12 @@ void ChromeContentRendererClient::RenderThreadStarted() { @@ -430,6 +433,12 @@ void ChromeContentRendererClient::RenderThreadStarted() {
WebString::FromASCII(extensions::kExtensionScheme)); WebString::FromASCII(extensions::kExtensionScheme));
#endif #endif
@ -610,7 +610,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
#if BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(ENABLE_SPELLCHECK)
if (!spellcheck_) if (!spellcheck_)
InitSpellCheck(); InitSpellCheck();
@@ -587,6 +596,13 @@ void ChromeContentRendererClient::RenderFrameCreated( @@ -586,6 +595,13 @@ void ChromeContentRendererClient::RenderFrameCreated(
render_frame, registry); render_frame, registry);
#endif #endif
@ -624,7 +624,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
#if BUILDFLAG(ENABLE_PPAPI) #if BUILDFLAG(ENABLE_PPAPI)
new PepperHelper(render_frame); new PepperHelper(render_frame);
#endif #endif
@@ -1556,7 +1572,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( @@ -1555,7 +1571,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart(
ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart(
render_frame); render_frame);
// |render_frame| might be dead by now. // |render_frame| might be dead by now.
@ -639,7 +639,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
} }
void ChromeContentRendererClient::RunScriptsAtDocumentEnd( void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
@@ -1565,7 +1588,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( @@ -1564,7 +1587,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd(
render_frame); render_frame);
// |render_frame| might be dead by now. // |render_frame| might be dead by now.
@ -654,7 +654,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
} }
void ChromeContentRendererClient::RunScriptsAtDocumentIdle( void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
@@ -1574,7 +1604,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( @@ -1573,7 +1603,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle(
render_frame); render_frame);
// |render_frame| might be dead by now. // |render_frame| might be dead by now.
@ -672,7 +672,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc
--- a/chrome/renderer/chrome_render_thread_observer.cc --- a/chrome/renderer/chrome_render_thread_observer.cc
+++ b/chrome/renderer/chrome_render_thread_observer.cc +++ b/chrome/renderer/chrome_render_thread_observer.cc
@@ -57,6 +57,8 @@ @@ -58,6 +58,8 @@
#include "third_party/blink/public/web/web_security_policy.h" #include "third_party/blink/public/web/web_security_policy.h"
#include "third_party/blink/public/web/web_view.h" #include "third_party/blink/public/web/web_view.h"
@ -681,7 +681,7 @@ diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "extensions/renderer/localization_peer.h" #include "extensions/renderer/localization_peer.h"
#endif #endif
@@ -259,6 +261,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( @@ -260,6 +262,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration(
void ChromeRenderThreadObserver::SetConfiguration( void ChromeRenderThreadObserver::SetConfiguration(
chrome::mojom::DynamicParamsPtr params) { chrome::mojom::DynamicParamsPtr params) {
*GetDynamicConfigParams() = std::move(*params); *GetDynamicConfigParams() = std::move(*params);
@ -10467,7 +10467,7 @@ new file mode 100755
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
--- a/tools/gritsettings/resource_ids.spec --- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec
@@ -738,6 +738,12 @@ @@ -761,6 +761,12 @@
"components/autofill/core/browser/autofill_address_rewriter_resources.grd":{ "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{
"includes": [3720] "includes": [3720]
}, },

2
build/patches/Guard-for-user-agent-reduction.patch
View file

@ -55,7 +55,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -1311,8 +1311,8 @@ BASE_FEATURE(kWindowPlacementFullscreenCompanionWindow, @@ -1339,8 +1339,8 @@ BASE_FEATURE(kDurableClientHintsCache,
const base::FeatureParam<std::string> kUserAgentFrozenBuildVersion{ const base::FeatureParam<std::string> kUserAgentFrozenBuildVersion{
&kReduceUserAgentMinorVersion, "build_version", "0"}; &kReduceUserAgentMinorVersion, "build_version", "0"};

22
build/patches/History-number-of-days-privacy-setting.patch
View file

@ -150,8 +150,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/history/history_service_factory.cc diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/history/history_service_factory.cc
--- a/chrome/browser/history/history_service_factory.cc --- a/chrome/browser/history/history_service_factory.cc
+++ b/chrome/browser/history/history_service_factory.cc +++ b/chrome/browser/history/history_service_factory.cc
@@ -28,6 +28,8 @@ std::unique_ptr<KeyedService> BuildHistoryService( @@ -29,6 +29,8 @@ std::unique_ptr<KeyedService> BuildHistoryService(
history::HistoryDatabaseParamsForPath(context->GetPath()))) { context->GetPath(), chrome::GetChannel()))) {
return nullptr; return nullptr;
} }
+ Profile* profile = Profile::FromBrowserContext(context); + Profile* profile = Profile::FromBrowserContext(context);
@ -173,7 +173,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc
@@ -365,6 +365,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path, @@ -367,6 +367,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
void ProfileImpl::RegisterProfilePrefs( void ProfileImpl::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) { user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false); registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false);
@ -307,7 +307,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
diff --git a/components/history/core/browser/expire_history_backend.cc b/components/history/core/browser/expire_history_backend.cc diff --git a/components/history/core/browser/expire_history_backend.cc b/components/history/core/browser/expire_history_backend.cc
--- a/components/history/core/browser/expire_history_backend.cc --- a/components/history/core/browser/expire_history_backend.cc
+++ b/components/history/core/browser/expire_history_backend.cc +++ b/components/history/core/browser/expire_history_backend.cc
@@ -389,7 +389,7 @@ const ExpiringVisitsReader* @@ -387,7 +387,7 @@ const ExpiringVisitsReader*
void ExpireHistoryBackend::StartExpiringOldStuff( void ExpireHistoryBackend::StartExpiringOldStuff(
base::TimeDelta expiration_threshold) { base::TimeDelta expiration_threshold) {
@ -316,7 +316,7 @@ diff --git a/components/history/core/browser/expire_history_backend.cc b/compone
// Remove all readers, just in case this was method was called before. // Remove all readers, just in case this was method was called before.
readers_.clear(); readers_.clear();
@@ -405,6 +405,11 @@ void ExpireHistoryBackend::StartExpiringOldStuff( @@ -403,6 +403,11 @@ void ExpireHistoryBackend::StartExpiringOldStuff(
ScheduleExpire(); ScheduleExpire();
} }
@ -328,7 +328,7 @@ diff --git a/components/history/core/browser/expire_history_backend.cc b/compone
void ExpireHistoryBackend::DeleteFaviconsIfPossible(DeleteEffects* effects) { void ExpireHistoryBackend::DeleteFaviconsIfPossible(DeleteEffects* effects) {
if (!favicon_db_) if (!favicon_db_)
return; return;
@@ -607,6 +612,12 @@ void ExpireHistoryBackend::DoExpireIteration() { @@ -605,6 +610,12 @@ void ExpireHistoryBackend::DoExpireIteration() {
return; return;
} }
@ -356,7 +356,7 @@ diff --git a/components/history/core/browser/expire_history_backend.h b/componen
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
--- a/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc
@@ -158,7 +158,7 @@ const int kMaxRedirectCount = 32; @@ -160,7 +160,7 @@ const int kMaxRedirectCount = 32;
// The number of days old a history entry can be before it is considered "old" // The number of days old a history entry can be before it is considered "old"
// and is deleted. // and is deleted.
@ -365,7 +365,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
// The maximum number of days for which domain visit metrics are computed // The maximum number of days for which domain visit metrics are computed
// each time HistoryBackend::GetDomainDiversity() is called. // each time HistoryBackend::GetDomainDiversity() is called.
@@ -1090,6 +1090,19 @@ void HistoryBackend::InitImpl( @@ -1107,6 +1107,19 @@ void HistoryBackend::InitImpl(
LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time); LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time);
} }
@ -388,7 +388,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
diff --git a/components/history/core/browser/history_backend.h b/components/history/core/browser/history_backend.h diff --git a/components/history/core/browser/history_backend.h b/components/history/core/browser/history_backend.h
--- a/components/history/core/browser/history_backend.h --- a/components/history/core/browser/history_backend.h
+++ b/components/history/core/browser/history_backend.h +++ b/components/history/core/browser/history_backend.h
@@ -219,6 +219,8 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, @@ -224,6 +224,8 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
void Init(bool force_fail, void Init(bool force_fail,
const HistoryDatabaseParams& history_database_params); const HistoryDatabaseParams& history_database_params);
@ -410,7 +410,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
#include "components/history/core/browser/download_row.h" #include "components/history/core/browser/download_row.h"
#include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_backend.h"
#include "components/history/core/browser/history_backend_client.h" #include "components/history/core/browser/history_backend_client.h"
@@ -1126,6 +1129,9 @@ void HistoryService::Cleanup() { @@ -1124,6 +1127,9 @@ void HistoryService::Cleanup() {
return; return;
} }
@ -420,7 +420,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
NotifyHistoryServiceBeingDeleted(); NotifyHistoryServiceBeingDeleted();
weak_ptr_factory_.InvalidateWeakPtrs(); weak_ptr_factory_.InvalidateWeakPtrs();
@@ -1190,6 +1196,33 @@ bool HistoryService::Init( @@ -1188,6 +1194,33 @@ bool HistoryService::Init(
return true; return true;
} }

4
build/patches/Increase-number-of-autocomplete-matches-to-10.patch
View file

@ -24,7 +24,7 @@ diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omni
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
--- a/components/omnibox/browser/omnibox_field_trial.cc --- a/components/omnibox/browser/omnibox_field_trial.cc
+++ b/components/omnibox/browser/omnibox_field_trial.cc +++ b/components/omnibox/browser/omnibox_field_trial.cc
@@ -323,9 +323,9 @@ void OmniboxFieldTrial::GetDemotionsByType( @@ -269,9 +269,9 @@ void OmniboxFieldTrial::GetDemotionsByType(
size_t OmniboxFieldTrial::GetProviderMaxMatches( size_t OmniboxFieldTrial::GetProviderMaxMatches(
AutocompleteProvider::Type provider) { AutocompleteProvider::Type provider) {
@ -36,7 +36,7 @@ diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omni
omnibox::kUIExperimentMaxAutocompleteMatches, omnibox::kUIExperimentMaxAutocompleteMatches,
OmniboxFieldTrial::kUIMaxAutocompleteMatchesByProviderParam); OmniboxFieldTrial::kUIMaxAutocompleteMatchesByProviderParam);
@@ -349,7 +349,7 @@ size_t OmniboxFieldTrial::GetProviderMaxMatches( @@ -295,7 +295,7 @@ size_t OmniboxFieldTrial::GetProviderMaxMatches(
else if (k == provider) else if (k == provider)
return v; return v;
} }

10
build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch
View file

@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/renderer/core/dom/build.gni diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/renderer/core/dom/build.gni
--- a/third_party/blink/renderer/core/dom/build.gni --- a/third_party/blink/renderer/core/dom/build.gni
+++ b/third_party/blink/renderer/core/dom/build.gni +++ b/third_party/blink/renderer/core/dom/build.gni
@@ -159,6 +159,8 @@ blink_core_sources_dom = [ @@ -162,6 +162,8 @@ blink_core_sources_dom = [
"has_invalidation_flags.h", "has_invalidation_flags.h",
"icon_url.cc", "icon_url.cc",
"icon_url.h", "icon_url.h",
@ -43,7 +43,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
#include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h" #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
#include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h" #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
#include "third_party/blink/renderer/core/page/spatial_navigation_controller.h" #include "third_party/blink/renderer/core/page/spatial_navigation_controller.h"
@@ -356,6 +357,8 @@ @@ -357,6 +358,8 @@
#include "third_party/blink/renderer/platform/wtf/text/string_buffer.h" #include "third_party/blink/renderer/platform/wtf/text/string_buffer.h"
#include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h" #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
@ -52,7 +52,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
#ifndef NDEBUG #ifndef NDEBUG
using WeakDocumentSet = blink::HeapHashSet<blink::WeakMember<blink::Document>>; using WeakDocumentSet = blink::HeapHashSet<blink::WeakMember<blink::Document>>;
static WeakDocumentSet& LiveDocumentSet(); static WeakDocumentSet& LiveDocumentSet();
@@ -7109,6 +7112,64 @@ void Document::OnPrepareToStopParsing() { @@ -7194,6 +7197,64 @@ void Document::OnPrepareToStopParsing() {
MilestoneForDelayedAsyncScript::kFinishedParsing); MilestoneForDelayedAsyncScript::kFinishedParsing);
} }
@ -117,7 +117,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
void Document::FinishedParsing() { void Document::FinishedParsing() {
DCHECK(!GetScriptableDocumentParser() || !parser_->IsParsing()); DCHECK(!GetScriptableDocumentParser() || !parser_->IsParsing());
DCHECK(!GetScriptableDocumentParser() || ready_state_ != kLoading); DCHECK(!GetScriptableDocumentParser() || ready_state_ != kLoading);
@@ -7160,6 +7221,10 @@ void Document::FinishedParsing() { @@ -7250,6 +7311,10 @@ void Document::FinishedParsing() {
frame->Loader().FinishedParsing(); frame->Loader().FinishedParsing();
@ -131,7 +131,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
--- a/third_party/blink/renderer/core/dom/document.h --- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h
@@ -1993,6 +1993,9 @@ class CORE_EXPORT Document : public ContainerNode, @@ -1995,6 +1995,9 @@ class CORE_EXPORT Document : public ContainerNode,
// Called when the AXMode of an existing AXContext changes. // Called when the AXMode of an existing AXContext changes.
void AXContextModeChanged(); void AXContextModeChanged();

2
build/patches/Invalidate-components-public-key.patch
View file

@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.cc b/chrome/browser/component_updater/pki_metadata_component_installer.cc diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.cc b/chrome/browser/component_updater/pki_metadata_component_installer.cc
--- a/chrome/browser/component_updater/pki_metadata_component_installer.cc --- a/chrome/browser/component_updater/pki_metadata_component_installer.cc
+++ b/chrome/browser/component_updater/pki_metadata_component_installer.cc +++ b/chrome/browser/component_updater/pki_metadata_component_installer.cc
@@ -71,7 +71,8 @@ const char kGoogleOperatorName[] = "Google"; @@ -72,7 +72,8 @@ const char kGoogleOperatorName[] = "Google";
// The extension id is: efniojlnjndmcbiieegkicadnoecjjef // The extension id is: efniojlnjndmcbiieegkicadnoecjjef
const uint8_t kPKIMetadataPublicKeySHA256[32] = { const uint8_t kPKIMetadataPublicKeySHA256[32] = {
0x45, 0xd8, 0xe9, 0xbd, 0x9d, 0x3c, 0x21, 0x88, 0x44, 0x6a, 0x82, 0x45, 0xd8, 0xe9, 0xbd, 0x9d, 0x3c, 0x21, 0x88, 0x44, 0x6a, 0x82,

20
build/patches/JIT-site-settings.patch
View file

@ -214,7 +214,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
@@ -632,6 +632,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -633,6 +633,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
browserContextHandle, ContentSettingsType.JAVASCRIPT) browserContextHandle, ContentSettingsType.JAVASCRIPT)
? R.string.website_settings_add_site_description_javascript_block ? R.string.website_settings_add_site_description_javascript_block
: R.string.website_settings_add_site_description_javascript_allow; : R.string.website_settings_add_site_description_javascript_allow;
@ -226,7 +226,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} else if (mCategory.getType() == SiteSettingsCategory.Type.SOUND) { } else if (mCategory.getType() == SiteSettingsCategory.Type.SOUND) {
resource = WebsitePreferenceBridge.isCategoryEnabled( resource = WebsitePreferenceBridge.isCategoryEnabled(
browserContextHandle, ContentSettingsType.SOUND) browserContextHandle, ContentSettingsType.SOUND)
@@ -761,6 +766,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @@ -762,6 +767,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
allowSpecifyingExceptions = true; allowSpecifyingExceptions = true;
} else if (mCategory.getType() == SiteSettingsCategory.Type.JAVASCRIPT) { } else if (mCategory.getType() == SiteSettingsCategory.Type.JAVASCRIPT) {
allowSpecifyingExceptions = true; allowSpecifyingExceptions = true;
@ -256,7 +256,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} else if (type == ContentSettingsType.NOTIFICATIONS) { } else if (type == ContentSettingsType.NOTIFICATIONS) {
setUpNotificationsPreference(preference, mSite.isEmbargoed(type)); setUpNotificationsPreference(preference, mSite.isEmbargoed(type));
} else if (type == ContentSettingsType.REQUEST_DESKTOP_SITE) { } else if (type == ContentSettingsType.REQUEST_DESKTOP_SITE) {
@@ -1060,6 +1064,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment @@ -1067,6 +1071,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */); setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */);
} }
@ -326,7 +326,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsUtil.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsUtil.java diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsUtil.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsUtil.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsUtil.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsUtil.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsUtil.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsUtil.java
@@ -23,6 +23,7 @@ public class SiteSettingsUtil { @@ -26,6 +26,7 @@ public class SiteSettingsUtil {
ContentSettingsType.MEDIASTREAM_MIC, ContentSettingsType.MEDIASTREAM_MIC,
ContentSettingsType.NOTIFICATIONS, ContentSettingsType.NOTIFICATIONS,
ContentSettingsType.JAVASCRIPT, ContentSettingsType.JAVASCRIPT,
@ -399,15 +399,15 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
--- a/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -605,7 +605,7 @@ void ContentSettingsRegistry::Init() { @@ -622,7 +622,7 @@ void ContentSettingsRegistry::Init() {
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
Register(ContentSettingsType::JAVASCRIPT_JIT, "javascript-jit", Register(ContentSettingsType::FEDERATED_IDENTITY_API, "webid-api",
- CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE, - CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE,
+ CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE, + CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,
AllowlistedSchemes(), /*allowlisted_schemes=*/{},
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK},
WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, WebsiteSettingsInfo::GENERIC_SINGLE_ORIGIN_SCOPE,
diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc
--- a/components/page_info/android/page_info_controller_android.cc --- a/components/page_info/android/page_info_controller_android.cc
+++ b/components/page_info/android/page_info_controller_android.cc +++ b/components/page_info/android/page_info_controller_android.cc

2
build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch
View file

@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -4145,9 +4145,9 @@ @@ -4199,9 +4199,9 @@
"expiry_milestone": 110 "expiry_milestone": 110
}, },
{ {

2
build/patches/Logcat-crash-reports-UI.patch
View file

@ -157,7 +157,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -639,6 +639,7 @@ static_library("ui") { @@ -642,6 +642,7 @@ static_library("ui") {
"//third_party/re2", "//third_party/re2",
"//third_party/webrtc_overrides:webrtc_component", "//third_party/webrtc_overrides:webrtc_component",
"//third_party/zlib", "//third_party/zlib",

46
build/patches/Modify-default-preferences.patch
View file

@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/payments/core/payment_prefs.cc | 2 +- components/payments/core/payment_prefs.cc | 2 +-
.../core/common/safe_browsing_prefs.cc | 4 ++-- .../core/common/safe_browsing_prefs.cc | 4 ++--
.../primary_account_manager.cc | 4 ++-- .../primary_account_manager.cc | 4 ++--
content/public/common/content_features.cc | 4 ++-- third_party/blink/common/features.cc | 4 ++--
19 files changed, 73 insertions(+), 20 deletions(-) 19 files changed, 73 insertions(+), 20 deletions(-)
create mode 100644 components/bookmarks/browser/features.cc create mode 100644 components/bookmarks/browser/features.cc
create mode 100644 components/bookmarks/browser/features.h create mode 100644 components/bookmarks/browser/features.h
@ -36,9 +36,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "components/autofill_assistant/browser/features.h" #include "components/autofill_assistant/browser/features.h"
+#include "components/bookmarks/browser/features.h" +#include "components/bookmarks/browser/features.h"
#include "components/browser_sync/browser_sync_switches.h" #include "components/browser_sync/browser_sync_switches.h"
#include "components/browser_ui/settings/android/features.h"
#include "components/browser_ui/site_settings/android/features.h" #include "components/browser_ui/site_settings/android/features.h"
#include "components/browsing_data/core/features.h" @@ -6051,6 +6052,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5937,6 +5938,11 @@ const FeatureEntry kFeatureEntries[] = {
reading_list::switches::kReadLaterReminderNotification)}, reading_list::switches::kReadLaterReminderNotification)},
#endif #endif
@ -53,10 +53,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
--- a/chrome/browser/background/background_mode_manager.cc --- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc
@@ -377,7 +377,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { @@ -371,7 +371,7 @@ BackgroundModeManager::~BackgroundModeManager() {
registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); // static
#endif void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
- registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true); - registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false); + registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
} }
@ -65,7 +65,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1435,7 +1435,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( @@ -1514,7 +1514,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
void ChromeContentBrowserClient::RegisterProfilePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) { user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@ -77,7 +77,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -2920,6 +2920,10 @@ const char kTabToGTSAnimationAndroidDescription[] = @@ -2890,6 +2890,10 @@ const char kTabToGTSAnimationAndroidDescription[] =
"Allows users to see an animation when entering or leaving the " "Allows users to see an animation when entering or leaving the "
"Grid Tab Switcher on phones."; "Grid Tab Switcher on phones.";
@ -91,7 +91,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -1641,6 +1641,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[]; @@ -1630,6 +1630,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[];
extern const char kTabToGTSAnimationAndroidName[]; extern const char kTabToGTSAnimationAndroidName[];
extern const char kTabToGTSAnimationAndroidDescription[]; extern const char kTabToGTSAnimationAndroidDescription[];
@ -249,23 +249,23 @@ new file mode 100644
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
--- a/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -311,7 +311,7 @@ void ContentSettingsRegistry::Init() { @@ -262,7 +262,7 @@ void ContentSettingsRegistry::Init() {
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync", Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync",
- CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE, - CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE,
+ CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE, + CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,
AllowlistedSchemes(), /*allowlisted_schemes=*/{},
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK},
WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
@@ -411,7 +411,7 @@ void ContentSettingsRegistry::Init() { @@ -362,7 +362,7 @@ void ContentSettingsRegistry::Init() {
// TODO(crbug.com/904439): Update this to "SECURE_ONLY" once // TODO(crbug.com/904439): Update this to "SECURE_ONLY" once
// DeviceOrientationEvents and DeviceMotionEvents are only fired in secure // DeviceOrientationEvents and DeviceMotionEvents are only fired in secure
// contexts. // contexts.
- Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_ALLOW, - Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_ALLOW,
+ Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_BLOCK, + Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_BLOCK,
WebsiteSettingsInfo::UNSYNCABLE, AllowlistedSchemes(), WebsiteSettingsInfo::UNSYNCABLE, /*allowlisted_schemes=*/{},
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK},
WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
--- a/components/content_settings/core/browser/cookie_settings.cc --- a/components/content_settings/core/browser/cookie_settings.cc
@ -309,7 +309,7 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/compo
diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
--- a/components/signin/internal/identity_manager/primary_account_manager.cc --- a/components/signin/internal/identity_manager/primary_account_manager.cc
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc
@@ -50,9 +50,9 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -51,9 +51,9 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
std::string()); std::string());
registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string()); registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string());
registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false); registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false);
@ -321,17 +321,17 @@ diff --git a/components/signin/internal/identity_manager/primary_account_manager
registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false); registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false);
} }
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/content/public/common/content_features.cc --- a/third_party/blink/common/features.cc
+++ b/content/public/common/content_features.cc +++ b/third_party/blink/common/features.cc
@@ -540,8 +540,8 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList"; @@ -1720,8 +1720,8 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread,
// the attribute. Note: At present, only iframes with origin-restricted // the attribute. Note: At present, only iframes with origin-restricted
// sandboxes are isolated. // sandboxes are isolated.
BASE_FEATURE(kIsolateSandboxedIframes, BASE_FEATURE(kIsolateSandboxedIframes,
- "IsolateSandboxedIframes", - "IsolateSandboxedIframes",
- base::FEATURE_DISABLED_BY_DEFAULT); - base::FEATURE_DISABLED_BY_DEFAULT);
+ "IsolateSandboxedIframes", // enabled by default + "IsolateSandboxedIframes", // must be enabled
+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite
const base::FeatureParam<IsolateSandboxedIframesGrouping>::Option const base::FeatureParam<IsolateSandboxedIframesGrouping>::Option
isolated_sandboxed_iframes_grouping_types[] = { isolated_sandboxed_iframes_grouping_types[] = {
{IsolateSandboxedIframesGrouping::kPerSite, "per-site"}, {IsolateSandboxedIframesGrouping::kPerSite, "per-site"},

315
build/patches/Move-navigation-bar-to-bottom.patch
View file

File diff suppressed because it is too large Load diff

48
build/patches/Multiple-fingerprinting-mitigations.patch
View file

@ -61,7 +61,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -2395,6 +2395,7 @@ static_library("browser") { @@ -2392,6 +2392,7 @@ static_library("browser") {
"//services/device/public/cpp:device_features", "//services/device/public/cpp:device_features",
"//services/device/public/cpp/serial:switches", "//services/device/public/cpp/serial:switches",
"//services/device/public/cpp/usb", "//services/device/public/cpp/usb",
@ -72,7 +72,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -216,6 +216,8 @@ @@ -218,6 +218,8 @@
#include "ui/native_theme/native_theme_features.h" #include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h" #include "ui/ui_features.h"
@ -81,7 +81,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#include "base/allocator/buildflags.h" #include "base/allocator/buildflags.h"
#endif #endif
@@ -3646,6 +3648,20 @@ const FeatureEntry kFeatureEntries[] = { @@ -3715,6 +3717,20 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebrtcUseMinMaxVEADimensionsName, flag_descriptions::kWebrtcUseMinMaxVEADimensionsName,
flag_descriptions::kWebrtcUseMinMaxVEADimensionsDescription, kOsAll, flag_descriptions::kWebrtcUseMinMaxVEADimensionsDescription, kOsAll,
FEATURE_VALUE_TYPE(blink::features::kWebRtcUseMinMaxVEADimensions)}, FEATURE_VALUE_TYPE(blink::features::kWebRtcUseMinMaxVEADimensions)},
@ -105,18 +105,18 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
--- a/content/browser/BUILD.gn --- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn
@@ -247,6 +247,7 @@ source_set("browser") { @@ -248,6 +248,7 @@ source_set("browser") {
"//third_party/libyuv", "//third_party/libyuv",
"//third_party/re2", "//third_party/re2",
"//third_party/sqlite", "//third_party/sqlite",
+ "//third_party/ungoogled:switches", + "//third_party/ungoogled:switches",
"//third_party/webrtc_overrides:webrtc_component", "//third_party/webrtc_overrides:webrtc_component",
"//third_party/wtl",
"//third_party/zlib", "//third_party/zlib",
"//third_party/zlib/google:zip",
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -204,6 +204,7 @@ @@ -206,6 +206,7 @@
#include "url/gurl.h" #include "url/gurl.h"
#include "url/origin.h" #include "url/origin.h"
@ -124,7 +124,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
#include "base/android/child_process_binding_types.h" #include "base/android/child_process_binding_types.h"
#include "content/browser/android/java_interfaces_impl.h" #include "content/browser/android/java_interfaces_impl.h"
@@ -3250,6 +3251,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( @@ -3265,6 +3266,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kDisableBreakpad, switches::kDisableBreakpad,
switches::kDisableDatabases, switches::kDisableDatabases,
switches::kDisableFileSystem, switches::kDisableFileSystem,
@ -148,7 +148,7 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
--- a/content/child/runtime_features.cc --- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc
@@ -41,6 +41,8 @@ @@ -42,6 +42,8 @@
#include "ui/gl/gl_switches.h" #include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h" #include "ui/native_theme/native_theme_features.h"
@ -157,7 +157,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
#include "base/android/build_info.h" #include "base/android/build_info.h"
#endif #endif
@@ -456,6 +458,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs( @@ -485,6 +487,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
if (!command_line.HasSwitch(switches::kDisableYUVImageDecoding) && if (!command_line.HasSwitch(switches::kDisableYUVImageDecoding) &&
base::FeatureList::IsEnabled( base::FeatureList::IsEnabled(
blink::features::kDecodeLossyWebPImagesToYUV)) { blink::features::kDecodeLossyWebPImagesToYUV)) {
@ -196,9 +196,9 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
#include "base/ranges/algorithm.h" #include "base/ranges/algorithm.h"
#include "base/time/time.h" #include "base/time/time.h"
@@ -820,6 +821,15 @@ Document::Document(const DocumentInit& initializer, @@ -820,6 +821,15 @@ Document::Document(const DocumentInit& initializer,
? MakeGarbageCollected<RenderBlockingResourceManager>(*this) MakeGarbageCollected<DisplayLockDocumentState>(this)),
: nullptr), render_blocking_resource_manager_(
data_(MakeGarbageCollected<DocumentData>(GetExecutionContext())) { initializer.GetType() == DocumentInit::Type::kHTML
+ if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) { + if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
+ // Precompute -0.0003% to 0.0003% noise factor for get*ClientRect*() fingerprinting + // Precompute -0.0003% to 0.0003% noise factor for get*ClientRect*() fingerprinting
+ noise_factor_x_ = 1 + (base::RandDouble() - 0.5) * 0.000003; + noise_factor_x_ = 1 + (base::RandDouble() - 0.5) * 0.000003;
@ -208,10 +208,10 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
+ noise_factor_y_ = 1; + noise_factor_y_ = 1;
+ } + }
+ +
if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution)) ? MakeGarbageCollected<RenderBlockingResourceManager>(*this)
script_runner_delayer_->Activate(); : nullptr),
data_(MakeGarbageCollected<DocumentData>(GetExecutionContext())) {
@@ -2243,6 +2253,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { @@ -2252,6 +2262,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
#endif #endif
} }
@ -240,7 +240,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
AtomicString visibilityState() const; AtomicString visibilityState() const;
bool IsPageVisible() const; bool IsPageVisible() const;
bool hidden() const; bool hidden() const;
@@ -2332,6 +2336,9 @@ class CORE_EXPORT Document : public ContainerNode, @@ -2333,6 +2337,9 @@ class CORE_EXPORT Document : public ContainerNode,
base::ElapsedTimer start_time_; base::ElapsedTimer start_time_;
@ -253,7 +253,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
--- a/third_party/blink/renderer/core/dom/element.cc --- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2053,6 +2053,7 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const { @@ -2065,6 +2065,7 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
quads.push_back(element_layout_object->LocalToAbsoluteQuad( quads.push_back(element_layout_object->LocalToAbsoluteQuad(
gfx::QuadF(element_layout_object->ObjectBoundingBox()))); gfx::QuadF(element_layout_object->ObjectBoundingBox())));
} }
@ -261,7 +261,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
return; return;
} }
@@ -2060,6 +2061,11 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const { @@ -2072,6 +2073,11 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
if (element_layout_object->IsBoxModelObject() || if (element_layout_object->IsBoxModelObject() ||
element_layout_object->IsBR()) element_layout_object->IsBR())
element_layout_object->AbsoluteQuads(quads); element_layout_object->AbsoluteQuads(quads);
@ -273,7 +273,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
} }
DOMRectList* Element::getClientRects() { DOMRectList* Element::getClientRects() {
@@ -2098,6 +2104,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { @@ -2110,6 +2116,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const {
DCHECK(element_layout_object); DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object); *element_layout_object);
@ -464,7 +464,7 @@ diff --git a/third_party/blink/renderer/core/svg/svg_text_content_element.cc b/t
diff --git 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 diff --git 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
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc --- 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 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -29,6 +29,7 @@ @@ -30,6 +30,7 @@
#include "third_party/blink/renderer/modules/webcodecs/video_frame.h" #include "third_party/blink/renderer/modules/webcodecs/video_frame.h"
#include "third_party/blink/renderer/platform/graphics/bitmap_image.h" #include "third_party/blink/renderer/platform/graphics/bitmap_image.h"
#include "third_party/blink/renderer/platform/graphics/graphics_context.h" #include "third_party/blink/renderer/platform/graphics/graphics_context.h"
@ -472,7 +472,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
#include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
#include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/graphics/stroke_data.h"
#include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
@@ -2070,6 +2071,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -2079,6 +2080,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
} }
@ -486,7 +486,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
@@ -920,9 +920,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { @@ -929,9 +929,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
TextDirection direction = TextDirection direction =
ToTextDirection(GetState().GetDirection(), canvas()); ToTextDirection(GetState().GetDirection(), canvas());
@ -761,7 +761,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1447,6 +1447,15 @@ @@ -1514,6 +1514,15 @@
// No plan to support complex UI for date/time INPUT types on Android. // No plan to support complex UI for date/time INPUT types on Android.
status: {"Android": "test", "default": "stable"}, status: {"Android": "test", "default": "stable"},
}, },

10
build/patches/Never-fetch-popular-sites.patch
View file

@ -15,10 +15,10 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
const char kPopularSitesDefaultVersion[] = "5"; const char kPopularSitesDefaultVersion[] = "5";
const int kSitesExplorationStartVersion = 6; const int kSitesExplorationStartVersion = 6;
-const int kPopularSitesRedownloadIntervalHours = 24; -const int kPopularSitesRedownloadIntervalHours = 24;
const char kIOSDefaultPopularSitesExperimentIncludeApps[] =
GURL GetPopularSitesURL(const std::string& directory, "https://www.gstatic.com/chrome/ntp/ios/"
const std::string& country, "suggested_sites_US_2023q1_mvt_experiment_with_popular_sites.json";
@@ -285,7 +284,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, @@ -370,7 +369,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
DCHECK(!callback_); DCHECK(!callback_);
callback_ = std::move(callback); callback_ = std::move(callback);
@ -32,7 +32,7 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref)); prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
const base::TimeDelta time_since_last_download = const base::TimeDelta time_since_last_download =
base::Time::Now() - last_download_time; base::Time::Now() - last_download_time;
@@ -302,7 +306,7 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, @@ -387,7 +391,7 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
(time_since_last_download > redownload_interval) || url_changed) { (time_since_last_download > redownload_interval) || url_changed) {
FetchPopularSites(); FetchPopularSites();
return true; return true;

Some files were not shown because too many files have changed in this diff Show more