diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 2300b039..e817de2f 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -38,7 +38,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -89,6 +89,9 @@ android_library("java") { +@@ -92,6 +92,9 @@ android_library("java") { "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java", "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java", ] @@ -222,7 +222,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -682,6 +682,20 @@ void ContentSettingsRegistry::Init() { +@@ -669,6 +669,20 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -258,7 +258,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -205,7 +205,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::AUTOPLAY || content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || @@ -268,7 +268,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -217,6 +218,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -218,6 +219,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url); @@ -327,7 +327,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -276,6 +276,8 @@ enum class ContentSettingsType : int32_t { +@@ -277,6 +277,8 @@ enum class ContentSettingsType : int32_t { // site instead of the mobile one. REQUEST_DESKTOP_SITE, @@ -436,7 +436,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 -@@ -244,6 +244,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( +@@ -246,6 +246,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( } } @@ -450,7 +450,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_); -@@ -490,25 +497,6 @@ static String ExtractWebGLContextCreationError( +@@ -492,25 +499,6 @@ static String ExtractWebGLContextCreationError( const Platform::GraphicsInfo& info) { StringBuilder builder; builder.Append("Could not create a WebGL context"); @@ -476,7 +476,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(), builder); builder.Append('.'); -@@ -576,6 +564,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( +@@ -578,6 +566,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( const CanvasContextCreationAttributesCore& attributes, Platform::ContextType context_type, Platform::GraphicsInfo* graphics_info) { diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 7582795d..8c7b3246 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -92,6 +92,9 @@ android_library("java") { +@@ -95,6 +95,9 @@ android_library("java") { sources += [ "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java", ] @@ -218,7 +218,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -696,6 +696,20 @@ void ContentSettingsRegistry::Init() { +@@ -683,6 +683,20 @@ void ContentSettingsRegistry::Init() { /*show_into_info_page*/ true, /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL, /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE); @@ -254,7 +254,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -207,7 +207,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE || @@ -264,7 +264,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -219,6 +220,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url); FilterRulesForType(webgl_rules, outermost_main_frame_url); @@ -323,7 +323,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -278,6 +278,8 @@ enum class ContentSettingsType : int32_t { +@@ -279,6 +279,8 @@ enum class ContentSettingsType : int32_t { WEBGL, diff --git a/build/patches/Bromite-package-name.patch b/build/patches/Bromite-package-name.patch index f2fff898..77cbd442 100644 --- a/build/patches/Bromite-package-name.patch +++ b/build/patches/Bromite-package-name.patch @@ -8,16 +8,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn +index 432569612196b..b75cfc77f4e54 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -42,7 +42,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) { - assert(current_toolchain != android_secondary_abi_toolchain) - } +@@ -47,7 +47,7 @@ chrome_jni_registration_header = + chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h" --_default_package = "org.chromium.chrome" -+_default_package = "org.bromite.bromite" - if (android_channel != "default" && android_channel != "stable") { - # android-binary-size trybot may checks if an internal Chrome variant's - # AndroidManifest is as expected by ensuring the differences between its --- -2.25.1 + if (current_toolchain == default_toolchain) { +- _default_package = "org.chromium.chrome" ++ _default_package = "org.bromite.bromite" + if (use_stable_package_name_for_trichrome) { + _default_package += ".stable" + } else if (android_channel != "default" && android_channel != "stable") { +-- +2.30.2 + diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index e82465b6..e74d21ba 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -41,9 +41,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -85,6 +85,10 @@ android_library("java") { +@@ -88,6 +88,10 @@ android_library("java") { "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java", - "java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java" + "java/src/org/chromium/components/browser_ui/site_settings/WebsiteRowPreference.java", ] + sources += [ + "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java", @@ -763,7 +763,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 -@@ -41,6 +41,7 @@ import org.chromium.content_public.browser.ContentFeatureList; +@@ -42,6 +42,7 @@ import org.chromium.content_public.browser.ContentFeatureList; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -771,7 +771,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. -@@ -168,7 +169,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -171,7 +172,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment case ContentSettingsType.CLIPBOARD_READ_WRITE: return "clipboard_permission_list"; default: @@ -780,7 +780,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } } -@@ -493,7 +494,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -504,7 +505,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment private void setupContentSettingsPreferences() { mMaxPermissionOrder = findPreference(PREF_PERMISSIONS_HEADER).getOrder(); @@ -790,7 +790,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c Preference preference = new ChromeSwitchPreference(getStyledContext()); preference.setKey(getPreferenceKey(type)); -@@ -908,16 +910,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -945,16 +947,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment private void setupContentSettingsPreference(Preference preference, @ContentSettingValues @Nullable Integer value, boolean isEmbargoed) { @@ -818,7 +818,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c switchPreference.setOnPreferenceChangeListener(this); @ContentSettingsType int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey()); -@@ -1169,7 +1177,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1206,7 +1214,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment } mSite.setContentSetting(browserContextHandle, type, permission); @@ -929,7 +929,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 -@@ -260,6 +260,10 @@ public final class Website implements Serializable { +@@ -277,6 +277,10 @@ public final class Website implements WebsiteEntry { /*isEmbargoed=*/false); setContentSettingException(type, exception); } @@ -943,7 +943,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/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java -@@ -89,7 +89,7 @@ public class WebsitePermissionsFetcher { +@@ -92,7 +92,7 @@ public class WebsitePermissionsFetcher { case ContentSettingsType.USB_GUARD: return WebsitePermissionsType.CHOSEN_OBJECT_INFO; default: @@ -955,7 +955,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/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java -@@ -225,7 +225,7 @@ public class WebsitePreferenceBridge { +@@ -246,7 +246,7 @@ public class WebsitePreferenceBridge { case ContentSettingsType.TIMEZONE_OVERRIDE: return true; default: @@ -976,7 +976,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. #if BUILDFLAG(IS_ANDROID) #include "media/base/android/media_drm_bridge.h" -@@ -693,7 +695,10 @@ void ContentSettingsRegistry::Register( +@@ -680,7 +682,10 @@ void ContentSettingsRegistry::Register( Platforms platforms, ContentSettingsInfo::IncognitoBehavior incognito_behavior, ContentSettingsInfo::StorageBehavior storage_behavior, @@ -988,7 +988,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. // Ensure that nothing has been registered yet for the given type. DCHECK(!website_settings_registry_->Get(type)); -@@ -702,7 +707,9 @@ void ContentSettingsRegistry::Register( +@@ -689,7 +694,9 @@ void ContentSettingsRegistry::Register( website_settings_registry_->Register( type, name, std::move(default_value), sync_status, WebsiteSettingsInfo::NOT_LOSSY, scoping_type, platforms, @@ -1173,7 +1173,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 -@@ -23,6 +23,7 @@ +@@ -24,6 +24,7 @@ #include "components/browser_ui/util/android/url_constants.h" #include "components/browsing_data/content/local_storage_helper.h" #include "components/content_settings/browser/page_specific_content_settings.h" @@ -1181,7 +1181,7 @@ 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_utils.h" -@@ -164,6 +165,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, +@@ -167,6 +168,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, return true; } @@ -1197,7 +1197,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. const bool is_incognito = web_contents->GetBrowserContext()->IsOffTheRecord(); #if BUILDFLAG(IS_ANDROID) // Special geolocation DSE settings apply only on Android, so make sure it -@@ -1112,7 +1122,18 @@ void PageInfo::PresentSitePermissions() { +@@ -1150,7 +1160,18 @@ void PageInfo::PresentSitePermissions() { PermissionInfo permission_info; HostContentSettingsMap* content_settings = GetContentSettings(); DCHECK(web_contents_); diff --git a/build/patches/Do-not-compile-QR-code-sharing.patch b/build/patches/Do-not-compile-QR-code-sharing.patch index 4e9db405..2e3d1400 100644 --- a/build/patches/Do-not-compile-QR-code-sharing.patch +++ b/build/patches/Do-not-compile-QR-code-sharing.patch @@ -14,7 +14,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/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 -@@ -97,7 +97,6 @@ import org.chromium.chrome.browser.share.ShareButtonController; +@@ -100,7 +100,6 @@ import org.chromium.chrome.browser.share.ShareButtonController; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin; import org.chromium.chrome.browser.share.ShareUtils; @@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager; import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler; import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController; -@@ -496,10 +495,6 @@ public class RootUiCoordinator +@@ -499,10 +498,6 @@ public class RootUiCoordinator } public void onAttachFragment(Fragment fragment) { @@ -44,17 +44,17 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator; import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge; import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator; -@@ -312,9 +311,6 @@ public class ChromeProvidedSharingOptionsProvider { +@@ -311,9 +310,6 @@ public class ChromeProvidedSharingOptionsProvider { || !ChromeFeatureList.isEnabled(ChromeFeatureList.SEND_TAB_TO_SELF_SIGNIN_PROMO)) { mOrderedFirstPartyOptions.add(createSendTabToSelfFirstPartyOption()); } - if (!mIsIncognito) { - mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption()); - } - if (mTabProvider.hasValue() && UserPrefs.get(profile).getBoolean(Pref.PRINTING_ENABLED)) { + if (mTabProvider.hasValue() && UserPrefs.get(mProfile).getBoolean(Pref.PRINTING_ENABLED)) { mOrderedFirstPartyOptions.add(createPrintingFirstPartyOption()); } -@@ -457,21 +453,6 @@ public class ChromeProvidedSharingOptionsProvider { +@@ -456,21 +452,6 @@ public class ChromeProvidedSharingOptionsProvider { .build(); } diff --git a/build/patches/JIT-site-settings.patch b/build/patches/JIT-site-settings.patch index da5b147d..264e1838 100644 --- a/build/patches/JIT-site-settings.patch +++ b/build/patches/JIT-site-settings.patch @@ -42,7 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -161,6 +161,7 @@ android_resources("java_resources") { +@@ -164,6 +164,7 @@ android_resources("java_resources") { "java/res/drawable-hdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-hdpi/permission_background_sync.png", "java/res/drawable-hdpi/permission_javascript.png", @@ -50,7 +50,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-hdpi/permission_popups.png", "java/res/drawable-hdpi/permission_protected_media.png", "java/res/drawable-hdpi/settings_sensors.png", -@@ -168,6 +169,7 @@ android_resources("java_resources") { +@@ -171,6 +172,7 @@ android_resources("java_resources") { "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-mdpi/permission_background_sync.png", "java/res/drawable-mdpi/permission_javascript.png", @@ -58,7 +58,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-hdpi/settings_autoplay.png", "java/res/drawable-xhdpi/settings_autoplay.png", "java/res/drawable-xxhdpi/settings_autoplay.png", -@@ -180,6 +182,7 @@ android_resources("java_resources") { +@@ -183,6 +185,7 @@ android_resources("java_resources") { "java/res/drawable-xhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xhdpi/permission_background_sync.png", "java/res/drawable-xhdpi/permission_javascript.png", @@ -66,7 +66,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-xhdpi/permission_popups.png", "java/res/drawable-xhdpi/permission_protected_media.png", "java/res/drawable-xhdpi/settings_sensors.png", -@@ -187,6 +190,7 @@ android_resources("java_resources") { +@@ -190,6 +193,7 @@ android_resources("java_resources") { "java/res/drawable-xxhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xxhdpi/permission_background_sync.png", "java/res/drawable-xxhdpi/permission_javascript.png", @@ -74,7 +74,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-xxhdpi/permission_popups.png", "java/res/drawable-xxhdpi/permission_protected_media.png", "java/res/drawable-xxhdpi/settings_sensors.png", -@@ -194,6 +198,7 @@ android_resources("java_resources") { +@@ -197,6 +201,7 @@ android_resources("java_resources") { "java/res/drawable-xxxhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xxxhdpi/permission_background_sync.png", "java/res/drawable-xxxhdpi/permission_javascript.png", @@ -238,7 +238,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 -@@ -133,6 +133,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -136,6 +136,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment return "idle_detection_permission_list"; case ContentSettingsType.JAVASCRIPT: return "javascript_permission_list"; @@ -247,7 +247,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case ContentSettingsType.POPUPS: return "popup_permission_list"; case ContentSettingsType.SOUND: -@@ -503,6 +505,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -514,6 +516,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setUpJavascriptPreference(preference); } else if (type == ContentSettingsType.GEOLOCATION) { setUpLocationPreference(preference); @@ -256,7 +256,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.NOTIFICATIONS) { setUpNotificationsPreference(preference, mSite.isEmbargoed(type)); } else if (type == ContentSettingsType.REQUEST_DESKTOP_SITE) { -@@ -1023,6 +1027,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1060,6 +1064,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */); } @@ -337,7 +337,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 -@@ -213,6 +213,13 @@ public final class Website implements Serializable { +@@ -230,6 +230,13 @@ public final class Website implements WebsiteEntry { } else { RecordUserAction.record("JavascriptContentSetting.DisableBy.SiteSettings"); } @@ -354,7 +354,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc -@@ -790,6 +790,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled( +@@ -821,6 +821,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled( case ContentSettingsType::COOKIES: case ContentSettingsType::FEDERATED_IDENTITY_API: case ContentSettingsType::JAVASCRIPT: @@ -375,7 +375,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen Location -@@ -473,6 +476,20 @@ +@@ -497,6 +500,20 @@ Block JavaScript for a specific site. @@ -399,7 +399,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -618,7 +618,7 @@ void ContentSettingsRegistry::Init() { +@@ -605,7 +605,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); Register(ContentSettingsType::JAVASCRIPT_JIT, "javascript-jit", @@ -431,7 +431,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 -@@ -122,6 +122,7 @@ ContentSettingsType kPermissionType[] = { +@@ -125,6 +125,7 @@ ContentSettingsType kPermissionType[] = { ContentSettingsType::AR, ContentSettingsType::IDLE_DETECTION, ContentSettingsType::FEDERATED_IDENTITY_API, @@ -439,7 +439,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. }; // Determines whether to show permission |type| in the Page Info UI. Only -@@ -155,6 +156,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, +@@ -158,6 +159,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, return true; } diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index 24174a57..08a6dbb0 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -22,15 +22,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/payments/core/payment_prefs.cc | 2 +- .../core/common/safe_browsing_prefs.cc | 4 ++-- .../primary_account_manager.cc | 4 ++-- - content/public/common/content_features.cc | 2 +- - 19 files changed, 72 insertions(+), 19 deletions(-) + content/public/common/content_features.cc | 4 ++-- + 19 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 components/bookmarks/browser/features.cc create mode 100644 components/bookmarks/browser/features.h diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc +index 54fd9f0905ae8..c4e818c315441 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -78,6 +78,7 @@ +@@ -79,6 +79,7 @@ #include "components/autofill/core/common/autofill_switches.h" #include "components/autofill/core/common/autofill_util.h" #include "components/autofill_assistant/browser/features.h" @@ -38,7 +39,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/browser_sync/browser_sync_switches.h" #include "components/browser_ui/site_settings/android/features.h" #include "components/browsing_data/core/features.h" -@@ -5756,6 +5757,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5937,6 +5938,11 @@ const FeatureEntry kFeatureEntries[] = { reading_list::switches::kReadLaterReminderNotification)}, #endif @@ -51,6 +52,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc flag_descriptions::kTabGroupsNewBadgePromoName, flag_descriptions::kTabGroupsNewBadgePromoDescription, kOsDesktop, diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc +index cbf9b5dd9480b..56ab82fb2dde8 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc @@ -377,7 +377,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { @@ -63,9 +65,10 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows void BackgroundModeManager::RegisterProfile(Profile* profile) { diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc +index bb81389e0ea17..4e264ce161a8b 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1425,7 +1425,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1435,7 +1435,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -75,9 +78,10 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // user policy in addition to the same named ones in Local State (which are // used for mapping the command-line flags). diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc +index 2904162779c98..606e9b943e0f8 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2793,6 +2793,10 @@ const char kTabToGTSAnimationAndroidDescription[] = +@@ -2920,6 +2920,10 @@ const char kTabToGTSAnimationAndroidDescription[] = "Allows users to see an animation when entering or leaving the " "Grid Tab Switcher on phones."; @@ -89,9 +93,10 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kTabGroupsNewBadgePromoDescription[] = "Causes a 'New' badge to appear on the entry point for creating a tab " diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h +index 3aad4196b7895..fabe35badce4e 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1569,6 +1569,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[]; +@@ -1641,6 +1641,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[]; extern const char kTabToGTSAnimationAndroidName[]; extern const char kTabToGTSAnimationAndroidDescription[]; @@ -102,6 +107,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio extern const char kTabGroupsNewBadgePromoDescription[]; diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/prefetch_prefs.h +index 6c4021a2d5d41..a00b3dc281a47 100644 --- a/chrome/browser/prefetch/prefetch_prefs.h +++ b/chrome/browser/prefetch/prefetch_prefs.h @@ -25,7 +25,7 @@ enum class NetworkPredictionOptions { @@ -114,9 +120,10 @@ diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/ // Enum representing possible values of the Preload Pages opt-in state. Since diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc +index a82af67cd3afb..8309bc84cdf96 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -282,7 +282,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -302,7 +302,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -126,6 +133,7 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil #if BUILDFLAG(IS_ANDROID) registry->RegisterStringPref( diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html +index fdc696d48682f..6752dae95ec5d 100644 --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html @@ -36,7 +36,7 @@ @@ -138,6 +146,7 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc +index df3225597d7e0..c02bdc82855df 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc @@ -77,11 +77,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { @@ -156,6 +165,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup); registry->RegisterDictionaryPref(prefs::kAppWindowPlacement); diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browser/BUILD.gn +index fa0a550e02074..6ed7b1c16c780 100644 --- a/components/bookmarks/browser/BUILD.gn +++ b/components/bookmarks/browser/BUILD.gn @@ -21,6 +21,7 @@ static_library("browser") { @@ -175,6 +185,7 @@ diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browse "scoped_group_bookmark_actions.cc", "titled_url_index.cc", diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc +index b08cbb0bd8a8d..020935e486a41 100644 --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc @@ -25,6 +25,7 @@ @@ -185,7 +196,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" #include "components/bookmarks/common/bookmark_metrics.h" #include "components/bookmarks/common/bookmark_pref_names.h" -@@ -440,11 +441,14 @@ bool DoesBookmarkContainWords(const std::u16string& title, +@@ -443,11 +444,14 @@ bool DoesBookmarkContainWords(const std::u16string& title, void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -204,6 +215,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar prefs::kShowManagedBookmarksInBookmarkBar, true, diff --git a/components/bookmarks/browser/features.cc b/components/bookmarks/browser/features.cc new file mode 100644 +index 0000000000000..59094046f1dcf --- /dev/null +++ b/components/bookmarks/browser/features.cc @@ -0,0 +1,16 @@ @@ -225,6 +237,7 @@ new file mode 100644 +} // namespace bookmarks diff --git a/components/bookmarks/browser/features.h b/components/bookmarks/browser/features.h new file mode 100644 +index 0000000000000..5aa1e1ffce624 --- /dev/null +++ b/components/bookmarks/browser/features.h @@ -0,0 +1,18 @@ @@ -247,9 +260,10 @@ new file mode 100644 + +#endif // COMPONENTS_BOOKMARKS_BROWSER_FEATURES_H_ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc +index 85d55cd689a7b..3200dddb8904a 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -324,7 +324,7 @@ void ContentSettingsRegistry::Init() { +@@ -311,7 +311,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync", @@ -258,7 +272,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. AllowlistedSchemes(), ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, -@@ -424,7 +424,7 @@ void ContentSettingsRegistry::Init() { +@@ -411,7 +411,7 @@ void ContentSettingsRegistry::Init() { // TODO(crbug.com/904439): Update this to "SECURE_ONLY" once // DeviceOrientationEvents and DeviceMotionEvents are only fired in secure // contexts. @@ -268,6 +282,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc +index 10cf2824bdb0c..1728801c44c12 100644 --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc @@ -66,7 +66,7 @@ void CookieSettings::RegisterProfilePrefs( @@ -280,6 +295,7 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo } diff --git a/components/payments/core/payment_prefs.cc b/components/payments/core/payment_prefs.cc +index 3196befc8c400..2caca44e2d4e7 100644 --- a/components/payments/core/payment_prefs.cc +++ b/components/payments/core/payment_prefs.cc @@ -16,7 +16,7 @@ const char kCanMakePaymentEnabled[] = "payments.can_make_payment_enabled"; @@ -292,6 +308,7 @@ diff --git a/components/payments/core/payment_prefs.cc b/components/payments/cor } diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc +index 12d10cc3059df..ba2b8297b6613 100644 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc @@ -199,9 +199,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -307,6 +324,7 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/compo registry->RegisterBooleanPref(prefs::kSafeBrowsingEnhanced, false); registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc +index d8b6883073669..71a93f1ed2a10 100644 --- a/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc @@ -50,9 +50,9 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -322,16 +340,20 @@ diff --git a/components/signin/internal/identity_manager/primary_account_manager } diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc +index d57db0aa742ba..dbaa19eafbb64 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -499,7 +499,7 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList"; +@@ -540,8 +540,8 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList"; // the attribute. Note: At present, only iframes with origin-restricted // sandboxes are isolated. - const base::Feature kIsolateSandboxedIframes{"IsolateSandboxedIframes", -- base::FEATURE_DISABLED_BY_DEFAULT}; -+ base::FEATURE_ENABLED_BY_DEFAULT}; + BASE_FEATURE(kIsolateSandboxedIframes, +- "IsolateSandboxedIframes", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "IsolateSandboxedIframes", // enabled by default ++ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite const base::FeatureParam::Option isolated_sandboxed_iframes_grouping_types[] = { {IsolateSandboxedIframesGrouping::kPerSite, "per-site"}, --- -2.25.1 +-- +2.30.2 + diff --git a/build/patches/Remove-price-shopping-commerce-integrations.patch b/build/patches/Remove-price-shopping-commerce-integrations.patch index a2b40ace..bc9dc950 100644 --- a/build/patches/Remove-price-shopping-commerce-integrations.patch +++ b/build/patches/Remove-price-shopping-commerce-integrations.patch @@ -4,7 +4,7 @@ Subject: Remove price/shopping/commerce integrations License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/android/BUILD.gn | 24 --- + chrome/android/BUILD.gn | 26 --- chrome/android/chrome_java_sources.gni | 4 - chrome/android/features/tab_ui/BUILD.gn | 7 - .../res/layout/large_message_card_item.xml | 9 - @@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../TabSelectionEditorCoordinator.java | 2 +- .../TabSwitcherCoordinator.java | 102 +--------- .../tab_management/TabSwitcherMediator.java | 57 ------ - .../chrome/browser/app/ChromeActivity.java | 17 -- + .../chrome/browser/app/ChromeActivity.java | 20 -- .../AppMenuPropertiesDelegateImpl.java | 16 +- .../browser/bookmarks/BookmarkBridge.java | 84 --------- .../bookmarks/BookmarkItemsAdapter.java | 23 --- @@ -33,9 +33,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../init/ProcessInitializationHandler.java | 5 - .../chrome/browser/tab/TabHelpers.java | 9 - .../tabbed_mode/TabbedRootUiCoordinator.java | 22 --- - .../ToolbarButtonInProductHelpController.java | 26 --- + .../ToolbarButtonInProductHelpController.java | 27 --- .../browser/toolbar/ToolbarManager.java | 17 -- - .../chrome/browser/ui/RootUiCoordinator.java | 19 -- + .../chrome/browser/ui/RootUiCoordinator.java | 21 --- chrome/android/java_sources.gni | 8 - chrome/browser/BUILD.gn | 2 - .../price_tracking/PriceTrackingFeatures.java | 2 +- @@ -43,9 +43,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../CommerceSubscriptionsService.java | 36 +--- .../SubscriptionsManagerImpl.java | 26 +-- chrome/browser/persisted_state_db/BUILD.gn | 1 - - 39 files changed, 29 insertions(+), 916 deletions(-) + 39 files changed, 29 insertions(+), 924 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn +index ef72700a4f65b..432569612196b 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -20,10 +20,6 @@ import("//chrome/android/feed/feed_java_sources.gni") @@ -59,34 +60,62 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn import("//chrome/browser/password_manager/buildflags.gni") import("//chrome/browser/share/android/java_sources.gni") import("//chrome/chrome_paks.gni") -@@ -367,9 +363,6 @@ android_library("chrome_java") { - "//chrome/browser/browser_controls/android:java", - "//chrome/browser/commerce/android:java", - "//chrome/browser/commerce/merchant_viewer/android:java", -- "//chrome/browser/commerce/price_tracking/android:java", -- "//chrome/browser/commerce/price_tracking/proto:proto_java", -- "//chrome/browser/commerce/subscriptions/android:subscriptions_java", - "//chrome/browser/consent_auditor/android:java", - "//chrome/browser/contextmenu:java", - "//chrome/browser/dependency_injection:java", -@@ -756,16 +749,6 @@ android_library("chrome_java") { - sources += share_java_sources - deps += share_java_deps +@@ -394,9 +390,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/browser_controls/android:java", + "//chrome/browser/commerce/android:java", + "//chrome/browser/commerce/merchant_viewer/android:java", +- "//chrome/browser/commerce/price_tracking/android:java", +- "//chrome/browser/commerce/price_tracking/proto:proto_java", +- "//chrome/browser/commerce/subscriptions/android:subscriptions_java", + "//chrome/browser/consent_auditor/android:java", + "//chrome/browser/contextmenu:java", + "//chrome/browser/creator/android:java", +@@ -783,16 +776,6 @@ if (current_toolchain == default_toolchain) { + sources += share_java_sources + deps += share_java_deps -- # TODO(crbug/1186003): Instead of adding source files, add it as a separate -- # dependency when circular deps is resolved. -- sources += price_tracking_java_sources -- deps += price_tracking_java_deps +- # TODO(crbug/1186003): Instead of adding source files, add it as a separate +- # dependency when circular deps is resolved. +- sources += price_tracking_java_sources +- deps += price_tracking_java_deps - -- # TODO(crbug/1210158): Instead of adding source files, add it as a separate -- # dependency when circular deps is resolved. -- sources += commerce_subscriptions_java_sources -- deps += commerce_subscriptions_java_deps +- # TODO(crbug/1210158): Instead of adding source files, add it as a separate +- # dependency when circular deps is resolved. +- sources += commerce_subscriptions_java_sources +- deps += commerce_subscriptions_java_deps - - if (enable_basic_printing) { - deps += [ "//printing:printing_java" ] - } -@@ -854,8 +837,6 @@ group("jni_headers") { + if (enable_basic_printing) { + deps += [ "//printing:printing_java" ] + } +@@ -996,9 +979,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/browser_controls/android:junit", + "//chrome/browser/commerce/android:java", + "//chrome/browser/commerce/merchant_viewer/android:junit", +- "//chrome/browser/commerce/price_tracking/android:java", +- "//chrome/browser/commerce/price_tracking/proto:proto_java", +- "//chrome/browser/commerce/subscriptions/android:subscriptions_java", + "//chrome/browser/contextmenu:java", + "//chrome/browser/creator/android:java", + "//chrome/browser/creator/android:junit", +@@ -1520,8 +1500,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/commerce/android:javatests", + "//chrome/browser/commerce/merchant_viewer/android:java", + "//chrome/browser/commerce/merchant_viewer/android:javatests", +- "//chrome/browser/commerce/price_tracking/android:java", +- "//chrome/browser/commerce/subscriptions/android:subscriptions_java", + "//chrome/browser/content_creation/notes/internal/android:java", + "//chrome/browser/contextmenu:java", + "//chrome/browser/dependency_injection:java", +@@ -1799,8 +1777,6 @@ if (current_toolchain == default_toolchain) { + + deps += feed_test_deps + +- deps += commerce_subscriptions_java_test_deps +- + if (enable_basic_printing) { + deps += [ "//printing:printing_java" ] + } +@@ -4158,8 +4134,6 @@ group("jni_headers") { "//chrome/browser/android/browserservices/verification:jni_headers", "//chrome/browser/battery/android:jni_headers", "//chrome/browser/commerce/merchant_viewer/android:jni_headers", @@ -95,36 +124,11 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/contextmenu:jni_headers", "//chrome/browser/download/android:jni_headers", "//chrome/browser/enterprise/util:jni_headers", -@@ -1014,8 +995,6 @@ robolectric_binary("chrome_junit_tests") { - "//chrome/browser/browser_controls/android:junit", - "//chrome/browser/commerce/android:java", - "//chrome/browser/commerce/merchant_viewer/android:junit", -- "//chrome/browser/commerce/price_tracking/android:java", -- "//chrome/browser/commerce/price_tracking/proto:proto_java", - "//chrome/browser/commerce/subscriptions/android:subscriptions_java", - "//chrome/browser/contextmenu:java", - "//chrome/browser/dependency_injection:java", -@@ -1544,7 +1523,6 @@ android_library("chrome_test_java") { - "//chrome/browser/commerce/android:javatests", - "//chrome/browser/commerce/merchant_viewer/android:java", - "//chrome/browser/commerce/merchant_viewer/android:javatests", -- "//chrome/browser/commerce/price_tracking/android:java", - "//chrome/browser/commerce/subscriptions/android:subscriptions_java", - "//chrome/browser/content_creation/notes/internal/android:java", - "//chrome/browser/contextmenu:java", -@@ -1820,8 +1798,6 @@ android_library("chrome_test_java") { - - deps += feed_test_deps - -- deps += commerce_subscriptions_java_test_deps -- - if (enable_basic_printing) { - deps += [ "//printing:printing_java" ] - } diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni +index a11dd6e2b4e81..14a9948820016 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -194,10 +194,6 @@ chrome_java_sources = [ +@@ -198,10 +198,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java", "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java", "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java", @@ -136,9 +140,10 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/bookmarks/ReadingListSectionHeader.java", "java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java", diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn +index 0f5ffcaa629b0..c169f9aba2327 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn -@@ -108,11 +108,6 @@ android_library("java") { +@@ -110,11 +110,6 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewUtils.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java", @@ -150,7 +155,7 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/t "java/src/org/chromium/chrome/browser/tasks/tab_management/SelectableTabGridView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/StoreHoursCardView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogCoordinator.java", -@@ -190,7 +185,6 @@ android_library("java") { +@@ -194,7 +189,6 @@ android_library("java") { "//chrome/browser/android/lifecycle:java", "//chrome/browser/back_press/android:java", "//chrome/browser/browser_controls/android:java", @@ -158,7 +163,7 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/t "//chrome/browser/endpoint_fetcher:java", "//chrome/browser/feature_engagement:java", "//chrome/browser/feed/android:java", -@@ -272,7 +266,6 @@ android_library("unit_device_javatests") { +@@ -276,7 +270,6 @@ android_library("unit_device_javatests") { "//base/test:test_support_java", "//chrome/android/features/tab_ui:java", "//chrome/android/features/tab_ui:tab_suggestions_java", @@ -167,6 +172,7 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/t "//chrome/browser/optimization_guide/android:java", "//chrome/browser/profiles/android:java", diff --git a/chrome/android/features/tab_ui/java/res/layout/large_message_card_item.xml b/chrome/android/features/tab_ui/java/res/layout/large_message_card_item.xml +index ec48df97859e9..b9fd2be61a429 100644 --- a/chrome/android/features/tab_ui/java/res/layout/large_message_card_item.xml +++ b/chrome/android/features/tab_ui/java/res/layout/large_message_card_item.xml @@ -22,15 +22,6 @@ found in the LICENSE file. @@ -186,12 +192,13 @@ diff --git a/chrome/android/features/tab_ui/java/res/layout/large_message_card_i android:id="@+id/icon" android:layout_width="26dp" diff --git a/chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml b/chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml +index fb28f3db5ab90..11ccf6782a2b4 100644 --- a/chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml +++ b/chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml -@@ -54,14 +54,6 @@ found in the LICENSE file. - android:src="@color/thumbnail_placeholder_on_primary_bg" - style="?attr/tabGridThumbnailStyle"/> - +@@ -62,14 +62,6 @@ found in the LICENSE file. + app:cornerRadiusTopEnd="@dimen/tab_grid_card_thumbnail_corner_radius_top" + app:cornerRadiusBottomStart="@dimen/tab_grid_card_thumbnail_corner_radius_bottom" + app:cornerRadiusBottomEnd="@dimen/tab_grid_card_thumbnail_corner_radius_bottom"/> - mShareDelegateSupplier; - /** {@see TabManagementDelegate#createCarouselTabSwitcher} */ -@@ -218,7 +207,7 @@ public class TabSwitcherCoordinator +@@ -235,7 +224,7 @@ public class TabSwitcherCoordinator new PropertyModel(TabListContainerProperties.ALL_KEYS); mMediator = new TabSwitcherMediator(activity, this, containerViewModel, - tabModelSelector, browserControls, container, tabContentManager, this, this, + tabModelSelector, browserControls, container, tabContentManager, this, - multiWindowModeStateDispatcher, mode); + multiWindowModeStateDispatcher, mode, incognitoReauthControllerSupplier); mTabSwitcherCustomViewManager = new TabSwitcherCustomViewManager(mMediator); -@@ -238,7 +227,7 @@ public class TabSwitcherCoordinator +@@ -255,7 +244,7 @@ public class TabSwitcherCoordinator long startTimeMs = SystemClock.uptimeMillis(); mTabListCoordinator = new TabListCoordinator(mode, activity, tabModelSelector, mMultiThumbnailCardProvider, titleProvider, true, mMediator, null, @@ -867,7 +886,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mRootView, null); mContainerViewChangeProcessor = PropertyModelChangeProcessor.create(containerViewModel, mTabListCoordinator.getContainerView(), TabListContainerViewBinder::bind); -@@ -336,21 +325,6 @@ public class TabSwitcherCoordinator +@@ -353,21 +342,6 @@ public class TabSwitcherCoordinator new LayoutViewBuilder(R.layout.large_message_card_item), LargeMessageCardViewBinder::bind); } @@ -889,7 +908,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } if (ChromeFeatureList.sInstantStart.isEnabled() -@@ -456,8 +430,6 @@ public class TabSwitcherCoordinator +@@ -481,8 +455,6 @@ public class TabSwitcherCoordinator mMultiThumbnailCardProvider.initWithNative(); mMediator.initWithNative(controller, mSnackbarManager); @@ -898,8 +917,8 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mIsInitialized = true; } -@@ -487,21 +459,6 @@ public class TabSwitcherCoordinator - tabContentManager, selectionEditorMode, mRootView, /*displayGroups=*/false); +@@ -554,21 +526,6 @@ public class TabSwitcherCoordinator + RecordUserAction.record("TabMultiSelectV2.OpenFromGrid"); } - private void setUpPriceTracking(Context context, ModalDialogManager modalDialogManager) { @@ -920,7 +939,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser // TabSwitcher implementation. @Override public void setOnTabSelectingListener(OnTabSelectingListener listener) { -@@ -631,22 +588,10 @@ public class TabSwitcherCoordinator +@@ -698,22 +655,10 @@ public class TabSwitcherCoordinator public boolean resetWithTabs( @Nullable List tabs, boolean quickMode, boolean mruMode) { mMediator.registerFirstMeaningfulPaintRecorder(); @@ -943,7 +962,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser return showQuickly; } -@@ -683,38 +628,6 @@ public class TabSwitcherCoordinator +@@ -750,38 +695,6 @@ public class TabSwitcherCoordinator sAppendedMessagesForTesting = messages.size() > 0; } @@ -982,7 +1001,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser private void appendMessagesTo(int index) { if (mMultiWindowModeStateDispatcher.isInMultiWindowMode()) return; sAppendedMessagesForTesting = false; -@@ -744,9 +657,6 @@ public class TabSwitcherCoordinator +@@ -811,9 +724,6 @@ public class TabSwitcherCoordinator mMessageCardProviderCoordinator.getNextMessageItemForType(messageType); if (nextMessage == null || !shouldAppendMessage(nextMessage.model)) return; if (messageType == MessageService.MessageType.PRICE_MESSAGE) { @@ -992,7 +1011,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } else { mTabListCoordinator.addSpecialListItemToEnd( TabProperties.UiType.MESSAGE, nextMessage.model); -@@ -796,8 +706,7 @@ public class TabSwitcherCoordinator +@@ -863,8 +773,7 @@ public class TabSwitcherCoordinator } private boolean shouldRegisterLargeMessageItemType() { @@ -1002,7 +1021,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } @Override -@@ -833,9 +742,6 @@ public class TabSwitcherCoordinator +@@ -900,9 +809,6 @@ public class TabSwitcherCoordinator if (mTabAttributeCache != null) { mTabAttributeCache.destroy(); } @@ -1013,17 +1032,18 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java +index 5cd6229ab4100..e988d9eceeda5 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java -@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; +@@ -46,7 +46,6 @@ import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthManager; import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.price_tracking.PriceTrackingUtilities; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabCreationState; - import org.chromium.chrome.browser.tab.TabHidingType; -@@ -77,7 +76,6 @@ import java.util.List; + import org.chromium.chrome.browser.tab.TabSelectionType; +@@ -79,7 +78,6 @@ import java.util.List; */ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView.VisibilityListener, TabListMediator.GridCardOnClickListenerProvider, @@ -1031,7 +1051,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser TabSwitcherCustomViewManager.Delegate { private static final String TAG = "TabSwitcherMediator"; -@@ -125,7 +123,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -153,7 +151,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView private TabSelectionEditorCoordinator .TabSelectionEditorController mTabSelectionEditorController; private TabSwitcher.OnTabSelectingListener mOnTabSelectingListener; @@ -1039,7 +1059,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser private boolean mIsOnHomepage; /** -@@ -226,29 +223,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -260,29 +257,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView void restoreAllAppendedMessage(); } @@ -1069,15 +1089,15 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** * Basic constructor for the Mediator. * @param context The context to use for accessing {@link android.content.res.Resources}. -@@ -267,7 +241,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -303,7 +277,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView PropertyModel containerViewModel, TabModelSelector tabModelSelector, BrowserControlsStateProvider browserControlsStateProvider, ViewGroup containerView, TabContentManager tabContentManager, MessageItemsController messageItemsController, - PriceWelcomeMessageController priceWelcomeMessageController, - MultiWindowModeStateDispatcher multiWindowModeStateDispatcher, @TabListMode int mode) { - mResetHandler = resetHandler; - mContainerViewModel = containerViewModel; -@@ -357,9 +330,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView + MultiWindowModeStateDispatcher multiWindowModeStateDispatcher, @TabListMode int mode, + @Nullable OneshotSupplier + incognitoReauthControllerSupplier) { +@@ -400,9 +373,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView public void willCloseTab(Tab tab, boolean animate, boolean didCloseAlone) { if (mTabModelSelector.getCurrentModel().getCount() == 1) { messageItemsController.removeAllAppendedMessage(); @@ -1087,7 +1107,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } } -@@ -368,10 +338,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -411,10 +381,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView if (mTabModelSelector.getCurrentModel().getCount() == 1) { messageItemsController.restoreAllAppendedMessage(); } @@ -1098,7 +1118,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser notifyBackPressStateChangedInternal(); } -@@ -387,12 +353,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -430,12 +396,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView @Override public void tabClosureCommitted(Tab tab) { @@ -1111,7 +1131,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } }; -@@ -641,14 +601,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -694,14 +654,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView "MobileTabSwitched." + TabSwitcherCoordinator.COMPONENT_NAME); } } @@ -1126,7 +1146,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } @Override -@@ -997,10 +949,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -1058,10 +1010,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView mOnTabSelectingListener = listener; } @@ -1137,7 +1157,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser // GridCardOnClickListenerProvider implementation. @Override @Nullable -@@ -1034,11 +982,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -1095,11 +1043,6 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView } } @@ -1150,11 +1170,12 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser return TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext) && mTabModelSelector.isIncognitoSelected() == tab.isIncognito() 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 +index ebaf5e67c2b0b..b89327eee0d81 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -83,9 +83,7 @@ import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator; +@@ -83,9 +83,7 @@ import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton; + import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator; import org.chromium.chrome.browser.back_press.BackPressManager; - import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkModel; -import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; import org.chromium.chrome.browser.bookmarks.TabBookmarker; @@ -1171,14 +1192,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler; import org.chromium.chrome.browser.tab.RequestDesktopUtils; import org.chromium.chrome.browser.tab.Tab; -@@ -2372,19 +2368,6 @@ public abstract class ChromeActivity +@@ -2366,27 +2362,11 @@ public abstract class ChromeActivity + } + + if (id == R.id.enable_price_tracking_menu_id) { +- mTabBookmarkerSupplier.get().startOrModifyPriceTracking(currentTab); + RecordUserAction.record("MobileMenuEnablePriceTracking"); +- TrackerFactory.getTrackerForProfile(Profile.getLastUsedRegularProfile()) +- .notifyEvent(EventConstants.SHOPPING_LIST_PRICE_TRACK_FROM_MENU); + return true; } if (id == R.id.disable_price_tracking_menu_id) { - // TODO(crbug.com/1268976): Extract this code into a one-liner. - List bookmarkIds = - PowerBookmarkUtils.getBookmarkIdsWithSharedClusterIdForTab( -- currentTab, mBookmarkBridgeSupplier.get()); +- currentTab, mBookmarkModelSupplier.get()); - SubscriptionsManager subscriptionsManager = null; - if (ShoppingFeatures.isShoppingListEnabled()) { - subscriptionsManager = new CommerceSubscriptionsServiceFactory() @@ -1186,18 +1215,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv - .getSubscriptionsManager(); - } - PowerBookmarkUtils.setPriceTrackingEnabledWithSnackbars(subscriptionsManager, -- mBookmarkBridgeSupplier.get(), bookmarkIds, +- mBookmarkModelSupplier.get(), bookmarkIds, - /*enabled=*/false, mSnackbarManager, getResources()); RecordUserAction.record("MobileMenuDisablePriceTracking"); return true; } 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 +index 52173bd406be9..4481b255d6982 100644 --- 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 @@ -37,7 +37,6 @@ import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.banners.AppMenuVerbiage; - import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkFeatures; + import org.chromium.chrome.browser.bookmarks.BookmarkModel; -import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; import org.chromium.chrome.browser.bookmarks.ReadingListFeatures; import org.chromium.chrome.browser.commerce.ShoppingFeatures; @@ -1210,10 +1240,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.read_later.ReadingListUtils; import org.chromium.chrome.browser.share.ShareHelper; -@@ -572,9 +570,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate - .getTabsWithNoOtherRelatedTabs() - .size() - > 1; +@@ -595,9 +593,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate + > 1; + } + - boolean isPriceTrackingVisible = isOverviewModeMenu - && PriceTrackingUtilities.shouldShowPriceTrackingMenu() - && !DeviceClassManager.enableAccessibilityLayout(mContext) && !isIncognito; @@ -1221,7 +1251,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App boolean isPriceTrackingEnabled = isPriceTrackingVisible; boolean hasItemBetweenDividers = false; -@@ -1147,9 +1143,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1181,9 +1177,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate * @param stopPriceTrackingMenuItem The menu item to stop price tracking. * @param currentTab Current tab being displayed. */ @@ -1234,8 +1264,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App ShoppingServiceFactory.getForProfile(Profile.getLastUsedRegularProfile()); ShoppingService.ProductInfo info = null; if (service != null && currentTab != null) { -@@ -1185,7 +1181,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate - info.productClusterId, mBookmarkBridgeSupplier.get()); +@@ -1219,7 +1215,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate + info.productClusterId, mBookmarkModelSupplier.get()); } startPriceTrackingMenuItem.setVisible(!priceTrackingEnabled); - stopPriceTrackingMenuItem.setVisible(priceTrackingEnabled); @@ -1246,6 +1276,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/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +index 9727dd580f38c..75a775607708a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java @@ -26,9 +26,6 @@ import org.chromium.chrome.browser.commerce.ShoppingFeatures; @@ -1257,8 +1288,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm -import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.chrome.browser.tab.Tab; import org.chromium.components.bookmarks.BookmarkId; - import org.chromium.components.bookmarks.BookmarkType; -@@ -60,8 +57,6 @@ public class BookmarkBridge { + import org.chromium.components.bookmarks.BookmarkItem; +@@ -59,8 +56,6 @@ class BookmarkBridge { new ArrayList(); private final ObserverList mObservers = new ObserverList(); @@ -1267,7 +1298,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Interface for callback object for fetching bookmarks and folder hierarchy. -@@ -315,26 +310,6 @@ public class BookmarkBridge { +@@ -104,26 +99,6 @@ class BookmarkBridge { mNativeBookmarkBridge = BookmarkBridgeJni.get().init(BookmarkBridge.this, profile); mIsDoingExtensiveChanges = BookmarkBridgeJni.get().isDoingExtensiveChanges( mNativeBookmarkBridge, BookmarkBridge.this); @@ -1294,7 +1325,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } /** -@@ -349,10 +324,6 @@ public class BookmarkBridge { +@@ -138,10 +113,6 @@ class BookmarkBridge { mDelayedBookmarkCallbacks.clear(); } mObservers.clear(); @@ -1305,7 +1336,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } /** Returns whether the bridge has been destroyed. */ -@@ -656,61 +627,6 @@ public class BookmarkBridge { +@@ -445,61 +416,6 @@ class BookmarkBridge { return result; } @@ -1368,10 +1399,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm * Gets the child of a folder at the specific position. * @param folderId Id of the parent folder diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java +index 84fa2a626b085..c3711ea8bbadf 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java -@@ -24,12 +24,9 @@ import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem; - import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver; +@@ -22,12 +22,9 @@ import org.chromium.base.metrics.RecordUserAction; + import org.chromium.chrome.R; import org.chromium.chrome.browser.bookmarks.BookmarkListEntry.ViewType; import org.chromium.chrome.browser.bookmarks.BookmarkRow.Location; -import org.chromium.chrome.browser.commerce.ShoppingFeatures; @@ -1382,8 +1414,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm -import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.components.bookmarks.BookmarkId; - import org.chromium.components.bookmarks.BookmarkType; -@@ -66,13 +63,10 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter selectableList = mMainView.findViewById(R.id.selectable_list); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java +index c008afd350eac..e646b33f47ac0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java @@ -17,8 +17,6 @@ import org.chromium.base.lifetime.DestroyChecker; @@ -1532,21 +1557,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm @VisibleForTesting diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java +index d1526bcc10861..658d92f5298e6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java -@@ -16,11 +16,8 @@ import org.chromium.base.metrics.RecordUserAction; +@@ -14,11 +14,8 @@ import org.chromium.base.Callback; + import org.chromium.base.CallbackController; + import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; - import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem; - import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver; -import org.chromium.chrome.browser.bookmarks.PowerBookmarkMetrics.PriceTrackingState; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.subscriptions.CommerceSubscription; -import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.components.bookmarks.BookmarkId; + import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.feature_engagement.EventConstants; - import org.chromium.components.power_bookmarks.PowerBookmarkMeta; -@@ -30,7 +27,7 @@ import java.util.List; +@@ -29,7 +26,7 @@ import java.util.List; /** Controls the bookmarks save-flow. */ public class BookmarkSaveFlowMediator @@ -1555,7 +1581,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private final Context mContext; private final Runnable mCloseRunnable; -@@ -40,9 +37,6 @@ public class BookmarkSaveFlowMediator +@@ -39,9 +36,6 @@ public class BookmarkSaveFlowMediator private BookmarkId mBookmarkId; private PowerBookmarkMeta mPowerBookmarkMeta; private boolean mWasBookmarkMoved; @@ -1565,7 +1591,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private String mFolderName; /** -@@ -51,22 +45,15 @@ public class BookmarkSaveFlowMediator +@@ -50,22 +44,15 @@ public class BookmarkSaveFlowMediator * model. * @param context The {@link Context} associated with this mediator. * @param closeRunnable A {@link Runnable} which closes the bookmark save flow. @@ -1589,7 +1615,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } /** -@@ -101,9 +88,6 @@ public class BookmarkSaveFlowMediator +@@ -100,9 +87,6 @@ public class BookmarkSaveFlowMediator mCloseRunnable.run(); }); @@ -1678,26 +1704,27 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm - } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +index a2ae71eb17eef..6008d11acdba4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java -@@ -39,7 +39,6 @@ import org.chromium.chrome.browser.app.bookmarks.BookmarkEditActivity; +@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.app.bookmarks.BookmarkActivity; + import org.chromium.chrome.browser.app.bookmarks.BookmarkEditActivity; import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderSelectActivity; - import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem; import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider.CustomTabsUiType; -import org.chromium.chrome.browser.commerce.ShoppingFeatures; import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider; import org.chromium.chrome.browser.customtabs.IncognitoCustomTabIntentDataProvider; import org.chromium.chrome.browser.document.ChromeLauncherActivity; -@@ -47,8 +46,6 @@ import org.chromium.chrome.browser.feature_engagement.TrackerFactory; - import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; - import org.chromium.chrome.browser.preferences.SharedPreferencesManager; +@@ -48,8 +47,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; + import org.chromium.chrome.browser.read_later.ReadingListUtils; + import org.chromium.chrome.browser.renderer_host.ChromeNavigationUIData; -import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; -import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabLaunchType; - import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; -@@ -135,16 +132,9 @@ public class BookmarkUtils { + import org.chromium.chrome.browser.tabmodel.AsyncTabCreationParams; +@@ -142,16 +139,9 @@ public class BookmarkUtils { return; } @@ -1716,6 +1743,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } 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 +index 1a0d1623b6c6d..3b4f0ce6f6625 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java @@ -73,7 +73,6 @@ import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomiza @@ -1738,9 +1766,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni deferredStartupHandler.addDeferredTask(() -> { if (ChromeFeatureList.isEnabled(ChromeFeatureList.FEATURE_NOTIFICATION_GUIDE)) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java +index f72eccf4dbd6b..195464284839c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java -@@ -13,7 +13,6 @@ import org.chromium.chrome.browser.dom_distiller.TabDistillabilityProvider; +@@ -14,7 +14,6 @@ import org.chromium.chrome.browser.dom_distiller.TabDistillabilityProvider; import org.chromium.chrome.browser.infobar.InfoBarContainer; import org.chromium.chrome.browser.media.ui.MediaSessionTabHelper; import org.chromium.chrome.browser.password_check.PasswordCheckUkmRecorder; @@ -1748,9 +1777,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers. import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData; /** -@@ -38,14 +37,6 @@ public final class TabHelpers { - AutofillAssistantTabHelper.createForTab(tab); +@@ -40,14 +39,6 @@ public final class TabHelpers { PasswordCheckUkmRecorder.createForTab(tab); + AccessibilityTabHelper.createForTab(tab); - // The following will start prefetching data for the price drops feature, so - // we should only do it if the user is eligible for the feature (e.g. has sync enabled). @@ -1764,6 +1793,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers. if (tab.isIncognito()) CipherFactory.getInstance().triggerKeyGeneration(); } 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 +index 7e6ed2639332d..84edc93d150de 100644 --- 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 @@ -72,7 +72,6 @@ import org.chromium.chrome.browser.offlinepages.indicator.OfflineIndicatorInProd @@ -1811,7 +1841,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab initUndoGroupSnackbarController(); } -@@ -764,18 +754,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -765,18 +755,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { if (animate) browserControlsSizer.setAnimateBrowserControlsHeightChanges(false); } @@ -1831,6 +1861,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mActivity)) { mUndoGroupSnackbarController = new UndoGroupSnackbarController( diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java +index 48f135299b0a2..ded5f91245d8f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java @@ -15,8 +15,6 @@ import org.chromium.base.supplier.ObservableSupplier; @@ -1842,7 +1873,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar import org.chromium.chrome.browser.download.DownloadUtils; import org.chromium.chrome.browser.feature_engagement.ScreenshotMonitor; import org.chromium.chrome.browser.feature_engagement.ScreenshotMonitorDelegate; -@@ -117,7 +115,6 @@ public class ToolbarButtonInProductHelpController +@@ -118,7 +116,6 @@ public class ToolbarButtonInProductHelpController private void handleIPHForSuccessfulPageLoad(final Tab tab) { showDownloadPageTextBubble(tab, FeatureConstants.DOWNLOAD_PAGE_FEATURE); showTranslateMenuButtonTextBubble(tab); @@ -1850,7 +1881,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar } private void handleIPHForErrorPageShown(Tab tab) { -@@ -148,29 +145,6 @@ public class ToolbarButtonInProductHelpController +@@ -149,30 +146,6 @@ public class ToolbarButtonInProductHelpController mLifecycleDispatcher.unregister(this); } @@ -1860,7 +1891,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar - */ - private void showPriceTrackingIPH(Tab tab) { - if (!ShoppingFeatures.isShoppingListEnabled() -- || !PowerBookmarkUtils.isPriceTrackingEligible(tab)) { +- || !PowerBookmarkUtils.isPriceTrackingEligible(tab) +- || AdaptiveToolbarFeatures.isContextualPageActionUiEnabled()) { - return; - } - @@ -1881,9 +1913,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar * Attempts to show an IPH text bubble for download continuing. */ 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 +index 47d16aafb12c4..11e758581cbc8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -91,8 +91,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate; +@@ -92,8 +92,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate; import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; import org.chromium.chrome.browser.page_info.ChromePageInfo; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; @@ -1892,7 +1925,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; -@@ -1981,21 +1979,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -2018,21 +2016,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve * viewed in the tab switcher grid. */ private void maybeShowPriceDropIPH() { @@ -1915,17 +1948,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar private void checkIfNtpLoaded() { 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 +index f8336b232a870..f6eda91ed51c4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.app.omnibox.OmniboxPedalDelegateImpl; - import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController; - import org.chromium.chrome.browser.back_press.BackPressManager; - import org.chromium.chrome.browser.bookmarks.BookmarkBridge; --import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; - import org.chromium.chrome.browser.bookmarks.TabBookmarker; - import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; - import org.chromium.chrome.browser.commerce.ShoppingFeatures; -@@ -93,7 +92,6 @@ import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; +@@ -95,7 +95,6 @@ import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceInteractionSource; import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; @@ -1933,7 +1959,7 @@ 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.search_engines.TemplateUrlServiceFactory; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; -@@ -103,7 +101,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin; +@@ -105,7 +104,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin; import org.chromium.chrome.browser.share.ShareUtils; import org.chromium.chrome.browser.share.qrcode.QrCodeDialog; import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager; @@ -1941,14 +1967,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler; import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController; import org.chromium.chrome.browser.tab.RequestDesktopUtils; -@@ -773,17 +770,6 @@ public class RootUiCoordinator +@@ -775,17 +773,6 @@ public class RootUiCoordinator initMerchantTrustSignals(); initScrollCapture(); - // TODO(1293885): Remove this validator once we have an API on the backend that sends - // success/failure information back. - if (ShoppingFeatures.isShoppingListEnabled()) { -- mBookmarkBridgeSupplier.addObserver((bridge) -> { +- mBookmarkModelSupplier.addObserver((bridge) -> { - PowerBookmarkUtils.validateBookmarkedCommerceSubscriptions(bridge, - new CommerceSubscriptionsServiceFactory() - .getForLastUsedProfile() @@ -1959,26 +1985,30 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi new OneShotCallback<>(mProfileSupplier, this::initHistoryClustersCoordinator); if (DeviceFormFactor.isWindowOnTablet(mWindowAndroid) -@@ -1088,9 +1074,6 @@ public class RootUiCoordinator +@@ -1090,12 +1077,6 @@ public class RootUiCoordinator mIdentityDiscController = new IdentityDiscController( mActivity, mActivityLifecycleDispatcher, mProfileSupplier); - PriceTrackingButtonController priceTrackingButtonController = -- new PriceTrackingButtonController( -- mActivity, mActivityTabProvider, mTabBookmarkerSupplier); - ShareButtonController shareButtonController = new ShareButtonController(mActivity, - AppCompatResources.getDrawable( - mActivity, R.drawable.ic_toolbar_share_offset_24dp), -@@ -1136,8 +1119,6 @@ public class RootUiCoordinator +- new PriceTrackingButtonController(mActivityTabProvider, +- mModalDialogManagerSupplier.get(), getBottomSheetController(), +- AppCompatResources.getDrawable( +- mActivity, R.drawable.price_tracking_disabled), +- mTabBookmarkerSupplier); + ReaderModeToolbarButtonController readerModeToolbarButtonController = + new ReaderModeToolbarButtonController(mActivityTabProvider, + mModalDialogManagerSupplier.get(), +@@ -1146,8 +1127,6 @@ public class RootUiCoordinator AdaptiveToolbarButtonVariant.SHARE, shareButtonController); adaptiveToolbarButtonController.addButtonVariant( AdaptiveToolbarButtonVariant.VOICE, voiceToolbarButtonController); - adaptiveToolbarButtonController.addButtonVariant( - AdaptiveToolbarButtonVariant.PRICE_TRACKING, priceTrackingButtonController); + adaptiveToolbarButtonController.addButtonVariant( + AdaptiveToolbarButtonVariant.READER_MODE, readerModeToolbarButtonController); mButtonDataProviders = - Arrays.asList(mIdentityDiscController, adaptiveToolbarButtonController); - diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni +index ca13030a9ee1a..ece0f01fca408 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni @@ -15,9 +15,6 @@ import("//chrome/android/features/tab_ui/tab_management_java_sources.gni") @@ -2009,9 +2039,10 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni if (enable_arcore) { diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn +index 9b8f1fe5abc54..13cb35fe38e37 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2908,8 +2908,6 @@ static_library("browser") { +@@ -2921,8 +2921,6 @@ static_library("browser") { "chrome_browser_main_android.h", "commerce/android/shopping_service_factory_android.cc", "commerce/merchant_viewer/web_contents_helper.cc", @@ -2021,6 +2052,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "component_updater/crow_domain_list_component_installer.h", "component_updater/desktop_sharing_hub_component_remover.cc", diff --git a/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingFeatures.java b/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingFeatures.java +index e1b30f6419af8..844ce346c9a0d 100644 --- a/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingFeatures.java +++ b/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingFeatures.java @@ -77,7 +77,7 @@ public class PriceTrackingFeatures { @@ -2033,6 +2065,7 @@ diff --git a/chrome/browser/commerce/price_tracking/android/java/src/org/chromiu private static boolean isSignedIn() { diff --git a/chrome/browser/commerce/subscriptions/android/BUILD.gn b/chrome/browser/commerce/subscriptions/android/BUILD.gn +index 3c74ec1ef62b0..f79b23e5e3a10 100644 --- a/chrome/browser/commerce/subscriptions/android/BUILD.gn +++ b/chrome/browser/commerce/subscriptions/android/BUILD.gn @@ -30,7 +30,6 @@ android_library("subscriptions_java") { @@ -2044,6 +2077,7 @@ diff --git a/chrome/browser/commerce/subscriptions/android/BUILD.gn b/chrome/bro "//chrome/browser/flags:java", "//chrome/browser/preferences:java", diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java +index 16bf9302a8b6b..f68ed0ed64a4c 100644 --- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java @@ -10,8 +10,6 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; @@ -2124,6 +2158,7 @@ diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium } } diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImpl.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImpl.java +index da5055a414e25..2c1f7477bc127 100644 --- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImpl.java +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImpl.java @@ -11,8 +11,6 @@ import androidx.annotation.VisibleForTesting; @@ -2195,6 +2230,7 @@ diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium /** diff --git a/chrome/browser/persisted_state_db/BUILD.gn b/chrome/browser/persisted_state_db/BUILD.gn +index e0320b5559939..1d7a72743c03a 100644 --- a/chrome/browser/persisted_state_db/BUILD.gn +++ b/chrome/browser/persisted_state_db/BUILD.gn @@ -20,7 +20,6 @@ source_set("persisted_state_db") { @@ -2205,5 +2241,6 @@ diff --git a/chrome/browser/persisted_state_db/BUILD.gn b/chrome/browser/persist "//components/commerce/core:persisted_state_db_content_proto", "//components/keyed_service/content", "//components/leveldb_proto", --- -2.25.1 +-- +2.30.2 + diff --git a/build/patches/Remove-voice-recognition-integration.patch b/build/patches/Remove-voice-recognition-integration.patch index 4f1cffe0..60338c8e 100644 --- a/build/patches/Remove-voice-recognition-integration.patch +++ b/build/patches/Remove-voice-recognition-integration.patch @@ -28,7 +28,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java --- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java +++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java -@@ -374,8 +374,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. +@@ -420,8 +420,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. // Initialize // Note that isVoiceSearchEnabled will return false in incognito mode. @@ -38,7 +38,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/ boolean shouldShowLensButton = mOmniboxStub.isLensEnabled(LensEntryPoint.TASKS_SURFACE); LensMetrics.recordShown(LensEntryPoint.TASKS_SURFACE, shouldShowLensButton); mPropertyModel.set(IS_LENS_BUTTON_VISIBLE, shouldShowLensButton); -@@ -1073,10 +1072,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. +@@ -1176,10 +1175,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. // incorrect state if check synchronously. ThreadUtils.postOnUiThread(() -> { if (mOmniboxStub != null) { @@ -89,9 +89,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni - () - -> AssistantVoiceSearchService.reportStartupUserEligibility( - ContextUtils.getApplicationContext())); - deferredStartupHandler.addDeferredTask( - () -> GlobalAppLocaleController.getInstance().recordOverrideLanguageMetrics()); - deferredStartupHandler.addDeferredTask( + deferredStartupHandler.addDeferredTask(() -> { + GlobalAppLocaleController.getInstance().maybeSetupLocaleManager(); + GlobalAppLocaleController.getInstance().recordOverrideLanguageMetrics(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java @@ -331,15 +331,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java -@@ -46,7 +46,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxFeatures; - import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate; +@@ -50,7 +50,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate; import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils; import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener; + import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; -@@ -333,14 +332,12 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -343,14 +342,12 @@ public class SearchActivity extends AsyncInitializationActivity // will navigate to Tabbed mode. Investigate whether this can inflate // the tabbed mode layout in the background instead of CCTs. CustomTabsConnection.getInstance().warmup(0); @@ -355,7 +355,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se RecordUserAction.record("SearchWidget.WidgetSelected"); getActivityDelegate().onFinishDeferredInitialization(); -@@ -411,8 +408,7 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -421,8 +418,7 @@ public class SearchActivity extends AsyncInitializationActivity if (isFromQuickActionSearchWidget()) { recordQuickActionSearchType(searchType); } @@ -375,8 +375,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; import org.chromium.chrome.browser.toolbar.top.ToolbarPhone; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager; - import org.chromium.ui.base.DeviceFormFactor; -@@ -82,7 +81,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { + import org.chromium.components.browser_ui.styles.ChromeColors; +@@ -88,7 +87,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { /** Called when the SearchActivity has finished initialization. */ void onDeferredStartup(@SearchType int searchType, @@ -384,7 +384,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se @NonNull WindowAndroid windowAndroid) { mAutocompleteCoordinator.prefetchZeroSuggestResults(); -@@ -97,7 +95,7 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { +@@ -103,7 +101,7 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { } if (mPendingBeginQuery) { @@ -393,7 +393,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se mPendingBeginQuery = false; } } -@@ -106,12 +104,10 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { +@@ -112,12 +110,10 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { * Begins a new query. * @param searchType The type of search to invoke. * @param optionalText Prepopulate with a query, this may be null. @@ -406,7 +406,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se @NonNull WindowAndroid windowAndroid) { // Clear the text regardless of the promo decision. This allows the user to enter text // before native has been initialized and have it not be cleared one the delayed beginQuery -@@ -125,11 +121,10 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { +@@ -131,11 +127,10 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { return; } @@ -419,7 +419,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se @NonNull WindowAndroid windowAndroid) { assert !mPendingSearchPromoDecision; -@@ -139,7 +134,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { +@@ -145,7 +140,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { } if (searchType == SearchType.VOICE) { @@ -427,7 +427,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se } else if (searchType == SearchType.LENS) { runGoogleLens(windowAndroid); } else { -@@ -147,33 +141,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { +@@ -153,33 +147,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { } } @@ -461,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se /** * Begins a new Lens query. * -@@ -227,9 +194,4 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { +@@ -233,9 +200,4 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { mAutocompleteCoordinator.startCachedZeroSuggest(); }); } @@ -474,7 +474,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se 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 -@@ -88,7 +88,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate; +@@ -89,7 +89,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate; import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils; import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate; @@ -482,7 +482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar import org.chromium.chrome.browser.page_info.ChromePageInfo; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; -@@ -2041,11 +2040,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -2073,11 +2072,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve return mLocationBar.getOmniboxStub(); } @@ -497,7 +497,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar 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 -@@ -88,8 +88,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer; +@@ -91,8 +91,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer; import org.chromium.chrome.browser.omnibox.OmniboxFocusReason; import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate; @@ -506,7 +506,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; -@@ -269,7 +267,6 @@ public class RootUiCoordinator +@@ -272,7 +270,6 @@ public class RootUiCoordinator protected OneshotSupplierImpl mPromoShownOneshotSupplier = new OneshotSupplierImpl<>(); protected Supplier mStartSurfaceParentTabSupplier; @Nullable @@ -514,7 +514,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi private MediaCaptureOverlayController mCaptureController; private @Nullable ScrollCaptureManager mScrollCaptureManager; protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher; -@@ -544,9 +541,6 @@ public class RootUiCoordinator +@@ -547,9 +544,6 @@ public class RootUiCoordinator } if (mToolbarManager != null) { @@ -524,7 +524,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi mToolbarManager.destroy(); mToolbarManager = null; } -@@ -1084,19 +1078,11 @@ public class RootUiCoordinator +@@ -1092,19 +1086,11 @@ public class RootUiCoordinator new VoiceToolbarButtonController.VoiceSearchDelegate() { @Override public boolean isVoiceSearchEnabled() { @@ -545,7 +545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi } }; VoiceToolbarButtonController voiceToolbarButtonController = -@@ -1144,13 +1130,6 @@ public class RootUiCoordinator +@@ -1154,13 +1140,6 @@ public class RootUiCoordinator if (!mSupportsAppMenuSupplier.getAsBoolean()) { mToolbarManager.getToolbar().disableMenuButton(); } @@ -562,7 +562,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn --- a/chrome/browser/ui/android/omnibox/BUILD.gn +++ b/chrome/browser/ui/android/omnibox/BUILD.gn -@@ -123,12 +123,6 @@ android_library("java") { +@@ -127,12 +127,6 @@ android_library("java") { "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionView.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewProperties.java", @@ -601,15 +601,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow 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 -@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate; - import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate; +@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownEmbedder; + import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; -@@ -360,13 +359,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver, +@@ -368,13 +367,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver, return mLocationBarLayout.getSecurityIconView(); } @@ -623,7 +623,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Nullable @Override public OmniboxStub getOmniboxStub() { -@@ -632,11 +624,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver, +@@ -644,11 +636,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver, // End tablet-specific methods. @@ -712,7 +712,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow mLocationBarLayout.onFinishNativeInitialization(); setProfile(mProfileSupplier.get()); onPrimaryColorChanged(); -@@ -373,17 +351,6 @@ class LocationBarMediator +@@ -375,17 +353,6 @@ class LocationBarMediator mLocationBarLayout.setUnfocusedWidth(unfocusedWidth); } @@ -730,7 +730,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /* package */ void setLensControllerForTesting(LensController lensController) { mLensController = lensController; } -@@ -392,11 +359,6 @@ class LocationBarMediator +@@ -394,11 +361,6 @@ class LocationBarMediator sLastCachedIsLensOnOmniboxEnabled = null; } @@ -742,7 +742,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /* package */ void setIsUrlBarFocusedWithoutAnimationsForTesting( boolean isUrlBarFocusedWithoutAnimations) { mUrlFocusedWithoutAnimations = isUrlBarFocusedWithoutAnimations; -@@ -589,8 +551,6 @@ class LocationBarMediator +@@ -591,8 +553,6 @@ class LocationBarMediator /* package */ void micButtonClicked(View view) { if (!mNativeInitialized) return; RecordUserAction.record("MobileOmniboxVoiceSearch"); @@ -751,7 +751,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } /** package */ void lensButtonClicked(View view) { -@@ -936,28 +896,6 @@ class LocationBarMediator +@@ -938,28 +898,6 @@ class LocationBarMediator } } @@ -780,7 +780,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** * Update visuals to use a correct color scheme depending on the primary color. */ -@@ -1044,8 +982,7 @@ class LocationBarMediator +@@ -1046,8 +984,7 @@ class LocationBarMediator private boolean shouldShowMicButton() { if (shouldShowDeleteButton()) return false; @@ -790,7 +790,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow return false; } boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean(); -@@ -1203,9 +1140,6 @@ class LocationBarMediator +@@ -1241,9 +1178,6 @@ class LocationBarMediator public void onPrimaryColorChanged() { // This method needs to be called first as it computes |mBrandedColorScheme|. updateBrandedColorScheme(); @@ -800,7 +800,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } @Override -@@ -1277,16 +1211,6 @@ class LocationBarMediator +@@ -1315,16 +1249,6 @@ class LocationBarMediator } } @@ -817,7 +817,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Override public void addUrlFocusChangeListener(UrlFocusChangeListener listener) { mUrlFocusChangeListeners.addObserver(listener); -@@ -1302,37 +1226,10 @@ class LocationBarMediator +@@ -1340,37 +1264,10 @@ class LocationBarMediator return mUrlHasFocus; } @@ -855,7 +855,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow public void setSearchQuery(String query) { if (TextUtils.isEmpty(query)) return; -@@ -1351,17 +1248,14 @@ class LocationBarMediator +@@ -1389,17 +1286,14 @@ class LocationBarMediator mUrlCoordinator.setKeyboardVisibility(true, false); } @@ -909,7 +909,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; import org.chromium.components.omnibox.AutocompleteMatch; -@@ -247,24 +246,6 @@ public class AutocompleteController { +@@ -249,24 +248,6 @@ public class AutocompleteController { completedLength, webContents); } @@ -934,7 +934,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** * Updates aqs parameters on the selected match that we will navigate to and returns the * updated URL. -@@ -369,8 +350,6 @@ public class AutocompleteController { +@@ -371,8 +352,6 @@ public class AutocompleteController { long nativeAutocompleteControllerAndroid, int matchIndex, long elapsedTimeSinceInputChange, String newQueryText, String[] newQueryParams); Tab getMatchingTabForSuggestion(long nativeAutocompleteControllerAndroid, int matchIndex); @@ -946,7 +946,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java -@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionView +@@ -48,7 +48,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionView import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionViewBinder; import org.chromium.chrome.browser.omnibox.suggestions.tail.TailSuggestionView; import org.chromium.chrome.browser.omnibox.suggestions.tail.TailSuggestionViewBinder; @@ -954,7 +954,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -@@ -283,13 +282,6 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC +@@ -304,13 +303,6 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC mMediator.onNativeInitialized(); } @@ -971,7 +971,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -@@ -35,7 +35,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; +@@ -36,7 +36,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.OnSuggestionsReceivedListener; import org.chromium.chrome.browser.omnibox.suggestions.SuggestionsMetrics.RefineActionUsage; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; @@ -979,7 +979,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -@@ -378,14 +377,6 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, +@@ -398,14 +397,6 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, mShouldPreventOmniboxAutocomplete = prevent; } diff --git a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch index 60353324..94dde917 100644 --- a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch +++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -46,7 +46,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -168,6 +168,11 @@ android_resources("java_resources") { +@@ -171,6 +171,11 @@ android_resources("java_resources") { "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-mdpi/permission_background_sync.png", "java/res/drawable-mdpi/permission_javascript.png", @@ -219,7 +219,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 -@@ -127,6 +127,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -130,6 +130,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment return "cookies_permission_list"; case ContentSettingsType.FEDERATED_IDENTITY_API: return "federated_identity_api_list"; @@ -228,7 +228,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case ContentSettingsType.IDLE_DETECTION: return "idle_detection_permission_list"; case ContentSettingsType.JAVASCRIPT: -@@ -493,6 +495,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -504,6 +506,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment if (type == ContentSettingsType.ADS) { setUpAdsPreference(preference); @@ -237,7 +237,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.SOUND) { setUpSoundPreference(preference); } else if (type == ContentSettingsType.JAVASCRIPT) { -@@ -983,6 +987,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1020,6 +1024,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */); } @@ -308,7 +308,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 -@@ -213,6 +213,15 @@ public final class Website implements Serializable { +@@ -230,6 +230,15 @@ public final class Website implements WebsiteEntry { } else { RecordUserAction.record("JavascriptContentSetting.DisableBy.SiteSettings"); } @@ -327,7 +327,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/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java -@@ -61,6 +61,7 @@ public class WebsitePermissionsFetcher { +@@ -64,6 +64,7 @@ public class WebsitePermissionsFetcher { case ContentSettingsType.AUTOMATIC_DOWNLOADS: case ContentSettingsType.BACKGROUND_SYNC: case ContentSettingsType.BLUETOOTH_SCANNING: @@ -338,7 +338,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc -@@ -794,6 +794,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled( +@@ -825,6 +825,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled( case ContentSettingsType::REQUEST_DESKTOP_SITE: case ContentSettingsType::SENSORS: case ContentSettingsType::SOUND: @@ -368,7 +368,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -331,7 +331,7 @@ void ContentSettingsRegistry::Init() { +@@ -318,7 +318,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -392,7 +392,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -202,6 +202,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -203,6 +203,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( return content_type == ContentSettingsType::IMAGES || content_type == ContentSettingsType::JAVASCRIPT || content_type == ContentSettingsType::POPUPS || @@ -400,7 +400,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE; -@@ -215,6 +216,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -216,6 +217,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(mixed_content_rules, outermost_main_frame_url); FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); FilterRulesForType(timezone_override_rules, outermost_main_frame_url); @@ -502,7 +502,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 -@@ -99,6 +99,7 @@ ContentSettingsType kPermissionType[] = { +@@ -102,6 +102,7 @@ ContentSettingsType kPermissionType[] = { ContentSettingsType::ADS, ContentSettingsType::BACKGROUND_SYNC, ContentSettingsType::SOUND, @@ -510,7 +510,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. ContentSettingsType::AUTOMATIC_DOWNLOADS, #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ContentSettingsType::PROTECTED_MEDIA_IDENTIFIER, -@@ -142,6 +143,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, +@@ -145,6 +146,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, return is_subresource_filter_activated; } diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch index 83802c1f..4c9b5390 100644 --- a/build/patches/Site-setting-for-images.patch +++ b/build/patches/Site-setting-for-images.patch @@ -37,7 +37,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -160,6 +160,7 @@ android_resources("java_resources") { +@@ -163,6 +163,7 @@ android_resources("java_resources") { sources = [ "java/res/drawable-hdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-hdpi/permission_background_sync.png", @@ -45,7 +45,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-hdpi/permission_javascript.png", "java/res/drawable-hdpi/permission_javascript_jit.png", "java/res/drawable-hdpi/permission_popups.png", -@@ -168,6 +169,7 @@ android_resources("java_resources") { +@@ -171,6 +172,7 @@ android_resources("java_resources") { "java/res/drawable-hdpi/web_asset.png", "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-mdpi/permission_background_sync.png", @@ -53,7 +53,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-mdpi/permission_javascript.png", "java/res/drawable-mdpi/permission_javascript_jit.png", "java/res/drawable-hdpi/settings_autoplay.png", -@@ -181,6 +183,7 @@ android_resources("java_resources") { +@@ -184,6 +186,7 @@ android_resources("java_resources") { "java/res/drawable-mdpi/web_asset.png", "java/res/drawable-xhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xhdpi/permission_background_sync.png", @@ -61,7 +61,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-xhdpi/permission_javascript.png", "java/res/drawable-xhdpi/permission_javascript_jit.png", "java/res/drawable-xhdpi/permission_popups.png", -@@ -189,6 +192,7 @@ android_resources("java_resources") { +@@ -192,6 +195,7 @@ android_resources("java_resources") { "java/res/drawable-xhdpi/web_asset.png", "java/res/drawable-xxhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xxhdpi/permission_background_sync.png", @@ -69,7 +69,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-xxhdpi/permission_javascript.png", "java/res/drawable-xxhdpi/permission_javascript_jit.png", "java/res/drawable-xxhdpi/permission_popups.png", -@@ -197,6 +201,7 @@ android_resources("java_resources") { +@@ -200,6 +204,7 @@ android_resources("java_resources") { "java/res/drawable-xxhdpi/web_asset.png", "java/res/drawable-xxxhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xxxhdpi/permission_background_sync.png", @@ -211,7 +211,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 -@@ -131,6 +131,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -134,6 +134,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment return "autoplay_permission_list"; case ContentSettingsType.IDLE_DETECTION: return "idle_detection_permission_list"; @@ -220,7 +220,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case ContentSettingsType.JAVASCRIPT: return "javascript_permission_list"; case ContentSettingsType.JAVASCRIPT_JIT: -@@ -505,6 +507,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -516,6 +518,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setUpJavascriptPreference(preference); } else if (type == ContentSettingsType.GEOLOCATION) { setUpLocationPreference(preference); @@ -229,7 +229,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.JAVASCRIPT_JIT) { setUpJavascriptJitPreference(preference); } else if (type == ContentSettingsType.NOTIFICATIONS) { -@@ -1100,6 +1104,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1137,6 +1141,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment mSite.isEmbargoed(ContentSettingsType.REQUEST_DESKTOP_SITE)); } @@ -312,7 +312,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 -@@ -197,6 +197,13 @@ public final class Website implements Serializable { +@@ -214,6 +214,13 @@ public final class Website implements WebsiteEntry { /*isEmbargoed=*/false); setContentSettingException(type, exception); } @@ -329,7 +329,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/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java -@@ -64,6 +64,7 @@ public class WebsitePermissionsFetcher { +@@ -67,6 +67,7 @@ public class WebsitePermissionsFetcher { case ContentSettingsType.AUTOPLAY: case ContentSettingsType.COOKIES: case ContentSettingsType.FEDERATED_IDENTITY_API: @@ -340,7 +340,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc -@@ -789,6 +789,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled( +@@ -820,6 +820,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled( case ContentSettingsType::BACKGROUND_SYNC: case ContentSettingsType::COOKIES: case ContentSettingsType::FEDERATED_IDENTITY_API: @@ -361,7 +361,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen JavaScript -@@ -224,6 +227,9 @@ +@@ -232,6 +235,9 @@ Site %1$sgoogle.com added @@ -419,7 +419,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 -@@ -91,9 +91,7 @@ ContentSettingsType kPermissionType[] = { +@@ -94,9 +94,7 @@ ContentSettingsType kPermissionType[] = { ContentSettingsType::SENSORS, ContentSettingsType::NOTIFICATIONS, ContentSettingsType::JAVASCRIPT, @@ -427,9 +427,9 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. ContentSettingsType::IMAGES, -#endif ContentSettingsType::POPUPS, - ContentSettingsType::WINDOW_PLACEMENT, + ContentSettingsType::WINDOW_MANAGEMENT, ContentSettingsType::ADS, -@@ -149,6 +147,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, +@@ -152,6 +150,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, return true; } @@ -461,7 +461,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in - IDS_SITE_SETTINGS_TYPE_IMAGES_MID_SENTENCE}, {ContentSettingsType::SERIAL_GUARD, IDS_SITE_SETTINGS_TYPE_SERIAL_PORTS, IDS_SITE_SETTINGS_TYPE_SERIAL_PORTS_MID_SENTENCE}, - {ContentSettingsType::WINDOW_PLACEMENT, + {ContentSettingsType::WINDOW_MANAGEMENT, diff --git a/components/site_settings_strings.grdp b/components/site_settings_strings.grdp --- a/components/site_settings_strings.grdp +++ b/components/site_settings_strings.grdp diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index d1dffca0..0882d62c 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -63,8 +63,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C /** * A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic. */ -@@ -232,6 +236,18 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { - PrivacySandboxBridge.setFirstPartySetsDataAccessEnabled(enabled); +@@ -242,6 +246,18 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { + return PrivacySandboxBridge.getFirstPartySetOwner(memberOrigin); } + // open wiki page for documentation about the timezone override feature @@ -85,15 +85,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -83,6 +83,7 @@ android_library("java") { - "java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java", - "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreference.java", +@@ -8,6 +8,7 @@ generate_jni("site_settings_jni_headers") { + sources = [ + "java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsFeatureList.java", "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java", + "java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java" ] - annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] - resources_package = "org.chromium.components.browser_ui.site_settings" -@@ -211,6 +212,8 @@ android_resources("java_resources") { + } + +@@ -214,6 +215,8 @@ android_resources("java_resources") { "java/res/xml/single_website_preferences.xml", "java/res/xml/site_settings_preferences.xml", "java/res/xml/website_preferences.xml", @@ -510,7 +510,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 -@@ -135,6 +135,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -138,6 +138,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment return "popup_permission_list"; case ContentSettingsType.SOUND: return "sound_permission_list"; @@ -519,7 +519,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case ContentSettingsType.AR: return "ar_permission_list"; case ContentSettingsType.MEDIASTREAM_CAMERA: -@@ -897,11 +899,13 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -934,11 +936,13 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment if (value == null) return; setUpPreferenceCommon(preference, value); @@ -534,7 +534,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c switchPreference.setOnPreferenceChangeListener(this); @ContentSettingsType int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey()); -@@ -1100,7 +1104,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1137,7 +1141,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment } mSite.setContentSetting(browserContextHandle, type, permission); @@ -601,15 +601,15 @@ 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/SiteSettingsDelegate.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java -@@ -145,6 +145,8 @@ public interface SiteSettingsDelegate { +@@ -151,6 +151,8 @@ public interface SiteSettingsDelegate { */ void setFirstPartySetsDataAccessEnabled(boolean enabled); + void launchTimeZoneOverrideHelpAndFeedbackActivity(Activity currentActivity); + /** - * Returns whether the current implementation of the delegate is able to launch the Clear - * Browsing Data dialog in Settings. + * Gets the First Party Sets owner hostname given a FPS member origin. + * @param memberOrigin FPS member origin. diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java new file mode 100755 --- /dev/null @@ -811,7 +811,7 @@ new file mode 100755 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 -@@ -226,6 +226,17 @@ public final class Website implements Serializable { +@@ -243,6 +243,17 @@ public final class Website implements WebsiteEntry { } else { RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings"); } @@ -832,7 +832,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/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java -@@ -68,6 +68,7 @@ public class WebsitePermissionsFetcher { +@@ -71,6 +71,7 @@ public class WebsitePermissionsFetcher { case ContentSettingsType.POPUPS: case ContentSettingsType.REQUEST_DESKTOP_SITE: case ContentSettingsType.SOUND: @@ -840,19 +840,19 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c return WebsitePermissionsType.CONTENT_SETTING_EXCEPTION; case ContentSettingsType.AR: case ContentSettingsType.CLIPBOARD_READ_WRITE: -@@ -148,6 +149,8 @@ public class WebsitePermissionsFetcher { - for (@ContentSettingsType int type = 0; type < ContentSettingsType.NUM_TYPES; type++) { - addFetcherForContentSettingsType(queue, type); - } +@@ -151,6 +152,8 @@ public class WebsitePermissionsFetcher { + * @param category A category to fetch. + * @param callback The callback to run when the fetch is complete. + * + queue.add(new ExceptionInfoFetcher(ContentSettingsType.TIMEZONE_OVERRIDE)); + - queue.add(new PermissionsAvailableCallbackRunner(callback)); - queue.next(); - } + */ + public void fetchPreferencesForCategory( + SiteSettingsCategory category, WebsitePermissionsCallback callback) { diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java -@@ -222,6 +222,8 @@ public class WebsitePreferenceBridge { +@@ -243,6 +243,8 @@ public class WebsitePreferenceBridge { switch (contentSettingsType) { case ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER: return true; @@ -861,7 +861,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c default: return false; } -@@ -371,6 +373,14 @@ public class WebsitePreferenceBridge { +@@ -392,6 +394,14 @@ public class WebsitePreferenceBridge { return WebsitePreferenceBridgeJni.get().toHostOnlyPattern(pattern); } @@ -876,7 +876,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c @NativeMethods public interface Natives { boolean isNotificationEmbargoedForOrigin( -@@ -434,5 +444,7 @@ public class WebsitePreferenceBridge { +@@ -456,5 +466,7 @@ public class WebsitePreferenceBridge { boolean getLocationAllowedByPolicy(BrowserContextHandle browserContextHandle); String toDomainWildcardPattern(String pattern); String toHostOnlyPattern(String pattern); @@ -887,7 +887,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc -@@ -985,3 +985,19 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern( +@@ -1016,3 +1016,19 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern( ContentSettingsPattern::FromString(pattern_string)); return ConvertUTF8ToJavaString(env, host_only_pattern.ToString()); } @@ -920,7 +920,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen Desktop site -@@ -563,6 +566,38 @@ +@@ -587,6 +590,38 @@ Block sites from playing protected content @@ -962,7 +962,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen 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 -@@ -88,6 +88,8 @@ void PrefProvider::RegisterProfilePrefs( +@@ -90,6 +90,8 @@ void PrefProvider::RegisterProfilePrefs( info->GetPrefRegistrationFlags()); } @@ -971,7 +971,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov // Obsolete prefs ---------------------------------------------------------- // These prefs have been removed, but need to be registered so they can -@@ -175,6 +177,10 @@ PrefProvider::PrefProvider(PrefService* prefs, +@@ -178,6 +180,10 @@ PrefProvider::PrefProvider(PrefService* prefs, event_args->set_number_of_exceptions( num_exceptions); // PrefProvider::PrefProvider. }); @@ -982,7 +982,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov } PrefProvider::~PrefProvider() { -@@ -338,4 +344,14 @@ void PrefProvider::SetClockForTesting(base::Clock* clock) { +@@ -342,4 +348,14 @@ void PrefProvider::SetClockForTesting(base::Clock* clock) { clock_ = clock; } @@ -1021,7 +1021,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov 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 -@@ -658,6 +658,18 @@ void ContentSettingsRegistry::Init() { +@@ -645,6 +645,18 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); @@ -1091,7 +1091,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -203,7 +203,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -204,7 +204,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::JAVASCRIPT || content_type == ContentSettingsType::POPUPS || content_type == ContentSettingsType::MIXEDSCRIPT || @@ -1101,7 +1101,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -213,6 +214,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -214,6 +215,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(popup_redirect_rules, outermost_main_frame_url); FilterRulesForType(mixed_content_rules, outermost_main_frame_url); FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); @@ -1168,7 +1168,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -225,6 +225,9 @@ enum class ContentSettingsType : int32_t { +@@ -226,6 +226,9 @@ enum class ContentSettingsType : int32_t { // by the File System Access API. FILE_SYSTEM_LAST_PICKED_DIRECTORY,