PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rebase to v144 (#2639)

Browse Source 
Rebase to v144
This commit is contained in:
uazo
2026-01-20 15:27:33 +00:00
committed by GitHub
parent 65ef4d754b 054d093802
commit d102353b1b
249 changed files with 4271 additions and 5212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/RELEASE
+1 -1
View File
@@ -1 +1 @@
143.0.7499.147
144.0.7559.76
build/cromite_patches_list.txt
+2 -6
View File
@@ -1,5 +1,4 @@
Do-not-link-with-libatomic.patch
Do-not-check-for-the-presence-of-use-remoteexec.patch
bromite-build-utils.patch
Add-cromite-flags-support.patch
Force-use-vpython3-for-some-scripts.patch
@@ -10,7 +9,6 @@ Restore-chrome-password-store.patch
Remove-EV-certificates.patch
do-not-hide-.orig-files.patch
do-not-add-suffix-to-package-name.patch
exit-on-failure-of-inclusion.patch
Move-some-account-settings-back-to-privacy-settings.patch
kill-Vision.patch
kill-Location-fall-back-to-system.patch
@@ -99,7 +97,6 @@ Block-gateway-attacks-via-websockets.patch
Enable-darken-websites-checkbox-in-themes.patch
Remove-blocklisted-URLs-upon-bookmark-creation.patch
Disable-the-DIAL-repeating-discovery.patch
Block-qjz9zk-or-trk-requests.patch
Hardening-against-incognito-mode-detection.patch
Restore-Simplified-NTP-launch.patch
Add-option-to-use-home-page-as-NTP.patch
@@ -156,7 +153,6 @@ Enable-Certificate-Transparency.patch
Invalidate-components-public-key.patch
Improve-plain-text-rendering-on-mobile.patch
Remove-segmentation-platform.patch
Follow-only-system-dark-mode.patch
Remove-window-name-on-cross-origin-navigation.patch
Remove-preload-of-com.google.android.gms.fonts.patch
Partition-Blink-memory-cache.patch
@@ -308,9 +304,10 @@ Temp-disable-UseContextSnapshot.patch
Enable-ClientHello-Segmentation.patch
Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch
Supporting-Dangling-Ptr-Detection-via-BackupRefPtr.patch
Disable-device-bound-session.patch
Keep-disabled-CpuPerformance.patch
# temporary or wip patches
Temp-PerformanceNavigationTiming-privacy-fix.patch
Temp-disable-predictive-back-gesture.patch
TEMP-Add-a-log-to-track-strange-behavior.patch
Temp-guard-FileSystemAccessPersistentPermissions.patch
@@ -331,5 +328,4 @@ Eyeo-Adblock-for-Cromite.patch
# extension patches
Experimental-support-for-extensions-on-Android.patch
Backport-v144-android-extensions-changes.patch
Enable-extension-in-incognito.patch
build/patches/Add-AllowUserCertificates-flag.patch
+6 -6
View File
@@ -20,7 +20,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/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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -249,6 +249,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
@@ -255,6 +255,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.SelectionPopupController;
import org.chromium.content_public.browser.WebContents;
import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.printing.PrintManagerDelegateImpl;
import org.chromium.printing.PrintingController;
import org.chromium.printing.PrintingControllerImpl;
@@ -1082,6 +1083,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -1096,6 +1097,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
super.onStartWithNative();
ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
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
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -194,6 +194,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -196,6 +196,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&feed::kFeedPerformanceStudy,
&feed::kFeedRecyclerBinderUnmountOnDetach,
&feed::kFeedShowSignInCommand,
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
"AdaptiveButtonInTopToolbarPageSummary";
public static final String ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER =
@@ -805,6 +806,8 @@ public abstract class ChromeFeatureList {
@@ -820,6 +821,8 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =
newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);
public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,14 +68,14 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final CachedFlag sAppSpecificHistoryViewIntent =
newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);
public static final CachedFlag sAsyncNotificationManager =
@@ -1128,6 +1131,7 @@ public abstract class ChromeFeatureList {
@@ -1136,6 +1139,7 @@ public abstract class ChromeFeatureList {
sAccountForSuppressedKeyboardInsets,
sAndroidAnimatedProgressBarInBrowser,
sAndroidAnimatedProgressBarInViz,
+ sAllowUserCertificates,
sAndroidAppIntegrationModule,
sAndroidAppIntegrationMultiDataSource,
sAndroidBottomToolbar,
sAndroidAutoMintedTwa,
diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc
new file mode 100644
--- /dev/null
build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch
+1 -1
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/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
@@ -903,6 +903,12 @@ public class KeyboardShortcuts {
@@ -904,6 +904,12 @@ public class KeyboardShortcuts {
KeyEvent.KEYCODE_ESCAPE,
KeyEvent.META_CTRL_ON);
}
build/patches/Add-IsCleartextPermitted-flag.patch
+1 -1
View File
@@ -44,7 +44,7 @@ new file mode 100644
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -413,6 +413,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
@@ -400,6 +400,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
}
}
build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch
+3 -3
View File
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/base/features.cc b/base/features.cc
--- a/base/features.cc
+++ b/base/features.cc
@@ -202,6 +202,10 @@ bool IsReducePPMsEnabled() {
@@ -200,6 +200,10 @@ bool IsReducePPMsEnabled() {
return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);
}
@@ -23,9 +23,9 @@ diff --git a/base/features.cc b/base/features.cc
+SET_CROMITE_FEATURE_DISABLED(kPartialLowEndModeOnMidRangeDevices);
+#endif
+
void Init(EmitThreadControllerProfilerMetadata
emit_thread_controller_profiler_metadata) {
void Init() {
g_is_reduce_ppms_enabled.store(FeatureList::IsEnabled(kReducePPMs),
std::memory_order_relaxed);
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
build/patches/Add-a-flag-to-disable-GamePad-API.patch
+16 -11
View File
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -8969,9 +8969,9 @@
@@ -9186,9 +9186,9 @@
"expiry_milestone": 150
},
{
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -264,6 +264,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
@@ -262,6 +262,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
{wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)},
{wf::EnablePeriodicBackgroundSync,
raw_ref(features::kPeriodicBackgroundSync)},
@@ -56,7 +56,7 @@ new file mode 100644
diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc
--- a/device/gamepad/public/cpp/gamepad_features.cc
+++ b/device/gamepad/public/cpp/gamepad_features.cc
@@ -40,4 +40,12 @@ bool IsGamepadMultitouchEnabled() {
@@ -53,4 +53,12 @@ bool IsGamepadMultitouchEnabled() {
return false;
}
@@ -72,12 +72,17 @@ diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/publ
diff --git a/device/gamepad/public/cpp/gamepad_features.h b/device/gamepad/public/cpp/gamepad_features.h
--- a/device/gamepad/public/cpp/gamepad_features.h
+++ b/device/gamepad/public/cpp/gamepad_features.h
@@ -16,8 +16,10 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
@@ -17,6 +17,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
kEnableSimulatedGamepadDataFetcher);
GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kGamepadRawInputChangeEvent);
+GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess);
#if BUILDFLAG(IS_WIN)
GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kIgnorePS5GamepadsInWgi);
@@ -27,6 +28,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kAllowlistHidrawGamepads);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
GAMEPAD_FEATURES_EXPORT bool IsGamepadMultitouchEnabled();
+GAMEPAD_FEATURES_EXPORT bool IsRestrictGamepadAccessEnabled();
@@ -91,10 +96,10 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t
#include "base/auto_reset.h"
#include "device/gamepad/public/cpp/gamepads.h"
+#include "device/gamepad/public/cpp/gamepad_features.h"
#include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
#include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
#include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-blink.h"
@@ -114,6 +115,9 @@ void RecordGamepadsForIdentifiabilityStudy(
#include "third_party/blink/public/platform/task_type.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_gamepad_mapping_type.h"
@@ -86,6 +87,9 @@ NavigatorGamepad& NavigatorGamepad::From(Navigator& navigator) {
HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads(
Navigator& navigator,
ExceptionState& exception_state) {
@@ -104,10 +109,10 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t
if (!navigator.DomWindow()) {
// Using an existing NavigatorGamepad if one exists, but don't create one
// for a detached window, as its subclasses depend on a non-null window.
@@ -420,6 +424,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
void NavigatorGamepad::DispatchGamepadEvent(const AtomicString& event_name,
Gamepad* gamepad) {
@@ -428,6 +432,8 @@ void NavigatorGamepad::MaybeDispatchGamepadEvents(
void NavigatorGamepad::DispatchGamepadConnectionChangedEvent(
const AtomicString& event_name,
Gamepad* gamepad) {
+ if (::features::IsRestrictGamepadAccessEnabled())
+ return;
// Ensure that we're blocking re-entrancy.
build/patches/Add-a-proxy-configuration-page.patch
+16 -15
View File
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -102,6 +102,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -410,6 +410,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
@@ -411,6 +411,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
#endif
builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -233,6 +233,9 @@
@@ -239,6 +239,9 @@
<if expr="_google_chrome">
<include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />
</if>
@@ -197,7 +197,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
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -211,6 +211,8 @@
@@ -212,6 +212,8 @@
#include "printing/buildflags/buildflags.h"
#include "rlz/buildflags/buildflags.h"
@@ -206,7 +206,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
#include "chrome/browser/background/extensions/background_mode_manager.h"
#endif
@@ -1565,6 +1567,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1314,6 +1316,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
component_updater::RegisterPrefs(registry);
domain_reliability::RegisterPrefs(registry);
embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -673,7 +673,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -58,6 +58,9 @@
@@ -59,6 +59,9 @@
#include "extensions/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
@@ -683,7 +683,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u
#if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)
#include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"
#endif
@@ -428,7 +431,7 @@ void RegisterChromeWebUIConfigs() {
@@ -438,7 +441,7 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());
#endif
@@ -1154,7 +1154,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
--- a/chrome/common/webui_url_constants.h
+++ b/chrome/common/webui_url_constants.h
@@ -191,6 +191,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
@@ -197,6 +197,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
inline constexpr char kChromeUINewTabHost[] = "newtab";
inline constexpr char kChromeUINewTabFooterHost[] = "newtab-footer";
@@ -1166,15 +1166,16 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const
diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc
--- a/components/proxy_config/pref_proxy_config_tracker_impl.cc
+++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc
@@ -253,14 +253,14 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig(
@@ -550,7 +550,7 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig(
// static
void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterDictionaryPref(proxy_config::prefs::kProxy,
- ProxyConfigDictionary::CreateSystem());
+ ProxyConfigDictionary::CreateDirect());
}
// static
registry->RegisterListPref(proxy_config::prefs::kProxyOverrideRules);
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
registry->RegisterIntegerPref(
@@ -562,7 +562,7 @@ void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
void PrefProxyConfigTrackerImpl::RegisterProfilePrefs(
PrefRegistrySimple* registry) {
registry->RegisterDictionaryPref(proxy_config::prefs::kProxy,
@@ -1183,7 +1184,7 @@ diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/compone
registry->RegisterBooleanPref(proxy_config::prefs::kUseSharedProxies, false);
registry->RegisterListPref(proxy_config::prefs::kProxyOverrideRules);
#if !BUILDFLAG(IS_CHROMEOS)
@@ -410,6 +410,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
@@ -716,6 +716,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
if (proxy_dict.GetBypassList(&proxy_bypass)) {
proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
}
@@ -1196,7 +1197,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
+++ b/components/proxy_config/proxy_config_dictionary.cc
@@ -30,6 +30,8 @@ const char kProxyPacMandatory[] = "pac_mandatory";
// String containing proxy bypass rules. For a specification of the
// expected syntax see net::ProxyBypassRules::ParseFromString().
// expected syntax see net::ProxyHostMatchingRules::ParseFromString().
const char kProxyBypassList[] = "bypass_list";
+// Boolean telling whether to reverse the meaning of the bypass list.
+const char kProxyReverseBypass[] = "reverse_bypass";
@@ -1420,7 +1421,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_config.h
--- a/net/proxy_resolution/proxy_config.h
+++ b/net/proxy_resolution/proxy_config.h
@@ -107,6 +107,9 @@ class NET_EXPORT ProxyConfig {
@@ -106,6 +106,9 @@ class NET_EXPORT ProxyConfig {
void ParseFromString(std::string_view proxy_rules,
bool allow_bracketed_proxy_chains = false,
bool is_quic_allowed = false);
build/patches/Add-an-always-incognito-mode.patch
+73 -72
View File
@@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../AppMenuPropertiesDelegateImpl.java | 7 +-
.../ChromeContextMenuPopulator.java | 6 +-
.../CustomTabActivityLifecycleUmaTracker.java | 31 ----
.../CustomTabAppMenuPropertiesDelegate.java | 4 +
.../CustomTabAppMenuPropertiesDelegate.java | 5 +
.../CustomTabIntentDataProvider.java | 10 +
.../browser/download/DownloadUtils.java | 13 +-
.../history/HistoryContentManager.java | 9 +-
@@ -88,7 +88,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../add-an-always-incognito-mode.inc | 1 +
.../add-an-always-incognito-mode.inc | 3 +
.../add-an-always-incognito-mode.inc | 1 +
69 files changed, 806 insertions(+), 106 deletions(-)
69 files changed, 807 insertions(+), 106 deletions(-)
create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
@@ -101,7 +101,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
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -650,6 +650,7 @@ chrome_java_resources = [
@@ -669,6 +669,7 @@ chrome_java_resources = [
"java/res/xml/main_preferences.xml",
"java/res/xml/manage_sync_preferences.xml",
"java/res/xml/personalize_google_services_preferences.xml",
@@ -120,7 +120,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/org/chromium/chrome/browser/ActivityTabProvider.java",
"java/src/org/chromium/chrome/browser/ActivityUtils.java",
@@ -936,6 +937,7 @@ chrome_java_sources = [
@@ -949,6 +950,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/privacy/settings/PasswordEchoSettingHandlerFactory.java",
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@@ -173,7 +173,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -90,6 +90,11 @@ found in the LICENSE file.
@@ -84,6 +84,11 @@ found in the LICENSE file.
android:key="secure_dns"
android:title="@string/settings_secure_dns_title"
android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
@@ -258,7 +258,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
import org.chromium.chrome.browser.IntentHandler.TabOpenType;
import org.chromium.chrome.browser.accessibility.settings.CaretBrowsingDialog;
@@ -825,15 +829,20 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -819,15 +823,20 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
BrowserWindowType.NORMAL, currentTabModel, mMultiInstanceManager);
// For saving non-incognito tab closures for Recent Tabs.
@@ -286,7 +286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
// Defer creation of this helper so it triggers after TabGroupModelFilter observers.
mUndoRefocusHelper =
new UndoRefocusHelper(
@@ -3274,7 +3283,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -3282,7 +3291,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
// We determine SupportedProfileType in onPreCreate().
// We determine the model as soon as possible so every systems get initialized coherently.
@@ -298,15 +298,15 @@ 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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -101,6 +101,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerH
import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
@@ -106,6 +106,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
import org.chromium.chrome.browser.desktop_site.DesktopSiteUtils;
import org.chromium.chrome.browser.device.DeviceClassManager;
import org.chromium.chrome.browser.devtools.DevToolsWindowAndroid;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
import org.chromium.chrome.browser.dom_distiller.DomDistillerUiUtils;
import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
import org.chromium.chrome.browser.download.DownloadManagerService;
@@ -2144,6 +2145,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -2189,6 +2190,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
throw new IllegalStateException(
"Attempting to access TabCreator before initialization");
}
@@ -319,7 +319,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
--- 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
@@ -92,6 +92,8 @@ import java.util.Iterator;
@@ -93,6 +93,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.function.Supplier;
@@ -328,7 +328,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
* items based on activity state.
@@ -633,8 +635,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
@@ -669,8 +671,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
&& !isNativePage
&& !isFileScheme
&& !isContentScheme
@@ -343,7 +343,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
@@ -41,6 +41,7 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager;
@@ -43,6 +43,7 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.R;
@@ -351,7 +351,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ContextMenuItemType;
@@ -437,6 +438,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -452,6 +453,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
mShowEphemeralTabNewLabel = null;
mCustomActionMap.clear();
@@ -361,7 +361,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
List<ModelList> groupedItems = new ArrayList<>();
if (mParams.isPage() && shouldShowEmptySpaceContextMenu()) {
@@ -508,7 +512,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -523,7 +527,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
}
}
if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -422,20 +422,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
import org.chromium.chrome.browser.DefaultBrowserInfo;
import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
@@ -248,6 +249,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
openInChromeItemVisible = false;
@@ -240,6 +241,10 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
tryAddingReadAloud = false;
}
+ if (AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) {
+ downloadItemVisible = true;
+ }
boolean isNativePage =
url.getScheme().equals(UrlConstants.CHROME_SCHEME)
+ if (AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) {
+ downloadItemVisible = true;
+ }
+
if (CustomTabIntentDataProvider.isOpenInBrowserDisallowed(mUiType, mIsIncognitoBranded)) {
openInChromeItemVisible = false;
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
@@ -105,6 +105,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
@@ -106,6 +106,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
import org.chromium.device.mojom.ScreenOrientationLockType;
import org.chromium.net.NetId;
@@ -445,7 +446,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -1328,6 +1331,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
@@ -1362,6 +1365,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
return getInitialActivityWidth() > 0;
}
@@ -549,7 +550,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
mSelectableListLayout = null;
mRootView = getIncognitoHistoryPlaceholderView();
return;
@@ -451,9 +459,22 @@ public class HistoryManager
@@ -458,9 +466,22 @@ public class HistoryManager
onBackPressStateChanged();
}
@@ -573,7 +574,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
// If Incognito placeholder is shown no need to call any destroy method.
return;
}
@@ -514,7 +535,7 @@ public class HistoryManager
@@ -521,7 +542,7 @@ public class HistoryManager
* @return True if manager handles this event, false if it decides to ignore.
*/
private boolean onBackPressed() {
@@ -618,7 +619,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
@@ -25,6 +25,7 @@ import org.chromium.base.supplier.OneshotSupplier;
@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.R;
@@ -626,7 +627,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.app.download.home.DownloadPage;
import org.chromium.chrome.browser.back_press.BackPressManager;
@@ -411,7 +412,8 @@ public class NativePageFactory {
@@ -425,7 +426,8 @@ public class NativePageFactory {
NativePage page;
@@ -879,7 +880,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation;
@@ -229,6 +230,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
@@ -211,6 +212,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
SigninAndHistorySyncActivityLauncherImpl.get(),
new SettingsCustomTabLauncherImpl()));
}
@@ -998,7 +999,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/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier;
@@ -27,6 +27,7 @@ import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.R;
@@ -1006,7 +1007,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.ai.AiAssistantService;
import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
@@ -241,7 +242,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
@@ -245,7 +246,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
// When the feature is enabled, show either "New Incognito tab" in incognito mode
// or "New tab" in normal mode. When the feature is disabled, show both.
@@ -1019,7 +1020,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -209,6 +209,8 @@ import org.chromium.content_public.common.ContentSwitches;
@@ -216,6 +216,8 @@ import org.chromium.content_public.common.ContentSwitches;
import org.chromium.ui.UiUtils;
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.DeviceFormFactor;
@@ -1028,7 +1029,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.UiAndroidFeatureList;
import org.chromium.ui.display.DisplayUtil;
@@ -1257,7 +1259,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -1309,7 +1311,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
() -> {
mTabCreatorManagerSupplier
.get()
@@ -1040,7 +1041,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
@@ -55,6 +55,10 @@ import org.chromium.url.GURL;
@@ -56,6 +56,10 @@ import org.chromium.url.GURL;
import java.util.Collections;
import java.util.function.Supplier;
@@ -1051,7 +1052,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}. */
public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabModelOrderController {
/**
@@ -594,7 +598,6 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode
@@ -598,7 +602,6 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode
// TODO(crbug.com/40691614): Clean up the launches from SearchActivity/Chrome.
public @Nullable Tab launchUrlFromExternalApp(
LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) {
@@ -1062,7 +1063,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
@@ -20,6 +20,7 @@ import org.chromium.build.annotations.Initializer;
@@ -20,6 +20,7 @@ import org.chromium.build.annotations.MonotonicNonNull;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton;
@@ -1070,7 +1071,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
import org.chromium.chrome.browser.flags.ActivityType;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
@@ -139,6 +140,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
@@ -138,6 +139,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
ProfileProvider profileProvider = mProfileProviderSupplier.get();
assert profileProvider != null;
@@ -1090,7 +1091,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton;
import org.chromium.chrome.browser.crypto.CipherFactory;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -750,6 +751,12 @@ public class TabPersistentStoreImpl implements TabPersistentStore {
@@ -723,6 +724,12 @@ public class TabPersistentStoreImpl implements TabPersistentStore {
}
}
}
@@ -1229,7 +1230,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -461,6 +461,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const {
@@ -462,6 +462,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const {
return AimEligibilityServiceFactory::GetForProfile(profile_);
}
@@ -1284,7 +1285,7 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b
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
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -37,6 +37,7 @@
@@ -33,6 +33,7 @@
#include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h"
#include "base/uuid.h"
@@ -1292,7 +1293,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
#include "chrome/browser/commerce/shopping_service_factory.h"
@@ -214,6 +215,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
@@ -210,6 +211,12 @@ static ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
if (!profile)
return nullptr;
@@ -1356,7 +1357,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
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
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -83,6 +83,12 @@
@@ -80,6 +80,12 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#endif
@@ -1369,7 +1370,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
using safe_browsing::SafeBrowsingNavigationObserverManager;
@@ -223,6 +229,16 @@ const int kExtensionReferrerUserGestureLimit = 2;
@@ -220,6 +226,16 @@ const int kExtensionReferrerUserGestureLimit = 2;
WebstorePrivateApi::Delegate* test_delegate = nullptr;
@@ -1386,7 +1387,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
// We allow the web store to set a string containing login information when a
// purchase is made, so that when a user logs into sync with a different
// account we can recognize the situation. The Get function returns the login if
@@ -429,7 +445,7 @@ WebstorePrivateBeginInstallWithManifest3Function::Run() {
@@ -426,7 +442,7 @@ WebstorePrivateBeginInstallWithManifest3Function::Run() {
params_ = Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params_);
@@ -1395,7 +1396,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
if (!crx_file::id_util::IdIsValid(details().id)) {
return RespondNow(BuildResponse(api::webstore_private::Result::kInvalidId,
@@ -965,7 +981,7 @@ void WebstorePrivateBeginInstallWithManifest3Function::
@@ -948,7 +964,7 @@ void WebstorePrivateBeginInstallWithManifest3Function::
DCHECK(extension);
DCHECK(contents);
@@ -1404,7 +1405,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
std::string message_from_admin =
ExtensionManagementFactory::GetForBrowserContext(profile)
@@ -1001,7 +1017,7 @@ WebstorePrivateCompleteInstallFunction::Run() {
@@ -984,7 +1000,7 @@ WebstorePrivateCompleteInstallFunction::Run() {
std::optional<CompleteInstall::Params> params =
CompleteInstall::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
@@ -1413,7 +1414,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
if (profile->IsGuestSession() || profile->IsOffTheRecord()) {
return RespondNow(Error(kIncognitoError));
}
@@ -1319,7 +1335,7 @@ ExtensionFunction::ResponseValue
@@ -1302,7 +1318,7 @@ ExtensionFunction::ResponseValue
WebstorePrivateGetExtensionStatusFunction::BuildResponseWithoutManifest(
const ExtensionId& extension_id) {
ExtensionInstallStatus status = GetWebstoreExtensionInstallStatus(
@@ -1422,7 +1423,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
api::webstore_private::ExtensionInstallStatus api_status =
ConvertExtensionInstallStatusForAPI(status);
return ArgumentList(GetExtensionStatus::Results::Create(api_status));
@@ -1333,7 +1349,7 @@ void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed(
@@ -1316,7 +1332,7 @@ void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed(
return;
}
@@ -1478,7 +1479,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
--- a/chrome/browser/history/history_tab_helper.h
+++ b/chrome/browser/history/history_tab_helper.h
@@ -17,6 +17,8 @@
@@ -18,6 +18,8 @@
#include "components/translate/core/browser/translate_driver.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
@@ -1487,7 +1488,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor
namespace history {
struct HistoryAddPageArgs;
@@ -59,6 +61,11 @@ class HistoryTabHelper
@@ -60,6 +62,11 @@ class HistoryTabHelper
std::optional<std::string> GetAppId() { return app_id_; }
#endif
@@ -1807,7 +1808,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
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -261,6 +261,7 @@
@@ -262,6 +262,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h"
@@ -1815,7 +1816,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
#include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
#include "chrome/browser/android/preferences/browser_prefs_android.h"
@@ -2022,6 +2023,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1774,6 +1775,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
variations::VariationsService::RegisterProfilePrefs(registry);
webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
@@ -1880,7 +1881,7 @@ diff --git a/chrome/browser/profiles/profile_selections.h b/chrome/browser/profi
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
+++ b/chrome/browser/ui/android/native_page/BUILD.gn
@@ -33,6 +33,8 @@ robolectric_library("junit") {
@@ -34,6 +34,8 @@ robolectric_library("junit") {
deps = [
":java",
@@ -1901,7 +1902,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
/** An interface for pages that will be using Android views instead of html/rendered Web content. */
@NullMarked
public interface NativePage {
@@ -192,7 +194,8 @@ public interface NativePage {
@@ -201,7 +203,8 @@ public interface NativePage {
*/
static boolean isNativePageUrl(GURL url, boolean isIncognito, boolean hasPdfDownload) {
return url != null
@@ -1911,7 +1912,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
}
/**
@@ -202,7 +205,7 @@ public interface NativePage {
@@ -211,7 +214,7 @@ public interface NativePage {
* not have chrome or chrome-native scheme.
*/
static boolean isChromePageUrl(GURL url, boolean isIncognito) {
@@ -1920,7 +1921,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
}
/**
@@ -216,7 +219,8 @@ public interface NativePage {
@@ -225,7 +228,8 @@ public interface NativePage {
GURL url,
@Nullable NativePage candidatePage,
boolean isIncognito,
@@ -1930,7 +1931,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
if (hasPdfDownload) {
// For navigation with associated pdf download (e.g. open a pdf link), pdf page should
// be created.
@@ -234,7 +238,7 @@ public interface NativePage {
@@ -243,7 +247,7 @@ public interface NativePage {
// created after the pdf document is re-downloaded in other parts of the code.
return NativePageType.NONE;
} else {
@@ -1939,7 +1940,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
}
}
@@ -246,7 +250,7 @@ public interface NativePage {
@@ -255,7 +259,7 @@ public interface NativePage {
* which do not have chrome or chrome-native scheme.
*/
private static @NativePageType int chromePageType(
@@ -1948,7 +1949,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
String host = url.getHost();
String scheme = url.getScheme();
if (!UrlConstants.CHROME_NATIVE_SCHEME.equals(scheme)
@@ -266,7 +270,8 @@ public interface NativePage {
@@ -275,7 +279,8 @@ public interface NativePage {
return NativePageType.DOWNLOADS;
} else if (UrlConstants.HISTORY_HOST.equals(host)) {
return NativePageType.HISTORY;
@@ -1961,7 +1962,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
@@ -101,6 +101,11 @@ import org.chromium.ui.interpolators.Interpolators;
@@ -108,6 +108,11 @@ import org.chromium.ui.interpolators.Interpolators;
import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.url.GURL;
@@ -1973,7 +1974,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -497,6 +502,9 @@ class LocationBarMediator
@@ -528,6 +533,9 @@ class LocationBarMediator
if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mContext)) return;
Tab tab = mLocationBarDataProvider.getTab();
if (tab == null) return;
@@ -1986,7 +1987,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -6900,6 +6900,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -6990,6 +6990,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_QUICK_DELETE_DIALOG_COOKIES_CACHE_AND_OTHER_SITE_DATA_TEXT" desc="Text indicating that browsing data like cookies, cache, and other site data would be deleted.">
Cookies, cache, and other site data
</message>
@@ -2073,7 +2074,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
#include "chrome/common/url_constants.h"
#include "components/search_engines/template_url.h"
#include "components/search_engines/template_url_fetcher.h"
@@ -165,6 +166,11 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
@@ -166,6 +167,11 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
// Download the OpenSearch description document. If this is successful, a
// new keyword will be created when done.
@@ -2088,7 +2089,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -4116,6 +4116,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
@@ -4153,6 +4153,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
"net.out_of_process_system_dns_resolution_enabled";
#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
@@ -2104,7 +2105,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
@@ -122,10 +122,12 @@ void PrefProvider::RegisterProfilePrefs(
@@ -129,10 +129,12 @@ void PrefProvider::RegisterProfilePrefs(
PrefProvider::PrefProvider(PrefService* prefs,
bool off_the_record,
@@ -2117,7 +2118,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
store_last_modified_(store_last_modified),
clock_(base::DefaultClock::GetInstance()) {
TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider");
@@ -148,10 +150,12 @@ PrefProvider::PrefProvider(PrefService* prefs,
@@ -155,10 +157,12 @@ PrefProvider::PrefProvider(PrefService* prefs,
WebsiteSettingsRegistry* website_settings =
WebsiteSettingsRegistry::GetInstance();
for (const WebsiteSettingsInfo* info : *website_settings) {
@@ -2189,7 +2190,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
bool store_last_modified,
bool restore_session,
bool should_record_metrics);
@@ -551,6 +552,8 @@ class HostContentSettingsMap : public content_settings::Observer,
@@ -556,6 +557,8 @@ class HostContentSettingsMap : public content_settings::Observer,
// Whether this settings map is for an incognito or guest session.
bool is_off_the_record_;
@@ -2201,10 +2202,10 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/components/omnibox/browser/autocomplete_provider_client.cc
--- a/components/omnibox/browser/autocomplete_provider_client.cc
+++ b/components/omnibox/browser/autocomplete_provider_client.cc
@@ -81,3 +81,7 @@ AutocompleteProviderClient::GetGeminiPrototypeOmniboxService() const {
@@ -77,3 +77,7 @@ base::WeakPtr<AutocompleteProviderClient>
AutocompleteProviderClient::GetWeakPtr() {
return nullptr;
}
#endif // BUILDFLAG(IS_IOS)
+
+bool AutocompleteProviderClient::IsAlwaysIncognitoEnabled() const {
+ return false;
@@ -2212,7 +2213,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/compon
diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h
--- a/components/omnibox/browser/autocomplete_provider_client.h
+++ b/components/omnibox/browser/autocomplete_provider_client.h
@@ -161,6 +161,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
@@ -154,6 +154,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
virtual bool IsOffTheRecord() const = 0;
virtual bool IsIncognitoProfile() const = 0;
virtual bool IsGuestSession() const = 0;
@@ -2223,7 +2224,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
--- a/components/omnibox/browser/base_search_provider.cc
+++ b/components/omnibox/browser/base_search_provider.cc
@@ -401,7 +401,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
@@ -403,7 +403,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
// Don't make a suggest request if in incognito mode; unless for the Lens
// searchboxes.
@@ -2235,7 +2236,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
--- a/components/omnibox/browser/search_provider.cc
+++ b/components/omnibox/browser/search_provider.cc
@@ -922,7 +922,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
@@ -948,7 +948,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
// is required.
// Request for suggestions in OTR contexts is not allowed; except for the Lens
// searchboxes.
build/patches/Add-bookmark-import-export-actions.patch
+25 -24
View File
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../app/bookmarks/BookmarkActivity.java | 32 ++
.../native_page/NativePageFactory.java | 9 +-
chrome/browser/BUILD.gn | 11 +-
.../bookmarks/android/bookmark_bridge.cc | 192 ++++++++++++
.../bookmarks/android/bookmark_bridge.cc | 193 ++++++++++++
.../bookmarks/android/bookmark_bridge.h | 30 +-
.../browser/bookmarks/BookmarkBridge.java | 39 +++
.../browser/bookmarks/BookmarkDelegate.java | 10 +
@@ -51,7 +51,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
ui/shell_dialogs/select_file_dialog_linux.cc | 4 +
ui/shell_dialogs/select_file_dialog_linux.h | 2 +
ui/shell_dialogs/select_file_dialog_win.cc | 5 +
40 files changed, 805 insertions(+), 24 deletions(-)
40 files changed, 806 insertions(+), 24 deletions(-)
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -200,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
@@ -25,6 +25,7 @@ import org.chromium.base.supplier.OneshotSupplier;
@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.R;
@@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
import org.chromium.chrome.browser.app.download.home.DownloadPage;
import org.chromium.chrome.browser.back_press.BackPressManager;
import org.chromium.chrome.browser.bookmarks.BookmarkPage;
@@ -77,7 +78,7 @@ import java.util.function.Supplier;
@@ -79,7 +80,7 @@ import java.util.function.Supplier;
*/
@NullMarked
public class NativePageFactory {
@@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
private final BottomSheetController mBottomSheetController;
private final BrowserControlsManager mBrowserControlsManager;
private final Supplier<@Nullable Tab> mCurrentTabSupplier;
@@ -102,7 +103,7 @@ public class NativePageFactory {
@@ -104,7 +105,7 @@ public class NativePageFactory {
private final MultiInstanceManager mMultiInstanceManager;
public NativePageFactory(
@@ -226,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
BottomSheetController sheetController,
BrowserControlsManager browserControlsManager,
Supplier<@Nullable Tab> currentTabSupplier,
@@ -180,7 +181,7 @@ public class NativePageFactory {
@@ -182,7 +183,7 @@ public class NativePageFactory {
@VisibleForTesting
static class NativePageBuilder {
@@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
private final BottomSheetController mBottomSheetController;
private final Supplier<NewTabPageCreationTracker> mNewTabPageCreationTracker;
private final BrowserControlsManager mBrowserControlsManager;
@@ -293,7 +294,7 @@ public class NativePageFactory {
@@ -299,7 +300,7 @@ public class NativePageFactory {
mTabModelSelector,
mEdgeToEdgeControllerSupplier),
mActivity.getComponentName(),
@@ -247,7 +247,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
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -200,6 +200,8 @@ static_library("browser") {
@@ -207,6 +207,8 @@ static_library("browser") {
"bad_message.h",
"bookmarks/bookmark_model_factory.cc",
"bookmarks/bookmark_model_factory.h",
@@ -256,7 +256,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"bookmarks/chrome_bookmark_client.cc",
"bookmarks/chrome_bookmark_client.h",
"bookmarks/managed_bookmark_service_factory.cc",
@@ -1588,6 +1590,13 @@ static_library("browser") {
@@ -1573,6 +1575,13 @@ static_library("browser") {
"webdata_services/web_data_service_factory.cc",
]
@@ -270,7 +270,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config:precompiled_headers",
@@ -3711,8 +3720,6 @@ static_library("browser") {
@@ -3733,8 +3742,6 @@ static_library("browser") {
"bookmarks/bookmark_expanded_state_tracker.h",
"bookmarks/bookmark_expanded_state_tracker_factory.cc",
"bookmarks/bookmark_expanded_state_tracker_factory.h",
@@ -282,7 +282,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
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
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -68,6 +68,28 @@
@@ -64,6 +64,28 @@
#include "content/public/browser/web_contents.h"
#include "url/gurl.h"
@@ -311,7 +311,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
// Must come after all headers that specialize FromJniType() / ToJniType().
#include "chrome/browser/bookmarks/android/jni_headers/BookmarkBridge_jni.h"
@@ -296,6 +318,10 @@ BookmarkBridge::~BookmarkBridge() {
@@ -292,6 +314,10 @@ BookmarkBridge::~BookmarkBridge() {
partner_bookmarks_shim_observation_.Reset();
bookmark_model_observation_.Reset();
profile_observation_.Reset();
@@ -322,7 +322,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
}
void BookmarkBridge::Destroy(JNIEnv* env) {
@@ -847,6 +873,172 @@ jint BookmarkBridge::GetTotalBookmarkCount(
@@ -843,6 +869,173 @@ jint BookmarkBridge::GetTotalBookmarkCount(
return count;
}
@@ -450,7 +450,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
+ }
+
+ std::vector<char> buffer(fileLength);
+ if (-1 == file.ReadAtCurrentPos(buffer.data(), fileLength)) {
+ base::span<uint8_t> buffer_span = base::as_writable_byte_span(buffer);
+ if (-1 == file.ReadAtCurrentPos(buffer_span)) {
+ select_file_dialog_->ShowToast("Could not read bookmarks file");
+ return "";
+ }
@@ -770,7 +771,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
/** Keeps track of whether drag is enabled / active for bookmark lists. */
private class BookmarkDragStateDelegate implements DragStateDelegate {
private BookmarkDelegate mBookmarkDelegate;
@@ -658,6 +704,14 @@ class BookmarkManagerMediator
@@ -646,6 +692,14 @@ class BookmarkManagerMediator
mNativePage = nativePage;
}
@@ -785,7 +786,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
/** See BookmarkManager(Coordinator)#updateForUrl */
void updateForUrl(String url) {
// Bookmark model is null if the manager has been destroyed.
@@ -830,6 +884,235 @@ class BookmarkManagerMediator
@@ -818,6 +872,235 @@ class BookmarkManagerMediator
}
}
@@ -1246,7 +1247,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
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
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -262,6 +262,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -264,6 +264,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kAuxiliarySearchHistoryDonation,
&kBlockIntentsWhileLocked,
&kBookmarkPaneAndroid,
@@ -1257,7 +1258,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
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
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -712,6 +712,7 @@ public abstract class ChromeFeatureList {
@@ -713,6 +713,7 @@ public abstract class ChromeFeatureList {
"UseLibunwindstackNativeUnwinderAndroid";
public static final String VERIFY_QWACS = "VerifyQWACs";
public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
@@ -1320,7 +1321,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
/** Whether Chrome is set as the default browser. Default value is false. */
public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser";
@@ -1092,6 +1094,7 @@ public final class ChromePreferenceKeys {
@@ -1125,6 +1127,7 @@ public final class ChromePreferenceKeys {
AUXILIARY_SEARCH_SCHEMA_VERSION,
APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1331,7 +1332,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -252,6 +252,24 @@ CHAR_LIMIT guidelines:
@@ -264,6 +264,24 @@ CHAR_LIMIT guidelines:
<message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
Sites
</message>
@@ -1569,8 +1570,8 @@ diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_fil
diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
--- a/ui/shell_dialogs/select_file_dialog_android.cc
+++ b/ui/shell_dialogs/select_file_dialog_android.cc
@@ -171,6 +171,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type,
owning_window->GetJavaObject());
@@ -196,6 +196,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type,
suggested_name.value(), owning_window->GetJavaObject());
}
+void SelectFileDialogImpl::ShowToast(const std::string& message) {
@@ -1623,7 +1624,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_linux.h b/ui/shell_dialogs/sele
diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc
--- a/ui/shell_dialogs/select_file_dialog_win.cc
+++ b/ui/shell_dialogs/select_file_dialog_win.cc
@@ -193,6 +193,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog,
@@ -192,6 +192,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog,
int index);
bool HasMultipleFileTypeChoicesImpl() override;
@@ -1631,7 +1632,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/selec
// Returns the filter to be used while displaying the open/save file dialog.
// This is computed from the extensions for the file types being opened.
@@ -270,6 +271,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
@@ -269,6 +270,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
return has_multiple_file_type_choices_;
}
build/patches/Add-cromite-flags-support.patch
+65 -66
View File
@@ -24,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../homepage/settings/HomepageSettings.java | 2 +-
.../privacy/settings/PrivacySettings.java | 2 +-
.../settings/FragmentDependencyProvider.java | 10 +-
.../browser/settings/SettingsActivity.java | 42 ++++-
.../browser/settings/SettingsActivity.java | 41 ++++-
.../tracing/settings/DeveloperSettings.java | 5 +-
chrome/browser/about_flags.cc | 11 ++
chrome/browser/browser_features.cc | 1 +
@@ -106,7 +106,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
third_party/blink/public/common/features.h | 1 +
ui/base/ui_base_features.cc | 1 +
ui/base/ui_base_features.h | 1 +
93 files changed, 847 insertions(+), 32 deletions(-)
93 files changed, 846 insertions(+), 32 deletions(-)
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
@@ -152,7 +152,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
sources = [
"allocator/allocator_check.cc",
"allocator/allocator_check.h",
@@ -1057,7 +1059,7 @@ component("base") {
@@ -1061,7 +1063,7 @@ component("base") {
"//build/config/compiler:wglobal_constructors",
]
@@ -191,7 +191,7 @@ diff --git a/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned
diff --git a/base/feature_list.cc b/base/feature_list.cc
--- a/base/feature_list.cc
+++ b/base/feature_list.cc
@@ -42,6 +42,31 @@
@@ -43,6 +43,31 @@
namespace base {
@@ -223,7 +223,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
namespace {
// Pointer to the FeatureList instance singleton that was set via
@@ -471,6 +496,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
@@ -472,6 +497,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
return g_feature_list_instance->IsFeatureEnabled(feature);
}
@@ -270,7 +270,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
// static
bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) {
return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos;
@@ -738,6 +803,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
@@ -739,6 +804,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
void FeatureList::FinalizeInitialization() {
DCHECK(!initialized_);
@@ -463,7 +463,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -44,6 +44,10 @@ found in the LICENSE file.
@@ -38,6 +38,10 @@ found in the LICENSE file.
android:key="do_not_track"
android:title="@string/do_not_track_title"
android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
@@ -477,7 +477,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
@@ -40,7 +40,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
@@ -41,7 +41,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
@Override
@@ -489,7 +489,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -132,7 +132,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -127,7 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
}
@Override
@@ -509,7 +509,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.NullMarked;
@@ -71,24 +72,31 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
@@ -68,24 +69,31 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
private final OneshotSupplier<SnackbarManager> mSnackbarManagerSupplier;
private final OneshotSupplier<BottomSheetController> mBottomSheetControllerSupplier;
private final ObservableSupplier<@Nullable ModalDialogManager> mModalDialogManagerSupplier;
@@ -551,19 +551,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
+import android.app.Activity;
import android.annotation.SuppressLint;
import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent;
@@ -35,7 +36,9 @@ import org.chromium.base.CallbackUtils;
import org.chromium.base.DeviceInfo;
import org.chromium.base.Log;
@@ -43,6 +44,7 @@ import org.chromium.base.Log;
import org.chromium.base.metrics.RecordHistogram;
+import java.util.function.Supplier;
import org.chromium.base.metrics.RecordUserAction;
import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.base.supplier.OneshotSupplierImpl;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
@@ -45,6 +48,7 @@ import org.chromium.chrome.browser.back_press.BackPressHelper;
@@ -54,6 +56,7 @@ import org.chromium.chrome.browser.back_press.BackPressHelper.OnKeyDownHandler;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
@@ -571,7 +569,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
@@ -52,6 +56,7 @@ import org.chromium.chrome.browser.settings.search.SettingsSearchCoordinator;
@@ -61,6 +64,7 @@ import org.chromium.chrome.browser.settings.search.SettingsSearchCoordinator;
import org.chromium.chrome.browser.ui.device_lock.MissingDeviceLockLauncher;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
@@ -579,7 +577,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
@@ -106,6 +111,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -115,6 +119,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
PreferenceUpdateObserver {
private static final String TAG = "SettingsActivity";
@@ -620,7 +618,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
public static final String EXTRA_SHOW_FRAGMENT = "show_fragment";
@@ -187,7 +226,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -205,7 +243,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
mProfile,
mSnackbarManagerSupplier,
mBottomSheetControllerSupplier,
@@ -629,7 +627,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
+ () -> new RequestRestartDelegate(mSnackbarManagerSupplier, this)),
/* recursive= */ true);
fragmentManager.registerFragmentLifecycleCallbacks(
new WideDisplayPaddingApplier(), /* recursive= */ false);
new WideDisplayPaddingApplier(), /* recursive= */ true);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
@@ -655,7 +653,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -385,6 +385,10 @@ using flags_ui::kOsLinux;
@@ -389,6 +389,10 @@ using flags_ui::kOsLinux;
using flags_ui::kOsMac;
using flags_ui::kOsWin;
@@ -666,9 +664,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
namespace about_flags {
namespace {
@@ -5198,6 +5202,10 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
@@ -5242,6 +5246,10 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
};
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#endif // !BUILDFLAG(IS_ANDROID)
+#define FEATURE_PARAM_SECTION
+#include "cromite_flags/chrome_browser_about_flags_cc.inc"
@@ -677,7 +675,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
// RECORDING USER METRICS FOR FLAGS:
// -----------------------------------------------------------------------------
// The first line of the entry is the internal name.
@@ -5224,6 +5232,9 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
@@ -5268,6 +5276,9 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
const FeatureEntry kFeatureEntries[] = {
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
// //tools/flags/generate_unexpire_flags.py.
@@ -690,7 +688,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -302,4 +302,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
@@ -284,4 +284,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
// show both in Chrome Tabs and Windows.
BASE_FEATURE(kRemovalOfIWAsFromTabCapture, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -699,7 +697,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature
diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features.h
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -122,6 +122,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
@@ -118,6 +118,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
// module, e.g.
// //chrome/browser/<foo_module>/features.h
//
@@ -749,19 +747,20 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
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
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -835,5 +835,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -840,6 +840,7 @@ BASE_FEATURE(kXplatSyncedSetup, base::FEATURE_DISABLED_BY_DEFAULT);
// clang-format on
+#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_cc.inc"
} // namespace android
} // namespace chrome
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
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -370,6 +370,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(
"snippet_as_subtitle",
/*default_value=*/false);
@@ -375,6 +375,7 @@ inline constexpr base::FeatureParam<bool>
"snippet_as_subtitle",
/*default_value=*/false);
+#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_h.inc"
} // namespace chrome::android
@@ -781,7 +780,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
import java.util.List;
import java.util.Map;
@@ -1110,7 +1114,7 @@ public abstract class ChromeFeatureList {
@@ -1118,7 +1122,7 @@ public abstract class ChromeFeatureList {
newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
// keep-sorted end
@@ -790,7 +789,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
List.of(
// keep-sorted start
sAccountForSuppressedKeyboardInsets,
@@ -1271,6 +1275,13 @@ public abstract class ChromeFeatureList {
@@ -1282,6 +1286,13 @@ public abstract class ChromeFeatureList {
// keep-sorted end
);
@@ -970,24 +969,24 @@ new file mode 100644
diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
--- a/chrome/browser/ui/ui_features.cc
+++ b/chrome/browser/ui/ui_features.cc
@@ -712,4 +712,5 @@ bool IsAndroidAnimatedProgressBarInBrowserEnabled() {
@@ -788,4 +788,5 @@ BASE_FEATURE(kWhatsNewDesktopRefresh, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kWhatsNewDesktopRefresh, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kTabGroupsFocusing, base::FEATURE_DISABLED_BY_DEFAULT);
+#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc"
} // namespace features
diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
--- a/chrome/browser/unexpire_flags.cc
+++ b/chrome/browser/unexpire_flags.cc
@@ -8,6 +8,7 @@
#include "base/containers/contains.h"
@@ -11,6 +11,7 @@
#include "base/containers/flat_map.h"
#include "base/feature_list.h"
#include "base/no_destructor.h"
+#include "chrome/browser/about_flags.h"
#include "chrome/browser/expired_flags_list.h"
#include "chrome/browser/unexpire_flags_gen.h"
#include "chrome/common/chrome_version.h"
@@ -114,7 +115,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage,
@@ -117,7 +118,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage,
// Otherwise, the flag is expired if its expiration mstone is less than the
// mstone of this copy of Chromium.
@@ -1011,7 +1010,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -1913,5 +1913,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1901,5 +1901,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
// happen silently without prompting an updating dialog.
BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -1021,7 +1020,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
diff --git a/components/browser_ui/accessibility/android/BUILD.gn b/components/browser_ui/accessibility/android/BUILD.gn
--- a/components/browser_ui/accessibility/android/BUILD.gn
+++ b/components/browser_ui/accessibility/android/BUILD.gn
@@ -65,6 +65,7 @@ android_library("lib_java") {
@@ -73,6 +73,7 @@ android_library("lib_java") {
":page_zoom_utils_java",
"//base:base_java",
"//build/android:build_java",
@@ -1045,9 +1044,9 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
@@ -28,9 +28,11 @@ import org.chromium.components.omnibox.OmniboxFeatures;
import org.chromium.content_public.browser.ContentFeatureList;
@@ -30,9 +30,11 @@ import org.chromium.content_public.browser.ContentFeatureList;
import org.chromium.content_public.browser.ContentFeatureMap;
import org.chromium.ui.base.UiAndroidFeatureList;
+import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
+
@@ -1055,10 +1054,10 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
@NullMarked
-public class AccessibilitySettings extends PreferenceFragmentCompat
+public class AccessibilitySettings extends ChromeBaseSettingsFragment
implements EmbeddableSettingsPage, Preference.OnPreferenceChangeListener {
public static final String PREF_PAGE_ZOOM_DEFAULT_ZOOM = "page_zoom_default_zoom";
public static final String PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT =
@@ -71,7 +73,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
implements EmbeddableSettingsPage,
Preference.OnPreferenceChangeListener,
CustomDividerFragment {
@@ -78,7 +80,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
}
@Override
@@ -1200,17 +1199,17 @@ diff --git a/components/password_manager/core/browser/features/password_features
--- a/components/password_manager/core/browser/features/password_features.cc
+++ b/components/password_manager/core/browser/features/password_features.cc
@@ -201,4 +201,5 @@ BASE_FEATURE(kRetrieveTrustedVaultKeyKeyboardAccessoryAction,
base::FEATURE_ENABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_ANDROID)
BASE_FEATURE(kUseActionablesForImprovedPasswordChange,
base::FEATURE_DISABLED_BY_DEFAULT);
+#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc"
} // namespace password_manager::features
diff --git a/components/permissions/features.cc b/components/permissions/features.cc
--- a/components/permissions/features.cc
+++ b/components/permissions/features.cc
@@ -121,6 +121,7 @@ BASE_FEATURE(kReturnDeniedForNotificationsWhenNoAppLevelSettings,
@@ -120,6 +120,7 @@ BASE_FEATURE(kReturnDeniedForNotificationsWhenNoAppLevelSettings,
BASE_FEATURE(kPermissionPredictionsGeolocationAccuracy,
base::FEATURE_DISABLED_BY_DEFAULT);
#endif
+#include "cromite_flags/components_permissions_features_cc.inc"
} // namespace features
@@ -1555,8 +1554,8 @@ diff --git a/components/webui/flags/resources/experiment.html.ts b/components/we
return html`<!--_html_template_start_-->
<div class="experiment" id="${this.feature_.internal_name}">
- <div class="flex-container">
+ <div class="flex-container" class="${(this.feature_.is_cromite && this.feature_.is_new ? "cromite " : "")
+ + (this.feature_.is_default_value_on ? "experiment-on" : "")}">
+ <div class="${"flex-container " + (this.feature_.is_cromite && this.feature_.is_new ? "cromite " : "")
+ + (this.feature_.is_default_value_on ? "experiment-on" : "")}">
<div class="flex">
${this.showingSearchHit_? html`
<h2 class="experiment-name clone" id="${this.getHeaderId_()}"
@@ -1640,7 +1639,7 @@ diff --git a/components/webui/version/version_handler_helper.cc b/components/web
diff --git a/content/common/features.cc b/content/common/features.cc
--- a/content/common/features.cc
+++ b/content/common/features.cc
@@ -701,4 +701,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() {
@@ -750,4 +750,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() {
blink::features::kTreatMhtmlInitialDocumentLoadsAsCrossDocument);
}
@@ -1649,7 +1648,7 @@ diff --git a/content/common/features.cc b/content/common/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
+++ b/content/public/common/content_features.cc
@@ -1428,4 +1428,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
@@ -1438,4 +1438,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
features::kPushSubscriptionChangeEventOnResubscribe);
}
@@ -1658,7 +1657,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
--- a/content/public/common/content_features.h
+++ b/content/public/common/content_features.h
@@ -416,6 +416,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
@@ -420,6 +420,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
CONTENT_EXPORT bool IsPushSubscriptionChangeEventEnabled();
@@ -2004,7 +2003,7 @@ new file mode 100755
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -1710,5 +1710,5 @@ uint32_t GetPassthroughAudioFormats() {
@@ -1750,5 +1750,5 @@ uint32_t GetPassthroughAudioFormats() {
return 0;
#endif // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
}
@@ -2014,7 +2013,7 @@ 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
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -590,5 +590,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
@@ -556,5 +556,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
} // namespace media
@@ -2024,18 +2023,18 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -904,4 +904,5 @@ BASE_FEATURE_PARAM(std::string,
BASE_FEATURE(kDnsResponseDiscardPartialQuestions,
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -846,4 +846,5 @@ BASE_FEATURE(kAddAutomaticWithDohFallbackMode,
BASE_FEATURE(kUseQuicProxiesWithoutWaitingForConnectResponse,
base::FEATURE_DISABLED_BY_DEFAULT);
+#include "cromite_flags/net_base_features_cc.inc"
} // namespace net::features
diff --git a/net/base/features.h b/net/base/features.h
--- a/net/base/features.h
+++ b/net/base/features.h
@@ -986,6 +986,7 @@ NET_EXPORT BASE_DECLARE_FEATURE_PARAM(std::string, kQuicOptions);
NET_EXPORT BASE_DECLARE_FEATURE(kDnsResponseDiscardPartialQuestions);
@@ -911,6 +911,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kAddAutomaticWithDohFallbackMode);
NET_EXPORT BASE_DECLARE_FEATURE(
kUseQuicProxiesWithoutWaitingForConnectResponse);
+#include "cromite_flags/net_base_features_h.inc"
} // namespace net::features
@@ -2064,7 +2063,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2693,4 +2693,5 @@ bool IsXrDevice() {
@@ -2647,4 +2647,5 @@ bool IsXrDevice() {
//
// DO NOT ADD NEW FEATURES HERE.
@@ -2073,7 +2072,7 @@ 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
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -1955,6 +1955,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
@@ -1960,6 +1960,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
//
// DO NOT ADD NEW FEATURES HERE.
@@ -2084,7 +2083,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ
diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
--- a/ui/base/ui_base_features.cc
+++ b/ui/base/ui_base_features.cc
@@ -434,4 +434,5 @@ BASE_FEATURE(kUseSystemDefaultAccentColors, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -449,4 +449,5 @@ BASE_FEATURE(kUseSystemDefaultAccentColors, base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kStringWidthCache, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -2093,7 +2092,7 @@ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h
--- a/ui/base/ui_base_features.h
+++ b/ui/base/ui_base_features.h
@@ -267,6 +267,7 @@ BASE_DECLARE_FEATURE(kUseSystemDefaultAccentColors);
@@ -270,6 +270,7 @@ BASE_DECLARE_FEATURE(kUseSystemDefaultAccentColors);
COMPONENT_EXPORT(UI_BASE_FEATURES)
BASE_DECLARE_FEATURE(kStringWidthCache);
build/patches/Add-cromite-test-support.patch
+14 -14
View File
@@ -73,7 +73,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
@@ -148,6 +148,7 @@ import org.chromium.ui.base.SelectFileDialog;
@@ -149,6 +149,7 @@ import org.chromium.ui.base.SelectFileDialog;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider;
import org.chromium.url.GURL;
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
import java.io.File;
import java.nio.charset.StandardCharsets;
@@ -724,7 +725,10 @@ public class ProcessInitializationHandler {
@@ -729,7 +730,10 @@ public class ProcessInitializationHandler {
tasks.add(
() -> {
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -183,6 +183,11 @@ source_set("shell_integration") {
@@ -190,6 +190,11 @@ source_set("shell_integration") {
# require many files from it. This makes linking more efficient.
static_library("browser") {
sources = [
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b
#include "chrome/browser/chrome_browser_interface_binders_webui.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_content_browser_client_parts.h"
@@ -495,6 +496,15 @@ void ChromeContentBrowserClient::
@@ -492,6 +493,15 @@ void ChromeContentBrowserClient::
render_frame_host);
},
&render_frame_host));
@@ -412,7 +412,7 @@ new file mode 100644
diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
--- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
+++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
@@ -182,6 +182,7 @@ public class NotificationPermissionController implements UnownedUserData {
@@ -181,6 +181,7 @@ public class NotificationPermissionController {
* @return True if any UI was shown (either rationale dialog or OS prompt), false otherwise.
*/
public boolean requestPermissionIfNeeded(boolean contextual) {
@@ -423,7 +423,7 @@ diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/b
diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -226,6 +226,7 @@ static const std::variant<const base::Feature*, const char*>
@@ -220,6 +220,7 @@ static const std::variant<const base::Feature*, const char*>
#if BUILDFLAG(IS_ANDROID)
&chrome::android::kCommandLineOnNonRooted,
@@ -434,7 +434,7 @@ diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/s
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -669,6 +669,7 @@ mojom("mojo_bindings") {
@@ -666,6 +666,7 @@ mojom("mojo_bindings") {
sources = [
"chrome_render_frame.mojom",
"google_accounts_private_api_extension.mojom",
@@ -477,7 +477,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
#include "chrome/renderer/google_accounts_private_api_extension.h"
#include "chrome/renderer/loadtimes_extension_bindings.h"
#include "chrome/renderer/media/flash_embed_rewrite.h"
@@ -661,6 +662,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
@@ -650,6 +651,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
TrustedVaultEncryptionKeysExtension::Create(render_frame);
GoogleAccountsPrivateApiExtension::Create(render_frame);
@@ -785,15 +785,15 @@ diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/json/json_writer.h"
@@ -46,6 +47,7 @@
#include "content/public/browser/devtools_manager_delegate.h"
@@ -47,6 +48,7 @@
#include "content/public/browser/devtools_socket_factory.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_constants.h"
+#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
#include "net/base/io_buffer.h"
@@ -588,9 +590,12 @@ void DevToolsHttpHandler::OnJsonRequest(
@@ -602,9 +604,12 @@ void DevToolsHttpHandler::OnJsonRequest(
if (command == "version") {
base::Value::Dict version;
@@ -851,7 +851,7 @@ diff --git a/content/browser/log_console_message.h b/content/browser/log_console
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
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -319,6 +319,8 @@
@@ -316,6 +316,8 @@
#include "url/origin.h"
#include "url/url_constants.h"
@@ -860,7 +860,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
#if BUILDFLAG(IS_ANDROID)
#include "content/browser/accessibility/browser_accessibility_manager_android.h"
#include "content/browser/android/content_url_loader_factory.h"
@@ -4799,7 +4801,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
@@ -4786,7 +4788,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no,
updated_source_id,
untrusted_stack_trace)) {
@@ -870,7 +870,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
}
// Pass through log severity only on builtin components pages to limit console
@@ -4816,8 +4819,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
@@ -4803,8 +4806,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
const bool is_off_the_record =
GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();
build/patches/Add-custom-tab-intents-privacy-option.patch
+26 -26
View File
@@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -52,6 +52,21 @@ found in the LICENSE file.
@@ -46,6 +46,21 @@ found in the LICENSE file.
android:key="cromite_flags"
android:title="@string/cromite_flags_title"
app:url="@string/cromite_flags_url" />
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
@@ -66,6 +66,9 @@ import java.lang.annotation.Retention;
@@ -65,6 +65,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Set;
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
/**
* Dispatches incoming intents to the appropriate activity based on the current configuration and
* Intent fired.
@@ -269,6 +272,9 @@ public class LaunchIntentDispatcher {
@@ -262,6 +265,9 @@ public class LaunchIntentDispatcher {
*/
public static boolean isCustomTabIntent(Intent intent) {
if (intent == null) return false;
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
Log.w(
TAG,
"CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
@@ -297,6 +303,10 @@ public class LaunchIntentDispatcher {
@@ -290,6 +296,10 @@ public class LaunchIntentDispatcher {
// Make sure the result of the CustomTabActivity is forwarded to the client.
newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
@@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
// Since configureIntentForResizableCustomTab() might change the componenet/class
// associated with the passed intent, it needs to be called after #setClassName(context,
// CustomTabActivity.class.getName());
@@ -493,6 +503,17 @@ public class LaunchIntentDispatcher {
@@ -486,6 +496,17 @@ public class LaunchIntentDispatcher {
if (Intent.ACTION_VIEW.equals(newIntent.getAction())
&& !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
@@ -238,16 +238,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
@@ -239,16 +239,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
// Extra whose value is an array of ints that is supplied to
// SyntheticTrialRegistry::RegisterExternalExperiments().
@@ -132,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
/**
* Extra that, if set, makes the Custom Tab Activity's height to be x pixels, the Custom Tab
@@ -690,7 +690,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
@@ -697,7 +697,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
TrustedWebActivityIntentBuilder.EXTRA_SCREEN_ORIENTATION,
ScreenOrientation.DEFAULT));
@@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
mBreakPointDp = getActivityBreakPointFromIntent(intent);
mInitialActivityHeight = getInitialActivityHeightFromIntent(intent);
@@ -703,8 +703,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
@@ -710,8 +710,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
intent, EXTRA_ACTIVITY_HEIGHT_RESIZE_BEHAVIOR, ACTIVITY_HEIGHT_DEFAULT);
mIsPartialCustomTabFixedHeight = activityHeightResizeBehavior == ACTIVITY_HEIGHT_FIXED;
@@ -152,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
@BackgroundInteractBehavior
int backgroundInteractBehavior =
IntentUtils.safeGetIntExtra(
@@ -1335,7 +1335,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
@@ -1369,7 +1369,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
public @CustomTabProfileType int getCustomTabMode() {
return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
? CustomTabProfileType.INCOGNITO
@@ -166,7 +166,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/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
@@ -782,7 +782,7 @@ public class CustomTabsConnection {
@@ -786,7 +786,7 @@ public class CustomTabsConnection {
ThreadUtils.assertOnUiThread();
if (extras == null) return;
int[] experimentIds =
@@ -175,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
if (experimentIds == null) return;
// When ids are set through cct, they should not override existing ids.
boolean override = false;
@@ -999,6 +999,7 @@ public class CustomTabsConnection {
@@ -1003,6 +1003,7 @@ public class CustomTabsConnection {
PostTask.postTask(
TaskTraits.UI_DEFAULT,
() -> {
@@ -186,7 +186,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/customtabs/IncognitoCustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
@@ -43,6 +43,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
@@ -44,6 +44,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
import java.util.ArrayList;
import java.util.List;
@@ -196,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
/**
* A model class that parses the incoming intent for incognito Custom Tabs specific customization
* data.
@@ -125,6 +128,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
@@ -133,6 +136,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
}
private static boolean isIntentFromThirdPartyAllowed() {
@@ -206,7 +206,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
return ChromeFeatureList.sCctIncognitoAvailableToThirdParty.isEnabled();
}
@@ -222,6 +228,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
@@ -230,6 +236,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
}
public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) {
@@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
if (!isIncognitoRequested(intent)) return false;
var session = SessionHolder.getSessionHolderFromIntent(intent);
if (isIntentFromThirdPartyAllowed()
@@ -332,6 +342,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
@@ -340,6 +350,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
@Override
public @CustomTabProfileType int getCustomTabMode() {
@@ -239,7 +239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import android.os.Bundle;
import android.text.SpannableString;
import android.text.style.ClickableSpan;
@@ -79,6 +80,15 @@ import org.chromium.ui.text.SpanApplier;
@@ -80,6 +81,15 @@ import org.chromium.ui.text.SpanApplier;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@@ -255,7 +255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import androidx.preference.PreferenceCategory;
import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
import org.chromium.base.shared_preferences.SharedPreferencesManager;
@@ -153,6 +163,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -148,6 +158,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
startTag, endTag, new ChromeClickableSpan(context, onClickCallback));
}
@@ -265,7 +265,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
mPageTitle.set(getString(R.string.prefs_privacy_security));
@@ -384,6 +397,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -376,6 +389,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
}
@@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
@@ -404,6 +420,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -396,6 +412,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
UserPrefs.get(getProfile())
.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -307,7 +307,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
}
return true;
}
@@ -436,6 +477,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -428,6 +469,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
}
@@ -327,7 +327,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
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
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -708,7 +708,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -713,7 +713,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT);
// Enables an experimental feature which forces mayLaunchUrl to use a different
// storage partition. This may reduce performance. This should not be enabled by
// default.
@@ -337,22 +337,22 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kMediaIndicatorsAndroid, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kMiniOriginBar, base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kMostVisitedTilesCustomization, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kMostVisitedTilesCustomization, base::FEATURE_ENABLED_BY_DEFAULT);
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
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -980,6 +980,8 @@ public abstract class ChromeFeatureList {
@@ -989,6 +989,8 @@ public abstract class ChromeFeatureList {
MOST_VISITED_TILES_CUSTOMIZATION,
/* defaultValue= */ false,
/* defaultValue= */ true,
/* defaultValueInTests= */ true);
+ public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition =
+ newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
public static final CachedFlag sMostVisitedTilesReselect =
newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
@@ -1223,6 +1225,7 @@ public abstract class ChromeFeatureList {
@@ -1236,6 +1238,7 @@ public abstract class ChromeFeatureList {
sMaliciousApkDownloadCheck,
sMiniOriginBar,
sMitigateLegacySearchEnginePromoOverlap,
sMostVisitedTilesCustomization,
+ sMayLaunchurlUsesSeparateStoragePartition,
sMostVisitedTilesReselect,
build/patches/Add-exit-menu-item.patch
+6 -6
View File
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -357,6 +357,8 @@ import java.util.Set;
@@ -363,6 +363,8 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
@@ -37,7 +37,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 are
* accessible via a chrome specific tab switching UI.
@@ -3858,6 +3860,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -3901,6 +3903,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
.closeTabs(
TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
RecordUserAction.record("MobileTabClosed");
@@ -49,7 +49,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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -64,6 +64,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
@@ -68,6 +68,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.ActivityUtils;
@@ -57,7 +57,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.ChromeApplicationImpl;
import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
@@ -2588,6 +2589,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -2633,6 +2634,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
return true;
}
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
@@ -412,6 +412,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
@@ -422,6 +422,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
maybeAddDividerLine(modelList, R.id.menu_item_content_filter_divider_line_id);
modelList.add(buildContentFilterHelpCenterMenuItem(currentTab));
}
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4380,6 +4380,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -4437,6 +4437,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
Dark theme
</message>
build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
+3 -3
View File
@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
#include "base/feature_list.h"
#include "base/format_macros.h"
#include "base/functional/bind.h"
@@ -557,6 +558,15 @@ AutocompleteController::AutocompleteController(
@@ -553,6 +554,15 @@ AutocompleteController::AutocompleteController(
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION),
config_(config) {
@@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
#include "base/functional/callback.h"
#include "base/i18n/break_iterator.h"
#include "base/i18n/case_conversion.h"
@@ -637,6 +638,9 @@ void SearchProvider::Run(bool query_is_private) {
@@ -659,6 +660,9 @@ void SearchProvider::Run(bool query_is_private) {
}
void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -88,7 +88,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/i18n/char_iterator.h"
@@ -644,6 +646,8 @@ GURL FixupURLInternal(const std::string& text,
@@ -640,6 +642,8 @@ GURL FixupURLInternal(const std::string& text,
FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
if (chrome_url && !parts.host.is_valid()) {
build/patches/Add-flag-to-configure-maximum-connections-per-host.patch
+7 -34
View File
@@ -8,40 +8,13 @@ with limited CPU/memory resources and it is disabled by default.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../common/network_features.cc | 3 +++
.../common/network_features.h | 4 ++++
.../common/network_switch_list.h | 4 ++++
.../spoof_checks/top_domains/BUILD.gn | 1 +
...o-configure-maximum-connections-per-host.inc | 17 +++++++++++++++++
net/socket/client_socket_pool_manager.cc | 17 +++++++++++++++++
6 files changed, 46 insertions(+)
4 files changed, 39 insertions(+)
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc
diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
--- a/components/network_session_configurator/common/network_features.cc
+++ b/components/network_session_configurator/common/network_features.cc
@@ -8,4 +8,7 @@
namespace features {
+const char kMaxConnectionsPerHostChoiceDefault[] = "6",
+ kMaxConnectionsPerHostChoice15[] = "15";
+
} // namespace features
diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
--- a/components/network_session_configurator/common/network_features.h
+++ b/components/network_session_configurator/common/network_features.h
@@ -10,6 +10,10 @@
namespace features {
+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kMaxConnectionsPerHostChoiceDefault[],
+ kMaxConnectionsPerHostChoice6[],
+ kMaxConnectionsPerHostChoice15[];
+
} // namespace features
#endif // COMPONENTS_NETWORK_SESSION_CONFIGURATOR_COMMON_NETWORK_FEATURES_H_
diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
--- a/components/network_session_configurator/common/network_switch_list.h
+++ b/components/network_session_configurator/common/network_switch_list.h
@@ -54,8 +27,8 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
+NETWORK_SWITCH(kMaxConnectionsPerHost, "max-connections-per-host")
+
// Ignores certificate-related errors.
NETWORK_SWITCH(kIgnoreCertificateErrors, "ignore-certificate-errors")
// Note: In tests using net::EmbeddedTestServer with a custom hostname not
// covered by the default test certs, using this switch is usually incorrect.
diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
--- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn
+++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
@@ -75,8 +48,8 @@ new file mode 100644
+#ifdef FEATURE_PARAM_SECTION
+
+const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
+ {features::kMaxConnectionsPerHostChoiceDefault, "", ""},
+ {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
+ {/*features::kMaxConnectionsPerHostChoiceDefault*/ "6", "", ""},
+ {/*features::kMaxConnectionsPerHostChoice15*/ "15", switches::kMaxConnectionsPerHost, "15"},
+};
+
+#endif
@@ -103,8 +76,8 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
#include "net/ssl/ssl_config.h"
#include "url/gurl.h"
#include "url/scheme_host_port.h"
@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
int ClientSocketPoolManager::max_sockets_per_group(
@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_socket_soft_cap_per_pool_for_test(
size_t ClientSocketPoolManager::max_sockets_per_group(
HttpNetworkSession::SocketPoolType pool_type) {
DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
+
build/patches/Add-flag-to-disable-IPv6-probes.patch
+1 -1
View File
@@ -45,7 +45,7 @@ new file mode 100644
diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1177,6 +1177,7 @@ component("net") {
@@ -1182,6 +1182,7 @@ component("net") {
":net_deps",
"//components/network_time/time_tracker",
"//components/unexportable_keys",
build/patches/Add-flag-to-disable-external-intent-requests.patch
+13 -21
View File
@@ -15,14 +15,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../ExternalNavigationDelegateImpl.java | 4 ++-
.../cromite/sAllowExternalIntentRequests.java | 33 +++++++++++++++++++
...g-to-disable-external-intent-requests.grdp | 9 +++++
.../android/external_intents_features.cc | 7 +++-
.../android/external_intents_features.cc | 6 ++++
.../android/external_intents_features.h | 1 +
.../ExternalIntentsFeatures.java | 6 ++++
.../ExternalNavigationHandler.java | 21 ++++++++++++
...ag-to-disable-external-intent-requests.inc | 13 ++++++++
...t-Delete-block-external-form-redirects.inc | 15 +++++++++
...ag-to-disable-external-intent-requests.inc | 3 ++
12 files changed, 118 insertions(+), 3 deletions(-)
12 files changed, 118 insertions(+), 2 deletions(-)
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc
@@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -77,7 +77,12 @@ found in the LICENSE file.
@@ -71,7 +71,12 @@ found in the LICENSE file.
android:title="@string/settings_incognito_tab_lock_title"
android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"
android:persistent="false" />
@@ -49,7 +49,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
import org.chromium.chrome.browser.flags.ActivityType;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
import org.chromium.chrome.browser.fullscreen.FullscreenManager;
import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate;
@@ -158,6 +159,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
@@ -155,6 +156,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
@Override
public boolean shouldDisableAllExternalIntents() {
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
import org.chromium.chrome.browser.IntentHandler;
import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
import org.chromium.chrome.browser.document.ChromeLauncherActivity;
@@ -131,7 +132,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
@@ -134,7 +135,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
@Override
public boolean shouldDisableExternalIntentRequestsForUrl(
ExternalNavigationParams params, Intent intent) {
@@ -141,17 +141,9 @@ new file mode 100644
diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
--- a/components/external_intents/android/external_intents_features.cc
+++ b/components/external_intents/android/external_intents_features.cc
@@ -29,7 +29,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kNavigationCaptureRefactorAndroid, &kAuxiliaryNavigationStaysInBrowser,
&kReparentTopLevelNavigationFromPWA, &kReparentAuxiliaryNavigationFromPWA,
&kAuxiliaryNavigationStaysInPWA};
-
} // namespace
// Alphabetical:
@@ -52,7 +51,13 @@ BASE_FEATURE(kReparentAuxiliaryNavigationFromPWA,
BASE_FEATURE(kAuxiliaryNavigationStaysInPWA, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -35,7 +35,13 @@ BASE_FEATURE(kExternalNavigationDebugLogs, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kNavigationCaptureRefactorAndroid,
base::FEATURE_DISABLED_BY_DEFAULT);
+CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
+ "IntentBlockExternalFormRedirectsNoGesture",
@@ -173,7 +165,7 @@ diff --git a/components/external_intents/android/external_intents_features.h b/c
+BASE_DECLARE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture);
BASE_DECLARE_FEATURE(kExternalNavigationDebugLogs);
BASE_DECLARE_FEATURE(kBlockFrameRenavigations);
BASE_DECLARE_FEATURE(kBlockIntentsToSelf);
BASE_DECLARE_FEATURE(kNavigationCaptureRefactorAndroid);
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
@@ -188,12 +180,12 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
+ new ExternalIntentsFeature(-1, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME);
+
public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs";
public static final String BLOCK_INTENTS_TO_SELF_NAME = "BlockIntentsToSelf";
public static final String NAVIGATION_CAPTURE_REFACTOR_ANDROID_NAME =
"NavigationCaptureRefactorAndroid";
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
@@ -1760,6 +1760,12 @@ public class ExternalNavigationHandler {
@@ -1726,6 +1726,12 @@ public class ExternalNavigationHandler {
return false;
}
@@ -206,7 +198,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
ExternalNavigationParams params,
Intent targetIntent,
@@ -1851,6 +1857,21 @@ public class ExternalNavigationHandler {
@@ -1811,6 +1817,21 @@ public class ExternalNavigationHandler {
return OverrideUrlLoadingResult.forNoOverride();
}
build/patches/Add-flag-to-disable-vibration.patch
+2 -2
View File
@@ -78,7 +78,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c
// Maximum number of entries in a vibration pattern.
const unsigned kVibrationPatternLengthMax = 99;
@@ -108,6 +109,8 @@ bool VibrationController::vibrate(Navigator& navigator,
@@ -105,6 +106,8 @@ bool VibrationController::vibrate(Navigator& navigator,
// reference to |window| or |navigator| was retained in another window.
if (!navigator.DomWindow())
return false;
@@ -104,7 +104,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
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1137,6 +1137,10 @@
@@ -1138,6 +1138,10 @@
{
name: "CompositingDecisionAtAnimationPhaseBoundaries"
},
build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch
+13 -11
View File
@@ -8,13 +8,13 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
build/config/compiler/BUILD.gn | 17 ++++++++++++++---
build_overrides/build.gni | 3 +++
2 files changed, 17 insertions(+), 3 deletions(-)
build_overrides/build.gni | 5 +++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -727,7 +727,7 @@ config("compiler") {
@@ -734,7 +734,7 @@ config("compiler") {
# TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
# It also causes segfault on Linux s390x:
# https://github.com/llvm/llvm-project/issues/149511
@@ -23,7 +23,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
}
}
@@ -1836,7 +1836,7 @@ config("clang_revision") {
@@ -1830,7 +1830,7 @@ config("clang_revision") {
# e.g. by setting in the the project's .gn file.
config("clang_warning_suppression") {
# Some build configs use older versions of clang that don't support WSMs
@@ -32,7 +32,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
from_build_root =
rebase_path(clang_warning_suppression_file, root_build_dir)
inputs = [ clang_warning_suppression_file ]
@@ -2197,7 +2197,9 @@ config("default_warnings") {
@@ -2192,7 +2192,9 @@ config("default_warnings") {
# TODO(crbug.com/432275627): Fix and re-enable.
"-Wno-uninitialized-const-pointer",
]
@@ -43,7 +43,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
cflags_cc += [
# TODO(crbug.com/328490295): Fix and re-enable for C flags.
"-Wenum-compare-conditional",
@@ -2251,6 +2253,15 @@ config("default_warnings") {
@@ -2246,6 +2248,15 @@ config("default_warnings") {
ldflags += [ "-Wno-version-check" ]
}
@@ -62,14 +62,16 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -53,6 +53,9 @@ declare_args() {
# Allows googletest to pretty-print various absl types.
@@ -54,6 +54,11 @@ declare_args() {
gtest_enable_absl_printers = true
}
+declare_args() {
+ # Allows clangd builds by suppressing unsupported parameters
+ skip_clangd_unsupported_options = false
+}
+
# Allow projects that wish to stay on C++17 to override Chromium's default.
# TODO(anglebug.com/330910097): evaluate removing this 2026-04-01
use_cxx17 = false
# Features used by //base/trace_event.
declare_args() {
# Use Perfetto's trace processor for converting protobuf-encoded traces to
--
build/patches/Add-lifetime-options-for-permissions.patch
+110 -108
View File
@@ -66,7 +66,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../core/browser/content_settings_utils.h | 6 ++
.../core/common/content_settings_enums.mojom | 9 ++
.../page_info/PageInfoController.java | 4 +-
.../PermissionParamsListBuilder.java | 13 ++-
.../PermissionParamsListBuilder.java | 12 ++-
.../android/page_info_controller_android.cc | 10 ++-
components/page_info/page_info.cc | 2 +
components/page_info/page_info.h | 1 +
@@ -89,7 +89,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/permissions/permission_request.h | 18 +++-
.../permissions/permission_request_manager.cc | 49 ++++++-----
.../permissions/permission_request_manager.h | 11 ++-
37 files changed, 509 insertions(+), 75 deletions(-)
37 files changed, 508 insertions(+), 75 deletions(-)
diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
--- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -178,7 +178,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
OneTimePermissionsTracker::~OneTimePermissionsTracker() = default;
OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default;
@@ -255,6 +281,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
@@ -260,6 +286,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
for (auto& observer : observer_list_) {
observer.OnLastPageFromOriginClosed(origin);
}
@@ -202,7 +202,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/keyed_service/core/keyed_service.h"
#include "content/public/browser/visibility.h"
@@ -24,7 +25,7 @@ class OneTimePermissionsTracker : public KeyedService {
@@ -26,7 +27,7 @@ class OneTimePermissionsTracker : public KeyedService {
void (OneTimePermissionsTracker::*)(const url::Origin&);
public:
@@ -211,7 +211,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/
~OneTimePermissionsTracker() override;
OneTimePermissionsTracker(const OneTimePermissionsTracker&) = delete;
@@ -138,7 +139,7 @@ class OneTimePermissionsTracker : public KeyedService {
@@ -147,7 +148,7 @@ class OneTimePermissionsTracker : public KeyedService {
base::ObserverList<OneTimePermissionsTrackerObserver> observer_list_;
std::map<url::Origin, OriginTrackEntry> origin_tracker_;
@@ -233,7 +233,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc
diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
--- a/chrome/browser/ui/views/permissions/chip/chip_controller.cc
+++ b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
@@ -228,7 +228,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
@@ -227,7 +227,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
active_chip_permission_request_manager_.value()->Accept();
break;
case permissions::PermissionAction::GRANTED_ONCE:
@@ -269,7 +269,7 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_v
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
@@ -696,6 +696,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -715,6 +715,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
}
@RequiresNonNull({"mSite"})
@@ -281,7 +281,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
private void setUpClearDataPreference() {
ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA);
long usage = mSite.getTotalUsage();
@@ -1313,6 +1318,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -1407,6 +1412,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
.getDefaultColor());
}
}
@@ -425,33 +425,33 @@ diff --git a/components/content_settings/core/common/content_settings_enums.mojo
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
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
@@ -376,8 +376,8 @@ public class PageInfoController
@@ -387,9 +387,9 @@ public class PageInfoController
*/
@CalledByNative
private void addPermissionSection(
- String name, String nameMidSentence, int type, boolean allowed) {
- mPermissionParamsListBuilder.addPermissionEntry(name, nameMidSentence, type, allowed);
+ String name, String nameMidSentence, int type, boolean allowed, boolean is_user_session) {
+ mPermissionParamsListBuilder.addPermissionEntry(name, nameMidSentence, type, allowed, is_user_session);
- String name, String nameMidSentence, int type, boolean allowed, boolean requested) {
+ String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) {
mPermissionParamsListBuilder.addPermissionEntry(
- name, nameMidSentence, type, allowed, requested);
+ name, nameMidSentence, type, allowed, requested, is_user_session);
}
/** Update the permissions view based on the contents of mDisplayedPermissions. */
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
--- a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
@@ -46,8 +46,9 @@ public class PermissionParamsListBuilder {
mEntries = new ArrayList<>();
@@ -47,8 +47,8 @@ public class PermissionParamsListBuilder {
}
- public void addPermissionEntry(String name, String nameMidSentence, int type, boolean allowed) {
- mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed));
+ public void addPermissionEntry(String name, String nameMidSentence, int type, boolean allowed,
+ boolean is_user_session) {
+ mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, is_user_session));
public void addPermissionEntry(
- String name, String nameMidSentence, int type, boolean allowed, boolean requested) {
- mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, requested));
+ String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) {
+ mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, requested, is_user_session));
}
public void clearPermissionEntries() {
@@ -84,6 +85,10 @@ public class PermissionParamsListBuilder {
@@ -85,6 +85,10 @@ public class PermissionParamsListBuilder {
} else {
warningTextResource = R.string.page_info_android_permission_blocked;
}
@@ -462,18 +462,20 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
}
}
@@ -112,12 +117,14 @@ public class PermissionParamsListBuilder {
public final String nameMidSentence;
@@ -115,14 +119,16 @@ public class PermissionParamsListBuilder {
public final int type;
public final boolean allowed;
public final boolean requested;
+ public final boolean is_user_session;
- PageInfoPermissionEntry(String name, String nameMidSentence, int type, boolean allowed) {
+ PageInfoPermissionEntry(String name, String nameMidSentence, int type, boolean allowed, boolean is_user_session) {
PageInfoPermissionEntry(
- String name, String nameMidSentence, int type, boolean allowed, boolean requested) {
+ String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) {
this.name = name;
this.nameMidSentence = nameMidSentence;
this.type = type;
this.allowed = allowed;
this.requested = requested;
+ this.is_user_session = is_user_session;
}
@@ -481,40 +483,40 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
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
+++ b/components/page_info/android/page_info_controller_android.cc
@@ -207,6 +207,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
std::map<ContentSettingsType, /*allowed*/ bool>
user_specified_settings_to_display;
@@ -214,6 +214,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
// being requested. This is needed for the Loud Clapper experiment
// (crbug.com/458351800).
bool requested_notifications = false;
+ std::map<ContentSettingsType, bool>
+ user_specified_settings_is_user_session;
for (const auto& permission : permission_info_list) {
if (base::Contains(permissions_to_display, permission.type)) {
@@ -219,6 +221,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
@@ -226,6 +228,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
user_specified_settings_to_display[permission.type] =
info->delegate().IsAnyPermissionAllowed(*setting_to_display);
+ user_specified_settings_is_user_session[permission.type] =
+ permission.is_user_session;
}
}
}
@@ -235,7 +239,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
ConvertUTF16ToJavaString(env, setting_title),
// Notifications permission can have the setting to display as DEFAULT
@@ -252,7 +256,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
static_cast<jint>(permission),
- user_specified_settings_to_display[permission]);
+ user_specified_settings_to_display[permission],
user_specified_settings_to_display[permission],
- requested_notifications);
+ requested_notifications,
+ user_specified_settings_is_user_session[permission]);
}
}
@@ -248,7 +253,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
@@ -265,7 +270,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title),
ConvertUTF16ToJavaString(env, object_title),
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), requested_notifications);
+ static_cast<jint>(CONTENT_SETTING_ALLOW), requested_notifications,
+ /* is_user_session */ false);
}
@@ -522,7 +524,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
--- a/components/page_info/page_info.cc
+++ b/components/page_info/page_info.cc
@@ -1331,6 +1331,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
@@ -1296,6 +1296,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
permission_info.is_one_time =
(info.metadata.session_model() ==
content_settings::mojom::SessionModel::ONE_TIME);
@@ -545,9 +547,9 @@ diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
--- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
+++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
@@ -16,6 +16,7 @@ import org.jni_zero.NativeMethods;
import org.chromium.build.annotations.NullMarked;
@@ -16,6 +16,7 @@ import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.base.WindowAndroid;
+import org.chromium.components.content_settings.LifetimeMode;
@@ -682,7 +684,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
diff --git a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
--- a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
+++ b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
@@ -118,7 +118,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() {
@@ -123,7 +123,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() {
delegate()->FinalizeCurrentRequests();
}
@@ -707,7 +709,7 @@ diff --git a/components/permissions/android/permission_prompt/embedded_permissio
diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
--- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
+++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
@@ -137,6 +137,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() {
@@ -138,6 +138,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() {
static_cast<int>(permission_prompt_->GetEmbeddedPromptVariant()));
}
@@ -719,7 +721,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
// static
std::unique_ptr<PermissionDialogDelegate> PermissionDialogDelegate::Create(
content::WebContents* web_contents,
@@ -165,12 +170,22 @@ PermissionDialogDelegate::CreateForTesting(
@@ -166,12 +171,22 @@ PermissionDialogDelegate::CreateForTesting(
void PermissionDialogDelegate::Accept(JNIEnv* env) {
CHECK(permission_prompt_);
@@ -743,7 +745,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
}
void PermissionDialogDelegate::Acknowledge(JNIEnv* env) {
@@ -180,6 +195,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env) {
@@ -181,6 +196,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env) {
void PermissionDialogDelegate::Deny(JNIEnv* env) {
CHECK(permission_prompt_);
@@ -760,7 +762,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.h b/components/permissions/android/permission_prompt/permission_dialog_delegate.h
--- a/components/permissions/android/permission_prompt/permission_dialog_delegate.h
+++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.h
@@ -42,6 +42,7 @@ class PermissionDialogJavaDelegate {
@@ -43,6 +43,7 @@ class PermissionDialogJavaDelegate {
const favicon_base::FaviconRawBitmapResult& favicon_result);
virtual void DismissDialog();
@@ -789,7 +791,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_prompt_
diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.h b/components/permissions/android/permission_prompt/permission_prompt_android.h
--- a/components/permissions/android/permission_prompt/permission_prompt_android.h
+++ b/components/permissions/android/permission_prompt/permission_prompt_android.h
@@ -56,9 +56,10 @@ class PermissionPromptAndroid : public PermissionPrompt {
@@ -57,9 +57,10 @@ class PermissionPromptAndroid : public PermissionPrompt {
const;
virtual void Closing();
virtual void Accept();
@@ -851,24 +853,24 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
IsRequestingOriginDSE(request_data.requesting_origin);
if (decision == PermissionDecision::kAllow &&
@@ -210,7 +221,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
request_data.embedding_origin,
std::move(callback), false /* persist */,
- PermissionDecision::kDeny,
+ PermissionDecision::kDeny, lifetime_option,
request_data.prompt_options);
FinishNotifyPermissionSet(
request_data.id, request_data.requesting_origin,
request_data.embedding_origin, std::move(callback),
- false /* persist */, PermissionDecision::kDeny,
+ false /* persist */, PermissionDecision::kDeny, lifetime_option,
request_data.prompt_options,
request_data.embedded_permission_request_descriptor.Clone());
return;
}
@@ -231,7 +242,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
request_data.embedding_origin,
std::move(callback), false /* persist */,
- PermissionDecision::kDeny,
+ PermissionDecision::kDeny, lifetime_option,
request_data.prompt_options);
@@ -232,7 +243,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
FinishNotifyPermissionSet(
request_data.id, request_data.requesting_origin,
request_data.embedding_origin, std::move(callback),
- false /* persist */, PermissionDecision::kDeny,
+ false /* persist */, PermissionDecision::kDeny, lifetime_option,
request_data.prompt_options,
request_data.embedded_permission_request_descriptor.Clone());
return;
}
@@ -244,14 +255,14 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
@@ -246,14 +257,14 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
base::BindOnce(
&GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown,
weak_factory_.GetWeakPtr(), request_data.requesting_origin,
@@ -878,14 +880,14 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
return;
}
FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
request_data.embedding_origin, std::move(callback),
- persist, decision, request_data.prompt_options);
+ persist, decision, lifetime_option, request_data.prompt_options);
FinishNotifyPermissionSet(
request_data.id, request_data.requesting_origin,
- request_data.embedding_origin, std::move(callback), persist, decision,
+ request_data.embedding_origin, std::move(callback), persist, decision, lifetime_option,
request_data.prompt_options,
request_data.embedded_permission_request_descriptor.Clone());
}
content::PermissionResult
@@ -428,7 +439,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
@@ -432,7 +443,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
const GURL& requesting_origin,
const GURL& embedding_origin,
bool persist,
@@ -894,7 +896,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
std::optional<PromptOptions> prompt_options,
LocationSettingsDialogOutcome prompt_outcome) {
bool is_default_search = IsRequestingOriginDSE(requesting_origin);
@@ -448,7 +459,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
@@ -452,7 +463,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
FinishNotifyPermissionSet(location_settings_dialog_request_id_,
requesting_origin, embedding_origin,
std::move(location_settings_dialog_callback_),
@@ -903,18 +905,18 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
location_settings_dialog_request_id_ =
PermissionRequestID(content::GlobalRenderFrameHostId(0, 0),
@@ -461,7 +472,7 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
@@ -465,7 +476,7 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
const GURL& embedding_origin,
BrowserPermissionCallback callback,
bool persist,
- PermissionDecision decision,
+ PermissionDecision decision, content_settings::mojom::LifetimeMode lifetime_option,
std::optional<PromptOptions> prompt_options) {
PermissionRequestData request_data(
this, id,
@@ -470,9 +481,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
blink::PermissionType::GEOLOCATION)),
requesting_origin, embedding_origin);
std::optional<PromptOptions> prompt_options,
blink::mojom::EmbeddedPermissionRequestDescriptorPtr
embedded_permission_request_descriptor) {
@@ -478,9 +489,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
request_data.embedded_permission_request_descriptor =
std::move(embedded_permission_request_descriptor);
request_data.prompt_options = prompt_options.value_or(std::monostate());
- GeolocationPermissionContext::NotifyPermissionSet(
+ GeolocationPermissionContext::NotifyPermissionSetImpl(
@@ -949,14 +951,14 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
std::optional<PromptOptions> prompt_options,
LocationSettingsDialogOutcome prompt_outcome);
@@ -145,6 +152,7 @@ class GeolocationPermissionContextAndroid
BrowserPermissionCallback callback,
bool persist,
PermissionDecision decision,
+ content_settings::mojom::LifetimeMode lifetime_option,
std::optional<PromptOptions> prompt_options);
std::unique_ptr<LocationSettings> location_settings_;
@@ -146,6 +153,7 @@ class GeolocationPermissionContextAndroid
BrowserPermissionCallback callback,
bool persist,
PermissionDecision decision,
+ content_settings::mojom::LifetimeMode lifetime_option,
std::optional<PromptOptions> prompt_options,
blink::mojom::EmbeddedPermissionRequestDescriptorPtr
embedded_permission_request_descriptor = nullptr);
diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/components/permissions/embedded_permission_prompt_flow_model.cc
--- a/components/permissions/embedded_permission_prompt_flow_model.cc
+++ b/components/permissions/embedded_permission_prompt_flow_model.cc
@@ -972,7 +974,7 @@ diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/c
diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
--- a/components/permissions/permission_context_base.cc
+++ b/components/permissions/permission_context_base.cc
@@ -282,6 +282,17 @@ PermissionContextBase::CreatePermissionRequest(
@@ -281,6 +281,17 @@ PermissionContextBase::CreatePermissionRequest(
std::move(request_finished_callback), UsesAutomaticEmbargo());
}
@@ -990,7 +992,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
bool PermissionContextBase::UsesAutomaticEmbargo() const {
return true;
}
@@ -626,7 +637,8 @@ void PermissionContextBase::DecidePermission(
@@ -624,7 +635,8 @@ void PermissionContextBase::DecidePermission(
void PermissionContextBase::PermissionDecided(
PermissionDecision decision,
bool is_final_decision,
@@ -1000,7 +1002,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
UserMadePermissionDecision(request_data.id, request_data.requesting_origin,
request_data.embedding_origin, decision);
// If a permission request originates from an embedded element, its
@@ -650,11 +662,12 @@ void PermissionContextBase::PermissionDecided(
@@ -648,11 +660,12 @@ void PermissionContextBase::PermissionDecided(
// missing if a permission prompt was preignored and we already notified an
// origin about it.
if (request->second.second) {
@@ -1017,7 +1019,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
}
}
@@ -739,6 +752,30 @@ void PermissionContextBase::NotifyPermissionSet(
@@ -737,6 +750,30 @@ void PermissionContextBase::NotifyPermissionSet(
bool persist,
PermissionDecision decision,
bool is_final_decision) {
@@ -1048,7 +1050,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// Note that rfh may be null, see crbug.com/426909787.
@@ -754,8 +791,8 @@ void PermissionContextBase::NotifyPermissionSet(
@@ -752,8 +789,8 @@ void PermissionContextBase::NotifyPermissionSet(
if (persist) {
// Clone new value, because we need it again for the callback.
@@ -1059,7 +1061,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
}
if (is_final_decision) {
@@ -794,6 +831,17 @@ void PermissionContextBase::UpdateSetting(
@@ -811,6 +848,17 @@ void PermissionContextBase::UpdateSetting(
const PermissionRequestData& request_data,
PermissionSetting setting,
bool is_one_time) {
@@ -1077,7 +1079,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
DCHECK_EQ(request_data.requesting_origin,
request_data.requesting_origin.DeprecatedGetOriginAsURL());
DCHECK_EQ(request_data.embedding_origin,
@@ -803,6 +851,8 @@ void PermissionContextBase::UpdateSetting(
@@ -820,6 +868,8 @@ void PermissionContextBase::UpdateSetting(
constraints.set_session_model(
is_one_time ? content_settings::mojom::SessionModel::ONE_TIME
: content_settings::mojom::SessionModel::DURABLE);
@@ -1133,7 +1135,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
// Implementors can override this method to avoid using automatic embargo.
virtual bool UsesAutomaticEmbargo() const;
@@ -281,7 +304,8 @@ class PermissionContextBase : public content_settings::Observer {
@@ -285,7 +308,8 @@ class PermissionContextBase : public content_settings::Observer {
// allows/blocks/dismisses a permission prompt.
void PermissionDecided(PermissionDecision decision,
bool is_final_decision,
@@ -1177,7 +1179,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
PermissionRequest::~PermissionRequest() {
std::move(request_finished_callback_).Run();
}
@@ -431,20 +441,40 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
@@ -433,20 +443,40 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
return request_type() == RequestType::kStorageAccess;
}
@@ -1261,7 +1263,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
// Called when the user has cancelled the permission request. This
// corresponds to a denial, but is segregated in case the context needs to
@@ -242,6 +253,9 @@ class PermissionRequest {
@@ -247,6 +258,9 @@ class PermissionRequest {
// Called once a decision is made about the permission.
PermissionDecidedCallback permission_decided_callback_;
@@ -1274,7 +1276,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
--- a/components/permissions/permission_request_manager.cc
+++ b/components/permissions/permission_request_manager.cc
@@ -206,12 +206,12 @@ void PermissionRequestManager::AddRequest(
@@ -208,12 +208,12 @@ void PermissionRequestManager::AddRequest(
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDenyPermissionPrompts)) {
@@ -1289,7 +1291,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
return;
}
@@ -282,9 +282,9 @@ void PermissionRequestManager::AddRequest(
@@ -284,9 +284,9 @@ void PermissionRequestManager::AddRequest(
if (should_auto_approve_request) {
if (should_auto_approve_request == PermissionAction::GRANTED) {
@@ -1301,7 +1303,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
return;
}
@@ -611,7 +611,8 @@ void PermissionRequestManager::Accept() {
@@ -615,7 +615,8 @@ void PermissionRequestManager::Accept() {
StorePermissionActionForUMA(request->requesting_origin(),
request->request_type(), action);
PermissionGrantedIncludingDuplicates(request.get(),
@@ -1309,9 +1311,9 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
+ /*is_one_time=*/false,
+ content_settings::mojom::LifetimeMode::ALWAYS);
#if !BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
std::optional<ContentSettingsType> content_settings_type =
@@ -629,7 +630,7 @@ void PermissionRequestManager::Accept() {
@@ -633,7 +634,7 @@ void PermissionRequestManager::Accept() {
CurrentRequestsDecided(action);
}
@@ -1320,7 +1322,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
if (ignore_callbacks_from_prompt_) {
return;
}
@@ -641,7 +642,8 @@ void PermissionRequestManager::AcceptThisTime() {
@@ -645,7 +646,8 @@ void PermissionRequestManager::AcceptThisTime() {
StorePermissionActionForUMA(request->requesting_origin(),
request->request_type(), action);
PermissionGrantedIncludingDuplicates(request.get(),
@@ -1330,7 +1332,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
NotifyRequestDecided(action);
@@ -649,6 +651,15 @@ void PermissionRequestManager::AcceptThisTime() {
@@ -653,6 +655,15 @@ void PermissionRequestManager::AcceptThisTime() {
}
void PermissionRequestManager::Deny() {
@@ -1346,7 +1348,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
if (ignore_callbacks_from_prompt_) {
return;
}
@@ -669,7 +680,7 @@ void PermissionRequestManager::Deny() {
@@ -673,7 +684,7 @@ void PermissionRequestManager::Deny() {
for (const auto& request : requests_) {
StorePermissionActionForUMA(request->requesting_origin(),
request->request_type(), action);
@@ -1355,7 +1357,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
NotifyRequestDecided(action);
@@ -1306,32 +1317,32 @@ PermissionRequestManager::VisitDuplicateRequests(
@@ -1366,32 +1377,32 @@ PermissionRequestManager::VisitDuplicateRequests(
void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
PermissionRequest* request,
@@ -1398,7 +1400,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
request);
}
@@ -1608,7 +1619,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
@@ -1679,7 +1690,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
}
switch (auto_response_for_test_) {
case ACCEPT_ONCE:
@@ -1422,7 +1424,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
void Dismiss() override;
void Ignore() override;
void FinalizeCurrentRequests() override;
@@ -426,9 +428,12 @@ class PermissionRequestManager
@@ -441,9 +443,12 @@ class PermissionRequestManager
// Calls PermissionGranted on a request and all its duplicates.
void PermissionGrantedIncludingDuplicates(PermissionRequest* request,
build/patches/Add-menu-item-to-bookmark-all-tabs.patch
+32 -68
View File
@@ -18,8 +18,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../bookmark_ui_operations_helper.cc | 2 +
.../bookmark_bar_page_handler.cc | 2 +
components/bookmark_bar_strings.grdp | 6 +++
.../bookmarks/browser/bookmark_codec.cc | 20 +++++++--
components/bookmarks/browser/bookmark_codec.h | 7 ++-
.../bookmarks/browser/bookmark_codec.cc | 14 +++++-
components/bookmarks/browser/bookmark_codec.h | 4 ++
.../browser/bookmark_load_details.cc | 15 +++++--
.../bookmarks/browser/bookmark_load_details.h | 2 +
.../bookmarks/browser/bookmark_model.cc | 3 +-
@@ -31,15 +31,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/bookmarks/browser/bookmark_uuids.h | 1 +
components/bookmarks/browser/model_loader.cc | 9 +++-
.../bookmark_specifics_conversions.cc | 1 +
27 files changed, 257 insertions(+), 14 deletions(-)
27 files changed, 251 insertions(+), 11 deletions(-)
diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
--- a/chrome/android/java/res/values/ids.xml
+++ b/chrome/android/java/res/values/ids.xml
@@ -194,6 +194,7 @@ found in the LICENSE file.
<item type="id" name="menu_select_tabs" />
@@ -197,6 +197,7 @@ found in the LICENSE file.
<item type="id" name="menu_item_content_filter_divider_line_id" />
<item type="id" name="menu_item_content_filter_help_center_id" />
<item type="id" name="duplicate_tab_menu_id" />
+ <item type="id" name="bookmark_all_tabs_menu_id" />
<!-- Custom Tabs -->
@@ -55,7 +55,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.LayoutManagerChrome;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
@@ -294,6 +295,9 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
@@ -299,6 +300,9 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
import org.chromium.chrome.browser.ui.browser_window.BrowserWindowType;
import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
@@ -65,16 +65,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient;
import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin;
import org.chromium.chrome.browser.ui.signin.BottomSheetSigninAndHistorySyncConfig;
@@ -308,6 +312,8 @@ import org.chromium.chrome.browser.usage_stats.UsageStatsService;
import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
@@ -314,6 +318,8 @@ import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionInitializerImpl;
import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionManagerImpl;
import org.chromium.components.browser_ui.accessibility.AccessibilityFeatureMap;
+import org.chromium.components.bookmarks.BookmarkId;
+import org.chromium.components.bookmarks.BookmarkItem;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
import org.chromium.components.browser_ui.share.ShareParams;
import org.chromium.components.browser_ui.util.BrowserControlsVisibilityDelegate;
@@ -3886,6 +3892,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -3929,6 +3935,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
CloseAllTabsDialog.show(
this, getModalDialogManagerSupplier(), tabModelSelector, closeAllTabsRunnable);
RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
} else if (id == R.id.close_all_incognito_tabs_menu_id) {
boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
@@ -4013,6 +4021,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -4058,6 +4066,41 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
}
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
@@ -288,6 +288,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
@@ -292,6 +292,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
// Bookmarks
modelList.add(buildBookmarksItem());
@@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
// Recent Tabs
if (shouldShowRecentTabsItem()) modelList.add(buildRecentTabsItem());
@@ -468,6 +476,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
@@ -478,6 +486,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
}
modelList.add(buildCloseAllTabsItem());
if (shouldShowTinkerTank()) modelList.add(buildTinkerTankItem());
@@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
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
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -340,6 +340,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
@@ -336,6 +336,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
return bookmark_model_->account_mobile_node() != nullptr;
}
@@ -194,7 +194,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
base::android::ScopedJavaLocalRef<jobject>
BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,
const GURL& url) {
@@ -452,6 +479,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
@@ -448,6 +475,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
// Vector to temporarily contain all child bookmarks at same level for sorting
std::vector<const BookmarkNode*> bookmarks = {
bookmark_model_->mobile_node(),
@@ -202,7 +202,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
bookmark_model_->bookmark_bar_node(),
bookmark_model_->other_node(),
};
@@ -560,6 +588,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
@@ -556,6 +584,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
top_level_folders.push_back(other_node);
}
@@ -212,7 +212,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
const BookmarkNode* reading_list_node =
local_or_syncable_reading_list_manager_->GetRoot();
if (IsPermanentFolderVisible(
@@ -1232,6 +1263,17 @@ void BookmarkBridge::GetBookmarksOfType(
@@ -1229,6 +1260,17 @@ void BookmarkBridge::GetBookmarksOfType(
AddBookmarkNodesToBookmarkIdList(env, j_list, results);
}
@@ -460,7 +460,7 @@ 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
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4505,6 +4505,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -4562,6 +4562,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
Select tabs
</message>
@@ -545,15 +545,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
} else {
// No permanent node should have been provided.
CHECK(!other_folder_node);
@@ -148,6 +152,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
@@ -144,6 +148,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
BookmarkNode* bb_node,
BookmarkNode* other_folder_node,
BookmarkNode* mobile_folder_node,
+ BookmarkNode* tabs_folder_node,
int64_t* max_id,
std::string* sync_metadata_str) {
const int64_t max_already_assigned_id =
@@ -162,7 +167,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
if (sync_metadata_str) {
@@ -156,13 +161,15 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
base::Uuid::ParseLowercase(kBookmarkBarNodeUuid),
base::Uuid::ParseLowercase(kOtherBookmarksNodeUuid),
base::Uuid::ParseLowercase(kMobileBookmarksNodeUuid),
@@ -562,25 +562,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
+ base::Uuid::ParseLowercase(kTabsCollectionBookmarksNodeUuid)};
ids_reassigned_ = false;
uuids_reassigned_ = false;
ids_valid_ = true;
@@ -171,6 +177,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
stored_sha256_checksum_.clear();
InitializeChecksum();
nodes_requiring_id_reassignment_.clear();
reassigned_ids_per_old_id_.clear();
bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node,
+ tabs_folder_node,
value, sync_metadata_str);
FinalizeChecksum();
ReassignIDsIfRequired();
@@ -180,7 +187,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
if (!ids_valid_ || (computed_checksum_ != stored_checksum_) ||
(use_sha256 && computed_sha256_checksum_ != stored_sha256_checksum_)) {
maximum_id_ = max_already_assigned_id;
- ReassignIDs(bb_node, other_folder_node, mobile_folder_node);
+ ReassignIDs(bb_node, other_folder_node, mobile_folder_node, tabs_folder_node);
}
*max_id = maximum_id_ + 1;
return success;
@@ -239,6 +246,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
@@ -220,6 +227,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
BookmarkNode* other_folder_node,
BookmarkNode* mobile_folder_node,
@@ -588,7 +578,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
const base::Value::Dict& value,
std::string* sync_metadata_str) {
std::optional<int> version = value.FindInt(kVersionKey);
@@ -284,6 +292,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
@@ -243,6 +251,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
roots->FindDict(kOtherBookmarkFolderNameKey);
const base::Value::Dict* mobile_folder_value =
roots->FindDict(kMobileBookmarkFolderNameKey);
@@ -597,7 +587,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
if (!bb_value || !other_folder_value || !mobile_folder_value)
return false;
@@ -291,6 +301,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
@@ -250,6 +260,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
DecodeNode(*bb_value, nullptr, bb_node);
DecodeNode(*other_folder_value, nullptr, other_folder_node);
DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node);
@@ -606,22 +596,6 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
// Need to reset the title as the title is persisted and restored from
// the file.
@@ -499,12 +511,14 @@ void BookmarkCodec::DecodeMetaInfoHelper(
void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
BookmarkNode* other_node,
- BookmarkNode* mobile_node) {
+ BookmarkNode* mobile_node,
+ BookmarkNode* tabs_folder_node) {
ids_.clear();
reassigned_ids_per_old_id_.clear();
ReassignIDsHelper(bb_node);
ReassignIDsHelper(other_node);
ReassignIDsHelper(mobile_node);
+ ReassignIDsHelper(tabs_folder_node);
ids_reassigned_ = true;
}
diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
--- a/components/bookmarks/browser/bookmark_codec.h
+++ b/components/bookmarks/browser/bookmark_codec.h
@@ -641,7 +615,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
int64_t* max_node_id,
std::string* sync_metadata_str);
@@ -100,6 +102,7 @@ class BookmarkCodec {
@@ -95,6 +97,7 @@ class BookmarkCodec {
static const char kBookmarkBarFolderNameKey[];
static const char kOtherBookmarkFolderNameKey[];
static const char kMobileBookmarkFolderNameKey[];
@@ -649,7 +623,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
static const char kVersionKey[];
static const char kChecksumKey[];
static const char kChecksumSHA256Key[];
@@ -133,6 +136,7 @@ class BookmarkCodec {
@@ -128,6 +131,7 @@ class BookmarkCodec {
bool DecodeHelper(BookmarkNode* bb_node,
BookmarkNode* other_folder_node,
BookmarkNode* mobile_folder_node,
@@ -657,16 +631,6 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
const base::Value::Dict& value,
std::string* sync_metadata_str);
@@ -143,7 +147,8 @@ class BookmarkCodec {
// Reassigns bookmark IDs for all nodes.
void ReassignIDs(BookmarkNode* bb_node,
BookmarkNode* other_node,
- BookmarkNode* mobile_node);
+ BookmarkNode* mobile_node,
+ BookmarkNode* tabs_folder_node);
// Helper to recursively reassign IDs.
void ReassignIDsHelper(BookmarkNode* node);
diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/bookmarks/browser/bookmark_load_details.cc
--- a/components/bookmarks/browser/bookmark_load_details.cc
+++ b/components/bookmarks/browser/bookmark_load_details.cc
@@ -749,7 +713,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -909,7 +909,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
@@ -908,7 +908,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
(account_bookmark_bar_node_ &&
!account_bookmark_bar_node_->children().empty()) ||
(account_other_node_ && !account_other_node_->children().empty()) ||
@@ -758,7 +722,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
}
bool BookmarkModel::IsBookmarked(const GURL& url) const {
@@ -1241,6 +1241,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
@@ -1240,6 +1240,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
bookmark_bar_node_ = details->bb_node();
other_node_ = details->other_folder_node();
mobile_node_ = details->mobile_folder_node();
@@ -907,7 +871,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
&sync_metadata_str)) {
ids_assigned_to_account_nodes = codec.release_assigned_ids();
@@ -118,7 +122,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
@@ -123,7 +127,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
if (root_dict.has_value() &&
codec.Decode(*root_dict, std::move(ids_assigned_to_account_nodes),
details->bb_node(), details->other_folder_node(),
build/patches/Add-menu-item-to-view-source.patch
+6 -6
View File
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -3922,6 +3922,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -3965,6 +3965,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
}
RecordUserAction.record("MobileMenuDownloadManager");
@@ -39,7 +39,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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -2756,6 +2756,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -2797,6 +2797,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
return doOpenWebApk(currentTab);
}
@@ -54,7 +54,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
--- 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
@@ -988,6 +988,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
@@ -1024,6 +1024,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
return false;
}
@@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
@@ -411,6 +411,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
@@ -406,6 +406,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
modelList.add(buildAddToHomescreenListItem(currentTab, false));
}
@@ -101,7 +101,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/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
@@ -360,6 +360,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
@@ -370,6 +370,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
modelList.add(buildAddToHomescreenListItem(currentTab, shouldShowIconBeforeItem()));
}
@@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -327,6 +327,10 @@ CHAR_LIMIT guidelines:
@@ -339,6 +339,10 @@ CHAR_LIMIT guidelines:
Chrome Tips
</message>
build/patches/Add-option-to-disable-snapshots.patch
+11 -11
View File
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
@@ -504,7 +504,12 @@ class TabGridViewBinder {
@@ -512,7 +512,12 @@ class TabGridViewBinder {
if (result != null) {
TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
} else {
@@ -29,7 +29,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
}
};
if (sThumbnailFetcherForTesting != null) {
@@ -542,6 +547,7 @@ class TabGridViewBinder {
@@ -550,6 +555,7 @@ class TabGridViewBinder {
*/
private static void setFavicon(
ImageView faviconView, PropertyModel model, @Nullable TabFavicon favicon) {
@@ -69,7 +69,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -73,6 +73,11 @@ found in the LICENSE file.
@@ -67,6 +67,11 @@ found in the LICENSE file.
android:title="@string/open_external_links_incognito_title"
android:summary="@string/open_external_links_incognito_summary"
android:defaultValue="false" />
@@ -84,7 +84,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -153,6 +153,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
@@ -158,6 +158,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
import org.chromium.chrome.browser.printing.TabPrinter;
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
@@ -667,7 +668,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -679,7 +680,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
new TabContentManager(
this,
mBrowserControlsManagerSupplier.get(),
@@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.ObservableSupplierImpl;
import org.chromium.build.annotations.NullMarked;
@@ -98,13 +99,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
@@ -99,13 +100,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
@@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
private static final String PREF_PRELOAD_PAGES = "preload_pages";
private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
@@ -216,6 +231,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -201,6 +216,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
}
}
@@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
// Record the launch of PG from the S&P link-row entry point
privacyGuidePreference.setOnPreferenceClickListener(
@@ -441,6 +471,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -433,6 +463,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
@@ -172,7 +172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -487,6 +518,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -479,6 +510,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
sharedPreferencesEditor.apply();
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
}
return true;
}
@@ -537,6 +575,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -529,6 +567,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
: R.string.text_off);
}
@@ -200,7 +200,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
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -6416,6 +6416,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -6506,6 +6506,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
</message>
build/patches/Add-option-to-force-tablet-UI.patch
+60 -60
View File
@@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../preferences/ChromePreferenceKeys.java | 1 +
.../preferences/ChromeSharedPreferences.java | 12 ++++++++++++
.../LegacyChromePreferenceKeys.java | 1 +
.../AppHeaderCoordinator.java | 2 ++
.../ui/desktop_windowing/AppHeaderUtils.java | 2 ++
.../omnibox/LocationBarCoordinator.java | 2 +-
.../strings/android_chrome_strings.grd | 7 +++++++
.../java/res/layout/control_container.xml | 8 ++++----
@@ -80,8 +80,8 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -119,9 +119,13 @@ found in the LICENSE file.
<dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
@@ -116,9 +116,13 @@ found in the LICENSE file.
<dimen name="signin_screen_top_padding">50dp</dimen>
<!-- Should match toolbar_height_no_shadow -->
- <dimen name="control_container_height">@dimen/default_action_bar_height</dimen>
@@ -98,7 +98,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeFieldTrialImpl;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
@@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo
import org.chromium.chrome.browser.ui.edge_to_edge.SimpleEdgeToEdgeController;
import org.chromium.components.browser_ui.styles.SemanticColorUtils;
import org.chromium.components.browser_ui.util.AutomotiveUtils;
@@ -146,6 +147,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
@@ -145,6 +146,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(newBase);
@@ -171,7 +171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -818,7 +818,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -830,7 +830,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
// Inflate the correct toolbar layout for the device.
int toolbarLayoutId = getToolbarLayoutId();
if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -186,7 +186,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/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
@@ -136,6 +136,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
@@ -137,6 +137,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
import org.chromium.components.tab_group_sync.TriggerSource;
import org.chromium.components.tab_groups.TabGroupColorId;
import org.chromium.ui.accessibility.AccessibilityState;
@@ -194,7 +194,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
import org.chromium.ui.base.LocalizationUtils;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.util.ColorUtils;
@@ -5308,8 +5309,13 @@ public class StripLayoutHelper
@@ -5317,8 +5318,13 @@ public class StripLayoutHelper
mCloseButtonMenu.setAnchorView(tabView);
// 3. Set the vertical offset to align the close button menu with bottom of the tab strip
int tabHeight = mManagerHost.getHeight();
@@ -213,7 +213,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
@@ -101,6 +101,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
@@ -105,6 +105,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
import org.chromium.components.browser_ui.styles.SemanticColorUtils;
import org.chromium.components.browser_ui.widget.scrim.ScrimProperties;
import org.chromium.content_public.browser.LoadUrlParams;
@@ -221,9 +221,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
import org.chromium.ui.base.LocalizationUtils;
import org.chromium.ui.base.PageTransition;
import org.chromium.ui.base.WindowAndroid;
@@ -491,7 +492,10 @@ public class StripLayoutHelperManager
mIsLayoutOptimizationsEnabled =
ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(
@@ -498,7 +499,10 @@ public class StripLayoutHelperManager
mIsHeaderCustomizationSupported =
ToolbarFeatures.isAppHeaderCustomizationSupported(
/* isTablet= */ true, DisplayUtil.isContextInDefaultDisplay(mContext));
- mScrollableStripHeight = res.getDimension(R.dimen.tab_strip_height) / mDensity;
+ mScrollableStripHeight =
@@ -231,7 +231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
+ ? res.getDimension(R.dimen.tab_strip_height_tabletui)
+ : res.getDimension(R.dimen.tab_strip_height_cromite)) / mDensity;
mHeight =
mIsLayoutOptimizationsEnabled
mIsHeaderCustomizationSupported
? toolbarManager.getTabStripHeightSupplier().get() / mDensity
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
@@ -273,7 +273,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -766,7 +766,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -807,7 +807,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@Override
public int getControlContainerHeightResource() {
@@ -296,9 +296,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
@@ -1877,7 +1879,9 @@ public class RootUiCoordinator
if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
@@ -1947,7 +1949,9 @@ public class RootUiCoordinator
protected int getFindToolbarStub() {
int stubId = R.id.find_toolbar_stub;
- if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
+ if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity) &&
@@ -306,7 +306,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
+ ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false)) {
stubId = R.id.find_toolbar_tablet_stub;
}
mFindToolbarManager =
return stubId;
diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
--- a/chrome/browser/preferences/BUILD.gn
+++ b/chrome/browser/preferences/BUILD.gn
@@ -321,7 +321,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
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
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -348,6 +348,7 @@ public final class ChromePreferenceKeys {
@@ -358,6 +358,7 @@ public final class ChromePreferenceKeys {
/** Whether the app-specific history info text was already seen by users. */
public static final String HISTORY_APP_SPECIFIC_INFO_SEEN =
"Chrome.History.AppSpecificInfoSeen";
@@ -369,29 +369,29 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
ChromePreferenceKeys.HOMEPAGE_ENABLED,
diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
--- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
+++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
@@ -43,6 +43,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
import org.chromium.ui.display.DisplayUtil;
import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider;
import org.chromium.ui.insets.CaptionBarInsetsRectProvider;
diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
--- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
+++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher.Activit
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
+import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.insets.InsetObserver;
import org.chromium.ui.insets.InsetObserver.WindowInsetsConsumer;
import org.chromium.ui.display.DisplayUtil;
import org.chromium.ui.insets.InsetsRectProvider;
@@ -304,6 +305,7 @@ public class AppHeaderCoordinator
InsetsRectProvider insetsRectProvider,
@DesktopWindowHeuristicResult int currentResult,
boolean isOnExternalDisplay) {
@@ -245,6 +246,7 @@ public class AppHeaderUtils {
*/
static @DesktopWindowHeuristicResult int checkIsInDesktopWindow(
InsetsRectProvider insetsRectProvider, Context context) {
+ if (DeviceFormFactor.isForceTabletUI()) return DesktopWindowHeuristicResult.IN_DESKTOP_WINDOW;
@DesktopWindowHeuristicResult int newResult;
Insets captionBarInset = insetsRectProvider.getCachedInset();
boolean isOnExternalDisplay = !DisplayUtil.isContextInDefaultDisplay(context);
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
@@ -903,7 +903,7 @@ public class LocationBarCoordinator
@@ -1008,7 +1008,7 @@ public class LocationBarCoordinator
}
private boolean isTabletWindow() {
@@ -403,7 +403,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1498,6 +1498,13 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1507,6 +1507,13 @@ Your Google account may have other forms of browsing history like searches and a
Privacy guide explanation closed
</message>
@@ -438,9 +438,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
android:layout_marginBottom="@dimen/toolbar_hairline_height"
android:layout_height="@dimen/toolbar_height_no_shadow" />
@@ -29,13 +29,13 @@ found in the LICENSE file.
android:layout_width="match_parent"
@@ -30,13 +30,13 @@ found in the LICENSE file.
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:layout_anchorGravity="bottom"
- />
+ android:layout_marginTop="@dimen/control_container_height_cromite" />
@@ -506,7 +506,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.PorterDuff;
@@ -165,6 +166,24 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
@@ -172,6 +173,24 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
@Initializer
public void initWithToolbar(int toolbarLayoutId, int toolbarLayoutHeightResId) {
try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
@@ -534,7 +534,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
import org.chromium.components.feature_engagement.Tracker;
import org.chromium.ui.base.ViewUtils;
import org.chromium.ui.util.MotionEventUtils;
@@ -542,7 +542,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
import org.chromium.ui.util.TokenHolder;
import org.chromium.url.GURL;
@@ -582,7 +583,9 @@ public abstract class ToolbarLayout extends FrameLayout
@@ -588,7 +589,9 @@ public abstract class ToolbarLayout extends FrameLayout
* not have a tab strip.
*/
protected int getTabStripHeightFromResource() {
@@ -556,15 +556,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
@@ -32,6 +32,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripHeightObserver;
@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer;
import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate;
import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionHandler;
import org.chromium.ui.base.ViewUtils;
+import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback;
import org.chromium.ui.util.TokenHolder;
@@ -561,6 +562,7 @@ class HeightTransitionHandler {
@@ -492,6 +493,7 @@ class HeightTransitionHandler {
/** Get the min screen width (in dp) required for the tab strip to become visible. */
private static int getScreenWidthThresholdDp() {
@@ -575,15 +575,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager.AppHeaderObserver;
+import org.chromium.ui.base.DeviceFormFactor;
/** Class used to manage tab strip visibility and height updates. */
@NullMarked
@@ -148,7 +149,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
/**
* Class used to manage tab strip visibility and height updates.
@@ -170,7 +171,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
mTabStripReservedTopPadding =
controlContainerView()
.getResources()
@@ -613,17 +613,17 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
@@ -29,6 +29,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
import org.chromium.content_public.browser.ContentFeatureMap;
@@ -31,6 +31,7 @@ import org.chromium.content_public.browser.ContentFeatureMap;
import org.chromium.ui.base.UiAndroidFeatureList;
import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
+import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
/** Fragment to keep track of all the accessibility related preferences. */
@NullMarked
@@ -45,6 +46,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
public static final String PREF_CARET_BROWSING = "caret_browsing";
@@ -51,6 +52,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
public static final String PREF_TOUCHPAD_OVERSCROLL_HISTORY_NAVIGATION =
"touchpad_overscroll_history_navigation";
+ private BooleanPreferenceDelegate mForceTabletUIDelegate;
+ static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
@@ -631,7 +631,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
private PageZoomPreference mPageZoomDefaultZoomPref;
private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
private ChromeSwitchPreference mPageZoomAlwaysShowPref;
@@ -119,6 +123,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
@@ -126,6 +130,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
mDelegate.getReaderAccessibilityDelegate().getValue());
readerForAccessibilityPref.setOnPreferenceChangeListener(this);
@@ -644,7 +644,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
Preference captions = findPreference(PREF_CAPTIONS);
captions.setOnPreferenceClickListener(
preference -> {
@@ -191,6 +201,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
@@ -212,6 +222,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue);
@@ -669,7 +669,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
--- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
+++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
@@ -79,6 +79,14 @@ public class DeviceFormFactor {
@@ -87,6 +87,14 @@ public class DeviceFormFactor {
/** See {@link #setIsTabletForTesting(boolean)}. */
private static @Nullable Boolean sIsTabletForTesting;
@@ -684,7 +684,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
/**
* Each activity could be on a different display, and this will just tell you whether the
* display associated with the application context is "tablet sized". Use {@link
@@ -87,6 +95,7 @@ public class DeviceFormFactor {
@@ -95,6 +103,7 @@ public class DeviceFormFactor {
@CalledByNative
@Deprecated
public static boolean isTablet() {
@@ -692,7 +692,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
if (sIsTabletForTesting != null) {
return sIsTabletForTesting;
}
@@ -117,6 +126,7 @@ public class DeviceFormFactor {
@@ -125,6 +134,7 @@ public class DeviceFormFactor {
* E.g. http://developer.samsung.com/samsung-dex/testing
*/
public static boolean isNonMultiDisplayContextOnTablet(Context context) {
@@ -700,7 +700,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;
}
@@ -151,6 +161,7 @@ public class DeviceFormFactor {
@@ -159,6 +169,7 @@ public class DeviceFormFactor {
* @return The screen width bucket the device is in (see constants at the top of this class).
*/
private static int detectScreenWidthBucket(Context context) {
@@ -708,7 +708,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
return context.getResources().getInteger(R.integer.min_screen_width_bucket);
}
@@ -158,6 +169,7 @@ public class DeviceFormFactor {
@@ -166,6 +177,7 @@ public class DeviceFormFactor {
ThreadUtils.assertOnUiThread();
Context context = windowAndroid.getContext().get();
if (context == null) return 0;
@@ -716,7 +716,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
return context.getResources().getInteger(R.integer.min_screen_width_bucket);
}
@@ -167,6 +179,7 @@ public class DeviceFormFactor {
@@ -175,6 +187,7 @@ public class DeviceFormFactor {
*/
@UiThread
public static int getNonMultiDisplayMinimumTabletWidthPx(Context context) {
@@ -724,7 +724,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
return getMinimumTabletWidthPx(DisplayAndroid.getNonMultiDisplay(context));
}
@@ -175,6 +188,7 @@ public class DeviceFormFactor {
@@ -183,6 +196,7 @@ public class DeviceFormFactor {
* layout.
*/
public static int getMinimumTabletWidthPx(DisplayAndroid display) {
build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
+7 -7
View File
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -95,6 +95,11 @@ found in the LICENSE file.
@@ -89,6 +89,11 @@ found in the LICENSE file.
android:title="@string/incognito_settings_title"
android:summary="@string/incognito_settings_summary"
android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -46,6 +46,7 @@ import org.chromium.base.ApplicationStatus;
@@ -47,6 +47,7 @@ import org.chromium.base.ApplicationStatus;
import org.chromium.base.Callback;
import org.chromium.base.CallbackController;
import org.chromium.base.CallbackUtils;
@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
import org.chromium.base.CommandLine;
import org.chromium.base.DeviceInfo;
import org.chromium.base.IntentUtils;
@@ -2173,8 +2174,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -2175,8 +2176,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
boolean hadCipherData =
CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.base.IntentUtils;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.metrics.RecordUserAction;
@@ -114,6 +116,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -113,6 +115,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
private final SharedPreferencesManager mSharedPreferencesManager =
ChromeSharedPreferences.getInstance();
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
@VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
@VisibleForTesting static final String PREF_TRACKING_PROTECTION = "tracking_protection";
@@ -382,7 +386,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -374,7 +378,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
UserPrefs.get(getProfile())
.setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
} else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) {
@@ -442,6 +450,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -434,6 +442,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
getContext(), getProfile()));
}
@@ -128,7 +128,7 @@ diff --git a/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2883,6 +2883,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -2898,6 +2898,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_ACCESSIBILITY_TAB_SWITCHER_TITLE" desc="Accessibility label of the current window when Grid Tab Switcher is shown.">
All tabs
</message>
build/patches/Add-option-to-use-home-page-as-NTP.patch
+16 -16
View File
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
@@ -87,6 +87,9 @@ import java.util.List;
@@ -89,6 +89,9 @@ import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.Supplier;
@@ -115,7 +115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
/**
* A coordinator for the context menu on the tab strip by long-pressing on the group titles. It is
* responsible for creating a list of menu items, setting up the menu and displaying the menu.
@@ -235,9 +238,15 @@ public class TabGroupContextMenuCoordinator extends TabStripReorderingHelper<Tok
@@ -239,9 +242,15 @@ public class TabGroupContextMenuCoordinator extends TabStripReorderingHelper<Tok
/* didCloseCallback= */ null);
RecordUserAction.record("MobileToolbarTabGroupMenu.DeleteGroup");
} else if (menuId == R.id.open_new_tab_in_group) {
@@ -161,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
@@ -26,6 +26,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
@@ -27,6 +27,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
import org.chromium.components.embedder_support.util.UrlUtilities;
import org.chromium.components.url_formatter.UrlFormatter;
import org.chromium.url.GURL;
@@ -169,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
/** Fragment that allows the user to configure homepage related preferences. */
@NullMarked
@@ -35,6 +36,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
@@ -36,6 +37,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
@VisibleForTesting
public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
@@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
private HomepageManager mHomepageManager;
private RadioButtonGroupHomepagePreference mRadioButtons;
private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
@@ -102,6 +105,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
@@ -103,6 +106,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
mRadioButtons.setOnHomepagePreferenceChangeListener(this::onRadioButtonGroupChanged);
mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
@@ -197,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
@@ -117,7 +117,6 @@ public class LaunchMetrics {
@@ -136,7 +136,6 @@ public class LaunchMetrics {
public static void recordHomePageLaunchMetrics(
boolean showHomeButton, boolean homepageIsNtp, GURL homepageGurl) {
if (homepageGurl.isEmpty()) {
@@ -208,15 +208,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchM
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFact
import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
+import org.chromium.chrome.browser.homepage.HomepageManager;
import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
import org.chromium.chrome.browser.multiwindow.MultiInstanceManager.NewWindowAppSource;
import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
import org.chromium.chrome.browser.profiles.Profile;
@@ -579,6 +580,13 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode
@@ -583,6 +584,13 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode
*/
public @Nullable Tab launchUrl(
String url, @TabLaunchType int type, @Nullable Intent intent, long intentTimestamp) {
@@ -233,7 +233,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
--- 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
@@ -361,6 +361,7 @@ public final class ChromePreferenceKeys {
@@ -371,6 +371,7 @@ public final class ChromePreferenceKeys {
public static final String HOMEPAGE_USE_CHROME_NTP = "Chrome.Homepage.UseNTP";
public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled";
@@ -255,7 +255,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1339,6 +1339,9 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1348,6 +1348,9 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
Last hour
</message>
@@ -268,8 +268,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -122,6 +122,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -123,6 +123,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
pref_registration_flags);
registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
pref_registration_flags);
+ registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
@@ -280,7 +280,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -1336,6 +1336,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
@@ -1347,6 +1347,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
// by enterprise policy.
inline constexpr char kGeminiSettings[] = "browser.gemini_settings";
build/patches/Add-search-engine.patch
+9 -5
View File
@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
components/search_engines/BUILD.gn | 3 ++
components/search_engines/cromite/BUILD.gn | 12 ++++++
.../cromite/cromite_prepopulated_engines.json | 37 ++++++++++++++++++
.../search_engine_choice_utils.cc | 5 +--
.../search_engine_choice_utils.cc | 9 +----
.../search_engines/search_engine_type.h | 5 +++
.../template_url_prepopulate_data.cc | 21 +++++++++-
.../template_url_prepopulate_data.h | 9 -----
@@ -20,7 +20,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
tools/json_to_struct/json_to_struct.py | 26 ++++++++----
tools/json_to_struct/struct_generator.py | 10 +++--
tools/variations/fieldtrial_to_struct.py | 4 +-
12 files changed, 113 insertions(+), 28 deletions(-)
12 files changed, 113 insertions(+), 32 deletions(-)
create mode 100644 components/resources/default_100_percent/search_engine_choice/default_favicon.png
create mode 100644 components/search_engines/cromite/BUILD.gn
create mode 100644 components/search_engines/cromite/cromite_prepopulated_engines.json
@@ -63,7 +63,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL
]
deps = [
@@ -164,6 +165,7 @@ source_set("search_engine_utils") {
@@ -161,6 +162,7 @@ source_set("search_engine_utils") {
":search_engine_type",
"//components/google/core/common",
"//third_party/search_engines_data:prepopulated_engines",
@@ -71,7 +71,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL
]
deps = [ "//url" ]
@@ -259,6 +261,7 @@ source_set("unit_tests") {
@@ -256,6 +258,7 @@ source_set("unit_tests") {
"//testing/gmock",
"//testing/gtest",
"//third_party/search_engines_data:prepopulated_engines",
@@ -141,7 +141,7 @@ new file mode 100644
diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
--- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
+++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
@@ -193,10 +193,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
@@ -209,14 +209,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
}
void RecordChoiceScreenSelectedIndex(int selected_engine_index) {
@@ -149,6 +149,10 @@ diff --git a/components/search_engines/search_engine_choice/search_engine_choice
- kSearchEngineChoiceScreenSelectedEngineIndexHistogram,
- selected_engine_index,
- TemplateURLPrepopulateData::kMaxEeaPrepopulatedEngines);
- base::PumaHistogramExactLinear(
- base::PumaType::kRc, kPumaSearchChoiceScreenSelectedEngineIndexHistogram,
- selected_engine_index,
- TemplateURLPrepopulateData::kMaxEeaPrepopulatedEngines);
+ // do nothing in Cromite
}
build/patches/Add-setting-to-clear-data-on-exit.patch
+75 -46
View File
@@ -31,16 +31,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../core/browsing_data_policies_utils.h | 11 +++
.../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
.../core/clear_browsing_data_tab.h | 3 +-
components/browsing_data/core/features.h | 1 +
components/browsing_data/core/pref_names.cc | 17 ++++
components/browsing_data/core/pref_names.h | 10 +++
components/favicon/core/favicon_database.cc | 9 +++
components/favicon/core/favicon_database.h | 2 +
components/favicon/core/favicon_database.h | 3 +
.../search_engines/template_url_service.cc | 1 +
content/browser/btm/btm_service_impl.cc | 2 +-
content/browser/storage_partition_impl.cc | 1 +
content/browser/storage_partition_impl.cc | 2 +
.../public/browser/browsing_data_remover.h | 7 +-
.../Add-setting-to-clear-data-on-exit.inc | 8 ++
36 files changed, 407 insertions(+), 34 deletions(-)
37 files changed, 410 insertions(+), 34 deletions(-)
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc
@@ -48,7 +49,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -268,6 +268,7 @@ chrome_java_sources = [
@@ -270,6 +270,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",
"java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java",
"java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java",
@@ -74,7 +75,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -203,6 +203,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
@@ -208,6 +208,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate;
@@ -82,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler;
import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory;
import org.chromium.chrome.browser.reengagement.ReengagementNotificationController;
@@ -2179,7 +2180,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -2181,7 +2182,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
Intent intent = getIntent();
boolean hadCipherData =
@@ -98,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
@@ -224,8 +224,8 @@ public final class BrowsingDataBridge implements Destroyable {
@@ -205,8 +205,8 @@ public final class BrowsingDataBridge {
* BrowsingDataType}).
* @return The state of the corresponding deletion preference.
*/
@@ -109,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
}
/**
@@ -235,8 +235,8 @@ public final class BrowsingDataBridge implements Destroyable {
@@ -216,8 +216,8 @@ public final class BrowsingDataBridge {
* BrowsingDataType}).
* @param value The state to be set.
*/
@@ -120,7 +121,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
}
/**
@@ -340,10 +340,10 @@ public final class BrowsingDataBridge implements Destroyable {
@@ -278,10 +278,10 @@ public final class BrowsingDataBridge {
@JniType("Profile*") Profile profile, @JniType("std::string") String origin);
boolean getBrowsingDataDeletionPreference(
@@ -165,9 +166,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
- private void onClearBrowsingData() {
+ protected void onClearBrowsingData() {
RecordUserAction.record("ClearBrowsingData_AdvancedTab");
}
if (ChromeFeatureList.sClearBrowsingDataAndroidSurvey.isEnabled()) {
@@ -442,6 +448,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
@@ -437,6 +443,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
BrowsingDataBridge.getForProfile(getProfile())
.setBrowsingDataDeletionPreference(
ClearBrowsingDataFragment.getDataType(item.getOption()),
@@ -175,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
item.isSelected());
}
@@ -449,8 +456,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
@@ -444,8 +451,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
.setBrowsingDataDeletionTimePeriod(mLastSelectedTimePeriod);
}
@@ -189,7 +190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
String referrer =
fragmentArgs.getString(
ClearBrowsingDataFragment.CLEAR_BROWSING_DATA_REFERRER, null);
@@ -476,6 +487,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
@@ -471,6 +482,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
DialogOption.CLEAR_SITE_SETTINGS);
}
@@ -200,7 +201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
/**
* Decides whether a given dialog option should be selected when the dialog is initialized.
*
@@ -484,7 +499,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
@@ -479,7 +494,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
*/
private boolean isOptionSelectedByDefault(@DialogOption int option) {
return BrowsingDataBridge.getForProfile(getProfile())
@@ -209,7 +210,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
}
/**
@@ -552,6 +567,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
@@ -547,6 +562,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
* options.
*/
private void onClearButtonClicked() {
@@ -217,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
if (shouldShowImportantSitesDialog()) {
showImportantDialogThenClear();
return;
@@ -581,6 +597,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
@@ -576,6 +592,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
Button clearButton = (Button) assumeNonNull(getView()).findViewById(R.id.clear_button);
boolean isEnabled = !getSelectedOptions().isEmpty();
clearButton.setEnabled(isEnabled);
@@ -225,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
}
private int getSpinnerIndex(
@@ -658,7 +675,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
@@ -653,7 +670,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
.getBoolean(Pref.ALLOW_DELETING_BROWSER_HISTORY)) {
enabled = false;
browsingDataBridge.setBrowsingDataDeletionPreference(
@@ -234,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
}
// Disable tabs closure if the user is in multi-window mode.
@@ -688,8 +705,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
@@ -683,8 +700,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
mSigninManager.addSignInStateObserver(this);
setHasOptionsMenu(true);
@@ -334,7 +335,7 @@ new file mode 100644
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2097,6 +2097,16 @@
@@ -2148,6 +2148,16 @@
<message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
Delete browsing data
</message>
@@ -354,7 +355,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -108,6 +108,7 @@
@@ -109,6 +109,7 @@
#include "components/enterprise/client_certificates/core/features.h"
#include "components/enterprise/data_controls/core/browser/features.h"
#include "components/error_page/common/error_page_switches.h"
@@ -365,7 +366,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
--- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc
+++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
@@ -70,6 +70,15 @@ PrefService* GetPrefService(Profile* profile) {
@@ -67,6 +67,15 @@ PrefService* GetPrefService(Profile* profile) {
return profile->GetOriginalProfile()->GetPrefs();
}
@@ -381,7 +382,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
void OnBrowsingDataModelBuilt(JNIEnv* env,
const ScopedJavaGlobalRef<jobject>& java_callback,
std::unique_ptr<BrowsingDataModel> model) {
@@ -222,7 +231,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting(
@@ -219,7 +228,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting(
static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
JNIEnv* env,
Profile* profile,
@@ -391,7 +392,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
DCHECK_GE(data_type, 0);
DCHECK_LE(data_type,
static_cast<int>(browsing_data::BrowsingDataType::MAX_VALUE));
@@ -234,7 +244,7 @@ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
@@ -231,7 +241,7 @@ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
std::string pref;
if (!browsing_data::GetDeletionPreferenceFromDataType(
static_cast<browsing_data::BrowsingDataType>(data_type),
@@ -400,7 +401,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
return false;
}
@@ -245,6 +255,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
@@ -242,6 +252,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
JNIEnv* env,
Profile* profile,
jint data_type,
@@ -408,7 +409,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
jboolean value) {
DCHECK_GE(data_type, 0);
DCHECK_LE(data_type,
@@ -253,7 +264,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
@@ -250,7 +261,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
std::string pref;
if (!browsing_data::GetDeletionPreferenceFromDataType(
static_cast<browsing_data::BrowsingDataType>(data_type),
@@ -420,7 +421,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
--- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
@@ -324,8 +324,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
@@ -327,8 +327,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
bool keep_browser_alive) {
@@ -448,7 +449,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
if (!data_types.empty() &&
IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
@@ -434,6 +451,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
@@ -437,6 +454,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
bool ChromeBrowsingDataLifetimeManager::
IsConditionSatisfiedForBrowsingDataRemoval(
const syncer::UserSelectableTypeSet sync_types) {
@@ -459,7 +460,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
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
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -351,6 +351,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -352,6 +352,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
uint64_t origin_type_mask,
base::OnceCallback<void(uint64_t)> callback) {
CHECK(((remove_mask &
@@ -467,7 +468,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
~content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS &
~constants::FILTERABLE_DATA_TYPES) == 0) ||
filter_builder->MatchesAllOriginsAndDomains());
@@ -454,6 +455,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -455,6 +456,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
CreateTaskCompletionClosure(TracingDataType::kHistory),
&history_task_tracker_);
}
@@ -477,7 +478,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
if (ClipboardRecentContent::GetInstance())
ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
@@ -562,6 +566,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -563,6 +567,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
// and SSL host state are scoped to hosts and represent them as std::string.
// Rename the method to indicate its more general usage.
if (profile_->GetSSLHostStateDelegate()) {
@@ -489,7 +490,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
profile_->GetSSLHostStateDelegate()->Clear(
filter_builder->MatchesAllOriginsAndDomains()
? base::RepeatingCallback<bool(const std::string&)>()
@@ -590,9 +599,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -591,9 +600,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
}
device_event_log::Clear(delete_begin_, delete_end_);
@@ -503,7 +504,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
delete_begin_, delete_end_);
@@ -1318,6 +1331,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -1320,6 +1333,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
if (should_clear_zero_suggest_and_session_token && template_url_service)
template_url_service->ClearSessionToken();
@@ -515,7 +516,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -560,6 +560,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
@@ -564,6 +564,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
(*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
settings_api::PrefType::kNumber;
@@ -562,19 +563,20 @@ diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/browser/profiles/android/profile_manager_utils.cc
--- a/chrome/browser/profiles/android/profile_manager_utils.cc
+++ b/chrome/browser/profiles/android/profile_manager_utils.cc
@@ -64,3 +64,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
g_browser_process->profile_manager()->GetLoadedProfiles(),
@@ -65,4 +65,9 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
RemoveSessionCookiesForProfile);
}
+
+static void JNI_ProfileManagerUtils_RemoveBrowsingDataAtStart(
+ JNIEnv* env) {
+ g_browser_process->profile_manager()->RemoveBrowsingDataAtStart();
+}
+
DEFINE_JNI(ProfileManagerUtils)
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1448,6 +1448,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
@@ -1516,6 +1516,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
}
}
@@ -594,7 +596,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
void ProfileManager::DoFinalInitForServices(Profile* profile,
bool go_off_the_record) {
if (!do_final_services_init_ ||
@@ -2117,9 +2130,9 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
@@ -2185,9 +2198,9 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
// Do nothing if the closed window is not the last window of the same profile.
bool has_other_window = false;
ForEachCurrentBrowserWindowInterfaceOrderedByActivation(
@@ -609,7 +611,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -215,6 +215,8 @@ class ProfileManager : public Profile::Delegate {
@@ -231,6 +231,8 @@ class ProfileManager : public Profile::Delegate {
// profiles.
std::vector<Profile*> GetLoadedProfiles() const;
@@ -675,7 +677,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
@@ -214,6 +214,7 @@ export class SettingsClearBrowsingDataDialogElement extends
@@ -216,6 +216,7 @@ export class SettingsClearBrowsingDataDialogElement extends
value: () =>
[loadTimeData.getString('basicPageTitle'),
loadTimeData.getString('advancedPageTitle'),
@@ -683,7 +685,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
],
},
@@ -336,6 +337,7 @@ export class SettingsClearBrowsingDataDialogElement extends
@@ -344,6 +345,7 @@ export class SettingsClearBrowsingDataDialogElement extends
}
this.clearButtonDisabled_ =
this.getSelectedDataTypes_(page as HTMLElement).length === 0;
@@ -694,7 +696,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1434,6 +1434,9 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1443,6 +1443,9 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_ANDROID_APP_HISTORY_OPEN_FULL_OTHER_FORMS" desc="The informational message at the top of the history page letting users know that app-specific history may be missing some entries, followed by the info on the other forms of browing history.">
Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
</message>
@@ -721,7 +723,7 @@ new file mode 100644
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -2192,6 +2192,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
@@ -2218,6 +2218,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
{"clearedData", IDS_SETTINGS_CLEARED_DATA},
{"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
{"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -880,6 +882,17 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component
} // namespace browsing_data
diff --git a/components/browsing_data/core/features.h b/components/browsing_data/core/features.h
--- a/components/browsing_data/core/features.h
+++ b/components/browsing_data/core/features.h
@@ -19,6 +19,7 @@ BASE_DECLARE_FEATURE(kBrowsingDataModel);
// updates to history counter logic and removal of the bulk password deletion
// option from the dialog.
BASE_DECLARE_FEATURE(kDbdRevampDesktop);
+SET_CROMITE_FEATURE_DISABLED(kDbdRevampDesktop);
// When enabled, calls to browsingData.removePasswords extension API would
// result in an error response instead of a console warning.
diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc
--- a/components/browsing_data/core/pref_names.cc
+++ b/components/browsing_data/core/pref_names.cc
@@ -956,7 +969,15 @@ diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/co
diff --git a/components/favicon/core/favicon_database.h b/components/favicon/core/favicon_database.h
--- a/components/favicon/core/favicon_database.h
+++ b/components/favicon/core/favicon_database.h
@@ -33,6 +33,8 @@ namespace favicon {
@@ -9,6 +9,7 @@
#include <optional>
#include <vector>
+#include "base/feature_list.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "components/favicon/core/favicon_types.h"
@@ -33,6 +34,8 @@ namespace favicon {
// All earlier updates are ignored.
static const int kFaviconUpdateLastRequestedAfterDays = 10;
@@ -979,7 +1000,7 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear
diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_service_impl.cc
--- a/content/browser/btm/btm_service_impl.cc
+++ b/content/browser/btm/btm_service_impl.cc
@@ -262,7 +262,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
@@ -261,7 +261,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
remover->RemoveWithFilterAndReply(
base::Time::Min(), base::Time::Max(),
@@ -991,7 +1012,15 @@ diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_s
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1551,6 +1551,7 @@ void StoragePartitionImpl::Initialize(
@@ -19,6 +19,7 @@
#include "base/containers/contains.h"
#include "base/dcheck_is_on.h"
#include "base/feature_list.h"
+#include "base/files/file_util.h"
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/functional/concurrent_closures.h"
@@ -1557,6 +1558,7 @@ void StoragePartitionImpl::Initialize(
.AppendASCII("Code Cache");
}
DCHECK_GE(settings.size_in_bytes(), 0);
build/patches/Add-setting-to-enable-Credman-for-passkeys.patch
+44 -24
View File
@@ -11,16 +11,17 @@ Conditional immediate support is disabled.
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../settings/PasswordSettings.java | 27 +++++++++++++++++
.../touch_to_fill_controller.cc | 2 ++
...etting-to-enable-Credman-for-passkeys.grdp | 12 ++++++++
.../webauthn/AuthenticatorImpl.java | 29 +++++++------------
.../components/webauthn/WebauthnFeatures.java | 2 ++
.../cred_man/CredManSupportProvider.java | 27 +++++------------
.../cred_man/CredManSupportProvider.java | 25 ++++------------
.../webauthn/android/webauthn_feature_map.cc | 1 +
components/webauthn/features.cc | 4 +++
components/webauthn/features.h | 3 ++
device/fido/features.cc | 2 ++
.../authentication_credentials_container.cc | 5 ++++
10 files changed, 75 insertions(+), 37 deletions(-)
11 files changed, 75 insertions(+), 37 deletions(-)
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
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
@@ -81,6 +82,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
private void displayManageAccountLink() {
SyncService syncService = SyncServiceFactory.getForProfile(getProfile());
if (syncService == null || !syncService.isEngineInitialized()) {
diff --git a/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc b/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
--- a/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
+++ b/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
@@ -312,6 +312,7 @@ void TouchToFillController::Reset() {
}
visibility_controller_->Reset();
credentials_.clear();
+ cred_man_delegate_ = nullptr;
}
void TouchToFillController::ActionCompleted() {
@@ -319,6 +320,7 @@ void TouchToFillController::ActionCompleted() {
visibility_controller_->SetShown();
}
ttf_delegate_.reset();
+ cred_man_delegate_ = nullptr;
}
DisplayTarget TouchToFillController::GetResponsibleDisplayTarget(
diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
new file mode 100644
--- /dev/null
@@ -174,36 +194,36 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
- .WEBAUTHN_IMMEDIATE_GET)
- && isUvpaa));
+ false));
boolean signal_supported =
boolean signalSupported =
isUvpaa
&& DeviceFeatureMap.isEnabled(
diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
--- a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
+++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
@@ -16,4 +16,6 @@ import org.chromium.build.annotations.NullMarked;
public abstract class WebauthnFeatures {
@@ -17,4 +17,6 @@ public abstract class WebauthnFeatures {
public static final String WEBAUTHN_ANDROID_PASSKEY_CACHE_MIGRATION =
"WebAuthenticationAndroidPasskeyCacheMigration";
public static final String WEBAUTHN_ANDROID_CRED_MAN_FOR_DEV = "WebAuthnAndroidCredManForDev";
+ public static final String WEBAUTHN_ANDROID_PASSKEY =
+ "WebAuthenticationAndroidPasskey";
}
diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
--- a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
+++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
@@ -19,9 +19,11 @@ import org.chromium.base.version_info.VersionInfo;
@@ -19,11 +19,11 @@ import org.chromium.base.version_info.VersionInfo;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.components.webauthn.CredManSupport;
-import org.chromium.components.webauthn.GmsCoreUtils;
import org.chromium.components.webauthn.WebauthnFeatureMap;
import org.chromium.components.webauthn.WebauthnFeatures;
import org.chromium.components.webauthn.WebauthnMode;
import org.chromium.components.webauthn.WebauthnModeProvider;
+import org.chromium.components.webauthn.WebauthnFeatureMap;
+import org.chromium.components.webauthn.WebauthnFeatures;
+import org.chromium.components.webauthn.WebauthnLogger;
@NullMarked
public class CredManSupportProvider {
@@ -57,12 +59,12 @@ public class CredManSupportProvider {
@@ -79,12 +79,12 @@ public class CredManSupportProvider {
}
if (getAndroidVersion() < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
sCredManSupport = CredManSupport.DISABLED;
@@ -219,15 +239,15 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
return sCredManSupport;
}
if (notSkippedBecauseInTests()
@@ -70,14 +72,14 @@ public class CredManSupportProvider {
@@ -92,14 +92,14 @@ public class CredManSupportProvider {
== null) {
sCredManSupport = CredManSupport.DISABLED;
recordCredManAvailability(/*available*/ false);
recordCredManAvailability(/* available= */ false);
- log(TAG, "Disabled because CredentialManager is not available.");
+ WebauthnLogger.logError(TAG, "Disabled because CredentialManager is not available.");
return sCredManSupport;
}
recordCredManAvailability(/*available*/ true);
recordCredManAvailability(/* available= */ true);
final CredManUiRecommender recommender =
ServiceLoaderUtil.maybeCreate(CredManUiRecommender.class);
@@ -236,7 +256,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
boolean gpmInCredMan =
sOverrideForcesGpm != null ? sOverrideForcesGpm : customUiRecommended;
boolean isChrome3pPwmMode =
@@ -116,13 +118,6 @@ public class CredManSupportProvider {
@@ -138,13 +138,6 @@ public class CredManSupportProvider {
"WebAuthentication.Android.CredManAvailability", available);
}
@@ -250,7 +270,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
private static int getAndroidVersion() {
return sOverrideAndroidVersion == null ? Build.VERSION.SDK_INT : sOverrideAndroidVersion;
}
@@ -130,10 +125,4 @@ public class CredManSupportProvider {
@@ -152,10 +145,4 @@ public class CredManSupportProvider {
private static boolean notSkippedBecauseInTests() {
return sOverrideForcesGpm == null && sOverrideAndroidVersion == null;
}
@@ -264,10 +284,10 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
diff --git a/components/webauthn/android/webauthn_feature_map.cc b/components/webauthn/android/webauthn_feature_map.cc
--- a/components/webauthn/android/webauthn_feature_map.cc
+++ b/components/webauthn/android/webauthn_feature_map.cc
@@ -16,6 +16,7 @@ namespace {
// Array of features exposed through the Java WebauthnFeatureMap API.
@@ -17,6 +17,7 @@ namespace {
const base::Feature* const kFeaturesExposedToJava[] = {
&kWebAuthnAndroidPasskeyCacheMigration,
&kWebAuthnAndroidCredManForDev,
+ &kWebAuthnAndroidPasskey,
};
@@ -275,9 +295,9 @@ diff --git a/components/webauthn/android/webauthn_feature_map.cc b/components/we
diff --git a/components/webauthn/features.cc b/components/webauthn/features.cc
--- a/components/webauthn/features.cc
+++ b/components/webauthn/features.cc
@@ -16,6 +16,10 @@ BASE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration,
"WebAuthenticationAndroidPasskeyCacheMigration",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -25,6 +25,10 @@ BASE_FEATURE(kWebAuthnAndroidCredManForDev, base::FEATURE_DISABLED_BY_DEFAULT);
const base::FeatureParam<std::string> kWebAuthnAndroidCredManForDevMode{
&kWebAuthnAndroidCredManForDev, "mode", ""};
+CROMITE_FEATURE(kWebAuthnAndroidPasskey,
+ "WebAuthenticationAndroidPasskey",
@@ -289,9 +309,9 @@ diff --git a/components/webauthn/features.cc b/components/webauthn/features.cc
diff --git a/components/webauthn/features.h b/components/webauthn/features.h
--- a/components/webauthn/features.h
+++ b/components/webauthn/features.h
@@ -20,6 +20,9 @@ namespace webauthn::features {
@@ -27,6 +27,9 @@ BASE_DECLARE_FEATURE(kWebAuthnAndroidCredManForDev);
COMPONENT_EXPORT(WEBAUTHN)
BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration);
extern const base::FeatureParam<std::string> kWebAuthnAndroidCredManForDevMode;
+COMPONENT_EXPORT(WEBAUTHN)
+BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskey);
@@ -302,7 +322,7 @@ diff --git a/components/webauthn/features.h b/components/webauthn/features.h
diff --git a/device/fido/features.cc b/device/fido/features.cc
--- a/device/fido/features.cc
+++ b/device/fido/features.cc
@@ -171,6 +171,7 @@ BASE_FEATURE(kWebAuthnImmediateGet,
@@ -188,6 +188,7 @@ BASE_FEATURE(kWebAuthnImmediateGet,
#else
base::FEATURE_ENABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_ANDROID)
@@ -310,7 +330,7 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc
BASE_FEATURE_PARAM(int,
kWebAuthnImmediateMediationTimeoutMilliseconds,
@@ -183,6 +184,7 @@ BASE_FEATURE_PARAM(int,
@@ -200,6 +201,7 @@ BASE_FEATURE_PARAM(int,
BASE_FEATURE(kWebAuthnImmediateGetAutoselect,
"WebAuthenticationImmediateGetAutoselect",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -321,7 +341,7 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc
diff --git a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
--- a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
+++ b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
@@ -1076,6 +1076,11 @@ DOMException* AuthenticatorStatusToDOMException(
@@ -1090,6 +1090,11 @@ DOMException* AuthenticatorStatusToDOMException(
const WebAuthnDOMExceptionDetailsPtr& dom_exception_details) {
DCHECK_EQ(status != AuthenticatorStatus::ERROR_WITH_DOM_EXCEPTION_DETAILS,
dom_exception_details.is_null());
build/patches/Add-setting-to-invert-tap-and-long-tap.patch
+30 -30
View File
@@ -98,7 +98,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
@@ -134,8 +134,9 @@ class ChromeContextMenuItem {
@@ -135,8 +135,9 @@ class ChromeContextMenuItem {
// Developer Group
int VIEW_PAGE_SOURCE = 41;
int INSPECT_ELEMENT = 42;
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
}
/** Mapping from {@link Item} to the ID found in the ids.xml. */
@@ -183,6 +184,7 @@ class ChromeContextMenuItem {
@@ -184,6 +185,7 @@ class ChromeContextMenuItem {
R.id.contextmenu_print_page, // Item.PRINT_PAGE
R.id.contextmenu_view_page_source, // Item.VIEW_PAGE_SOURCE
R.id.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
@@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
};
/** Mapping from {@link Item} to the ID of the string that describes the action of the item. */
@@ -230,6 +232,7 @@ class ChromeContextMenuItem {
@@ -231,6 +233,7 @@ class ChromeContextMenuItem {
R.string.contextmenu_print_page, // Item.PRINT_PAGE
R.string.contextmenu_view_page_source, // Item.VIEW_PAGE_SOURCE
R.string.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
@@ -459,6 +459,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -474,6 +474,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
}
if (mParams.isAnchor()) {
ModelList linkGroup = new ModelList();
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
if (FirstRunStatus.getFirstRunFlowComplete()
&& !isEmptyUrl(mParams.getUrl())
&& UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
@@ -1068,6 +1071,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -1083,6 +1086,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
getProfile(),
false);
});
@@ -150,7 +150,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
@@ -401,6 +401,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
@@ -414,6 +414,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
mTab.loadUrl(loadUrlParams);
}
@@ -168,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
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
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -444,6 +444,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -446,6 +446,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kTabGroupParityBottomSheetAndroid,
&kTabModelInitFixes,
&kTabStorageSqlitePrototype,
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
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
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -511,6 +511,8 @@ public abstract class ChromeFeatureList {
@@ -517,6 +517,8 @@ public abstract class ChromeFeatureList {
"DisableToolbarSwipeUp";
public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
"MoveTopToolbarToBottom";
@@ -188,7 +188,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON =
"NewTabPageCustomizationToolbarButton";
public static final String NEW_TAB_PAGE_CUSTOMIZATION_V2 = "NewTabPageCustomizationV2";
@@ -1024,6 +1026,8 @@ public abstract class ChromeFeatureList {
@@ -1031,6 +1033,8 @@ public abstract class ChromeFeatureList {
newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
public static final CachedFlag sMoveTopToolbarToBottom =
newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -197,7 +197,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
public static final CachedFlag sPostGetMyMemoryStateToBackground =
newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);
@@ -1292,6 +1296,7 @@ public abstract class ChromeFeatureList {
@@ -1303,6 +1307,7 @@ public abstract class ChromeFeatureList {
sTopControlsRefactor,
sTopControlsRefactorV2,
sTouchToSearchCallout,
@@ -208,7 +208,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
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1563,6 +1563,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1572,6 +1572,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_DISABLE_TOOLBAR_SWIPE_UP" desc="Summary of the preference that allows the user to disable toolbar swipeup.">
Disable toolbar swipe up
</message>
@@ -221,15 +221,15 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<!-- Safety check -->
<message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">
@@ -3222,6 +3228,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -3237,6 +3243,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_CONTEXTMENU_OPEN_IN_NEW_CHROME_TAB" desc="Context sensitive menu item to open the selected link in a new Chrome tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
Open in new Chrome tab
</message>
+ <message name="IDS_CONTEXTMENU_OPEN_IN_TAB" desc="Context sensitive menu item to open the selected link in tab. [CHAR_LIMIT=30]">
+ Open in current tab
+ </message>
<message name="IDS_CONTEXTMENU_OPEN_IN_CHROME_INCOGNITO_TAB" desc="Context sensitive menu item to open the selected link in a Chrome Incognito tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
Open in Incognito tab
<message name="IDS_CONTEXTMENU_OPEN_IN_CHROME_WINDOW" desc="Context sensitive menu item to open the selected link in a Chrome window from Chrome Custom Tab. Used when there is a dedicated window for Incognito tabs. [CHAR_LIMIT=30]">
Open in Chrome window
</message>
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
@@ -249,7 +249,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
@@ -54,6 +54,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
@@ -60,6 +60,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
@@ -259,7 +259,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
private PageZoomPreference mPageZoomDefaultZoomPref;
private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
private ChromeSwitchPreference mPageZoomAlwaysShowPref;
@@ -150,6 +153,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
@@ -157,6 +160,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.getValue());
mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
@@ -272,7 +272,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
Preference captions = findPreference(PREF_CAPTIONS);
captions.setOnPreferenceClickListener(
preference -> {
@@ -244,6 +253,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
@@ -265,6 +274,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
} else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue);
mDelegate.requestRestart(getActivity());
@@ -467,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
#include "third_party/blink/renderer/core/paint/timing/paint_timing.h"
#include "third_party/blink/renderer/core/probe/core_probes.h"
#include "third_party/blink/renderer/core/resize_observer/resize_observer_entry.h"
@@ -796,6 +798,21 @@ void HTMLImageElement::DidFinishLayout() {
@@ -782,6 +784,21 @@ void HTMLImageElement::DidFinishLayout() {
}
}
@@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h
--- a/third_party/blink/renderer/core/html/html_image_element.h
+++ b/third_party/blink/renderer/core/html/html_image_element.h
@@ -216,6 +216,8 @@ class CORE_EXPORT HTMLImageElement
@@ -211,6 +211,8 @@ class CORE_EXPORT HTMLImageElement
void DidAddUserAgentShadowRoot(ShadowRoot&) override;
void AdjustStyle(ComputedStyleBuilder&) override;
@@ -525,7 +525,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
mouse_event->SetDefaultHandled();
}
@@ -434,7 +436,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
@@ -440,7 +442,8 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
const PhysicalOffset& point,
WebMenuSourceType source_type,
@@ -535,7 +535,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
// Displaying the context menu in this function is a big hack as we don't
// have context, i.e. whether this is being invoked via a script or in
// response to user input (Mouse event WM_RBUTTONDOWN,
@@ -457,6 +460,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
@@ -463,6 +466,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
if (!result.InnerNodeOrImageMapImage())
return false;
@@ -552,7 +552,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
// Clear any previously set cached results if we are resetting the hit test
// result.
image_selection_cached_result_ = nullptr;
@@ -838,7 +851,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
@@ -844,7 +857,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
SetAutofillData(result.InnerNode(), data);
@@ -564,7 +564,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/third_party/blink/renderer/core/page/context_menu_controller.h
--- a/third_party/blink/renderer/core/page/context_menu_controller.h
+++ b/third_party/blink/renderer/core/page/context_menu_controller.h
@@ -57,7 +57,7 @@ class CORE_EXPORT ContextMenuController final
@@ -58,7 +58,7 @@ class CORE_EXPORT ContextMenuController
void DocumentDetached(Document*);
@@ -573,13 +573,13 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/th
void ShowContextMenuAtPoint(LocalFrame*,
float x,
float y,
@@ -124,7 +124,8 @@ class CORE_EXPORT ContextMenuController final
bool ShowContextMenu(LocalFrame*,
const PhysicalOffset&,
WebMenuSourceType,
- const MouseEvent* mouse_event = nullptr);
+ const MouseEvent* mouse_event = nullptr,
+ bool do_not_show_context_menu = false);
@@ -127,7 +127,8 @@ class CORE_EXPORT ContextMenuController
virtual bool ShowContextMenu(LocalFrame*,
const PhysicalOffset&,
WebMenuSourceType,
- const MouseEvent* mouse_event);
+ const MouseEvent* mouse_event,
+ bool do_not_show_context_menu = false);
bool ShouldShowContextMenuFromTouch(const ContextMenuData&);
build/patches/Add-site-engagement-flag.patch
+2 -2
View File
@@ -27,8 +27,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -169,6 +169,7 @@
#include "components/sensitive_content/features.h"
#include "components/services/heap_profiling/public/cpp/switches.h"
#include "components/services/on_device_translation/buildflags/buildflags.h"
#include "components/services/storage/public/cpp/buckets/bucket_info.h"
+#include "components/site_engagement/core/features.h"
#include "components/shared_highlighting/core/common/shared_highlighting_features.h"
@@ -131,7 +131,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
#include "components/feature_engagement/public/configuration.h"
#include "components/feature_engagement/public/event_constants.h"
#include "components/feature_engagement/public/feature_constants.h"
@@ -113,6 +114,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
@@ -121,6 +122,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
}
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
build/patches/Add-support-for-ISupportHelpAndFeedback.patch
+3 -3
View File
@@ -12,7 +12,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/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -60,6 +60,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
@@ -68,6 +68,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
@@ -20,10 +20,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
import org.chromium.components.browser_ui.settings.PreferenceUpdateObserver;
@@ -797,8 +798,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
finishCurrentSettings(mainFragment);
@@ -922,8 +923,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
return true;
} else if (item.getItemId() == R.id.menu_id_general_help) {
RecordUserAction.record("Settings.MobileHelpAndFeedback");
- HelpAndFeedbackLauncherImpl.getForProfile(mProfile)
- .show(this, getString(R.string.help_context_settings), null);
+ if (mainFragment instanceof SettingsUtils.ISupportHelpAndFeedback) {
build/patches/Add-support-for-writing-URIs.patch
+1 -1
View File
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
--- a/base/android/content_uri_utils.cc
+++ b/base/android/content_uri_utils.cc
@@ -137,6 +137,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
@@ -137,6 +137,16 @@ static void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
Time::FromMillisecondsSinceUnixEpoch(last_modified));
}
build/patches/Add-webGL-site-setting.patch
+6 -6
View File
@@ -189,7 +189,7 @@ new file mode 100644
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
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -86,6 +86,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
@@ -94,6 +94,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
return settings;
}
@@ -206,7 +206,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
--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -114,6 +114,8 @@ enum ReasonForCallingCanExecuteScripts {
@@ -149,6 +149,8 @@ enum ReasonForCallingCanExecuteScripts {
enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -346,6 +346,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
@@ -341,6 +341,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
}
}
@@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {
base::AutoLock locker(WebGLContextLimitLock());
DCHECK(webgl_context_limits_initialized_);
@@ -616,25 +623,6 @@ static String ExtractWebGLContextCreationError(
@@ -611,25 +618,6 @@ static String ExtractWebGLContextCreationError(
const Platform::WebGLContextInfo& info) {
StringBuilder builder;
builder.Append("Could not create a WebGL context");
@@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
builder);
builder.Append('.');
@@ -695,6 +683,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
@@ -690,6 +678,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
const CanvasContextCreationAttributesCore& attributes,
Platform::WebGLContextType context_type,
Platform::WebGLContextInfo* context_info) {
@@ -274,7 +274,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
@@ -1958,6 +1958,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
@@ -1965,6 +1965,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
DOMArrayBufferView* pixels,
int64_t offset);
build/patches/Add-webRTC-site-settings.patch
+10 -10
View File
@@ -187,7 +187,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
--- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
+++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
@@ -49,6 +49,7 @@
@@ -47,6 +47,7 @@
#include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/task_type.h"
@@ -195,7 +195,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/web/modules/mediastream/media_stream_video_source.h"
#include "third_party/blink/public/web/web_document.h"
@@ -1053,6 +1054,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
@@ -1041,6 +1042,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
// |request_multiple_routes|. Whether local IP addresses could be
// collected depends on if mic/camera permission is granted for this
// origin.
@@ -210,9 +210,9 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
--- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
@@ -16,6 +16,9 @@
#include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
#include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
@@ -12,6 +12,9 @@
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
#include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
+#include "third_party/blink/public/platform/web_content_settings_client.h"
+#include "third_party/blink/public/web/web_local_frame.h"
@@ -220,7 +220,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_rtcp_parameters.h"
@@ -279,6 +282,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
@@ -277,6 +280,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
if (kind != "audio" && kind != "video")
return nullptr;
@@ -238,9 +238,9 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
--- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
@@ -21,6 +21,9 @@
#include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
#include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
@@ -17,6 +17,9 @@
#include "base/strings/to_string.h"
#include "base/task/single_thread_task_runner.h"
#include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
+#include "third_party/blink/public/platform/web_content_settings_client.h"
+#include "third_party/blink/public/web/web_local_frame.h"
@@ -248,7 +248,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
@@ -1031,6 +1034,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
@@ -1019,6 +1022,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
if (kind != "audio" && kind != "video")
return nullptr;
build/patches/Allow-DocumentPiP-if-PopupsAndRedirects-are-active.patch
+1 -1
View File
@@ -34,7 +34,7 @@ diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/pict
#include "third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_event.h"
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
@@ -386,6 +387,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
@@ -388,6 +389,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
return;
}
build/patches/Allow-building-without-enable_reporting.patch
+28 -28
View File
@@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc
--- a/chrome/browser/net/chrome_report_sender.cc
+++ b/chrome/browser/net/chrome_report_sender.cc
@@ -85,6 +85,7 @@ void SendReport(
@@ -88,6 +88,7 @@ void SendReport(
const std::string& report,
base::OnceClosure success_callback,
ErrorCallback error_callback) {
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr
diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
--- a/content/browser/devtools/protocol/network_handler.cc
+++ b/content/browser/devtools/protocol/network_handler.cc
@@ -1511,6 +1511,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
@@ -1517,6 +1517,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
}
}
@@ -51,7 +51,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow
std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
std::vector<GURL> urls;
frame_host->ForEachRenderFrameHostImplWithAction(
@@ -1524,6 +1525,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
@@ -1530,6 +1531,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
});
return urls;
}
@@ -106,9 +106,9 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
#include "base/values.h"
+#include "net/base/features.h"
#include "content/browser/service_worker/service_worker_host.h"
#include "content/browser/shared_storage/shared_storage_worklet_host.h"
#include "content/browser/worker_host/dedicated_worker_host.h"
#include "content/browser/worker_host/shared_worker_host.h"
@@ -240,12 +241,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
@@ -241,12 +242,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
const std::string& group,
const std::string& type,
base::Value::Dict body) {
@@ -126,7 +126,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
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -16439,12 +16439,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
@@ -16347,12 +16347,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
}
}
}
@@ -308,7 +308,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
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -508,14 +508,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -499,14 +499,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
const GURL& url,
const std::optional<base::UnguessableToken>& reporting_source,
const net::NetworkAnonymizationKey& network_anonymization_key,
@@ -340,7 +340,7 @@ diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/pu
diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
--- a/services/network/public/mojom/BUILD.gn
+++ b/services/network/public/mojom/BUILD.gn
@@ -1826,7 +1826,6 @@ mojom("mojom") {
@@ -1833,7 +1833,6 @@ mojom("mojom") {
export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
export_header_blink = "third_party/blink/public/platform/web_common.h"
if (enable_reporting) {
@@ -351,7 +351,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
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1305,6 +1305,7 @@ interface NetworkContext {
@@ -1245,6 +1245,7 @@ interface NetworkContext {
// provided `network_anonymization_key`.
//
// Spec: https://w3c.github.io/reporting/#concept-reports
@@ -359,7 +359,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
QueueReport(string type,
string group,
url.mojom.Url url,
@@ -1312,6 +1313,7 @@ interface NetworkContext {
@@ -1252,6 +1253,7 @@ interface NetworkContext {
NetworkAnonymizationKey network_anonymization_key,
mojo_base.mojom.DictionaryValue body);
@@ -367,7 +367,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
QueueEnterpriseReport(string type,
string group,
url.mojom.Url url,
@@ -1322,6 +1324,7 @@ interface NetworkContext {
@@ -1262,6 +1264,7 @@ interface NetworkContext {
// Note that this queued report will never be delivered if no reporting
// endpoint matching is registered for with the provided
// `network_anonymization_key`.
@@ -413,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
#include "services/network/public/cpp/features.h"
#include "services/network/public/mojom/content_security_policy.mojom-blink.h"
#include "services/network/public/mojom/source_location.mojom-blink.h"
@@ -2854,9 +2855,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
@@ -2871,9 +2872,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
}
@@ -428,15 +428,15 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
--- a/third_party/blink/renderer/core/frame/local_frame.h
+++ b/third_party/blink/renderer/core/frame/local_frame.h
@@ -37,6 +37,7 @@
#include "base/time/time.h"
@@ -38,6 +38,7 @@
#include "base/unguessable_token.h"
#include "build/build_config.h"
+#include "net/net_buildflags.h"
#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "net/net_buildflags.h"
#include "net/storage_access_api/status.h"
@@ -668,7 +669,9 @@ class CORE_EXPORT LocalFrame final
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
@@ -670,7 +671,9 @@ class CORE_EXPORT LocalFrame final
return client_hints_preferences_;
}
@@ -457,17 +457,17 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
#include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/task_type.h"
@@ -59,7 +60,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
@@ -55,7 +56,9 @@ bool ShouldReportBeVisibleToObservers(Report* report) {
ReportingContext::ReportingContext(ExecutionContext& context)
: Supplement<ExecutionContext>(context),
execution_context_(context),
: execution_context_(context),
+#if BUILDFLAG(ENABLE_REPORTING)
reporting_service_(&context),
+#endif
receivers_(this, &context) {}
// static
@@ -126,7 +129,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
@@ -121,7 +124,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
visitor->Trace(observers_);
visitor->Trace(report_buffer_);
visitor->Trace(execution_context_);
@@ -475,9 +475,9 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
visitor->Trace(reporting_service_);
+#endif
visitor->Trace(receivers_);
Supplement<ExecutionContext>::Trace(visitor);
}
@@ -149,6 +154,7 @@ void ReportingContext::CountReport(Report* report) {
@@ -143,6 +148,7 @@ void ReportingContext::CountReport(Report* report) {
UseCounter::Count(execution_context_, feature);
}
@@ -485,7 +485,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
ReportingContext::GetReportingService() const {
if (!reporting_service_.is_bound()) {
@@ -158,6 +164,7 @@ ReportingContext::GetReportingService() const {
@@ -152,6 +158,7 @@ ReportingContext::GetReportingService() const {
}
return reporting_service_;
}
@@ -493,7 +493,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
void ReportingContext::NotifyInternal(Report* report) {
if (!ShouldReportBeVisibleToObservers(report)) {
@@ -184,6 +191,7 @@ void ReportingContext::NotifyInternal(Report* report) {
@@ -178,6 +185,7 @@ void ReportingContext::NotifyInternal(Report* report) {
void ReportingContext::SendToReportingAPI(Report* report,
const String& endpoint) const {
@@ -501,7 +501,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
const String& type = report->type();
if (!(type == ReportType::kCSPViolation || type == ReportType::kCSPHash ||
type == ReportType::kDeprecation ||
@@ -268,6 +276,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
@@ -262,6 +270,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
url, endpoint, body->featureId(), body->disposition(), body->message(),
body->sourceFile(), line_number, column_number);
}
@@ -520,7 +520,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
#include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
#include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
#include "third_party/blink/renderer/core/core_export.h"
@@ -56,10 +57,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
@@ -52,10 +53,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
private:
// Counts the use of a report type via UseCounter.
void CountReport(Report*);
@@ -533,7 +533,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
void NotifyInternal(Report* report);
// Send |report| via the Reporting API to |endpoint|.
void SendToReportingAPI(Report* report, const String& endpoint) const;
@@ -71,8 +72,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
@@ -67,8 +68,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
// This is declared mutable so that the service endpoint can be cached by
// const methods.
build/patches/Allow-building-without-supervised-users.patch
+7 -7
View File
@@ -24,7 +24,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
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -828,7 +828,6 @@ if (_is_default_toolchain) {
@@ -815,7 +815,6 @@ if (_is_default_toolchain) {
"//components/offline_pages/core:offline_page_model_enums_java",
"//components/sharing_message:sharing_dialog_type_generated_enum",
"//components/sharing_message:sharing_send_message_result_generated_enum",
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -327,7 +327,7 @@ void PrepareFactory(
@@ -332,7 +332,7 @@ void PrepareFactory(
policy::BrowserPolicyConnector* policy_connector) {
factory->SetManagedPolicies(policy_service, policy_connector);
factory->SetRecommendedPolicies(policy_service, policy_connector);
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -680,10 +680,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
@@ -679,10 +679,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
pref_change_registrar_.Init(prefs);
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
// Changes in the profile avatar.
pref_change_registrar_.Add(
@@ -1627,6 +1623,7 @@ GURL ProfileImpl::GetHomePage() {
@@ -1603,6 +1599,7 @@ GURL ProfileImpl::GetHomePage() {
}
void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -111,7 +111,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1194,10 +1194,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
@@ -1262,10 +1262,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
}
@@ -122,7 +122,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
}
void ProfileManager::RegisterTestingProfile(std::unique_ptr<Profile> profile,
@@ -1976,9 +1972,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
@@ -2044,9 +2040,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
init_params.icon_index =
profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
@@ -208,7 +208,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
diff --git a/components/supervised_user/core/browser/supervised_user_service.cc b/components/supervised_user/core/browser/supervised_user_service.cc
--- a/components/supervised_user/core/browser/supervised_user_service.cc
+++ b/components/supervised_user/core/browser/supervised_user_service.cc
@@ -248,6 +248,7 @@ SupervisedUserService::SupervisedUserService(
@@ -244,6 +244,7 @@ SupervisedUserService::SupervisedUserService(
}
void SupervisedUserService::SetSettingsServiceActive(bool active) {
build/patches/Allow-playing-audio-in-background.patch
+2 -2
View File
@@ -23,7 +23,7 @@ diff --git a/content/public/renderer/render_frame_media_playback_options.cc b/co
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
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
@@ -1311,6 +1311,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
@@ -1287,6 +1287,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
return pipeline_metadata_.has_audio;
}
@@ -36,7 +36,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
void WebMediaPlayerImpl::EnabledAudioTracksChanged(
std::optional<WebMediaPlayer::TrackId> enabled_track_id) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -3678,7 +3684,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
@@ -3654,7 +3660,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
const bool preserve_audio = HasUnmutedAudio() || audio_source_provider_->IsAudioBeingCaptured();
// Audio only stream is allowed to play when in background.
build/patches/Always-open-browser-controls-in-new-tab.patch
+3 -3
View File
@@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
import org.chromium.chrome.browser.DefaultBrowserInfo;
import org.chromium.chrome.browser.IntentHandler;
import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpenerImpl;
@@ -43,6 +44,7 @@ import org.chromium.chrome.browser.preferences.Pref;
@@ -45,6 +46,7 @@ import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
import org.chromium.chrome.browser.printing.TabPrinter;
import org.chromium.chrome.browser.profiles.Profile;
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -335,6 +337,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
@@ -348,6 +350,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
@Nullable Referrer referrer,
boolean navigateToTab,
@Nullable AdditionalNavigationParams additionalNavigationParams) {
@@ -34,7 +34,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
RecordUserAction.record("MobileNewTabOpened");
RecordUserAction.record("LinkOpenedInNewTab");
LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
@@ -355,6 +358,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
@@ -368,6 +371,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
* @param url The URL to open.
*/
public void onOpenInNewTabInGroup(GURL url, @Nullable Referrer referrer) {
build/patches/Android-Pixel-Perfect-Mode.patch
+106 -130
View File
@@ -35,7 +35,6 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../browser/flags/cromite/sPixelPerfect.java | 33 +++++++++++++
.../settings/ChromeBaseSettingsFragment.java | 4 ++
.../Pixel-perfect-mode.grdp | 9 ++++
.../common/interventions_features.cc | 1 +
components/input/BUILD.gn | 2 +
components/input/android_input_helper.cc | 2 +-
components/input/child_frame_input_helper.cc | 2 +-
@@ -78,7 +77,6 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../widget/visual_properties_mojom_traits.h | 11 +++++
.../mojom/widget/visual_properties.mojom | 4 ++
third_party/blink/public/web/web_view.h | 1 +
.../canvas_interventions_helper.cc | 1 +
.../blink/renderer/core/css/media_values.cc | 4 +-
.../renderer/core/exported/web_view_impl.cc | 41 ++++++++++++----
.../renderer/core/exported/web_view_impl.h | 5 ++
@@ -109,7 +107,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
ui/display/mojom/screen_info_mojom_traits.h | 4 ++
ui/display/screen_info.h | 1 +
ui/events/blink/blink_event_util.cc | 2 +-
99 files changed, 533 insertions(+), 139 deletions(-)
97 files changed, 531 insertions(+), 139 deletions(-)
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sPixelPerfect.java
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Pixel-perfect-mode.grdp
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Pixel-perfect-mode.inc
@@ -119,7 +117,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc
--- a/android_webview/browser/aw_contents.cc
+++ b/android_webview/browser/aw_contents.cc
@@ -1039,7 +1039,7 @@ void AwContents::OnSizeChanged(JNIEnv* env, int w, int h, int ow, int oh) {
@@ -955,7 +955,7 @@ void AwContents::OnSizeChanged(JNIEnv* env, int w, int h, int ow, int oh) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
gfx::Size size(w, h);
web_contents_->GetNativeView()->OnPhysicalBackingSizeChanged(size);
@@ -131,7 +129,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw
diff --git a/cc/input/input_handler.cc b/cc/input/input_handler.cc
--- a/cc/input/input_handler.cc
+++ b/cc/input/input_handler.cc
@@ -695,7 +695,7 @@ InputHandlerPointerResult InputHandler::MouseMoveAt(
@@ -720,7 +720,7 @@ InputHandlerPointerResult InputHandler::MouseMoveAt(
return result;
}
@@ -176,7 +174,7 @@ diff --git a/cc/layers/viewport.cc b/cc/layers/viewport.cc
diff --git a/cc/mojo_embedder/viz_layer_context.cc b/cc/mojo_embedder/viz_layer_context.cc
--- a/cc/mojo_embedder/viz_layer_context.cc
+++ b/cc/mojo_embedder/viz_layer_context.cc
@@ -1301,7 +1301,7 @@ void VizLayerContext::SetVisible(bool visible) {
@@ -1311,7 +1311,7 @@ void VizLayerContext::SetVisible(bool visible) {
service_->SetVisible(visible);
}
@@ -210,7 +208,7 @@ diff --git a/cc/trees/commit_state.h b/cc/trees/commit_state.h
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -1389,7 +1389,7 @@ void LayerTreeHost::SetEventListenerProperties(
@@ -1391,7 +1391,7 @@ void LayerTreeHost::SetEventListenerProperties(
SetNeedsCommit();
}
@@ -219,7 +217,7 @@ diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
const gfx::Rect& device_viewport_rect,
float device_scale_factor,
const viz::LocalSurfaceId& local_surface_id_from_parent) {
@@ -1509,9 +1509,11 @@ void LayerTreeHost::SetOverscrollBehavior(const OverscrollBehavior& behavior) {
@@ -1511,9 +1511,11 @@ void LayerTreeHost::SetOverscrollBehavior(const OverscrollBehavior& behavior) {
void LayerTreeHost::SetPageScaleFactorAndLimits(float page_scale_factor,
float min_page_scale_factor,
@@ -231,7 +229,7 @@ diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
pending_commit_state()->max_page_scale_factor == max_page_scale_factor)
return;
DCHECK_GE(page_scale_factor, min_page_scale_factor);
@@ -1527,6 +1529,7 @@ void LayerTreeHost::SetPageScaleFactorAndLimits(float page_scale_factor,
@@ -1529,6 +1531,7 @@ void LayerTreeHost::SetPageScaleFactorAndLimits(float page_scale_factor,
pending_commit_state()->page_scale_factor = page_scale_factor;
pending_commit_state()->min_page_scale_factor = min_page_scale_factor;
@@ -263,7 +261,7 @@ diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2585,7 +2585,7 @@ viz::RegionCaptureBounds LayerTreeHostImpl::CollectRegionCaptureBounds() {
@@ -2587,7 +2587,7 @@ viz::RegionCaptureBounds LayerTreeHostImpl::CollectRegionCaptureBounds() {
return bounds;
}
@@ -272,7 +270,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
viz::CompositorFrameMetadata metadata;
if (settings().trees_in_viz_in_viz_process) {
// In TreesInViz mode, this function is called in client process already,
@@ -2752,7 +2752,7 @@ viz::CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() {
@@ -2754,7 +2754,7 @@ viz::CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() {
return metadata;
}
@@ -284,7 +282,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -162,6 +162,7 @@ LayerTreeImpl::LayerTreeImpl(
@@ -163,6 +163,7 @@ LayerTreeImpl::LayerTreeImpl(
background_color_(SkColors::kTransparent),
page_scale_factor_(page_scale_factor),
min_page_scale_factor_(0),
@@ -292,7 +290,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
max_page_scale_factor_(0),
external_page_scale_factor_(1.f),
device_scale_factor_(1.f),
@@ -449,7 +450,7 @@ void LayerTreeImpl::InvalidateRasterInducingScrolls(
@@ -450,7 +451,7 @@ void LayerTreeImpl::InvalidateRasterInducingScrolls(
}
}
@@ -301,7 +299,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
if (!InnerViewportScrollNode())
return;
@@ -519,8 +520,13 @@ void LayerTreeImpl::UpdateViewportContainerSizes() {
@@ -520,8 +521,13 @@ void LayerTreeImpl::UpdateViewportContainerSizes() {
// Adjust the outer viewport container as well, since adjusting only the
// inner may cause its bounds to exceed those of the outer, causing scroll
// clamping.
@@ -317,7 +315,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
property_trees->SetOuterViewportContainerBoundsDelta(scaled_bounds_delta);
// outer_viewport_container_bounds_delta and
@@ -818,6 +824,7 @@ void LayerTreeImpl::PullLayerTreePropertiesFrom(CommitState& commit_state) {
@@ -843,6 +849,7 @@ void LayerTreeImpl::PullLayerTreePropertiesFrom(CommitState& commit_state) {
PushPageScaleFromMainThread(commit_state.page_scale_factor,
commit_state.min_page_scale_factor,
@@ -325,7 +323,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
commit_state.max_page_scale_factor);
SetBrowserControlsParams(commit_state.browser_controls_params);
@@ -927,6 +934,7 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
@@ -967,6 +974,7 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
// Active tree already shares the page_scale_factor object with pending
// tree so only the limits need to be provided.
target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(),
@@ -333,7 +331,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
max_page_scale_factor());
target_tree->SetExternalPageScaleFactor(external_page_scale_factor_);
@@ -1343,19 +1351,21 @@ void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) {
@@ -1402,19 +1410,21 @@ void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) {
void LayerTreeImpl::PushPageScaleFromMainThread(float page_scale_factor,
float min_page_scale_factor,
@@ -357,7 +355,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
if (changed_page_scale) {
DidUpdatePageScale();
@@ -1364,12 +1374,13 @@ void LayerTreeImpl::SetPageScaleFactorAndLimitsForDisplayTree(
@@ -1423,12 +1433,13 @@ void LayerTreeImpl::SetPageScaleFactorAndLimitsForDisplayTree(
void LayerTreeImpl::PushPageScaleFactorAndLimits(const float* page_scale_factor,
float min_page_scale_factor,
@@ -372,7 +370,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
if (page_scale_factor) {
DCHECK(!IsActiveTree() || !host_impl_->pending_tree());
@@ -1486,12 +1497,15 @@ void LayerTreeImpl::PushBrowserControls(
@@ -1545,12 +1556,15 @@ void LayerTreeImpl::PushBrowserControls(
}
bool LayerTreeImpl::SetPageScaleFactorLimits(float min_page_scale_factor,
@@ -388,7 +386,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
max_page_scale_factor_ = max_page_scale_factor;
return true;
@@ -2392,7 +2406,7 @@ ScrollbarSet LayerTreeImpl::ScrollbarsFor(ElementId scroll_element_id) const {
@@ -2451,7 +2465,7 @@ ScrollbarSet LayerTreeImpl::ScrollbarsFor(ElementId scroll_element_id) const {
return scrollbars;
}
@@ -397,7 +395,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
const gfx::PointF& screen_space_point,
const gfx::Transform& local_space_to_screen_space_transform,
const gfx::Rect& local_space_rect,
@@ -3003,7 +3017,7 @@ static gfx::SelectionBound ComputeViewportSelectionBound(
@@ -3062,7 +3076,7 @@ static gfx::SelectionBound ComputeViewportSelectionBound(
return viewport_bound;
}
@@ -409,7 +407,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -383,6 +383,7 @@ class CC_EXPORT LayerTreeImpl {
@@ -385,6 +385,7 @@ class CC_EXPORT LayerTreeImpl {
void SetPageScaleOnActiveTree(float active_page_scale);
void PushPageScaleFromMainThread(float page_scale_factor,
float min_page_scale_factor,
@@ -417,7 +415,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
float max_page_scale_factor);
const LayerSelection& selection() const { return selection_; }
float current_page_scale_factor() const {
@@ -390,7 +391,7 @@ class CC_EXPORT LayerTreeImpl {
@@ -392,7 +393,7 @@ class CC_EXPORT LayerTreeImpl {
}
float min_page_scale_factor() const { return min_page_scale_factor_; }
float max_page_scale_factor() const { return max_page_scale_factor_; }
@@ -426,7 +424,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
float page_scale_delta() const { return page_scale_factor()->Delta(); }
SyncedScale* page_scale_factor();
@@ -845,6 +846,7 @@ class CC_EXPORT LayerTreeImpl {
@@ -847,6 +848,7 @@ class CC_EXPORT LayerTreeImpl {
void SetPageScaleFactorAndLimitsForDisplayTree(float page_scale_factor,
float min_page_scale_factor,
@@ -434,7 +432,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
float max_page_scale_factor);
LayerTreeHostImpl* host_impl() { return host_impl_; }
@@ -869,8 +871,10 @@ class CC_EXPORT LayerTreeImpl {
@@ -871,8 +873,10 @@ class CC_EXPORT LayerTreeImpl {
float ClampPageScaleFactorToLimits(float page_scale_factor) const;
void PushPageScaleFactorAndLimits(const float* page_scale_factor,
float min_page_scale_factor,
@@ -445,7 +443,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
float max_page_scale_factor);
void DidUpdatePageScale();
void PushBrowserControls(const float* top_controls_shown_ratio,
@@ -909,6 +913,7 @@ class CC_EXPORT LayerTreeImpl {
@@ -911,6 +915,7 @@ class CC_EXPORT LayerTreeImpl {
scoped_refptr<SyncedScale> page_scale_factor_;
float min_page_scale_factor_;
@@ -456,7 +454,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
--- a/cc/trees/property_tree.cc
+++ b/cc/trees/property_tree.cc
@@ -1602,7 +1602,7 @@ void ScrollTree::clear() {
@@ -1690,7 +1690,7 @@ void ScrollTree::clear() {
#endif
}
@@ -465,7 +463,7 @@ diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
const ScrollNode* scroll_node = Node(scroll_node_id);
gfx::SizeF scroll_bounds = this->scroll_bounds(scroll_node_id);
@@ -2121,7 +2121,7 @@ gfx::Vector2dF ScrollTree::ScrollBy(const ScrollNode& scroll_node,
@@ -2239,7 +2239,7 @@ gfx::Vector2dF ScrollTree::ScrollBy(const ScrollNode& scroll_node,
return old_offset + scroll - new_offset;
}
@@ -501,7 +499,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -41,6 +41,9 @@ import androidx.annotation.NonNull;
@@ -44,6 +44,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
@@ -511,7 +509,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.base.ActivityState;
import org.chromium.base.ApplicationStatus;
import org.chromium.base.Callback;
@@ -540,7 +543,25 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -552,7 +555,25 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
// Ensure that mConfig is initialized before tablet mode changes.
mConfig = getResources().getConfiguration();
@@ -562,7 +560,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
@@ -618,7 +618,7 @@ public class OverlayPanelContent {
@@ -619,7 +619,7 @@ public class OverlayPanelContent {
OverlayPanelContentJni.get()
.onPhysicalBackingSizeChanged(
mNativeOverlayPanelContentPtr, webContents, mContentViewWidth, viewHeight);
@@ -574,7 +572,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bott
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
@@ -2370,7 +2370,7 @@ class TabImpl implements Tab {
@@ -2394,7 +2394,7 @@ class TabImpl implements Tab {
Supplier<CompositorViewHolder> compositorViewHolderSupplier =
assumeNonNull(getActivity()).getCompositorViewHolderSupplier();
View compositorView = compositorViewHolderSupplier.get();
@@ -717,21 +715,10 @@ new file mode 100644
+ Eliminate conversions between dpi and pixels in Blink
+ </message>
+</grit-part>
diff --git a/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc b/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc
--- a/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc
+++ b/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc
@@ -27,6 +27,7 @@ BASE_FEATURE_PARAM(bool,
&kBlockCanvasReadback,
"enable_in_regular_mode",
false);
+SET_CROMITE_FEATURE_DISABLED(kCanvasNoise);
bool IsCanvasInterventionsEnabledForIncognitoState(bool is_incognito) {
if (is_incognito) {
diff --git a/components/input/BUILD.gn b/components/input/BUILD.gn
--- a/components/input/BUILD.gn
+++ b/components/input/BUILD.gn
@@ -97,6 +97,8 @@ component("input") {
@@ -98,6 +98,8 @@ component("input") {
"//ui/events:gesture_detection",
"//ui/events/blink",
"//ui/events/gestures/blink",
@@ -767,7 +754,7 @@ diff --git a/components/input/child_frame_input_helper.cc b/components/input/chi
diff --git a/components/input/input_router_impl.cc b/components/input/input_router_impl.cc
--- a/components/input/input_router_impl.cc
+++ b/components/input/input_router_impl.cc
@@ -618,7 +618,7 @@ bool InputRouterImpl::IsAutoscrollInProgress() {
@@ -619,7 +619,7 @@ bool InputRouterImpl::IsAutoscrollInProgress() {
return client_->IsAutoscrollInProgress();
}
@@ -849,7 +836,7 @@ diff --git a/components/input/render_widget_targeter.cc b/components/input/rende
diff --git a/components/thin_webview/internal/thin_webview.cc b/components/thin_webview/internal/thin_webview.cc
--- a/components/thin_webview/internal/thin_webview.cc
+++ b/components/thin_webview/internal/thin_webview.cc
@@ -105,7 +105,7 @@ void ThinWebView::ResizeWebContents(const gfx::Size& size) {
@@ -106,7 +106,7 @@ void ThinWebView::ResizeWebContents(const gfx::Size& size) {
return;
web_contents_->GetNativeView()->OnPhysicalBackingSizeChanged(size);
@@ -897,7 +884,7 @@ diff --git a/components/viz/service/input/render_input_router_support_child_fram
diff --git a/components/viz/service/layers/layer_context_impl.cc b/components/viz/service/layers/layer_context_impl.cc
--- a/components/viz/service/layers/layer_context_impl.cc
+++ b/components/viz/service/layers/layer_context_impl.cc
@@ -1841,7 +1841,7 @@ base::expected<void, std::string> LayerContextImpl::DoUpdateDisplayTree(
@@ -1883,7 +1883,7 @@ base::expected<void, std::string> LayerContextImpl::DoUpdateDisplayTree(
return base::unexpected("Invalid page scale factors");
}
layers.SetPageScaleFactorAndLimitsForDisplayTree(
@@ -998,7 +985,7 @@ diff --git a/content/browser/renderer_host/input/touch_selection_controller_clie
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
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -9396,7 +9396,7 @@ void RenderFrameHostImpl::ShowPopupMenu(
@@ -9315,7 +9315,7 @@ void RenderFrameHostImpl::ShowPopupMenu(
#endif
}
@@ -1010,7 +997,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1049,7 +1049,20 @@ blink::VisualProperties RenderWidgetHostImpl::GetVisualProperties() {
@@ -1055,7 +1055,20 @@ blink::VisualProperties RenderWidgetHostImpl::GetVisualProperties() {
blink::VisualProperties visual_properties;
visual_properties.screen_infos = GetScreenInfos();
auto& current_screen_info = visual_properties.screen_infos.mutable_current();
@@ -1032,7 +1019,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/
// For testing, override the raster color profile.
// Note: this needs to be done here and not earlier in the pipeline because
// Mac uses the display color space to update an NSSurface and this setting
@@ -1154,6 +1167,13 @@ blink::VisualProperties RenderWidgetHostImpl::GetVisualProperties() {
@@ -1160,6 +1173,13 @@ blink::VisualProperties RenderWidgetHostImpl::GetVisualProperties() {
visual_properties.compositing_scale_factor =
properties_from_parent_local_root_.compositing_scale_factor;
@@ -1046,7 +1033,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/
#if BUILDFLAG(IS_MAC)
// Only macOS cursor scaling affects CSS custom cursor images for now.
visual_properties.cursor_accessibility_scale_factor =
@@ -1334,8 +1354,10 @@ bool RenderWidgetHostImpl::SynchronizeVisualProperties(
@@ -1340,8 +1360,10 @@ bool RenderWidgetHostImpl::SynchronizeVisualProperties(
}
}
@@ -1059,7 +1046,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/
// If we do not have a valid viz::LocalSurfaceId then we are a child frame
// waiting on the id to be propagated from our parent. We cannot create a hash
@@ -3990,7 +4012,7 @@ void RenderWidgetHostImpl::IntrinsicSizingInfoChanged(
@@ -4010,7 +4032,7 @@ void RenderWidgetHostImpl::IntrinsicSizingInfoChanged(
// porting drag-and-drop calls to Mojo, so that RenderWidgetHostImpl bypasses
// RenderWidget to talk the the WebFrameWidget and needs to perform the scale
// operation itself.
@@ -1071,7 +1058,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -89,6 +89,7 @@
@@ -90,6 +90,7 @@
#include "content/public/common/content_client.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
@@ -1079,7 +1066,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/
#include "third_party/blink/public/mojom/input/input_handler.mojom.h"
#include "third_party/perfetto/include/perfetto/tracing/track.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -989,7 +990,7 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
@@ -990,7 +991,7 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
? SK_ColorTRANSPARENT
: metadata.root_background_color.toSkColor());
@@ -1088,7 +1075,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/
overscroll_controller_->OnFrameMetadataUpdated(
metadata.page_scale_factor, metadata.device_scale_factor,
metadata.scrollable_viewport_size, metadata.root_layer_size,
@@ -1292,6 +1293,12 @@ gfx::Size RenderWidgetHostViewAndroid::GetRequestedRendererSizeDevicePx() {
@@ -1293,6 +1294,12 @@ gfx::Size RenderWidgetHostViewAndroid::GetRequestedRendererSizeDevicePx() {
default_bounds_dip_.height() * scale_factor);
}
@@ -1101,7 +1088,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/
const float scale_factor = GetDeviceScaleFactor() / view_.GetDipScale();
return gfx::ScaleToCeiledSize(view_.GetSizeDevicePx(), scale_factor);
}
@@ -1317,6 +1324,10 @@ void RenderWidgetHostViewAndroid::SetInsets(const gfx::Insets& insets) {
@@ -1318,6 +1325,10 @@ void RenderWidgetHostViewAndroid::SetInsets(const gfx::Insets& insets) {
NOTREACHED();
}
@@ -1112,7 +1099,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/
gfx::Size RenderWidgetHostViewAndroid::GetCompositorViewportPixelSize() {
if (!view_.parent()) {
if (default_bounds_dip_.IsEmpty()) {
@@ -1452,7 +1463,7 @@ viz::SurfaceId RenderWidgetHostViewAndroid::GetCurrentSurfaceId() const {
@@ -1462,7 +1473,7 @@ viz::SurfaceId RenderWidgetHostViewAndroid::GetCurrentSurfaceId() const {
: viz::SurfaceId();
}
@@ -1121,7 +1108,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/
const gfx::PointF& point,
RenderWidgetHostViewInput* target_view,
gfx::PointF* transformed_point) {
@@ -1868,7 +1879,7 @@ bool RenderWidgetHostViewAndroid::HasFallbackSurface() const {
@@ -1879,7 +1890,7 @@ bool RenderWidgetHostViewAndroid::HasFallbackSurface() const {
return delegated_frame_host_->HasFallbackSurface();
}
@@ -1144,7 +1131,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/c
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -113,6 +113,10 @@ gfx::Size RenderWidgetHostViewBase::GetCompositorViewportPixelSize() {
@@ -116,6 +116,10 @@ gfx::Size RenderWidgetHostViewBase::GetCompositorViewportPixelSize() {
GetDeviceScaleFactor());
}
@@ -1155,7 +1142,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/con
void RenderWidgetHostViewBase::SelectionBoundsChanged(
const gfx::Rect& anchor_rect,
base::i18n::TextDirection anchor_dir,
@@ -605,7 +609,7 @@ display::ScreenInfos RenderWidgetHostViewBase::GetScreenInfos() const {
@@ -614,7 +618,7 @@ display::ScreenInfos RenderWidgetHostViewBase::GetScreenInfos() const {
void RenderWidgetHostViewBase::ResetGestureDetection() {}
@@ -1167,7 +1154,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/con
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
--- a/content/browser/renderer_host/render_widget_host_view_base.h
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -286,6 +286,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -294,6 +294,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// The size of the view's backing surface in non-DPI-adjusted pixels.
virtual gfx::Size GetCompositorViewportPixelSize();
@@ -1249,7 +1236,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
@@ -533,7 +533,8 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
@@ -526,7 +526,8 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
boolean shouldSuggest,
int sourceType,
RenderFrameHost renderFrameHost,
@@ -1259,7 +1246,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
mMenuModelBridge = menuModelBridge;
RecordHistogram.recordEnumeratedHistogram(
"Android.ShowSelectionMenuSourceType", sourceType, MenuSourceType.MAX_VALUE);
@@ -543,6 +544,8 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
@@ -536,6 +537,8 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
mXDip = xDip;
mYDip = yDip;
mSelectionRect.set(left, top, right, offsetBottom);
@@ -1283,7 +1270,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
}
@Override
@@ -1469,7 +1469,7 @@ public class WebContentsImpl
@@ -1475,7 +1475,7 @@ public class WebContentsImpl
Rect getFullscreenVideoSize(long nativeWebContentsAndroid);
@@ -1317,7 +1304,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
+
// All features in alphabetical order.
// Kill switch to guard additional security checks performed by the browser
// Marks navigations as aborted when the NavigationHandle is destroyed mid
diff --git a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
--- a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
+++ b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
@@ -1451,7 +1438,7 @@ diff --git a/third_party/blink/public/mojom/widget/visual_properties.mojom b/thi
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
--- a/third_party/blink/public/web/web_view.h
+++ b/third_party/blink/public/web/web_view.h
@@ -249,6 +249,7 @@ class BLINK_EXPORT WebView {
@@ -238,6 +238,7 @@ class BLINK_EXPORT WebView {
// Minimum and Maximum as computed as a combination of default, page defined,
// UA, etc. constraints.
virtual float MinimumPageScaleFactor() const = 0;
@@ -1459,17 +1446,6 @@ diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/
virtual float MaximumPageScaleFactor() const = 0;
// Sets the offset of the visual viewport within the main frame, in
diff --git a/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc b/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc
--- a/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc
+++ b/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc
@@ -69,6 +69,7 @@ std::string_view GetContextTypeForMetrics(ExecutionContext* execution_context) {
// 2) the CanvasInterventions RuntimeEnabledFeature is enabled
bool ShouldApplyNoise(HighEntropyCanvasOpType canvas_operations,
ExecutionContext* execution_context) {
+ if (RuntimeEnabledFeatures::PixelPerfectEnabled()) return false;
CanvasNoiseReason noise_reason = CanvasNoiseReason::kAllConditionsMet;
if (canvas_operations == HighEntropyCanvasOpType::kNone) {
noise_reason |= CanvasNoiseReason::kNoTrigger;
diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/blink/renderer/core/css/media_values.cc
--- a/third_party/blink/renderer/core/css/media_values.cc
+++ b/third_party/blink/renderer/core/css/media_values.cc
@@ -1494,7 +1470,7 @@ diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/b
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -1265,8 +1265,19 @@ void WebViewImpl::UpdateICBAndResizeViewport(
@@ -1255,8 +1255,19 @@ void WebViewImpl::UpdateICBAndResizeViewport(
if (GetBrowserControls().PermittedState() ==
cc::BrowserControlsState::kBoth &&
!GetBrowserControls().ShrinkViewport()) {
@@ -1516,7 +1492,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
}
GetPageScaleConstraintsSet().DidChangeInitialContainingBlockSize(icb_size);
@@ -1346,7 +1357,8 @@ void WebViewImpl::DidUpdateBrowserControls() {
@@ -1336,7 +1347,8 @@ void WebViewImpl::DidUpdateBrowserControls() {
ResizeViewportAnchor::ResizeScope resize_scope(*resize_viewport_anchor_);
visual_viewport.SetBrowserControlsAdjustment(
@@ -1526,7 +1502,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
}
}
@@ -1420,7 +1432,7 @@ void WebViewImpl::ResizeWithBrowserControls(
@@ -1410,7 +1422,7 @@ void WebViewImpl::ResizeWithBrowserControls(
float bottom_controls_height,
bool browser_controls_shrink_layout) {
ResizeWithBrowserControls(
@@ -1535,7 +1511,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
{top_controls_height, GetBrowserControls().TopMinHeight(),
bottom_controls_height, GetBrowserControls().BottomMinHeight(),
GetBrowserControls().AnimateHeightChanges(),
@@ -1430,6 +1442,8 @@ void WebViewImpl::ResizeWithBrowserControls(
@@ -1420,6 +1432,8 @@ void WebViewImpl::ResizeWithBrowserControls(
void WebViewImpl::ResizeWithBrowserControls(
const gfx::Size& main_frame_widget_size,
const gfx::Size& visible_viewport_size,
@@ -1544,7 +1520,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
cc::BrowserControlsParams browser_controls_params) {
if (should_auto_resize_) {
// When auto-resizing only the viewport size comes from the browser, while
@@ -1438,6 +1452,11 @@ void WebViewImpl::ResizeWithBrowserControls(
@@ -1428,6 +1442,11 @@ void WebViewImpl::ResizeWithBrowserControls(
return;
}
@@ -1556,7 +1532,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
if (size_ == main_frame_widget_size &&
GetPage()->GetVisualViewport().Size() == visible_viewport_size &&
GetBrowserControls().Params() == browser_controls_params)
@@ -2118,7 +2137,7 @@ void WebViewImpl::DidAttachLocalMainFrame() {
@@ -2112,7 +2131,7 @@ void WebViewImpl::DidAttachLocalMainFrame() {
web_preferences_.prefers_reduced_motion);
MainFrameImpl()->FrameWidgetImpl()->SetPageScaleStateAndLimits(
viewport.Scale(), viewport.IsPinchGestureActive(),
@@ -1565,7 +1541,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
// Prevent main frame updates while the main frame is loading until enough
// progress is made and BeginMainFrames are explicitly asked for.
scoped_defer_main_frame_update_ =
@@ -2934,7 +2953,7 @@ void WebViewImpl::RefreshPageScaleFactor() {
@@ -2928,7 +2947,7 @@ void WebViewImpl::RefreshPageScaleFactor() {
auto& viewport = GetPage()->GetVisualViewport();
MainFrameImpl()->FrameWidgetImpl()->SetPageScaleStateAndLimits(
viewport.Scale(), viewport.IsPinchGestureActive(),
@@ -1574,7 +1550,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
}
}
@@ -3011,7 +3030,7 @@ void WebViewImpl::UpdatePageDefinedViewportConstraints(
@@ -3005,7 +3024,7 @@ void WebViewImpl::UpdatePageDefinedViewportConstraints(
TextAutosizer::UpdatePageInfoInAllFrames(GetPage()->MainFrame());
}
@@ -1583,7 +1559,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
if (should_auto_resize_ || !MainFrameImpl())
return;
@@ -3245,6 +3264,10 @@ float WebViewImpl::MinimumPageScaleFactor() const {
@@ -3239,6 +3258,10 @@ float WebViewImpl::MinimumPageScaleFactor() const {
return GetPageScaleConstraintsSet().FinalConstraints().minimum_scale;
}
@@ -1594,7 +1570,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
float WebViewImpl::MaximumPageScaleFactor() const {
return GetPageScaleConstraintsSet().FinalConstraints().maximum_scale;
}
@@ -3295,7 +3318,7 @@ void WebViewImpl::SendResizeEventForMainFrame() {
@@ -3289,7 +3312,7 @@ void WebViewImpl::SendResizeEventForMainFrame() {
auto& viewport = GetPage()->GetVisualViewport();
MainFrameImpl()->FrameWidgetImpl()->SetPageScaleStateAndLimits(
viewport.Scale(), viewport.IsPinchGestureActive(),
@@ -1603,7 +1579,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
}
}
@@ -3844,7 +3867,7 @@ void WebViewImpl::PageScaleFactorChanged() {
@@ -3834,7 +3857,7 @@ void WebViewImpl::PageScaleFactorChanged() {
DCHECK(viewport.IsActiveViewport());
MainFrameImpl()->FrameWidgetImpl()->SetPageScaleStateAndLimits(
viewport.Scale(), viewport.IsPinchGestureActive(),
@@ -1615,7 +1591,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
@@ -171,6 +171,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -168,6 +168,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
void AdvanceFocus(bool reverse) override;
float PageScaleFactor() const override;
float MinimumPageScaleFactor() const override;
@@ -1623,7 +1599,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_pa
float MaximumPageScaleFactor() const override;
void SetDefaultPageScaleLimits(float min_scale, float max_scale) override;
void SetInitialPageScaleOverride(float) override;
@@ -284,6 +285,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -281,6 +282,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
// includes all browser controls params such as the min heights.
void ResizeWithBrowserControls(const gfx::Size& main_frame_widget_size,
const gfx::Size& visible_viewport_size,
@@ -1632,7 +1608,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_pa
cc::BrowserControlsParams);
// Requests a page-scale animation based on the specified point/rect.
@@ -834,6 +837,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -827,6 +830,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
// The upper bound on the size when auto-resizing.
gfx::Size max_auto_size_;
@@ -1644,7 +1620,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_pa
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.cc b/third_party/blink/renderer/core/frame/local_frame_view.cc
--- a/third_party/blink/renderer/core/frame/local_frame_view.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_view.cc
@@ -1740,8 +1740,11 @@ void LocalFrameView::PerformPostLayoutTasks(bool visual_viewport_size_changed) {
@@ -1791,8 +1791,11 @@ void LocalFrameView::PerformPostLayoutTasks(bool visual_viewport_size_changed) {
}
float LocalFrameView::InputEventsScaleFactor() const {
@@ -1785,7 +1761,7 @@ diff --git a/third_party/blink/renderer/core/frame/visual_viewport.h b/third_par
diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
--- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
@@ -1873,6 +1873,9 @@ void WebFrameWidgetImpl::UpdateVisualProperties(
@@ -1872,6 +1872,9 @@ void WebFrameWidgetImpl::UpdateVisualProperties(
// All non-top-level Widgets (child local-root frames, GuestViews,
// etc.) propagate and consume the page scale factor as "external", meaning
// that it comes from the top level widget's page scale.
@@ -1795,7 +1771,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
if (!ForTopMostMainFrame()) {
// The main frame controls the page scale factor, from blink. For other
// frame widgets, the page scale from pinch zoom and compositing scale is
@@ -1880,7 +1883,7 @@ void WebFrameWidgetImpl::UpdateVisualProperties(
@@ -1879,7 +1882,7 @@ void WebFrameWidgetImpl::UpdateVisualProperties(
// blink doesn't need to know this page scale factor outside the main frame,
// the compositor does in order to produce its output at the correct scale.
float combined_scale_factor = visual_properties.page_scale_factor *
@@ -1804,7 +1780,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
widget_base_->LayerTreeHost()->SetExternalPageScaleFactor(
combined_scale_factor, visual_properties.is_pinch_gesture_active);
@@ -1893,7 +1896,7 @@ void WebFrameWidgetImpl::UpdateVisualProperties(
@@ -1892,7 +1895,7 @@ void WebFrameWidgetImpl::UpdateVisualProperties(
// Ensure the external scale factor in top-level widgets is reset as it may
// be leftover from when a widget was nested and was promoted to top level.
widget_base_->LayerTreeHost()->SetExternalPageScaleFactor(
@@ -1813,7 +1789,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
/*is_pinch_gesture_active=*/false);
}
@@ -1937,6 +1940,18 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing(
@@ -1936,6 +1939,18 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing(
new_compositor_viewport_pixel_rect,
device_scale_factor_for_testing_ / non_testing_device_scale_factor_);
}
@@ -1832,7 +1808,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
if (ForMainFrame()) {
if (size_ != new_size) {
@@ -1954,6 +1969,8 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing(
@@ -1953,6 +1968,8 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing(
size_.value(),
widget_base_->DIPsToCeiledBlinkSpace(
widget_base_->VisibleViewportSize()),
@@ -1841,7 +1817,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
visual_properties.browser_controls_params);
return;
}
@@ -1987,6 +2004,8 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing(
@@ -1986,6 +2003,8 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing(
View()->ResizeWithBrowserControls(
size_.value(), widget_base_->VisibleViewportSize(),
@@ -1850,7 +1826,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
visual_properties.browser_controls_params);
}
@@ -2375,6 +2394,8 @@ void WebFrameWidgetImpl::SetZoomInternal(double zoom_level,
@@ -2374,6 +2393,8 @@ void WebFrameWidgetImpl::SetZoomInternal(double zoom_level,
View()->ZoomFactorForViewportLayout() *
static_cast<float>(View()->ZoomLevelToZoomFactor(zoom_level)) *
static_cast<float>(css_zoom_factor);
@@ -1859,7 +1835,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
if (zoom_changed) {
// Set the layout shift exclusion window for the zoom level change.
if (LocalFrameView* view = document->View()) {
@@ -3421,6 +3442,7 @@ void WebFrameWidgetImpl::SetRootLayer(scoped_refptr<cc::Layer> layer) {
@@ -3425,6 +3446,7 @@ void WebFrameWidgetImpl::SetRootLayer(scoped_refptr<cc::Layer> layer) {
// be needed in setting the raster scale.
SetPageScaleStateAndLimits(1.f, false /* is_pinch_gesture_active */,
View()->MinimumPageScaleFactor(),
@@ -1867,7 +1843,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
View()->MaximumPageScaleFactor());
}
@@ -4796,9 +4818,10 @@ void WebFrameWidgetImpl::SetPageScaleStateAndLimits(
@@ -4810,9 +4832,10 @@ void WebFrameWidgetImpl::SetPageScaleStateAndLimits(
float page_scale_factor,
bool is_pinch_gesture_active,
float minimum,
@@ -1879,7 +1855,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
// Only propagate page scale from the main frame.
if (ForMainFrame()) {
@@ -4922,7 +4945,10 @@ void WebFrameWidgetImpl::OrientationChanged() {
@@ -4936,7 +4959,10 @@ void WebFrameWidgetImpl::OrientationChanged() {
void WebFrameWidgetImpl::DidUpdateSurfaceAndScreen(
const display::ScreenInfos& previous_original_screen_infos) {
display::ScreenInfo screen_info = widget_base_->GetScreenInfo();
@@ -1891,7 +1867,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
if (ShouldAutoDetermineCompositingToLCDTextSetting()) {
// This causes compositing state to be modified which dirties the
@@ -5121,7 +5147,7 @@ void WebFrameWidgetImpl::SetDeviceScaleFactorForTesting(float factor) {
@@ -5135,7 +5161,7 @@ void WebFrameWidgetImpl::SetDeviceScaleFactorForTesting(float factor) {
if (!device_scale_factor_for_testing_) {
non_testing_device_scale_factor_ =
@@ -1903,7 +1879,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th
diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h
--- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h
+++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h
@@ -659,6 +659,7 @@ class CORE_EXPORT WebFrameWidgetImpl
@@ -660,6 +660,7 @@ class CORE_EXPORT WebFrameWidgetImpl
void SetPageScaleStateAndLimits(float page_scale_factor,
bool is_pinch_gesture_active,
float minimum,
@@ -1935,7 +1911,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/thi
diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
@@ -1506,6 +1506,7 @@ bool HTMLCanvasElement::PushFrame(scoped_refptr<CanvasResource>&& image,
@@ -1515,6 +1515,7 @@ bool HTMLCanvasElement::PushFrame(scoped_refptr<CanvasResource>&& image,
}
bool HTMLCanvasElement::ShouldAccelerate() const {
@@ -1946,7 +1922,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
diff --git a/third_party/blink/renderer/core/input/event_handler.cc b/third_party/blink/renderer/core/input/event_handler.cc
--- a/third_party/blink/renderer/core/input/event_handler.cc
+++ b/third_party/blink/renderer/core/input/event_handler.cc
@@ -2090,7 +2090,7 @@ GestureEventWithHitTestResults EventHandler::HitTestResultForGestureEvent(
@@ -2103,7 +2103,7 @@ GestureEventWithHitTestResults EventHandler::HitTestResultForGestureEvent(
hit_test_result);
}
@@ -1958,7 +1934,7 @@ diff --git a/third_party/blink/renderer/core/input/event_handler.cc b/third_part
diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
--- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
@@ -1071,7 +1071,8 @@ InspectorEmulationAgent::setSmallViewportHeightDifferenceOverride(
@@ -1075,7 +1075,8 @@ InspectorEmulationAgent::setSmallViewportHeightDifferenceOverride(
// Ensure the override is applied immediately without having to wait for
// `WebFrameWidgetImpl::UpdateVisualProperties()` to be called.
GetWebViewImpl()->ResizeWithBrowserControls(
@@ -1971,7 +1947,7 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent
diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
--- a/third_party/blink/renderer/core/page/page.cc
+++ b/third_party/blink/renderer/core/page/page.cc
@@ -1332,6 +1332,10 @@ void Page::CalculateEmulatedScreenSetting(LocalFrame* frame, bool force) {
@@ -1289,6 +1289,10 @@ void Page::CalculateEmulatedScreenSetting(LocalFrame* frame, bool force) {
|| disable_screen_emulated_) {
isEnabled = false;
}
@@ -1997,7 +1973,7 @@ diff --git a/third_party/blink/renderer/core/page/viewport_description.cc b/thir
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
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -470,16 +470,17 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -462,16 +462,17 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
}
}
@@ -2020,7 +1996,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -6000,6 +6000,10 @@
@@ -6164,6 +6164,10 @@
// If enabled, the `getDisplayMedia()` family of APIs will ask for NV12
// frames, which should trigger a zero-copy path in the tab capture code.
name: "ZeroCopyTabCapture",
@@ -2075,7 +2051,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
scroll_state_data.delta_x_hint = -event.data.scroll_begin.delta_x_hint;
scroll_state_data.delta_y_hint = -event.data.scroll_begin.delta_y_hint;
scroll_state_data.is_beginning = true;
@@ -877,7 +892,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -897,7 +912,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
const WebGestureEvent& gesture_event =
static_cast<const WebGestureEvent&>(event);
input_handler_->PinchGestureBegin(
@@ -2084,7 +2060,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
GestureScrollInputType(gesture_event.SourceDevice()));
gesture_pinch_in_progress_ = true;
return DID_HANDLE;
@@ -889,7 +904,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -909,7 +924,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
const WebGestureEvent& gesture_event =
static_cast<const WebGestureEvent&>(event);
input_handler_->PinchGestureEnd(
@@ -2093,7 +2069,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
return DID_HANDLE;
}
@@ -899,7 +914,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -919,7 +934,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
static_cast<const WebGestureEvent&>(event);
input_handler_->PinchGestureUpdate(
gesture_event.data.pinch_update.scale,
@@ -2102,7 +2078,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
return DID_HANDLE;
}
@@ -922,7 +937,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -942,7 +957,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
// TODO(arakeri): Pass in the modifier instead of a bool once the
// refactor (crbug.com/1022097) is done. For details, see
// crbug.com/1016955.
@@ -2111,7 +2087,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
}
return DID_NOT_HANDLE;
@@ -933,7 +948,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -953,7 +968,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
static_cast<const WebMouseEvent&>(event);
CHECK(input_handler_);
if (mouse_event.button == WebMouseEvent::Button::kLeft)
@@ -2120,7 +2096,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
return DID_NOT_HANDLE;
}
case WebInputEvent::Type::kMouseMove: {
@@ -948,7 +963,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -968,7 +983,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
(mouse_event.button == WebPointerProperties::Button::kNoButton &&
!(mouse_event.GetModifiers() &
WebInputEvent::Modifiers::kRelativeMotionEvent));
@@ -2129,7 +2105,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
should_cancel_scrollbar_drag);
return DID_NOT_HANDLE;
}
@@ -987,12 +1002,14 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution(
@@ -1007,12 +1022,14 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution(
// to check pointer lock state
gfx::PointF point =
static_cast<const WebMouseEvent&>(event).PositionInWidget();
@@ -2144,7 +2120,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
return WebInputEventAttribution(
WebInputEventAttribution::kTargetedFrame,
input_handler_->FindFrameElementIdAtPoint(point));
@@ -1007,6 +1024,7 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution(
@@ -1027,6 +1044,7 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution(
// how the renderer host performs touch event dispatch.
// https://cs.chromium.org/chromium/src/content/browser/renderer_host/render_widget_host_input_event_router.cc?l=808&rcl=10fe9d0a725d4ed7b69266a5936c525f0a5b26d3
gfx::PointF point = touch_event.touches[0].PositionInWidget();
@@ -2152,7 +2128,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
const cc::ElementId targeted_element =
input_handler_->FindFrameElementIdAtPoint(point);
@@ -1108,7 +1126,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel(
@@ -1128,7 +1146,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel(
}
}
@@ -2161,7 +2137,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
if (input_handler_->HasBlockingWheelEventHandlerAt(
gfx::Point(position_in_widget.x(), position_in_widget.y()))) {
result = DID_NOT_HANDLE;
@@ -1280,7 +1298,7 @@ InputHandlerProxy::HandleGestureScrollUpdate(
@@ -1310,7 +1328,7 @@ InputHandlerProxy::HandleGestureScrollUpdate(
scroll_data->set_unused_delta_y(scroll_result.unused_scroll_delta.y());
});
@@ -2169,8 +2145,8 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
+ HandleOverscroll(ScalePoint(gesture_event.PositionInWidget()), scroll_result,
gesture_event.SourceDevice());
if (elastic_overscroll_controller_)
@@ -1367,8 +1385,8 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HitTestTouchEvent(
if (elastic_overscroll_controller_) {
@@ -1403,8 +1421,8 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HitTestTouchEvent(
}
cc::TouchAction touch_action = cc::TouchAction::kAuto;
@@ -2181,7 +2157,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
// TODO(crbug.com/355578906): This is just some rough math for now. The main
// thread counterpart is AdjustPointerEvent. The buffer math on the main and
// cc thread(s) need to match.
@@ -1483,7 +1501,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart(
@@ -1519,7 +1537,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart(
touch_event.touches_length == 1) {
DCHECK(touch_event.touches[0].state == WebTouchPoint::State::kStatePressed);
cc::InputHandlerPointerResult pointer_result = HandlePointerDown(
@@ -2190,7 +2166,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
if (pointer_result.type == cc::PointerResultType::kScrollbarScroll) {
client_->SetAllowedTouchAction(allowed_touch_action);
return DID_HANDLE;
@@ -1546,7 +1564,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchMove(
@@ -1582,7 +1600,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchMove(
touch_event.touch_start_or_first_touch_move);
if (touch_event.touches_length == 1) {
cc::InputHandlerPointerResult pointer_result = HandlePointerMove(
@@ -2199,7 +2175,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
false /* should_cancel_scrollbar_drag */);
if (pointer_result.type == cc::PointerResultType::kScrollbarScroll) {
return DID_HANDLE;
@@ -1589,7 +1607,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchEnd(
@@ -1625,7 +1643,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchEnd(
touch_event.touches_length);
if (touch_event.touches_length == 1) {
cc::InputHandlerPointerResult pointer_result = HandlePointerUp(
@@ -2301,7 +2277,7 @@ diff --git a/third_party/blink/renderer/platform/widget/widget_base.cc b/third_p
diff --git a/third_party/blink/renderer/platform/widget/widget_base.h b/third_party/blink/renderer/platform/widget/widget_base.h
--- a/third_party/blink/renderer/platform/widget/widget_base.h
+++ b/third_party/blink/renderer/platform/widget/widget_base.h
@@ -404,7 +404,7 @@ class PLATFORM_EXPORT WidgetBase : public mojom::blink::Widget,
@@ -405,7 +405,7 @@ class PLATFORM_EXPORT WidgetBase : public mojom::blink::Widget,
void OnDevToolsSessionConnectionChanged(bool attached);
// Helper to get the non-emulated device scale factor.
@@ -2391,9 +2367,9 @@ diff --git a/ui/android/event_forwarder.cc b/ui/android/event_forwarder.cc
diff --git a/ui/android/java/src/org/chromium/ui/base/UiAndroidFeatureList.java b/ui/android/java/src/org/chromium/ui/base/UiAndroidFeatureList.java
--- a/ui/android/java/src/org/chromium/ui/base/UiAndroidFeatureList.java
+++ b/ui/android/java/src/org/chromium/ui/base/UiAndroidFeatureList.java
@@ -59,6 +59,12 @@ public class UiAndroidFeatureList {
/* defaultValue= */ true,
/* defaultValueInTests= */ true);
@@ -66,6 +66,12 @@ public class UiAndroidFeatureList {
UiAndroidFeatures.ANDROID_TOUCHPAD_OVERSCROLL_HISTORY_NAVIGATION,
/* defaultValue= */ true);
+ public static final CachedFlag sPixelPerfect =
+ newCachedFlag(
@@ -2574,8 +2550,8 @@ diff --git a/ui/display/mojom/screen_info_mojom_traits.cc b/ui/display/mojom/scr
out->device_scale_factor = data.device_scale_factor();
+ out->device_scale_factor_original = data.device_scale_factor_original();
out->depth = data.depth();
out->handwriting_radius = data.handwriting_radius();
out->depth_per_component = data.depth_per_component();
out->is_monochrome = data.is_monochrome();
diff --git a/ui/display/mojom/screen_info_mojom_traits.h b/ui/display/mojom/screen_info_mojom_traits.h
--- a/ui/display/mojom/screen_info_mojom_traits.h
+++ b/ui/display/mojom/screen_info_mojom_traits.h
build/patches/Android-Toolbar-Scroll-Ablation-setting.patch
+1 -1
View File
@@ -53,7 +53,7 @@ new file mode 100644
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
@@ -79,6 +79,12 @@ found in the LICENSE file.
@@ -84,6 +84,12 @@ found in the LICENSE file.
android:key="disable_toolbar_swipeup"
android:title="@string/disable_toolbar_swipe_up" />
build/patches/Android-fonts-fingerprinting-mitigation.patch
+93 -17
View File
@@ -8,10 +8,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../common/ProductionSupportedFlagList.java | 3 +
.../component_updater/registration.cc | 9 +
build/config/freetype/freetype.gni | 2 +-
.../java/res/xml/developer_preferences.xml | 5 +
chrome/browser/BUILD.gn | 7 +
.../browser/component_updater/registration.cc | 10 +
...droid-fonts-fingerprinting-mitigation.grdp | 9 +
chrome/browser/ui/prefs/prefs_tab_helper.cc | 9 +-
chrome/renderer/BUILD.gn | 4 +
.../installer_policies/BUILD.gn | 7 +
.../fonts_pack_component_installer.cc | 96 +
@@ -29,10 +31,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
content/child/BUILD.gn | 7 +
content/renderer/BUILD.gn | 4 +
.../renderer/renderer_blink_platform_impl.cc | 55 +-
...renderer_main_platform_delegate_android.cc | 2 +-
...ndroid-fonts-fingerprinting-mitigation.inc | 12 +
...ndroid-fonts-fingerprinting-mitigation.inc | 7 +
...ndroid-fonts-fingerprinting-mitigation.inc | 5 +
skia/BUILD.gn | 12 +
skia/ext/font_utils.cc | 1 +
.../include/ports/SkFontConfigInterface.h | 2 +
.../skia/include/ports/SkFontMgr_android.h | 42 +-
.../skia/src/ports/SkFontConfigInterface.cpp | 4 +
@@ -40,9 +44,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../src/ports/SkFontConfigInterface_direct.h | 1 +
.../skia/src/ports/SkFontMgr_android.cpp | 278 ++-
.../skia/src/ports/SkFontMgr_android_data.cpp | 1640 +++++++++++++++++
.../skia/src/ports/SkFontMgr_android_ndk.cpp | 2 +-
.../src/ports/SkFontMgr_android_parser.cpp | 49 +-
.../skia/src/ports/SkFontMgr_android_parser.h | 5 +-
36 files changed, 2416 insertions(+), 76 deletions(-)
41 files changed, 2424 insertions(+), 84 deletions(-)
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Android-fonts-fingerprinting-mitigation.grdp
create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.cc
create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.h
@@ -54,7 +59,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
--- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
+++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
@@ -970,6 +970,9 @@ public final class ProductionSupportedFlagList {
@@ -933,6 +933,9 @@ public final class ProductionSupportedFlagList {
"Hides user preference on the system keyboard by setting the standard "
+ "eng layout and removing the layout information from the "
+ "javascript keyboard events."),
@@ -90,6 +95,16 @@ diff --git a/android_webview/nonembedded/component_updater/registration.cc b/and
component_installer_list.push_back(
std::make_unique<
component_updater::OriginTrialsComponentInstallerPolicy>());
diff --git a/build/config/freetype/freetype.gni b/build/config/freetype/freetype.gni
--- a/build/config/freetype/freetype.gni
+++ b/build/config/freetype/freetype.gni
@@ -26,5 +26,5 @@ declare_args() {
# https://crbug.com/370816215
#
# Note: //build should not import directly from //pdf for layering reasons.
- enable_freetype = !is_android && !is_ios && (is_linux || !is_castos)
+ enable_freetype = !is_ios && (is_linux || !is_castos)
}
diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/android/java/res/xml/developer_preferences.xml
--- a/chrome/android/java/res/xml/developer_preferences.xml
+++ b/chrome/android/java/res/xml/developer_preferences.xml
@@ -106,7 +121,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -8015,6 +8015,13 @@ static_library("browser") {
@@ -8010,6 +8010,13 @@ static_library("browser") {
]
}
@@ -123,7 +138,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc
--- a/chrome/browser/component_updater/registration.cc
+++ b/chrome/browser/component_updater/registration.cc
@@ -116,10 +116,20 @@
@@ -115,10 +115,20 @@
#include "chrome/browser/component_updater/file_type_policies_component_installer.h"
#endif
@@ -158,10 +173,36 @@ new file mode 100644
+ Replaces all system fonts with the same for all devices
+ </message>
+</grit-part>
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -64,8 +64,7 @@
#include <windows.h>
#endif
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
// If a font name in prefs default values starts with a comma, consider it's a
// comma-separated font list and resolve it to the first available font.
#define PREFS_FONT_LIST 1
@@ -442,9 +441,9 @@ void PrefsTabHelper::RegisterProfilePrefs(
value = gfx::FontList::FirstAvailableOrFirst(value);
}
#else // !PREFS_FONT_LIST
- DCHECK(!value.starts_with(','))
- << "This platform doesn't support default font lists. "
- << pref.pref_name << "=" << value;
+ // DCHECK(!value.starts_with(','))
+ // << "This platform doesn't support default font lists. "
+ // << pref.pref_name << "=" << value;
#endif // PREFS_FONT_LIST
registry->RegisterStringPref(pref.pref_name, value);
fonts_with_defaults.insert(pref.pref_name);
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -269,6 +269,10 @@ static_library("renderer") {
@@ -266,6 +266,10 @@ static_library("renderer") {
deps += [ "//components/strings" ]
}
@@ -175,7 +216,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn
--- a/components/component_updater/installer_policies/BUILD.gn
+++ b/components/component_updater/installer_policies/BUILD.gn
@@ -36,6 +36,13 @@ static_library("installer_policies_no_content_deps") {
@@ -32,6 +32,13 @@ static_library("installer_policies_no_content_deps") {
"trust_token_key_commitments_component_installer_policy.h",
]
@@ -625,7 +666,7 @@ diff --git a/components/services/font/public/mojom/font_service.mojom b/componen
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2613,6 +2613,17 @@ source_set("browser") {
@@ -2608,6 +2608,17 @@ source_set("browser") {
]
}
@@ -643,8 +684,8 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
if (is_linux || is_chromeos) {
sources -=
[ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
@@ -2658,6 +2669,13 @@ source_set("browser") {
]
@@ -2654,6 +2665,13 @@ source_set("browser") {
deps += [ "//components/services/font_data:lib" ]
}
+ if (is_android) {
@@ -672,7 +713,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bin
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
#include "content/browser/font_service.h" // nogncheck
@@ -348,6 +353,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver(
@@ -351,6 +356,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver(
}
#endif
@@ -706,7 +747,7 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -349,6 +349,10 @@ target(link_target_type, "renderer") {
@@ -350,6 +350,10 @@ target(link_target_type, "renderer") {
deps += [ "//services/screen_ai/public/mojom" ]
}
@@ -720,7 +761,7 @@ diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -138,6 +138,23 @@
@@ -142,6 +142,23 @@
#include "content/common/android/sync_compositor_statics.h"
#endif
@@ -744,7 +785,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
using blink::Platform;
using blink::WebAudioDevice;
using blink::WebAudioLatencyHint;
@@ -188,6 +205,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType(
@@ -192,6 +209,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType(
NOTREACHED();
}
@@ -782,7 +823,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
} // namespace
//------------------------------------------------------------------------------
@@ -201,18 +249,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
@@ -205,18 +253,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
is_locked_to_site_(false),
main_thread_scheduler_(main_thread_scheduler),
next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -805,7 +846,19 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
+#endif
#endif
#if BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
diff --git a/content/renderer/renderer_main_platform_delegate_android.cc b/content/renderer/renderer_main_platform_delegate_android.cc
--- a/content/renderer/renderer_main_platform_delegate_android.cc
+++ b/content/renderer/renderer_main_platform_delegate_android.cc
@@ -35,7 +35,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
// Android 14+ user devices with updated system fonts will call statx and
// possibly other system calls that are not allowed in the sandbox.
// See https://crbug.com/40618213 for details.
- [[maybe_unused]] auto mgr = skia::DefaultFontMgr();
+ // [[maybe_unused]] auto mgr = skia::DefaultFontMgr();
}
void RendererMainPlatformDelegate::PlatformUninitialize() {
diff --git a/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc b/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc
new file mode 100644
--- /dev/null
@@ -848,7 +901,7 @@ new file mode 100644
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -460,6 +460,18 @@ component("skia") {
@@ -449,6 +449,18 @@ component("skia") {
sources += skia_ports_fci_sources
}
@@ -867,6 +920,17 @@ diff --git a/skia/BUILD.gn b/skia/BUILD.gn
if (is_linux || is_chromeos || is_android) {
# Retain the files for the SkFontMgr_Android on linux to emulate android
# fonts. See content/zygote/zygote_main_linux.cc
diff --git a/skia/ext/font_utils.cc b/skia/ext/font_utils.cc
--- a/skia/ext/font_utils.cc
+++ b/skia/ext/font_utils.cc
@@ -59,6 +59,7 @@ SkFontMgr* g_fontmgr_override = nullptr;
#if BUILDFLAG(IS_ANDROID)
// https://crbug.com/461659286 Failure to create any font causes crash.
BASE_FEATURE(kUseAndroidNDKFontAPI, base::FEATURE_DISABLED_BY_DEFAULT);
+SET_CROMITE_FEATURE_DISABLED(kUseAndroidNDKFontAPI);
#endif
} // namespace
diff --git a/third_party/skia/include/ports/SkFontConfigInterface.h b/third_party/skia/include/ports/SkFontConfigInterface.h
--- a/third_party/skia/include/ports/SkFontConfigInterface.h
+++ b/third_party/skia/include/ports/SkFontConfigInterface.h
@@ -3051,6 +3115,18 @@ new file mode 100644
+
+ return false;
+}
diff --git a/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp b/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp
--- a/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp
@@ -996,7 +996,7 @@ public:
}
std::vector<std::unique_ptr<FontFamily>> xmlFamilies;
- SkFontMgr_Android_Parser::GetSystemFontFamilies(xmlFamilies);
+ SkFontMgr_Android_Parser::GetSystemFontFamilies(xmlFamilies, /*custom*/ nullptr);
skia_private::THashMap<SkString, std::unique_ptr<SkStreamAsset>> streamForPath;
diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
--- a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
@@ -3129,7 +3205,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
void SkFontMgr_Android_Parser::GetSystemFontFamilies(
- std::vector<std::unique_ptr<FontFamily>>& fontFamilies)
+ std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
+ const SkFontMgr_Android_CustomFonts* custom)
+ const SkFontMgr_Android_CustomFonts* custom)
{
// Version 21 of the system font configuration does not need any fallback configuration files.
SkString basePath(getenv("ANDROID_ROOT"));
build/patches/Ask-for-restart-on-connection-change.patch
+23 -23
View File
@@ -284,7 +284,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -1441,7 +1441,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -1525,7 +1525,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
mActivity,
mStatusIndicatorCoordinator,
isUrlBarFocusedSupplier,
@@ -299,7 +299,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
@@ -201,6 +201,13 @@ public abstract class TabModelSelectorBase
@@ -200,6 +200,13 @@ public abstract class TabModelSelectorBase
return null;
}
@@ -407,7 +407,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
--- a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
+++ b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
@@ -135,6 +135,8 @@ public interface TabWindowManager {
@@ -138,6 +138,8 @@ public interface TabWindowManager {
/** Returns the total number of incognito tabs across all tab model selectors. */
int getIncognitoTabCount();
@@ -419,7 +419,7 @@ diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/brows
diff --git a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
--- a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
+++ b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
@@ -566,6 +566,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
@@ -568,6 +568,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
return tabGroupModelFilter.getTabsInGroup(tabGroupId);
}
@@ -497,7 +497,7 @@ diff --git a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml b/c
diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
--- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
+++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
@@ -137,6 +137,8 @@ public class Snackbar {
@@ -140,6 +140,8 @@ public class Snackbar {
private @Nullable String mTemplateText;
private @Nullable String mActionText;
private @Nullable Object mActionData;
@@ -506,7 +506,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
private int mBackgroundColor;
private int mTextApperanceResId;
private boolean mDefaultLines = true;
@@ -243,6 +245,20 @@ public class Snackbar {
@@ -246,6 +248,20 @@ public class Snackbar {
return this;
}
@@ -530,7 +530,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
--- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
+++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
@@ -340,6 +340,12 @@ public class SnackbarManager
@@ -348,6 +348,12 @@ public class SnackbarManager
new SnackbarView(
mActivity,
this,
@@ -546,7 +546,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
--- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
+++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
@@ -56,6 +56,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
@@ -55,6 +55,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
protected final ViewGroup mSnackbarView;
protected final TemplatePreservingTextView mMessageView;
private final TextView mActionButtonView;
@@ -554,38 +554,38 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
private final ImageView mProfileImageView;
private final int mAnimationDuration;
private final boolean mIsTablet;
@@ -102,11 +103,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
@@ -100,11 +101,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
public SnackbarView(
Activity activity,
OnClickListener listener,
SnackbarManager manager,
+ OnClickListener dismissListener,
Snackbar snackbar,
ViewGroup parentView,
@Nullable WindowAndroid windowAndroid,
boolean isTablet) {
- this(activity, listener, snackbar, parentView, windowAndroid, null, isTablet);
+ this(activity, listener, dismissListener, snackbar, parentView, windowAndroid, null, isTablet);
- this(activity, manager, snackbar, parentView, windowAndroid, null, isTablet);
+ this(activity, manager, dismissListener, snackbar, parentView, windowAndroid, null, isTablet);
}
/**
@@ -125,6 +127,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
@@ -122,6 +124,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
public SnackbarView(
Activity activity,
OnClickListener listener,
SnackbarManager manager,
+ OnClickListener dismissListener,
Snackbar snackbar,
ViewGroup parentView,
@Nullable WindowAndroid windowAndroid,
@@ -155,6 +158,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
@@ -158,6 +161,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
(TemplatePreservingTextView) mContainerView.findViewById(R.id.snackbar_message);
mActionButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_button);
mActionButtonView.setOnClickListener(listener);
mActionButtonView.setOnClickListener(manager);
+ mDismissButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_dismiss);
+ mDismissButtonView.setOnClickListener(dismissListener);
mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
mEdgeToEdgeSupplier = edgeToEdgeSupplier;
// TODO(crbug/com/451807932): Replace with a custom pad adjuster to account for inset
@@ -431,6 +436,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
// TODO(crbug.com/451807932): Replace with a custom pad adjuster to account for inset
@@ -434,6 +439,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
mActionButtonView.setVisibility(View.VISIBLE);
mActionButtonView.setContentDescription(snackbar.getActionText());
setViewText(mActionButtonView, snackbar.getActionText(), animate);
@@ -638,7 +638,7 @@ diff --git a/content/browser/web_contents/web_contents_android.h b/content/brows
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4151,8 +4151,10 @@ void WebContentsImpl::Stop() {
@@ -4096,8 +4096,10 @@ void WebContentsImpl::Stop() {
void WebContentsImpl::SetPageFrozen(bool frozen) {
TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
@@ -665,7 +665,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
@Override
public void setDisplayCutoutSafeArea(Rect insets) {
if (mNativeWebContentsAndroid == 0) return;
@@ -1480,6 +1486,8 @@ public class WebContentsImpl
@@ -1486,6 +1492,8 @@ public class WebContentsImpl
void setFocus(long nativeWebContentsAndroid, boolean focused);
@@ -734,7 +734,7 @@ new file mode 100644
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
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -4655,6 +4655,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
@@ -4665,6 +4665,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
}
void Document::DispatchFreezeEvent() {
@@ -745,7 +745,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
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
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -3306,6 +3306,7 @@ void LocalFrame::DidFreeze() {
@@ -3321,6 +3321,7 @@ void LocalFrame::DidFreeze() {
LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
Loader().SetDefersLoading(freeze_mode);
@@ -753,7 +753,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
}
void LocalFrame::DidResume() {
@@ -3320,6 +3321,7 @@ void LocalFrame::DidResume() {
@@ -3335,6 +3336,7 @@ void LocalFrame::DidResume() {
GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
Loader().SetDefersLoading(LoaderFreezeMode::kNone);
build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch
+12 -12
View File
@@ -88,7 +88,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_
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
+++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
@@ -17,6 +17,7 @@
@@ -20,6 +20,7 @@
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/mediastream/media_devices.h"
#include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
@@ -96,7 +96,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
#include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
#include "third_party/blink/public/platform/web_audio_latency_hint.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
@@ -863,7 +864,9 @@ double AudioContext::baseLatency() const {
@@ -921,7 +922,9 @@ double AudioContext::baseLatency() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
DCHECK(destination());
@@ -110,15 +110,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
--- a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
+++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
@@ -29,6 +29,7 @@
@@ -30,6 +30,7 @@
#include "base/metrics/histogram_functions.h"
#include "build/build_config.h"
#include "media/base/audio_bus.h"
+#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
#include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h"
#include "third_party/blink/public/platform/platform.h"
@@ -776,6 +777,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
@@ -777,6 +778,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
return To<LocalDOMWindow>(GetExecutionContext());
}
@@ -162,15 +162,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.c
diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
--- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
+++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
@@ -32,6 +32,7 @@
#include <complex>
@@ -33,6 +33,7 @@
#include "base/compiler_specific.h"
#include "media/base/audio_bus.h"
+#include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
#include "third_party/blink/renderer/platform/audio/audio_bus.h"
#include "third_party/blink/renderer/platform/audio/audio_utilities.h"
#include "third_party/blink/renderer/platform/audio/vector_math.h"
@@ -117,7 +118,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array,
@@ -118,7 +119,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array,
for (unsigned i = 0; i < len; ++i) {
const float linear_value = UNSAFE_TODO(source[i]);
const double db_mag = audio_utilities::LinearToDecibels(linear_value);
@@ -180,7 +180,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
}
}
}
@@ -155,9 +157,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array,
@@ -156,9 +158,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array,
// The range m_minDecibels to m_maxDecibels will be scaled to byte values
// from 0 to UCHAR_MAX.
@@ -193,7 +193,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
// Clip to valid range.
UNSAFE_TODO(destination[i]) =
static_cast<unsigned char>(ClampTo(scaled_value, 0, UCHAR_MAX));
@@ -188,6 +192,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
@@ -189,6 +193,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
input_buffer[(i + write_index - fft_size + kInputBufferSize) %
kInputBufferSize]);
@@ -201,7 +201,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
UNSAFE_TODO(destination[i]) = value;
}
}
@@ -211,10 +216,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
@@ -212,10 +217,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
for (unsigned i = 0; i < len; ++i) {
// Buffer access is protected due to modulo operation.
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -631,9 +631,8 @@
@@ -639,9 +639,8 @@
{
// AudioContext.playoutStats interface.
// https://chromestatus.com/feature/5172818344148992
build/patches/Backport-v144-android-extensions-changes.patch
-954
View File
@@ -1,954 +0,0 @@
From: uazo <uazo@users.noreply.github.com>
Date: Thu, 6 Nov 2025 13:22:24 +0000
Subject: Backport-v144-android-extensions-changes
Enable support for anonymous browsing.
Backport of bugid
7089957: extensions Use BrowserWindowInterface in ExtensionViewHost
https://chromium-review.googlesource.com/c/chromium/src/+/7089957
7126008: Destroy ExtensionWindowControllerBridge when its Profile is destroyed
https://chromium-review.googlesource.com/c/chromium/src/+/7126008
---
.../chrome/browser/ChromeTabbedActivity.java | 1 +
.../chrome/browser/app/ChromeActivity.java | 12 ++
.../customtabs/BaseCustomTabActivity.java | 1 +
.../BaseCustomTabRootUiCoordinator.java | 5 +
.../tabbed_mode/TabbedRootUiCoordinator.java | 2 +
.../browser/toolbar/ToolbarManager.java | 4 +
.../chrome/browser/ui/RootUiCoordinator.java | 6 +
chrome/android/junit/BUILD.gn | 1 +
...aseCustomTabRootUiCoordinatorUnitTest.java | 4 +
.../extensions/extension_view_host_factory.cc | 127 +++++++++---------
.../extensions/extension_view_host_factory.h | 17 +--
chrome/browser/ui/android/extensions/BUILD.gn | 1 +
.../extension_action_popup_contents.cc | 9 +-
.../ExtensionActionPopupContents.java | 14 +-
.../extensions/windowing/internal/BUILD.gn | 1 +
.../ExtensionWindowControllerBridgeImpl.java | 45 ++++++-
chrome/browser/ui/android/toolbar/BUILD.gn | 2 +
.../ExtensionActionListCoordinator.java | 10 +-
.../ExtensionActionListMediator.java | 16 ++-
.../ExtensionActionListMediatorTest.java | 11 +-
.../ExtensionToolbarCoordinator.java | 5 +
.../ExtensionToolbarCoordinatorImpl.java | 4 +
22 files changed, 201 insertions(+), 97 deletions(-)
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -2937,6 +2937,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
mLayoutStateProviderSupplier,
getBrowserControlsManager(),
getWindowAndroid(),
+ getChromeAndroidTaskSupplier(),
getLifecycleDispatcher(),
getLayoutManagerSupplier(),
/* menuOrKeyboardActionController= */ this,
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -62,6 +62,7 @@ import org.chromium.base.metrics.RecordUserAction;
import org.chromium.base.shared_preferences.SharedPreferencesManager;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.ObservableSupplierImpl;
+import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.base.supplier.OneshotSupplierImpl;
import org.chromium.base.supplier.UnownedUserDataSupplier;
import org.chromium.chrome.R;
@@ -447,6 +448,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
private @Nullable TabStateThemeResourceProvider mThemeResourceProvider;
+ private final OneshotSupplierImpl<ChromeAndroidTask> mChromeAndroidTaskSupplier =
+ new OneshotSupplierImpl<>();
+
protected ChromeActivity() {
mManualFillingComponentSupplier.set(ManualFillingComponentFactory.createComponent());
sNextActivityId++;
@@ -1093,9 +1097,17 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
if (extensionWindowControllerBridge != null) {
chromeAndroidTask.addFeature(extensionWindowControllerBridge);
}
+
+ // 4. Make the ChromeAndroidTask available via OneshotSupplier.
+ mChromeAndroidTaskSupplier.set(chromeAndroidTask);
}
}
+ /** Returns an {@link OneshotSupplier} for {@link ChromeAndroidTask}. */
+ protected final OneshotSupplier<ChromeAndroidTask> getChromeAndroidTaskSupplier() {
+ return mChromeAndroidTaskSupplier;
+ }
+
@Override
public void onStartWithNative() {
assert mNativeInitialized : "onStartWithNative was called before native was initialized.";
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
@@ -364,6 +364,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity {
getTabModelSelectorSupplier(),
getBrowserControlsManager(),
getWindowAndroid(),
+ getChromeAndroidTaskSupplier(),
getLifecycleDispatcher(),
getLayoutManagerSupplier(),
/* menuOrKeyboardActionController= */ this,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
@@ -30,6 +30,7 @@ import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.ObservableSupplierImpl;
import org.chromium.base.supplier.OneShotCallback;
+import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.base.supplier.OneshotSupplierImpl;
import org.chromium.base.supplier.SupplierUtils;
import org.chromium.chrome.R;
@@ -96,6 +97,7 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuBlocker;
import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator;
import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
import org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarCoordinator;
@@ -160,6 +162,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
* @param tabModelSelectorSupplier Supplies the {@link TabModelSelector}.
* @param browserControlsManager Manages the browser controls.
* @param windowAndroid The current {@link WindowAndroid}.
+ * @param chromeAndroidTaskSupplier Supplies an {@link ChromeAndroidTask}.
* @param activityLifecycleDispatcher Allows observation of the activity lifecycle.
* @param layoutManagerSupplier Supplies the {@link LayoutManager}.
* @param menuOrKeyboardActionController Controls the menu or keyboard action controller.
@@ -200,6 +203,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
@NonNull BrowserControlsManager browserControlsManager,
@NonNull ActivityWindowAndroid windowAndroid,
+ @NonNull OneshotSupplier<ChromeAndroidTask> chromeAndroidTaskSupplier,
@NonNull ActivityLifecycleDispatcher activityLifecycleDispatcher,
@NonNull ObservableSupplier<LayoutManagerImpl> layoutManagerSupplier,
@NonNull MenuOrKeyboardActionController menuOrKeyboardActionController,
@@ -245,6 +249,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
new OneshotSupplierImpl<>(),
browserControlsManager,
windowAndroid,
+ chromeAndroidTaskSupplier,
activityLifecycleDispatcher,
layoutManagerSupplier,
menuOrKeyboardActionController,
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -411,6 +411,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@NonNull OneshotSupplier<LayoutStateProvider> layoutStateProviderOneshotSupplier,
@NonNull BrowserControlsManager browserControlsManager,
@NonNull ActivityWindowAndroid windowAndroid,
+ @NonNull OneshotSupplier chromeAndroidTaskSupplier,
@NonNull ActivityLifecycleDispatcher activityLifecycleDispatcher,
@NonNull ObservableSupplier<LayoutManagerImpl> layoutManagerSupplier,
@NonNull MenuOrKeyboardActionController menuOrKeyboardActionController,
@@ -461,6 +462,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
layoutStateProviderOneshotSupplier,
browserControlsManager,
windowAndroid,
+ chromeAndroidTaskSupplier,
activityLifecycleDispatcher,
layoutManagerSupplier,
menuOrKeyboardActionController,
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -184,6 +184,7 @@ import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoord
import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator;
import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
import org.chromium.chrome.browser.ui.appmenu.MenuButtonDelegate;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
import org.chromium.chrome.browser.ui.native_page.NativePage;
import org.chromium.chrome.browser.ui.system.StatusBarColorController;
@@ -748,6 +749,7 @@ public class ToolbarManager
* @param omniboxFocusStateSupplier Supplier to access the focus state of the omnibox.
* @param promoShownOneshotSupplier Supplier for whether a promo was shown on startup.
* @param windowAndroid The {@link WindowAndroid} associated with the ToolbarManager.
+ * @param chromeAndroidTaskSupplier Supplier of the {@link ChromeAndroidTask}.
* @param isInOverviewModeSupplier Supplies whether the app is currently in overview mode.
* @param modalDialogManagerSupplier Supplies the {@link ModalDialogManager}.
* @param statusBarColorController The {@link StatusBarColorController} for the app.
@@ -800,6 +802,7 @@ public class ToolbarManager
ObservableSupplier<Boolean> omniboxFocusStateSupplier,
OneshotSupplier<Boolean> promoShownOneshotSupplier,
WindowAndroid windowAndroid,
+ OneshotSupplier<ChromeAndroidTask> chromeAndroidTaskSupplier,
Supplier<Boolean> isInOverviewModeSupplier,
Supplier<ModalDialogManager> modalDialogManagerSupplier,
StatusBarColorController statusBarColorController,
@@ -1127,6 +1130,7 @@ public class ToolbarManager
mActivity,
extensionToolbarStub,
windowAndroid,
+ chromeAndroidTaskSupplier,
(ObservableSupplier<Profile>) profileSupplier,
(ObservableSupplier<Tab>) tabProvider,
mTabCreatorManager.getTabCreator(false),
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -166,6 +166,7 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinatorFactory;
import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
import org.chromium.chrome.browser.ui.appmenu.AppMenuObserver;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator;
@@ -262,6 +263,7 @@ public class RootUiCoordinator
protected @Nullable AppMenuCoordinator mAppMenuCoordinator;
private final MenuOrKeyboardActionController mMenuOrKeyboardActionController;
protected final ActivityWindowAndroid mWindowAndroid;
+ private final OneshotSupplier<ChromeAndroidTask> mChromeAndroidTaskSupplier;
protected final ActivityTabProvider mActivityTabProvider;
protected ObservableSupplier<ShareDelegate> mShareDelegateSupplier;
@@ -401,6 +403,7 @@ public class RootUiCoordinator
* @param layoutStateProviderOneshotSupplier Supplier of the {@link LayoutStateProvider}.
* @param browserControlsManager Manages the browser controls.
* @param windowAndroid The current {@link WindowAndroid}.
+ * @param chromeAndroidTaskSupplier Supplies an {@link ChromeAndroidTask}.
* @param activityLifecycleDispatcher Allows observation of the activity lifecycle.
* @param layoutManagerSupplier Supplies the {@link LayoutManager}.
* @param menuOrKeyboardActionController Controls the menu or keyboard action controller.
@@ -446,6 +449,7 @@ public class RootUiCoordinator
@NonNull OneshotSupplier<LayoutStateProvider> layoutStateProviderOneshotSupplier,
@NonNull BrowserControlsManager browserControlsManager,
@NonNull ActivityWindowAndroid windowAndroid,
+ @NonNull OneshotSupplier<ChromeAndroidTask> chromeAndroidTaskSupplier,
@NonNull ActivityLifecycleDispatcher activityLifecycleDispatcher,
@NonNull ObservableSupplier<LayoutManagerImpl> layoutManagerSupplier,
@NonNull MenuOrKeyboardActionController menuOrKeyboardActionController,
@@ -478,6 +482,7 @@ public class RootUiCoordinator
mCallbackController = new CallbackController();
mActivity = activity;
mWindowAndroid = windowAndroid;
+ mChromeAndroidTaskSupplier = chromeAndroidTaskSupplier;
setupUnownedUserDataSuppliers();
mOnOmniboxFocusChangedListener = onOmniboxFocusChangedListener;
mBrowserControlsManager = browserControlsManager;
@@ -1715,6 +1720,7 @@ public class RootUiCoordinator
mOmniboxFocusStateSupplier,
mPromoShownOneshotSupplier,
mWindowAndroid,
+ mChromeAndroidTaskSupplier,
mIsInOverviewModeSupplier,
mModalDialogManagerSupplier,
mStatusBarColorController,
diff --git a/chrome/android/junit/BUILD.gn b/chrome/android/junit/BUILD.gn
--- a/chrome/android/junit/BUILD.gn
+++ b/chrome/android/junit/BUILD.gn
@@ -205,6 +205,7 @@ if (is_android) {
"//chrome/browser/ui/android/signin:java",
"//chrome/browser/ui/android/theme:java",
"//chrome/browser/ui/android/toolbar:java",
+ "//chrome/browser/ui/browser_window/public/android:java",
"//chrome/browser/ui/messages/android:java",
"//chrome/browser/uid/android:java",
"//chrome/browser/url_constants/android:java",
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinatorUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinatorUnitTest.java
--- a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinatorUnitTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinatorUnitTest.java
@@ -39,6 +39,7 @@ import org.chromium.base.TimeUtils;
import org.chromium.base.UnownedUserDataHost;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.ObservableSupplierImpl;
+import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.Features.DisableFeatures;
@@ -74,6 +75,7 @@ import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.ui.appmenu.AppMenuBlocker;
import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
import org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarCoordinator;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -123,6 +125,7 @@ public final class BaseCustomTabRootUiCoordinatorUnitTest {
mBrowserStateBrowserControlsVisibilityDelegate;
@Mock private ActivityWindowAndroid mWindowAndroid;
+ @Mock private OneshotSupplier<ChromeAndroidTask> mChromeAndroidTask;
@Mock private ActivityLifecycleDispatcher mActivityLifecycleDispatcher;
@Mock private ObservableSupplier<LayoutManagerImpl> mLayoutManagerSupplier;
@Mock private MenuOrKeyboardActionController mMenuOrKeyboardActionController;
@@ -196,6 +199,7 @@ public final class BaseCustomTabRootUiCoordinatorUnitTest {
mTabModelSelectorSupplier,
mBrowserControlsManager,
mWindowAndroid,
+ mChromeAndroidTask,
mActivityLifecycleDispatcher,
mLayoutManagerSupplier,
mMenuOrKeyboardActionController,
diff --git a/chrome/browser/extensions/extension_view_host_factory.cc b/chrome/browser/extensions/extension_view_host_factory.cc
--- a/chrome/browser/extensions/extension_view_host_factory.cc
+++ b/chrome/browser/extensions/extension_view_host_factory.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window/public/browser_window_features.h"
+#include "chrome/browser/ui/browser_window/public/browser_window_interface.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/keyboard_event_processing_result.h"
#include "content/public/browser/web_contents.h"
@@ -21,9 +22,9 @@
#include "extensions/common/manifest_handlers/incognito_info.h"
#include "extensions/common/mojom/view_type.mojom.h"
-#if !BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/ui/browser.h"
-#endif // !BUILDFLAG(IS_ANDROID)
+#endif // BUILDFLAG(ENABLE_EXTENSIONS)
static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
@@ -31,51 +32,7 @@ namespace extensions {
namespace {
-#if BUILDFLAG(IS_ANDROID)
-
-// Delegate for ExtensionViewHost on Android.
-class ExtensionViewHostDelegateAndroid : public ExtensionViewHost::Delegate {
- public:
- ExtensionViewHostDelegateAndroid() = default;
- ExtensionViewHostDelegateAndroid(const ExtensionViewHostDelegateAndroid&) =
- delete;
- ExtensionViewHostDelegateAndroid& operator=(
- const ExtensionViewHostDelegateAndroid&) = delete;
- ~ExtensionViewHostDelegateAndroid() override = default;
-
- content::WebContents* OpenURL(
- const content::OpenURLParams& params,
- base::OnceCallback<void(content::NavigationHandle&)>
- navigation_handle_callback) override {
- // TODO(cbrug.com/385987224): Implement this method for Android.
- NOTIMPLEMENTED();
- return nullptr;
- }
-
- content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
- content::WebContents* source,
- const input::NativeWebKeyboardEvent& event) override {
- // TODO(cbrug.com/385987224): Implement this method for Android.
- NOTIMPLEMENTED();
- return content::KeyboardEventProcessingResult::NOT_HANDLED;
- }
-
- std::unique_ptr<content::EyeDropper> OpenEyeDropper(
- content::RenderFrameHost* frame,
- content::EyeDropperListener* listener) override {
- // TODO(cbrug.com/385987224): Implement this method for Android.
- NOTIMPLEMENTED();
- return nullptr;
- }
-
- WindowController* GetExtensionWindowController() const override {
- // TODO(cbrug.com/385987224): Implement this method for Android.
- NOTIMPLEMENTED();
- return nullptr;
- }
-};
-
-#else // BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
// Delegate for ExtensionViewHost attached to a specific browser window.
class ExtensionViewHostBrowserDelegate : public ExtensionViewHost::Delegate {
@@ -175,7 +132,52 @@ class ExtensionViewHostTabDelegate : public ExtensionViewHost::Delegate {
raw_ptr<content::WebContents> web_contents_;
};
-#endif // BUILDFLAG(IS_ANDROID)
+
+#else // BUILDFLAG(ENABLE_EXTENSIONS)
+
+// Delegate for ExtensionViewHost on Android.
+class ExtensionViewHostDelegateAndroid : public ExtensionViewHost::Delegate {
+ public:
+ ExtensionViewHostDelegateAndroid() = default;
+ ExtensionViewHostDelegateAndroid(const ExtensionViewHostDelegateAndroid&) =
+ delete;
+ ExtensionViewHostDelegateAndroid& operator=(
+ const ExtensionViewHostDelegateAndroid&) = delete;
+ ~ExtensionViewHostDelegateAndroid() override = default;
+
+ content::WebContents* OpenURL(
+ const content::OpenURLParams& params,
+ base::OnceCallback<void(content::NavigationHandle&)>
+ navigation_handle_callback) override {
+ // TODO(cbrug.com/385987224): Implement this method for Android.
+ NOTIMPLEMENTED();
+ return nullptr;
+ }
+
+ content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
+ content::WebContents* source,
+ const input::NativeWebKeyboardEvent& event) override {
+ // TODO(cbrug.com/385987224): Implement this method for Android.
+ NOTIMPLEMENTED();
+ return content::KeyboardEventProcessingResult::NOT_HANDLED;
+ }
+
+ std::unique_ptr<content::EyeDropper> OpenEyeDropper(
+ content::RenderFrameHost* frame,
+ content::EyeDropperListener* listener) override {
+ // TODO(cbrug.com/385987224): Implement this method for Android.
+ NOTIMPLEMENTED();
+ return nullptr;
+ }
+
+ WindowController* GetExtensionWindowController() const override {
+ // TODO(cbrug.com/385987224): Implement this method for Android.
+ NOTIMPLEMENTED();
+ return nullptr;
+ }
+};
+
+#endif // BUILDFLAG(ENABLE_EXTENSIONS)
// Creates a new ExtensionHost with its associated view, grouping it in the
// appropriate SiteInstance (and therefore process) based on the URL and
@@ -264,28 +266,23 @@ std::unique_ptr<ExtensionViewHost> CreateViewHost(
} // namespace
-#if BUILDFLAG(IS_ANDROID)
-
// static
std::unique_ptr<ExtensionViewHost> ExtensionViewHostFactory::CreatePopupHost(
const GURL& url,
- Profile* profile) {
- return CreateViewHost(url, profile, mojom::ViewType::kExtensionPopup,
- std::make_unique<ExtensionViewHostDelegateAndroid>());
-}
-
-#else // BUILDFLAG(IS_ANDROID)
-
-// static
-std::unique_ptr<ExtensionViewHost> ExtensionViewHostFactory::CreatePopupHost(
- const GURL& url,
- Browser* browser) {
+ BrowserWindowInterface* browser) {
DCHECK(browser);
- return CreateViewHost(
- url, browser->profile(), mojom::ViewType::kExtensionPopup,
- std::make_unique<ExtensionViewHostBrowserDelegate>(browser));
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+ auto delegate = std::make_unique<ExtensionViewHostBrowserDelegate>(
+ browser->GetBrowserForMigrationOnly());
+#else // BUILDFLAG(ENABLE_EXTENSIONS)
+ auto delegate = std::make_unique<ExtensionViewHostDelegateAndroid>();
+#endif // BUILDFLAG(ENABLE_EXTENSIONS)
+ return CreateViewHost(url, browser->GetProfile(),
+ mojom::ViewType::kExtensionPopup, std::move(delegate));
}
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+
// static
std::unique_ptr<ExtensionViewHost>
ExtensionViewHostFactory::CreateSidePanelHost(
@@ -311,6 +308,6 @@ ExtensionViewHostFactory::CreateSidePanelHost(
std::move(delegate));
}
-#endif // BUILDFLAG(IS_ANDROID)
+#endif // BUILDFLAG(ENABLE_EXTENSIONS)
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_view_host_factory.h b/chrome/browser/extensions/extension_view_host_factory.h
--- a/chrome/browser/extensions/extension_view_host_factory.h
+++ b/chrome/browser/extensions/extension_view_host_factory.h
@@ -12,10 +12,8 @@
static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
-class Browser;
class BrowserWindowInterface;
class GURL;
-class Profile;
namespace tabs {
class TabInterface;
@@ -33,19 +31,14 @@ class ExtensionViewHostFactory {
ExtensionViewHostFactory(const ExtensionViewHostFactory&) = delete;
ExtensionViewHostFactory& operator=(const ExtensionViewHostFactory&) = delete;
-#if BUILDFLAG(IS_ANDROID)
// Creates a new ExtensionHost with its associated view, grouping it in the
// appropriate SiteInstance (and therefore process) based on the URL and
// profile.
- static std::unique_ptr<ExtensionViewHost> CreatePopupHost(const GURL& url,
- Profile* profile);
-#else // BUILDFLAG(IS_ANDROID)
- // Creates a new ExtensionHost with its associated view, grouping it in the
- // appropriate SiteInstance (and therefore process) based on the URL and
- // profile.
- static std::unique_ptr<ExtensionViewHost> CreatePopupHost(const GURL& url,
- Browser* browser);
+ static std::unique_ptr<ExtensionViewHost> CreatePopupHost(
+ const GURL& url,
+ BrowserWindowInterface* browser);
+#if BUILDFLAG(ENABLE_EXTENSIONS)
// Creates a new ExtensionHost with its associated view, grouping it in the
// appropriate SiteInstance (and therefore process) based on the URL and
// profile.
@@ -54,7 +47,7 @@ class ExtensionViewHostFactory {
const GURL& url,
BrowserWindowInterface* browser,
tabs::TabInterface* tab_interface);
-#endif // BUILDFLAG(IS_ANDROID)
+#endif // BUILDFLAG(ENABLE_EXTENSIONS)
};
} // namespace extensions
diff --git a/chrome/browser/ui/android/extensions/BUILD.gn b/chrome/browser/ui/android/extensions/BUILD.gn
--- a/chrome/browser/ui/android/extensions/BUILD.gn
+++ b/chrome/browser/ui/android/extensions/BUILD.gn
@@ -24,6 +24,7 @@ android_library("java") {
"//chrome/browser/tab:java",
"//chrome/browser/tabmodel:java",
"//chrome/browser/ui/android/theme:java",
+ "//chrome/browser/ui/browser_window/public/android:java",
"//components/browser_ui/widget/android:java",
"//third_party/android_deps:material_design_java",
"//ui/android:ui_full_java",
diff --git a/chrome/browser/ui/android/extensions/extension_action_popup_contents.cc b/chrome/browser/ui/android/extensions/extension_action_popup_contents.cc
--- a/chrome/browser/ui/android/extensions/extension_action_popup_contents.cc
+++ b/chrome/browser/ui/android/extensions/extension_action_popup_contents.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_view_host.h"
#include "chrome/browser/extensions/extension_view_host_factory.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser_window/internal/android/android_browser_window.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/extension_action.h"
@@ -135,9 +136,13 @@ void ExtensionActionPopupContents::HandleCloseExtensionHost(
// popup.
static ScopedJavaLocalRef<jobject> JNI_ExtensionActionPopupContents_Create(
JNIEnv* env,
- Profile* profile,
+ jlong browser_window_interface_ptr,
std::string& action_id,
int tab_id) {
+ BrowserWindowInterface* browser =
+ reinterpret_cast<BrowserWindowInterface*>(browser_window_interface_ptr);
+ Profile* profile = browser->GetProfile();
+
ExtensionRegistry* registry = ExtensionRegistry::Get(profile);
DCHECK(registry);
@@ -154,7 +159,7 @@ static ScopedJavaLocalRef<jobject> JNI_ExtensionActionPopupContents_Create(
GURL popup_url = action->GetPopupUrl(tab_id);
std::unique_ptr<ExtensionViewHost> host =
- ExtensionViewHostFactory::CreatePopupHost(popup_url, profile);
+ ExtensionViewHostFactory::CreatePopupHost(popup_url, browser);
DCHECK(host);
// The ExtensionActionPopupContents C++ object's lifetime is managed by its
diff --git a/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionActionPopupContents.java b/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionActionPopupContents.java
--- a/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionActionPopupContents.java
+++ b/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionActionPopupContents.java
@@ -12,7 +12,7 @@ import org.jni_zero.NativeMethods;
import org.chromium.base.lifetime.Destroyable;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
-import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.content_public.browser.WebContents;
/**
@@ -50,8 +50,10 @@ public class ExtensionActionPopupContents implements Destroyable {
}
/** Creates an {@link ExtensionActionPopupContents} instance. */
- public static ExtensionActionPopupContents create(Profile profile, String actionId, int tabId) {
- return ExtensionActionPopupContentsJni.get().create(profile, actionId, tabId);
+ public static ExtensionActionPopupContents create(
+ ChromeAndroidTask task, String actionId, int tabId) {
+ return ExtensionActionPopupContentsJni.get()
+ .create(task.getOrCreateNativeBrowserWindowPtr(), actionId, tabId);
}
/**
@@ -138,15 +140,13 @@ public class ExtensionActionPopupContents implements Destroyable {
/**
* Creates the native ExtensionActionPopupContents object and returns its Java peer.
*
- * @param profile The {@link Profile} associated with the extension.
+ * @param androidBrowserWindowPtr The address of a native {@code BrowserWindowInterface}.
* @param actionId The ID of the extension action.
* @param tabId The ID of the tab context.
* @return The Java {@link ExtensionActionPopupContents} object, or {@code null} on failure.
*/
ExtensionActionPopupContents create(
- @JniType("Profile*") Profile profile,
- @JniType("std::string") String actionId,
- int tabId);
+ long androidBrowserWindowPtr, @JniType("std::string") String actionId, int tabId);
/**
* Destroys the native ExtensionActionPopupContents object.
diff --git a/chrome/browser/ui/android/extensions/windowing/internal/BUILD.gn b/chrome/browser/ui/android/extensions/windowing/internal/BUILD.gn
--- a/chrome/browser/ui/android/extensions/windowing/internal/BUILD.gn
+++ b/chrome/browser/ui/android/extensions/windowing/internal/BUILD.gn
@@ -38,6 +38,7 @@ android_library("java") {
]
deps = [
"//build/android:build_java",
+ "//chrome/browser/profiles/android:java",
"//chrome/browser/ui/android/extensions/windowing:java",
"//chrome/browser/ui/browser_window/public/android:java",
"//third_party/androidx:androidx_annotation_annotation_java",
diff --git a/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeImpl.java b/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeImpl.java
--- a/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeImpl.java
+++ b/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeImpl.java
@@ -11,6 +11,8 @@ import org.jni_zero.CalledByNative;
import org.jni_zero.NativeMethods;
import org.chromium.build.annotations.NullMarked;
+import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import java.util.ArrayList;
@@ -19,7 +21,8 @@ import java.util.Map;
/** Implements {@link ExtensionWindowControllerBridge}. */
@NullMarked
-final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowControllerBridge {
+final class ExtensionWindowControllerBridgeImpl
+ implements ExtensionWindowControllerBridge, ProfileManager.Observer {
/**
* Events received by the native singleton {@code WindowControllerListObserverForTesting}.
@@ -82,6 +85,7 @@ final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowContro
assert mNativeExtensionWindowControllerBridge == 0
: "ExtensionWindowControllerBridge is already added to a task.";
+ ProfileManager.addObserver(this);
mNativeExtensionWindowControllerBridge =
ExtensionWindowControllerBridgeImplJni.get()
.create(
@@ -91,10 +95,8 @@ final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowContro
@Override
public void onTaskRemoved() {
- if (mNativeExtensionWindowControllerBridge != 0) {
- ExtensionWindowControllerBridgeImplJni.get()
- .destroy(mNativeExtensionWindowControllerBridge);
- }
+ destroyNativeExtensionWindowControllerBridge();
+ ProfileManager.removeObserver(this);
}
@Override
@@ -113,6 +115,32 @@ final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowContro
}
}
+ @Override
+ public void onProfileAdded(Profile profile) {}
+
+ @Override
+ public void onProfileDestroyed(Profile profile) {
+ // This is a short-term fix for http://crbug.com/450234852.
+ //
+ // The native extension code is cross-platform and depends on BrowserWindowInterface. Per
+ // documentation of BrowserWindowInterface::GetProfile(), cross-platform code assumes
+ // BrowserWindowInterface will always be destroyed *before* its Profile.
+ //
+ // See:
+ // https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/browser_window/public/browser_window_interface.h;l=108;drc=c8dc70b538f1bb0862f1be58237d6e945ee81819
+ //
+ // However, on Android, http://crbug.com/450234852 reveals a case where the Profile is
+ // destroyed before its BrowserWindowInterface, which caused native extension code to
+ // dereference an invalid Profile pointer.
+ //
+ // To avoid this issue, we destroy the native objects for extensions as soon as the native
+ // Profile is about to be destroyed. The long-term fix should be to correct the object
+ // destruction order for the case described in http://crbug.com/450234852.
+ if (profile == mChromeAndroidTask.getProfile()) {
+ destroyNativeExtensionWindowControllerBridge();
+ }
+ }
+
long getNativePtrForTesting() {
return mNativeExtensionWindowControllerBridge;
}
@@ -123,6 +151,13 @@ final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowContro
.getExtensionWindowIdForTesting(mNativeExtensionWindowControllerBridge); // IN-TEST
}
+ private void destroyNativeExtensionWindowControllerBridge() {
+ if (mNativeExtensionWindowControllerBridge != 0) {
+ ExtensionWindowControllerBridgeImplJni.get()
+ .destroy(mNativeExtensionWindowControllerBridge);
+ }
+ }
+
@CalledByNative
private void clearNativePtr() {
mNativeExtensionWindowControllerBridge = 0;
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -189,6 +189,7 @@ android_library("java") {
"//chrome/browser/ui/android/omnibox:java_resources",
"//chrome/browser/ui/android/pdf:java",
"//chrome/browser/ui/android/theme:java",
+ "//chrome/browser/ui/browser_window/public/android:java",
"//chrome/browser/url_constants/android:java",
"//chrome/browser/user_education:java",
"//chrome/browser/util:java",
@@ -478,6 +479,7 @@ robolectric_library("junit") {
"//chrome/browser/ui/android/omnibox:java_resources",
"//chrome/browser/ui/android/theme:java",
"//chrome/browser/ui/android/toolbar:java_resources",
+ "//chrome/browser/ui/browser_window/public/android:java",
"//chrome/browser/user_education:java",
"//chrome/test/android:chrome_java_unit_test_support",
"//components/browser_ui/bottomsheet/android:java",
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java
@@ -10,11 +10,13 @@ import android.view.LayoutInflater;
import org.chromium.base.lifetime.Destroyable;
import org.chromium.base.lifetime.LifetimeAssert;
import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.toolbar.extensions.ExtensionActionButtonProperties.ListItemType;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.chrome.browser.ui.extensions.R;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.listmenu.ListMenuButton;
@@ -37,6 +39,7 @@ public class ExtensionActionListCoordinator implements Destroyable {
Context context,
ExtensionActionListContainer container,
WindowAndroid windowAndroid,
+ OneshotSupplier<ChromeAndroidTask> taskSupplier,
ObservableSupplier<Profile> profileSupplier,
ObservableSupplier<Tab> currentTabSupplier) {
mContainer = container;
@@ -44,7 +47,12 @@ public class ExtensionActionListCoordinator implements Destroyable {
mModels = new ModelList();
mMediator =
new ExtensionActionListMediator(
- context, windowAndroid, mModels, profileSupplier, currentTabSupplier);
+ context,
+ windowAndroid,
+ mModels,
+ taskSupplier,
+ profileSupplier,
+ currentTabSupplier);
mAdapter =
new ViewGroupAdapter.Builder(mContainer, mModels)
.registerType(
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediator.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediator.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediator.java
@@ -12,6 +12,7 @@ import org.chromium.base.Log;
import org.chromium.base.lifetime.Destroyable;
import org.chromium.base.lifetime.LifetimeAssert;
import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.browser.extensions.ContextMenuSource;
@@ -19,6 +20,7 @@ import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.toolbar.MenuBuilderHelper;
import org.chromium.chrome.browser.toolbar.extensions.ExtensionActionButtonProperties.ListItemType;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.chrome.browser.ui.extensions.ExtensionAction;
import org.chromium.chrome.browser.ui.extensions.ExtensionActionContextMenuBridge;
import org.chromium.chrome.browser.ui.extensions.ExtensionActionPopupContents;
@@ -38,6 +40,7 @@ class ExtensionActionListMediator implements Destroyable {
private final Context mContext;
private final WindowAndroid mWindowAndroid;
private final ModelList mModels;
+ private final OneshotSupplier<ChromeAndroidTask> mTaskSupplier;
private final ExtensionActionsUpdateHelper mExtensionActionsUpdateHelper;
private final ActionsUpdateDelegate mActionsUpdateDelegate = new ActionsUpdateDelegate();
@@ -50,11 +53,13 @@ class ExtensionActionListMediator implements Destroyable {
Context context,
WindowAndroid windowAndroid,
ModelList models,
+ OneshotSupplier<ChromeAndroidTask> taskSupplier,
ObservableSupplier<Profile> profileSupplier,
ObservableSupplier<Tab> currentTabSupplier) {
mContext = context;
mWindowAndroid = windowAndroid;
mModels = models;
+ mTaskSupplier = taskSupplier;
mExtensionActionsUpdateHelper =
new ExtensionActionsUpdateHelper(
@@ -103,16 +108,19 @@ class ExtensionActionListMediator implements Destroyable {
// button while its popup is open.
closePopup();
- Tab currentTab = mExtensionActionsUpdateHelper.getCurrentTab();
- Profile profile = mExtensionActionsUpdateHelper.getProfile();
+ ChromeAndroidTask task = mTaskSupplier.get();
+ if (task == null) {
+ return;
+ }
- if (profile == null || currentTab == null) {
+ Tab currentTab = mExtensionActionsUpdateHelper.getCurrentTab();
+ if (currentTab == null) {
return;
}
int tabId = currentTab.getId();
ExtensionActionPopupContents contents =
- ExtensionActionPopupContents.create(profile, actionId, tabId);
+ ExtensionActionPopupContents.create(task, actionId, tabId);
assert mCurrentPopup == null;
mCurrentPopup =
new ExtensionActionPopup(mContext, mWindowAndroid, buttonView, actionId, contents);
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediatorTest.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediatorTest.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediatorTest.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediatorTest.java
@@ -39,12 +39,14 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.annotation.LooperMode;
import org.chromium.base.supplier.ObservableSupplierImpl;
+import org.chromium.base.supplier.OneshotSupplierImpl;
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.chrome.browser.extensions.ContextMenuSource;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.MockTab;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.toolbar.extensions.ExtensionActionButtonProperties.ListItemType;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.chrome.browser.ui.extensions.ExtensionActionContextMenuBridge;
import org.chromium.chrome.browser.ui.extensions.ExtensionActionContextMenuBridgeJni;
import org.chromium.chrome.browser.ui.extensions.FakeExtensionActionsBridge;
@@ -86,6 +88,7 @@ public class ExtensionActionListMediatorTest {
private FakeExtensionActionsBridge.ProfileModel mProfileModel;
private MockTab mTab1;
private MockTab mTab2;
+ private OneshotSupplierImpl<ChromeAndroidTask> mTaskSupplier;
private ObservableSupplierImpl<Profile> mProfileSupplier;
private ObservableSupplierImpl<Tab> mCurrentTabSupplier;
private ModelList mModels;
@@ -108,12 +111,18 @@ public class ExtensionActionListMediatorTest {
mTab2 = new MockTab(TAB2_ID, mProfile);
mTab1.setWebContentsOverrideForTesting(mWebContents);
mTab2.setWebContentsOverrideForTesting(mWebContents);
+ mTaskSupplier = new OneshotSupplierImpl<>();
mProfileSupplier = new ObservableSupplierImpl<>();
mCurrentTabSupplier = new ObservableSupplierImpl<>();
mModels = new ModelList();
mMediator =
new ExtensionActionListMediator(
- context, mWindowAndroid, mModels, mProfileSupplier, mCurrentTabSupplier);
+ context,
+ mWindowAndroid,
+ mModels,
+ mTaskSupplier,
+ mProfileSupplier,
+ mCurrentTabSupplier);
// Wait for the main thread to settle.
shadowOf(Looper.getMainLooper()).idle();
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinator.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinator.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinator.java
@@ -11,6 +11,7 @@ import android.view.ViewStub;
import org.chromium.base.ServiceLoaderUtil;
import org.chromium.base.lifetime.Destroyable;
import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.Initializer;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
@@ -18,6 +19,7 @@ import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabCreator;
import org.chromium.chrome.browser.theme.ThemeColorProvider;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.ui.base.WindowAndroid;
/**
@@ -40,6 +42,7 @@ public interface ExtensionToolbarCoordinator extends Destroyable {
Context context,
ViewStub extensionToolbarStub,
WindowAndroid windowAndroid,
+ OneshotSupplier<ChromeAndroidTask> taskSupplier,
ObservableSupplier<Profile> profileSupplier,
ObservableSupplier<Tab> currentTabSupplier,
TabCreator tabCreator,
@@ -53,6 +56,7 @@ public interface ExtensionToolbarCoordinator extends Destroyable {
context,
extensionToolbarStub,
windowAndroid,
+ taskSupplier,
profileSupplier,
currentTabSupplier,
tabCreator,
@@ -71,6 +75,7 @@ public interface ExtensionToolbarCoordinator extends Destroyable {
Context context,
ViewStub extensionToolbarStub,
WindowAndroid windowAndroid,
+ OneshotSupplier<ChromeAndroidTask> taskSupplier,
ObservableSupplier<Profile> profileSupplier,
ObservableSupplier<Tab> currentTabSupplier,
TabCreator tabCreator,
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinatorImpl.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinatorImpl.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinatorImpl.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinatorImpl.java
@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
import org.chromium.base.Callback;
import org.chromium.base.lifetime.LifetimeAssert;
import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.build.annotations.ServiceImpl;
@@ -20,6 +21,7 @@ import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabCreator;
import org.chromium.chrome.browser.theme.ThemeColorProvider;
+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask;
import org.chromium.chrome.browser.ui.extensions.ExtensionActionsBridge;
import org.chromium.chrome.browser.ui.extensions.ExtensionUi;
import org.chromium.chrome.browser.ui.extensions.R;
@@ -44,6 +46,7 @@ public class ExtensionToolbarCoordinatorImpl implements ExtensionToolbarCoordina
Context context,
ViewStub extensionToolbarStub,
WindowAndroid windowAndroid,
+ OneshotSupplier<ChromeAndroidTask> taskSupplier,
ObservableSupplier<Profile> profileSupplier,
ObservableSupplier<Tab> currentTabSupplier,
TabCreator tabCreator,
@@ -63,6 +66,7 @@ public class ExtensionToolbarCoordinatorImpl implements ExtensionToolbarCoordina
context,
container.findViewById(R.id.extension_action_list),
windowAndroid,
+ taskSupplier,
profileSupplier,
currentTabSupplier);
mExtensionsMenuCoordinator =
--
build/patches/Battery-API-return-nothing.patch
+1 -1
View File
@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
--- a/third_party/blink/renderer/modules/battery/battery_manager.cc
+++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -80,46 +80,28 @@ ScriptPromise<BatteryManager> BatteryManager::StartRequest(
@@ -77,46 +77,28 @@ ScriptPromise<BatteryManager> BatteryManager::StartRequest(
}
bool BatteryManager::charging() {
build/patches/Block-gateway-attacks-via-websockets.patch
+3 -3
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/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
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -391,6 +391,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
@@ -425,6 +425,7 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext,
void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -93,8 +93,8 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
+#include "third_party/blink/renderer/platform/network/network_utils.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/scheduler/public/virtual_time_controller.h"
#include "third_party/blink/renderer/platform/supplementable.h"
@@ -90,6 +91,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
#include "third_party/blink/renderer/platform/weborigin/security_policy.h"
@@ -89,6 +90,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
return should_block_request;
}
build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch
+3 -3
View File
@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
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
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5180,7 +5180,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
@@ -5158,7 +5158,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
}
void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
@@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
return referrer_;
}
@@ -2903,6 +2908,13 @@ void DocumentLoader::CommitNavigation() {
@@ -2913,6 +2918,13 @@ void DocumentLoader::CommitNavigation() {
response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly));
}
@@ -135,7 +135,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
--- a/third_party/blink/renderer/core/loader/document_loader.h
+++ b/third_party/blink/renderer/core/loader/document_loader.h
@@ -773,7 +773,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
@@ -768,7 +768,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
// |archive_|, but won't have |loading_main_document_from_mhtml_archive_| set.
bool loading_main_document_from_mhtml_archive_ = false;
const bool loading_srcdoc_ = false;
build/patches/Block-qjz9zk-or-trk-requests.patch
-277
View File
@@ -1,277 +0,0 @@
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Wed, 30 Oct 2019 11:50:13 +0100
Subject: Block 'qjz9zk' or 'trk:' requests
An info bar is displayed unless the --disable-trkbar command-line flag or the chrome://flag option is used.
This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../chrome_autocomplete_scheme_classifier.cc | 1 +
chrome/browser/history/history_utils.cc | 1 +
chrome/browser/ui/singleton_tabs.cc | 5 ++++
.../omnibox/browser/autocomplete_input.cc | 8 ++++-
components/url_formatter/url_fixer.cc | 4 +++
.../child_process_security_policy_impl.cc | 1 +
net/BUILD.gn | 2 ++
net/url_request/trk_protocol_handler.cc | 25 ++++++++++++++++
net/url_request/trk_protocol_handler.h | 30 +++++++++++++++++++
net/url_request/url_request.cc | 8 +++++
.../url_request_context_builder.cc | 3 ++
url/url_constants.h | 1 +
url/url_util.cc | 2 ++
13 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 net/url_request/trk_protocol_handler.cc
create mode 100644 net/url_request/trk_protocol_handler.h
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
@@ -72,6 +72,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
if (base::IsStringASCII(scheme) &&
(ProfileIOData::IsHandledProtocol(scheme) ||
base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
+ base::EqualsCaseInsensitiveASCII(scheme, url::kTraceScheme) ||
base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) ||
base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme))) {
return metrics::OmniboxInputType::URL;
diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc
--- a/chrome/browser/history/history_utils.cc
+++ b/chrome/browser/history/history_utils.cc
@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url) {
url.SchemeIs(content::kChromeUIScheme) ||
url.SchemeIs(content::kChromeUIUntrustedScheme) ||
url.SchemeIs(content::kViewSourceScheme) ||
+ url.SchemeIs(url::kTraceScheme) ||
url.SchemeIs(chrome::kChromeNativeScheme) ||
url.SchemeIs(chrome::kChromeSearchScheme) ||
url.SchemeIs(dom_distiller::kDomDistillerScheme))
diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -144,6 +144,11 @@ int GetIndexOfExistingTab(BrowserWindowInterface* browser,
continue;
}
+ // trk: URLs must not be rewritten
+ if (tab_url.SchemeIs(url::kTraceScheme)) {
+ continue;
+ }
+
GURL rewritten_tab_url = tab_url;
content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
&rewritten_tab_url, browser->GetProfile());
diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -92,10 +92,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
bool HasScheme(const std::u16string& input, const char* scheme) {
std::string utf8_input(base::UTF16ToUTF8(input));
url::Component view_source_scheme;
+
+ if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &view_source_scheme)) {
+ return false;
+ }
if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme,
&view_source_scheme)) {
utf8_input.erase(0, view_source_scheme.end() + 1);
}
+
return url::FindAndCompareScheme(utf8_input, scheme, nullptr);
}
@@ -580,7 +585,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
// For the view-source and blob schemes, we should emphasize the host of the
// URL qualified by the view-source or blob prefix.
if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
- base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme)) &&
+ base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme) ||
+ base::EqualsCaseInsensitiveASCII(scheme_str, url::kTraceScheme)) &&
(static_cast<int>(text.length()) > after_scheme_and_colon)) {
// Obtain the URL prefixed by view-source or blob and parse it.
std::u16string real_url(text.substr(after_scheme_and_colon));
diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
--- a/components/url_formatter/url_fixer.cc
+++ b/components/url_formatter/url_fixer.cc
@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string& text,
}
}
+ if (scheme == url::kTraceScheme) {
+ return GURL();
+ }
+
// We handle the file scheme separately.
if (scheme == url::kFileScheme) {
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -969,6 +969,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
RegisterPseudoScheme(url::kJavaScriptScheme);
RegisterPseudoScheme(kViewSourceScheme);
RegisterPseudoScheme(kGoogleChromeScheme);
+ RegisterWebSafeScheme(url::kTraceScheme);
}
ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() = default;
diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1147,6 +1147,8 @@ component("net") {
"url_request/url_request_http_job.cc",
"url_request/url_request_http_job.h",
"url_request/url_request_interceptor.cc",
+ "url_request/trk_protocol_handler.cc",
+ "url_request/trk_protocol_handler.h",
"url_request/url_request_interceptor.h",
"url_request/url_request_job.cc",
"url_request/url_request_job.h",
diff --git a/net/url_request/trk_protocol_handler.cc b/net/url_request/trk_protocol_handler.cc
new file mode 100644
--- /dev/null
+++ b/net/url_request/trk_protocol_handler.cc
@@ -0,0 +1,25 @@
+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "net/url_request/trk_protocol_handler.h"
+
+#include "base/logging.h"
+#include "net/base/net_errors.h"
+#include "net/url_request/url_request_error_job.h"
+
+namespace net {
+
+TrkProtocolHandler::TrkProtocolHandler() = default;
+
+std::unique_ptr<URLRequestJob> TrkProtocolHandler::CreateJob(
+ URLRequest* request) const {
+ LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url();
+ return std::make_unique<URLRequestErrorJob>(request, ERR_BLOCKED_BY_CLIENT);
+}
+
+bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
+ return true;
+}
+
+} // namespace net
diff --git a/net/url_request/trk_protocol_handler.h b/net/url_request/trk_protocol_handler.h
new file mode 100644
--- /dev/null
+++ b/net/url_request/trk_protocol_handler.h
@@ -0,0 +1,30 @@
+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
+#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
+
+#include "base/compiler_specific.h"
+#include "net/base/net_export.h"
+#include "net/url_request/url_request_job_factory.h"
+
+namespace net {
+
+class URLRequestJob;
+
+// Implements a ProtocolHandler for Trk jobs.
+class NET_EXPORT TrkProtocolHandler
+ : public URLRequestJobFactory::ProtocolHandler {
+ public:
+ TrkProtocolHandler(const TrkProtocolHandler&) = delete;
+ TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete;
+
+ TrkProtocolHandler();
+ std::unique_ptr<URLRequestJob> CreateJob(URLRequest* request) const override;
+ bool IsSafeRedirectTarget(const GURL& location) const override;
+};
+
+} // namespace net
+
+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -15,6 +15,7 @@
#include "base/notreached.h"
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/strings/string_util.h"
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
#include "base/types/optional_util.h"
@@ -55,6 +56,7 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
+#include "url/url_constants.h"
namespace net {
@@ -650,6 +652,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
// Sanity check out environment.
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
+ if (!url.SchemeIs(url::kTraceScheme) &&
+ base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) {
+ LOG(ERROR) << "Block URL in URLRequest: " << url;
+ url_chain_[0] = GURL(url::kTraceScheme + (":" + url.possibly_invalid_spec()));
+ }
+
context->url_requests()->insert(this);
net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE,
[&](NetLogCaptureMode capture_mode) {
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -55,6 +55,7 @@
#include "net/socket/network_binding_client_socket_factory.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/url_request/static_http_user_agent_settings.h"
+#include "net/url_request/trk_protocol_handler.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
#include "url/url_constants.h"
@@ -619,6 +620,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
job_factory->SetProtocolHandler(scheme_handler.first,
std::move(scheme_handler.second));
}
+ job_factory->SetProtocolHandler(url::kTraceScheme,
+ std::make_unique<TrkProtocolHandler>());
protocol_handlers_.clear();
context->set_job_factory(std::move(job_factory));
diff --git a/url/url_constants.h b/url/url_constants.h
--- a/url/url_constants.h
+++ b/url/url_constants.h
@@ -34,6 +34,7 @@ inline constexpr char16_t kDataScheme16[] = u"data";
inline constexpr char kDrivefsScheme[] = "drivefs";
inline constexpr char kFileScheme[] = "file";
inline constexpr char16_t kFileScheme16[] = u"file";
+inline constexpr char kTraceScheme[] = "trk";
inline constexpr char kFileSystemScheme[] = "filesystem";
inline constexpr char16_t kFileSystemScheme16[] = u"filesystem";
inline constexpr char kFtpScheme[] = "ftp";
diff --git a/url/url_util.cc b/url/url_util.cc
--- a/url/url_util.cc
+++ b/url/url_util.cc
@@ -54,6 +54,7 @@ struct SchemeRegistry {
std::vector<SchemeWithType> standard_schemes = {
{kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
{kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
+ {kTraceScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
// Yes, file URLs can have a hostname, so file URLs should be handled as
// "standard". File URLs never have a port as specified by the SchemeType
// field. Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
@@ -99,6 +100,7 @@ struct SchemeRegistry {
kAboutScheme,
kJavaScriptScheme,
kDataScheme,
+ kTraceScheme,
};
// Schemes that can be sent CORS requests.
--
build/patches/Bookmarks-select-all-menu-entry.patch
+1 -1
View File
@@ -80,7 +80,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -252,6 +252,9 @@ CHAR_LIMIT guidelines:
@@ -264,6 +264,9 @@ CHAR_LIMIT guidelines:
<message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
Sites
</message>
build/patches/Bromite-auto-updater.patch
+37 -33
View File
@@ -92,7 +92,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
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -858,6 +858,8 @@ chrome_java_sources = [
@@ -871,6 +871,8 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/omaha/OmahaBase.java",
"java/src/org/chromium/chrome/browser/omaha/OmahaDelegate.java",
"java/src/org/chromium/chrome/browser/omaha/OmahaDelegateBase.java",
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/a
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
@@ -29,13 +29,19 @@ import org.chromium.ui.widget.Toast;
@@ -31,10 +31,15 @@ import org.chromium.ui.widget.Toast;
import java.util.Calendar;
@@ -133,6 +133,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
- implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener {
+ implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener,
+ Preference.OnPreferenceChangeListener {
static {
CalendarFactory.warmUp();
}
@@ -42,6 +47,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
private static final int TAPS_FOR_DEVELOPER_SETTINGS = 7;
private static final String PREF_APPLICATION_VERSION = "application_version";
@@ -140,9 +144,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
private static final String PREF_OS_VERSION = "os_version";
private static final String PREF_LEGAL_INFORMATION = "legal_information";
@@ -72,6 +78,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
@@ -78,6 +84,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
assumeNonNull(p);
int currentYear = Calendar.getInstance().get(Calendar.YEAR);
int currentYear = CalendarFactory.get().get(Calendar.YEAR);
p.setSummary(getString(R.string.legal_information_summary, currentYear));
+
+ ChromeSwitchPreference allowInlineUpdate =
@@ -154,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
}
@Override
@@ -142,6 +155,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
@@ -148,6 +161,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
return true;
}
@@ -686,7 +690,7 @@ new file mode 100644
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2660,6 +2660,12 @@ static_library("browser") {
@@ -2652,6 +2652,12 @@ static_library("browser") {
}
if (is_android) {
@@ -1004,18 +1008,18 @@ new file mode 100644
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
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -386,6 +386,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -387,6 +387,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kProtectedTabsAndroid,
&kPwaRestoreUi,
&kPwaRestoreUiAtStartup,
+ &kInlineUpdateFlow,
&kQuickDeleteAndroidSurvey,
&kReadAloud,
&kReadAloudAudioOverviews,
&kReadAloudAudioOverviewsFeedback,
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
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -469,6 +469,7 @@ public abstract class ChromeFeatureList {
@@ -477,6 +477,7 @@ public abstract class ChromeFeatureList {
public static final String INCOGNITO_NTP_SMALL_ICON = "IncognitoNtpSmallIcon";
public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
public static final String INCOGNITO_THEME_OVERLAY_TESTING = "IncognitoThemeOverlayTesting";
@@ -1026,7 +1030,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc
--- a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc
+++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc
@@ -266,7 +266,7 @@ AccessCodeCastDiscoveryInterface::CreateEndpointFetcher(
@@ -264,7 +264,7 @@ AccessCodeCastDiscoveryInterface::CreateEndpointFetcher(
.SetTimeout(kTimeout)
.SetUrl(GURL(base::StrCat({GetDiscoveryUrl(), "/", access_code})))
.SetPostData(kEmptyPostData)
@@ -1617,7 +1621,7 @@ diff --git a/chrome/browser/save_to_drive/drive_uploader.cc b/chrome/browser/sav
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2306,6 +2306,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -2315,6 +2315,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">
Chrome updates are no longer supported for this version of Android
</message>
@@ -1630,7 +1634,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<!-- Account management UI strings. -->
<message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR_LIMIT=32]">
@@ -4315,7 +4321,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -4366,7 +4372,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<!-- Main menu items -->
<message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
@@ -1642,7 +1646,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">
Newer version is available
@@ -4326,6 +4335,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -4377,6 +4386,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_MENU_UPDATE_UNSUPPORTED_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that the Android version on the device is unsupported. [CHAR_LIMIT=30]">
Android version is unsupported
</message>
@@ -1664,7 +1668,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
--- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
@@ -742,7 +742,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
@@ -765,7 +765,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
.SetTimeout(timeout)
.SetUrl(fetch_url)
.SetUploadProgressCallback(std::move(upload_progress_callback))
@@ -1724,7 +1728,7 @@ diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.c
diff --git a/components/contextual_search/internal/composebox_query_controller.cc b/components/contextual_search/internal/composebox_query_controller.cc
--- a/components/contextual_search/internal/composebox_query_controller.cc
+++ b/components/contextual_search/internal/composebox_query_controller.cc
@@ -525,7 +525,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
@@ -772,7 +772,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
.SetTimeout(timeout)
.SetUploadProgressCallback(std::move(upload_progress_callback))
.SetUrl(fetch_url)
@@ -1760,7 +1764,7 @@ diff --git a/components/data_sharing/internal/preview_server_proxy.cc b/componen
diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc
--- a/components/endpoint_fetcher/endpoint_fetcher.cc
+++ b/components/endpoint_fetcher/endpoint_fetcher.cc
@@ -25,6 +25,11 @@
@@ -29,6 +29,11 @@
#include "services/network/public/mojom/referrer_policy.mojom-shared.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
@@ -1772,7 +1776,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
namespace endpoint_fetcher {
namespace {
@@ -43,6 +48,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
@@ -47,6 +52,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
return "DELETE";
case HttpMethod::kPut:
return "PUT";
@@ -1781,7 +1785,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
default:
DCHECK(0) << base::StringPrintf("Unknown HttpMethod %d\n",
static_cast<int>(http_method));
@@ -50,6 +57,13 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
@@ -54,6 +61,13 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
return "";
}
@@ -1795,7 +1799,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
} // namespace
EndpointResponse::EndpointResponse() = default;
@@ -105,9 +119,11 @@ EndpointFetcher::RequestParams::Builder::Build() {
@@ -109,9 +123,11 @@ EndpointFetcher::RequestParams::Builder::Build() {
EndpointFetcher::EndpointFetcher(
const scoped_refptr<network::SharedURLLoaderFactory>& url_loader_factory,
signin::IdentityManager* identity_manager,
@@ -1808,7 +1812,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
request_params_(std::move(request_params)) {
if (request_params_.auth_type() == OAUTH) {
DCHECK(identity_manager_)
@@ -120,12 +136,32 @@ EndpointFetcher::EndpointFetcher(
@@ -124,12 +140,32 @@ EndpointFetcher::EndpointFetcher(
EndpointFetcher::EndpointFetcher(
const net::NetworkTrafficAnnotationTag& annotation_tag)
: identity_manager_(nullptr),
@@ -1841,7 +1845,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
EndpointFetcher::~EndpointFetcher() = default;
void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) {
@@ -208,13 +244,10 @@ void EndpointFetcher::PerformHttpRequest(
@@ -212,13 +248,10 @@ void EndpointFetcher::PerformHttpRequest(
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->method = GetHttpMethodString(request_params_.http_method());
resource_request->url = request_params_.url();
@@ -1858,7 +1862,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
// Add Content-Type header if post data is present.
bool has_body_content = (request_params_.http_method() == HttpMethod::kPost ||
request_params_.http_method() == HttpMethod::kPut) &&
@@ -255,8 +288,23 @@ void EndpointFetcher::PerformHttpRequest(
@@ -259,8 +292,23 @@ void EndpointFetcher::PerformHttpRequest(
break;
}
@@ -1882,7 +1886,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
if (has_body_content) {
simple_url_loader_->AttachStringForUpload(
@@ -269,9 +317,18 @@ void EndpointFetcher::PerformHttpRequest(
@@ -273,9 +321,18 @@ void EndpointFetcher::PerformHttpRequest(
simple_url_loader_->SetRetryOptions(GetMaxRetries(),
network::SimpleURLLoader::RETRY_ON_5XX);
@@ -1901,10 +1905,10 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
+ base::Unretained(this)));
+ return;
+ }
network::SimpleURLLoader::BodyAsStringCallbackDeprecated
body_as_string_callback = base::BindOnce(
&EndpointFetcher::OnResponseFetched, weak_ptr_factory_.GetWeakPtr(),
@@ -330,21 +387,6 @@ void EndpointFetcher::OnResponseFetched(
network::SimpleURLLoader::BodyAsStringCallback body_as_string_callback =
base::BindOnce(&EndpointFetcher::OnResponseFetched,
weak_ptr_factory_.GetWeakPtr(),
@@ -334,21 +391,6 @@ void EndpointFetcher::OnResponseFetched(
std::move(endpoint_fetcher_callback).Run(std::move(response));
}
@@ -1926,7 +1930,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
int EndpointFetcher::GetMaxRetries() const {
return request_params_.max_retries.value_or(kNumRetries);
}
@@ -362,4 +404,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
@@ -366,4 +408,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
return request_params_.url().spec();
}
@@ -2017,7 +2021,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
@@ -334,11 +349,17 @@ class EndpointFetcher {
void OnResponseFetched(EndpointFetcherCallback callback,
std::unique_ptr<std::string> response_body);
std::optional<std::string> response_body);
+ void OnURLLoadComplete(scoped_refptr<net::HttpResponseHeaders> headers);
+ void OnSimpleLoaderRedirect(const GURL& url_before_redirect,
+ const net::RedirectInfo& redirect_info,
@@ -2032,16 +2036,16 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
// Members set in constructor
const scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
@@ -346,6 +367,8 @@ class EndpointFetcher {
// this case, callers should invoke `PerformRequest` directly).
const raw_ptr<signin::IdentityManager> identity_manager_;
@@ -349,6 +370,8 @@ class EndpointFetcher {
// SingleClientSharedTabGroupVersioningSyncTest.ShouldShowVersioningMessagesAfterRestart/kSyncTransportOnly
const raw_ptr<signin::IdentityManager, DanglingUntriaged> identity_manager_;
+ const bool intercept_redirect_;
+
// The complete definition of the specific network request to be performed.
// Contains authentication details and response handling preferences.
const RequestParams request_params_;
@@ -355,6 +378,9 @@ class EndpointFetcher {
@@ -358,6 +381,9 @@ class EndpointFetcher {
access_token_fetcher_;
std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
build/patches/Bromite-subresource-adblocker.patch
+25 -25
View File
@@ -65,7 +65,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
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -325,6 +325,7 @@ if (_is_default_toolchain) {
@@ -302,6 +302,7 @@ if (_is_default_toolchain) {
"//chrome/android/features/tab_ui/public:ui_java_resources",
"//chrome/android/modules/stack_unwinder/provider:java",
"//chrome/android/webapk/libs/client:client_java",
@@ -76,15 +76,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -439,6 +439,7 @@ chrome_java_resources = [
"java/res/layout/account_divider_preference.xml",
@@ -453,6 +453,7 @@ chrome_java_resources = [
"java/res/layout/account_management_account_row.xml",
"java/res/layout/app_history_filter.xml",
"java/res/layout/auto_pip_permission_dialog.xml",
+ "java/res/layout/adblock_editor.xml",
"java/res/layout/auto_sign_in_first_run_dialog.xml",
"java/res/layout/autofill_billing_address_dropdown.xml",
"java/res/layout/autofill_card_name_and_number.xml",
@@ -639,6 +640,7 @@ chrome_java_resources = [
@@ -658,6 +659,7 @@ chrome_java_resources = [
"java/res/xml/account_management_preferences.xml",
"java/res/xml/ad_services_config.xml",
"java/res/xml/appearance_preferences.xml",
@@ -95,7 +95,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
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -929,6 +929,8 @@ chrome_java_sources = [
@@ -942,6 +942,8 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/permissions/PermissionBlockedDialog.java",
"java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
"java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@@ -179,7 +179,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
--- a/chrome/android/java/res/values/styles.xml
+++ b/chrome/android/java/res/values/styles.xml
@@ -317,6 +317,24 @@ found in the LICENSE file.
@@ -331,6 +331,24 @@ found in the LICENSE file.
</item>
</style>
@@ -441,7 +441,7 @@ new file mode 100644
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -87,6 +87,8 @@ import java.util.HashMap;
@@ -95,6 +95,8 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -450,8 +450,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
/**
* The Chrome settings activity.
*
@@ -1016,6 +1018,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
if (!MAIN_FRAGMENT_TAG.equals(fragment.getTag())) {
@@ -1175,6 +1177,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
&& !MAIN_FRAGMENT_TAG.equals(fragment.getTag())) {
return;
}
+ if (fragment instanceof AdBlockEditor) return;
@@ -461,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -17255,6 +17255,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -17395,6 +17395,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
Never show this again.
</message>
@@ -521,7 +521,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
namespace gcm {
class GCMDriver;
}
@@ -271,6 +276,7 @@ class BrowserProcess {
@@ -276,6 +281,7 @@ class BrowserProcess {
#endif
virtual component_updater::ComponentUpdateService* component_updater() = 0;
@@ -532,7 +532,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1285,6 +1285,34 @@ BrowserProcessImpl::component_updater() {
@@ -1284,6 +1284,34 @@ BrowserProcessImpl::component_updater() {
return component_updater_.get();
}
@@ -570,7 +570,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -211,6 +211,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -213,6 +213,7 @@ class BrowserProcessImpl : public BrowserProcess,
#endif
component_updater::ComponentUpdateService* component_updater() override;
@@ -578,7 +578,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
MediaFileSystemRegistry* media_file_system_registry() override;
WebRtcLogUploader* webrtc_log_uploader() override;
network_time::NetworkTimeTracker* network_time_tracker() override;
@@ -428,6 +429,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -426,6 +427,7 @@ class BrowserProcessImpl : public BrowserProcess,
// to concerns over integrity of data shared between profiles,
// but some users of component updater only install per-user.
std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@@ -589,7 +589,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
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -429,6 +429,9 @@ StartupProfileInfo CreateInitialProfile(
@@ -430,6 +430,9 @@ StartupProfileInfo CreateInitialProfile(
// missing code in the above test.
CHECK(profile_info.profile) << "Cannot get default profile.";
@@ -700,7 +700,7 @@ new file mode 100755
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
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -715,6 +715,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -716,6 +716,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
NetworkProcessLaunchWatcher::RegisterPrefs(registry);
@@ -714,8 +714,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -224,6 +224,20 @@ CHAR_LIMIT guidelines:
Search settings
@@ -236,6 +236,20 @@ CHAR_LIMIT guidelines:
Try searching the help center
</message>
+ <!-- AdBlock settings -->
@@ -738,7 +738,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -2942,6 +2942,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
@@ -2979,6 +2979,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
inline constexpr char kAudioCaptureAllowedUrls[] =
"hardware.audio_capture_allowed_urls";
@@ -753,7 +753,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
--- a/components/browser_ui/strings/android/site_settings.grdp
+++ b/components/browser_ui/strings/android/site_settings.grdp
@@ -421,6 +421,9 @@
@@ -424,6 +424,9 @@
<message name="IDS_INTRUSIVE_ADS_INFORMATION" desc="The extra information at the top of the Site Details page when the site tends to show intrusive ads">
This site shows intrusive or misleading ads
</message>
@@ -1595,7 +1595,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
web_contents_helper_(web_contents_helper) {}
ContentSubresourceFilterThrottleManager::
@@ -628,6 +632,17 @@ ContentSubresourceFilterThrottleManager::
@@ -661,6 +665,17 @@ ContentSubresourceFilterThrottleManager::
throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
ad_tagging_state);
}
@@ -1616,7 +1616,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
--- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
+++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
@@ -403,6 +403,8 @@ class ContentSubresourceFilterThrottleManager
@@ -410,6 +410,8 @@ class ContentSubresourceFilterThrottleManager
std::unique_ptr<ProfileInteractionManager> profile_interaction_manager_;
@@ -1998,15 +1998,15 @@ diff --git a/components/subresource_filter/core/browser/verified_ruleset_dealer.
diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/components/subresource_filter/core/common/indexed_ruleset.cc
--- a/components/subresource_filter/core/common/indexed_ruleset.cc
+++ b/components/subresource_filter/core/common/indexed_ruleset.cc
@@ -6,6 +6,7 @@
@@ -7,6 +7,7 @@
#include "base/check.h"
#include "base/functional/callback.h"
#include "base/hash/hash.h"
+#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/strcat.h"
#include "base/trace_event/trace_event.h"
@@ -37,7 +38,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
@@ -38,7 +39,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
// least once. The verifier detects a subset of the errors detected by the
// checksum, and is unneeded once expected_checksum is consistently nonzero.
flatbuffers::Verifier verifier(buffer.data(), buffer.size());
build/patches/Bubble-Locking-on-UI-DevTools.patch
+1 -1
View File
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -274,6 +274,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
@@ -276,6 +276,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
command = IDC_RELOAD;
}
build/patches/Change-popup-site-setting.patch
+1 -1
View File
@@ -24,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/resources/settings/site_settings/popups_page.html b/chrome/browser/resources/settings/site_settings/popups_page.html
--- a/chrome/browser/resources/settings/site_settings/popups_page.html
+++ b/chrome/browser/resources/settings/site_settings/popups_page.html
@@ -9,6 +9,8 @@
@@ -10,6 +10,8 @@
category="[[contentSettingsTypesEnum_.POPUPS]]"
allow-option-label="$i18n{siteSettingsPopupsAllowed}"
allow-option-icon="cr:open-in-new"
build/patches/Chrome-web-store-protection.patch
+13 -13
View File
@@ -181,7 +181,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/profile_info_genera
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
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -67,6 +67,7 @@
@@ -68,6 +68,7 @@
#include "extensions/browser/scoped_active_install.h"
#include "extensions/buildflags/buildflags.h"
#include "extensions/common/extension.h"
@@ -189,7 +189,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
#include "extensions/common/manifest.h"
#include "extensions/common/manifest_constants.h"
#include "extensions/common/manifest_handlers/permissions_parser.h"
@@ -245,6 +246,8 @@ Profile* GetProfileInIncognito(Profile* profile) {
@@ -242,6 +243,8 @@ Profile* GetProfileInIncognito(Profile* profile) {
// there was previously stored data, or an empty string otherwise. The Set will
// overwrite any previous login.
std::string GetWebstoreLogin(Profile* profile) {
@@ -198,7 +198,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) {
return profile->GetPrefs()->GetString(kWebstoreLogin);
}
@@ -252,11 +255,15 @@ std::string GetWebstoreLogin(Profile* profile) {
@@ -249,11 +252,15 @@ std::string GetWebstoreLogin(Profile* profile) {
}
void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -214,7 +214,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
switch (status) {
case kCanRequest:
return api::webstore_private::ExtensionInstallStatus::kCanRequest;
@@ -1194,7 +1201,8 @@ ExtensionFunction::ResponseAction
@@ -1177,7 +1184,8 @@ ExtensionFunction::ResponseAction
WebstorePrivateIsInIncognitoModeFunction::Run() {
Profile* profile = Profile::FromBrowserContext(browser_context());
return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -224,7 +224,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
}
WebstorePrivateIsPendingCustodianApprovalFunction::
@@ -1291,11 +1299,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
@@ -1274,11 +1282,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
recent_navigations_to_collect);
@@ -291,7 +291,7 @@ diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -248,8 +248,6 @@ ExtensionService::ExtensionService(
@@ -247,8 +247,6 @@ ExtensionService::ExtensionService(
UpgradeDetector::GetInstance()->AddObserver(this);
#endif
@@ -300,7 +300,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
if (autoupdate_enabled) {
@@ -764,7 +762,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
@@ -763,7 +761,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
// unpublished extensions should not be enabled. This update allows
// unpublished extensions to be disabled sooner rather than waiting till the
// next regularly scheduled fetch.
@@ -1201,9 +1201,9 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro
diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc
--- a/extensions/common/extension_features.cc
+++ b/extensions/common/extension_features.cc
@@ -182,4 +182,11 @@ BASE_FEATURE(kEnableShouldShowPromotion, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kEnableWebRequestCollapsedListeners,
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -183,4 +183,11 @@ BASE_FEATURE(kEnableShouldShowPromotion, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kWebRequestPersistFilteredEvents,
base::FEATURE_ENABLED_BY_DEFAULT);
+CROMITE_FEATURE(kEnableExtensionAutoupdate,
+ "EnableExtensionAutoupdate",
@@ -1216,9 +1216,9 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi
diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h
--- a/extensions/common/extension_features.h
+++ b/extensions/common/extension_features.h
@@ -300,6 +300,16 @@ BASE_DECLARE_FEATURE(kEnableShouldShowPromotion);
// Enables the "collapsed listeners" strategy for webRequest lazy listeners.
BASE_DECLARE_FEATURE(kEnableWebRequestCollapsedListeners);
@@ -307,6 +307,16 @@ BASE_DECLARE_FEATURE(kWebRequestSecurityInfo);
// browser startup).
BASE_DECLARE_FEATURE(kWebRequestPersistFilteredEvents);
+// Activates the auto update of extensions.
+// the only data provided by default is the list of extensions.
build/patches/Clear-CORS-Preflight-Cache-on-clearing-data.patch
+7 -7
View File
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/preflight_cache.cc
--- a/services/network/cors/preflight_cache.cc
+++ b/services/network/cors/preflight_cache.cc
@@ -204,6 +204,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
@@ -197,6 +197,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
MayPurge(max_entries, purge_unit);
}
@@ -29,7 +29,7 @@ diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/pr
diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/preflight_cache.h
--- a/services/network/cors/preflight_cache.h
+++ b/services/network/cors/preflight_cache.h
@@ -78,6 +78,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightCache final {
@@ -75,6 +75,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightCache final {
// `max_entries` for testing.
void MayPurgeForTesting(size_t max_entries, size_t purge_unit);
@@ -41,7 +41,7 @@ diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/pre
diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc
--- a/services/network/cors/preflight_controller.cc
+++ b/services/network/cors/preflight_controller.cc
@@ -755,6 +755,10 @@ void PreflightController::ClearCorsPreflightCache(
@@ -631,6 +631,10 @@ void PreflightController::ClearCorsPreflightCache(
cache_.ClearCache(std::move(url_filter));
}
@@ -55,9 +55,9 @@ diff --git a/services/network/cors/preflight_controller.cc b/services/network/co
diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h
--- a/services/network/cors/preflight_controller.h
+++ b/services/network/cors/preflight_controller.h
@@ -152,6 +152,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final {
url_loader_network_service_observer,
const PreflightMode& preflight_mode);
@@ -117,6 +117,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final {
mojo::PendingRemote<mojom::URLLoaderNetworkServiceObserver>
url_loader_network_service_observer);
+ void ClearCache();
+
@@ -79,7 +79,7 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1373,6 +1373,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
@@ -1368,6 +1368,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
base::Time end_time,
mojom::ClearDataFilterPtr filter,
ClearHttpCacheCallback callback) {
build/patches/Client-hints-overrides.patch
+8 -8
View File
@@ -76,7 +76,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
std::string brand_version =
output_version_type == blink::UserAgentBrandVersionType::kFullVersion
@@ -693,6 +691,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) {
@@ -695,6 +693,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) {
}
// High entropy client hints.
@@ -236,7 +236,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part
diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
--- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
+++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
@@ -186,6 +186,7 @@ const String& NavigatorUAData::platform() const {
@@ -114,6 +114,7 @@ const String& NavigatorUAData::platform() const {
}
bool AllowedToCollectHighEntropyValues(ExecutionContext* execution_context) {
@@ -256,9 +256,9 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third
+ RuntimeEnabled=UserAgentClientHint,
+ Exposed=(Window,Worker)
+] interface NavigatorUAData {
[HighEntropy, MeasureAs=NavigatorUAData_Brands] readonly attribute FrozenArray<NavigatorUABrandVersion> brands;
[HighEntropy=Direct, MeasureAs=NavigatorUAData_Mobile] readonly attribute boolean mobile;
[HighEntropy=Direct, MeasureAs=NavigatorUAData_Platform] readonly attribute DOMString platform;
[MeasureAs=NavigatorUAData_Brands] readonly attribute FrozenArray<NavigatorUABrandVersion> brands;
[MeasureAs=NavigatorUAData_Mobile] readonly attribute boolean mobile;
[MeasureAs=NavigatorUAData_Platform] readonly attribute DOMString platform;
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
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
@@ -283,7 +283,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -592,6 +592,11 @@
@@ -610,6 +610,11 @@
name: "AriaNotifyV2",
status: {"Android": "test", "Win": "test", "Mac": "test", "Linux": "test"},
},
@@ -295,12 +295,12 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
{
name: "AriaRowColIndexText",
status: "stable",
@@ -1019,8 +1024,7 @@
@@ -1016,8 +1021,7 @@
// Allows top-level sites to restrict collection of high-entropy UA client
// hints (from 3Ps, or itself) via the getHighEntropyValues API.
// crbug.com/385161047
- name: "ClientHintUAHighEntropyValuesPermissionPolicy",
- status: "test",
- status: "stable",
+ name: "ClientHintUAHighEntropyValuesPermissionPolicy", // disabled by default
},
{
build/patches/Close-Sessions-On-Ip-Change.patch
+3 -3
View File
@@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc
--- a/components/network_session_configurator/browser/network_session_configurator.cc
+++ b/components/network_session_configurator/browser/network_session_configurator.cc
@@ -222,9 +222,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions(
@@ -221,9 +221,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions(
bool ShouldQuicCloseSessionsOnIpChange(
const VariationParameters& quic_trial_params) {
@@ -34,7 +34,7 @@ diff --git a/components/network_session_configurator/browser/network_session_con
}
bool ShouldQuicGoAwaySessionsOnIpChange(
@@ -305,11 +304,8 @@ bool ShouldQuicEstimateInitialRtt(
@@ -304,11 +303,8 @@ bool ShouldQuicEstimateInitialRtt(
bool ShouldQuicMigrateSessionsOnNetworkChangeV2(
const VariationParameters& quic_trial_params) {
@@ -88,7 +88,7 @@ new file mode 100644
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -511,7 +511,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -443,7 +443,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT);
// NetworkChangeNotifier::AreNetworkHandlesSupported).
#if BUILDFLAG(IS_ANDROID)
inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =
build/patches/Content-settings-infrastructure.patch
+86 -100
View File
@@ -13,9 +13,8 @@ Require: bromite-build-utils.patch
---
.../ChromeSiteSettingsDelegate.java | 17 +-
...page_specific_content_settings_delegate.cc | 2 +-
chrome/browser/resources/settings/BUILD.gn | 2 +-
.../privacy_page/privacy_page_index.html | 1 +
.../privacy_page/privacy_page_index.ts | 82 +++-
.../privacy_page/privacy_page_index.ts | 83 +++-
chrome/browser/resources/settings/route.ts | 2 +
...settings_category_default_radio_group.html | 12 +
.../settings_category_default_radio_group.ts | 23 +-
@@ -47,7 +46,7 @@ Require: bromite-build-utils.patch
...tomTriStateSiteSettingsPreferenceImpl.java | 24 +
.../ContentSettingsResources.java | 32 +-
.../site_settings/SingleCategorySettings.java | 57 ++-
.../site_settings/SingleWebsiteSettings.java | 50 ++-
.../site_settings/SingleWebsiteSettings.java | 48 +-
.../site_settings/SiteSettings.java | 33 +-
.../site_settings/SiteSettingsCategory.java | 18 +-
.../site_settings/SiteSettingsDelegate.java | 2 +
@@ -85,7 +84,7 @@ Require: bromite-build-utils.patch
.../platform/web_content_settings_client.h | 13 +
.../execution_context/execution_context.cc | 16 +
.../execution_context/execution_context.h | 5 +
74 files changed, 1964 insertions(+), 106 deletions(-)
73 files changed, 1962 insertions(+), 105 deletions(-)
create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
@@ -99,7 +98,7 @@ Require: bromite-build-utils.patch
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
@@ -70,6 +70,10 @@ import org.chromium.url.GURL;
@@ -71,6 +71,10 @@ import org.chromium.url.GURL;
import java.util.List;
import java.util.Set;
@@ -110,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
/** A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic. */
@NullMarked
public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
@@ -239,7 +243,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
@@ -240,7 +244,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
@Override
public boolean isHelpAndFeedbackEnabled() {
@@ -119,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
}
@Override
@@ -377,6 +381,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
@@ -378,6 +382,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
return mPrivacySandboxBridge.getRelatedWebsiteSetOwner(memberOrigin);
}
@@ -149,38 +148,27 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_dele
rules->mixed_content_rules.push_back(ContentSettingPatternSource(
ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK),
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -358,6 +358,7 @@ build_webui("build") {
"privacy_sandbox/privacy_sandbox_browser_proxy.ts",
"relaunch_mixin.ts",
"reset_page/reset_browser_proxy.ts",
+ "site_settings/site_settings_util.ts",
"route.ts",
"router.ts",
"safety_hub/safety_hub_browser_proxy.ts",
@@ -371,7 +372,6 @@ build_webui("build") {
"site_settings/constants.ts",
"site_settings/site_settings_mixin.ts",
"site_settings/site_settings_browser_proxy.ts",
- "site_settings/site_settings_util.ts",
"site_settings/website_usage_browser_proxy.ts",
"time.ts",
"tooltip_mixin.ts",
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
@@ -623,4 +623,5 @@
@@ -609,4 +609,5 @@
</zoom-levels>
</template>
+ <div id="bromite-placeholder"/>
+ <div id="bromite-placeholder"></div>
</cr-view-manager>
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
@@ -29,6 +29,8 @@ import {PrivacyGuideAvailabilityMixin} from './privacy_guide/privacy_guide_avail
@@ -9,6 +9,7 @@ import '../settings_page/settings_section.js';
import '../settings_shared.css.js';
import './privacy_guide/privacy_guide_promo.js';
import './privacy_page.js';
+import '../controls/settings_dropdown_menu.js';
import {PrefsMixin} from '/shared/settings/prefs/prefs_mixin.js';
import type {CrViewManagerElement} from 'chrome://resources/cr_elements/cr_view_manager/cr_view_manager.js';
@@ -29,6 +30,8 @@ import {PrivacyGuideAvailabilityMixin} from './privacy_guide/privacy_guide_avail
import type {PrivacyGuideBrowserProxy} from './privacy_guide/privacy_guide_browser_proxy.js';
import {MAX_PRIVACY_GUIDE_PROMO_IMPRESSION, PrivacyGuideBrowserProxyImpl} from './privacy_guide/privacy_guide_browser_proxy.js';
import {getTemplate} from './privacy_page_index.html.js';
@@ -189,7 +177,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.t
// clang-format off
// <if expr="is_chromeos">
@@ -53,8 +55,86 @@ export class SettingsPrivacyPageIndexElement extends
@@ -53,8 +56,86 @@ export class SettingsPrivacyPageIndexElement extends
return 'settings-privacy-page-index';
}
@@ -288,7 +276,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
/**
* Add all of the child routes that originate from the privacy route,
@@ -155,6 +156,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
@@ -150,6 +151,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
r.SITE_SETTINGS_LOCAL_NETWORK_ACCESS =
r.SITE_SETTINGS.createChild('localNetworkAccess');
}
@@ -395,17 +383,17 @@ diff --git a/chrome/browser/resources/settings/site_settings/settings_category_d
diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
--- a/chrome/browser/resources/settings/site_settings/site_details.html
+++ b/chrome/browser/resources/settings/site_settings/site_details.html
@@ -334,5 +334,6 @@
@@ -332,5 +332,6 @@
label="$i18n{siteSettingsLocalNetworkAccess}">
</site-details-permission>
</template>
+ <div id="bromite-placeholder"/>
+ <div id="bromite-placeholder"></div>
</div>
</settings-subpage>
diff --git a/chrome/browser/resources/settings/site_settings/site_details.ts b/chrome/browser/resources/settings/site_settings/site_details.ts
--- a/chrome/browser/resources/settings/site_settings/site_details.ts
+++ b/chrome/browser/resources/settings/site_settings/site_details.ts
@@ -71,8 +71,39 @@ export class SiteDetailsElement extends SiteDetailsElementBase {
@@ -73,8 +73,39 @@ export class SiteDetailsElement extends SiteDetailsElementBase {
return 'site-details';
}
@@ -609,7 +597,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_mixin
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_page.ts b/chrome/browser/resources/settings/site_settings/site_settings_page.ts
--- a/chrome/browser/resources/settings/site_settings/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings/site_settings_page.ts
@@ -51,7 +51,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
@@ -52,7 +52,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
}
// The following list is ordered alphabetically by |id|. The order in which
// these appear in the UI is determined elsewhere in this file.
@@ -739,7 +727,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_util.
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1606,6 +1606,7 @@ static_library("ui") {
@@ -1620,6 +1620,7 @@ static_library("ui") {
"//components/commerce/core/webui",
"//components/contextual_search:public",
"//components/endpoint_fetcher",
@@ -747,7 +735,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//components/enterprise/common:files_scan_data",
"//components/feedback/proto",
"//components/headless/console_message_logger",
@@ -4761,6 +4762,7 @@ static_library("ui") {
@@ -4790,6 +4791,7 @@ static_library("ui") {
"//components/power_bookmarks/core",
"//components/power_bookmarks/storage",
"//components/prefs",
@@ -787,7 +775,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc b/chrome
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
--- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -58,6 +58,7 @@
@@ -55,6 +55,7 @@
#include "ui/views/layout/box_layout.h"
#include "ui/views/layout/flex_layout.h"
#include "ui/views/vector_icons.h"
@@ -795,7 +783,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
#include "ui/views/view_class_properties.h"
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -284,8 +285,20 @@ void PageInfoMainView::SetPermissionInfo(
@@ -259,8 +260,20 @@ void PageInfoMainView::SetPermissionInfo(
scroll_view->SetDrawOverflowIndicator(false);
auto* content_view =
scroll_view->SetContents(std::make_unique<views::View>());
@@ -818,7 +806,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
content_view->SetID(PageInfoViewFactory::VIEW_ID_PAGE_INFO_PERMISSION_VIEW);
content_view->SetProperty(views::kElementIdentifierKey,
kPermissionsElementId);
@@ -300,11 +313,16 @@ void PageInfoMainView::SetPermissionInfo(
@@ -275,11 +288,16 @@ void PageInfoMainView::SetPermissionInfo(
}
}
@@ -835,7 +823,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
toggle_row->SetProperty(views::kCrossAxisAlignmentKey,
views::LayoutAlignment::kStretch);
syncable_permission_rows_.emplace(permission.type, toggle_row);
@@ -312,6 +330,8 @@ void PageInfoMainView::SetPermissionInfo(
@@ -287,6 +305,8 @@ void PageInfoMainView::SetPermissionInfo(
}
for (auto& object : chosen_object_info_list) {
@@ -844,7 +832,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
// The view takes ownership of the object info.
auto object_view = std::make_unique<ChosenObjectView>(
std::move(object),
@@ -322,6 +342,10 @@ void PageInfoMainView::SetPermissionInfo(
@@ -297,6 +317,10 @@ void PageInfoMainView::SetPermissionInfo(
content_view->AddChildView(std::move(object_view)));
}
@@ -867,7 +855,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom
#include "components/page_info/core/features.h"
#include "components/page_info/core/proto/about_this_site_metadata.pb.h"
#include "components/page_info/page_info.h"
@@ -291,7 +293,14 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
@@ -280,7 +282,14 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
bool blocked_on_system_level) {
PermissionSetting setting =
permission.setting.value_or(permission.default_setting);
@@ -882,7 +870,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom
auto* info = content_settings::PermissionSettingsRegistry::GetInstance()->Get(
permission.type);
// For guard content settings and Automatic Picture-in-Picture, ASK is treated
@@ -595,6 +604,17 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
@@ -584,6 +593,17 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
icon = &vector_icons::kPrinterIcon;
break;
default:
@@ -903,7 +891,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom
diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.h b/chrome/browser/ui/views/page_info/page_info_view_factory.h
--- a/chrome/browser/ui/views/page_info/page_info_view_factory.h
+++ b/chrome/browser/ui/views/page_info/page_info_view_factory.h
@@ -97,6 +97,11 @@ class PageInfoViewFactory {
@@ -95,6 +95,11 @@ class PageInfoViewFactory {
const PageInfo::PermissionInfo& info,
bool blocked_on_system_level = false);
@@ -1236,7 +1224,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
#include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
#include "components/password_manager/core/browser/manage_passwords_referrer.h"
#include "components/password_manager/core/common/password_manager_features.h"
@@ -4048,6 +4052,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -4111,6 +4115,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);
@@ -1296,7 +1284,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
--- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -46,6 +46,8 @@
@@ -47,6 +47,8 @@
#include "chrome/grit/generated_resources.h"
#include "components/content_settings/core/browser/content_settings_provider.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -1374,7 +1362,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
NOTREACHED() << static_cast<int32_t>(type)
<< " is not a recognized content settings type.";
}
@@ -668,6 +689,13 @@ std::vector<ContentSettingsType> GetVisiblePermissionCategories(
@@ -664,6 +685,13 @@ std::vector<ContentSettingsType> GetVisiblePermissionCategories(
base_types->push_back(ContentSettingsType::LOCAL_NETWORK_ACCESS);
}
@@ -1391,8 +1379,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
diff --git a/components/browser_ui/settings/android/BUILD.gn b/components/browser_ui/settings/android/BUILD.gn
--- a/components/browser_ui/settings/android/BUILD.gn
+++ b/components/browser_ui/settings/android/BUILD.gn
@@ -90,6 +90,7 @@ android_resources("java_resources") {
"java/res/layout/managed_disclaimer_preference_for_radio_groups.xml",
@@ -92,6 +92,7 @@ android_resources("java_resources") {
"java/res/layout/preference_chrome_button.xml",
"java/res/layout/preference_chrome_image_view.xml",
"java/res/layout/preference_spinner.xml",
+ "java/res/layout/preference_spinner_single_widget.xml",
@@ -1579,7 +1567,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
}
android_library("javatests") {
@@ -205,6 +222,7 @@ robolectric_library("junit") {
@@ -208,6 +225,7 @@ robolectric_library("junit") {
}
android_resources("java_resources") {
@@ -2306,7 +2294,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
--- 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
@@ -360,6 +360,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -361,6 +361,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
} else {
@ContentSetting
Integer contentSetting = website.site().getContentSetting(browserContextHandle, type);
@@ -2317,7 +2305,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
if (contentSetting != null) {
return ContentSetting.BLOCK == contentSetting;
}
@@ -551,6 +555,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -552,6 +556,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
? new HashSet<>(getArguments().getStringArrayList(EXTRA_SELECTED_DOMAINS))
: null;
@@ -2325,7 +2313,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
configureGlobalToggles();
if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) {
RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered");
@@ -586,7 +591,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -587,7 +592,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
if (queryHasChanged) getInfoForOrigins();
});
@@ -2335,7 +2323,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
MenuItem help =
menu.add(
Menu.NONE,
@@ -598,12 +604,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -599,12 +605,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
getResources(),
R.drawable.ic_help_and_feedback,
getContext().getTheme()));
@@ -2356,7 +2344,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
if (mCategory.getType() == SiteSettingsCategory.Type.PROTECTED_MEDIA) {
getSiteSettingsDelegate()
.launchProtectedContentHelpAndFeedbackActivity(getActivity());
@@ -681,6 +695,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -682,6 +696,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
public boolean onPreferenceChange(Preference preference, Object newValue) {
BrowserContextHandle browserContextHandle = getBrowserContextHandle();
PrefService prefService = UserPrefs.get(browserContextHandle);
@@ -2368,7 +2356,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
if (BINARY_RADIO_BUTTON_KEY.equals(preference.getKey())
|| BINARY_TOGGLE_KEY.equals(preference.getKey())) {
assert !mCategory.isManaged();
@@ -855,7 +874,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -856,7 +875,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
? R.string.website_settings_add_site_description_javascript_optimizer_block
: R.string.website_settings_add_site_description_javascript_optimizer_allow;
}
@@ -2377,7 +2365,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
}
// OnPreferenceClickListener:
@@ -973,17 +992,15 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -974,17 +993,15 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
break;
}
@@ -2398,7 +2386,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
String exceptionDialogMessage =
exceptionDialogMessageResourceId != 0
? getString(exceptionDialogMessageResourceId)
@@ -994,7 +1011,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -995,7 +1012,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
getStyledContext(),
ADD_EXCEPTION_KEY,
exceptionDialogMessage,
@@ -2407,7 +2395,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
mCategory,
this));
@@ -1178,8 +1195,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -1179,8 +1196,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
private boolean isBlocked() {
switch (mGlobalToggleLayout) {
case GlobalToggleLayout.TRI_STATE_TOGGLE:
@@ -2424,7 +2412,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
return (triStateToggle.getCheckedSetting() == ContentSetting.BLOCK);
case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE:
TriStateCookieSettingsPreference triStateCookieToggle =
@@ -1332,7 +1357,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -1333,7 +1358,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
} else if (res_id != -1) {
infoText.setSummary(res_id);
} else {
@@ -2437,7 +2425,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
}
// Hide the anti-abuse text preferences, as needed.
@@ -1371,6 +1400,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -1372,6 +1401,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
} else {
screen.removePreference(mLocationTriStatePref);
}
@@ -2445,7 +2433,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
maybeShowReasonToggleDisabled(screen);
@@ -1579,6 +1609,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
@@ -1580,6 +1610,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
iconIds = ContentSettingsResources.getTriStateSettingIconIDs(contentType);
}
triStateToggle.initialize(
@@ -2453,8 +2441,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
setting,
descriptionIds,
iconIds,
@@ -1867,6 +1898,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
selectedButton.setChecked(true);
@@ -1891,6 +1922,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
setLocationAccessEnabled.accept(allowButton.isChecked());
}
+ AlertDialog.Builder alertDialogBuilder =
@@ -2471,7 +2459,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/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
@@ -57,6 +57,7 @@ import java.util.Collection;
@@ -58,6 +58,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -2479,7 +2467,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
/** Shows the permissions and other settings for a particular website. */
@NullMarked
@@ -200,7 +201,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -204,7 +205,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
case ContentSettingsType.WINDOW_MANAGEMENT:
return "window_management_permission_list";
default:
@@ -2488,7 +2476,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
}
}
@@ -631,7 +632,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -650,7 +651,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
private void setupContentSettingsPreferences() {
Preference permissionsHeaderPref = findPreference(PREF_PERMISSIONS_HEADER);
mMaxPermissionOrder = permissionsHeaderPref.getOrder();
@@ -2498,7 +2486,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
Preference preference = getPermissionPreference(type);
preference.setKey(getPreferenceKey(type));
@@ -663,6 +665,19 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -682,6 +684,19 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
}
private Preference getPermissionPreference(@ContentSettingsType.EnumType int type) {
@@ -2518,25 +2506,23 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
boolean isOneTime = isOneTime(type);
if (type == ContentSettingsType.GEOLOCATION_WITH_OPTIONS && !isOneTime) {
return createTwoActionLocationSwitchPreference();
@@ -1258,7 +1273,16 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@ContentSetting @Nullable Integer value,
boolean isEmbargoed,
boolean isOneTime) {
@@ -1354,7 +1369,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
value = ContentSetting.BLOCK;
}
- if (value == null) return;
+ @ContentSettingsType.EnumType
+ int content_type = getContentSettingsTypeFromPreferenceKey(preference.getKey());
+ BromiteCustomContentSetting cs =
+ BromiteCustomContentSettingImpl.getContentSetting(content_type);
+ BromiteCustomContentSettingImpl.getContentSetting(contentType);
+ if (value == null && cs == null) return;
+ if (value == null) {
+ if (cs.showIntoInfoPage() == false) return;
+ value = WebsitePreferenceBridge.getDefaultContentSetting(
+ getSiteSettingsDelegate().getBrowserContextHandle(), content_type);
+ getSiteSettingsDelegate().getBrowserContextHandle(), contentType);
+ }
setUpPreferenceCommon(preference, value);
preference.setOnPreferenceChangeListener(this);
@ContentSettingsType.EnumType
@@ -1310,10 +1334,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -1404,10 +1426,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
oneTimePreference.setBackgroundColor(mHighlightColor);
}
} else {
@@ -2548,14 +2534,14 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
+ if (preference instanceof ChromeSwitchPreference) {
+ ((ChromeSwitchPreference)switchPreference).setChecked(value != ContentSetting.BLOCK);
+ } else {
+ BromiteCustomContentSettingImpl.setWebSitePreferenceValue(content_type, preference, value);
+ BromiteCustomContentSettingImpl.setWebSitePreferenceValue(contentType, preference, value);
+ }
+ if (preference instanceof ChromeSwitchPreference && contentType == mHighlightedPermission) {
+ ((ChromeSwitchPreference)switchPreference).setBackgroundColor(
AppCompatResources.getColorStateList(getContext(), mHighlightColor)
.getDefaultColor());
}
@@ -1619,7 +1647,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -1713,7 +1739,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
if (newValue instanceof Boolean) {
permission = (Boolean) newValue ? getEnabledValue(type) : ContentSetting.BLOCK;
} else {
@@ -2769,7 +2755,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/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
@@ -361,7 +361,11 @@ public final class Website implements WebsiteEntry {
@@ -368,7 +368,11 @@ public final class Website implements WebsiteEntry {
RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings");
}
}
@@ -2924,7 +2910,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
namespace content_settings {
@@ -858,6 +859,7 @@ void ContentSettingsRegistry::Init() {
@@ -848,6 +849,7 @@ void ContentSettingsRegistry::Init() {
WebsiteSettingsRegistry::PLATFORM_CHROMEOS,
ContentSettingsInfo::INHERIT_IN_INCOGNITO,
PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
@@ -3271,7 +3257,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
diff --git a/components/content_settings/core/common/content_settings_types.mojom b/components/content_settings/core/common/content_settings_types.mojom
--- a/components/content_settings/core/common/content_settings_types.mojom
+++ b/components/content_settings/core/common/content_settings_types.mojom
@@ -495,5 +495,7 @@ enum ContentSettingsType {
@@ -492,5 +492,7 @@ enum ContentSettingsType {
// when suspicious warning is shown. If the user has selected this, the
// notification permission will not be revoked based on suspicious verdict.
SUSPICIOUS_NOTIFICATION_SHOW_ORIGINAL,
@@ -3392,7 +3378,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoPermissionsController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoPermissionsController.java
--- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoPermissionsController.java
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoPermissionsController.java
@@ -203,6 +203,15 @@ public class PageInfoPermissionsController extends PageInfoPreferenceSubpageCont
@@ -241,6 +241,15 @@ public class PageInfoPermissionsController extends PageInfoPreferenceSubpageCont
: perm1.nameMidSentence.toString());
}
@@ -3419,7 +3405,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/content_settings/core/common/features.h"
@@ -205,6 +206,15 @@ void PageInfoControllerAndroid::SetPermissionInfo(
@@ -206,6 +207,15 @@ void PageInfoControllerAndroid::SetPermissionInfo(
permissions_to_display.push_back(ContentSettingsType::LOCAL_NETWORK_ACCESS);
}
@@ -3434,8 +3420,8 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
+
std::map<ContentSettingsType, /*allowed*/ bool>
user_specified_settings_to_display;
std::map<ContentSettingsType, bool>
@@ -267,6 +277,14 @@ std::optional<PermissionSetting> PageInfoControllerAndroid::GetSettingToDisplay(
@@ -284,6 +294,14 @@ std::optional<PermissionSetting> PageInfoControllerAndroid::GetSettingToDisplay(
return permission.setting;
}
@@ -3461,10 +3447,10 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
#include "components/content_settings/browser/ui/cookie_controls_controller.h"
#include "components/content_settings/core/browser/content_settings_registry.h"
#include "components/content_settings/core/browser/content_settings_uma_util.h"
@@ -1405,6 +1406,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
// via `HasContentSettingChangedViaPageInfo(type)`.
bool PageInfo::ShouldShowPermission(
const PageInfo::PermissionInfo& info) const {
@@ -1391,6 +1392,14 @@ bool PageInfo::ShouldShowPermission(
}
#endif // BUILDFLAG(IS_ANDROID)
+ content_settings::WebsiteSettingsRegistry* website_settings =
+ content_settings::WebsiteSettingsRegistry::GetInstance();
+ for (const content_settings::WebsiteSettingsInfo* winfo : *website_settings) {
@@ -3476,7 +3462,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
// Note |ContentSettingsType::ADS| will show up regardless of its default
// value when it has been activated on the current origin.
if (info.type == ContentSettingsType::ADS) {
@@ -1532,7 +1541,19 @@ void PageInfo::PresentSitePermissions() {
@@ -1514,7 +1523,19 @@ void PageInfo::PresentSitePermissions() {
HostContentSettingsMap* content_settings = GetContentSettings();
DCHECK(web_contents_);
@@ -3603,7 +3589,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
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -70,6 +70,22 @@
@@ -78,6 +78,22 @@
namespace blink {
@@ -3629,18 +3615,18 @@ 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
--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -43,6 +43,7 @@
#include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h"
@@ -44,6 +44,7 @@
#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/permissions_policy/policy_disposition.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/v8_cache_options.mojom-blink-forward.h"
+#include "third_party/blink/public/platform/web_content_settings_client.h"
#include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/execution_context/security_context.h"
@@ -101,6 +102,10 @@ class SecurityOrigin;
class ScriptState;
class ScriptWrappable;
class TrustedTypePolicyFactory;
@@ -136,6 +137,10 @@ class TrustedTypePolicyFactory;
class WebCodecsLogger;
class WebPrintingManager;
class WebViewAndroid;
+class WebContentSettingsClient;
+
+CORE_EXPORT WebContentSettingsClient* GetContentSettingsClientFor(
build/patches/Cromite-Branding--improve-settings-ui.patch
+8 -14
View File
@@ -8,17 +8,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
chrome/android/chrome_java_resources.gni | 2 +-
.../android/java/res/xml/main_preferences.xml | 4 +-
.../res/xml/privacy_preferences_cromite.xml | 197 ++++++++++++++++++
.../res/xml/privacy_preferences_cromite.xml | 191 ++++++++++++++++++
.../privacy/settings/PrivacySettings.java | 6 +-
.../Cromite-settings-ui.grdp | 15 ++
5 files changed, 219 insertions(+), 5 deletions(-)
5 files changed, 213 insertions(+), 5 deletions(-)
create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -664,7 +664,7 @@ chrome_java_resources = [
@@ -683,7 +683,7 @@ chrome_java_resources = [
"java/res/xml/manage_sync_preferences.xml",
"java/res/xml/personalize_google_services_preferences.xml",
"java/res/xml/incognito_preferences.xml",
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrom
new file mode 100644
--- /dev/null
+++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
@@ -0,0 +1,197 @@
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2022 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
@@ -223,12 +223,6 @@ new file mode 100644
+ android:fragment="org.chromium.components.privacy_sandbox.TrackingProtectionSettings"
+ app:isPreferenceVisible="false" />
+ <Preference
+ android:key="incognito_tracking_protections"
+ android:title="@string/incognito_tracking_protections_link_row_label"
+ android:summary="@string/incognito_tracking_protections_link_row_sublabel"
+ android:fragment="org.chromium.components.privacy_sandbox.IncognitoTrackingProtectionsFragment"
+ app:isPreferenceVisible="false" />
+ <Preference
+ android:key="privacy_sandbox"
+ android:title="@string/ad_privacy_link_row_label"
+ android:summary="@string/ad_privacy_link_row_sub_label"
@@ -253,16 +247,16 @@ new file mode 100644
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -194,7 +194,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -189,7 +189,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
mPageTitle.set(getString(R.string.prefs_privacy_security));
- SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
+ SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences_cromite);
Preference incognitoTrackingProtectionsPreference =
findPreference(PREF_INCOGNITO_TRACKING_PROTECTIONS);
@@ -290,7 +290,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
Preference sandboxPreference = findPreference(PREF_PRIVACY_SANDBOX);
// Overwrite the click listener to pass a correct referrer to the fragment.
@@ -282,7 +282,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
ChromeSwitchPreference passwordLeakTogglePref =
(ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);
build/patches/Cromite-Branding.patch
+11 -11
View File
@@ -91,7 +91,7 @@ diff --git a/build/BUILD.gn b/build/BUILD.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -186,6 +186,10 @@ declare_args() {
@@ -184,6 +184,10 @@ declare_args() {
clang_warning_suppression_file = ""
}
@@ -9146,7 +9146,7 @@ diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
@@ -466,8 +466,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -481,8 +481,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
&& !isEmptyUrl(mParams.getUrl())
&& UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
if (mMode == ContextMenuMode.NORMAL) {
@@ -9214,7 +9214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -873,7 +873,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -914,7 +914,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
}
return mBackButtonShouldCloseTabFn.apply(tab)
? ActionType.CLOSE_TAB
@@ -13201,7 +13201,7 @@ e)fqMZZ`3a)Ds&5H<cfp<0000<MNUMnLSTYHt&Yn8
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1840,6 +1840,7 @@ static_library("browser") {
@@ -1825,6 +1825,7 @@ static_library("browser") {
"//build/config/chromebox_for_meetings:buildflags",
"//build/config/compiler:compiler_buildflags",
"//build/config/linux/dbus:buildflags",
@@ -13212,7 +13212,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java b/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
--- a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
+++ b/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
@@ -84,7 +84,7 @@ public class HubToolbarMediator {
@@ -83,7 +83,7 @@ public class HubToolbarMediator {
@Override
public void onConfigurationChanged(Configuration configuration) {
int screenWidthDp = configuration.screenWidthDp;
@@ -13356,7 +13356,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
@@ -289,10 +290,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
@@ -294,10 +295,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
const base::FilePath& profile_path) {
std::string seed;
CHECK(ui::ResourceBundle::HasSharedInstance());
@@ -13371,7 +13371,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
--- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -78,7 +78,7 @@ const int kMaxProfileShortcutFileNameLength = 64;
@@ -79,7 +79,7 @@ const int kMaxProfileShortcutFileNameLength = 64;
// Incrementing this number will cause profile icons to be regenerated on
// profile startup (it should be incremented whenever the product/avatar icons
// change, etc).
@@ -13402,7 +13402,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
#menu {
color: var(--google-grey-700);
display: flex;
@@ -176,7 +188,7 @@
@@ -177,7 +189,7 @@
</a>
<a role="menuitem" id="about-menu" href="/help"
class="cr-nav-menu-item">
@@ -13439,7 +13439,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
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
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2371,7 +2371,7 @@ Your Google account may have other forms of browsing history like searches and a
@@ -2380,7 +2380,7 @@ Your Google account may have other forms of browsing history like searches and a
About Chrome
</message>
<message name="IDS_LEGAL_INFORMATION_SUMMARY" desc="Summary for legal information" meaning="Android">
@@ -13448,7 +13448,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">
Application version
@@ -5752,7 +5752,7 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -5845,7 +5845,7 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<!-- Storage Preference UI strings for clearing storage. -->
<message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL" desc="Title for Chrome's Manage Space Activity.">
@@ -18412,7 +18412,7 @@ i?Ib$(ofrX17!1R|`h|N%TnD<%35@j2bgPM^i2nno*_EOI
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -1109,6 +1109,7 @@ bool AutocompleteController::ShouldRunProvider(
@@ -1106,6 +1106,7 @@ bool AutocompleteController::ShouldRunProvider(
#if BUILDFLAG(IS_ANDROID)
if (omnibox::IsAndroidHub(input_.current_page_classification())) {
build/patches/Customize-selection-popup.patch
+7 -7
View File
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionMod
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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -903,10 +903,17 @@ public class ChromeTabbedActivity extends ChromeActivity {
@@ -897,10 +897,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
@TabLaunchType int type,
@TabCreationState int creationState,
boolean markedForSelection) {
@@ -106,7 +106,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/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
@@ -249,6 +249,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
@@ -250,6 +250,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
// Skip opening a new Tab if it doesn't make sense.
if (mTab.isClosing()) return false;
@@ -121,7 +121,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
WindowAndroid window = mTab.getWindowAndroid();
boolean openingPopup =
window != null
@@ -279,7 +287,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
@@ -294,7 +302,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
mTab,
/* shouldPin= */ false,
webContents,
@@ -158,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
@@ -417,8 +417,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
@@ -430,8 +430,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
public void onOpenImageInNewTab(GURL url, @Nullable Referrer referrer) {
LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
loadUrlParams.setReferrer(referrer);
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
import org.chromium.base.TraceEvent;
import org.chromium.base.lifetime.Destroyable;
import org.chromium.base.metrics.RecordUserAction;
@@ -979,11 +980,16 @@ public class RootUiCoordinator
@@ -1021,11 +1022,16 @@ public class RootUiCoordinator
TrackerFactory.getTrackerForProfile(tab.getProfile())
.notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
@@ -265,7 +265,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
@@ -79,4 +79,28 @@ found in the LICENSE file.
@@ -84,4 +84,28 @@ found in the LICENSE file.
android:key="disable_toolbar_swipeup"
android:title="@string/disable_toolbar_swipe_up" />
@@ -390,7 +390,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
@@ -1113,7 +1113,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
@@ -1114,7 +1114,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
private boolean handleAssistMenuItemClick(int order) {
// Primary assist action is always the first action in the list so offset by 1.
build/patches/Dictionary-suggestions-for-the-Omnibox.patch
+5 -5
View File
@@ -24,11 +24,11 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
+ android:inputType="textUri"
android:hint="@string/omnibox_empty_hint"
android:textAlignment="viewStart"
app:layout_constraintStart_toEndOf="@id/location_bar_status"
android:importantForAutofill="no"
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
@@ -378,8 +378,17 @@ class LocationBarMediator
@@ -409,8 +409,17 @@ class LocationBarMediator
if (!mUrlFocusedWithPastedText
&& !shouldRetainOmniboxOnFocus
&& mLocationBarLayout.shouldClearTextOnFocus()) {
@@ -48,7 +48,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
} else if (shouldRetainOmniboxOnFocus) {
mUrlCoordinator.setSelectAllOnFocus(true);
}
@@ -1798,7 +1807,6 @@ class LocationBarMediator
@@ -1898,7 +1907,6 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(true, false);
}
@@ -67,7 +67,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import android.os.SystemClock;
import android.text.Editable;
import android.text.InputType;
@@ -114,6 +115,7 @@ public class UrlBar extends AutocompleteEditText {
@@ -116,6 +117,7 @@ public class UrlBar extends AutocompleteEditText {
private boolean mAllowFocus = true;
private boolean mShouldSendTypingStartedEvent;
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
private boolean mPendingScroll;
private boolean mIsInCct;
@@ -353,6 +355,28 @@ public class UrlBar extends AutocompleteEditText {
@@ -369,6 +371,28 @@ public class UrlBar extends AutocompleteEditText {
fixupTextDirection();
mShouldSendTypingStartedEvent = focused;
build/patches/Disable-Accessibility-service-by-default.patch
+1 -1
View File
@@ -42,7 +42,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
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
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
@@ -1134,6 +1134,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
@@ -1142,6 +1142,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
structure.setChildCount(0);
return;
}
build/patches/Disable-Android-Tab-Declutter.patch
+1 -1
View File
@@ -27,7 +27,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/tab/TabArchiveSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
@@ -104,11 +104,12 @@ public class TabArchiveSettings {
@@ -105,11 +105,12 @@ public class TabArchiveSettings {
// are created, and tabs disappearing from tests is very unexpected. For archive tests,
// this will need to be turned on manually.
return mPrefsManager.readBoolean(
build/patches/Disable-CSSDynamicRangeLimit.patch
+1 -1
View File
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1398,7 +1398,7 @@
@@ -1419,7 +1419,7 @@
},
{
name: "CSSDynamicRangeLimit",
build/patches/Disable-Compose-feature.patch
+1 -1
View File
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui
#include "chrome/browser/history_embeddings/history_embeddings_utils.h"
#include "chrome/browser/optimization_guide/optimization_guide_keyed_service.h"
#include "chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.h"
@@ -354,7 +356,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
@@ -359,7 +361,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
base::FeatureList::IsEnabled(permissions::features::kKeyboardLockPrompt));
#if BUILDFLAG(ENABLE_COMPOSE)
build/patches/Disable-Compression-Dictionary-Transport.patch
+1 -1
View File
@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
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
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1447,8 +1447,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
@@ -1452,8 +1452,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
registry->RegisterBooleanPref(prefs::kSandboxExternalProtocolBlocked, true);
registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true);
registry->RegisterListPref(prefs::kSSLErrorOverrideAllowedForOrigins);
build/patches/Disable-Device-Attributes-API.patch
+2 -2
View File
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/device_api/device_service_impl.cc
--- a/chrome/browser/device_api/device_service_impl.cc
+++ b/chrome/browser/device_api/device_service_impl.cc
@@ -154,6 +154,7 @@ bool IsPermissionsPolicyFeatureEnabled() {
@@ -155,6 +155,7 @@ bool IsPermissionsPolicyFeatureEnabled() {
bool IsTrustedContext(content::RenderFrameHost& host,
const url::Origin& origin) {
@@ -18,7 +18,7 @@ diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/d
// Do not create the service for the incognito mode.
if (GetProfile(host)->IsIncognitoProfile()) {
return false;
@@ -349,6 +350,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
@@ -350,6 +351,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
void DeviceServiceImpl::GetDeviceAttribute(
void (DeviceAttributeApi::*method)(DeviceAttributeCallback callback),
DeviceAttributeCallback callback) {
build/patches/Disable-FedCm.patch
+11 -3
View File
@@ -6,16 +6,18 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../content_settings/core/browser/content_settings_registry.cc | 2 +-
.../content/public/common/content_features_cc/Disable-FedCm.inc | 1 +
.../services/network/public/cpp/features_cc/Disable-FedCm.inc | 1 +
.../third_party/blink/common/features_cc/Disable-FedCm.inc | 1 +
.../blink/renderer/platform/runtime_enabled_features.json5 | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
5 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc
create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
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
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -650,7 +650,7 @@ void ContentSettingsRegistry::Init() {
@@ -640,7 +640,7 @@ void ContentSettingsRegistry::Init() {
PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
Register(ContentSettingsType::FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION,
@@ -30,6 +32,12 @@ new file mode 100644
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kFedCm);
diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc
new file mode 100644
--- /dev/null
+++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc
@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_ENABLED(kSendSameSiteLaxForFedCM);
diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
new file mode 100644
--- /dev/null
@@ -39,7 +47,7 @@ new file mode 100644
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2222,7 +2222,7 @@
@@ -2286,7 +2286,7 @@
{
name: "FedCm",
public: true,
build/patches/Disable-GetInstalledRelatedApps-API.patch
+1 -1
View File
@@ -58,7 +58,7 @@ new file mode 100644
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2952,9 +2952,8 @@
@@ -3037,9 +3037,8 @@
status: "stable",
},
{
build/patches/Disable-PrivacyGuide.patch
+1 -1
View File
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -328,8 +328,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
@@ -336,8 +336,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
#endif // BUILDFLAG(IS_CHROMEOS)
bool show_privacy_guide =
build/patches/Disable-Real-Box.patch
+18 -16
View File
@@ -4,16 +4,16 @@ Subject: Disable Real Box
Real-box is search box in ntp
---
chrome/browser/prefs/browser_prefs.cc | 2 +-
chrome/browser/resources/new_tab_page/app.html | 17 -----------------
.../ui/webui/searchbox/searchbox_handler.cc | 1 +
components/search/ntp_features.cc | 4 ++--
4 files changed, 4 insertions(+), 20 deletions(-)
chrome/browser/prefs/browser_prefs.cc | 2 +-
.../browser/resources/new_tab_page/app.html | 19 -------------------
.../searchbox/searchbox_handler.cc | 1 +
components/search/ntp_features.cc | 4 ++--
4 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -2235,7 +2235,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1987,7 +1987,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry->RegisterBooleanPref(
prefs::kLensRegionSearchEnabled, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -25,7 +25,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html
--- a/chrome/browser/resources/new_tab_page/app.html
+++ b/chrome/browser/resources/new_tab_page/app.html
@@ -40,23 +40,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
@@ -40,25 +40,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
?hidden="${!this.showScrim_}"></div>
` : ''}
<div id="searchboxContainer">
@@ -37,6 +37,7 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
- @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
- ?had-secondary-side="${this.realboxHadSecondarySide}"
- @had-secondary-side-changed="${this.onRealboxHadSecondarySideChanged_}"
- @context-menu-entrypoint-click="${this.onContextMenuEntrypointClick_}"
- ?can-show-secondary-side="${this.realboxCanShowSecondarySide}"
- ?compose-button-enabled="${this.composeButtonEnabled}"
- ?composebox-enabled="${this.composeboxEnabled}"
@@ -44,15 +45,16 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
- ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
- ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}"
- @searchbox-input-focus-changed="${this.onInputFocusChanged_}"
- context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}">
- context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}"
- ?multi-line-enabled="${this.multiLineEnabled_}">
- </cr-searchbox>
${this.showComposebox_ ? html`
<cr-composebox id="composebox"
?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
--- a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
+++ b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
@@ -298,6 +298,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
${this.enableModalComposebox_ ? html`
<div id="dialogAnchor"></div>
diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
--- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
+++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
@@ -299,6 +299,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
Profile* profile,
bool enable_voice_search,
bool enable_lens_search) {
@@ -63,7 +65,7 @@ diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/bro
diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
--- a/components/search/ntp_features.cc
+++ b/components/search/ntp_features.cc
@@ -109,7 +109,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -114,7 +114,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT);
// If enabled, logo will be shown.
// This is a kill switch. Keep indefinitely.
@@ -72,7 +74,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
// If enabled, middle slot promo will be shown.
// This is a kill switch. Keep indefinitely.
@@ -151,7 +151,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -156,7 +156,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
// If enabled, OneGoogleBar will be shown.
// This is a kill switch. Keep indefinitely.
build/patches/Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch
+1 -1
View File
@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -4830,8 +4830,8 @@
@@ -4951,8 +4951,8 @@
{
// Preserves the sticky user activation state after a page navigates to
// another same-origin page. https://crbug.com/433729626
build/patches/Disable-TLS-resumption.patch
+1 -1
View File
@@ -129,7 +129,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {}
QuicSessionRequest::~QuicSessionRequest() {
@@ -2415,7 +2447,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
@@ -2422,7 +2454,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
cert_verifier_, transport_security_state_, sct_auditing_delegate_,
std::move(hostnames_to_allow_unknown_roots),
key.network_anonymization_key),
build/patches/Disable-UA-full-version.patch
+16 -12
View File
@@ -7,8 +7,8 @@ getHighEntropyValues will return only the major version
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
---
.../renderer/core/frame/navigator_ua_data.cc | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
.../renderer/core/frame/navigator_ua_data.cc | 21 +++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
--- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
@@ -20,13 +20,15 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
+#include "base/version.h"
+#include "base/strings/strcat.h"
+#include "base/strings/string_number_conversions.h"
#include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
#include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
#include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
@@ -65,6 +68,16 @@ void MaybeRecordMetric(bool record_identifiability,
execution_context);
}
#include "third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_ua_data_values.h"
@@ -17,6 +20,20 @@
namespace blink {
+namespace {
+
+const String GetReducedVersionNumber(const std::string& fullVersion) {
+ base::Version version(fullVersion);
+ std::string version_str;
@@ -37,10 +39,12 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
+ return String::FromUTF8(version_str);
+}
+
} // namespace
+}
+
NavigatorUAData::NavigatorUAData(ExecutionContext* context)
@@ -103,7 +116,7 @@ void NavigatorUAData::SetFullVersionList(
: ExecutionContextClient(context) {
NavigatorUABrandVersion* dict = NavigatorUABrandVersion::Create();
@@ -53,7 +70,7 @@ void NavigatorUAData::SetFullVersionList(
const UserAgentBrandList& full_version_list) {
for (const auto& brand_version : full_version_list) {
AddBrandFullVersion(String::FromUTF8(brand_version.brand),
@@ -49,7 +53,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
}
}
@@ -125,7 +138,7 @@ void NavigatorUAData::SetModel(const String& model) {
@@ -75,7 +92,7 @@ void NavigatorUAData::SetModel(const String& model) {
}
void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) {
build/patches/Disable-Viewport-Segments.patch
+1 -1
View File
@@ -21,7 +21,7 @@ new file mode 100644
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -5458,8 +5458,7 @@
@@ -5592,8 +5592,7 @@
status: "stable",
},
{
build/patches/Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch
+1 -1
View File
@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
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
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -357,8 +357,13 @@ void ContentSettingsRegistry::Init() {
@@ -347,8 +347,13 @@ void ContentSettingsRegistry::Init() {
ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
build/patches/Disable-WebGPU.patch
+4 -4
View File
@@ -24,10 +24,10 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
--- a/gpu/config/gpu_finch_features.cc
+++ b/gpu/config/gpu_finch_features.cc
@@ -182,7 +182,7 @@ BASE_FEATURE(kEnableDrDc,
@@ -196,7 +196,7 @@ BASE_FEATURE(kEnableDrDc,
// enabled by default on supported platforms.
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
BUILDFLAG(IS_ANDROID)
BUILDFLAG(IS_ANDROID) || BUILDFLAG(USE_WEBGPU_ON_VULKAN_VIA_GL_INTEROP)
-#define WEBGPU_ENABLED base::FEATURE_ENABLED_BY_DEFAULT
+#define WEBGPU_ENABLED base::FEATURE_DISABLED_BY_DEFAULT
#else
@@ -36,7 +36,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
--- a/third_party/blink/renderer/modules/webgpu/gpu.cc
+++ b/third_party/blink/renderer/modules/webgpu/gpu.cc
@@ -161,6 +161,8 @@ GPU::GPU(NavigatorBase& navigator)
@@ -153,6 +153,8 @@ GPU::GPU(NavigatorBase& navigator)
GPU::~GPU() = default;
WGSLLanguageFeatures* GPU::wgslLanguageFeatures() const {
@@ -45,7 +45,7 @@ diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blin
return wgsl_language_features_.Get();
}
@@ -444,6 +446,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
@@ -404,6 +406,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
"WebGPU is experimental on this platform. See "
"https://github.com/gpuweb/gpuweb/wiki/"
"Implementation-Status#implementation-status"));
build/patches/Disable-all-predictors-code.patch
+286 -226
View File
@@ -5,82 +5,86 @@ Subject: Disable all predictors code
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
---
chrome/browser/BUILD.gn | 3 -
.../background_download_service_factory.cc | 2 +-
.../preloading_model_keyed_service.cc | 3 +
.../preloading_model_keyed_service_factory.cc | 4 +-
.../chrome_hints_manager.cc | 1 +
.../model_validator_keyed_service.cc | 6 +-
.../optimization_guide_keyed_service.cc | 1 -
.../password_change_delegate_impl.cc | 2 +
chrome/browser/permissions/BUILD.gn | 2 -
.../permissions/chrome_permissions_client.cc | 2 -
.../passage_embedder_delegate.cc | 2 +
.../permissions_ai_ui_selector.cc | 5 ++
.../permissions_ai_ui_selector.h | 5 +-
.../prediction_model_handler_provider.cc | 12 +++-
.../prediction_model_handler_provider.h | 2 +
.../quiet_notification_permission_ui_state.cc | 4 +-
.../autocomplete_action_predictor.cc | 2 +
.../predictors/loading_predictor_config.cc | 4 +-
.../browser/predictors/predictors_features.cc | 3 +-
.../search_prefetch/field_trial_settings.cc | 4 ++
.../search_prefetch_url_loader_interceptor.cc | 1 +
...hrome_browser_main_extra_parts_profiles.cc | 1 -
chrome/browser/safe_browsing/BUILD.gn | 1 -
...ation_content_detection_service_factory.cc | 6 ++
.../preloading/AndroidPrerenderManager.java | 1 +
.../ui/autofill/chrome_autofill_client.cc | 15 -----
chrome/browser/ui/tab_helpers.cc | 1 -
.../autofill_ml_internals_page_handler.cc | 2 +
.../autofill_ml_internals_page_handler.h | 3 +
.../autofill_ml_internals_ui.cc | 3 +
.../read_anything/read_aloud_app_model.cc | 16 +++++-
.../read_anything/read_aloud_app_model.h | 9 ++-
.../read_anything_app_controller.cc | 10 ++++
.../read_anything_app_controller.h | 4 ++
chrome/test/BUILD.gn | 2 -
chrome/utility/BUILD.gn | 2 +-
chrome/utility/services.cc | 8 ---
components/BUILD.gn | 2 +-
.../browser/foundations/autofill_manager.cc | 6 ++
.../browser/foundations/autofill_manager.h | 3 +
.../autofill_optimization_guide_decider.cc | 5 +-
.../field_classification_model_handler.cc | 12 ++--
.../field_classification_model_handler.h | 10 +++-
.../aim_eligibility_service_features.cc | 1 +
.../browser/autocomplete_controller.cc | 4 ++
.../omnibox/browser/base_search_provider.cc | 4 +-
.../prediction_model_download_manager.cc | 6 +-
.../delivery/prediction_model_fetcher_impl.cc | 1 +
.../core/hints/hints_fetcher.cc | 1 +
.../core/hints/hints_manager.cc | 2 +
.../core/optimization_guide_features.cc | 12 ++--
components/optimization_guide/features.gni | 3 +-
.../core/page_content_annotations_features.cc | 4 ++
.../page_content_annotations_model_manager.cc | 1 +
.../notification_content_detection/BUILD.gn | 4 --
.../service_worker_main_resource_loader.cc | 1 +
.../Disable-all-predictors-code.inc | 2 +
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 5 ++
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 2 +
media/webrtc/BUILD.gn | 5 ++
media/webrtc/helpers.cc | 3 +-
services/on_device_model/ml/BUILD.gn | 2 +-
services/on_device_model/ml/ts_model.cc | 4 +-
services/on_device_model/safety/BUILD.gn | 2 +-
services/webnn/BUILD.gn | 2 +-
services/webnn/features.gni | 2 +-
services/webnn/webnn_context_provider_impl.cc | 57 +------------------
.../core/html/parser/html_document_parser.cc | 1 +
.../document_speculation_rules.cc | 1 +
.../platform/runtime_enabled_features.json5 | 2 +-
75 files changed, 187 insertions(+), 144 deletions(-)
chrome/browser/BUILD.gn | 3 ---
.../background_download_service_factory.cc | 2 +-
.../preloading_model_keyed_service.cc | 3 +++
.../preloading_model_keyed_service_factory.cc | 4 +---
.../optimization_guide/chrome_hints_manager.cc | 1 +
.../model_validator_keyed_service.cc | 6 +++++-
.../optimization_guide_keyed_service.cc | 1 -
.../password_change_delegate_impl.cc | 2 ++
chrome/browser/permissions/BUILD.gn | 2 --
.../permissions/chrome_permissions_client.cc | 2 --
.../passage_embedder_delegate.cc | 2 ++
.../permissions_ai_ui_selector.cc | 5 +++++
.../permissions_ai_ui_selector.h | 5 ++++-
.../prediction_model_handler_provider.cc | 12 +++++++++---
.../prediction_model_handler_provider.h | 2 ++
.../quiet_notification_permission_ui_state.cc | 4 ++--
.../autocomplete_action_predictor.cc | 2 ++
.../predictors/loading_predictor_config.cc | 4 ++--
.../browser/predictors/predictors_features.cc | 3 +--
.../search_prefetch/field_trial_settings.cc | 4 ++++
.../search_prefetch_url_loader_interceptor.cc | 1 +
...chrome_browser_main_extra_parts_profiles.cc | 1 -
chrome/browser/safe_browsing/BUILD.gn | 1 -
...cation_content_detection_service_factory.cc | 6 ++++++
.../preloading/AndroidPrerenderManager.java | 1 +
.../ui/autofill/chrome_autofill_client.cc | 13 +------------
chrome/browser/ui/tab_helpers.cc | 1 -
.../autofill_ml_internals_page_handler.cc | 2 ++
.../autofill_ml_internals_page_handler.h | 3 +++
.../autofill_ml_internals_ui.cc | 3 +++
.../read_anything/read_aloud_app_model.cc | 16 ++++++++++++++--
.../read_anything/read_aloud_app_model.h | 9 ++++++++-
.../read_anything_app_controller.cc | 10 ++++++++++
.../read_anything_app_controller.h | 4 ++++
chrome/test/BUILD.gn | 2 --
chrome/utility/BUILD.gn | 2 +-
chrome/utility/services.cc | 8 --------
components/BUILD.gn | 2 +-
.../browser/foundations/autofill_manager.cc | 6 ++++++
.../browser/foundations/autofill_manager.h | 3 +++
.../autofill_optimization_guide_decider.cc | 5 +++--
.../field_classification_model_handler.cc | 12 ++++++++----
.../field_classification_model_handler.h | 10 ++++++++--
.../aim_eligibility_service_features.cc | 1 +
.../omnibox/browser/autocomplete_controller.cc | 4 ++++
.../omnibox/browser/base_search_provider.cc | 4 ++--
.../prediction_model_download_manager.cc | 6 ++++--
.../delivery/prediction_model_fetcher_impl.cc | 1 +
.../core/hints/hints_fetcher.cc | 1 +
.../core/hints/hints_manager.cc | 2 ++
.../core/optimization_guide_features.cc | 11 +++++------
components/optimization_guide/features.gni | 3 +--
.../core/page_content_annotations_features.cc | 7 +++++++
.../page_content_annotations_model_manager.cc | 1 +
.../notification_content_detection/BUILD.gn | 4 ----
components/viz/service/BUILD.gn | 4 ++--
components/viz/service/gl/gpu_service_impl.cc | 18 ------------------
content/browser/BUILD.gn | 6 +++---
content/browser/gpu/gpu_process_host.cc | 6 +++---
.../service_worker_main_resource_loader.cc | 1 +
.../Disable-all-predictors-code.inc | 2 ++
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 5 +++++
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 1 +
.../Disable-all-predictors-code.inc | 2 ++
media/webrtc/BUILD.gn | 5 +++++
media/webrtc/helpers.cc | 3 ++-
services/on_device_model/ml/BUILD.gn | 2 +-
services/on_device_model/ml/ts_model.cc | 4 ++--
services/on_device_model/safety/BUILD.gn | 2 +-
services/webnn/BUILD.gn | 2 +-
services/webnn/features.gni | 2 +-
services/webnn/webnn_context_provider_impl.cc | 13 +------------
.../core/html/parser/html_document_parser.cc | 1 +
.../document_speculation_rules.cc | 1 +
.../platform/runtime_enabled_features.json5 | 2 +-
79 files changed, 198 insertions(+), 123 deletions(-)
create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
@@ -93,7 +97,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
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -728,8 +728,6 @@ static_library("browser") {
@@ -731,8 +731,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_keyed_service_factory.h",
"navigation_predictor/navigation_predictor_metrics_document_data.cc",
"navigation_predictor/navigation_predictor_metrics_document_data.h",
@@ -102,7 +106,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"navigation_predictor/preloading_model_keyed_service.cc",
"navigation_predictor/preloading_model_keyed_service.h",
"navigation_predictor/preloading_model_keyed_service_factory.cc",
@@ -2376,7 +2374,6 @@ static_library("browser") {
@@ -2364,7 +2362,6 @@ static_library("browser") {
"//components/resources",
"//components/safe_browsing/content/browser",
"//components/safe_browsing/content/browser:safe_browsing_service",
@@ -175,7 +179,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc b/chrome/browser/optimization_guide/model_validator_keyed_service.cc
--- a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
+++ b/chrome/browser/optimization_guide/model_validator_keyed_service.cc
@@ -67,13 +67,13 @@ namespace optimization_guide {
@@ -69,13 +69,13 @@ namespace optimization_guide {
ModelValidatorKeyedService::ModelValidatorKeyedService(Profile* profile)
: profile_(profile) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -190,7 +194,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
if (switches::ShouldValidateModel()) {
// Create the validator object which will get destroyed when the model
// load is complete.
@@ -134,6 +134,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged(
@@ -136,6 +136,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged(
void ModelValidatorKeyedService::StartModelExecutionValidation() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -198,15 +202,15 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
auto* opt_guide_service =
OptimizationGuideKeyedServiceFactory::GetForProfile(profile_);
if (!opt_guide_service) {
@@ -152,6 +153,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() {
/*execution_timeout=*/std::nullopt,
@@ -154,6 +155,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() {
/*options=*/{},
base::BindOnce(&ModelValidatorKeyedService::OnModelExecuteResponse,
weak_ptr_factory_.GetWeakPtr()));
+#endif
}
void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
@@ -169,6 +171,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
@@ -171,6 +173,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
void ModelValidatorKeyedService::PerformOnDeviceModelExecutionValidation(
std::unique_ptr<optimization_guide::proto::ModelValidationInput> input) {
@@ -214,7 +218,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
auto* opt_guide_service =
OptimizationGuideKeyedServiceFactory::GetForProfile(profile_);
@@ -216,6 +219,7 @@ void ModelValidatorKeyedService::ExecuteModel(
@@ -218,6 +221,7 @@ void ModelValidatorKeyedService::ExecuteModel(
*metadata, base::BindRepeating(
&ModelValidatorKeyedService::OnDeviceModelExecuteResponse,
weak_ptr_factory_.GetWeakPtr(), std::move(request)));
@@ -225,7 +229,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_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
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
@@ -383,7 +383,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
@@ -420,7 +420,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
void OptimizationGuideKeyedService::RegisterOptimizationTypes(
const std::vector<optimization_guide::proto::OptimizationType>&
optimization_types) {
@@ -236,7 +240,7 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.
diff --git a/chrome/browser/password_manager/password_change_delegate_impl.cc b/chrome/browser/password_manager/password_change_delegate_impl.cc
--- a/chrome/browser/password_manager/password_change_delegate_impl.cc
+++ b/chrome/browser/password_manager/password_change_delegate_impl.cc
@@ -397,11 +397,13 @@ void PasswordChangeDelegateImpl::StartPasswordChangeFlow() {
@@ -353,11 +353,13 @@ void PasswordChangeDelegateImpl::StartPasswordChangeFlow() {
// a local ML model for field classification.
// TODO(452883239): Clean this up when model is downloaded on start-up for
// everybody.
@@ -249,7 +253,7 @@ diff --git a/chrome/browser/password_manager/password_change_delegate_impl.cc b/
+#endif
}
void PasswordChangeDelegateImpl::OnLoginStateCheckResult(bool is_logged_in) {
void PasswordChangeDelegateImpl::OnLoginStateCheckResult(
diff --git a/chrome/browser/permissions/BUILD.gn b/chrome/browser/permissions/BUILD.gn
--- a/chrome/browser/permissions/BUILD.gn
+++ b/chrome/browser/permissions/BUILD.gn
@@ -265,7 +269,7 @@ diff --git a/chrome/browser/permissions/BUILD.gn b/chrome/browser/permissions/BU
diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc
--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -481,8 +481,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
@@ -482,8 +482,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
#endif
selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
Profile::FromBrowserContext(browser_context)));
@@ -296,7 +300,7 @@ diff --git a/chrome/browser/permissions/prediction_service/passage_embedder_dele
diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
--- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
@@ -412,6 +412,7 @@ void PermissionsAiUiSelector::SelectUiToUse(
@@ -434,6 +434,7 @@ void PermissionsAiUiSelector::SelectUiToUse(
}
}
@@ -304,7 +308,7 @@ diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_sel
void PermissionsAiUiSelector::OnGetInnerTextForOnDeviceModel(
ModelExecutionData model_data,
ModelExecutionCallback model_execution_callback,
@@ -459,6 +460,7 @@ void PermissionsAiUiSelector::OnGetInnerTextForOnDeviceModel(
@@ -481,6 +482,7 @@ void PermissionsAiUiSelector::OnGetInnerTextForOnDeviceModel(
InquireServerModel(model_data.features,
std::move(model_data.request_metadata));
}
@@ -312,7 +316,7 @@ diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_sel
void PermissionsAiUiSelector::OnTimeout() {
VLOG(1) << "[CPSS] Overall timeout for prediction reached.";
@@ -673,6 +675,7 @@ bool PermissionsAiUiSelector::ShouldHoldBack(
@@ -697,6 +699,7 @@ bool PermissionsAiUiSelector::ShouldHoldBack(
PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse(
permissions::RequestType request_type) {
@@ -320,7 +324,7 @@ diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_sel
const bool is_msbb_enabled = profile_->GetPrefs()->GetBoolean(
unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
@@ -749,6 +752,7 @@ PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse(
@@ -773,6 +776,7 @@ PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse(
return PredictionSource::kNoCpssModel;
}
@@ -328,7 +332,7 @@ diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_sel
void PermissionsAiUiSelector::set_language_detection_observer_for_testing(
std::unique_ptr<permissions::LanguageDetectionObserver>
language_detection_observer) {
@@ -761,6 +765,7 @@ void PermissionsAiUiSelector::set_inner_text_for_testing(
@@ -785,6 +789,7 @@ void PermissionsAiUiSelector::set_inner_text_for_testing(
CHECK_IS_TEST();
inner_text_for_testing_ = std::move(inner_text_);
}
@@ -512,7 +516,7 @@ diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_
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
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -1221,7 +1221,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1217,7 +1217,6 @@ void ChromeBrowserMainExtraPartsProfiles::
#else
policy::UserPolicySigninServiceFactory::GetInstance();
#endif
@@ -523,7 +527,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -53,7 +53,6 @@ static_library("safe_browsing") {
@@ -54,7 +54,6 @@ static_library("safe_browsing") {
"//components/resources:components_resources_grit",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -582,19 +586,16 @@ diff --git a/chrome/browser/ui/android/preloading/java/src/org/chromium/chrome/b
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -565,11 +565,7 @@ void ChromeAutofillClient::GetAiPageContent(GetAiPageContentCallback callback) {
@@ -564,7 +564,7 @@ void ChromeAutofillClient::GetAiPageContent(GetAiPageContentCallback callback) {
}
AutofillAiManager* ChromeAutofillClient::GetAutofillAiManager() {
-#if !BUILDFLAG(IS_ANDROID)
- return &autofill_ai_manager_;
-#else
return nullptr;
-#endif
- return autofill_ai_manager_.get();
+ return nullptr;
}
AutofillAiModelCache* ChromeAutofillClient::GetAutofillAiModelCache() {
@@ -1401,18 +1397,7 @@ void ChromeAutofillClient::TriggerPlusAddressUserPerceptionSurvey(
@@ -1384,18 +1384,7 @@ void ChromeAutofillClient::TriggerPlusAddressUserPerceptionSurvey(
optimization_guide::ModelQualityLogsUploaderService*
ChromeAutofillClient::GetMqlsUploadService() {
@@ -820,7 +821,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
#include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"
#include "chrome/renderer/accessibility/read_anything/read_anything_app_model.h"
#include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h"
@@ -1798,6 +1800,7 @@ void ReadAnythingAppController::OnConnected() {
@@ -1810,6 +1812,7 @@ void ReadAnythingAppController::OnConnected() {
render_frame()->GetBrowserInterfaceBroker().GetInterface(
std::move(page_handler_factory_receiver));
@@ -828,7 +829,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
// Get the dependency parser model used by phrase-based highlighting.
if (read_aloud_model_.GetDependencyParserModel().IsAvailable()) {
return;
@@ -1806,6 +1809,7 @@ void ReadAnythingAppController::OnConnected() {
@@ -1818,6 +1821,7 @@ void ReadAnythingAppController::OnConnected() {
page_handler_->GetDependencyParserModel(
base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel,
weak_ptr_factory_.GetWeakPtr()));
@@ -836,7 +837,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
}
void ReadAnythingAppController::OnCopy() const {
@@ -2046,8 +2050,10 @@ std::u16string ReadAnythingAppController::GetCurrentTextContent() {
@@ -2062,8 +2066,10 @@ std::u16string ReadAnythingAppController::GetCurrentTextContent() {
}
void ReadAnythingAppController::PreprocessTextForSpeech() {
@@ -847,7 +848,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
}
void ReadAnythingAppController::MovePositionToNextGranularity() {
@@ -2301,14 +2307,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
@@ -2320,14 +2326,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
void ReadAnythingAppController::UpdateDependencyParserModel(
base::File model_file) {
@@ -879,7 +880,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
class ReadAnythingAppControllerTest;
class ReadAnythingAppControllerScreen2xDataCollectionModeTest;
@@ -311,7 +313,9 @@ class ReadAnythingAppController
@@ -313,7 +315,9 @@ class ReadAnythingAppController
// available.
void UpdateDependencyParserModel(base::File model_file);
@@ -892,7 +893,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5798,8 +5798,6 @@ if (!is_android) {
@@ -5812,8 +5812,6 @@ if (!is_android) {
"//chrome/browser/ui/exclusive_access:test_support",
"//chrome/browser/ui/hats",
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
@@ -916,9 +917,9 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
--- a/chrome/utility/services.cc
+++ b/chrome/utility/services.cc
@@ -243,13 +243,6 @@ auto RunMirroringService(
std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner());
}
@@ -245,13 +245,6 @@ auto RunMirroringService(
#endif // !BUILDFLAG(IS_ANDROID)
-auto RunPassageEmbeddingsService(
- mojo::PendingReceiver<passage_embeddings::mojom::PassageEmbeddingsService>
@@ -927,24 +928,24 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
- std::move(receiver));
-}
-
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
@@ -444,7 +437,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
auto RunSpeechRecognitionService(
mojo::PendingReceiver<media::mojom::SpeechRecognitionService> receiver) {
@@ -440,7 +433,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
services.Add(RunWebAppOriginAssociationParser);
services.Add(RunCSVPasswordParser);
services.Add(ContentBookmarkParser);
- services.Add(RunPassageEmbeddingsService);
#if !BUILDFLAG(IS_ANDROID)
services.Add(RunProfileImporter);
services.Add(RunMirroringService);
- services.Add(RunPassageEmbeddingsService);
services.Add(RunScreenAIServiceFactory);
#endif // !BUILDFLAG(IS_ANDROID)
diff --git a/components/BUILD.gn b/components/BUILD.gn
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -625,7 +625,7 @@ test("components_unittests") {
@@ -629,7 +629,7 @@ test("components_unittests") {
"//components/media_router/common/providers/cast/channel:unit_tests",
"//components/one_time_tokens/core/browser:unit_tests",
"//components/page_info:unit_tests",
"//components/permissions:unit_tests",
- "//components/permissions/prediction_service:unit_tests",
+ # "//components/permissions/prediction_service:unit_tests",
"//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests",
@@ -953,7 +954,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/components/autofill/core/browser/foundations/autofill_manager.cc
--- a/components/autofill/core/browser/foundations/autofill_manager.cc
+++ b/components/autofill/core/browser/foundations/autofill_manager.cc
@@ -137,8 +137,10 @@ struct AutofillManager::AsyncContext {
@@ -135,8 +135,10 @@ struct AutofillManager::AsyncContext {
std::vector<FormData> forms;
std::vector<RegexPredictions> regex_predictions;
@@ -964,23 +965,22 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/
GeoIpCountryCode country_code;
LanguageCode current_page_language;
std::unique_ptr<BufferingLogManager> log_manager;
@@ -710,6 +712,7 @@ void AutofillManager::ParseFormsAsyncCommon(
}
}
@@ -894,12 +896,14 @@ void AutofillManager::UpdateFormCache(
auto apply_predictions = [](FormStructure& form_structure,
const AsyncContext& context, size_t i) {
+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
if (!context.autofill_predictions.empty()) {
context.autofill_predictions[i].ApplyTo(form_structure->fields());
}
@@ -717,6 +720,7 @@ void AutofillManager::ParseFormsAsyncCommon(
context.password_manager_predictions[i].ApplyTo(
form_structure->fields());
}
if (!context.autofill_predictions.empty()) {
context.autofill_predictions[i].ApplyTo(form_structure.fields());
}
if (!context.password_manager_predictions.empty()) {
context.password_manager_predictions[i].ApplyTo(form_structure.fields());
}
+#endif
if (!context.regex_predictions.empty()) {
context.regex_predictions[i].ApplyTo(form_structure->fields());
}
@@ -979,6 +983,7 @@ void AutofillManager::LogCurrentFieldTypes(
if (!context.regex_predictions.empty()) {
context.regex_predictions[i].ApplyTo(form_structure.fields());
}
@@ -990,6 +994,7 @@ void AutofillManager::LogCurrentFieldTypes(
}
}
@@ -988,7 +988,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/
void AutofillManager::SubscribeToMlModelChanges(
FieldClassificationModelHandler& handler) {
switch (handler.optimization_target()) {
@@ -1002,5 +1007,6 @@ void AutofillManager::SubscribeToMlModelChanges(
@@ -1013,5 +1018,6 @@ void AutofillManager::SubscribeToMlModelChanges(
NOTREACHED();
}
}
@@ -1006,7 +1006,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.h b/c
#include "components/translate/core/browser/translate_driver.h"
namespace autofill {
@@ -368,10 +369,12 @@ class AutofillManager
@@ -374,10 +375,12 @@ class AutofillManager
// Reparses all known forms.
void ReparseKnownForms();
@@ -1022,7 +1022,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.h b/c
diff --git a/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc b/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc
--- a/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc
+++ b/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc
@@ -264,6 +264,7 @@ void AutofillOptimizationGuideDecider::OnPaymentsDataLoaded(
@@ -273,6 +273,7 @@ void AutofillOptimizationGuideDecider::OnPaymentsDataLoaded(
// If we do not have any optimization types to register, do not do anything.
if (!optimization_types.empty()) {
@@ -1030,7 +1030,7 @@ diff --git a/components/autofill/core/browser/integrators/optimization_guide/aut
decider_->RegisterOptimizationTypes(
std::vector<optimization_guide::proto::OptimizationType>(
std::move(optimization_types).extract()));
@@ -371,7 +372,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockSingleFieldSuggestions(
@@ -380,7 +381,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockSingleFieldSuggestions(
const AutofillField* field) const {
// If the field's storable type is `IBAN_VALUE`, check whether IBAN
// suggestions should be blocked based on `url`.
@@ -1039,7 +1039,7 @@ diff --git a/components/autofill/core/browser/integrators/optimization_guide/aut
optimization_guide::OptimizationGuideDecision decision =
decider_->CanApplyOptimization(
url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED,
@@ -397,7 +398,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockFormFieldSuggestion(
@@ -406,7 +407,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockFormFieldSuggestion(
const CreditCard& card) const {
if (auto optimization_type =
GetVcnMerchantOptOutOptimizationTypeForCard(card);
@@ -1168,7 +1168,7 @@ diff --git a/components/omnibox/browser/aim_eligibility_service_features.cc b/co
BASE_FEATURE(kAimEnabled, base::FEATURE_ENABLED_BY_DEFAULT);
+SET_CROMITE_FEATURE_DISABLED(kAimEnabled); // Disable AI Mode starter pack
BASE_FEATURE(kAimServerEligibilityEnabled, base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kAimServerEligibilityEnabled, base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
--- a/components/omnibox/browser/autocomplete_controller.cc
@@ -1183,7 +1183,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
#include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h"
#include "components/omnibox/browser/bookmark_provider.h"
#include "components/omnibox/browser/bookmark_scoring_signals_annotator.h"
@@ -132,6 +134,7 @@ using ProviderType = AutocompleteProvider::Type;
@@ -128,6 +130,7 @@ using ProviderType = AutocompleteProvider::Type;
constexpr bool is_android = !!BUILDFLAG(IS_ANDROID);
@@ -1191,7 +1191,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
void RecordMlScoreCoverage(size_t matches_with_non_null_scores,
size_t total_scored_matches) {
int percent_score_coverage =
@@ -240,6 +243,7 @@ void RecordTotalMatchesScored(size_t num_scored) {
@@ -236,6 +239,7 @@ void RecordTotalMatchesScored(size_t num_scored) {
base::UmaHistogramCounts1000("Omnibox.URLScoringModelExecuted.Matches",
num_scored);
}
@@ -1202,7 +1202,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
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
+++ b/components/omnibox/browser/base_search_provider.cc
@@ -100,14 +100,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type,
@@ -102,14 +102,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type,
bool BaseSearchProvider::ShouldPrefetch(const AutocompleteMatch& match) {
// TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for
// non-debugging purposes.
@@ -1259,7 +1259,7 @@ diff --git a/components/optimization_guide/core/delivery/prediction_model_downlo
diff --git a/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc b/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc
--- a/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc
+++ b/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc
@@ -51,6 +51,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels(
@@ -52,6 +52,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels(
proto::RequestContext request_context,
const std::string& locale,
ModelsFetchedCallback models_fetched_callback) {
@@ -1270,7 +1270,7 @@ diff --git a/components/optimization_guide/core/delivery/prediction_model_fetche
diff --git a/components/optimization_guide/core/hints/hints_fetcher.cc b/components/optimization_guide/core/hints/hints_fetcher.cc
--- a/components/optimization_guide/core/hints/hints_fetcher.cc
+++ b/components/optimization_guide/core/hints/hints_fetcher.cc
@@ -202,6 +202,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
@@ -204,6 +204,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
bool skip_cache,
HintsFetchedCallback hints_fetched_callback,
std::optional<proto::RequestContextMetadata> request_context_metadata) {
@@ -1298,7 +1298,7 @@ diff --git a/components/optimization_guide/core/hints/hints_manager.cc b/compone
diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc
--- a/components/optimization_guide/core/optimization_guide_features.cc
+++ b/components/optimization_guide/core/optimization_guide_features.cc
@@ -39,11 +39,7 @@ namespace features {
@@ -41,11 +41,7 @@ namespace features {
namespace {
constexpr auto enabled_by_default_mobile_only =
@@ -1310,7 +1310,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
} // namespace
@@ -244,8 +240,7 @@ size_t MaxHostKeyedHintCacheSize() {
@@ -254,8 +250,7 @@ size_t MaxHostKeyedHintCacheSize() {
}
bool ShouldPersistHintsToDisk() {
@@ -1320,13 +1320,12 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
}
RequestContextSet GetAllowedContextsForPersonalizedMetadata() {
@@ -579,5 +574,10 @@ bool ShouldEnableOptimizationGuideIconView() {
return base::FeatureList::IsEnabled(kOptimizationGuideIconView);
@@ -603,5 +598,9 @@ std::optional<base::TimeDelta> GetMainFrameGetAIPageContentTimeout() {
return kGetAIPageContentMainFrameTimeoutParam.Get();
}
+SET_CROMITE_FEATURE_DISABLED(kOptimizationHints);
+SET_CROMITE_FEATURE_DISABLED(kOptimizationTargetPrediction);
+SET_CROMITE_FEATURE_DISABLED(kPushNotifications);
+SET_CROMITE_FEATURE_DISABLED(kPreventLongRunningPredictionModels);
+SET_CROMITE_FEATURE_DISABLED(kOptimizationGuideFetchingForSRP);
} // namespace features
@@ -1347,14 +1346,45 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc
--- a/components/page_content_annotations/core/page_content_annotations_features.cc
+++ b/components/page_content_annotations/core/page_content_annotations_features.cc
@@ -323,4 +323,8 @@ PageContentExtractionTriggeringMode GetPageContentExtractionTriggeringMode() {
return PageContentExtractionTriggeringMode::kOnLoad;
@@ -69,6 +69,7 @@ const base::FeatureParam<std::string> kPageContentExtractionTriggeringMode{
bool IsSupportedLocale(const std::string& locale,
const std::string& supported_locales) {
+ if ((true)) return false;
if (supported_locales == "*") {
return true;
}
@@ -88,6 +89,7 @@ bool IsSupportedLocale(const std::string& locale,
bool IsSupportedCountry(const std::string& country_code,
const std::string& supported_countries) {
+ if ((true)) return false;
if (supported_countries == "*") {
return true;
}
@@ -295,6 +297,7 @@ bool IsSupportedLocaleForFeature(
const std::string& locale,
const base::Feature& feature,
const std::string& default_value = "de,en,es,fr,it,nl,pt,tr") {
+ if ((true)) return false;
if (!base::FeatureList::IsEnabled(feature)) {
return false;
}
@@ -312,6 +315,7 @@ bool IsSupportedLocaleForFeature(
bool IsSupportedCountryForFeature(const std::string& country_code,
const base::Feature& feature,
const std::string& default_value) {
+ if ((true)) return false;
if (!base::FeatureList::IsEnabled(feature)) {
return false;
}
@@ -326,4 +330,7 @@ bool IsSupportedCountryForFeature(const std::string& country_code,
return IsSupportedCountry(country_code, value);
}
+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations);
+SET_CROMITE_FEATURE_DISABLED(kRemotePageMetadata);
+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsValidation);
+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsPersistSalientImageMetadata);
+SET_CROMITE_FEATURE_DISABLED(kRemotePageMetadata);
} // namespace page_content_annotations::features
diff --git a/components/page_content_annotations/core/page_content_annotations_model_manager.cc b/components/page_content_annotations/core/page_content_annotations_model_manager.cc
--- a/components/page_content_annotations/core/page_content_annotations_model_manager.cc
@@ -1381,6 +1411,80 @@ diff --git a/components/safe_browsing/content/browser/notification_content_detec
]
deps = [
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -315,8 +315,8 @@ viz_component("service") {
"//services/metrics/public/mojom",
"//services/tracing/public/cpp",
"//services/viz/privileged/mojom",
- "//services/webnn:webnn_service",
- "//services/webnn/public/mojom",
+ #"//services/webnn:webnn_service",
+ #"//services/webnn/public/mojom",
"//skia",
"//skia:skcms",
"//third_party/blink/public/common",
diff --git a/components/viz/service/gl/gpu_service_impl.cc b/components/viz/service/gl/gpu_service_impl.cc
--- a/components/viz/service/gl/gpu_service_impl.cc
+++ b/components/viz/service/gl/gpu_service_impl.cc
@@ -649,24 +649,6 @@ void GpuServiceImpl::BindWebNNContextProvider(
std::move(pending_receiver), client_id));
return;
}
-
- if (!webnn_context_provider_) {
- scoped_refptr<gpu::SharedContextState> shared_context_state =
- GetContextState();
- // `shared_context_state` may be nullptr if there is no GPU acceleration.
- // For such case, WebNN CPU backend, e.g. TFLite XNNPACK, is still useful.
-
- // TODO(crbug.com/345352987): manage `WebNNContextProviderImpl` instance per
- // `client_id` in order to support memory metrics.
- webnn_context_provider_ = webnn::WebNNContextProviderImpl::Create(
- std::move(shared_context_state), gpu_feature_info_, gpu_info_,
- shared_image_manager(),
- base::BindOnce(&GpuServiceImpl::LoseAllContexts, weak_ptr_),
- main_runner(), GetGpuScheduler(), client_id, gpu_host_);
- }
-
- webnn_context_provider_->BindWebNNContextProvider(
- std::move(pending_receiver));
}
void GpuServiceImpl::GetVideoMemoryUsageStats(
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -270,9 +270,9 @@ source_set("browser") {
"//services/viz/public/cpp/gpu",
"//services/viz/public/mojom",
"//services/webnn:buildflags",
- "//services/webnn:webnn_service",
- "//services/webnn:webnn_switches",
- "//services/webnn/public/mojom",
+ # "//services/webnn:webnn_service",
+ # "//services/webnn:webnn_switches",
+ # "//services/webnn/public/mojom",
"//skia",
"//skia/public/mojom",
"//sql",
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -1346,9 +1346,9 @@ bool GpuProcessHost::LaunchGpuProcess() {
cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames);
cmd_line->CopySwitchesFrom(browser_command_line,
switches::kGLSwitchesCopiedFromGpuProcessHost);
- cmd_line->CopySwitchesFrom(
- browser_command_line,
- switches::GetWebNNSwitchesCopiedFromGpuProcessHost());
+ // cmd_line->CopySwitchesFrom(
+ // browser_command_line,
+ // switches::GetWebNNSwitchesCopiedFromGpuProcessHost());
if (browser_command_line.HasSwitch(switches::kDisableFrameRateLimit))
cmd_line->AppendSwitch(switches::kDisableGpuVsync);
diff --git a/content/browser/service_worker/service_worker_main_resource_loader.cc b/content/browser/service_worker/service_worker_main_resource_loader.cc
--- a/content/browser/service_worker/service_worker_main_resource_loader.cc
+++ b/content/browser/service_worker/service_worker_main_resource_loader.cc
@@ -1491,11 +1595,11 @@ diff --git a/media/webrtc/helpers.cc b/media/webrtc/helpers.cc
diff --git a/services/on_device_model/ml/BUILD.gn b/services/on_device_model/ml/BUILD.gn
--- a/services/on_device_model/ml/BUILD.gn
+++ b/services/on_device_model/ml/BUILD.gn
@@ -79,7 +79,7 @@ if (use_blink || (is_ios && build_with_internal_optimization_guide)) {
@@ -83,7 +83,7 @@ if (use_blink || (is_ios && build_with_internal_optimization_guide)) {
if (use_blink) {
deps += [ "//gpu/config" ]
}
- if (!is_fuchsia) {
- if (!is_fuchsia && build_with_tflite_lib) {
+ if (build_with_tflite_lib && !is_fuchsia) {
deps += [ "//services/on_device_model/safety:bert_safety_model" ]
}
@@ -1503,21 +1607,21 @@ diff --git a/services/on_device_model/ml/BUILD.gn b/services/on_device_model/ml/
diff --git a/services/on_device_model/ml/ts_model.cc b/services/on_device_model/ml/ts_model.cc
--- a/services/on_device_model/ml/ts_model.cc
+++ b/services/on_device_model/ml/ts_model.cc
@@ -25,7 +25,7 @@
@@ -27,7 +27,7 @@
#include "services/on_device_model/public/mojom/on_device_model_service.mojom.h"
#include "services/on_device_model/safety/safety_util.h"
-#if !BUILDFLAG(IS_FUCHSIA)
+#if false && !BUILDFLAG(IS_FUCHSIA)
-#if !BUILDFLAG(IS_FUCHSIA) && BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+#if false && !BUILDFLAG(IS_FUCHSIA) && BUILDFLAG(BUILD_WITH_TFLITE_LIB)
#include "services/on_device_model/safety/bert_safety_model.h"
#endif
@@ -189,7 +189,7 @@ void TsHolder::Reset(mojom::TextSafetyModelParamsPtr params,
@@ -207,7 +207,7 @@ void TsHolder::Reset(mojom::TextSafetyModelParamsPtr params,
mojo::PendingReceiver<mojom::TextSafetyModel> model) {
model_.Clear();
-#if !BUILDFLAG(IS_FUCHSIA)
+#if false && !BUILDFLAG(IS_FUCHSIA)
-#if !BUILDFLAG(IS_FUCHSIA) && BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+#if false && !BUILDFLAG(IS_FUCHSIA) && BUILDFLAG(BUILD_WITH_TFLITE_LIB)
if (!params->safety_assets || params->safety_assets->which() ==
mojom::SafetyModelAssets::Tag::kTsAssets) {
auto impl = TsModel::Create(*chrome_ml_, std::move(params));
@@ -1528,7 +1632,7 @@ diff --git a/services/on_device_model/safety/BUILD.gn b/services/on_device_model
import("//components/optimization_guide/features.gni")
-if (!is_fuchsia) {
-if (!is_fuchsia && build_with_tflite_lib) {
+if (build_with_tflite_lib && !is_fuchsia) {
source_set("bert_safety_op_resolver") {
sources = [
@@ -1536,15 +1640,15 @@ diff --git a/services/on_device_model/safety/BUILD.gn b/services/on_device_model
diff --git a/services/webnn/BUILD.gn b/services/webnn/BUILD.gn
--- a/services/webnn/BUILD.gn
+++ b/services/webnn/BUILD.gn
@@ -166,7 +166,7 @@ component("webnn_service") {
@@ -169,7 +169,7 @@ component("webnn_service") {
}
}
- if (is_win) {
+ if (is_win && webnn_use_tflite) {
sources += [
"ort/buffer_content_ort.cc",
"ort/buffer_content_ort.h",
"ort/context_impl_ort.cc",
"ort/context_impl_ort.h",
diff --git a/services/webnn/features.gni b/services/webnn/features.gni
--- a/services/webnn/features.gni
+++ b/services/webnn/features.gni
@@ -1560,74 +1664,30 @@ diff --git a/services/webnn/features.gni b/services/webnn/features.gni
diff --git a/services/webnn/webnn_context_provider_impl.cc b/services/webnn/webnn_context_provider_impl.cc
--- a/services/webnn/webnn_context_provider_impl.cc
+++ b/services/webnn/webnn_context_provider_impl.cc
@@ -236,62 +236,7 @@ void WebNNContextProviderImpl::CreateWebNNContext(
@@ -244,18 +244,7 @@ void WebNNContextProviderImpl::CreateWebNNContext(
}
#if BUILDFLAG(IS_WIN)
- if (ort::ShouldCreateOrtContext(*options)) {
- base::expected<scoped_refptr<ort::Environment>, std::string>
- env_creation_results = ort::Environment::GetInstance(gpu_info_);
- if (!env_creation_results.has_value()) {
- LOG(ERROR) << "[WebNN] Failed to create ONNX Runtime context: "
- << env_creation_results.error();
- } else {
- mojom::Device device_type = options->device;
- // Falls back to GPU if the device type is NPU but NPU is disabled.
- if (device_type == mojom::Device::kNpu &&
- gpu_feature_info_.IsWorkaroundEnabled(gpu::DISABLE_WEBNN_FOR_NPU)) {
- device_type = mojom::Device::kGpu;
- LOG(WARNING) << "[WebNN] [WARNING] NPU device is disabled to create "
- "ONNX Runtime context. Falling back to GPU.";
- }
- scoped_trace.AddStep("EnsureWebNNExecutionProvidersReady");
-
- if (!task_runner->BelongsToCurrentThread()) {
- // Re-create sequence for the new task runner. Destroying the old
- // sequence is safe since it has no scheduled tasks yet.
- sequence.reset();
- sequence = std::make_unique<ScopedSequence>(*scheduler_, task_runner,
- command_buffer_id);
-
- scoped_trace.AddStep("Create on sequence");
-
- // Safe to use base::Unretained for shared_image_manager_ since it
- // lives on the GPU service, which is guaranteed to outlive the provider
- // and its contexts.
- task_runner->PostTaskAndReplyWithResult(
- FROM_HERE,
- base::BindOnce(
- &ort::ContextImplOrt::Create, std::move(receiver), AsWeakPtr(),
- env_creation_results.value()->GetEpWorkarounds(device_type),
- std::move(options), device_type,
- std::move(write_tensor_consumer),
- std::move(read_tensor_producer),
- std::move(env_creation_results.value()), command_buffer_id,
- std::move(sequence), std::move(memory_tracker_), task_runner,
- base::Unretained(shared_image_manager_.get()),
- main_thread_task_runner_, std::move(scoped_trace)),
- base::BindOnce(&WebNNContextProviderImpl::OnCreateWebNNContextImpl,
- AsWeakPtr(), std::move(callback), std::move(remote),
- std::move(write_tensor_producer),
- std::move(read_tensor_consumer)));
- return;
- }
- context_impl = base::MakeRefCounted<ort::ContextImplOrt>(
- std::move(receiver), AsWeakPtr(),
- env_creation_results.value()->GetEpWorkarounds(device_type),
- std::move(options), device_type, std::move(write_tensor_consumer),
- std::move(read_tensor_producer),
- std::move(env_creation_results.value()), command_buffer_id,
- std::move(sequence), memory_tracker_, std::move(task_runner),
- shared_image_manager_, main_thread_task_runner_);
- }
- gpu_host_->EnsureWebNNExecutionProvidersReady(base::BindOnce(
- &WebNNContextProviderImpl::DidEnsureWebNNExecutionProvidersReady,
- AsWeakPtr(), std::move(scoped_trace), std::move(options),
- std::move(write_tensor_producer), std::move(write_tensor_consumer),
- std::move(read_tensor_producer), std::move(read_tensor_consumer),
- command_buffer_id, std::move(sequence), std::move(owning_task_runner),
- std::move(receiver), std::move(remote), std::move(callback)));
- return;
- } else if (dml::ShouldCreateDmlContext(*options)) {
+ if (dml::ShouldCreateDmlContext(*options)) {
base::expected<scoped_refptr<WebNNContextImpl>, mojom::ErrorPtr>
base::expected<WebNNContextImplPtr, mojom::ErrorPtr>
context_creation_results = dml::CreateContextFromOptions(
std::move(options), std::move(write_tensor_consumer),
diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc b/third_party/blink/renderer/core/html/parser/html_document_parser.cc
--- a/third_party/blink/renderer/core/html/parser/html_document_parser.cc
+++ b/third_party/blink/renderer/core/html/parser/html_document_parser.cc
@@ -1867,6 +1867,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget(
@@ -1846,6 +1846,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget(
}
bool HTMLDocumentParser::ShouldSkipPreloadScan() {
@@ -1638,7 +1698,7 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc
diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
--- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
+++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
@@ -664,6 +664,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
@@ -659,6 +659,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
return;
}
@@ -1649,7 +1709,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3898,7 +3898,7 @@
@@ -3989,7 +3989,7 @@
//
// It also has some feature params defined throughout the codebase.
name: "Prerender2",
build/patches/Disable-all-promo-dialogs.patch
+2 -2
View File
@@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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
--- 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
@@ -1772,6 +1772,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -1858,6 +1858,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
}
private boolean maybeShowPromo(Profile profile) {
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -183,7 +183,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -187,7 +187,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled,
false);
build/patches/Disable-conversion-measurement-api.patch
+51 -37
View File
@@ -13,6 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../browser/aw_content_browser_client.cc | 3 +
.../chromium/android_webview/AwSettings.java | 4 +-
.../apk/AndroidManifest.xml | 3 -
chrome/android/java/AndroidManifest.xml | 4 -
.../ChromeSiteSettingsDelegate.java | 2 +
.../k_anonymity_trust_token_getter.cc | 2 +-
@@ -46,7 +47,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
third_party/blink/renderer/core/page/page.cc | 2 +-
.../platform/runtime_enabled_features.json5 | 20 +-
ui/events/android/motion_event_android.cc | 8 +-
35 files changed, 103 insertions(+), 434 deletions(-)
36 files changed, 103 insertions(+), 437 deletions(-)
create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
@@ -82,7 +83,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
@SpeculativeLoadingAllowedFlags
private int mSpeculativeLoadingAllowedFlags =
@@ -1788,7 +1788,7 @@ public class AwSettings {
@@ -1795,7 +1795,7 @@ public class AwSettings {
public void setAttributionBehavior(@AttributionBehavior int behavior) {
synchronized (mAwSettingsLock) {
if (mAttributionBehavior != behavior) {
@@ -91,6 +92,19 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
mEventHandler.updateWebkitPreferencesLocked();
}
}
diff --git a/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
--- a/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
+++ b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
@@ -178,9 +178,6 @@
android:exported="true">
</activity>
- <property android:name="android.adservices.AD_SERVICES_CONFIG"
- android:resource="@xml/ad_services_config" />
-
<service android:name="android.webkit.MetaDataHolderService"
android:enabled="false"
android:exported="false">
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -102,9 +116,9 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_CONNECT"/>
<!--
@@ -1199,9 +1198,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
</activity>
@@ -1221,9 +1220,6 @@ by a child template that "extends" this file.
android:name="com.google.android.gms.cast.framework.ReconnectionService"
tools:node="remove" />
- <property android:name="android.adservices.AD_SERVICES_CONFIG"
- android:resource="@xml/ad_services_config" />
@@ -115,7 +129,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
@@ -151,6 +151,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
@@ -152,6 +152,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
// not great to dynamically remove the preference in this way.
case SiteSettingsCategory.Type.ADS:
return SiteSettingsCategory.adsCategoryEnabled();
@@ -127,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
--- a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
+++ b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
@@ -120,7 +120,7 @@ KAnonymityTrustTokenGetter::~KAnonymityTrustTokenGetter() = default;
@@ -122,7 +122,7 @@ KAnonymityTrustTokenGetter::~KAnonymityTrustTokenGetter() = default;
void KAnonymityTrustTokenGetter::TryGetTrustTokenAndKey(
TryGetTrustTokenAndKeyCallback callback) {
@@ -139,7 +153,7 @@ diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.c
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
@@ -191,15 +191,6 @@
@@ -179,15 +179,6 @@
</settings-ar-page>
</template>
@@ -152,13 +166,13 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.h
- </settings-anti-abuse-page>
- </template>
-
<template is="dom-if" if="[[enableAutoPictureInPicture_]]">
<template is="dom-if" if="[[renderView_(
routes_.SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE, currentRoute,
<template is="dom-if" if="[[renderView_(
routes_.SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE, currentRoute,
inSearchMode)]]" update-when-false>
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -84,7 +84,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
@@ -79,7 +79,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
r.SITE_SETTINGS.createChild('smartCardReaders');
}
// </if>
@@ -170,7 +184,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_page.ts b/chrome/browser/resources/settings/site_settings/site_settings_page.ts
--- a/chrome/browser/resources/settings/site_settings/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings/site_settings_page.ts
@@ -66,6 +66,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
@@ -67,6 +67,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
route: routes.SITE_SETTINGS_AUTO_VERIFY,
id: Id.ANTI_ABUSE,
label: 'siteSettingsAntiAbuse',
@@ -202,7 +216,7 @@ diff --git a/components/attribution_reporting/features.cc b/components/attributi
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
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -659,7 +659,7 @@ void ContentSettingsRegistry::Init() {
@@ -649,7 +649,7 @@ void ContentSettingsRegistry::Init() {
ContentSettingsInfo::INHERIT_IN_INCOGNITO,
PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
@@ -268,7 +282,7 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
--- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
+++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
@@ -807,11 +807,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
@@ -787,11 +787,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
headers->GetNormalizedHeader(
attribution_reporting::kAttributionReportingRegisterTriggerHeader);
@@ -282,7 +296,7 @@ diff --git a/content/browser/attribution_reporting/attribution_data_host_manager
const bool has_source =
web_source_header.has_value() || os_source_header.has_value();
@@ -1166,6 +1164,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
@@ -1143,6 +1141,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
Registrations& registrations,
HeaderPendingDecode pending_decode,
Registrar registrar) {
@@ -303,7 +317,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
#endif
}
@@ -346,6 +344,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
@@ -342,6 +340,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
return;
}
@@ -314,7 +328,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b/content/browser/attribution_reporting/attribution_manager_impl.cc
--- a/content/browser/attribution_reporting/attribution_manager_impl.cc
+++ b/content/browser/attribution_reporting/attribution_manager_impl.cc
@@ -581,11 +581,7 @@ bool IsOperationAllowed(
@@ -522,11 +522,7 @@ bool IsOperationAllowed(
}
std::unique_ptr<AttributionOsLevelManager> CreateOsLevelManager() {
@@ -349,7 +363,7 @@ diff --git a/content/browser/attribution_reporting/attribution_os_level_manager.
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
+++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
@@ -155,6 +155,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
@@ -131,6 +131,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
url::Origin origin,
std::string body,
UrlLoaderCallback callback) {
@@ -359,7 +373,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = std::move(url);
resource_request->method = net::HttpRequestHeaders::kPostMethod;
@@ -230,6 +233,12 @@ void AttributionReportNetworkSender::OnReportSent(
@@ -206,6 +209,12 @@ void AttributionReportNetworkSender::OnReportSent(
ReportSentCallback sent_callback,
UrlLoaderList::iterator it,
scoped_refptr<net::HttpResponseHeaders> headers) {
@@ -375,7 +389,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
--- a/content/browser/attribution_reporting/attribution_storage_sql.cc
+++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
@@ -539,6 +539,8 @@ void AssignSourceForDeactivationOrDeletion(
@@ -535,6 +535,8 @@ void AssignSourceForDeactivationOrDeletion(
}
}
@@ -384,7 +398,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
} // namespace
// static
@@ -561,9 +563,9 @@ bool AttributionStorageSql::Transaction::Commit() {
@@ -557,9 +559,9 @@ bool AttributionStorageSql::Transaction::Commit() {
AttributionStorageSql::AttributionStorageSql(
const base::FilePath& user_data_directory,
AttributionResolverDelegate* delegate)
@@ -400,7 +414,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
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
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -10609,6 +10609,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
@@ -10507,6 +10507,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
return false;
}
@@ -408,7 +422,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
if (!IsActive()) {
// reportEvent is not allowed when this RenderFrameHost or one of its
// ancestors is not active.
@@ -14699,6 +14700,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
@@ -14607,6 +14608,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
return;
}
@@ -428,7 +442,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1506,15 +1506,6 @@ void StoragePartitionImpl::Initialize(
@@ -1512,15 +1512,6 @@ void StoragePartitionImpl::Initialize(
bucket_manager_ = std::make_unique<BucketManager>(this);
@@ -444,7 +458,7 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
// Auction worklets on non-Android use dedicated processes; on Android due
// to high cost of process launch they try to reuse renderers.
@@ -1566,9 +1557,6 @@ void StoragePartitionImpl::Initialize(
@@ -1572,9 +1563,6 @@ void StoragePartitionImpl::Initialize(
font_access_manager_ = FontAccessManager::Create();
@@ -931,7 +945,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -647,6 +647,7 @@ void ContentBrowserClient::OnAuctionComplete(
@@ -649,6 +649,7 @@ void ContentBrowserClient::OnAuctionComplete(
network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
AttributionReportingOsApiState state,
bool client_os_disabled) {
@@ -939,7 +953,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
switch (state) {
case AttributionReportingOsApiState::kDisabled:
return network::mojom::AttributionSupport::kWeb;
@@ -664,13 +665,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
@@ -666,13 +667,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
const url::Origin* destination_origin,
const url::Origin* reporting_origin,
bool* can_bypass) {
@@ -955,7 +969,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
}
bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
@@ -678,7 +679,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
@@ -680,7 +681,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
content::RenderFrameHost* rfh,
const url::Origin& context_origin,
const url::Origin& reporting_origin) {
@@ -1009,7 +1023,7 @@ diff --git a/services/network/attribution/request_headers_internal.cc b/services
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1317,6 +1317,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
@@ -1312,6 +1312,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
void NetworkContext::ClearTrustTokenSessionOnlyData(
ClearTrustTokenSessionOnlyDataCallback callback) {
@@ -1020,7 +1034,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
// Only called when Private State Tokens is enabled, i.e.,
// `trust_token_store_` is non-null.
DCHECK(trust_token_store_);
@@ -2766,26 +2770,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2731,26 +2735,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
builder.set_network_quality_estimator(
network_service_->network_quality_estimator());
}
@@ -1069,7 +1083,7 @@ diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network
diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/third_party/blink/renderer/core/frame/attribution_src_loader.cc
--- a/third_party/blink/renderer/core/frame/attribution_src_loader.cc
+++ b/third_party/blink/renderer/core/frame/attribution_src_loader.cc
@@ -210,8 +210,6 @@ struct AttributionSrcLoader::AttributionHeaders {
@@ -220,8 +220,6 @@ struct AttributionSrcLoader::AttributionHeaders {
uint64_t request_id)
: web_source(map.Get(http_names::kAttributionReportingRegisterSource)),
web_trigger(map.Get(http_names::kAttributionReportingRegisterTrigger)),
@@ -1081,7 +1095,7 @@ diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/t
diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
--- a/third_party/blink/renderer/core/page/page.cc
+++ b/third_party/blink/renderer/core/page/page.cc
@@ -1624,7 +1624,7 @@ void Page::UpdateBrowsingContextGroup(
@@ -1586,7 +1586,7 @@ void Page::UpdateBrowsingContextGroup(
void Page::SetAttributionSupport(
network::mojom::AttributionSupport attribution_support) {
@@ -1089,7 +1103,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re
+ attribution_support_ = network::mojom::AttributionSupport::kNone;
}
template class CORE_TEMPLATE_EXPORT Supplement<Page>;
// static
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1104,7 +1118,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
origin_trial_feature_name: "AdInterestGroupAPI",
implied_by: ["Fledge", "Parakeet"],
public: true,
@@ -614,8 +614,8 @@
@@ -626,8 +626,8 @@
status: "stable",
},
{
@@ -1115,7 +1129,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
base_feature: "none",
public: true,
},
@@ -3948,8 +3948,8 @@
@@ -4047,8 +4047,8 @@
base_feature: "none",
},
{
@@ -1126,7 +1140,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
base_feature: "none",
public: true,
},
@@ -5136,16 +5136,16 @@
@@ -5268,16 +5268,16 @@
status: "experimental",
},
{
build/patches/Disable-crash-reporting.patch
+4 -4
View File
@@ -12,7 +12,7 @@ Subject: Disable crash reporting
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
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2690,15 +2690,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
@@ -2688,15 +2688,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
base::NumberToString(pid));
}
#endif
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
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
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -16368,6 +16368,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
@@ -16276,6 +16276,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
void RenderFrameHostImpl::MaybeGenerateCrashReport(
base::TerminationStatus status,
int exit_code) {
@@ -42,7 +42,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -10344,7 +10344,7 @@ void WebContentsImpl::RendererUnresponsive(
@@ -10332,7 +10332,7 @@ void WebContentsImpl::RendererUnresponsive(
base::UmaHistogramEnumeration(
"ReportingAndNEL.UnresponsiveRenderer.CrashReportOutcome", outcome);
@@ -54,7 +54,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
diff --git a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
--- a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
+++ b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
@@ -102,7 +102,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
@@ -98,7 +98,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
return;
}
ExecutionContext* execution_context = ToExecutionContext(script_state);
build/patches/Disable-css-preferred-text-scale.patch
+55 -8
View File
@@ -6,9 +6,12 @@ Do not expose the user's preferred font scale to CSS.
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../blink/common/features_cc/Disable-CSSPreferredTextScale.inc | 1 +
.../blink/renderer/platform/runtime_enabled_features.json5 | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
.../common/features_cc/Disable-CSSPreferredTextScale.inc | 1 +
.../core/css/document_style_environment_variables.cc | 6 ++++--
.../blink/renderer/core/css/style_environment_variables.cc | 4 +++-
third_party/blink/renderer/core/page/page.cc | 4 +++-
.../blink/renderer/platform/runtime_enabled_features.json5 | 3 +++
5 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc
diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc
@@ -17,17 +20,61 @@ new file mode 100644
+++ b/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc
@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kCSSPreferredTextScale);
diff --git a/third_party/blink/renderer/core/css/document_style_environment_variables.cc b/third_party/blink/renderer/core/css/document_style_environment_variables.cc
--- a/third_party/blink/renderer/core/css/document_style_environment_variables.cc
+++ b/third_party/blink/renderer/core/css/document_style_environment_variables.cc
@@ -55,8 +55,10 @@ DocumentStyleEnvironmentVariables::DocumentStyleEnvironmentVariables(
StyleEnvironmentVariables& parent,
Document& document)
: StyleEnvironmentVariables(parent), document_(&document) {
- SetPreferredTextScale(
- document_->GetSettings()->GetAccessibilityFontScaleFactor());
+ if (RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) {
+ SetPreferredTextScale(
+ document_->GetSettings()->GetAccessibilityFontScaleFactor());
+ }
}
void DocumentStyleEnvironmentVariables::RecordVariableUsage(
diff --git a/third_party/blink/renderer/core/css/style_environment_variables.cc b/third_party/blink/renderer/core/css/style_environment_variables.cc
--- a/third_party/blink/renderer/core/css/style_environment_variables.cc
+++ b/third_party/blink/renderer/core/css/style_environment_variables.cc
@@ -49,7 +49,9 @@ void SetDefaultEnvironmentVariables(StyleEnvironmentVariables* instance) {
instance->SetVariable(UADefinedVariable::kKeyboardInsetHeight,
kKeyboardInsetDefault);
- instance->SetVariable(UADefinedVariable::kPreferredTextScale, "1");
+ if (RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) {
+ instance->SetVariable(UADefinedVariable::kPreferredTextScale, "1");
+ }
}
} // namespace.
diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
--- a/third_party/blink/renderer/core/page/page.cc
+++ b/third_party/blink/renderer/core/page/page.cc
@@ -1056,7 +1056,9 @@ void Page::SettingsChanged(ChangeType change_type) {
}
break;
case ChangeType::kFontScaleFactor:
-
+ if (!RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) {
+ break;
+ }
for (Frame* frame = MainFrame(); frame;
frame = frame->Tree().TraverseNext()) {
LocalFrame* local_frame = DynamicTo<LocalFrame>(frame);
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1548,8 +1548,7 @@
@@ -1582,6 +1582,9 @@
name: "CSSPositionStickyStaticScrollPosition",
status: "test",
},
{
- name: "CSSPreferredTextScale",
- status: "stable",
+ {
+ name: "CSSPreferredTextScale", status: "test", public: true
},
+ },
// https://drafts.csswg.org/css-values-5/#progress
// progress()
{
--
build/patches/Disable-device-bound-session.patch
+25
View File
@@ -0,0 +1,25 @@
From: uazo <uazo@users.noreply.github.com>
Date: Mon, 19 Jan 2026 12:00:34 +0000
Subject: Disable device bound session
Disable DBSC due to potential privacy issues
see https://w3c.github.io/webappsec-dbsc/#privacy-considerations
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
net/features.gni | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/features.gni b/net/features.gni
--- a/net/features.gni
+++ b/net/features.gni
@@ -57,7 +57,7 @@ declare_args() {
chrome_root_store_only = is_win || is_mac || is_linux || is_chromeos
# DBSC is only supported on Windows, Linux and Mac for now.
- enable_device_bound_sessions = is_win || is_linux || is_mac
+ enable_device_bound_sessions = false
# Bracketed URIs parsing is only available for debug builds.
# TODO(crbug.com/365771838): Ensure tests are updated if needed if this
--
build/patches/Disable-devtools-remote-and-custom-protocols.patch
+2 -2
View File
@@ -9,7 +9,7 @@ Subject: Disable devtools remote and custom protocols
diff --git a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
--- a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
+++ b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
@@ -179,7 +179,7 @@ void DevToolsDataSource::StartDataRequest(
@@ -181,7 +181,7 @@ void DevToolsDataSource::StartDataRequest(
// Serve request to devtools://remote from remote location.
std::string remote_path_prefix(chrome::kChromeUIDevToolsRemotePath);
remote_path_prefix += "/";
@@ -18,7 +18,7 @@ diff --git a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc b/chrom
base::CompareCase::INSENSITIVE_ASCII)) {
if (MaybeHandleCustomRequest(path.substr(remote_path_prefix.length()),
&callback)) {
@@ -202,7 +202,7 @@ void DevToolsDataSource::StartDataRequest(
@@ -204,7 +204,7 @@ void DevToolsDataSource::StartDataRequest(
// Serve request to devtools://custom from custom URL.
std::string custom_path_prefix(chrome::kChromeUIDevToolsCustomPath);
custom_path_prefix += "/";
build/patches/Disable-fetching-of-all-field-trials.patch
+44 -21
View File
@@ -21,25 +21,27 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../firstrun/VariationsSeedBridge.java | 2 +-
.../firstrun/VariationsSeedFetcher.java | 36 +++----------------
components/variations/net/BUILD.gn | 2 --
.../omnibox_autofocus_url_loader_throttle.cc | 1 +
.../variations/net/variations_http_headers.cc | 2 ++
.../net/variations_url_loader_throttle.cc | 1 +
.../service/variations_field_trial_creator.cc | 6 ++--
.../variations/service/variations_service.cc | 19 ++--------
.../browser/loader/url_loader_throttles.cc | 7 ----
.../origin_trials/origin_trials_utils.cc | 2 +-
.../renderer_host/navigation_request.cc | 1 +
.../variations_render_thread_observer.cc | 9 -----
.../variations_render_thread_observer.cc | 8 -----
.../Disable-fetching-of-all-field-trials.inc | 1 +
.../Disable-fetching-of-all-field-trials.inc | 1 +
.../renderer/core/loader/document_loader.cc | 7 ----
.../platform/loader/fetch/resource_request.h | 1 -
25 files changed, 29 insertions(+), 91 deletions(-)
27 files changed, 31 insertions(+), 90 deletions(-)
create mode 100644 cromite_flags/net/base/features_cc/Disable-fetching-of-all-field-trials.inc
create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-fetching-of-all-field-trials.inc
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -500,6 +500,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
@@ -496,6 +496,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
content::OriginTrialsControllerDelegate*
AwBrowserContext::GetOriginTrialsControllerDelegate() {
@@ -157,14 +159,14 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b
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
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -929,7 +929,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
@@ -931,7 +931,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(
network::mojom::NetworkContextParams* network_context_params) {
- variations::UpdateCorsExemptHeaderForVariations(network_context_params);
variations::UpdateCorsExemptHeaderForOmniboxAutofocus(network_context_params);
#if BUILDFLAG(ENABLE_REQUEST_HEADER_INTEGRITY)
request_header_integrity::RequestHeaderIntegrityURLLoaderThrottle::
UpdateCorsExemptHeaders(network_context_params);
diff --git a/chrome/browser/origin_trials/origin_trials_factory.cc b/chrome/browser/origin_trials/origin_trials_factory.cc
--- a/chrome/browser/origin_trials/origin_trials_factory.cc
+++ b/chrome/browser/origin_trials/origin_trials_factory.cc
@@ -179,7 +181,7 @@ diff --git a/chrome/browser/origin_trials/origin_trials_factory.cc b/chrome/brow
diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc
--- a/components/ukm/ukm_recorder_impl.cc
+++ b/components/ukm/ukm_recorder_impl.cc
@@ -203,6 +203,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
@@ -192,6 +192,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
UkmRecorderImpl::UkmRecorderImpl()
: sampling_seed_(static_cast<uint32_t>(base::RandUint64())) {
@@ -269,10 +271,21 @@ diff --git a/components/variations/net/BUILD.gn b/components/variations/net/BUIL
]
deps += [
"//components/variations:variations_mojom",
diff --git a/components/variations/net/omnibox_autofocus_url_loader_throttle.cc b/components/variations/net/omnibox_autofocus_url_loader_throttle.cc
--- a/components/variations/net/omnibox_autofocus_url_loader_throttle.cc
+++ b/components/variations/net/omnibox_autofocus_url_loader_throttle.cc
@@ -18,6 +18,7 @@ OmniboxAutofocusURLLoaderThrottle::~OmniboxAutofocusURLLoaderThrottle() =
// static
void OmniboxAutofocusURLLoaderThrottle::AppendThrottleIfNeeded(
std::vector<std::unique_ptr<blink::URLLoaderThrottle>>* throttles) {
+ if ((true)) return;
#if BUILDFLAG(IS_ANDROID)
if (!base::FeatureList::IsEnabled(kReportOmniboxAutofocusHeader)) {
return;
diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc
--- a/components/variations/net/variations_http_headers.cc
+++ b/components/variations/net/variations_http_headers.cc
@@ -251,6 +251,8 @@ class VariationsHeaderHelper {
@@ -252,6 +252,8 @@ class VariationsHeaderHelper {
VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
@@ -281,10 +294,21 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v
// Note the criteria for attaching client experiment headers:
// 1. We only transmit to Google owned domains which can evaluate
// experiments.
diff --git a/components/variations/net/variations_url_loader_throttle.cc b/components/variations/net/variations_url_loader_throttle.cc
--- a/components/variations/net/variations_url_loader_throttle.cc
+++ b/components/variations/net/variations_url_loader_throttle.cc
@@ -47,6 +47,7 @@ VariationsURLLoaderThrottle::~VariationsURLLoaderThrottle() = default;
void VariationsURLLoaderThrottle::AppendThrottleIfNeeded(
const variations::VariationsClient* variations_client,
std::vector<std::unique_ptr<blink::URLLoaderThrottle>>* throttles) {
+ if ((true)) return;
if (!variations_client || variations_client->IsOffTheRecord()) {
return;
}
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
+++ b/components/variations/service/variations_field_trial_creator.cc
@@ -127,6 +127,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
@@ -130,6 +130,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
}
#if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
@@ -292,7 +316,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
// Determines whether the field trial testing config defined in
// testing/variations/fieldtrial_testing_config.json should be applied. If the
// "disable_fieldtrial_testing_config" GN flag is set to true, then the testing
@@ -335,9 +336,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
@@ -374,9 +375,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
metrics_state_manager->GetLowEntropySource());
}
@@ -302,7 +326,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
platform_field_trials->RegisterFeatureOverrides(feature_list.get());
base::FeatureList::SetInstance(std::move(feature_list));
@@ -682,6 +680,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
@@ -725,6 +723,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
base::FeatureList* feature_list,
SafeSeedManager* safe_seed_manager,
std::unique_ptr<ClientFilterableState> client_state) {
@@ -310,7 +334,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed");
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
CHECK(!create_trials_from_seed_called_);
@@ -801,6 +800,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
@@ -844,6 +843,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
void VariationsFieldTrialCreator::LoadSeedFromJsonFile(
const base::FilePath& json_seed_path) {
@@ -321,7 +345,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -223,22 +223,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
// Variations seed fetching is only enabled in official Chrome builds, if a URL
// is specified on the command line, and for testing.
bool IsFetchingEnabled() {
@@ -345,7 +369,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
}
// Returns the already downloaded first run seed, and clear the seed from the
@@ -635,7 +620,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
@@ -636,7 +621,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
// debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
// had a chance to run yet from the previous request. In this case, don't
// start a new request and just let the previous one finish.
@@ -357,7 +381,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/loader/url_loader_throttles.cc
--- a/content/browser/loader/url_loader_throttles.cc
+++ b/content/browser/loader/url_loader_throttles.cc
@@ -51,8 +51,6 @@ CreateContentBrowserURLLoaderThrottles(
@@ -54,8 +54,6 @@ CreateContentBrowserURLLoaderThrottles(
// TODO(crbug.com/40135370): Consider whether we want to use the WebContents
// to determine the value for variations::Owner. Alternatively, this is the
// browser side, and we might be fine with Owner::kUnknown.
@@ -366,7 +390,7 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo
ClientHintsControllerDelegate* client_hint_delegate =
browser_context->GetClientHintsControllerDelegate();
@@ -136,11 +134,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
@@ -139,11 +137,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles =
GetContentClient()->browser()->CreateURLLoaderThrottlesForKeepAlive(
browser_context, frame_tree_node_id);
@@ -404,11 +428,10 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
diff --git a/content/renderer/variations_render_thread_observer.cc b/content/renderer/variations_render_thread_observer.cc
--- a/content/renderer/variations_render_thread_observer.cc
+++ b/content/renderer/variations_render_thread_observer.cc
@@ -54,15 +54,6 @@ VariationsRenderThreadObserver::~VariationsRenderThreadObserver() = default;
void VariationsRenderThreadObserver::AppendThrottleIfNeeded(
const url::Origin& top_frame_origin,
@@ -57,14 +57,6 @@ void VariationsRenderThreadObserver::AppendThrottleIfNeeded(
std::vector<std::unique_ptr<blink::URLLoaderThrottle>>* throttles) {
-
variations::OmniboxAutofocusURLLoaderThrottle::AppendThrottleIfNeeded(
throttles);
- variations::mojom::VariationsHeadersPtr variations_headers =
- GetVariationsData()->GetVariationsHeaders();
-
@@ -425,7 +448,7 @@ new file mode 100644
--- /dev/null
+++ b/cromite_flags/net/base/features_cc/Disable-fetching-of-all-field-trials.inc
@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kTpcdTrialSettings);
+// empty file
diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-fetching-of-all-field-trials.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-fetching-of-all-field-trials.inc
new file mode 100644
--- /dev/null
@@ -435,7 +458,7 @@ new file mode 100644
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
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -210,13 +210,6 @@ std::vector<int> CopyInitiatorOriginTrials(
@@ -211,13 +211,6 @@ std::vector<int> CopyInitiatorOriginTrials(
const Vector<mojom::blink::OriginTrialFeature>&
initiator_origin_trial_features) {
std::vector<int> result;
build/patches/Disable-idle-detection.patch
+1 -1
View File
@@ -31,7 +31,7 @@ new file mode 100644
diff --git a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
--- a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
+++ b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
@@ -380,6 +380,7 @@
@@ -385,6 +385,7 @@
{
name: "IdleDetection",
permissions_policy_name: "idle-detection",
build/patches/Disable-media-router-and-remoting-by-default.patch
+2 -2
View File
@@ -43,7 +43,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
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -425,7 +425,7 @@ void ProfileImpl::RegisterProfilePrefs(
@@ -423,7 +423,7 @@ void ProfileImpl::RegisterProfilePrefs(
#endif
registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
@@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.c
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -4114,14 +4114,10 @@
@@ -4213,14 +4213,10 @@
base_feature: "none",
},
{
build/patches/Disable-minidump-upload-scheduling.patch
+2 -2
View File
@@ -11,8 +11,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc
--- a/components/endpoint_fetcher/endpoint_fetcher.cc
+++ b/components/endpoint_fetcher/endpoint_fetcher.cc
@@ -381,7 +381,7 @@ void EndpointFetcher::OnResponseFetched(
response->response = *response_body;
@@ -385,7 +385,7 @@ void EndpointFetcher::OnResponseFetched(
response->response = std::move(response_body).value();
} else {
std::string net_error = net::ErrorToString(net_error_code);
- VLOG(1) << __func__ << " with response error: " << net_error;
build/patches/Disable-omission-of-URL-elements.patch
+3 -3
View File
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome
diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -268,5 +268,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
@@ -276,5 +276,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
// static
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/c
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
--- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -629,39 +629,42 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) {
@@ -604,39 +604,42 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) {
}
std::unique_ptr<views::View> PageInfoMainView::CreateBubbleHeaderView() {
@@ -158,7 +158,7 @@ diff --git a/components/omnibox/browser/titled_url_match_utils.cc b/components/o
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
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
@@ -224,8 +224,7 @@ public class PageInfoController
@@ -229,8 +229,7 @@ public class PageInfoController
OmniboxUrlEmphasizer.getOriginEndIndex(
displayUrlBuilder.toString(), autocompleteSchemeClassifier);
autocompleteSchemeClassifier.destroy();
build/patches/Disable-plugins-enumeration.patch
+1 -1
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
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2376,9 +2376,7 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings()
@@ -2389,9 +2389,7 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings()
}
PluginData* LocalFrame::GetPluginData() const {
build/patches/Disable-prefers-reduced-motion.patch
+1 -1
View File
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/ui/accessibility/android/java/src/org/chromium/ui/accessibility/AccessibilityState.java b/ui/accessibility/android/java/src/org/chromium/ui/accessibility/AccessibilityState.java
--- a/ui/accessibility/android/java/src/org/chromium/ui/accessibility/AccessibilityState.java
+++ b/ui/accessibility/android/java/src/org/chromium/ui/accessibility/AccessibilityState.java
@@ -492,7 +492,7 @@ public class AccessibilityState {
@@ -503,7 +503,7 @@ public class AccessibilityState {
/** Returns whether the user settings specify preferred reduced motion. */
@CalledByNative
public static boolean prefersReducedMotion() {
build/patches/Disable-prefers-reduced-transparency-media-query.patch
+1 -1
View File
@@ -50,7 +50,7 @@ diff --git a/third_party/blink/renderer/core/preferences/preference_manager.idl
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
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3888,6 +3888,10 @@
@@ -3979,6 +3979,10 @@
name: "PrefersReducedData",
status: "experimental",
},
build/patches/Disable-privacy-issues-in-password-manager.patch
+4 -4
View File
@@ -24,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -488,15 +488,6 @@ by a child template that "extends" this file.
@@ -499,15 +499,6 @@ by a child template that "extends" this file.
android:excludeFromRecents="true"
android:exported="false" />
@@ -102,7 +102,7 @@ diff --git a/components/affiliations/core/browser/affiliation_backend.cc b/compo
diff --git a/components/affiliations/core/browser/affiliation_service_impl.cc b/components/affiliations/core/browser/affiliation_service_impl.cc
--- a/components/affiliations/core/browser/affiliation_service_impl.cc
+++ b/components/affiliations/core/browser/affiliation_service_impl.cc
@@ -317,6 +317,10 @@ void AffiliationServiceImpl::GetPSLExtensions(
@@ -316,6 +316,10 @@ void AffiliationServiceImpl::GetPSLExtensions(
void AffiliationServiceImpl::UpdateAffiliationsAndBranding(
const std::vector<FacetURI>& facets,
base::OnceClosure callback) {
@@ -172,7 +172,7 @@ diff --git a/components/password_manager/core/browser/leak_detection/leak_detect
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
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -600,7 +600,7 @@ void PasswordManager::RegisterProfilePrefs(
@@ -604,7 +604,7 @@ void PasswordManager::RegisterProfilePrefs(
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \
BUILDFLAG(IS_CHROMEOS)
registry->RegisterBooleanPref(prefs::kBiometricAuthenticationBeforeFilling,
@@ -181,7 +181,7 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) ||
// BUILDFLAG(IS_CHROMEOS)
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop
@@ -627,7 +627,7 @@ void PasswordManager::RegisterProfilePrefs(
@@ -636,7 +636,7 @@ void PasswordManager::RegisterProfilePrefs(
registry->RegisterBooleanPref(prefs::kAccountStoreMigratedToOSCryptAsync,
false);
registry->RegisterBooleanPref(
build/patches/Disable-privacy-sandbox.patch
+18 -18
View File
@@ -45,7 +45,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
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -1711,7 +1711,6 @@ if (_is_default_toolchain) {
@@ -1703,7 +1703,6 @@ if (_is_default_toolchain) {
java_group("chrome_public_non_pak_assets") {
deps = [
"//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
@@ -56,7 +56,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
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
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -3458,6 +3458,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
@@ -3445,6 +3445,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
const url::Origin* destination_origin,
const url::Origin* reporting_origin,
bool* can_bypass) {
@@ -66,7 +66,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
Profile* profile = Profile::FromBrowserContext(browser_context);
auto* privacy_sandbox_settings =
@@ -8022,7 +8025,7 @@ bool ChromeContentBrowserClient::ShouldDisableOriginAgentClusterDefault(
@@ -8124,7 +8127,7 @@ bool ChromeContentBrowserClient::ShouldDisableOriginAgentClusterDefault(
}
bool ChromeContentBrowserClient::WillProvidePublicFirstPartySets() {
@@ -78,12 +78,12 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
--- a/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
+++ b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
@@ -77,7 +77,7 @@ void FirstPartySetsNavigationThrottle::MaybeCreateAndAdd(
@@ -76,7 +76,7 @@ void FirstPartySetsNavigationThrottle::MaybeCreateAndAdd(
navigation_handle.GetWebContents()->GetBrowserContext());
// The `service` might be null for some irregular profiles.
// TODO(crbug.com/40233408): regular profiles and guest sessions
// aren't mutually exclusive on ChromeOS.
- if (!profile->IsRegularProfile() || profile->IsGuestSession()) {
+ if (((true)) || !profile->IsRegularProfile() || profile->IsGuestSession()) {
- if (!profile->IsRegularProfile()) {
+ if (((true)) || !profile->IsRegularProfile()) {
return;
}
@@ -121,7 +121,7 @@ diff --git a/chrome/browser/privacy_sandbox/BUILD.gn b/chrome/browser/privacy_sa
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
@@ -617,6 +617,7 @@ bool PrivacySandboxServiceImpl::UpdateAndGetSuppressionReason() {
@@ -591,6 +591,7 @@ bool PrivacySandboxServiceImpl::UpdateAndGetSuppressionReason() {
}
bool PrivacySandboxServiceImpl::ShouldDisablePrompt() {
@@ -129,7 +129,7 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc b/ch
// If the profile isn't a regular profile, no prompt should ever be shown.
if (!IsRegularProfile(profile_type_)) {
return true;
@@ -853,7 +854,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
@@ -766,7 +767,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
void PrivacySandboxServiceImpl::SetRelatedWebsiteSetsDataAccessEnabled(
bool enabled) {
pref_service_->SetBoolean(prefs::kPrivacySandboxRelatedWebsiteSetsEnabled,
@@ -152,7 +152,7 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
diff --git a/chrome/browser/resources/settings/privacy_page/cookies_page.ts b/chrome/browser/resources/settings/privacy_page/cookies_page.ts
--- a/chrome/browser/resources/settings/privacy_page/cookies_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/cookies_page.ts
@@ -225,7 +225,7 @@ export class SettingsCookiesPageElement extends SettingsCookiesPageElementBase {
@@ -227,7 +227,7 @@ export class SettingsCookiesPageElement extends SettingsCookiesPageElementBase {
}
private relatedWebsiteSetsToggleDisabled_() {
@@ -164,7 +164,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/cookies_page.ts b/ch
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1992,8 +1992,6 @@ if (is_android) {
@@ -2001,8 +2001,6 @@ if (is_android) {
"//components/privacy_sandbox/privacy_sandbox_attestations",
"//components/privacy_sandbox/privacy_sandbox_attestations:metrics",
"//components/privacy_sandbox/privacy_sandbox_attestations:test_support",
@@ -287,7 +287,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_san
diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc
--- a/components/privacy_sandbox/privacy_sandbox_features.cc
+++ b/components/privacy_sandbox/privacy_sandbox_features.cc
@@ -168,4 +168,7 @@ BASE_FEATURE(kPrivacySandboxMigratePrefsToSchemaV2,
@@ -160,4 +160,7 @@ BASE_FEATURE(kPrivacySandboxAdsApiUxEnhancements,
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kPrivacySandboxNoticeFramework, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -397,9 +397,9 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
diff --git a/components/privacy_sandbox/tracking_protection_prefs.cc b/components/privacy_sandbox/tracking_protection_prefs.cc
--- a/components/privacy_sandbox/tracking_protection_prefs.cc
+++ b/components/privacy_sandbox/tracking_protection_prefs.cc
@@ -25,9 +25,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
// Still in use for Mode B.
registry->RegisterBooleanPref(prefs::kShowRollbackUiModeB, false);
@@ -20,9 +20,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
prefs::kIpProtectionEnabled, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
- prefs::kBlockAll3pcToggleEnabled, false,
+ prefs::kBlockAll3pcToggleEnabled, false, // with true enables FPS
@@ -443,7 +443,7 @@ diff --git a/content/browser/shared_storage/shared_storage_document_service_impl
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -1724,7 +1724,7 @@ bool ContentBrowserClient::ShouldPreconnectNavigation(
@@ -1728,7 +1728,7 @@ bool ContentBrowserClient::ShouldPreconnectNavigation(
}
bool ContentBrowserClient::IsFirstPartySetsEnabled() {
@@ -479,7 +479,7 @@ new file mode 100644
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2631,6 +2631,7 @@ BASE_FEATURE(kXrDevice, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -2585,6 +2585,7 @@ BASE_FEATURE(kXrDevice, base::FEATURE_DISABLED_BY_DEFAULT);
// constants for features in the section above.
bool IsAllowURNsInIframeEnabled() {
build/patches/Disable-ranker-url-fetcher.patch
+2 -2
View File
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/components/translate/core/browser/translate_ranker_impl.cc b/components/translate/core/browser/translate_ranker_impl.cc
--- a/components/translate/core/browser/translate_ranker_impl.cc
+++ b/components/translate/core/browser/translate_ranker_impl.cc
@@ -229,7 +229,7 @@ bool TranslateRankerImpl::ShouldOfferTranslation(
@@ -228,7 +228,7 @@ bool TranslateRankerImpl::ShouldOfferTranslation(
// absence of a model or if enforcement is disabled. As this is ranker is
// subsumed into a more general assist ranker, this default will go away
// (or become False).
@@ -19,7 +19,7 @@ diff --git a/components/translate/core/browser/translate_ranker_impl.cc b/compon
translate_event->set_ranker_request_timestamp_sec(
(base::TimeTicks::Now() - base::TimeTicks()).InSeconds());
@@ -384,6 +384,8 @@ bool TranslateRankerImpl::ShouldOverrideMatchesPreviousLanguageDecision(
@@ -383,6 +383,8 @@ bool TranslateRankerImpl::ShouldOverrideMatchesPreviousLanguageDecision(
}
}
build/patches/Disable-references-to-fonts.googleapis.com.patch
+7 -7
View File
@@ -4,7 +4,7 @@ Subject: Disable references to fonts.googleapis.com
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../side_panel/read_anything/read_anything_toolbar.ts | 4 +---
.../side_panel/read_anything/app/read_anything_toolbar.ts | 4 +---
.../content/browser/dom_distiller_viewer_source.cc | 2 +-
components/dom_distiller/core/html/dom_distiller_viewer.html | 2 --
components/dom_distiller/core/html/preview.html | 2 +-
@@ -12,10 +12,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../crashpad/crashpad/doc/support/crashpad_doxygen.css | 3 +--
6 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts b/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts
--- a/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts
+++ b/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts
@@ -398,9 +398,7 @@ export class ReadAnythingToolbarElement extends ReadAnythingToolbarElementBase {
diff --git a/chrome/browser/resources/side_panel/read_anything/app/read_anything_toolbar.ts b/chrome/browser/resources/side_panel/read_anything/app/read_anything_toolbar.ts
--- a/chrome/browser/resources/side_panel/read_anything/app/read_anything_toolbar.ts
+++ b/chrome/browser/resources/side_panel/read_anything/app/read_anything_toolbar.ts
@@ -392,9 +392,7 @@ export class ReadAnythingToolbarElement extends ReadAnythingToolbarElementBase {
const link = document.createElement('link');
link.rel = 'preload';
link.as = 'style';
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/resources/side_panel/read_anything/read_anything_too
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
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -308,7 +308,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
@@ -309,7 +309,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
std::string DomDistillerViewerSource::GetContentSecurityPolicy(
network::mojom::CSPDirectiveName directive) {
if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
@@ -65,7 +65,7 @@ diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_di
diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
@@ -465,7 +465,7 @@ function maybeSetWebFont() {
@@ -646,7 +646,7 @@ function maybeSetWebFont() {
}
const e = document.createElement('link');

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