From d65fe20581d33e217c401111b66fc96b44daebfd Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 10 Sep 2020 18:12:22 +0200 Subject: [PATCH 001/152] Update patches from Chromium 86.0.4240.111 to Chromium 87.0.4250.0. --- patches/base-BUILD.gn.patch | 4 ++-- ...build-config-android-internal_rules.gni.patch | 4 ++-- patches/build-config-android-rules.gni.patch | 2 +- patches/build-config-compiler-BUILD.gn.patch | 2 +- .../build-toolchain-win-setup_toolchain.py.patch | 4 ++-- patches/chrome-BUILD.gn.patch | 2 +- patches/chrome-VERSION.patch | 8 ++++---- .../chrome-android-chrome_java_sources.gni.patch | 4 ++-- ...rome-android-chrome_public_apk_tmpl.gni.patch | 2 +- ...chrome-android-java-AndroidManifest.xml.patch | 2 +- ...hrome-browser-ChromeTabbedActivity.java.patch | 10 +++++----- ...-chrome-browser-app-ChromeActivity.java.patch | 4 ++-- ...rome-browser-settings-MainSettings.java.patch | 2 +- ...e-browser-sync-AndroidSyncSettings.java.patch | 2 +- ...c-settings-SyncAndServicesSettings.java.patch | 2 +- ...r-bottom-BottomControlsCoordinator.java.patch | 9 +++++---- patches/chrome-app-BUILD.gn.patch | 6 +++--- patches/chrome-browser-BUILD.gn.patch | 6 +++--- patches/chrome-browser-about_flags.cc.patch | 6 +++--- .../chrome-browser-browser_process_impl.h.patch | 4 ++-- ...browser-chrome_content_browser_client.h.patch | 4 ++-- patches/chrome-browser-extensions-BUILD.gn.patch | 4 ++-- ...-browser-extensions-extension_service.h.patch | 4 ++-- ...er-flags-android-chrome_feature_list.cc.patch | 4 ++-- ...dia-webrtc-webrtc_event_log_uploader.cc.patch | 2 +- ...ns-notification_display_service_impl.cc.patch | 4 ++-- ...-notification_platform_bridge_android.h.patch | 4 ++-- .../chrome-browser-prefs-browser_prefs.cc.patch | 6 +++--- ...rome-browser-profiles-profile_manager.h.patch | 4 ++-- ...hrome-browser-profiles-profile_window.h.patch | 2 +- ...ontext_menu-render_view_context_menu.cc.patch | 2 +- ...context_menu-render_view_context_menu.h.patch | 2 +- ...ome-browser-resources-settings-BUILD.gn.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 4 ++-- patches/chrome-browser-ui-chrome_pages.cc.patch | 4 ++-- ...startup-startup_browser_creator_impl.cc.patch | 4 ++-- ...ui-views-bookmarks-bookmark_bar_view.cc.patch | 2 +- ...views-bookmarks-bookmark_bubble_view.cc.patch | 2 +- ...views-location_bar-location_bar_view.cc.patch | 2 +- ...i-views-outdated_upgrade_bubble_view.cc.patch | 2 +- ...-browser-ui-views-tabs-new_tab_button.h.patch | 2 +- ...rowser-ui-views-toolbar-toolbar_view.cc.patch | 4 ++-- ...browser-ui-views-toolbar-toolbar_view.h.patch | 10 +++++----- ...-views-update_recommended_message_box.h.patch | 2 +- ...bui-chrome_web_ui_controller_factory.cc.patch | 4 ++-- ...-settings_localized_strings_provider.cc.patch | 4 ++-- ...-webui-settings-site_settings_helper.cc.patch | 4 ++-- ...hrome_authenticator_request_delegate.cc.patch | 4 ++-- patches/chrome-renderer-BUILD.gn.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 4 ++-- ...owser_ui-site_settings-android-BUILD.gn.patch | 6 +++--- ...te_settings-SingleCategorySettings.java.patch | 4 ++-- ...ent_updater-component_updater_service.h.patch | 2 +- ...-content_settings-core-browser-BUILD.gn.patch | 4 ++-- ...re-browser-content_settings_registry.cc.patch | 4 ++-- ...-policy-tools-generate_policy_source.py.patch | 4 ++-- patches/components-sync-BUILD.gn.patch | 2 +- ...rowser-frame_host-navigation_request.cc.patch | 2 +- patches/content-common-BUILD.gn.patch | 2 +- ...public-browser-content_browser_client.h.patch | 4 ++-- .../content-renderer-render_thread_impl.cc.patch | 4 ++-- ...xtensions-browser-sandboxed_unpacker.cc.patch | 4 ++-- patches/net-BUILD.gn.patch | 2 +- ...ervices-network-public-cpp-cors-cors.cc.patch | 2 +- ...rty-blink-renderer-core-dom-document.cc.patch | 2 +- ...tml-canvas-canvas_async_blob_creator.cc.patch | 2 +- ...core-html-canvas-html_canvas_element.cc.patch | 4 ++-- ...d_party-blink-renderer-modules-BUILD.gn.patch | 4 ++-- ...s-canvas2d-base_rendering_context_2d.cc.patch | 6 +++--- ...as-canvas2d-base_rendering_context_2d.h.patch | 4 ++-- ...anvas2d-canvas_rendering_context_2d.idl.patch | 2 +- ...fscreen_canvas_rendering_context_2d.idl.patch | 2 +- ...-renderer-modules-modules_idl_files.gni.patch | 4 ++-- ...s-webgl-webgl_rendering_context_base.cc.patch | 16 ++++++++-------- .../tools-gritsettings-resource_ids.spec.patch | 4 ++-- patches/tools-licenses.py.patch | 4 ++-- ...tools-metrics-histograms-histograms.xml.patch | 4 ++-- patches/ui-base-BUILD.gn.patch | 2 +- 78 files changed, 148 insertions(+), 147 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index f97f47fd76b4..822ef217507b 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index b2a25c8c376c3f522efaef4de558209059300770..70dc0a9c6686ed5b7dd6ec12c704a29cb4e0dbd7 100644 +index 123c0998a7e20532c9ed02fbbe0606e142fc9916..437fde79796f5a5e2949cddd1511e15cbc1ea2ab 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3634,6 +3634,7 @@ if (is_android) { +@@ -3648,6 +3648,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index f6cb76f36de1..5583a5f63ecf 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 59c9a5555a43cf150e48f699c45a46a3a643f91b..6bab69edb7339a9c2cc2dc467a4c59411026724b 100644 +index 9d587046dcb4e232fb6d3f0e624ded33ccf797eb..516a12a81926b263f6807b8e34385d09e48ec2b8 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -2002,6 +2002,7 @@ if (enable_java_templates) { +@@ -2010,6 +2010,7 @@ if (enable_java_templates) { _deps = [ ":$_desugar_target" ] _previous_output_jar = _desugar_output_jar } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 121e1daa1bca..44c65eed4178 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 0cd77fbd18390ff4d6bc6e682fd1917a9374f08a..4150aa4653c27e5cc0abbb780e9022d028127203 100644 +index 232fd4e136978d9c6b0737c336613ab8be9e4823..bd31bf57e346fab5ca2bfb6d6df4ea7ce8365057 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -513,6 +513,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 8e6746e6d702..c2350f5f873d 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index bafffe27168dbbc1f7e9b87beeca923f61a57abb..f972ee5a69709cab4fc7673f81ace391efbd22f5 100644 +index 3e7965ce9cda2daefe9a7b400ceb78c431820d3e..1333b28af26b8b4bbd146c22f5ed402f372dc544 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -1651,6 +1651,7 @@ config("chromium_code") { diff --git a/patches/build-toolchain-win-setup_toolchain.py.patch b/patches/build-toolchain-win-setup_toolchain.py.patch index 4af5335ec38b..aadb025bbdf0 100644 --- a/patches/build-toolchain-win-setup_toolchain.py.patch +++ b/patches/build-toolchain-win-setup_toolchain.py.patch @@ -1,8 +1,8 @@ diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py -index d9cd612975482ad2fc3e1c1e3596aaaf13026c1c..a67edaa47a0d2877712a58f488038ac10b205060 100644 +index 58bf3e8caf4e0a0fdcba03c5b8bf72b30ea8f075..81e1ccc1b8ccff4ebce2b93519ceaa5975f5a55f 100644 --- a/build/toolchain/win/setup_toolchain.py +++ b/build/toolchain/win/setup_toolchain.py -@@ -271,6 +271,7 @@ def main(): +@@ -277,6 +277,7 @@ def main(): return s if re.match(r'^[a-zA-Z0-9._/\\:-]*$', s) else '"' + s + '"' include_I = ' '.join([q('/I' + i) for i in include]) include_imsvc = ' '.join([q('-imsvc' + i) for i in include]) diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 04514cfe488b..63f2fff3bfef 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 5670687f18f166da366afba61f7bbc3ecdf48acb..dbe4292308a80e59ccb205d8c02f401668f79311 100644 +index 14a04f524e5df852bd6aa8c54d6c1acc23dcbc34..b5d85119dfc4bb6d5d56861982adfaf38420aaa9 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -146,6 +146,10 @@ if (!is_android && !is_mac) { diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 989a02dd53ef..56651aafe2a1 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index bb9a694c062d57f0328c30adbf8c378984e41d59..66a71641a95259a6bd786ba63636b70a66719a6b 100644 +index 6302e35c0707d876cf13a7cbda36de57f129c5d1..447df60a123e181673e2de32617afadcb37deb8a 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=86 + MAJOR=87 -MINOR=0 --BUILD=4240 --PATCH=111 +-BUILD=4250 +-PATCH=0 +MINOR=1 +BUILD=18 +PATCH=15 diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 65be0cdcb2bc..da9794860f93 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index ea7a83b636a33fa7bf6380e857c4288fdb6f276f..0b187965ba4954970e5c2e6e97a83fc99b81b31d 100644 +index 9045605246b8480be2269d170eae2fd69f20a6d6..9cee02b6113f81324948b6bc47ef9763871a39f8 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1741,3 +1741,4 @@ chrome_java_sources = [ +@@ -1716,3 +1716,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", "java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java", ] diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 54a63384b8b3..d0c1f19bb15c 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index d029559d9d1fcf131531df53d45d01f46c8a7fba..f1ef434f59c61146e2fb6604072c2fc3343ad6da 100644 +index ca09cd7c9144e5e3b33338bbcf9e1555f7c7b3f4..1bffd2f1d4794cd58870d15aa292eb570b0734d1 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -216,6 +216,7 @@ template("chrome_public_common_apk_or_module_tmpl") { diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index d3f3b886a639..ebf748712d29 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 74dd5f9e6458f7e6b9a86d840d3a90fdded7f21b..565aa6e0f2aa6a534b9f693fcb9877f75b885798 100644 +index 4bd3fafc8f176a7597854430a9155151ea4be227..1ed2a2c9172b1f05b38ac31cb982dccac78f0ee2 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -34,7 +34,9 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index a539382e8b3b..1c9d7298265a 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index a3deba245350c3ac9b22b05fba68f87775bb8f80..0df32632a25ec34490ce8459796607632361150a 100644 +index d6040e241c95c15981d2e8bbee9d3e95dbb5d6bb..af9bde84e67c55af7091214640e084d1e3eebcfd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java @@ -182,7 +182,7 @@ import java.util.Locale; @@ -11,7 +11,7 @@ index a3deba245350c3ac9b22b05fba68f87775bb8f80..0df32632a25ec34490ce845979660763 implements ChromeAccessibilityUtil.Observer { private static final String TAG = "ChromeTabbedActivity"; -@@ -996,7 +996,7 @@ public class ChromeTabbedActivity extends ChromeActivity( @@ -20,7 +20,7 @@ index a3deba245350c3ac9b22b05fba68f87775bb8f80..0df32632a25ec34490ce845979660763 assert profile != null : "Unexpectedly null profile from TabModel."; if (profile == null) return; -@@ -1588,7 +1588,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -318,7 +318,7 @@ public abstract class ChromeActivity NightModeReparentingController mNightModeReparentingController; protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch index 9d96913fc59a..caa7a04c578b 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -index 49bcf7e55674ba54271a76b8d3b32e731860b36e..5d7cd965c87e1a68dce2ef160153db1ae312090a 100644 +index 83b6c2719c42a2f1d0c8777fc9b15f62431bedca..282d617879a0303f81d5561d5703573f819f41cd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java @@ -50,7 +50,7 @@ import java.util.Map; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch index fa39ea8198e6..88a504e24faf 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java -index a222631bf18ed27f1854fcc07a288b6f5e6120e0..1aed5c3d25c6243fab82b4ca2211f60b6368803f 100644 +index a3ca9aea044fce0f7a8a8e87bafbf321b92948fe..aea2bfa90060cb900dbabf4b01a5b8679df57483 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java @@ -73,7 +73,7 @@ public class AndroidSyncSettings { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch index 64eb25916375..b3f7072cbbfd 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java -index 4240e3e3cc69b0cc02902ac25bb260c6e0e4987a..15d9b8a6f8251e271ad2406e225bcbcc52ed8b74 100644 +index b0ab35192a4c5e6a29b4cd47cca4a3dfc0536d41..b474666e588bb65364d67b6b00ce12ebdf4b1db5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java @@ -76,7 +76,7 @@ import org.chromium.ui.widget.ButtonCompat; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch index 7cf1f54acad0..7accca426f27 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -index fdca8057859857c09c570516c33095ac1b6639a9..952c3c7879a26e86ff2b64ce2cfaa63d1a754847 100644 +index 5c6f0f445fe20e45d8dfe950ef19556fe1c8caaf..6004ca0ba2c2bb3cbf45a91400fd4085aaab5364 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java @@ -120,7 +120,7 @@ public class BottomControlsCoordinator { @@ -11,9 +11,10 @@ index fdca8057859857c09c570516c33095ac1b6639a9..952c3c7879a26e86ff2b64ce2cfaa63d root.findViewById(R.id.bottom_toolbar_stub), tabProvider, tabSwitcherLongclickListener, themeColorProvider, shareDelegateSupplier, showStartSurfaceCallable, openHomepageAction, setUrlBarFocusAction, -@@ -207,4 +207,5 @@ public class BottomControlsCoordinator { - } - return mTabGroupUi.getTabGridDialogVisibilitySupplier(); +@@ -197,4 +197,6 @@ public class BottomControlsCoordinator { + if (mTabGroupUi != null) mTabGroupUi.destroy(); + mMediator.destroy(); } ++ + public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) {if (mBottomToolbarCoordinator != null) { mBottomToolbarCoordinator.updateBookmarkButton(isBookmarked, editingAllowed);}} } diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 7f8ecdf4a9f5..e3df76c868a2 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index 25423aabc06fea888727bec369c74056a0b8db31..d38ce64e036b82b774ff0e3bac826998b0160364 100644 +index 540adb223864d02d3ce575370fef157bb1aad6cb..58af33ca5aa1994cabf07b2d434bbf1b1f86ad21 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn -@@ -73,6 +73,8 @@ grit("generated_resources") { +@@ -74,6 +74,8 @@ grit("generated_resources") { if (is_android) { outputs += android_generated_java_resources } @@ -11,7 +11,7 @@ index 25423aabc06fea888727bec369c74056a0b8db31..d38ce64e036b82b774ff0e3bac826998 } if (is_android) { -@@ -95,7 +97,7 @@ grit("google_chrome_strings") { +@@ -96,7 +98,7 @@ grit("google_chrome_strings") { } grit("chromium_strings") { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 1dad36e527e8..57bacc4f009e 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 98ae3acaf7cf5fbfae0e4c2e0ddb8a087e6d6e23..fd339ae93d51f85cb850035d6bc0fc896ae05cdc 100644 +index 0b8467866c5a128f881c44429e61c96e405853d5..a600dbc4e8bd52a9219aeb4611e9b9dba80ef7a7 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2194,6 +2194,7 @@ static_library("browser") { +@@ -2190,6 +2190,7 @@ static_library("browser") { "//ui/strings", "//ui/surface", "//ui/web_dialogs", @@ -10,7 +10,7 @@ index 98ae3acaf7cf5fbfae0e4c2e0ddb8a087e6d6e23..fd339ae93d51f85cb850035d6bc0fc89 ] if (build_with_tflite_lib) { -@@ -3878,6 +3879,7 @@ static_library("browser") { +@@ -4001,6 +4002,7 @@ static_library("browser") { "task_manager/sampling/shared_sampler_posix.cc", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index f506f6f053af..c26d53ef0963 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 111807a9bdf6c740e98831b0b618efeb9972119a..2820848b25bc360f0275491e3b4b1e9afe8e2a4a 100644 +index 173fd01b13159de6eaf3c0dfab53c0638678c905..a0eadecae8c7ec145878e216e21e395e9e1c0877 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -293,14 +293,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -294,14 +294,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -21,7 +21,7 @@ index 111807a9bdf6c740e98831b0b618efeb9972119a..2820848b25bc360f0275491e3b4b1e9a const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -6377,6 +6377,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6469,6 +6469,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 2ce530a661d7..0f3ca4c6b644 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index 124ebbf06ea22f041040bde3c34bd7f49e10e365..ca05f540da33a6bd5cd1c4d1ce47c93430dc66af 100644 +index f22581ef5d5cf31c1bc9d8660ccbb71d9b96f870..e1f96733790ee47d037a7cbce1798521f91a4789 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -198,6 +198,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -200,6 +200,7 @@ class BrowserProcessImpl : public BrowserProcess, static void RegisterPrefs(PrefRegistrySimple* registry); private: diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index 6bd5e7337e50..f38085a23a50 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index a47818dc2f0f7b1f395f377f3c879299597e7be8..84ad4a4d05a8d98240fde76acabdf42ed2261e79 100644 +index c8fec14e4e05b7bd9196ed3c38f2e6529ba49539..1a8ea31bc7018ae1aa216f8bb5858af760a0c1d7 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -705,6 +705,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -704,6 +704,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index c8d9bfcb1119..6f0273c9e9da 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index af74217ca9433f731265aafa346dbf3aff88a6a6..90885afc22addfe3f9ff1a95885c13ea3397acdd 100644 +index e0cc4ef2067e4631206939b404d3dcb0d2bb32ee..ecb8fcb3313acd449500ee1d65b40b39da5105eb 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1264,6 +1264,7 @@ static_library("extensions") { +@@ -1260,6 +1260,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-extension_service.h.patch b/patches/chrome-browser-extensions-extension_service.h.patch index 60903f44f726..ac6ab73a35c5 100644 --- a/patches/chrome-browser-extensions-extension_service.h.patch +++ b/patches/chrome-browser-extensions-extension_service.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h -index fdd2211fefaf5e7ffa580a0a170ad21f633f5f2d..203454a82a2d927a1ee9743c50b33f94b929ad17 100644 +index d8a9e12213f935fcfad39a2b5210321015ffc9a8..72d81dce3d73b19574c2911c1da227ea67af859e 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h -@@ -445,6 +445,7 @@ class ExtensionService : public ExtensionServiceInterface, +@@ -446,6 +446,7 @@ class ExtensionService : public ExtensionServiceInterface, static base::AutoReset DisableExternalUpdatesForTesting(); private: diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index be815ea2bbe4..224c28eb7f10 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index c2550f9f8ad08b9eb39e654c54d5845848d9e66b..7a5c9e3b1ae3ee4e438d62fbaeac8a5160646482 100644 +index f36faa5ed8389edfce220f03b823c99490a05b05..4d338f707c61fc821247f48f560486aac3f705fb 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -275,6 +275,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -274,6 +274,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-media-webrtc-webrtc_event_log_uploader.cc.patch b/patches/chrome-browser-media-webrtc-webrtc_event_log_uploader.cc.patch index e9545e357446..58aa7e7840f1 100644 --- a/patches/chrome-browser-media-webrtc-webrtc_event_log_uploader.cc.patch +++ b/patches/chrome-browser-media-webrtc-webrtc_event_log_uploader.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -index 6327f0af949d5301af5d3f94d011f45efc4da7a0..c1333637659c4654aab6eb24bda87afcba45ef87 100644 +index a0e329f03da32d3697a4d484eec846393b106997..ec4b2ac9a46811f8122b8d6e711378af7687e55e 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -274,6 +274,7 @@ bool WebRtcEventLogUploaderImpl::PrepareUploadData(std::string* upload_data) { diff --git a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch index e391df7c8bc9..bcb1c40fc918 100644 --- a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch +++ b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc -index 73ad845380e82fc015e810751fdf52d51c118849..2caf87c091627a8c26a0caf71efce79677dd0cc8 100644 +index 88ffe9bc4615a4a5b49f48be775e93e7795606a6..cfe0abb65933e56f40fc7a06a4a8d7eeb9e9fc0b 100644 --- a/chrome/browser/notifications/notification_display_service_impl.cc +++ b/chrome/browser/notifications/notification_display_service_impl.cc -@@ -175,6 +175,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) +@@ -177,6 +177,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) std::make_unique()); } #endif diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_android.h.patch b/patches/chrome-browser-notifications-notification_platform_bridge_android.h.patch index 485d0812abda..3fe11caa459e 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_android.h.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_android.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_android.h b/chrome/browser/notifications/notification_platform_bridge_android.h -index d6fc39db68ca00a816401b9f3bfeb38043eaee1c..0585d6e1cdfcad122a6689dd54a2d5ce9f197ba9 100644 +index 7ff354723b9d14c43b9dd7dd2679f36ab8e66f79..ffb5f27cbc4f7d5f826e4717c9a6d6914abb1949 100644 --- a/chrome/browser/notifications/notification_platform_bridge_android.h +++ b/chrome/browser/notifications/notification_platform_bridge_android.h -@@ -85,6 +85,7 @@ class NotificationPlatformBridgeAndroid : public NotificationPlatformBridge { +@@ -88,6 +88,7 @@ class NotificationPlatformBridgeAndroid : public NotificationPlatformBridge { static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); private: diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 33b83975f6ff..6e0f7f5a94f3 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 6147d6dde0e57340b5c747b4f0126f2ee32d3d87..58e54c9651150688eca97fd691794a78e819ca09 100644 +index a2d024ce331c43dc1612224547467c052c869783..22b6d1aa7aa728a8738008dc6fadafd312b45824 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -868,6 +868,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -867,6 +867,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 6147d6dde0e57340b5c747b4f0126f2ee32d3d87..58e54c9651150688eca97fd691794a78 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1140,6 +1141,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1138,6 +1139,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index 43c4449d3cc3..63f61c6b2f3f 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index 93571e41925382f70d6a2c6218257f14574f7f3b..0fabed6c6f2d115ad8daa11568247742508de185 100644 +index 1bb2d7aedf9f5f812bd28a4d5d404390f9adbce8..5ae7e698d54f2a733e3432960923a43c555f7cbf 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -270,6 +270,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -271,6 +271,7 @@ class ProfileManager : public content::NotificationObserver, void set_do_final_services_init(bool do_final_services_init) { do_final_services_init_ = do_final_services_init; } diff --git a/patches/chrome-browser-profiles-profile_window.h.patch b/patches/chrome-browser-profiles-profile_window.h.patch index 4fdeeaa8b3c9..4f18c049d4cd 100644 --- a/patches/chrome-browser-profiles-profile_window.h.patch +++ b/patches/chrome-browser-profiles-profile_window.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_window.h b/chrome/browser/profiles/profile_window.h -index 6ba35ca6f4384892e87a132567fda82834d62b36..b17f08c9bbf4fc03ee328c34e7183037b484da13 100644 +index 2ee8d99e1804f91aedce6e3e9cfbf278ad53f963..e870befafe4c90c3caa4c8041b5b483d8336f706 100644 --- a/chrome/browser/profiles/profile_window.h +++ b/chrome/browser/profiles/profile_window.h @@ -85,6 +85,7 @@ void SwitchToProfile(const base::FilePath& path, diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 252f3d1f307f..b8130c2c8d7e 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 4a504963dc1174f9a3f02802dbd3807da3c07172..123d23a3435721cbdfd4663a7a50b94910f11206 100644 +index 9e827b4ea6f8346d2770a1d3c4fa41fd925e79db..37d8da2dd9b830e0b75497a042fc4f4d059f2844 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -1609,6 +1609,7 @@ void RenderViewContextMenu::AppendSearchProvider() { diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index 6a591608dfe3..db7e4cccd400 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index 9da13ac1bed219bad6fde529ac23ad99909f4d3a..845c6d0fccf874fabbc4829d660a510448d8119d 100644 +index 140c0383695189fe5eaa4e89fe8a9cd3ff1c4a6a..da4e7adf66ccea755974d9a013e0f3083588eb3c 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -119,6 +119,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 10333c72cfc1..f5c7b1347667 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 80ce6474e7b5279433cfc22a9d0a6403717cb606..751642e29d9192d46417c41eb01d52783c0724e0 100644 +index 3111f58d58e3ef9a8b5b7a98aad2aeceaa2e09c7..c766ad819d029ab7907128632068f4ae209378e6 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn @@ -31,6 +31,7 @@ if (optimize_webui) { diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index ec256de09c85..11a7938a49e3 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 15657bbf7f7bb41db9e61a314f644ca091a1bbff..f6ba173bca943f90f7355541686228abd30057ea 100644 +index b77094512b19f66f788bae704aa0e4e97ba7ae20..b1a4877f8d9523993736e3ec75a1a8c5e13c5c76 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -590,6 +590,7 @@ static_library("ui") { @@ -10,7 +10,7 @@ index 15657bbf7f7bb41db9e61a314f644ca091a1bbff..f6ba173bca943f90f7355541686228ab allow_circular_includes_from += [ "//chrome/browser/ui/webui/bluetooth_internals" ] -@@ -3092,10 +3093,13 @@ static_library("ui") { +@@ -3120,10 +3121,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index bb4703abf9ca..eb10155684f4 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index c988ba9c4101ee947de2bed7288222875bbdf944..b6172ac9accef6dbeb9442cdd81195a3f0e5de01 100644 +index 647a6b47ff9b84d3a72ffc9d452bcb87aa6195c2..fb997887da8eb06d5eb0473f69318d5c556de6d7 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -369,7 +369,7 @@ void ShowSlow(Browser* browser) { +@@ -377,7 +377,7 @@ void ShowSlow(Browser* browser) { #endif } diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 23973068819a..4471c4b5fe7a 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index e25bf88aa86d90584d1f1777bfa1debd48fa6b2f..1e5ab0e612193c58dfcc320c4a47da609486a145 100644 +index baee6546523bcbe6e0602775d58d54c22b5500ac..d0062665c076080bcdc4d165a87d957b96c2bb10 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -665,6 +665,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -666,6 +666,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); #endif // !defined(OS_CHROMEOS) diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 07a17866f25a..22c5105267b1 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 94dabd4ed766614e61541ea248b42c0c9fc7ebba..594954ec78feaa024c5c3e97d3e2b87b627f8983 100644 +index fe2c5e1609435187ab74c66df0638d99d7fbef3b..792e78fb1465002fd79143dbe7eff93324422200 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -844,6 +844,7 @@ void BookmarkBarView::Layout() { diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch index bfb35564402d..1f536a38b91e 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -index 71cd964ce9c9968410426e033f70bb5169f97824..4433726b4a5bfef828317963e53f0027ff0dadd7 100644 +index 5de4a098f5cc86dec32a2fa01eb3f688dae9bfdb..02a3af943065bccaced6349c60947d464bffe28a 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -229,6 +229,7 @@ void BookmarkBubbleView::ShowBubble( diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index 10269b216786..4699c9f702df 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 5d2b59f118785cf8265afd0d37d18985f5df8fa6..03c733f97feb72dff446ea6db3ec89d346750499 100644 +index 2576da658078baa1c210e8bc13f34827b316cd1e..b441b00114ab7cafb1cfd48a5df2e7bf19b53c64 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -568,6 +568,7 @@ void LocationBarView::Layout() { diff --git a/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch b/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch index 9b2828023ee1..67c8e696586f 100644 --- a/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc -index 287148a84b29aa6173c63a599a3d27f65f2e9049..d4360a1c7d2a310a7d89450536091082bd3bdc87 100644 +index 8d5927f53d324f05a7adb88922de05c3699ccd05..3479a202d0b5b31da7bc9ee36defa38da2f056a6 100644 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc @@ -37,8 +37,12 @@ namespace { diff --git a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch index 729b1c739ffe..e1675f685a4c 100644 --- a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch +++ b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/new_tab_button.h b/chrome/browser/ui/views/tabs/new_tab_button.h -index 4449616b6e1bfbabe0691ed57360ef94187c0a98..5cfca43ae41ceb45ad064f3eebcea4066d9fa519 100644 +index ee8566dae908581c8be0eb6680dff1a78ade35fb..fd221468d234d1701f19f4fe6543e9182309b821 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.h +++ b/chrome/browser/ui/views/tabs/new_tab_button.h @@ -45,6 +45,7 @@ class NewTabButton : public views::ImageButton, diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index ce089fba34fa..1e56564462df 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 7ccd06a9b0fea22db5f6427207639dd60178c14c..1a71c1deab569404357ab44fb49c0d6229eda542 100644 +index f69ad82885c4dd582895896983930bda3331be35..1cb71f892c156563810b330a783d0e208c9eb0f6 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -286,7 +286,7 @@ void ToolbarView::Init() { +@@ -275,7 +275,7 @@ void ToolbarView::Init() { } else { // TODO(crbug.com/932818): Remove this once the // |kAutofillEnableToolbarStatusChip| is fully launched. diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch index c86557e6216e..a99fe7af5b97 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h -index f4af66fa98b30f80689e0f8776596af720c3fb75..ceeffeafa6603911b2bb84ccb75bc4223ffa028e 100644 +index 21510da06867ca1e2b286010c44be71d33ae5168..1e039e2a559aaf6d767abdd1ce0c3d39fda6f8bf 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h -@@ -94,12 +94,14 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -93,12 +93,14 @@ class ToolbarView : public views::AccessiblePaneView, ~ToolbarView() override; // Create the contents of the Browser Toolbar. @@ -17,7 +17,7 @@ index f4af66fa98b30f80689e0f8776596af720c3fb75..ceeffeafa6603911b2bb84ccb75bc422 void Update(content::WebContents* tab); // Updates the visibility of the custom tab bar, potentially animating the -@@ -130,6 +132,7 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -129,6 +131,7 @@ class ToolbarView : public views::AccessiblePaneView, IntentPickerResponse callback); // Shows a bookmark bubble and anchors it appropriately. @@ -25,7 +25,7 @@ index f4af66fa98b30f80689e0f8776596af720c3fb75..ceeffeafa6603911b2bb84ccb75bc422 void ShowBookmarkBubble(const GURL& url, bool already_bookmarked, bookmarks::BookmarkBubbleObserver* observer); -@@ -196,6 +199,7 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -195,6 +198,7 @@ class ToolbarView : public views::AccessiblePaneView, void ChildPreferredSizeChanged(views::View* child) override; protected: @@ -33,7 +33,7 @@ index f4af66fa98b30f80689e0f8776596af720c3fb75..ceeffeafa6603911b2bb84ccb75bc422 // AccessiblePaneView: bool SetPaneFocusAndFocusDefault() override; -@@ -243,6 +247,7 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -242,6 +246,7 @@ class ToolbarView : public views::AccessiblePaneView, views::View* GetViewForDrop() override; // Loads the images for all the child views. diff --git a/patches/chrome-browser-ui-views-update_recommended_message_box.h.patch b/patches/chrome-browser-ui-views-update_recommended_message_box.h.patch index df1210e12757..dbe1a5c7573c 100644 --- a/patches/chrome-browser-ui-views-update_recommended_message_box.h.patch +++ b/patches/chrome-browser-ui-views-update_recommended_message_box.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/update_recommended_message_box.h b/chrome/browser/ui/views/update_recommended_message_box.h -index e7038138c170785a4a382e222e4be0df0af99a15..b95a50eeba6901efa2118f7ba11a3ade6f530eec 100644 +index 312a9a4c781eeb646f84bb2d8ff3db6287af67e0..3c0f75b2827c74a2d59e8ba37490fce50afac3f2 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.h +++ b/chrome/browser/ui/views/update_recommended_message_box.h @@ -20,6 +20,8 @@ class UpdateRecommendedMessageBox : public views::DialogDelegate { diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 23f91a8e2c40..3f2e7d01ae4b 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index aa93a9ddd7f56dbc178a40d328b7c25cbbd8f607..b435032c56238cc8f8f2c32a7ebdaf775509f23e 100644 +index 506ca0362917207d80e504fe066448fec7f3c896..630eb1abf00456fa66c04f6da9199b3c16022b94 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -12,6 +12,7 @@ @@ -10,7 +10,7 @@ index aa93a9ddd7f56dbc178a40d328b7c25cbbd8f607..b435032c56238cc8f8f2c32a7ebdaf77 #include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/accessibility_ui.h" -@@ -996,7 +997,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -999,7 +1000,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 99af5a833501..01c4b3aa2e50 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 79f60e280e68604d028ca0a1715279a32e62dbc5..888546ad6b318a9de05b806eaa413f1efb3a3a22 100644 +index 2f5ba2a2f8d187915d6abcc88b8f4f6974bcc7a6..8bdb89f949ea87e666d8dc534f5ddf5e4b7bd054 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2242,6 +2242,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2240,6 +2240,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 11790464bd0b..570432776e59 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 32c1db01bda484ba0adebd5ba4191b25b4b7fe1a..e8640dfaec9874e1e69e13d405c90d5b3e8a1b88 100644 +index 54e1de7f3f861e4796e495141389347d98f8d3ac..f7abbbb19381edb9194391b34f27049c4c009ebe 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -374,6 +374,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -373,6 +373,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(const std::string& name) { diff --git a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch index 7a1b0240d2b9..400d2bfaf86a 100644 --- a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch +++ b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -index db1ec6337b8c10e5c4a288eab6c618838fa5a3aa..2dcfbed286e67655676ca18b367a9bdbb430d317 100644 +index 03e4ff1c9c616c5600d67c8aa0e7b84888219324..9d4e44d3822a0a0484e41a1b1fc90f403226feeb 100644 --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -398,6 +398,7 @@ std::string TouchIdMetadataSecret(Profile* profile) { +@@ -399,6 +399,7 @@ std::string TouchIdMetadataSecret(Profile* profile) { ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfig ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfigForProfile( Profile* profile) { diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 1156167af11c..10b855108482 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index cbf9a60c385e47199879839f87c68df637494b69..ec8d1c45f64bd51958998ba35691d22ff3cc6fbe 100644 +index 62747b5714ed02fee4c9df7c55b28d95f3ac2a46..2b0f6ca51e39ac1cca91037aed056cf6e5016b63 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -195,6 +195,7 @@ static_library("renderer") { diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index cf37c07c0931..99f0355753dc 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index b5bec594d29a5fded3284ec41830cc6c88604b15..8b785fef73c68fba01c5df4dba7403fd7bca99bd 100644 +index c5b74462c86e567a87b9db494c092876957cb92d..902d914933f6ae16313289514e5c98f3ca61878c 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -761,6 +761,7 @@ if (!is_android) { +@@ -795,6 +795,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/components-browser_ui-site_settings-android-BUILD.gn.patch b/patches/components-browser_ui-site_settings-android-BUILD.gn.patch index ebd0b0343b49..dbdc2501ac9b 100644 --- a/patches/components-browser_ui-site_settings-android-BUILD.gn.patch +++ b/patches/components-browser_ui-site_settings-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn -index 5b6f9ff2945b0303e51fe45f88943c8da9227b98..2ca544bf887da522ac8458182ce1126c1c944d17 100644 +index 625717554a630601ed2051c3d090fb30fc1b3cff..caaf1c1af1b73bf1f6c5551df85ed7f0e3240106 100644 --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -74,6 +74,7 @@ android_library("java") { +@@ -75,6 +75,7 @@ android_library("java") { "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreference.java", "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java", ] @@ -10,7 +10,7 @@ index 5b6f9ff2945b0303e51fe45f88943c8da9227b98..2ca544bf887da522ac8458182ce1126c annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] resources_package = "org.chromium.components.browser_ui.site_settings" deps = [ -@@ -211,5 +212,6 @@ android_resources("java_resources") { +@@ -213,5 +214,6 @@ android_resources("java_resources") { "//components/permissions/android:java_resources", "//third_party/android_deps:android_support_v7_appcompat_java", ] diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index ccd830cb936c..b9a88e90efff 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index f66cb860725399e86f8b6692580c15e46df98085..5fb072b3d42452c35ff81d94f1dcc3d1d0f40770 100644 +index 9763d1263eecca76fe5b2da9df94029c9978fbac..097e9a716205ec099d47efd4be11ace17b84d1c4 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -441,7 +441,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -401,7 +401,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment if (queryHasChanged) getInfoForOrigins(); return true; } diff --git a/patches/components-component_updater-component_updater_service.h.patch b/patches/components-component_updater-component_updater_service.h.patch index 306b1936304d..eb2b3c0fb0a7 100644 --- a/patches/components-component_updater-component_updater_service.h.patch +++ b/patches/components-component_updater-component_updater_service.h.patch @@ -1,5 +1,5 @@ diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h -index c98bc5da30406725a0d20e64d7b9c38004fc56c0..f4c2c7c0f65e567afe8547427d9f72472a550b7e 100644 +index f926034a2c86b5bc7c826683de67ff56bec7e21c..418974f2071df6fcfa6adf082e4a7aac2c9afbd5 100644 --- a/components/component_updater/component_updater_service.h +++ b/components/component_updater/component_updater_service.h @@ -162,6 +162,7 @@ class OnDemandUpdater { diff --git a/patches/components-content_settings-core-browser-BUILD.gn.patch b/patches/components-content_settings-core-browser-BUILD.gn.patch index 14f4b2466ea9..7e76bc60c4cd 100644 --- a/patches/components-content_settings-core-browser-BUILD.gn.patch +++ b/patches/components-content_settings-core-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn -index 411368e75877d0cfaafd65846bad99be676eef72..4ce51717cc74901a28ccef1ae1a60199fcc53028 100644 +index 5ce9ad00c2c570c8d5c93cee2f3c9036749c4ebe..29deabeacaf6d7c8cb03d8c69ea85acb03b5b585 100644 --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn -@@ -66,6 +66,7 @@ static_library("browser") { +@@ -65,6 +65,7 @@ static_library("browser") { "//services/preferences/public/cpp", "//url", ] diff --git a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch index 7d25dbbae920..1a9919561497 100644 --- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index c52ece770230e43a277329265502f20d11af7ce4..15cdf8d462a03a53c5fa8bf6e8277515b04f7e8b 100644 +index 4cef5d840f9cf25da34bc1e0386f3bc6ab6c2f53..9df31674d73cdf91aa562c0966db9f3098769f5b 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -611,6 +611,7 @@ void ContentSettingsRegistry::Init() { +@@ -610,6 +610,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index a1d904145230..b221fb8be4bb 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,5 +1,5 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index 0fed66ab13223a3a8e22eff05575eb1d8c714580..b1528fa8db854dcf4c282d8b682e7078bde712c8 100755 +index f6056e1cef74ed3048c19dd10a4cc2590ce866fd..cc5ef772ed7bf38a710f8c102fab95f830861b07 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py @@ -42,6 +42,7 @@ PLATFORM_STRINGS = { @@ -10,7 +10,7 @@ index 0fed66ab13223a3a8e22eff05575eb1d8c714580..b1528fa8db854dcf4c282d8b682e7078 class PolicyDetails: """Parses a policy template and caches all its details.""" -@@ -351,6 +352,7 @@ def main(): +@@ -352,6 +353,7 @@ def main(): chrome_major_version = ParseVersionFile(version_path) template_file_contents = _LoadJSONFile(template_file_name) diff --git a/patches/components-sync-BUILD.gn.patch b/patches/components-sync-BUILD.gn.patch index b4d63cc478f8..a7ba1e0de277 100644 --- a/patches/components-sync-BUILD.gn.patch +++ b/patches/components-sync-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn -index abbe13bdd15c0558e0014696de277af5f92a9866..d0f6e94e1f8927d0c0ef01a0ab1616dd64381813 100644 +index fbf5178558298c1fe272027d4dac617064ec2413..647e3cb9f15078b6eae08fc3b70934efbcd453af 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn @@ -305,6 +305,7 @@ static_library("rest_of_sync") { diff --git a/patches/content-browser-frame_host-navigation_request.cc.patch b/patches/content-browser-frame_host-navigation_request.cc.patch index f7a82d0cf5b8..a84b087299f7 100644 --- a/patches/content-browser-frame_host-navigation_request.cc.patch +++ b/patches/content-browser-frame_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index 2c8589e2d7ddaeed9a1ba0726e0aa817f47ee0f3..304ee86f36ec9295e31152045e2f877e2c2c6358 100644 +index 4039355c521baea795ae2eb3ee9dda3eaf6b6863..efb24b28f38079f8ee7ea42acb9a76aa2dc25416 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc @@ -1812,6 +1812,7 @@ void NavigationRequest::OnRequestRedirected( diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index a87ed3def9f0..8e41c4e90e0e 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 262eeee4a39a32ab9259b53ee09f7b4afc1ea044..a7d511b738a9840b554764ecf490105808ac33a7 100644 +index 8355177adb31483f70bcae5f68d1e8a0aabefaf5..b48d1f064b1490c47274fab3e769abc333151009 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -37,6 +37,7 @@ source_set("common") { diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 96fe83e4e5d4..26964b947fd8 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 428ec871deba7faa1aee05e9e4ab58814c8cff66..47a6d989a523fe8dc0fd5356964fac0bbffe07ad 100644 +index 0229ba39ba7ff66e139df331e6ef519cba1640df..fa9551efaf018202674b4ac6663eed7203cc9787 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1760,6 +1760,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1761,6 +1761,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 144d8812df22..d83769fdcac0 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index a6118f1f5ce16c360fae5c9a45dc853353be24df..9dc3a6d6f133aab67834543771354bbeea142393 100644 +index afebe5db100f9c7e6a402e3b28b3be6e3d95cf63..2880e32117ae8580c292cccc5ee32f3b339145dc 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1012,6 +1012,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { +@@ -1013,6 +1013,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch index 7161974350fc..cb9773b452c9 100644 --- a/patches/extensions-browser-sandboxed_unpacker.cc.patch +++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc -index 2c25b111dc7090d80b6425a64fb9a6bc417f4a57..07790af26afbe4c9827ddc39303e71fb325234a6 100644 +index b2082d56c5c8baf4d6ece8b4524121eea0db3544..485e941c7a987eb243b19dc74d80af04fb16bca7 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc -@@ -912,6 +912,7 @@ base::Optional SandboxedUnpacker::RewriteManifestFile( +@@ -915,6 +915,7 @@ base::Optional SandboxedUnpacker::RewriteManifestFile( DCHECK(!public_key_.empty()); base::Value final_manifest = manifest.Clone(); final_manifest.SetStringKey(manifest_keys::kPublicKey, public_key_); diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 8bce82d96fc1..15fba43711c6 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index cba943e73f5b2daaa42173163e36e21d63b3aaef..25806b62a0523628af4cc493d49a48671086417a 100644 +index 116673476fbfa4cfe30420780f0f4c24d373ef90..4d7b0940e44139d712a7b3fbd95ee191896382c3 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1186,6 +1186,7 @@ component("net") { diff --git a/patches/services-network-public-cpp-cors-cors.cc.patch b/patches/services-network-public-cpp-cors-cors.cc.patch index a0776232b584..8d39a9d8a97e 100644 --- a/patches/services-network-public-cpp-cors-cors.cc.patch +++ b/patches/services-network-public-cpp-cors-cors.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc -index 92a86e4e6d5d7bdd6caadaf6c38a283bb618ab91..89b5b6432b4ff8dbe092a4199e77be664e9277cc 100644 +index 7189eaa1871ddd13d998e4c0ccec7c6b062d5237..e31b86440ba7738239c944f5a1566095a7354e83 100644 --- a/services/network/public/cpp/cors/cors.cc +++ b/services/network/public/cpp/cors/cors.cc @@ -449,6 +449,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) { diff --git a/patches/third_party-blink-renderer-core-dom-document.cc.patch b/patches/third_party-blink-renderer-core-dom-document.cc.patch index be82efc0aced..45e1bfa6b72f 100644 --- a/patches/third_party-blink-renderer-core-dom-document.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-document.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 74856aabf5aff72be70d4cd398fa8200dec49af4..48d763164d202bce9cef9ac1d89d0183644e3f84 100644 +index 37d86e529113e7519df04c0645e11355b50fbe84..520872024b6f510466ca66d22dfff66e0dd48963 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -33,7 +33,7 @@ diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch index c0f445eed441..0c7fddae2d46 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -index 14a78dbd7248fd9a8033d44a8cf604fa190faa16..ec5c30e8009b4f8f22167aa69f0c554aff62ed11 100644 +index 585d9c7657b474411a79633ae6692a300813cbd5..b0e02f8a2c3eeee964b160a5d0e1ad52aaaac808 100644 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -190,6 +190,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index c56bc09a549a..b3792e09c86a 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index e4594c9403e35e5226c67b7f09d157480de5b7f6..766115483d2d9487756ad70dda5a7f81e1fab2db 100644 +index 71c0e2193af43c91de7d286adee534bd8033d0c1..243ee3edb8968d4520fb08a8a6e2ed08ce3b7110 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -970,6 +970,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -968,6 +968,7 @@ String HTMLCanvasElement::ToDataURLInternal( scoped_refptr image_bitmap = Snapshot(source_buffer); if (image_bitmap) { diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index abc9dae30d00..c26e4c1aabe5 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 66d3b97751e09baf818f5087b3f4b77bce2a3e93..6da4958849aa2173e29df70213fc8aa73664da26 100644 +index 43fce1e5296ccfe6bec7f18232e975a631b6e710..56d7c6827651d22e7524e25223d7a3314bf49c52 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -16,6 +16,7 @@ if (is_android) { @@ -10,7 +10,7 @@ index 66d3b97751e09baf818f5087b3f4b77bce2a3e93..6da4958849aa2173e29df70213fc8aa7 config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -165,6 +166,7 @@ component("modules") { +@@ -166,6 +167,7 @@ component("modules") { "//third_party/blink/renderer/modules/xr", ] diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index 4e62655f3f41..203f54ed8ce9 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index 45a4034ad784d91c1d2b03619f1be2f55e922e11..1d7ab06bec6b901c52e563a69ae772f76896d3a8 100644 +index 8517ad3da75af421a6861a21a97d907895f3a6cf..2bc064d4cf01de891a6f819e233096422da1c14d 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -1599,6 +1599,7 @@ ImageData* BaseRenderingContext2D::createImageData( +@@ -1579,6 +1579,7 @@ ImageData* BaseRenderingContext2D::createImageData( } ImageData* BaseRenderingContext2D::getImageData( @@ -10,7 +10,7 @@ index 45a4034ad784d91c1d2b03619f1be2f55e922e11..1d7ab06bec6b901c52e563a69ae772f7 int sx, int sy, int sw, -@@ -1686,6 +1687,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1666,6 +1667,7 @@ ImageData* BaseRenderingContext2D::getImageData( return nullptr; } diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch index 6d79d06fac49..5f41b633be68 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h -index a0ce8e4948f5150ca557d7b2662da7c858d95f45..a85e6c4b506bdb34e93e46fd0980514c622db4c6 100644 +index 8cfe814b458b86f713e12a0326c384cd8fd146e5..5dc2d56dc32268741fb83818a38811920af00bf6 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h -@@ -329,6 +329,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, +@@ -320,6 +320,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, const UsageCounters& GetUsage(); diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch index f884bc0bfaa4..2278daa8a08b 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -index 9d47e14250aca417e0f09e02a44669e674e45e00..b435a7eaab0dbb1a739b3a4f0fb1e80fe69b7870 100644 +index dc3d6e8a9ac9faf410340b086b9731f95807c353..35318e91d9c472cf33b1b9fa49ff6a4fedeffd49 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl @@ -104,9 +104,13 @@ interface CanvasRenderingContext2D { diff --git a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch index 90db323bb9cc..1457e079ba66 100644 --- a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -index a58003a655e496c5d6051df2dc53bfe07d03b45e..274570e923ebdebbe919cf22674f7760a48322f6 100644 +index 5ff46e9890eac5ad02a024976d3245d98783af00..e65561cecb1c80e57aba1a241360aa534d77c82b 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl @@ -63,10 +63,10 @@ diff --git a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch index b31e7c66ebdb..f842b761c27a 100644 --- a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch +++ b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/modules_idl_files.gni b/third_party/blink/renderer/modules/modules_idl_files.gni -index c0aeb9ea0d6a6ad74571c7c5e43051955b29a327..db4d29cba41f050c23a50843f0dd77bc2f15ff14 100644 +index c584bc8ab46cd6d0d1f8808c01e73ecf462202df..21ee7fecda4b513174fba0a0614653c3a42cdeff 100644 --- a/third_party/blink/renderer/modules/modules_idl_files.gni +++ b/third_party/blink/renderer/modules/modules_idl_files.gni -@@ -141,6 +141,7 @@ _idl_imports = [ +@@ -142,6 +142,7 @@ _idl_imports = [ if (!is_android) { _idl_imports += [ "//third_party/blink/renderer/modules/serial/idls.gni" ] } diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index c10c018d83f7..197570922df5 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -23,7 +23,7 @@ index f7874b0f6944521c0a083375321f01709e2b4d08..43c0c78d69537a27f8bc5692cb1891bb if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return base::nullopt; + BRAVE_WEBGL_RENDERING_CONTEXT_BASE_NULLOPT - + HeapVector> shader_objects; const GLenum kShaderType[] = {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER, @@ -2996,6 +2999,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, @@ -39,13 +39,13 @@ index f7874b0f6944521c0a083375321f01709e2b4d08..43c0c78d69537a27f8bc5692cb1891bb if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); + BRAVE_WEBGL_RENDERING_CONTEXT_BASE_SCRIPT_VALUE - + switch (pname) { case GL_BUFFER_USAGE: { @@ -3165,6 +3170,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); - + + BRAVE_WEBGL_RENDERING_CONTEXT_BASE_SCRIPT_VALUE if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", @@ -121,16 +121,16 @@ index f7874b0f6944521c0a083375321f01709e2b4d08..43c0c78d69537a27f8bc5692cb1891bb + BRAVE_WEBGL_RENDERING_CONTEXT_BASE_STRING return EnsureNotNull(shader->Source()); } - -@@ -3737,6 +3752,7 @@ base::Optional> + +@@ -3811,6 +3826,7 @@ base::Optional> WebGLRenderingContextBase::getSupportedExtensions() { if (isContextLost()) return base::nullopt; + BRAVE_WEBGL_RENDERING_CONTEXT_BASE_NULLOPT - + Vector result; - -@@ -3759,6 +3775,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( + +@@ -3833,6 +3849,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index dde68d7440f3..46e4650a0047 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 0818d69864408fe2aa1c58e460cd61f13f54f8f0..eb66f15d12ba13b06a96f51130e263fd6f444810 100644 +index 1a4acc42f9ee7390e8d7355835bbb885fe603fb6..4d6268926b2d8f0e259208de94380e7036206b02 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index 0818d69864408fe2aa1c58e460cd61f13f54f8f0..eb66f15d12ba13b06a96f51130e263fd "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -377,6 +380,9 @@ +@@ -383,6 +386,9 @@ "META": {"align": 100}, "messages": [2700], }, diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses.py.patch index 6f14eb0b72da..a6620c48309a 100644 --- a/patches/tools-licenses.py.patch +++ b/patches/tools-licenses.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/licenses.py b/tools/licenses.py -index 5d27b2ec23386d4627e4504f199a99af41ed601b..63ed73662f597f8f467ff5ac90cc110a324abc8f 100755 +index 246f038f9d747f9679932776cc1940c4ecddc1b3..f6d7e9c71b5f27d4fae8d2d5f27ad003b0ab31e5 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -35,6 +35,7 @@ else: @@ -28,7 +28,7 @@ index 5d27b2ec23386d4627e4504f199a99af41ed601b..63ed73662f597f8f467ff5ac90cc110a # Add all subdirectories that are not marked for skipping. for dir in dirs: dirpath = os.path.join(path, dir) -@@ -682,7 +685,8 @@ def GenerateCredits( +@@ -680,7 +683,8 @@ def GenerateCredits( for path in third_party_dirs: try: metadata = ParseDir(path, _REPOSITORY_ROOT) diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch index 7b8f73bb60a7..70d23e00e7fd 100644 --- a/patches/tools-metrics-histograms-histograms.xml.patch +++ b/patches/tools-metrics-histograms-histograms.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml -index 0d562d5f2b079b657dfe76c395ed09eaa509e2e3..ba864b2a4f5175e482b6eb8e5c8a04dfb85b2074 100644 +index f298d5185015a6a574b8d40dbeea8403b940bd5d..c98894489decec8e63268c7b9210ecc71ee0f12f 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml -@@ -212662,6 +212662,7 @@ regressions. --> +@@ -212657,6 +212657,7 @@ regressions. --> diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index 029731d5b2d6..25948fb1a7c4 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 88883f2c90d89e719ba2c1d1541c73a13f7f2e0c..f44a31df2caea44a9985298fe3d1387e15e89524 100644 +index 196069945632bc613070b76caf8a895ca245ac5e..c9bc5b2aab4e9ae0a2e7e346fdb01f4233d4ac71 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -457,6 +457,7 @@ component("base") { From 34699c103bb7fb31cd3e3d31c3b97400661be3a4 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 31 Aug 2020 12:32:13 -0400 Subject: [PATCH 002/152] Conflict-resolved patches from Chromium 86.0.4240.111 to Chromium 87.0.4250.0. --- patches/chrome-android-BUILD.gn.patch | 14 +++---- ...cy_page-personalization_options.html.patch | 19 +++++---- ...vacy_page-personalization_options.js.patch | 11 ++--- ...-views-extensions-extension_popup.cc.patch | 6 +-- ...ews-location_bar-location_bar_view.h.patch | 4 +- ...nts-infobars-core-infobar_delegate.h.patch | 6 +-- ...ebgl-webgl_rendering_context_base.cc.patch | 42 +++++++++---------- 7 files changed, 52 insertions(+), 50 deletions(-) diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index de57cbd1b8b3..690899432a60 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index a5873f5f24329542ec9105ff87dc755c6b2b7307..3a900e4356e87af5c02f84c2dc7aae4676cba92a 100644 +index 4310ce75c3d9b62514261c7bee41bc84bf9c0d9c..9680d6f1914da59fba7336623891f1e96bca241a 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -211,6 +211,7 @@ android_resources("chrome_app_java_resources") { +@@ -209,6 +209,7 @@ android_resources("chrome_app_java_resources") { "//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:material_design_java", ] @@ -10,7 +10,7 @@ index a5873f5f24329542ec9105ff87dc755c6b2b7307..3a900e4356e87af5c02f84c2dc7aae46 create_srcjar = false } -@@ -499,6 +500,7 @@ android_library("chrome_java") { +@@ -492,6 +493,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,15 +18,15 @@ index a5873f5f24329542ec9105ff87dc755c6b2b7307..3a900e4356e87af5c02f84c2dc7aae46 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -535,6 +537,7 @@ android_library("chrome_java") { - "//content/public/browser:contacts_picker_properties_requested_javagen", +@@ -526,6 +528,7 @@ android_library("chrome_java") { + "//components/ui_metrics:ui_metrics_enums_java", "//net:effective_connection_type_java", ] + srcjar_deps += brave_chrome_java_srcjar_deps # From java_sources.gni. sources = chrome_java_sources + [ -@@ -659,6 +662,7 @@ group("jni_headers") { +@@ -651,6 +654,7 @@ group("jni_headers") { "//chrome/browser/util:jni_headers", "//chrome/browser/webauthn/android:jni_headers", ] @@ -34,7 +34,7 @@ index a5873f5f24329542ec9105ff87dc755c6b2b7307..3a900e4356e87af5c02f84c2dc7aae46 } action("chrome_android_java_google_api_keys_srcjar") { -@@ -1721,6 +1725,7 @@ if (current_toolchain == default_toolchain) { +@@ -1718,6 +1722,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch index e2c7cdd34233..f0ad29ad2ee2 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html -index ee33af6a45df058d946b763560063708327d9077..57b0c2741c30028367a4e13b953a2fc0dc230a39 100644 +index 2b94f37bda8703e6876b770b9d75dafbc0b27954..b0e72bac8a55cf1d3b1c98bdb31b5d1d16df9453 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html @@ -16,6 +16,7 @@ @@ -18,14 +18,15 @@ index ee33af6a45df058d946b763560063708327d9077..57b0c2741c30028367a4e13b953a2fc0 + - @@ -33,7 +34,7 @@ index ee33af6a45df058d946b763560063708327d9077..57b0c2741c30028367a4e13b953a2fc0 @@ -42,14 +43,14 @@ index ee33af6a45df058d946b763560063708327d9077..57b0c2741c30028367a4e13b953a2fc0 - + + - @@ -67,7 +68,7 @@ index ee33af6a45df058d946b763560063708327d9077..57b0c2741c30028367a4e13b953a2fc0 +@@ -141,11 +141,16 @@ + aria-label="$i18n{checkPasswords}"> + + ++ + - - - Devices - - diff --git a/app/brave_strings_override.grd b/app/brave_strings_override.grd index 8cb22ab3c6e2..e4a5a5cc0beb 100644 --- a/app/brave_strings_override.grd +++ b/app/brave_strings_override.grd @@ -303,9 +303,6 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> Use different profiles in Brave to separate work and personal browsing, or for different profiles who use this device - - - diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 01e111ec9dfe..d5b6fd234ab5 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -289,6 +289,7 @@ are declared in tools/grit/grit_rule.gni. + @@ -3488,7 +3489,7 @@ are declared in tools/grit/grit_rule.gni. To re-enable it, accept the new permissions: - + Brave has flagged "$1Brave Talk" as malicious and installation has been prevented @@ -3613,13 +3614,13 @@ are declared in tools/grit/grit_rule.gni. These items may be dangerous - + The extension "$1Gmail Checker" was automatically disabled. - + "$1Gmail Checker" has been disabled because it contains malware - + The app "$1Gmail" was automatically removed. @@ -3978,7 +3979,7 @@ are declared in tools/grit/grit_rule.gni. Read and change saved password settings - Read and change whitelisted users + Read and change allowlisted users Send audio and video to displays on the local network @@ -4042,7 +4043,7 @@ are declared in tools/grit/grit_rule.gni. Unable to import extension "$1Gmail" because it is not a shared module - + Unable to install "$1Google Play Movies & TV" because it is not allowed by "$2Brave Cast API" @@ -5696,6 +5697,12 @@ Keep your key file in a safe place. You will need it to create new versions of y To group tabs together, right-click a tab + + Dismiss + + + Remind me later + @@ -6821,7 +6828,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Installed because of dependent extension(s). - + This extension contains malware. diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 26bba4a42c9a..19ed8c90e49a 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -97,7 +97,7 @@ are declared in tools/grit/grit_rule.gni. - + diff --git a/app/global_media_controls_strings.grdp b/app/global_media_controls_strings.grdp index 51acca7129d5..778c2885b55a 100644 --- a/app/global_media_controls_strings.grdp +++ b/app/global_media_controls_strings.grdp @@ -11,4 +11,7 @@ Dismiss + + Devices + diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index 3e4883cf324e..93a5bbed2b08 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -890,6 +890,9 @@ Spell check + + Customize spell check + Manage input methods diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 9a38d3813e13..bde569ab12c3 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -278,6 +278,9 @@ Add and order languages you read. Apps and websites will be displayed in the most preferred language available. <a target="_blank" href="$1">Learn more</a> + + The language is used when translating pages + Translation suggestion @@ -299,8 +302,26 @@ Spell check - - Spell check isn’t supported for the languages you selected + + Enhanced spell check in Brave browser only (text is sent to Brave) + + + Spell check languages + + + Languages available for spell check is based on your languages settings + + + Couldn’t download spell check dictionary + + + Try again + + + Couldn’t download spell check dictionary for $1English. Try again. + + + Customize spell check Languages diff --git a/app/supervised_user_error_page_strings.grdp b/app/supervised_user_error_page_strings.grdp index 45555e00928f..bd392f964bb7 100644 --- a/app/supervised_user_error_page_strings.grdp +++ b/app/supervised_user_error_page_strings.grdp @@ -71,13 +71,13 @@ It may have mature content - + Your parent can unblock it for you - + Your parents can unblock it for you - + Your manager can unblock it for you diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index e90169ccf1ee..ad05c8cf3cbb 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -2484,9 +2484,6 @@ To change this setting, <resetlink>reset sync

Choose another account - - Sync is off - Turn on sync @@ -2496,15 +2493,6 @@ To change this setting, <resetlink>reset sync

- - Keep exploring offline - - - Get articles, videos, and other content from sites you like, even if you’re offline or your connection is poor. - - - Explore - Recent tabs @@ -2942,9 +2930,6 @@ To change this setting, <resetlink>reset sync

Brave can’t update. More options - - Search - Site information @@ -2963,12 +2948,6 @@ To change this setting, <resetlink>reset sync

New private tab - - Close all tabs - - - Close all private tabs - Private mode diff --git a/browser/ui/android/strings/android_chrome_strings_override.grd b/browser/ui/android/strings/android_chrome_strings_override.grd index ccd80aa82875..28ecb6332cf3 100644 --- a/browser/ui/android/strings/android_chrome_strings_override.grd +++ b/browser/ui/android/strings/android_chrome_strings_override.grd @@ -165,9 +165,6 @@ CHAR-LIMIT guidelines: New private tab - - Close all private tabs - Private mode From 8ee26dadbbdf55469957985f6595ee7c704e4eeb Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 16 Sep 2020 20:26:14 +0200 Subject: [PATCH 030/152] Adapt addition of two virtual methods to WebContentSettingsClient The method we were using in web_content_settings_client.h as hook to insert Brave's new virtual methods has dissapeared, so we need to adapt the override file to get our definitions back in. Chromium change: https://chromium.googlesource.com/chromium/src/+/0ddfe29da8583c5dc161a0c8d7475553675c7253 commit 0ddfe29da8583c5dc161a0c8d7475553675c7253 Author: Shubham Aggarwal Date: Wed Sep 9 16:50:59 2020 +0000 Refactor WebContentSettingsClient to dedupe AllowXYZ methods This change consolidates the storage related methods in the WebContentSettingsClient interface into two new methods to prevent use of repeated logic in implementations. Implementations and usage sites have also been updated to use the new methods, RequestStorageAccess and RequestStorageAccessSync. Change-Id: If46b3d0ca7555b8db212b014580f0b5513bbe508 Bug: 1019415 --- .../blink/public/platform/web_content_settings_client.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_src/third_party/blink/public/platform/web_content_settings_client.h b/chromium_src/third_party/blink/public/platform/web_content_settings_client.h index 9c38ecf22c24..b88480cd65c2 100644 --- a/chromium_src/third_party/blink/public/platform/web_content_settings_client.h +++ b/chromium_src/third_party/blink/public/platform/web_content_settings_client.h @@ -8,7 +8,7 @@ #include "brave/third_party/blink/renderer/brave_farbling_constants.h" -#define AllowDatabase \ +#define AllowStorageAccessSync \ AllowAutoplay(bool default_value) { return default_value; } \ virtual bool AllowFingerprinting(bool enabled_per_settings) { \ return enabled_per_settings; \ @@ -16,11 +16,11 @@ virtual BraveFarblingLevel GetBraveFarblingLevel() { \ return BraveFarblingLevel::OFF; \ } \ - virtual bool AllowDatabase + virtual bool AllowStorageAccessSync #include "../../../../../../third_party/blink/public/platform/web_content_settings_client.h" -#undef AllowDatabase +#undef AllowStorageAccessSync #endif // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_CONTENT_SETTINGS_CLIENT_H_ From ba3aa88b8ce587961d17e7b953abcddd43a47d6a Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 16 Sep 2020 21:51:46 +0200 Subject: [PATCH 031/152] Adapt signature of callback for views::Link::set_callback() This used to expect 2 parameters (Link* source, int event_flags), but it's only one (int event_flags) now, so let's adapt it. Chromium change: https://chromium.googlesource.com/chromium/src/+/10d5bf9896fd3b41bb0b74b79b27c8df1feebcd4 commit 10d5bf9896fd3b41bb0b74b79b27c8df1feebcd4 Author: Peter Kasting Date: Thu Sep 10 22:51:15 2020 +0000 Remove StyledLabelListener. This replaces it with direct callback registration on the underlying links, conveyed by setting the callback on the RangeStyleInfo corresponding to the link. This allows eliminating parameters like the range, since a different callback or different bound arguments can be set for each range. With a change to how ContentSettingBubbleContents works (which was the other place using the Link* argument of Link::ClickedCallback), this allows reducing Link::ClickedCallback to one argument as well. It makes sense to make these changes simultaneously since they mostly affect the same listeners and thus this avoids changing lots of signatures twice. Bug: 1108460 --- browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc | 3 +-- browser/ui/views/bookmarks/bookmark_bar_instructions_view.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc index b6b73b170e3c..7dd2efd469f2 100644 --- a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc +++ b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc @@ -111,8 +111,7 @@ void BookmarkBarInstructionsView::GetAccessibleNodeData( instructions_->GetAccessibleNodeData(node_data); } -void BookmarkBarInstructionsView::LinkClicked(views::Link* source, - int event_flags) { +void BookmarkBarInstructionsView::LinkClicked(int event_flags) { chrome::ShowImportDialog(browser_); } diff --git a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h index 5244ef179b77..8ca735b2bb33 100644 --- a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h +++ b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h @@ -44,7 +44,7 @@ class BookmarkBarInstructionsView : public views::View, ui::MenuSourceType source_type) override; void UpdateColors(); - void LinkClicked(views::Link* source, int event_flags); + void LinkClicked(int event_flags); views::Label* instructions_; views::Link* import_link_; From a60bcc9e4a5f6e4a96313708f9a1f1446971b5c9 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 16 Sep 2020 23:15:34 +0200 Subject: [PATCH 032/152] Adapt override of component_updater::RegisterCRLSetComponent() This helper function takes one parameter only now, instead of two. Chromium change: https://chromium.googlesource.com/chromium/src/+/eb9b67c9dd2c52d1e8627f5269a387a1d6a74fc4 commit eb9b67c9dd2c52d1e8627f5269a387a1d6a74fc4 Author: cfredric Date: Tue Sep 8 22:39:33 2020 +0000 Remove unused user_data_dir parameter. Change-Id: I9a64a0426c784bd692905512f32735e8d7ae600d Bug: 1126207 --- .../browser/component_updater/crl_set_component_installer.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc b/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc index 055c0bcfc581..3da823fe90b7 100644 --- a/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc +++ b/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc @@ -23,8 +23,7 @@ void OnCRLSetRegistered() { #endif } -void RegisterCRLSetComponent(ComponentUpdateService* cus, - const base::FilePath& user_data_dir) { +void RegisterCRLSetComponent(ComponentUpdateService* cus) { auto installer = base::MakeRefCounted( std::make_unique()); installer->Register(g_browser_process->component_updater(), From e8dc611d82b6dbd1f54d581c6ecba866adaeac4c Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 16 Sep 2020 23:30:35 +0200 Subject: [PATCH 033/152] Adapt includes for web_preferences.h, now moved into Blink This class used to live in //content, but it's now part of Blink's public API, so update includes and namespaces. Chromium change: https://chromium.googlesource.com/chromium/src/+/1ac4ca780f9adf3549298115b246695da73af8fc commit 1ac4ca780f9adf3549298115b246695da73af8fc Author: Gyuyoung Kim Date: Fri Sep 11 03:32:51 2020 +0000 Move content::WebPreferences struct to Blink As the first step to convert ViewMsg_UpdateWebPreferences, we need to move WebPreferences from //content to //third_party/blink because the IPC message passes WebPreferences struct. So, this CL moves WebPreferences to //third_party/blink/public/common/web_preferences as a pre-work. Additionally, this CL wraps all enums and WebPreferences with web_pref namespace to avoid duplicating the existing enum types in bliink. AX-Relnotes: N/A Bug: 1097943 --- app/brave_main_delegate_browsertest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index d3f49f628cfd..97419a7c915a 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -20,7 +20,7 @@ #include "components/safe_browsing/core/features.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/content_features.h" -#include "content/public/common/web_preferences.h" +#include "third_party/blink/public/common/web_preferences/web_preferences.h" #include "content/public/test/browser_test.h" #include "gpu/config/gpu_finch_features.h" #include "net/base/features.h" @@ -47,7 +47,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisableHyperlinkAuditing) { base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoPings)); content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - const content::WebPreferences prefs = + const blink::web_pref::WebPreferences prefs = contents->GetOrCreateWebPreferences(); EXPECT_FALSE(prefs.hyperlink_auditing_enabled); } From 852a4468eddb5e73e1140cac83d26f221dc5ca6f Mon Sep 17 00:00:00 2001 From: samartnik Date: Thu, 17 Sep 2020 15:48:08 -0400 Subject: [PATCH 034/152] [Android] Reverted patches for ToolbarPhone not related to BottomToolbar Previously these patches were removed in the context of BottomToolbar removal. This commit reverts patches that are still applicable and not related to BottomToolbar. --- ...rowser-toolbar-top-ToolbarPhone.java.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch new file mode 100644 index 000000000000..9399223ef0cb --- /dev/null +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -0,0 +1,52 @@ +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +index 25c687987c90ac32f40698e9270cddc1d77f3bb0..0ea457c1b335d38d402d96ae559e792170854c57 100644 +--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +@@ -89,7 +89,7 @@ import java.util.List; + /** + * Phone specific toolbar implementation. + */ +-public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, OnClickListener, ++public class ToolbarPhone extends BraveToolbarLayout implements Invalidator.Client, OnClickListener, + NewTabPage.OnSearchBoxScrollListener, + TabCountObserver { + /** The amount of time transitioning from one theme color to another should take in ms. */ +@@ -411,10 +411,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O + /** + * Set the background color of the location bar to appropriately match the theme color. + */ +- private void updateModernLocationBarColor(int color) { ++ @Override ++ protected void updateModernLocationBarColor(int color) { + if (mCurrentLocationBarColor == color) return; + mCurrentLocationBarColor = color; + mLocationBarBackground.setColorFilter(color, PorterDuff.Mode.SRC_IN); ++ super.updateModernLocationBarColor(color); + } + + /** +@@ -533,6 +535,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O + EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); + } + } ++ super.onClick(v); + } + + @Override +@@ -701,7 +704,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O + * @return The right bounds of the location bar after accounting for any visible left buttons. + */ + private int getBoundsAfterAccountingForRightButtons() { +- return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth()); ++ return Math.max(mToolbarSidePadding, super.getBoundsAfterAccountingForRightButtons(mToolbarButtonsContainer)); + } + + private void updateToolbarBackground(int color) { +@@ -2140,6 +2143,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O + } else { + populateUrlClearFocusingAnimatorSet(animators); + } ++ populateUrlAnimatorSet(hasFocus, URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS, URL_CLEAR_FOCUS_TABSTACK_DELAY_MS, URL_FOCUS_TOOLBAR_BUTTONS_TRANSLATION_X_DP, animators); + mUrlFocusLayoutAnimator = new AnimatorSet(); + mUrlFocusLayoutAnimator.playTogether(animators); + From f3fb0886ea0ab0d0f72bce9b64f45c98b4b4a870 Mon Sep 17 00:00:00 2001 From: samartnik Date: Thu, 17 Sep 2020 16:13:56 -0400 Subject: [PATCH 035/152] [Android] ExternalAuthUtils moved to a separate module Chromium change: https://chromium.googlesource.com/chromium/src/+/8c6ff4167c02ad427fc42c95b71f0ef40dfa633c Remove dependency from ExternalAuthUtils to AppHooks. This will allow ExternalAuthUtils to be moved to a separate module. Change-Id: I03c3217ca22ad4a0aa6e0dbd33cbe56032aca48d Bug: 1104817 --- .../org/chromium/chrome/browser/signin/BraveSigninManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java index d10c8468c759..193ac83da2c3 100644 --- a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java +++ b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java @@ -6,6 +6,7 @@ package org.chromium.chrome.browser.signin; import org.chromium.base.annotations.CalledByNative; +import org.chromium.chrome.browser.AppHooks; import org.chromium.chrome.browser.externalauth.ExternalAuthUtils; import org.chromium.chrome.browser.sync.AndroidSyncSettings; import org.chromium.components.signin.AccountTrackerService; @@ -40,6 +41,6 @@ private static SigninManager create(long nativeSigninManagerAndroid, assert identityMutator != null; return new BraveSigninManager(nativeSigninManagerAndroid, accountTrackerService, identityManager, identityMutator, - AndroidSyncSettings.get(), ExternalAuthUtils.getInstance()); + AndroidSyncSettings.get(), AppHooks.get().getExternalAuthUtils()); } } From 87f3ff0b810b2aa1ebd00d427f5140fea1f298a3 Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 18 Sep 2020 17:03:59 -0400 Subject: [PATCH 036/152] [Android] Removed some bits of ApiCompatibilityUtils that are no longer needed Chromium change: https://github.com/chromium/chromium/commit/761be79055f9b13846c949733f6f13cc774c6541 Remove some bits of ApiCompatibilityUtils that are no longer needed Since KitKat support is deprecated, >= L checks can be removed and < L code can be removed. Bug: none --- .../browser/notifications/BraveAdsNotificationBuilder.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java index 7ce1a8364cc6..ce76db0a73cd 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java @@ -18,6 +18,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; +import android.os.Process; import android.util.DisplayMetrics; import android.view.View; import android.widget.RemoteViews; @@ -218,8 +219,9 @@ private void addWorkProfileBadge(RemoteViews view) { Bitmap bitmap = Bitmap.createBitmap(colors, size, size, Bitmap.Config.ARGB_8888); Drawable inputDrawable = new BitmapDrawable(resources, bitmap); - Drawable outputDrawable = ApiCompatibilityUtils.getUserBadgedDrawableForDensity( - inputDrawable, null /* badgeLocation */, metrics.densityDpi); + Drawable outputDrawable = + mContext.getPackageManager().getUserBadgedDrawableForDensity(inputDrawable, + Process.myUserHandle(), null /* badgeLocation */, metrics.densityDpi); // The input bitmap is immutable, so the output drawable will be a different instance from // the input drawable if the work profile badge was applied. From cffab2d0fd3552e62f2fcef71bb992fcb8bba7d0 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 21 Sep 2020 11:59:58 -0400 Subject: [PATCH 037/152] [Android] NTP Card was removed Chromium change: https://chromium.googlesource.com/chromium/src/+/756b5c3cf62b7fa01c37ad09b7e9e1282e181a93 Content Indexing : Remove NTP Card This CL removes the content indexing entry point card shown on NTP. Bug: 1108602 --- android/java/res/layout/new_tab_page_layout.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/android/java/res/layout/new_tab_page_layout.xml b/android/java/res/layout/new_tab_page_layout.xml index a8d7bbb69001..9c13e956a7a8 100644 --- a/android/java/res/layout/new_tab_page_layout.xml +++ b/android/java/res/layout/new_tab_page_layout.xml @@ -91,14 +91,6 @@ - - - From f58e1205b74c78e1b8cbc1ff183c7cd3c8fedfe3 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 23 Sep 2020 12:23:37 -0400 Subject: [PATCH 038/152] [Android] Move BottomToolbar code to brave-core (stage 1) Moved code deleted in Chromium to brave-core Chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- android/brave_java_resources.gni | 6 + android/brave_java_sources.gni | 16 +- android/java/apk_for_test.flags | 4 - .../BraveTabbedAppMenuPropertiesDelegate.java | 4 +- .../document/BraveLauncherActivity.java | 4 +- .../settings/AppearancePreferences.java | 9 +- .../toolbar/bottom/BookmarksButton.java | 12 +- ...ottomTabSwitcherActionMenuCoordinator.java | 51 ++++ .../bottom/BottomToolbarCoordinator.java | 262 ++++++++++++++++++ .../bottom/BottomToolbarNewTabButton.java | 112 ++++++++ .../bottom/BottomToolbarVariationManager.java | 82 ++++++ .../BraveBottomToolbarConfiguration.java | 4 +- .../bottom/BraveBottomToolbarCoordinator.java | 8 +- .../BraveBottomToolbarVariationManager.java | 27 -- ...eBrowsingModeBottomToolbarCoordinator.java | 2 +- .../BrowsingModeBottomToolbarCoordinator.java | 261 +++++++++++++++++ ...BrowsingModeBottomToolbarLinearLayout.java | 52 ++++ .../BrowsingModeBottomToolbarMediator.java | 91 ++++++ .../BrowsingModeBottomToolbarModel.java | 25 ++ .../BrowsingModeBottomToolbarViewBinder.java | 38 +++ .../toolbar/bottom/SearchAccelerator.java | 100 +++++++ .../browser/toolbar/bottom/ShareButton.java | 104 +++++++ .../TabSwitcherBottomToolbarCoordinator.java | 111 ++++++++ .../TabSwitcherBottomToolbarMediator.java | 60 ++++ .../bottom/TabSwitcherBottomToolbarModel.java | 27 ++ .../TabSwitcherBottomToolbarViewBinder.java | 63 +++++ .../toolbar/top/BraveToolbarLayout.java | 1 - android/java/res/layout/bottom_toolbar.xml | 20 ++ .../res/layout/bottom_toolbar_browsing.xml | 81 ++++++ .../res/layout/bottom_toolbar_menu_button.xml | 36 +++ .../layout/bottom_toolbar_tab_switcher.xml | 57 ++++ .../java/res/layout/icon_row_menu_footer.xml | 53 ++++ android/java/res/layout/toolbar_space.xml | 14 + android/java/res/values/brave_dimens.xml | 8 + .../chromium/chrome/browser/BytecodeTest.java | 5 - .../android/strings/android_brave_strings.grd | 3 + build/android/bytecode/BUILD.gn | 1 - ...ottomToolbarConfigurationClassAdapter.java | 22 -- .../org/brave/bytecode/BraveClassAdapter.java | 1 - 39 files changed, 1750 insertions(+), 87 deletions(-) create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java delete mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java create mode 100644 android/java/res/layout/bottom_toolbar.xml create mode 100644 android/java/res/layout/bottom_toolbar_browsing.xml create mode 100644 android/java/res/layout/bottom_toolbar_menu_button.xml create mode 100644 android/java/res/layout/bottom_toolbar_tab_switcher.xml create mode 100644 android/java/res/layout/icon_row_menu_footer.xml create mode 100644 android/java/res/layout/toolbar_space.xml delete mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveBottomToolbarConfigurationClassAdapter.java diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index e0498901b98b..149610aa3371 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -690,6 +690,11 @@ brave_java_resources = [ "java/res/layout/binance_spinner_dropdown_item.xml", "java/res/layout/binance_spinner_item.xml", "java/res/layout/binance_summary_item.xml", + "java/res/layout/bottom_toolbar.xml", + "java/res/layout/bottom_toolbar_browsing.xml", + "java/res/layout/bottom_toolbar_menu_button.xml", + "java/res/layout/bottom_toolbar_tab_switcher.xml", + "java/res/layout/icon_row_menu_footer.xml", "java/res/layout/brave_ads_existing_user_dialog_layout.xml", "java/res/layout/brave_ads_new_user_dialog_layout.xml", "java/res/layout/brave_bookmark_toolbar.xml", @@ -756,6 +761,7 @@ brave_java_resources = [ "java/res/layout/ntp_widget_list_item_layout.xml", "java/res/layout/qa_code_check.xml", "java/res/layout/report_broken_site_layout.xml", + "java/res/layout/toolbar_space.xml", "java/res/layout/top_sites_layout.xml", "java/res/layout/tracker_item_layout.xml", "java/res/layout/user_wallet_activity.xml", diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 6916e16aff3e..c62f0d291aa9 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -147,11 +147,25 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java", - "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java", "../../brave/android/java/org/chromium/chrome/browser/ui/brave_tricks/checkbox_to_switch/CheckBoxPreference.java", "../../brave/android/java/org/chromium/chrome/browser/ui/messages/infobar/BraveSimpleConfirmInfoBarBuilder.java", diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 2e8016f86b8f..03b577a33292 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -73,7 +73,3 @@ -keep class org.chromium.base.CommandLineInitUtil { *** initCommandLine(...); } - --keep class org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration { - *** isBottomToolbarEnabled(...); -} diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index e63e0acb8edf..35d0fd20220f 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -28,7 +28,7 @@ import org.chromium.chrome.browser.tabbed_mode.TabbedAppMenuPropertiesDelegate; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.toolbar.ToolbarManager; -import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.bottom.BraveBottomToolbarConfiguration; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler; @@ -114,7 +114,7 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) { // Hide bookmark button if bottom toolbar is enabled ImageButton bookmarkButton = view.findViewById(R.id.bookmark_this_page_id); - if (bookmarkButton != null && BottomToolbarConfiguration.isBottomToolbarEnabled()) { + if (bookmarkButton != null && BraveBottomToolbarConfiguration.isBottomToolbarEnabled()) { bookmarkButton.setVisibility(View.GONE); } diff --git a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java index 941189052763..6108592d9c26 100644 --- a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java +++ b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java @@ -10,7 +10,7 @@ import org.chromium.chrome.browser.BraveHelper; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.bottom.BraveBottomToolbarConfiguration; /** * Base class for ChromeLauncherActivity @@ -23,7 +23,7 @@ public void onCreate(Bundle savedInstanceState) { // Disable key checker to avoid asserts on Brave keys in debug SharedPreferencesManager.getInstance().disableKeyCheckerForTesting(); - BottomToolbarConfiguration.isBottomToolbarEnabled(); + BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); BraveHelper.DisableFREDRP(); } } diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java index 4e5ff7f7e21b..50c8470a0d75 100644 --- a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java @@ -9,6 +9,7 @@ import android.content.SharedPreferences; import android.os.Bundle; + import androidx.preference.Preference; import org.chromium.base.ContextUtils; @@ -20,10 +21,10 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.night_mode.NightModeUtils; import org.chromium.chrome.browser.preferences.BravePreferenceKeys; -import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.chrome.browser.settings.BravePreferenceFragment; +import org.chromium.chrome.browser.toolbar.bottom.BraveBottomToolbarConfiguration; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.SettingsUtils; -import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.ui.base.DeviceFormFactor; public class AppearancePreferences extends BravePreferenceFragment @@ -89,7 +90,7 @@ public void onActivityCreated(Bundle savedInstanceState) { ContextUtils.getApplicationContext()); ((ChromeSwitchPreference) enableBottomToolbar) .setChecked(!isTablet - && BottomToolbarConfiguration.isBottomToolbarEnabled()); + && BraveBottomToolbarConfiguration.isBottomToolbarEnabled()); } } @@ -115,7 +116,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); if (BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY.equals(key)) { SharedPreferences prefs = ContextUtils.getAppSharedPreferences(); - Boolean originalStatus = BottomToolbarConfiguration.isBottomToolbarEnabled(); + Boolean originalStatus = BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); prefs.edit() .putBoolean(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, !originalStatus) diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java index 9d3cf1e1f3d3..4268889e1fa4 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java @@ -19,11 +19,12 @@ import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.ui.widget.ChromeImageButton; /** * The bookmarks button. */ -public class BookmarksButton extends ShareButton implements ThemeColorObserver, TintObserver { +public class BookmarksButton extends ChromeImageButton implements ThemeColorObserver, TintObserver { /** A provider that notifies components when the theme color changes.*/ private ThemeColorProvider mThemeColorProvider; private ColorStateList mCurrentTint; @@ -33,7 +34,6 @@ public BookmarksButton(Context context, AttributeSet attrs) { setImageDrawable(ContextCompat.getDrawable(context, R.drawable.btn_bookmark)); } - @Override public void destroy() { if (mThemeColorProvider != null) { mThemeColorProvider.removeThemeColorObserver(this); @@ -42,7 +42,6 @@ public void destroy() { } } - @Override public void setThemeColorProvider(ThemeColorProvider themeColorProvider) { mThemeColorProvider = themeColorProvider; mThemeColorProvider.addThemeColorObserver(this); @@ -72,17 +71,10 @@ public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { } setEnabled(editingAllowed); } - - @Override - public void setActivityTabProvider(ActivityTabProvider activityTabProvider) { - // sergz: Do nothing here, was added just to avoid extra patching - } - @Override public void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { } - @Override public void updateButtonEnabledState(Tab tab) { } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java new file mode 100644 index 000000000000..8f4ee18048dc --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java @@ -0,0 +1,51 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.view.View; +import android.view.View.OnLongClickListener; + +import org.chromium.base.Callback; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.toolbar.top.TabSwitcherActionMenuCoordinator; +import org.chromium.ui.modelutil.MVCListAdapter.ModelList; +import org.chromium.ui.widget.RectProvider; +import org.chromium.ui.widget.ViewRectProvider; + +/** + * The main coordinator for the Tab Switcher Action Menu on the bottom toolbar, + * responsible for creating the popup menu and building a list of menu items. + */ +public class BottomTabSwitcherActionMenuCoordinator extends TabSwitcherActionMenuCoordinator { + public static OnLongClickListener createOnLongClickListener(Callback onItemClicked) { + return createOnLongClickListener( + new BottomTabSwitcherActionMenuCoordinator(), onItemClicked); + } + + @Override + public ModelList buildMenuItems() { + ModelList itemList = new ModelList(); + itemList.add(buildListItemByMenuItemType(MenuItemType.NEW_TAB)); + itemList.add(buildListItemByMenuItemType(MenuItemType.NEW_INCOGNITO_TAB)); + itemList.add(buildListItemByMenuItemType(MenuItemType.DIVIDER)); + itemList.add(buildListItemByMenuItemType(MenuItemType.CLOSE_TAB)); + return itemList; + } + + @Override + protected RectProvider getRectProvider(View anchorView) { + ViewRectProvider rectProvider = new ViewRectProvider(anchorView); + rectProvider.setIncludePadding(true); + + // space between the icon and the border of the wrapper + int toolbarHeight = anchorView.getHeight(); + int iconHeight = + anchorView.getResources().getDimensionPixelSize(R.dimen.toolbar_icon_height); + int padding = (toolbarHeight - iconHeight) / 2; + rectProvider.setInsetPx(0, padding, padding / 2, 0); + + return rectProvider; + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java new file mode 100644 index 000000000000..431f4ab37dd3 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -0,0 +1,262 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.view.View; +import android.view.View.OnClickListener; +import android.view.View.OnLongClickListener; +import android.view.ViewGroup; +import android.view.ViewStub; + +import org.chromium.base.Callback; +import org.chromium.base.metrics.RecordUserAction; +import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.ObservableSupplierImpl; +import org.chromium.base.supplier.OneShotCallback; +import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ActivityTabProvider; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.OverviewModeObserver; +import org.chromium.chrome.browser.feature_engagement.TrackerFactory; +import org.chromium.chrome.browser.omnibox.LocationBar; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.share.ShareDelegate; +import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; +import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; +import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; +import org.chromium.components.feature_engagement.EventConstants; +import org.chromium.components.feature_engagement.Tracker; + +/** + * The root coordinator for the bottom toolbar. It has two sub-components: the browsing mode bottom + * toolbar and the tab switcher mode bottom toolbar. + */ +class BottomToolbarCoordinator { + /** The browsing mode bottom toolbar component */ + protected final BrowsingModeBottomToolbarCoordinator mBrowsingModeCoordinator; + + /** The tab switcher mode bottom toolbar component */ + private TabSwitcherBottomToolbarCoordinator mTabSwitcherModeCoordinator; + + /** The tab switcher mode bottom toolbar stub that will be inflated when native is ready. */ + private final ViewStub mTabSwitcherModeStub; + + /** A provider that notifies components when the theme color changes.*/ + private final ThemeColorProvider mThemeColorProvider; + + /** The overview mode manager. */ + protected OverviewModeBehavior mOverviewModeBehavior; + protected OverviewModeObserver mOverviewModeObserver; + + /** The activity tab provider. */ + private ActivityTabProvider mTabProvider; + + private final ObservableSupplier mShareDelegateSupplier; + private final Callback mShareDelegateSupplierCallback; + private ObservableSupplierImpl mShareButtonListenerSupplier = + new ObservableSupplierImpl<>(); + private final Supplier mShowStartSurfaceCallable; + private ObservableSupplier mOverviewModeBehaviorSupplier; + private Callback mOverviewModeBehaviorSupplierObserver; + private AppMenuButtonHelper mMenuButtonHelper; + + /** + * Build the coordinator that manages the bottom toolbar. + * @param stub The bottom toolbar {@link ViewStub} to inflate. + * @param tabProvider The {@link ActivityTabProvider} used for making the IPH. + * @param themeColorProvider The {@link ThemeColorProvider} for the bottom toolbar. + * @param shareDelegateSupplier The supplier for the {@link ShareDelegate} the bottom controls + * should use to share content. + * @param showStartSurfaceCallable The action that opens the start surface, returning true if + * the start surface is shown. + * @param openHomepageAction The action that opens the homepage. + * @param setUrlBarFocusAction The function that sets Url bar focus. The first argument is + * @param overviewModeBehaviorSupplier Supplier for the overview mode manager. + * @param menuButtonHelperSupplier + */ + BottomToolbarCoordinator(ViewStub stub, ActivityTabProvider tabProvider, + OnLongClickListener tabsSwitcherLongClickListner, ThemeColorProvider themeColorProvider, + ObservableSupplier shareDelegateSupplier, + Supplier showStartSurfaceCallable, Runnable openHomepageAction, + Callback setUrlBarFocusAction, + ObservableSupplier overviewModeBehaviorSupplier, + ObservableSupplier menuButtonHelperSupplier) { + View root = stub.inflate(); + + mOverviewModeBehaviorSupplierObserver = this::setOverviewModeBehavior; + mOverviewModeBehaviorSupplier = overviewModeBehaviorSupplier; + + mShowStartSurfaceCallable = showStartSurfaceCallable; + final OnClickListener homeButtonListener = v -> { + openHomepageAction.run(); + }; + + final OnClickListener searchAcceleratorListener = v -> { + RecordUserAction.record("MobileToolbarOmniboxAcceleratorTap"); + + // Only switch to HomePage when overview is showing. + if (mOverviewModeBehavior != null && mOverviewModeBehavior.overviewVisible()) { + mShowStartSurfaceCallable.get(); + } + setUrlBarFocusAction.onResult(LocationBar.OmniboxFocusReason.ACCELERATOR_TAP); + }; + + mBrowsingModeCoordinator = new BraveBrowsingModeBottomToolbarCoordinator(root, tabProvider, + homeButtonListener, searchAcceleratorListener, mShareButtonListenerSupplier, + tabsSwitcherLongClickListner, mOverviewModeBehaviorSupplier); + + mTabSwitcherModeStub = root.findViewById(R.id.bottom_toolbar_tab_switcher_mode_stub); + + mThemeColorProvider = themeColorProvider; + mTabProvider = tabProvider; + + mShareDelegateSupplier = shareDelegateSupplier; + mShareDelegateSupplierCallback = this::onShareDelegateAvailable; + mShareDelegateSupplier.addObserver(mShareDelegateSupplierCallback); + + new OneShotCallback<>(menuButtonHelperSupplier, (menuButtonHelper) -> { + if (menuButtonHelper != null) { + mMenuButtonHelper = menuButtonHelper; + } + }); + } + + /** + * Initialize the bottom toolbar with the components that had native initialization + * dependencies. + *

+ * Calling this must occur after the native library have completely loaded. + * @param tabSwitcherListener An {@link OnClickListener} that is triggered when the + * tab switcher button is clicked. + * @param newTabClickListener An {@link OnClickListener} that is triggered when the + * new tab button is clicked. + * @param tabCountProvider Updates the tab count number in the tab switcher button and in the + * incognito toggle tab layout. + * @param incognitoStateProvider Notifies components when incognito mode is entered or exited. + * @param topToolbarRoot The root {@link ViewGroup} of the top toolbar. + * @param closeAllTabsAction The runnable that closes all tabs in the current tab model. + */ + void initializeWithNative(OnClickListener tabSwitcherListener, + OnClickListener newTabClickListener, TabCountProvider tabCountProvider, + IncognitoStateProvider incognitoStateProvider, ViewGroup topToolbarRoot, + Runnable closeAllTabsAction) { + final OnClickListener closeTabsClickListener = v -> { + final boolean isIncognito = incognitoStateProvider.isIncognitoSelected(); + if (isIncognito) { + RecordUserAction.record("MobileToolbarCloseAllIncognitoTabsButtonTap"); + } else { + RecordUserAction.record("MobileToolbarCloseAllRegularTabsButtonTap"); + } + + closeAllTabsAction.run(); + }; + + + mBrowsingModeCoordinator.initializeWithNative(newTabClickListener, tabSwitcherListener, + mMenuButtonHelper, tabCountProvider, mThemeColorProvider, incognitoStateProvider); + mTabSwitcherModeCoordinator = new TabSwitcherBottomToolbarCoordinator(mTabSwitcherModeStub, + topToolbarRoot, incognitoStateProvider, mThemeColorProvider, newTabClickListener, + closeTabsClickListener, mMenuButtonHelper, tabCountProvider); + + // Do not change bottom bar if StartSurface Single Pane is enabled and HomePage is not + // customized. + if (!ReturnToChromeExperimentsUtil.shouldShowStartSurfaceAsTheHomePage() + && BottomToolbarVariationManager.shouldBottomToolbarBeVisibleInOverviewMode()) { + mOverviewModeObserver = new EmptyOverviewModeObserver() { + @Override + public void onOverviewModeStartedShowing(boolean showToolbar) { + mBrowsingModeCoordinator.getSearchAccelerator().setEnabled(false); + if (BottomToolbarVariationManager.isShareButtonOnBottom()) { + mBrowsingModeCoordinator.getShareButton().setEnabled(false); + } + if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { + mBrowsingModeCoordinator.getHomeButton().setEnabled(false); + } + } + + @Override + public void onOverviewModeStartedHiding( + boolean showToolbar, boolean delayAnimation) { + mBrowsingModeCoordinator.getSearchAccelerator().setEnabled(true); + if (BottomToolbarVariationManager.isShareButtonOnBottom()) { + mBrowsingModeCoordinator.getShareButton().updateButtonEnabledState( + mTabProvider.get()); + } + if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { + mBrowsingModeCoordinator.getHomeButton().updateButtonEnabledState( + mTabProvider.get()); + } + } + }; + mOverviewModeBehaviorSupplier.addObserver(mOverviewModeBehaviorSupplierObserver); + } + } + + /** + * @param isVisible Whether the bottom toolbar is visible. + */ + void setBottomToolbarVisible(boolean isVisible) { + if (mTabSwitcherModeCoordinator != null) { + mTabSwitcherModeCoordinator.showToolbarOnTop(!isVisible); + } + mBrowsingModeCoordinator.onVisibilityChanged(isVisible); + } + + /** + * Clean up any state when the bottom toolbar is destroyed. + */ + void destroy() { + mBrowsingModeCoordinator.destroy(); + if (mTabSwitcherModeCoordinator != null) { + mTabSwitcherModeCoordinator.destroy(); + mTabSwitcherModeCoordinator = null; + } + if (mOverviewModeBehavior != null) { + mOverviewModeBehavior.removeOverviewModeObserver(mOverviewModeObserver); + mOverviewModeBehavior = null; + } + if (mOverviewModeBehaviorSupplier != null) { + mOverviewModeBehaviorSupplier.removeObserver(mOverviewModeBehaviorSupplierObserver); + mOverviewModeBehaviorSupplier = null; + mOverviewModeBehaviorSupplierObserver = null; + } + mThemeColorProvider.destroy(); + mShareDelegateSupplier.removeObserver(mShareDelegateSupplierCallback); + } + + private void onShareDelegateAvailable(ShareDelegate shareDelegate) { + final OnClickListener shareButtonListener = v -> { + if (BottomToolbarVariationManager.isShareButtonOnBottom()) { + RecordUserAction.record("MobileBottomToolbarShareButton"); + } + + Tab tab = mTabProvider.get(); + shareDelegate.share(tab, /*shareDirectly=*/false); + }; + + mShareButtonListenerSupplier.set(shareButtonListener); + } + + private void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { + assert overviewModeBehavior != null; + assert mOverviewModeBehavior + == null + : "TODO(https://crbug.com/1084528): the overview mode manager should set at most once."; + mOverviewModeBehavior = overviewModeBehavior; + mOverviewModeBehavior.addOverviewModeObserver(mOverviewModeObserver); + } + + public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { + if (mBrowsingModeCoordinator != null) { + ((BraveBrowsingModeBottomToolbarCoordinator) mBrowsingModeCoordinator) + .updateBookmarkButton(isBookmarked, editingAllowed); + } + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java new file mode 100644 index 000000000000..a501280fc8a2 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java @@ -0,0 +1,112 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.content.res.Resources; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; + +import androidx.annotation.StringRes; + +import org.chromium.base.ApiCompatibilityUtils; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; +import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; +import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; +import org.chromium.chrome.browser.toolbar.IncognitoStateProvider.IncognitoStateObserver; +import org.chromium.chrome.browser.toolbar.ToolbarColors; +import org.chromium.ui.widget.ChromeImageButton; + +/** + * The tab switcher new tab button. + */ +class BottomToolbarNewTabButton extends ChromeImageButton + implements IncognitoStateObserver, ThemeColorObserver, TintObserver { + /** The gray pill background behind the plus icon. */ + private Drawable mBackground; + + /** The {@link Resources} used to compute the background color. */ + private final Resources mResources; + + /** A provider that notifies when incognito mode is entered or exited. */ + private IncognitoStateProvider mIncognitoStateProvider; + + /** A provider that notifies when the theme color changes.*/ + private ThemeColorProvider mThemeColorProvider; + + public BottomToolbarNewTabButton(Context context, AttributeSet attrs) { + super(context, attrs); + + mResources = context.getResources(); + } + + @Override + public void setBackground(Drawable background) { + super.setBackground(background); + mBackground = background; + } + + /** + * Clean up any state when the new tab button is destroyed. + */ + void destroy() { + if (mIncognitoStateProvider != null) { + mIncognitoStateProvider.removeObserver(this); + mIncognitoStateProvider = null; + } + if (mThemeColorProvider != null) { + mThemeColorProvider.removeThemeColorObserver(this); + mThemeColorProvider.removeTintObserver(this); + mThemeColorProvider = null; + } + } + + void setIncognitoStateProvider(IncognitoStateProvider incognitoStateProvider) { + mIncognitoStateProvider = incognitoStateProvider; + mIncognitoStateProvider.addIncognitoStateObserverAndTrigger(this); + } + + @Override + public void onIncognitoStateChanged(boolean isIncognito) { + @StringRes + int resId = isIncognito ? R.string.accessibility_toolbar_btn_new_incognito_tab + : R.string.accessibility_toolbar_btn_new_tab; + setContentDescription(getResources().getText(resId)); + updateBackground(); + } + + void setThemeColorProvider(ThemeColorProvider themeColorProvider) { + mThemeColorProvider = themeColorProvider; + mThemeColorProvider.addThemeColorObserver(this); + mThemeColorProvider.addTintObserver(this); + } + + @Override + public void onThemeColorChanged(int primaryColor, boolean shouldAnimate) { + updateBackground(); + } + + @Override + public void onTintChanged(ColorStateList tint, boolean useLight) { + ApiCompatibilityUtils.setImageTintList(this, tint); + updateBackground(); + } + + private void updateBackground() { + if (mThemeColorProvider == null || mIncognitoStateProvider == null || mBackground == null) { + return; + } + mBackground.setColorFilter( + ToolbarColors.getTextBoxColorForToolbarBackgroundInNonNativePage(mResources, + mThemeColorProvider.getThemeColor(), + mThemeColorProvider.useLight() + && mIncognitoStateProvider.isIncognitoSelected()), + PorterDuff.Mode.SRC_IN); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java new file mode 100644 index 000000000000..5445578d59ae --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java @@ -0,0 +1,82 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import androidx.annotation.StringDef; +import androidx.annotation.VisibleForTesting; + +import org.chromium.chrome.browser.flags.CachedFeatureFlags; +import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.flags.StringCachedFieldTrialParameter; +import org.chromium.chrome.browser.incognito.IncognitoUtils; +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; +import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; +import org.chromium.chrome.features.start_surface.StartSurfaceConfiguration; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * The variation manager helps figure out the current variation and the visibility of buttons on + * bottom toolbar. Every operation related to the variation, e.g. getting variation value, should be + * through {@link BottomToolbarVariationManager} rather than calling {@link CachedFeatureFlags}. + */ +public class BottomToolbarVariationManager { + /** + * @return Whether or not share button should be visible on the top toolbar in portrait mode + * in the current variation. + */ + public static boolean isShareButtonOnBottom() { + return false; + } + + /** + * @return Whether or not new tab button should be visible on the bottom toolbar + * in portrait mode in the current variation. + */ + public static boolean isNewTabButtonOnBottom() { + return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + } + + /** + * @return Whether or not menu button should be visible on the top toolbar + * in portrait mode in the current variation. + */ + public static boolean isMenuButtonOnBottom() { + return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + } + + /** + * @return Whether or not bottom toolbar should be visible in overview mode of portrait mode + * in the current variation. + */ + public static boolean shouldBottomToolbarBeVisibleInOverviewMode() { + return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + } + + /** + * @return Whether or not home button should be visible in top toolbar of portrait mode + * in current variation. + */ + public static boolean isHomeButtonOnBottom() { + return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + } + + /** + * @return Whether or not tab switcher button should be visible in bottom toolbar + * of portrait mode in current variation. + */ + public static boolean isTabSwitcherOnBottom() { + return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + } + + /** + * @return Whether or not bookmark button should be visible in bottom toolbar + * of portrait mode in current variation. + */ + public static boolean isBookmarkButtonOnBottom() { + return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java index 91940574c4e6..5d33f455fbc1 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java @@ -23,8 +23,8 @@ public class BraveBottomToolbarConfiguration { private static final int SMALL_SCREEN_HEIGHT = 640; public static boolean isBottomToolbarEnabled() { - if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(ContextUtils.getApplicationContext()) - || TabUiFeatureUtilities.isTabGroupsAndroidEnabled()) { + if (DeviceFormFactor.isNonMultiDisplayContextOnTablet( + ContextUtils.getApplicationContext())) { return false; } SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences(); diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java index 9d51546118a5..7a37226ddcb0 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java @@ -29,9 +29,9 @@ import org.chromium.chrome.browser.toolbar.HomeButton; import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.toolbar.bottom.BookmarksButton; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarNewTabButton; import org.chromium.chrome.browser.toolbar.bottom.SearchAccelerator; -import org.chromium.chrome.browser.toolbar.bottom.ShareButton; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.chrome.browser.util.TabUtils; import org.chromium.ui.widget.Toast; @@ -39,7 +39,7 @@ public class BraveBottomToolbarCoordinator extends BottomToolbarCoordinator implements View.OnLongClickListener { private HomeButton mHomeButton; - private ShareButton mBookmarksButton; + private BookmarksButton mBookmarksButton; private SearchAccelerator mSearchAccelerator; private BottomToolbarNewTabButton mNewTabButton; private ActivityTabProvider mBraveTabProvider; @@ -150,7 +150,7 @@ public void onOverviewModeStartedShowing(boolean showToolbar) { if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { browsingModeCoordinator.getHomeButton().setVisibility(View.INVISIBLE); } - if (BraveBottomToolbarVariationManager.isBraveVariation()) { + if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { browsingModeCoordinator.getBookmarkButton().setVisibility(View.INVISIBLE); } if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { @@ -177,7 +177,7 @@ public void onOverviewModeStartedHiding( browsingModeCoordinator.getHomeButton().updateButtonEnabledState( mBraveTabProvider.get()); } - if (BraveBottomToolbarVariationManager.isBraveVariation()) { + if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { browsingModeCoordinator.getBookmarkButton().setVisibility(View.VISIBLE); } if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java deleted file mode 100644 index 7b1191fa4801..000000000000 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.toolbar.bottom; - -import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; - -/** - * Brave's extension for BottomToolbarVariationManager - */ -public class BraveBottomToolbarVariationManager - extends BottomToolbarVariationManager { - private static String sBraveVariation; - - private static @Variations String getBraveVariation() { - if (sBraveVariation != null) return sBraveVariation; - sBraveVariation = Variations.NONE; - return sBraveVariation; - } - - public static boolean isBraveVariation() { - return BottomToolbarConfiguration.isBottomToolbarEnabled() - && getBraveVariation().equals(Variations.NONE); - } -} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java index 711807ba59a3..8f6af7808af9 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java @@ -44,7 +44,7 @@ public class BraveBrowsingModeBottomToolbarCoordinator mBraveToolbarRoot = root.findViewById(R.id.bottom_toolbar_browsing); mBraveNewTabButton = mBraveToolbarRoot.findViewById(R.id.bottom_new_tab_button); mBookmarkButton = mBraveToolbarRoot.findViewById(R.id.bottom_bookmark_button); - if (BraveBottomToolbarVariationManager.isBraveVariation()) { + if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { mBookmarkButton.setVisibility(View.VISIBLE); getNewTabButtonParent().setVisibility(View.GONE); OnClickListener bookmarkClickHandler = v -> { diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java new file mode 100644 index 000000000000..2ffa1c03d947 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -0,0 +1,261 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.view.View; +import android.view.View.OnClickListener; +import android.view.View.OnLongClickListener; + +import org.chromium.base.Callback; +import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ActivityTabProvider; +import org.chromium.chrome.browser.ActivityTabProvider.HintlessActivityTabObserver; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.feature_engagement.TrackerFactory; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tab.TabUtils; +import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; +import org.chromium.chrome.browser.toolbar.HomeButton; +import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; +import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.toolbar.TabSwitcherButtonCoordinator; +import org.chromium.chrome.browser.toolbar.TabSwitcherButtonView; +import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; +import org.chromium.components.feature_engagement.FeatureConstants; +import org.chromium.components.feature_engagement.Tracker; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor; + +/** + * The coordinator for the browsing mode bottom toolbar. This class has two primary components, + * an Android view that handles user actions and a composited texture that draws when the controls + * are being scrolled off-screen. The Android version does not draw unless the controls offset is 0. + */ +public class BrowsingModeBottomToolbarCoordinator { + /** The mediator that handles events from outside the browsing mode bottom toolbar. */ + private final BrowsingModeBottomToolbarMediator mMediator; + + /** The home button that lives in the bottom toolbar. */ + private final HomeButton mHomeButton; + + /** The share button that lives in the bottom toolbar. */ + private final ShareButton mShareButton; + + /** The new tab button that lives in the bottom toolbar. */ + private final BottomToolbarNewTabButton mNewTabButton; + + /** The search accelerator that lives in the bottom toolbar. */ + private final SearchAccelerator mSearchAccelerator; + + /** The tab switcher button component that lives in the bottom toolbar. */ + private final TabSwitcherButtonCoordinator mTabSwitcherButtonCoordinator; + + /** The tab switcher button view that lives in the bottom toolbar. */ + private final TabSwitcherButtonView mTabSwitcherButtonView; + + /** The view group that includes all views shown on browsing mode */ + private final BrowsingModeBottomToolbarLinearLayout mToolbarRoot; + + /** The model for the browsing mode bottom toolbar that holds all of its state. */ + private final BrowsingModeBottomToolbarModel mModel; + + /** The callback to be exectured when the share button on click listener is available. */ + private Callback mShareButtonListenerSupplierCallback; + + /** The supplier for the share button on click listener. */ + private ObservableSupplier mShareButtonListenerSupplier; + + /** The activity tab provider that used for making the IPH. */ + private final ActivityTabProvider mTabProvider; + + private Callback mOverviewModeBehaviorSupplierObserver; + private ObservableSupplier mOverviewModeBehaviorSupplier; + + /** + * Build the coordinator that manages the browsing mode bottom toolbar. + * @param root The root {@link View} for locating the views to inflate. + * @param tabProvider The {@link ActivityTabProvider} used for making the IPH. + * @param homeButtonListener The {@link OnClickListener} for the home button. + * @param searchAcceleratorListener The {@link OnClickListener} for the search accelerator. + * @param shareButtonListener The {@link OnClickListener} for the share button. + * @param overviewModeBehaviorSupplier Supplier for the overview mode manager. + */ + BrowsingModeBottomToolbarCoordinator(View root, ActivityTabProvider tabProvider, + OnClickListener homeButtonListener, OnClickListener searchAcceleratorListener, + ObservableSupplier shareButtonListenerSupplier, + OnLongClickListener tabSwitcherLongClickListener, + ObservableSupplier overviewModeBehaviorSupplier) { + mModel = new BrowsingModeBottomToolbarModel(); + mToolbarRoot = root.findViewById(R.id.bottom_toolbar_browsing); + mTabProvider = tabProvider; + + PropertyModelChangeProcessor.create( + mModel, mToolbarRoot, new BrowsingModeBottomToolbarViewBinder()); + + mMediator = new BrowsingModeBottomToolbarMediator(mModel); + + mHomeButton = mToolbarRoot.findViewById(R.id.bottom_home_button); + mHomeButton.setOnClickListener(homeButtonListener); + mHomeButton.setActivityTabProvider(mTabProvider); + + mNewTabButton = mToolbarRoot.findViewById(R.id.bottom_new_tab_button); + + mShareButton = mToolbarRoot.findViewById(R.id.bottom_share_button); + + mSearchAccelerator = mToolbarRoot.findViewById(R.id.search_accelerator); + mSearchAccelerator.setOnClickListener(searchAcceleratorListener); + + // TODO(amaralp): Make this adhere to MVC framework. + mTabSwitcherButtonView = mToolbarRoot.findViewById(R.id.bottom_tab_switcher_button); + mTabSwitcherButtonCoordinator = new TabSwitcherButtonCoordinator(mTabSwitcherButtonView); + + mTabSwitcherButtonView.setOnLongClickListener(tabSwitcherLongClickListener); + if (BottomToolbarVariationManager.isNewTabButtonOnBottom()) { + mNewTabButton.setVisibility(View.VISIBLE); + } + if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { + mHomeButton.setVisibility(View.VISIBLE); + } + + if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { + mTabSwitcherButtonView.setVisibility(View.VISIBLE); + } + if (BottomToolbarVariationManager.isShareButtonOnBottom()) { + mShareButton.setVisibility(View.VISIBLE); + mShareButtonListenerSupplierCallback = shareButtonListener -> { + mShareButton.setOnClickListener(shareButtonListener); + }; + mShareButtonListenerSupplier = shareButtonListenerSupplier; + mShareButton.setActivityTabProvider(mTabProvider); + mShareButtonListenerSupplier.addObserver(mShareButtonListenerSupplierCallback); + } + + mOverviewModeBehaviorSupplier = overviewModeBehaviorSupplier; + mOverviewModeBehaviorSupplierObserver = this::setOverviewModeBehavior; + mOverviewModeBehaviorSupplier.addObserver(mOverviewModeBehaviorSupplierObserver); + } + + /** + * @param isVisible Whether the bottom toolbar is visible. + */ + void onVisibilityChanged(boolean isVisible) {} + + /** + * Initialize the bottom toolbar with the components that had native initialization + * dependencies. + *

+ * Calling this must occur after the native library have completely loaded. + * @param tabSwitcherListener An {@link OnClickListener} that is triggered when the + * tab switcher button is clicked. + * @param menuButtonHelper An {@link AppMenuButtonHelper} that is triggered when the + * menu button is clicked. + * @param tabCountProvider Updates the tab count number in the tab switcher button. + * @param themeColorProvider Notifies components when theme color changes. + * @param incognitoStateProvider Notifies components when incognito state changes. + */ + void initializeWithNative(OnClickListener newTabListener, OnClickListener tabSwitcherListener, + AppMenuButtonHelper menuButtonHelper, TabCountProvider tabCountProvider, + ThemeColorProvider themeColorProvider, IncognitoStateProvider incognitoStateProvider) { + mMediator.setThemeColorProvider(themeColorProvider); + if (BottomToolbarVariationManager.isNewTabButtonOnBottom()) { + mNewTabButton.setOnClickListener(newTabListener); + mNewTabButton.setThemeColorProvider(themeColorProvider); + mNewTabButton.setIncognitoStateProvider(incognitoStateProvider); + } + if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { + mHomeButton.setThemeColorProvider(themeColorProvider); + } + + if (BottomToolbarVariationManager.isShareButtonOnBottom()) { + mShareButton.setThemeColorProvider(themeColorProvider); + } + + mSearchAccelerator.setThemeColorProvider(themeColorProvider); + mSearchAccelerator.setIncognitoStateProvider(incognitoStateProvider); + + if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { + mTabSwitcherButtonCoordinator.setTabSwitcherListener(tabSwitcherListener); + mTabSwitcherButtonCoordinator.setThemeColorProvider(themeColorProvider); + mTabSwitcherButtonCoordinator.setTabCountProvider(tabCountProvider); + } + } + + private void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { + assert overviewModeBehavior != null; + + // If StartSurface is HomePage, BrowsingModeBottomToolbar is shown in browsing mode and in + // overview mode. We need to pass the OverviewModeBehavior to the buttons so they are + // disabled based on the overview state. + if (ReturnToChromeExperimentsUtil.shouldShowStartSurfaceAsTheHomePage()) { + mShareButton.setOverviewModeBehavior(overviewModeBehavior); + mTabSwitcherButtonCoordinator.setOverviewModeBehavior(overviewModeBehavior); + mHomeButton.setOverviewModeBehavior(overviewModeBehavior); + } + } + + /** + * @param enabled Whether to disable click events on the bottom toolbar. Setting true can also + * prevent from all click events on toolbar and all children views on toolbar. + */ + void setTouchEnabled(boolean enabled) { + mToolbarRoot.setTouchEnabled(enabled); + } + + /** + * @param visible Whether to hide the tab switcher bottom toolbar + */ + void setVisible(boolean visible) { + mModel.set(BrowsingModeBottomToolbarModel.IS_VISIBLE, visible); + } + + /** + * @return The browsing mode bottom toolbar's share button. + */ + ShareButton getShareButton() { + return mShareButton; + } + + /** + * @return The browsing mode bottom toolbar's tab switcher button. + */ + TabSwitcherButtonView getTabSwitcherButtonView() { + return mTabSwitcherButtonView; + } + + /** + * @return The browsing mode bottom toolbar's search button. + */ + SearchAccelerator getSearchAccelerator() { + return mSearchAccelerator; + } + + /** + * @return The browsing mode bottom toolbar's home button. + */ + HomeButton getHomeButton() { + return mHomeButton; + } + + /** + * Clean up any state when the browsing mode bottom toolbar is destroyed. + */ + public void destroy() { + if (mShareButtonListenerSupplier != null) { + mShareButtonListenerSupplier.removeObserver(mShareButtonListenerSupplierCallback); + } + if (mOverviewModeBehaviorSupplier != null) { + mOverviewModeBehaviorSupplier.removeObserver(mOverviewModeBehaviorSupplierObserver); + mOverviewModeBehaviorSupplier = null; + mOverviewModeBehaviorSupplierObserver = null; + } + mMediator.destroy(); + mHomeButton.destroy(); + mShareButton.destroy(); + mSearchAccelerator.destroy(); + mTabSwitcherButtonCoordinator.destroy(); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java new file mode 100644 index 000000000000..cf6fb2bd13f1 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java @@ -0,0 +1,52 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.widget.LinearLayout; + +import androidx.annotation.Nullable; + +/** + * A linear layout which can intercept touch events to prevent from invoking click listeners on + * children views. + */ +public class BrowsingModeBottomToolbarLinearLayout extends LinearLayout { + private boolean mTouchEnabled = true; + + public BrowsingModeBottomToolbarLinearLayout(Context context) { + super(context); + } + + public BrowsingModeBottomToolbarLinearLayout(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + public BrowsingModeBottomToolbarLinearLayout( + Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + /** + * @param enabled True if all touch events will be intercepted. + */ + public void setTouchEnabled(boolean enabled) { + mTouchEnabled = enabled; + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + if (!mTouchEnabled) return true; + return super.onInterceptTouchEvent(ev); + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if (!mTouchEnabled) return true; + return super.onTouchEvent(event); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java new file mode 100644 index 000000000000..3daa61ac1e59 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java @@ -0,0 +1,91 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.app.Activity; +import android.graphics.Color; +import android.view.View; + +import androidx.annotation.ColorInt; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AppCompatActivity; + +import org.chromium.base.ApiCompatibilityUtils; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.AppHooks; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.components.browser_ui.widget.FeatureHighlightProvider; +import org.chromium.components.feature_engagement.FeatureConstants; +import org.chromium.components.feature_engagement.Tracker; + +/** + * This class is responsible for reacting to events from the outside world, interacting with other + * coordinators, running most of the business logic associated with the browsing mode bottom + * toolbar, and updating the model accordingly. + */ +class BrowsingModeBottomToolbarMediator implements ThemeColorObserver { + /** The transparency fraction of the IPH bubble. */ + private static final float DUET_IPH_BUBBLE_ALPHA_FRACTION = 0.9f; + + /** The transparency fraction of the IPH background. */ + private static final float DUET_IPH_BACKGROUND_ALPHA_FRACTION = 0.3f; + + /** The dismissable parameter name of the IPH. */ + static final String DUET_IPH_TAP_TO_DISMISS_PARAM_NAME = "duet_iph_tap_to_dismiss_enabled"; + + /** The model for the browsing mode bottom toolbar that holds all of its state. */ + private final BrowsingModeBottomToolbarModel mModel; + + /** The overview mode manager. */ + private OverviewModeBehavior mOverviewModeBehavior; + + /** A provider that notifies components when the theme color changes.*/ + private ThemeColorProvider mThemeColorProvider; + + private FeatureHighlightProvider mFeatureHighlightProvider; + + /** + * Build a new mediator that handles events from outside the bottom toolbar. + * @param model The {@link BrowsingModeBottomToolbarModel} that holds all the state for the + * browsing mode bottom toolbar. + */ + BrowsingModeBottomToolbarMediator(BrowsingModeBottomToolbarModel model) { + mModel = model; + mFeatureHighlightProvider = AppHooks.get().createFeatureHighlightProvider(); + } + + void setThemeColorProvider(ThemeColorProvider themeColorProvider) { + mThemeColorProvider = themeColorProvider; + mThemeColorProvider.addThemeColorObserver(this); + } + + /** + * Clean up anything that needs to be when the bottom toolbar is destroyed. + */ + void destroy() { + if (mThemeColorProvider != null) { + mThemeColorProvider.removeThemeColorObserver(this); + mThemeColorProvider = null; + } + } + + @Override + public void onThemeColorChanged(int primaryColor, boolean shouldAnimate) { + mModel.set(BrowsingModeBottomToolbarModel.PRIMARY_COLOR, primaryColor); + } + + /** + * Set the alpha for the color. + * @param baseColor The color which alpha will apply to. + * @param alpha The desired alpha for the color. The value should between 0 to 1. 0 means total + * transparency, 1 means total non-transparency. + */ + private @ColorInt int applyCustomAlphaToColor(@ColorInt int baseColor, float alpha) { + return (baseColor & 0x00FFFFFF) | ((int) (alpha * 255) << 24); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java new file mode 100644 index 000000000000..0d866623f65c --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java @@ -0,0 +1,25 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import org.chromium.ui.modelutil.PropertyModel; + +/** + * All of the state for the bottom toolbar, updated by the {@link + * BrowsingModeBottomToolbarCoordinator}. + */ +public class BrowsingModeBottomToolbarModel extends PropertyModel { + /** Primary color of bottom toolbar. */ + static final WritableIntPropertyKey PRIMARY_COLOR = new WritableIntPropertyKey(); + + /** Whether the browsing mode bottom toolbar is visible */ + static final WritableBooleanPropertyKey IS_VISIBLE = new WritableBooleanPropertyKey(); + + /** Default constructor. */ + BrowsingModeBottomToolbarModel() { + super(IS_VISIBLE, PRIMARY_COLOR); + set(IS_VISIBLE, true); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java new file mode 100644 index 000000000000..74c1f61d0cc2 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java @@ -0,0 +1,38 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.view.View; + +import org.chromium.ui.modelutil.PropertyKey; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor; + +/** + * This class is responsible for pushing updates to both the Android view and the compositor + * component of the browsing mode bottom toolbar. These updates are pulled from the + * {@link BrowsingModeBottomToolbarModel} when a notification of an update is received. + */ +public class BrowsingModeBottomToolbarViewBinder + implements PropertyModelChangeProcessor + .ViewBinder { + /** + * Build a binder that handles interaction between the model and the views that make up the + * browsing mode bottom toolbar. + */ + BrowsingModeBottomToolbarViewBinder() {} + + @Override + public final void bind( + BrowsingModeBottomToolbarModel model, View view, PropertyKey propertyKey) { + if (BrowsingModeBottomToolbarModel.PRIMARY_COLOR == propertyKey) { + view.setBackgroundColor(model.get(BrowsingModeBottomToolbarModel.PRIMARY_COLOR)); + } else if (BrowsingModeBottomToolbarModel.IS_VISIBLE == propertyKey) { + view.setVisibility(model.get(BrowsingModeBottomToolbarModel.IS_VISIBLE) ? View.VISIBLE + : View.GONE); + } else { + assert false : "Unhandled property detected in BrowsingModeBottomToolbarViewBinder!"; + } + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java new file mode 100644 index 000000000000..e4bacfa1192b --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java @@ -0,0 +1,100 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.content.res.Resources; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; + +import org.chromium.base.ApiCompatibilityUtils; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; +import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; +import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; +import org.chromium.chrome.browser.toolbar.IncognitoStateProvider.IncognitoStateObserver; +import org.chromium.chrome.browser.toolbar.ToolbarColors; +import org.chromium.ui.widget.ChromeImageButton; + +/** + * The search accelerator. + */ +class SearchAccelerator extends ChromeImageButton + implements ThemeColorObserver, TintObserver, IncognitoStateObserver { + /** The gray pill background behind the search icon. */ + private final Drawable mBackground; + + /** The {@link Resources} used to compute the background color. */ + private final Resources mResources; + + /** A provider that notifies components when the theme color changes.*/ + private ThemeColorProvider mThemeColorProvider; + + /** A provider that notifies when incognito mode is entered or exited. */ + private IncognitoStateProvider mIncognitoStateProvider; + + public SearchAccelerator(Context context, AttributeSet attrs) { + super(context, attrs); + + mResources = context.getResources(); + + mBackground = ApiCompatibilityUtils.getDrawable(mResources, R.drawable.ntp_search_box); + mBackground.mutate(); + setBackground(mBackground); + } + + void setThemeColorProvider(ThemeColorProvider themeColorProvider) { + mThemeColorProvider = themeColorProvider; + mThemeColorProvider.addThemeColorObserver(this); + mThemeColorProvider.addTintObserver(this); + } + + void setIncognitoStateProvider(IncognitoStateProvider provider) { + mIncognitoStateProvider = provider; + mIncognitoStateProvider.addIncognitoStateObserverAndTrigger(this); + } + + void destroy() { + if (mThemeColorProvider != null) { + mThemeColorProvider.removeThemeColorObserver(this); + mThemeColorProvider.removeTintObserver(this); + mThemeColorProvider = null; + } + + if (mIncognitoStateProvider != null) { + mIncognitoStateProvider.removeObserver(this); + mIncognitoStateProvider = null; + } + } + + @Override + public void onThemeColorChanged(int color, boolean shouldAnimate) { + updateBackground(); + } + + @Override + public void onTintChanged(ColorStateList tint, boolean useLight) { + ApiCompatibilityUtils.setImageTintList(this, tint); + updateBackground(); + } + + @Override + public void onIncognitoStateChanged(boolean isIncognito) { + updateBackground(); + } + + private void updateBackground() { + if (mThemeColorProvider == null || mIncognitoStateProvider == null) return; + + mBackground.setColorFilter(ToolbarColors.getTextBoxColorForToolbarBackgroundInNonNativePage( + mResources, mThemeColorProvider.getThemeColor(), + mIncognitoStateProvider.isIncognitoSelected() + && mThemeColorProvider.useLight()), + PorterDuff.Mode.SRC_IN); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java new file mode 100644 index 000000000000..b54faf1afa0f --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java @@ -0,0 +1,104 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.util.AttributeSet; + +import org.chromium.base.ApiCompatibilityUtils; +import org.chromium.chrome.browser.ActivityTabProvider; +import org.chromium.chrome.browser.ActivityTabProvider.ActivityTabTabObserver; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; +import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.share.ShareUtils; +import org.chromium.chrome.browser.tab.Tab; +import org.chromium.ui.widget.ChromeImageButton; + +/** + * The share button. + */ +class ShareButton extends ChromeImageButton implements TintObserver { + /** A provider that notifies components when the theme color changes.*/ + private ThemeColorProvider mThemeColorProvider; + + /** The {@link ActivityTabTabObserver} used to know when the active page changed. */ + private ActivityTabTabObserver mActivityTabTabObserver; + + /** The {@link OverviewModeBehavior} used to observe overview state changes. */ + private OverviewModeBehavior mOverviewModeBehavior; + + /** The {@link OvervieModeObserver} observing the OverviewModeBehavior */ + private OverviewModeBehavior.OverviewModeObserver mOverviewModeObserver; + + /** A collection of sharing utility functions.*/ + private ShareUtils mShareUtils; + + public ShareButton(Context context, AttributeSet attrs) { + super(context, attrs); + + mOverviewModeObserver = new EmptyOverviewModeObserver() { + @Override + public void onOverviewModeStartedShowing(boolean showTabSwitcherToolbar) { + setEnabled(false); + } + }; + + mShareUtils = new ShareUtils(); + } + + void setThemeColorProvider(ThemeColorProvider themeColorProvider) { + mThemeColorProvider = themeColorProvider; + mThemeColorProvider.addTintObserver(this); + } + + void setActivityTabProvider(ActivityTabProvider activityTabProvider) { + mActivityTabTabObserver = new ActivityTabTabObserver(activityTabProvider) { + @Override + public void onObservingDifferentTab(Tab tab, boolean hint) { + updateButtonEnabledState(tab); + } + + @Override + public void onUpdateUrl(Tab tab, String url) { + updateButtonEnabledState(tab); + } + }; + } + + public void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { + assert overviewModeBehavior != null; + mOverviewModeBehavior = overviewModeBehavior; + mOverviewModeBehavior.addOverviewModeObserver(mOverviewModeObserver); + } + + void destroy() { + if (mThemeColorProvider != null) { + mThemeColorProvider.removeTintObserver(this); + mThemeColorProvider = null; + } + if (mActivityTabTabObserver != null) { + mActivityTabTabObserver.destroy(); + mActivityTabTabObserver = null; + } + + if (mOverviewModeBehavior != null) { + mOverviewModeBehavior.removeOverviewModeObserver(mOverviewModeObserver); + mOverviewModeObserver = null; + } + } + + public void updateButtonEnabledState(Tab tab) { + final boolean isEnabled = mShareUtils.shouldEnableShare(tab); + setEnabled(isEnabled); + } + + @Override + public void onTintChanged(ColorStateList tint, boolean useLight) { + ApiCompatibilityUtils.setImageTintList(this, tint); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java new file mode 100644 index 000000000000..28aaa3ba8f78 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java @@ -0,0 +1,111 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.graphics.drawable.Drawable; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewGroup; +import android.view.ViewStub; + +import org.chromium.base.ApiCompatibilityUtils; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; +import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; +import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor; + +/** + * The coordinator for the tab switcher mode bottom toolbar. This class handles all interactions + * that the tab switcher bottom toolbar has with the outside world. + * TODO(crbug.com/1036474): This coordinator is not used currently and can be removed if the final + * duet design doesn't need a stand-alone toolbar in tab switcher mode. + */ +public class TabSwitcherBottomToolbarCoordinator { + /** The mediator that handles events from outside the tab switcher bottom toolbar. */ + private final TabSwitcherBottomToolbarMediator mMediator; + + /** The new tab button that lives in the tab switcher bottom toolbar. */ + private final BottomToolbarNewTabButton mNewTabButton; + + /** The menu button that lives in the tab switcher bottom toolbar. */ + private final MenuButton mMenuButton; + + /** The model for the tab switcher bottom toolbar that holds all of its state. */ + private final TabSwitcherBottomToolbarModel mModel; + + /** + * Build the coordinator that manages the tab switcher bottom toolbar. + * @param stub The tab switcher bottom toolbar {@link ViewStub} to inflate. + * @param topToolbarRoot The root {@link ViewGroup} of the top toolbar. + * @param incognitoStateProvider Notifies components when incognito mode is entered or exited. + * @param themeColorProvider Notifies components when the theme color changes. + * @param newTabClickListener An {@link OnClickListener} that is triggered when the + * new tab button is clicked. + * @param closeTabsClickListener An {@link OnClickListener} that is triggered when the + * close all tabs button is clicked. + * @param menuButtonHelper An {@link AppMenuButtonHelper} that is triggered when the + * menu button is clicked. + * @param tabCountProvider Updates the tab count number in the tab switcher button and in the + * incognito toggle tab layout. + */ + TabSwitcherBottomToolbarCoordinator(ViewStub stub, ViewGroup topToolbarRoot, + IncognitoStateProvider incognitoStateProvider, ThemeColorProvider themeColorProvider, + OnClickListener newTabClickListener, OnClickListener closeTabsClickListener, + AppMenuButtonHelper menuButtonHelper, TabCountProvider tabCountProvider) { + final ViewGroup root = (ViewGroup) stub.inflate(); + + View toolbar = root.findViewById(R.id.bottom_toolbar_buttons); + ViewGroup.LayoutParams params = toolbar.getLayoutParams(); + params.height = root.getResources().getDimensionPixelOffset(R.dimen.bottom_controls_height); + + mModel = new TabSwitcherBottomToolbarModel(); + + PropertyModelChangeProcessor.create(mModel, root, + new TabSwitcherBottomToolbarViewBinder( + topToolbarRoot, (ViewGroup) root.getParent())); + + mMediator = new TabSwitcherBottomToolbarMediator(mModel, themeColorProvider); + + mNewTabButton = root.findViewById(R.id.tab_switcher_new_tab_button); + Drawable background = + ApiCompatibilityUtils.getDrawable(root.getResources(), R.drawable.ntp_search_box); + background.mutate(); + mNewTabButton.setBackground(background); + mNewTabButton.setOnClickListener(newTabClickListener); + mNewTabButton.setIncognitoStateProvider(incognitoStateProvider); + mNewTabButton.setThemeColorProvider(themeColorProvider); + + assert menuButtonHelper != null; + mMenuButton = root.findViewById(R.id.menu_button_wrapper); + mMenuButton.setThemeColorProvider(themeColorProvider); + mMenuButton.setAppMenuButtonHelper(menuButtonHelper); + } + + /** + * @param showOnTop Whether to show the tab switcher bottom toolbar on the top of the screen. + */ + void showToolbarOnTop(boolean showOnTop) { + mMediator.showToolbarOnTop(showOnTop); + } + + /** + * @param visible Whether to hide the tab switcher bottom toolbar + */ + void setVisible(boolean visible) { + mModel.set(TabSwitcherBottomToolbarModel.IS_VISIBLE, visible); + } + + /** + * Clean up any state when the bottom toolbar is destroyed. + */ + public void destroy() { + mMediator.destroy(); + mNewTabButton.destroy(); + mMenuButton.destroy(); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java new file mode 100644 index 000000000000..fdbbd0e497c1 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java @@ -0,0 +1,60 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; +import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; + +/** + * This class is responsible for reacting to events from the outside world, interacting with other + * coordinators, running most of the business logic associated with the tab switcher bottom toolbar, + * and updating the model accordingly. + */ +class TabSwitcherBottomToolbarMediator implements ThemeColorObserver { + /** The model for the tab switcher bottom toolbar that holds all of its state. */ + private final TabSwitcherBottomToolbarModel mModel; + + /** A provider that notifies components when the theme color changes.*/ + private final ThemeColorProvider mThemeColorProvider; + + /** + * Build a new mediator that handles events from outside the tab switcher bottom toolbar. + * @param model The {@link TabSwitcherBottomToolbarModel} that holds all the state for the + * tab switcher bottom toolbar. + * @param themeColorProvider Notifies components when the theme color changes. + */ + TabSwitcherBottomToolbarMediator( + TabSwitcherBottomToolbarModel model, ThemeColorProvider themeColorProvider) { + mModel = model; + + mThemeColorProvider = themeColorProvider; + mThemeColorProvider.addThemeColorObserver(this); + } + + /** + * @param showOnTop Whether to show the tab switcher bottom toolbar on the top of the screen. + */ + void showToolbarOnTop(boolean showOnTop) { + // TODO(crbug.com/1012014): Resolve how to manage the toolbar position in tab switcher in + // landscape mode. Probably remove code about showing bottom toolbar on top. + // When GridTabSwitcher is enabled, show the original top toolbar instead of showing the + // bottom toolbar on top. + mModel.set(TabSwitcherBottomToolbarModel.SHOW_ON_TOP, + showOnTop && !TabUiFeatureUtilities.isGridTabSwitcherEnabled()); + } + + /** + * Clean up anything that needs to be when the tab switcher bottom toolbar is destroyed. + */ + void destroy() { + mThemeColorProvider.removeThemeColorObserver(this); + } + + @Override + public void onThemeColorChanged(int primaryColor, boolean shouldAnimate) { + mModel.set(TabSwitcherBottomToolbarModel.PRIMARY_COLOR, primaryColor); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java new file mode 100644 index 000000000000..03a43a3314c5 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java @@ -0,0 +1,27 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import org.chromium.ui.modelutil.PropertyModel; + +/** + * All of the state for the tab switcher bottom toolbar, updated by the + * {@link TabSwitcherBottomToolbarCoordinator}. + */ +public class TabSwitcherBottomToolbarModel extends PropertyModel { + /** Primary color of tab switcher bottom toolbar. */ + public static final WritableIntPropertyKey PRIMARY_COLOR = new WritableIntPropertyKey(); + + /** Whether the tab switcher bottom toolbar is visible */ + public static final WritableBooleanPropertyKey IS_VISIBLE = new WritableBooleanPropertyKey(); + + /** Whether the tab switcher bottom toolbar shows on top of the screen. */ + public static final WritableBooleanPropertyKey SHOW_ON_TOP = new WritableBooleanPropertyKey(); + + /** Default constructor. */ + public TabSwitcherBottomToolbarModel() { + super(PRIMARY_COLOR, IS_VISIBLE, SHOW_ON_TOP); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java new file mode 100644 index 000000000000..c262a5386e1c --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java @@ -0,0 +1,63 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.view.View; +import android.view.ViewGroup; + +import org.chromium.chrome.R; +import org.chromium.ui.UiUtils; +import org.chromium.ui.modelutil.PropertyKey; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor; + +/** + * This class is responsible for pushing updates the view of the tab switcher bottom toolbar. These + * updates are pulled from the {@link TabSwitcherBottomToolbarModel} when a notification of an + * update is received. + */ +public class TabSwitcherBottomToolbarViewBinder + implements PropertyModelChangeProcessor + .ViewBinder { + private final ViewGroup mTopRoot; + private final ViewGroup mBottomRoot; + + /** + * Build a binder that handles interaction between the model and the tab switcher bottom toolbar + * view. + */ + TabSwitcherBottomToolbarViewBinder(ViewGroup topRoot, ViewGroup bottomRoot) { + mTopRoot = topRoot; + mBottomRoot = bottomRoot; + } + + @Override + public final void bind( + TabSwitcherBottomToolbarModel model, View view, PropertyKey propertyKey) { + if (TabSwitcherBottomToolbarModel.IS_VISIBLE == propertyKey) { + view.setVisibility( + model.get(TabSwitcherBottomToolbarModel.IS_VISIBLE) ? View.VISIBLE : View.GONE); + } else if (TabSwitcherBottomToolbarModel.PRIMARY_COLOR == propertyKey) { + view.findViewById(R.id.bottom_toolbar_buttons) + .setBackgroundColor(model.get(TabSwitcherBottomToolbarModel.PRIMARY_COLOR)); + } else if (TabSwitcherBottomToolbarModel.SHOW_ON_TOP == propertyKey) { + final boolean showOnTop = model.get(TabSwitcherBottomToolbarModel.SHOW_ON_TOP); + view.findViewById(R.id.bottom_toolbar_bottom_shadow) + .setVisibility(showOnTop ? View.VISIBLE : View.GONE); + // When shown on the bottom, the layout should match_parent so that it fills its + // parent container. When the layout is shown on the top, it should wrap_content + // so that the toolbar shadow is visible. + view.getLayoutParams().height = showOnTop ? ViewGroup.LayoutParams.WRAP_CONTENT + : ViewGroup.LayoutParams.MATCH_PARENT; + reparentView(view, showOnTop ? mTopRoot : mBottomRoot); + } else { + assert false : "Unhandled property detected in TabSwitcherBottomToolbarViewBinder!"; + } + } + + private static void reparentView(View v, ViewGroup newParent) { + UiUtils.removeViewFromParent(v); + newParent.addView(v); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index b15e7b82e4b6..962263a717bd 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -770,7 +770,6 @@ private void updateVerifiedPublisherMark() { } } - @Override public void onBottomToolbarVisibilityChanged(boolean isVisible) { if (this instanceof ToolbarPhone && super.getMenuButtonCoordinator() != null) { super.getMenuButtonCoordinator().setVisibility(isVisible ? View.GONE : View.VISIBLE); diff --git a/android/java/res/layout/bottom_toolbar.xml b/android/java/res/layout/bottom_toolbar.xml new file mode 100644 index 000000000000..df816b89e626 --- /dev/null +++ b/android/java/res/layout/bottom_toolbar.xml @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/android/java/res/layout/bottom_toolbar_browsing.xml b/android/java/res/layout/bottom_toolbar_browsing.xml new file mode 100644 index 000000000000..97b06f328597 --- /dev/null +++ b/android/java/res/layout/bottom_toolbar_browsing.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/java/res/layout/bottom_toolbar_menu_button.xml b/android/java/res/layout/bottom_toolbar_menu_button.xml new file mode 100644 index 000000000000..a4badfa23581 --- /dev/null +++ b/android/java/res/layout/bottom_toolbar_menu_button.xml @@ -0,0 +1,36 @@ + + + + + + + + + + diff --git a/android/java/res/layout/bottom_toolbar_tab_switcher.xml b/android/java/res/layout/bottom_toolbar_tab_switcher.xml new file mode 100644 index 000000000000..63c4994f160d --- /dev/null +++ b/android/java/res/layout/bottom_toolbar_tab_switcher.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/java/res/layout/icon_row_menu_footer.xml b/android/java/res/layout/icon_row_menu_footer.xml new file mode 100644 index 000000000000..2382b933ff0e --- /dev/null +++ b/android/java/res/layout/icon_row_menu_footer.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/android/java/res/layout/toolbar_space.xml b/android/java/res/layout/toolbar_space.xml new file mode 100644 index 000000000000..b16e283817e2 --- /dev/null +++ b/android/java/res/layout/toolbar_space.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/android/java/res/values/brave_dimens.xml b/android/java/res/values/brave_dimens.xml index 96cf9b97499a..39ab637bceec 100644 --- a/android/java/res/values/brave_dimens.xml +++ b/android/java/res/values/brave_dimens.xml @@ -37,4 +37,12 @@ 200dp 233dp 318dp + + + 56dp + 12dp + 64dp + 36dp + 6dp + 4dp diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index d6cc6374be5e..7391a16c2280 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -40,8 +40,6 @@ public void testClassesExist() throws Exception { Assert.assertTrue(classExists( "org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter")); Assert.assertTrue(classExists("org/chromium/base/CommandLineInitUtil")); - Assert.assertTrue(classExists( - "org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration")); } @Test @@ -69,9 +67,6 @@ public void testMethodsExist() throws Exception { "org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter", "sortAndFilterUnnecessaryTemplateUrl")); Assert.assertTrue(methodExists("org/chromium/base/CommandLineInitUtil", "initCommandLine")); - Assert.assertTrue(methodExists( - "org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration", - "isBottomToolbarEnabled")); } @Test diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index c3d7cd558b77..f75a3ea95b28 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -1302,6 +1302,9 @@ until they verify, or until 90 days have passed. Enable "Night Mode" (Experimental) + + Search + Edit Stack diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn index 732a5cb34d40..e7975c735b89 100644 --- a/build/android/bytecode/BUILD.gn +++ b/build/android/bytecode/BUILD.gn @@ -11,7 +11,6 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAndroidSyncSettingsClassAdapter.java", - "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBottomToolbarConfigurationClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveCommandLineInitUtilClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveBottomToolbarConfigurationClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveBottomToolbarConfigurationClassAdapter.java deleted file mode 100644 index b090ae5fc5b8..000000000000 --- a/build/android/bytecode/java/org/brave/bytecode/BraveBottomToolbarConfigurationClassAdapter.java +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.brave.bytecode; - -import org.objectweb.asm.ClassVisitor; - -public class BraveBottomToolbarConfigurationClassAdapter extends BraveClassVisitor { - static String sBottomToolbarConfigurationClassName = - "org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration"; - - static String sBraveBottomToolbarConfigurationClassName = - "org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration"; - - public BraveBottomToolbarConfigurationClassAdapter(ClassVisitor visitor) { - super(visitor); - changeMethodOwner(sBottomToolbarConfigurationClassName, "isBottomToolbarEnabled", - sBraveBottomToolbarConfigurationClassName); - } -} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java index 33912c1c4cdf..aa769da8bb46 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java @@ -20,7 +20,6 @@ public static ClassVisitor createAdapter(ClassVisitor chain) { chain = new BraveEditUrlSuggestionProcessorClassAdapter(chain); chain = new BraveSearchEngineAdapterClassAdapter(chain); chain = new BraveCommandLineInitUtilClassAdapter(chain); - chain = new BraveBottomToolbarConfigurationClassAdapter(chain); return chain; } } From 329aff067554ed14e23c1cceb5297857967cc7a2 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 14:22:57 -0400 Subject: [PATCH 039/152] Updated patches from Chromium 87.0.4263.3 to Chromium 87.0.4270.0. --- patches/base-BUILD.gn.patch | 4 ++-- patches/build-config-BUILDCONFIG.gn.patch | 4 ++-- ...ld-config-android-internal_rules.gni.patch | 4 ++-- patches/build-config-android-rules.gni.patch | 6 ++--- patches/build-config-compiler-BUILD.gn.patch | 4 ++-- patches/chrome-BUILD.gn.patch | 22 +++++++++---------- patches/chrome-android-BUILD.gn.patch | 12 +++++----- ...e-android-chrome_public_apk_tmpl.gni.patch | 6 ++--- ...a-res-layout-custom_tabs_toolbar.xml.patch | 2 +- ...d-java-res-layout-toolbar_tablet.xml.patch | 2 +- ...hromium-chrome-browser-AppHooks.java.patch | 2 +- ...me-browser-ChromeTabbedActivity.java.patch | 10 ++++----- ...rome-browser-app-ChromeActivity.java.patch | 4 ++-- ...me-browser-ntp-NewTabPageLayout.java.patch | 4 ++-- ...nager-settings-PasswordSettings.java.patch | 4 ++-- ...rivacy-settings-PrivacySettings.java.patch | 8 +++---- ...e-browser-settings-MainSettings.java.patch | 4 ++-- ...rowser-sync-AndroidSyncSettings.java.patch | 4 ++-- ...tings-AccountManagementFragment.java.patch | 2 +- ...nu_button-MenuButtonCoordinator.java.patch | 6 ++--- ...er-toolbar-top-CustomTabToolbar.java.patch | 2 +- ...rowser-toolbar-top-ToolbarPhone.java.patch | 12 +++++----- ...owser-toolbar-top-ToolbarTablet.java.patch | 2 +- patches/chrome-app-BUILD.gn.patch | 2 +- patches/chrome-browser-about_flags.cc.patch | 6 ++--- ...rowsing_data-browsing_data_bridge.cc.patch | 4 ++-- ...wser-chrome_content_browser_client.h.patch | 4 ++-- ...wser-devtools-devtools_ui_bindings.h.patch | 2 +- .../chrome-browser-extensions-BUILD.gn.patch | 2 +- ...rowser-extensions-component_loader.h.patch | 2 +- ...r-extensions-extension_management.cc.patch | 2 +- ...er-extensions-extension_management.h.patch | 2 +- ...owser-extensions-extension_service.h.patch | 2 +- ...flags-android-chrome_feature_list.cc.patch | 4 ++-- ...ser-global_keyboard_shortcuts_mac.mm.patch | 2 +- ...-notification_platform_bridge_mac.mm.patch | 4 ++-- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 ++--- .../chrome-browser-profiles-profile.cc.patch | 4 ++-- ...profiles-profile_avatar_icon_util.cc.patch | 2 +- ...ome-browser-profiles-profile_impl.cc.patch | 4 ++-- ...rome-browser-profiles-profile_impl.h.patch | 4 ++-- ...ext_menu-render_view_context_menu.cc.patch | 4 ++-- ...text_menu-render_view_context_menu.h.patch | 2 +- ...-browser-resources-optimize_webui.py.patch | 4 ++-- ...ettings-privacy_page-privacy_page.js.patch | 4 ++-- ...-browser-resources-settings-route.js.patch | 4 ++-- ...settings-category_default_setting.js.patch | 2 +- ...-settings-site_settings-constants.js.patch | 4 ++-- ...browsing-client_side_model_loader.cc.patch | 4 ++-- ...ines-template_url_service_factory.cc.patch | 2 +- ...er-spellcheck_hunspell_dictionary.cc.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 ++--- ...rome-browser-ui-browser_navigator.cc.patch | 4 ++-- ...views-bookmarks-bookmark_bar_view.cc.patch | 2 +- ...ws-location_bar-location_bar_view.cc.patch | 2 +- ...iews-outdated_upgrade_bubble_view.cc.patch | 2 +- ...me-browser-ui-views-tabs-tab_icon.cc.patch | 4 ++-- ...s-toolbar-browser_app_menu_button.cc.patch | 2 +- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 ++-- ...r-ui-webui-downloads-downloads_ui.cc.patch | 2 +- ...ttings_localized_strings_provider.cc.patch | 4 ++-- ...me_authenticator_request_delegate.cc.patch | 4 ++-- patches/chrome-common-BUILD.gn.patch | 2 +- ...ommon-importer-importer_data_types.h.patch | 2 +- ...ler-mini_installer-mini_installer.cc.patch | 2 +- patches/chrome-installer-util-BUILD.gn.patch | 4 ++-- ...er-chrome_content_renderer_client.cc.patch | 4 ++-- ...rer-chrome_content_renderer_client.h.patch | 4 ++-- patches/chrome-test-BUILD.gn.patch | 4 ++-- .../chrome-test-base-testing_profile.cc.patch | 4 ++-- patches/chrome-utility-BUILD.gn.patch | 2 +- patches/chrome-utility-services.cc.patch | 2 +- ...browser-content_settings_registry.cc.patch | 4 ++-- ...mmon-content_settings_mojom_traits.h.patch | 4 ++-- ...nternal-common-download_item_impl.cc.patch | 4 ++-- .../components-omnibox-browser-BUILD.gn.patch | 2 +- ...x-browser-autocomplete_controller.cc.patch | 2 +- .../components-page_info-page_info.cc.patch | 4 ++-- ...components-page_info-page_info_ui.cc.patch | 6 ++--- ...nager-core-browser-login_database.cc.patch | 4 ++-- ...ents-translate-core-browser-BUILD.gn.patch | 4 ++-- ...ssions-permission_controller_impl.cc.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 4 ++-- ...-renderer_host-navigation_request.cc.patch | 4 ++-- ...content-browser-webui-web_ui_impl.cc.patch | 2 +- patches/content-common-BUILD.gn.patch | 2 +- ...lic-browser-content_browser_client.h.patch | 2 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 ++-- patches/google_apis-google_api_keys.cc.patch | 4 ++-- patches/net-BUILD.gn.patch | 2 +- ...services-network-public-cpp-BUILD.gn.patch | 2 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 2 +- ...-blink-renderer-core-dom-document.cc.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 ++-- ...r-core-html-media-autoplay_policy.cc.patch | 2 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 2 +- ...anvas2d-base_rendering_context_2d.cc.patch | 2 +- ...modules-cookie_store-cookie_store.cc.patch | 2 +- ...ebgl-webgl_rendering_context_base.cc.patch | 2 +- ...hird_party-widevine-cdm-widevine.gni.patch | 2 +- ...tools-gritsettings-resource_ids.spec.patch | 4 ++-- ..._schema_compiler-feature_compiler.py.patch | 4 ++-- ...ls-metrics-histograms-histograms.xml.patch | 4 ++-- patches/ui-base-BUILD.gn.patch | 2 +- .../ui-native_theme-native_theme_win.cc.patch | 4 ++-- 106 files changed, 194 insertions(+), 194 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index a1b1cb79553b..4750fbb0b07d 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 370a19ef0b556afff8a78c308003878767273c50..99a8ce640e56f4bab0c0aee2528e7f92df6cad4a 100644 +index 0b65fbd05cdfbd6fdd616c7c0cdb0bca34820cd4..4ae9df289f8b0c73def054e29e1c10d440e1e94c 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3660,6 +3660,7 @@ if (is_android) { +@@ -3675,6 +3675,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index 7ce9901bec9a..6d09b3107dfb 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index e011502180b5a94bd32bcebb301c91314d12653e..4e8645e62e9f415217d9fa68d8a5a427863703bd 100644 +index bb656fa19ff32fa407a01f302ea989ffcacc45f8..882a1b75b079151296497dbc9938dbba83924710 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -420,6 +420,7 @@ set_sources_assignment_filter(sources_assignment_filter) +@@ -328,6 +328,7 @@ set_sources_assignment_filter(sources_assignment_filter) # Holds all configs used for running the compiler. default_compiler_configs = [ diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 191445b15089..a3926aa17ff1 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 3724ee598a0d115c7a367dea6a36ffdb3b3ae151..ea373a0ac34281efeb0429ee9c2e91637d451ee7 100644 +index 1003633a13a282b67a6cd25a3bca0d9c33d89b3e..65a45bd516c1b0ce266c4085292fb4e28a733693 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -2015,6 +2015,7 @@ if (enable_java_templates) { +@@ -2021,6 +2021,7 @@ if (enable_java_templates) { _deps = [ ":$_desugar_target" ] _previous_output_jar = _desugar_output_jar } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index f3ef29b3db53..1e9391c302e6 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 8bf6bca84173e418ba582798403ba72280c99904..5ead9cb2f969d22abb711abce881ee3768a705fa 100644 +index cd97b2984ac6a7a2d0daf5627c87d456fbf3ca52..5b6857eb818c9485b6ce0447cf4b86907724096c 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -513,6 +513,7 @@ if (enable_java_templates) { +@@ -509,6 +509,7 @@ if (enable_java_templates) { # } template("java_cpp_enum") { set_sources_assignment_filter([]) @@ -10,7 +10,7 @@ index 8bf6bca84173e418ba582798403ba72280c99904..5ead9cb2f969d22abb711abce881ee37 action_with_pydeps(target_name) { forward_variables_from(invoker, [ -@@ -626,6 +627,7 @@ if (enable_java_templates) { +@@ -622,6 +623,7 @@ if (enable_java_templates) { # output = "$target_gen_dir/AndroidManifest.xml" # } template("jinja_template") { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index dc9b8ebd8c69..319594329127 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 16ee9ba98bc31f06301b0bda73928dfde37f5469..1a9887b6a44e5d95c25cf4161e447660e7d834fb 100644 +index c9ef45a1495e620aba3dc42527e991495aaf4bf8..9c332952b8f7819fdb5e2d13d5b57c6ea96cdf4f 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1648,6 +1648,7 @@ config("chromium_code") { +@@ -1666,6 +1666,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index d7165d82188a..747811d8c4ae 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba19be421e 100644 +index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda8b64988a 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -146,6 +146,10 @@ if (!is_android && !is_mac) { @@ -13,7 +13,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba deps += [ ":chrome_dll", -@@ -404,11 +408,12 @@ if (is_win) { +@@ -402,11 +406,12 @@ if (is_win) { "--bundle_id=$chrome_mac_bundle_id", ] } @@ -27,7 +27,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -426,6 +431,7 @@ if (is_win) { +@@ -424,6 +429,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -35,7 +35,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -494,7 +500,7 @@ if (is_win) { +@@ -492,7 +498,7 @@ if (is_win) { args = [ "-b", @@ -44,7 +44,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba "-v", rebase_path(chrome_version_file, root_build_dir), "-g", -@@ -563,6 +569,7 @@ if (is_win) { +@@ -561,6 +567,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -52,7 +52,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba } } -@@ -595,9 +602,11 @@ if (is_win) { +@@ -593,6 +600,7 @@ if (is_win) { "--scm=0", ] } @@ -64,7 +64,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -618,7 +627,7 @@ if (is_win) { +@@ -616,7 +625,7 @@ if (is_win) { output_name = chrome_helper_name + invoker.helper_name_suffix @@ -73,7 +73,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1007,6 +1016,10 @@ if (is_win) { +@@ -1004,6 +1013,10 @@ if (is_win) { if (is_chrome_branded) { deps += [ ":default_apps" ] } @@ -84,7 +84,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1164,6 +1177,7 @@ if (is_win) { +@@ -1161,6 +1174,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -92,7 +92,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba "//chrome/browser", "//chrome/common", "//components/gwp_asan/buildflags", -@@ -1239,12 +1253,13 @@ group("child_dependencies") { +@@ -1236,12 +1250,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -107,7 +107,7 @@ index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1298,6 +1313,7 @@ group("resources") { +@@ -1295,6 +1310,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 2d7fd482f9ab..047746c065a0 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index d0aa1fa0fe90f763ebd777030eb3c6f7c6e745dc..8a06a00e65be1c05649f9b27895d6c4b9e10d24b 100644 +index b1449fc06f0475232ed9924beb6c821d2a9f3143..faaa4dd480d32efcc6628addeb77559c9cca6d4a 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -210,6 +210,7 @@ android_resources("chrome_app_java_resources") { +@@ -229,6 +229,7 @@ android_resources("chrome_app_java_resources") { "//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:material_design_java", ] @@ -10,7 +10,7 @@ index d0aa1fa0fe90f763ebd777030eb3c6f7c6e745dc..8a06a00e65be1c05649f9b27895d6c4b create_srcjar = false } -@@ -497,6 +498,7 @@ android_library("chrome_java") { +@@ -515,6 +516,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,7 +18,7 @@ index d0aa1fa0fe90f763ebd777030eb3c6f7c6e745dc..8a06a00e65be1c05649f9b27895d6c4b srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -531,6 +533,7 @@ android_library("chrome_java") { +@@ -548,6 +550,7 @@ android_library("chrome_java") { "//components/ui_metrics:ui_metrics_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index d0aa1fa0fe90f763ebd777030eb3c6f7c6e745dc..8a06a00e65be1c05649f9b27895d6c4b # From java_sources.gni. sources = chrome_java_sources + [ -@@ -655,6 +658,7 @@ group("jni_headers") { +@@ -672,6 +675,7 @@ group("jni_headers") { "//chrome/browser/webauthn/android:jni_headers", "//components/media_router/browser/android:jni_headers", ] @@ -34,7 +34,7 @@ index d0aa1fa0fe90f763ebd777030eb3c6f7c6e745dc..8a06a00e65be1c05649f9b27895d6c4b } action("chrome_android_java_google_api_keys_srcjar") { -@@ -1726,6 +1730,7 @@ if (current_toolchain == default_toolchain) { +@@ -1758,6 +1762,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 3646a3b011d6..f68f46601c4c 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 2d1453dc0970c75993e1293cba1a8fb568a72bb6..7db367d02ae55e576aa60f15026b8243685941ea 100644 +index 40c3e5e44b9a476ccdd3022e86576d677445a09b..eeccf8dd7c591862f53b4c2bd3eff21d9d285f02 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -212,6 +212,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -213,6 +213,7 @@ template("chrome_public_common_apk_or_module_tmpl") { "${_material_package}:[Ss]lider", "${_material_package}:[Tt]oolbarLayout", ] @@ -10,7 +10,7 @@ index 2d1453dc0970c75993e1293cba1a8fb568a72bb6..7db367d02ae55e576aa60f15026b8243 if (!_is_monochrome) { product_config_java_packages = [ "org.chromium.chrome.browser" ] -@@ -321,6 +322,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -322,6 +323,7 @@ template("chrome_public_common_apk_or_module_tmpl") { if (!defined(proguard_configs)) { proguard_configs = [] } diff --git a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch index 043edb0eb35c..dbb35ca7e74e 100644 --- a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch +++ b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml -index a3b998b12505b4969ea6cc32d8ee01fcc4c51c8c..42f83234de200e7ae59fbf0441ceff67596cb278 100644 +index 36f574ae9585c6fea193b25303c43ebaf79819f8..5ea345af4f96f4dea75be25ea2b6780e481bf56c 100644 --- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml +++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml @@ -97,7 +97,7 @@ diff --git a/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch b/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch index f353b0d4558e..486bdcb4266f 100644 --- a/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch +++ b/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/res/layout/toolbar_tablet.xml b/chrome/android/java/res/layout/toolbar_tablet.xml -index b754783207893443e820105ad13a3fb962b89abe..f257b6bf4ed1f2109f67f02e13c721fc90d86b62 100644 +index 2fd51c5ad015ee86b23272e64bd00fbf3de103cc..0a81f8bb6d3b3dea0e3d374e9c6b4d851706f900 100644 --- a/chrome/android/java/res/layout/toolbar_tablet.xml +++ b/chrome/android/java/res/layout/toolbar_tablet.xml @@ -58,7 +58,7 @@ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch index bf52d067c4e3..c14e7b0be524 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -index 8e4cb23ad6a1949a9c5214de22db581fcfb15aaf..dc80294c0520741cdbfc72b17362874ffdfdea01 100644 +index 51a5f2c7e7181f787a65c9b774f11d256e6701ba..05df80deecfd8ee0ffd848c8ad206d3558a3ec72 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java @@ -76,7 +76,7 @@ public abstract class AppHooks { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 91b71845c722..4c0a670fdc02 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 5af719f9bac15ce7dfbe992147a525630d80af80..734859067ee10c425cc7f74c4bf555acb409a4b5 100644 +index 1e8697a4a42e061cf4397f40fb62b698ce75f567..a5d1f5044c0bd31cbba83881ba33ec81068e754d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java @@ -181,7 +181,7 @@ import java.util.Locale; @@ -11,7 +11,7 @@ index 5af719f9bac15ce7dfbe992147a525630d80af80..734859067ee10c425cc7f74c4bf555ac implements ChromeAccessibilityUtil.Observer { private static final String TAG = "ChromeTabbedActivity"; -@@ -986,7 +986,7 @@ public class ChromeTabbedActivity extends ChromeActivity( @@ -20,7 +20,7 @@ index 5af719f9bac15ce7dfbe992147a525630d80af80..734859067ee10c425cc7f74c4bf555ac assert profile != null : "Unexpectedly null profile from TabModel."; if (profile == null) return; -@@ -1578,7 +1578,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -326,7 +326,7 @@ public abstract class ChromeActivity NightModeReparentingController mNightModeReparentingController; protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch index 6275b0d22bce..6228960560e6 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -index 80684745fece0d8c580bb3a78fb11e760e4790c5..723b0881594dcd0a3bb3a75d2398eb0f86cbcbc5 100644 +index ce17e603c0d6285d2d07434c57e50de45ffdd6c6..cc98df12021cd52f257fe7b8f9fe9f9b6846a6dd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -@@ -58,7 +58,7 @@ import org.chromium.ui.vr.VrModeObserver; +@@ -59,7 +59,7 @@ import org.chromium.ui.vr.VrModeObserver; * Layout for the new tab page. This positions the page elements in the correct vertical positions. * There are no separate phone and tablet UIs; this layout adapts based on the available space. */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch index 6fb8d1513649..c289fee4f1c1 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -index 047559854f54613004112ad2df2c08dc4a07a489..433051ad14fcc67ab3292faf0849241e1b0305af 100644 +index 947741134a3323bcdd98a270625ccd981db57afd..116f89b8f104625b27043934814be787cf5a04e2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -@@ -59,7 +59,7 @@ import java.util.Locale; +@@ -58,7 +58,7 @@ import java.util.Locale; * to view saved passwords (just the username and URL), and to delete saved passwords. */ public class PasswordSettings diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch index 356a43043573..fc10c1098b97 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -index 753ff5df5dedd226c06ed3b694912c07ad095d21..8ae412a438fb44a06b500cd9bbd3a01602fce968 100644 +index 4dcd1b269aa6177ee214211e3f44e5747cf74f0d..dd1bfff95274d48698e9aa7aca13f99a4ddf4ff3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -40,7 +40,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -39,7 +39,7 @@ import org.chromium.ui.text.SpanApplier; * Fragment to keep track of the all the privacy related preferences. */ public class PrivacySettings @@ -11,7 +11,7 @@ index 753ff5df5dedd226c06ed3b694912c07ad095d21..8ae412a438fb44a06b500cd9bbd3a016 private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_NETWORK_PREDICTIONS = "preload_pages"; private static final String PREF_SECURE_DNS = "secure_dns"; -@@ -202,6 +202,7 @@ public class PrivacySettings +@@ -201,6 +201,7 @@ public class PrivacySettings @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index 753ff5df5dedd226c06ed3b694912c07ad095d21..8ae412a438fb44a06b500cd9bbd3a016 MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(VectorDrawableCompat.create( -@@ -216,6 +217,6 @@ public class PrivacySettings +@@ -215,6 +216,6 @@ public class PrivacySettings null); return true; } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch index 9d96913fc59a..05e149f1f94e 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -index 49bcf7e55674ba54271a76b8d3b32e731860b36e..5d7cd965c87e1a68dce2ef160153db1ae312090a 100644 +index f2cd84fca088725f29a63a0e6f4c12772d19b243..01ef4ddb7e2536edac06c4f03514d88daa1d0579 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -50,7 +50,7 @@ import java.util.Map; +@@ -55,7 +55,7 @@ import java.util.Map; /** * The main settings screen, shown when the user first opens Settings. */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch index cdec34c43881..c36f9bfb99be 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java -index 3160cd7ad38a0b777dd17e7686ebeb25fc335d76..45e4e019e9b753175ce794426290b3b3aa980f5f 100644 +index da29cb4fd81bd4adde4d3f92c446d47836a7ddd0..949b5aff10e6d05b6fab0d6fcc81b18b3f7e616e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java -@@ -78,7 +78,7 @@ public class AndroidSyncSettings { +@@ -75,7 +75,7 @@ public class AndroidSyncSettings { ThreadUtils.assertOnUiThread(); if (sInstance == null) { SyncContentResolverDelegate contentResolver = new SystemSyncContentResolverDelegate(); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch index 1c8719cacbac..6ba82aeb3bff 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java -index 12a6652d8ce97a8dc98d5925bb14e00830eca69a..ad865f30b8476ea5ef1a069615353885b7c1afae 100644 +index 1376ef85d1fcc012a03cbb5b9c853c05b8aa404c..86ace931630ba41ad6f037a0ce28c15b7ff7e340 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java @@ -63,7 +63,7 @@ import java.util.List; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch index 4610464024a8..24bbd1643c7d 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java -index 2d9b68296d598b723cd60f8b268f988bc2f79be8..dd5ced91b58503fc39f6e780025ebfdaced3bc3e 100644 +index 3e2ce3901540e00d9158be7e3304c5bdfdd1cc51..25f3125c019907ea246e4cb2a1e39a40198faf80 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java -@@ -272,6 +272,7 @@ public class MenuButtonCoordinator implements AppMenuObserver { +@@ -292,6 +292,7 @@ public class MenuButtonCoordinator implements AppMenuObserver { mAppMenuHandler = appMenuHandler; mAppMenuHandler.addObserver(this); mAppMenuButtonHelper = mAppMenuHandler.createAppMenuButtonHelper(); @@ -10,7 +10,7 @@ index 2d9b68296d598b723cd60f8b268f988bc2f79be8..dd5ced91b58503fc39f6e780025ebfda mAppMenuButtonHelper.setOnAppMenuShownListener( () -> { RecordUserAction.record("MobileToolbarShowMenu"); }); if (mMenuButton != null) { -@@ -311,4 +312,5 @@ public class MenuButtonCoordinator implements AppMenuObserver { +@@ -325,4 +326,5 @@ public class MenuButtonCoordinator implements AppMenuObserver { mMenuButton.removeAppMenuUpdateBadge(false); } } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch index b0229e640e50..3b0713255f0c 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java -index 28427567c273e5bc672912a3127cb9c0d7491d5c..355773204776bd413f477d2f137677ead5bf56c7 100644 +index e327ea90675087a5e497d66e405c395734bc5b3d..eb7748a45e58b2fc9bd46a890593644049532067 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java @@ -92,7 +92,7 @@ import java.util.regex.Pattern; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index 9399223ef0cb..c0fdf9c98134 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index 25c687987c90ac32f40698e9270cddc1d77f3bb0..0ea457c1b335d38d402d96ae559e792170854c57 100644 +index 2db46ef61a957edbaa03b2f2d26558b1be1790fe..b4671e2befd061e8edb790650ef58738aecd587e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -@@ -89,7 +89,7 @@ import java.util.List; +@@ -90,7 +90,7 @@ import java.util.List; /** * Phone specific toolbar implementation. */ @@ -11,7 +11,7 @@ index 25c687987c90ac32f40698e9270cddc1d77f3bb0..0ea457c1b335d38d402d96ae559e7921 NewTabPage.OnSearchBoxScrollListener, TabCountObserver { /** The amount of time transitioning from one theme color to another should take in ms. */ -@@ -411,10 +411,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O +@@ -412,10 +412,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O /** * Set the background color of the location bar to appropriately match the theme color. */ @@ -25,7 +25,7 @@ index 25c687987c90ac32f40698e9270cddc1d77f3bb0..0ea457c1b335d38d402d96ae559e7921 } /** -@@ -533,6 +535,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O +@@ -532,6 +534,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } @@ -33,7 +33,7 @@ index 25c687987c90ac32f40698e9270cddc1d77f3bb0..0ea457c1b335d38d402d96ae559e7921 } @Override -@@ -701,7 +704,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O +@@ -700,7 +703,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O * @return The right bounds of the location bar after accounting for any visible left buttons. */ private int getBoundsAfterAccountingForRightButtons() { @@ -42,7 +42,7 @@ index 25c687987c90ac32f40698e9270cddc1d77f3bb0..0ea457c1b335d38d402d96ae559e7921 } private void updateToolbarBackground(int color) { -@@ -2140,6 +2143,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O +@@ -2139,6 +2142,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O } else { populateUrlClearFocusingAnimatorSet(animators); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index 422fdac351e8..276a9a2c20ad 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index cb3009568f8283be44fbd86e9a1d02ef71dec2fa..b2eb2d71b2ad55c8ca588307dec075f354521e15 100644 +index 18d8ddb15d8f79103bbba4b11dbe91c22a8f0b3f..44cafe634a6943d21e8edfe511416a2ba9bc0957 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java @@ -59,7 +59,7 @@ import java.util.Collection; diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 9c0e19bf2eee..1238d6ac4d3c 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index ca2ab5f1e32c3ab0e16942caeb8eb091c17885d7..18bc0af17953779e5f1c095033378374f63c1824 100644 +index d85c8180793d59dd22d4aafbfb95ac0b746908ca..1eed0b7c4fa3fce7c7a6d80b0a006cc19d78bf4d 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -74,6 +74,8 @@ grit("generated_resources") { diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 1ac35b9f1c26..00833464fb9b 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index c476b77f26e7fb1d1284a70e67a8f8bfb8729070..7c5574b0458268119d85ff2d2d39a34ae806523b 100644 +index 9ca1ad5edd0cc96ec15616b5ba639b637c204eec..aefacfe0c1f6a8a7dc36516238f51774993db226 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -293,14 +293,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -294,14 +294,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -21,7 +21,7 @@ index c476b77f26e7fb1d1284a70e67a8f8bfb8729070..7c5574b0458268119d85ff2d2d39a34a const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -6400,6 +6400,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6445,6 +6445,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch index 46fe109b4e4c..aebfb97e727d 100644 --- a/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch +++ b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -index 8729c0cc9136a4e2845e8cd8e8de5f0c4bae7e55..434d913ffc28a8d10ec56831bdede3b8229a604a 100644 +index 6446838d89a7f2d42ef4b611a3a6a068c8a0168b..f5e80d26a8b8f44ece961896be120af7235489f8 100644 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -@@ -124,6 +124,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( +@@ -126,6 +126,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS; break; case browsing_data::BrowsingDataType::DOWNLOADS: diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index b9ff91d9a44f..c4c478fe17d6 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 1f90198c6622259586da9d3cad3c0d60e7efef4c..35f23c004ecc75d3011de9c3a4c415f9c3e19534 100644 +index 0e025853ca666f193a2487a1b042918d725dccbc..1457beb0792ebf30002fb1e19d457c8ccf6a48bc 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -709,6 +709,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -706,6 +706,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch index 0af7cd540375..574c29cce5ff 100644 --- a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch +++ b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h -index d7d4361d89aa64da8b5a762a67065ede58f0cfcc..d6d567f1a2ddd81c1b61798b5b7e21ed26d0dff7 100644 +index c4318ae485f179eb00488c485775a34419ce7151..ba520dee1194afa0341fe2efd9d4010383045d85 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.h +++ b/chrome/browser/devtools/devtools_ui_bindings.h @@ -93,6 +93,9 @@ class DevToolsUIBindings : public DevToolsEmbedderMessageDispatcher::Delegate, diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 635dab129119..5caf59a5cc5d 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 3e75f698fbb1762a6661663d6bb319017f3427a3..b1eb671861778625dbd9a5b4c78b32b53a0ba872 100644 +index 4dd8bc6cd96de7b89a6fd03c30038adb691dfcc1..9704aead36429c23673df091fc244e107a66876c 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -1258,6 +1258,7 @@ static_library("extensions") { diff --git a/patches/chrome-browser-extensions-component_loader.h.patch b/patches/chrome-browser-extensions-component_loader.h.patch index a5013bf5649b..c19df9cb77a5 100644 --- a/patches/chrome-browser-extensions-component_loader.h.patch +++ b/patches/chrome-browser-extensions-component_loader.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h -index 2d82a3f55258ad5914eff7a9bb1c14534d24d50b..89639e9d9366fe0abd3675fffcd7ff531c5f8d2e 100644 +index 64f0d79916d9d56f6fe29f54116c3089f41afd12..68abb8377be5b806fc78c6ff78252dbcd7126350 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h @@ -80,7 +80,7 @@ class ComponentLoader { diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index b2208a6e431d..b0c07128be73 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index 45300358307ddc086f175a8ef31f3dabfc79e85f..33a911a6defa8e5220b67d177196fcb00c15f46d 100644 +index 9d8854fde0bc139a3c7056567daf1297d13b3e70..accce246cf3f47021d032c6834e2c1f124b3aa7a 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -17,6 +17,7 @@ diff --git a/patches/chrome-browser-extensions-extension_management.h.patch b/patches/chrome-browser-extensions-extension_management.h.patch index b088a451e144..55e3cb076d50 100644 --- a/patches/chrome-browser-extensions-extension_management.h.patch +++ b/patches/chrome-browser-extensions-extension_management.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h -index 13e52e141826bb54a518c64142143c76ed28565d..92598c4c4e0eec399f6c4d0ea8488b284f33079a 100644 +index 6fa7e74a46bbd8e3859bdba57539c2a8290cd735..559e012a55132ff2a9a13e6ea40afc0c6e104375 100644 --- a/chrome/browser/extensions/extension_management.h +++ b/chrome/browser/extensions/extension_management.h @@ -197,6 +197,7 @@ class ExtensionManagement : public KeyedService { diff --git a/patches/chrome-browser-extensions-extension_service.h.patch b/patches/chrome-browser-extensions-extension_service.h.patch index ac6ab73a35c5..17ee5929d565 100644 --- a/patches/chrome-browser-extensions-extension_service.h.patch +++ b/patches/chrome-browser-extensions-extension_service.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h -index d8a9e12213f935fcfad39a2b5210321015ffc9a8..72d81dce3d73b19574c2911c1da227ea67af859e 100644 +index 6a5e4cfe1e0abec22694a3480a01a7ebda3a0523..11416c0257a1b0d41b4d9c1161fbfce694ab6868 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -446,6 +446,7 @@ class ExtensionService : public ExtensionServiceInterface, diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 04cadbcf19e9..902ce44ec625 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index fc48bb2beae8a31be359362d63e4af9b48981b18..da80fb22a623c3cef4d22e6466392acbf70ba322 100644 +index a9c7991e57e1f8de94dc8e4a2c07d591f92f8188..cbd4e96392ee8affb3c7d9ce22d23c51290f509a 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -265,6 +265,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -266,6 +266,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch index adc8a2910eb2..4a3186dbb3c6 100644 --- a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch +++ b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm -index 85394506813dac0d1eeb16564bfa79ba921f2e6c..fa9db4f7167803d17e7ae451e11f96095d1e09d9 100644 +index 939982edc874eaae41f98f0f43e0b9fe7407d470..0b2589917ba0d6c745557f93c718eb878e4966a6 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac.mm +++ b/chrome/browser/global_keyboard_shortcuts_mac.mm @@ -170,6 +170,7 @@ const std::vector& GetShortcutsNotPresentInMainMenu() { diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch index 667b5a4f6cf5..f603347fd86f 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm -index 1ff3b69f1b565a175baef6499aef151078da2e1e..dd050ef0ea37da14d7e97a5f77a4d95d02cc9aa2 100644 +index 2893564b41274ed0096253646ccf147cb6157534..4317310d2c30a0c65188d644bf790fe33719b84f 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm @@ -183,6 +183,7 @@ base::string16 CreateNotificationContext( @@ -10,7 +10,7 @@ index 1ff3b69f1b565a175baef6499aef151078da2e1e..dd050ef0ea37da14d7e97a5f77a4d95d int32_t major, minor, bugfix; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); // Allow alerts on all versions except 10.15.0, 10.15.1 & 10.15.2. -@@ -323,6 +324,7 @@ void NotificationPlatformBridgeMac::Display( +@@ -325,6 +326,7 @@ void NotificationPlatformBridgeMac::Display( } else { NSUserNotification* toast = [builder buildUserNotification]; [notification_center_ deliverNotification:toast]; diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 03d30877e56e..fb7b44eda4a8 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 016d4c9f0bfdc94fec7e61a0a7bf761e6f833981..6d2738a1cc2611191023467999e00a381dcf1440 100644 +index 526799941ae30a8bb969e761c470d40892eeffa8..f35ce1b3dcaddc732d70c714f332d398fec2c525 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -734,6 +734,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -735,6 +735,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 016d4c9f0bfdc94fec7e61a0a7bf761e6f833981..6d2738a1cc2611191023467999e00a38 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1003,6 +1004,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1005,6 +1006,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index e5235c6666c3..0344c60cf968 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index c3d02b41f530f55bbe99094dd190aaac2cbfe70f..098aca7d4a4ac7502853bd96a7ae2a760d0a3f18 100644 +index b5ab768526f77b37790de3b1b79960a8050d6524..0c0cb5d511cdd34e50ed4e348368d01c44f0a2ca 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -257,7 +257,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -262,7 +262,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, diff --git a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch index ee97427a82e0..55094732ba08 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index 6d88545a52677d20fe988338d5535d2f32ef46d6..c08353e313788ae5b302b1b1fffbccbe31388d4a 100644 +index 27c667218f2545d0f84c65d02ace31f4e68a3d3b..2b812f8fcc52152f16b95349e14ff5ed69fb2eb1 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -333,7 +333,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 44931f31d754..4b3b55c51d63 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index 5ee4f5589a72697dd5a31844d31be900bdc552cc..a68770a367573b75e405838602a37a4509dc26a0 100644 +index 55d2bd854a6f0441ccf1b5bdfd1ad0b16c667c83..573ac77f82e4037ae589b943e4403db22819708d 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -359,7 +359,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -356,7 +356,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, NOTREACHED(); } diff --git a/patches/chrome-browser-profiles-profile_impl.h.patch b/patches/chrome-browser-profiles-profile_impl.h.patch index cc8be80f7476..04c7635b814e 100644 --- a/patches/chrome-browser-profiles-profile_impl.h.patch +++ b/patches/chrome-browser-profiles-profile_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h -index 578f2bfd8c3815628bd1dafbc1875a2ee55c3a07..924480cc632f369763ab48a67e5be3104973b2fd 100644 +index e05b687a9f709b93138e18fec6fd9d233e8e3e26..9e12e682345495c2219e3e1e7a54ce38b307fdf1 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h -@@ -172,6 +172,7 @@ class ProfileImpl : public Profile { +@@ -171,6 +171,7 @@ class ProfileImpl : public Profile { void OnLogin() override; void InitChromeOSPreferences() override; #endif // defined(OS_CHROMEOS) diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index b8130c2c8d7e..15d4f6cdd486 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 9e827b4ea6f8346d2770a1d3c4fa41fd925e79db..37d8da2dd9b830e0b75497a042fc4f4d059f2844 100644 +index 132619a0f0af52b836c813abda2bca5cea5e7f12..e031356deb2cb75491af995d5d096d80cfc280bf 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1609,6 +1609,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1617,6 +1617,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index db7e4cccd400..8bc80eb6be0f 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index 140c0383695189fe5eaa4e89fe8a9cd3ff1c4a6a..da4e7adf66ccea755974d9a013e0f3083588eb3c 100644 +index 209983847a2ca07c077f3cb101e9d5a20fb73516..706d66c8695f6c136675381528f9c728e4e9c759 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -119,6 +119,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { diff --git a/patches/chrome-browser-resources-optimize_webui.py.patch b/patches/chrome-browser-resources-optimize_webui.py.patch index 6a59944e07c3..88c69a2c348c 100644 --- a/patches/chrome-browser-resources-optimize_webui.py.patch +++ b/patches/chrome-browser-resources-optimize_webui.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/optimize_webui.py b/chrome/browser/resources/optimize_webui.py -index 5b3b9aa1dba726b298d0e66feef929274ffe2b5c..7ffa16c734c4b198eccaa35ec7cf8aac6851bb4e 100755 +index 00da924718386c32fc6c989f1fcfa5de5954472f..6612a4952d3ff6ba8df735a15fe730921a01998d 100755 --- a/chrome/browser/resources/optimize_webui.py +++ b/chrome/browser/resources/optimize_webui.py @@ -56,8 +56,12 @@ _POLYMER_PATH = os.path.join( @@ -15,7 +15,7 @@ index 5b3b9aa1dba726b298d0e66feef929274ffe2b5c..7ffa16c734c4b198eccaa35ec7cf8aac # Excludes applying only to Polymer 2. 'chrome://resources/html/polymer.html', 'chrome://resources/polymer/v1_0/polymer/polymer.html', -@@ -101,6 +105,7 @@ for (redirect_url, file_path) in [ +@@ -102,6 +106,7 @@ for (redirect_url, file_path) in [ ('resources/js/', _JS_RESOURCES_PATH), ('resources/polymer/v1_0/', _POLYMER_PATH), ('resources/images/', _IMAGES_RESOURCES_PATH), diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch index 08d54396c2c9..1c9879a3308e 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js -index b80d9bfac40ff7eabddf110d64c8c18e7e80f000..926b988ecc64569a26d1d62f496560ac39261bc7 100644 +index c5a450dbafcadc64deaacd2e39372d125974d7e6..54228efc42de2928ffc298993e855c88c85136c1 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js -@@ -17,6 +17,7 @@ import '../prefs/prefs.m.js'; +@@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; import '../settings_page/settings_animated_pages.m.js'; import '../settings_page/settings_subpage.m.js'; import '../settings_shared_css.m.js'; diff --git a/patches/chrome-browser-resources-settings-route.js.patch b/patches/chrome-browser-resources-settings-route.js.patch index ca9a8976cf27..e1385e1bac15 100644 --- a/patches/chrome-browser-resources-settings-route.js.patch +++ b/patches/chrome-browser-resources-settings-route.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js -index 8f61f71e589efba60c146ef60bd191133948e4d6..9df7f236e4a10f2c952c8d6d965e11158837927e 100644 +index 9caa01cd88b349c490f5522f942948a5a7a017bb..d89ac587c16674c631b3b045e4f69590ab1e8203 100644 --- a/chrome/browser/resources/settings/route.js +++ b/chrome/browser/resources/settings/route.js @@ -34,7 +34,9 @@ function addPrivacyChildRoutes(r) { @@ -12,7 +12,7 @@ index 8f61f71e589efba60c146ef60bd191133948e4d6..9df7f236e4a10f2c952c8d6d965e1115 r.SITE_SETTINGS_AR = r.SITE_SETTINGS.createChild('ar'); r.SITE_SETTINGS_AUTOMATIC_DOWNLOADS = r.SITE_SETTINGS.createChild('automaticDownloads'); -@@ -178,7 +180,9 @@ function createBrowserSettingsRoutes() { +@@ -179,7 +181,9 @@ function createBrowserSettingsRoutes() { } r.PRINTING = r.ADVANCED.createSection('/printing', 'printing'); diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch index efc68c1aa1e1..d038c0ed43ce 100644 --- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch +++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.js b/chrome/browser/resources/settings/site_settings/category_default_setting.js -index df398f0d2c32ae2208381fac15948d03ddcb2cb8..475e0d7e3695ed70feabe8f5e5fe12b3047592c4 100644 +index 1f4e519bd6162c2a25e8fe5f97387797b4555d61..3c6fde5d024fd000bca05ecf466aba0e3047950b 100644 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.js +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.js @@ -171,6 +171,7 @@ Polymer({ diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch index dc66120247aa..6ebb8d68cb8a 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.js b/chrome/browser/resources/settings/site_settings/constants.js -index d0385583d83808a3697f8b09dac5762bddfe694e..c89f361e36509f5d07a34370099f19dbf93b18f6 100644 +index 4b456ddd6ec071b2a71f63eab10b8f30207b5ab6..097c071a174afe168c867890870e43ae264265a9 100644 --- a/chrome/browser/resources/settings/site_settings/constants.js +++ b/chrome/browser/resources/settings/site_settings/constants.js -@@ -43,6 +43,7 @@ export const ContentSettingsTypes = { +@@ -44,6 +44,7 @@ export const ContentSettingsTypes = { VR: 'vr', WINDOW_PLACEMENT: 'window-placement', ZOOM_LEVELS: 'zoom-levels', diff --git a/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch b/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch index aae207dcd02c..1de657fff324 100644 --- a/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch +++ b/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc -index 8be7f7d0efd9c47b3f9c6d2334dfd4860eb829d1..9e45ba4528d1d5b57ce2726f9caca67ce3865db6 100644 +index 99a163ccbde4258ab0794213ceb8d592b38f7a3a..55116d5a0df8cd1de469ac53f3b1c639c16c21ff 100644 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc -@@ -59,7 +59,7 @@ std::string ReadFileIntoString(base::FilePath path) { +@@ -60,7 +60,7 @@ std::string ReadFileIntoString(base::FilePath path) { const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024; const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000; const char ModelLoader::kClientModelUrlPrefix[] = diff --git a/patches/chrome-browser-search_engines-template_url_service_factory.cc.patch b/patches/chrome-browser-search_engines-template_url_service_factory.cc.patch index 385b091c812d..9ffdbfacfc15 100644 --- a/patches/chrome-browser-search_engines-template_url_service_factory.cc.patch +++ b/patches/chrome-browser-search_engines-template_url_service_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc -index 7cd204e65e0caafb30a850ef0365e6ef51281934..cb7b7bd2cf80be24b3e0ff7541d63ac260ae5ed5 100644 +index b3f207c4d728b68fa725654e916f0d8d1e3b0c49..d93ca1e804bb0b7a83def669fa66c2ae6289982a 100644 --- a/chrome/browser/search_engines/template_url_service_factory.cc +++ b/chrome/browser/search_engines/template_url_service_factory.cc @@ -82,7 +82,12 @@ void TemplateURLServiceFactory::RegisterProfilePrefs( diff --git a/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch b/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch index b8f72a29d024..72b09e98a95e 100644 --- a/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch +++ b/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -index ffdb0522bf96ac97234c543df34a175137daf347..e478e56bd3c485de567d5406e6fe4cb6d0742b1a 100644 +index ca81ec53b3316bfc01c083818d5d2b4c0b59e967..4a51baaf28845907510b45553b78835da8c27f7a 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc @@ -278,7 +278,7 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() { diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 3fb03f9e9f9d..1ca46e77fbf4 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 4f610894b2c42ffbfc667c96ddb5dcbea81b1877..9809e22d15d980910c1631581cc4bef6caf79465 100644 +index 58a6545751b2e35368435cda4ffc1bf6834253e9..cdb83851c1ba1ff6251c2e74c723dd1f7746b805 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -591,6 +591,7 @@ static_library("ui") { +@@ -592,6 +592,7 @@ static_library("ui") { "//ui/webui/resources/cr_components/customize_themes:mojom", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 4f610894b2c42ffbfc667c96ddb5dcbea81b1877..9809e22d15d980910c1631581cc4bef6 allow_circular_includes_from += [ "//chrome/browser/ui/webui/bluetooth_internals" ] -@@ -3130,10 +3131,13 @@ static_library("ui") { +@@ -3141,10 +3142,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index 45d16b25c440..43b00ce64626 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index 6d6a3b90dcad29f06c9c0929126ddd52ee8eb0a4..89293b056d3a5a93bdf499ee5efc139a282bb9f8 100644 +index 675dae9023fee4e892cac765369ba069cade0646..94fe92d2a16718815805aa3d3b09debb413b1d5d 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -469,6 +469,7 @@ void Navigate(NavigateParams* params) { @@ -10,7 +10,7 @@ index 6d6a3b90dcad29f06c9c0929126ddd52ee8eb0a4..89293b056d3a5a93bdf499ee5efc139a // Open System Apps in their standalone window if necessary. // TODO(crbug.com/1096345): Remove this code after we integrate with intent -@@ -731,6 +732,7 @@ void Navigate(NavigateParams* params) { +@@ -737,6 +738,7 @@ void Navigate(NavigateParams* params) { bool IsHostAllowedInIncognito(const GURL& url) { std::string scheme = url.scheme(); base::StringPiece host = url.host_piece(); diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 22c5105267b1..44387f923bd1 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index fe2c5e1609435187ab74c66df0638d99d7fbef3b..792e78fb1465002fd79143dbe7eff93324422200 100644 +index 4cbb2c09d8469c3b6e308c07106daf4f8a9cfc2f..554b337751ce6e1725ad48311bba9c5d711c41fa 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -844,6 +844,7 @@ void BookmarkBarView::Layout() { diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index 4699c9f702df..c7a8464475a2 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 2576da658078baa1c210e8bc13f34827b316cd1e..b441b00114ab7cafb1cfd48a5df2e7bf19b53c64 100644 +index 2889d7f988f222eafdba8247110f879a7f2b18b9..db1d7186b8b55b84d0118e024c3ebfffb4f9cb12 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -568,6 +568,7 @@ void LocationBarView::Layout() { diff --git a/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch b/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch index 67c8e696586f..34849b255a96 100644 --- a/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc -index 8d5927f53d324f05a7adb88922de05c3699ccd05..3479a202d0b5b31da7bc9ee36defa38da2f056a6 100644 +index 649bc9614dcf60ef8e631ef4b7f99adb6d29a03b..117d58f2b87882cea4eb8bb485614599ebe6d46b 100644 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc @@ -37,8 +37,12 @@ namespace { diff --git a/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch index 1b1346cc08e9..db7fd99116bb 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_icon.cc b/chrome/browser/ui/views/tabs/tab_icon.cc -index 0c9e5b98b3ef5acdb3dc33f3c572d42bc37bc332..eec05b31aeb2a489bb1f8636a5be28b976d24d9e 100644 +index 5d67756c4e6815e19f32307a74510f66d362a91c..66d0f7a11131eda7c7fccf2f9c555c7e19c1d9a4 100644 --- a/chrome/browser/ui/views/tabs/tab_icon.cc +++ b/chrome/browser/ui/views/tabs/tab_icon.cc -@@ -356,7 +356,7 @@ void TabIcon::SetIcon(const GURL& url, const gfx::ImageSkia& icon) { +@@ -357,7 +357,7 @@ void TabIcon::SetIcon(const GURL& url, const gfx::ImageSkia& icon) { favicon_ = icon; diff --git a/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch b/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch index 83e2e6e59f1d..489bafe3ee12 100644 --- a/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc -index 171166457a31226ccc36d76c8b64d578012d112a..a07cd6cef46a862bfbf0d4a3c1eab17128d54d9d 100644 +index a98d2d97b78565d193e5fd4fb0e15589a2f23b3e..5ccba630cdaf7ac5822b67e98cffd105a9d22bb0 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc @@ -11,6 +11,7 @@ diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index f211e0852528..450d37028c7b 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 2f91f263187145f19ab03d8cb68169cbbffdb27b..2a66a0591e0200c91e0132db52066ce1045ae3dd 100644 +index 8d66d50525f97a06f9cc6501017e4b4a1e42f4d5..dde22ef0e8da16259eaa45f1cf3fb43681d8383b 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -275,7 +275,7 @@ void ToolbarView::Init() { diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index e974db06b228..20ab195438d9 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index 80c304aed440c7c351005244f35eda03673a4cd6..2eb24ee2427408c25a0252351f8d03e866893981 100644 +index 9f7728fec9767158e4ffbf1e0cc551b6bf7916b1..bf72558b8bc0afb3ac78b8100baa5845110ab6f6 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -12,6 +12,7 @@ @@ -10,7 +10,7 @@ index 80c304aed440c7c351005244f35eda03673a4cd6..2eb24ee2427408c25a0252351f8d03e8 #include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/accessibility_ui.h" -@@ -1025,7 +1026,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1028,7 +1029,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch index 9e6525ceb998..c3ee6e187f72 100644 --- a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc -index a1ddff80f28035458be64285ee801ebf74a05db2..d77ed872c4b9f00f5738beb7b90244f0f5d48a29 100644 +index abc1aa5c9e35cd3f80473c3a6e1994eb14a0f12e..5a6b4f66502c81ab040985acbd1f69056b44a097 100644 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc @@ -62,6 +62,7 @@ content::WebUIDataSource* CreateDownloadsUIHTMLSource(Profile* profile) { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 29ee67f454d7..d76c072672d5 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 989ae93d330602b98f9425403ab30ec465853ae7..4076bdafdcc41486d1c2aac2ef14fa57b80fe8a7 100644 +index fc0d14e47edb637b85b5ebb8f967aa838b7d48ad..7ebeaaa1fa4f1e1da5e75bbd46d47473533b0c63 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2244,6 +2244,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2377,6 +2377,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch index 400d2bfaf86a..55d2954e2e89 100644 --- a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch +++ b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -index 03e4ff1c9c616c5600d67c8aa0e7b84888219324..9d4e44d3822a0a0484e41a1b1fc90f403226feeb 100644 +index 3f73a0535e227a3af7c044cf4199b9fc5a245e42..243255a3fa2bdfdf86c850473abfcf6af398e765 100644 --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -399,6 +399,7 @@ std::string TouchIdMetadataSecret(Profile* profile) { +@@ -433,6 +433,7 @@ std::string TouchIdMetadataSecret(Profile* profile) { ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfig ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfigForProfile( Profile* profile) { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 798034cd4f48..a1f529f35118 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 3c745772f189e77779584f5d846e051a9d233191..87d37ddc12be1dcb3d40d5ec0f54e7de530ec604 100644 +index 16fe306a6097e354858dd8ebe83b924174c55415..2781f10e6dba98b980f4b5161d6c3a3c9b87ef7d 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -64,6 +64,7 @@ source_set("channel_info") { diff --git a/patches/chrome-common-importer-importer_data_types.h.patch b/patches/chrome-common-importer-importer_data_types.h.patch index b72b95056a15..a2ac0abad590 100644 --- a/patches/chrome-common-importer-importer_data_types.h.patch +++ b/patches/chrome-common-importer-importer_data_types.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/importer/importer_data_types.h b/chrome/common/importer/importer_data_types.h -index 65cfcd480bd575bb5aa1953332c52b92a7606a70..388bec98f179047d56968531fb81bc7e75aafc41 100644 +index 6514aca7a68635245338285141a869dc0e682da5..53f5b5c0342c3a5e00cd426d531f024ba6d8cf45 100644 --- a/chrome/common/importer/importer_data_types.h +++ b/chrome/common/importer/importer_data_types.h @@ -31,7 +31,7 @@ enum ImportItem { diff --git a/patches/chrome-installer-mini_installer-mini_installer.cc.patch b/patches/chrome-installer-mini_installer-mini_installer.cc.patch index 85b7a621141f..f7670a937446 100644 --- a/patches/chrome-installer-mini_installer-mini_installer.cc.patch +++ b/patches/chrome-installer-mini_installer-mini_installer.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc -index 1c94fd3107389d9dc05f755e8b429df8fcc167af..53c3cda01cf084c0adb4f8b84e255bd304d2cbcd 100644 +index d01bb78cfd70458d2c998365cf179045840b2ad1..da0823d8f73a72928623f6f770683e915f7782d2 100644 --- a/chrome/installer/mini_installer/mini_installer.cc +++ b/chrome/installer/mini_installer/mini_installer.cc @@ -527,6 +527,7 @@ ProcessExitResult RunSetup(const Configuration& configuration, diff --git a/patches/chrome-installer-util-BUILD.gn.patch b/patches/chrome-installer-util-BUILD.gn.patch index 2b34e4977d8f..ef6732c9238a 100644 --- a/patches/chrome-installer-util-BUILD.gn.patch +++ b/patches/chrome-installer-util-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn -index 88cc5d8d6bac4cf2a18394e7217e08a8474ff6af..6553edb21c00cc45bd568f802b0bea677c2bf244 100644 +index 2ea95551d977717045804377090c4e57bb4e0518..cf2c6401223c15a684e07d274c8466b87c199ea0 100644 --- a/chrome/installer/util/BUILD.gn +++ b/chrome/installer/util/BUILD.gn -@@ -222,7 +222,20 @@ generate_embedded_i18n("generate_strings") { +@@ -225,7 +225,20 @@ generate_embedded_i18n("generate_strings") { output_file_name_base = "installer_util_strings" diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index ca37beb07dc3..a63afb3787ac 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index eb6e5d353b3333e4e4f474badebc67c672bf84a7..2d017884f8f158458c32a9f04572c707ee445d6a 100644 +index 87243e716262b31c49a2bf18fc3b3b8c38b29c53..384627707dbdbe3961a178b966886cbc81285581 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -485,7 +485,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -487,7 +487,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch index 565a209cf456..7fef2c2d2dc7 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index 066a1a0690c013ffdb8ee043f8489e250ac430f0..3b974e020afeab4ff66995b377f8b16e0c281de4 100644 +index 04d63a82dde7b1ec4259ec90e0733f3536e97ad0..ce53857b344e8c56706b8980c86219f81ee0d0d8 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h -@@ -232,6 +232,7 @@ class ChromeContentRendererClient +@@ -238,6 +238,7 @@ class ChromeContentRendererClient #endif private: diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index b5e81ac72314..91807eb4e460 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 7429f324e6e856eaa8caf06999f483de3d2b6e4e..1f935c123c49d82bec9b1f40ac3e5b0e87d72e66 100644 +index 24b1e6d45fd1a13892f6a30ae9bc587bbf6dfbdf..d08479d044b4492f94a41301ed4239c587d68449 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -806,6 +806,7 @@ if (!is_android) { +@@ -828,6 +828,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/chrome-test-base-testing_profile.cc.patch b/patches/chrome-test-base-testing_profile.cc.patch index 355587dcdf51..9743d6b028cb 100644 --- a/patches/chrome-test-base-testing_profile.cc.patch +++ b/patches/chrome-test-base-testing_profile.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc -index d6d1828b41d70d3e45d5c129b0432334c287083c..484a237dd8eddb66888487903401ff64f9fe88ed 100644 +index cd31628f7ff2bb0684ec250358f3e113b7a38403..e19418e465c90f04ccd3b0f0a40800a96d1547db 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc -@@ -325,6 +325,7 @@ void TestingProfile::Init() { +@@ -324,6 +324,7 @@ void TestingProfile::Init() { EnsureBrowserContextKeyedServiceFactoriesBuilt(); #if BUILDFLAG(ENABLE_SUPERVISED_USERS) diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index 738061009d6c..a030149bdd42 100644 --- a/patches/chrome-utility-BUILD.gn.patch +++ b/patches/chrome-utility-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn -index 591753657beba5f011b1879143591da335d97a68..6f013546df6542fa0496631337d3c5fdac250b69 100644 +index 8ca2f3bdf8362bcedeb8784f08fd9c4c9fa15b16..4b9e26ec210f9e4a540ce4f4e0b2a4bb0c62ee70 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -28,6 +28,7 @@ static_library("utility") { diff --git a/patches/chrome-utility-services.cc.patch b/patches/chrome-utility-services.cc.patch index c2cdedeabfce..64eb17e94a14 100644 --- a/patches/chrome-utility-services.cc.patch +++ b/patches/chrome-utility-services.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc -index d0a88f9e69dae1e8003d4e4515012450d72f845b..bf91ed8fd22401b2c553de99f1938faf6933099a 100644 +index a1e8b1f17864e009e92d19944a7352e9a72af138..1eb196a840cf1a228ee9508958547c91b721383f 100644 --- a/chrome/utility/services.cc +++ b/chrome/utility/services.cc @@ -324,6 +324,7 @@ mojo::ServiceFactory* GetMainThreadServiceFactory() { diff --git a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch index 1a9919561497..cf52e598e927 100644 --- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 4cef5d840f9cf25da34bc1e0386f3bc6ab6c2f53..9df31674d73cdf91aa562c0966db9f3098769f5b 100644 +index 24fdb2c10f985b68b00dfb981c4d1571574ad977..0ff133d53a6f764eb7d3443070b16dd3c9b303c1 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -610,6 +610,7 @@ void ContentSettingsRegistry::Init() { +@@ -621,6 +621,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); diff --git a/patches/components-content_settings-core-common-content_settings_mojom_traits.h.patch b/patches/components-content_settings-core-common-content_settings_mojom_traits.h.patch index 3d7723af1ee3..ed55d9ec68d8 100644 --- a/patches/components-content_settings-core-common-content_settings_mojom_traits.h.patch +++ b/patches/components-content_settings-core-common-content_settings_mojom_traits.h.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_traits.h b/components/content_settings/core/common/content_settings_mojom_traits.h -index 7ffaa9b4ec4338ead98b6d30ac188c73e3b07542..5fe94e46719386dfe3c2cc5c137109b58861871e 100644 +index e58b9a69537b2e49c90504fbdfe7e3444e853772..fea7416c7ada6702a2001afe6fb05d8d35579c07 100644 --- a/components/content_settings/core/common/content_settings_mojom_traits.h +++ b/components/content_settings/core/common/content_settings_mojom_traits.h -@@ -147,6 +147,7 @@ struct StructTraits< +@@ -148,6 +148,7 @@ struct StructTraits< static bool Read( content_settings::mojom::RendererContentSettingRulesDataView data, RendererContentSettingRules* out); diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index e424c2951ea4..1593d86563eb 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index 8a474c493b8081996b2899a29201b1c143dd77cf..a3803eb6267cbc76da49b6594323b6b3a3bb757d 100644 +index dfe701efa10eeec2bcc4b11a22f7e61952732a03..dedf2dc88a8a1250d314abd20ddc892bfd93543e 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc -@@ -1973,8 +1973,8 @@ void DownloadItemImpl::OnDownloadCompleting() { +@@ -1959,8 +1959,8 @@ void DownloadItemImpl::OnDownloadCompleting() { base::Unretained(download_file_.get()), GetTargetFilePath(), delegate_->GetApplicationClientIdForFileScanning(), diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index efd7e1c47781..99ba0801137a 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 4a0d2e8f91136ef9c263f1634d54f1d183d62dcf..3f0ce951fbd82d778eeaf95ca9cf67fc39de1850 100644 +index f7266475b1fdef082cbde96b227d4e1fdaa3e544..82eb2fcec51ea92c2dc95e8f36cac6b4cec097d3 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -253,6 +253,7 @@ static_library("browser") { diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index 367a025069cd..bc96eef8b29d 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index 95f686586eda32edf0868774f9568dfaa4b33338..61c7c72e69c64bd380ee50190a503480afe22956 100644 +index 42ecf277e74c976ff633c6d234431e52c67ae9d1..f93f744eea6cc61151fc3a27cbe9b92769a51453 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -261,6 +261,7 @@ AutocompleteController::AutocompleteController( diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index a639e9bf03f8..1599988dc680 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index 08a84c7ff5ebf00cd460b5a914edaa67773e1811..33dc8ec45065a96033f790bdc9b78a73182aaec5 100644 +index d0172a94ab89c5b861a122e10f8b5e48866fdc3a..a4110c7525a16ed402b4b218f4d1d7b6a6a78375 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -967,6 +967,7 @@ void PageInfo::PresentSitePermissions() { +@@ -969,6 +969,7 @@ void PageInfo::PresentSitePermissions() { } } diff --git a/patches/components-page_info-page_info_ui.cc.patch b/patches/components-page_info-page_info_ui.cc.patch index 0a6dfe68ab74..6806d2774c0d 100644 --- a/patches/components-page_info-page_info_ui.cc.patch +++ b/patches/components-page_info-page_info_ui.cc.patch @@ -1,9 +1,9 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc -index 87d77aa394f81887d8a4923fbd4abaca8ed8631c..71dd781811ff7c547cd7d77c118b72d3d4e07493 100644 +index 3da415e052e9a4f047f4aaeea1d5cc5677602677..aa1894cccbef67ccee310dc629c468b7e6d7c419 100644 --- a/components/page_info/page_info_ui.cc +++ b/components/page_info/page_info_ui.cc -@@ -555,6 +555,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon(const PermissionInfo& info, - SkColor related_text_color) { +@@ -554,6 +554,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon( + SkColor related_text_color) { const gfx::VectorIcon* icon = &gfx::kNoneIcon; switch (info.type) { + BRAVE_PAGE_INFO_UI_GET_PERMISSION_ICON diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index 5d6d57c4a363..185dceb8dbb6 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index 140a1bdf4b9080dbb2c26ed5c5f75b4373418c74..7e157a0d269010d21529714ca5dd436798250b5b 100644 +index 74c6c4f1409ff5a0505eac79f5638f81d24547db..78014cd72ba4e69e1bf6b5a1e1e75269f05190e2 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -1970,6 +1970,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -1977,6 +1977,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-translate-core-browser-BUILD.gn.patch b/patches/components-translate-core-browser-BUILD.gn.patch index 3b6d72f9ad75..249af054ea8e 100644 --- a/patches/components-translate-core-browser-BUILD.gn.patch +++ b/patches/components-translate-core-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/translate/core/browser/BUILD.gn b/components/translate/core/browser/BUILD.gn -index 0c629705b6dd370611bbc30db1d78e70e1a51d3e..b50781446fd1d8559085a9c79aa64ee5ca47133d 100644 +index 5198ffb0317a60e920bd31e23b68dc9f5d3e5a48..98e77e64c9a84422b23133392abdfb6f4ecc2621 100644 --- a/components/translate/core/browser/BUILD.gn +++ b/components/translate/core/browser/BUILD.gn -@@ -82,6 +82,7 @@ static_library("browser") { +@@ -85,6 +85,7 @@ static_library("browser") { ] deps += [ "//components/infobars/core" ] } diff --git a/patches/content-browser-permissions-permission_controller_impl.cc.patch b/patches/content-browser-permissions-permission_controller_impl.cc.patch index d33541f8fb58..5bc540b9c7a7 100644 --- a/patches/content-browser-permissions-permission_controller_impl.cc.patch +++ b/patches/content-browser-permissions-permission_controller_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc -index 259186652ba17b85c65657865ad78a6ad997d00c..a8405e5951fc819b514788875e9084ea7625ddb7 100644 +index ddd6656e035c4448905c7d9beb0896a13ad17ad0..c5dd4d3bbde92b939a17dc0c6d409070363feb39 100644 --- a/content/browser/permissions/permission_controller_impl.cc +++ b/content/browser/permissions/permission_controller_impl.cc @@ -67,6 +67,7 @@ PermissionToSchedulingFeature(PermissionType permission_name) { diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 775cbb5f0b5e..ea19497ed62c 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 6bdd9cb82c95ae92d0a0bb2f55831b21612175bf..9e08c8344076c4ce8c3a7faed583be511eaec462 100644 +index d50253cb9c4de436ac4ac4b5316834814aef248d..46516a48db6d97bf21d3da3c059a49234e2c9440 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3025,16 +3025,17 @@ void NavigationControllerImpl::NavigateWithoutEntry( +@@ -3016,16 +3016,17 @@ void NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index b074e07ecc41..2cb3484e6275 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 6d2487d9d54a6a17cb17714f27591a89c19e8fb4..6a0579cdcde19a0d26ef60e785a1a9a70afd766d 100644 +index 9e83a156d7e1341054817765c347a9f91e31c669..2c6560b07abb805540995a87f7cc33f4bd34521b 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -1812,6 +1812,7 @@ void NavigationRequest::OnRequestRedirected( @@ -10,7 +10,7 @@ index 6d2487d9d54a6a17cb17714f27591a89c19e8fb4..6a0579cdcde19a0d26ef60e785a1a9a7 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -2771,6 +2771,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -2784,6 +2785,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch index 96fb70431c47..7b5c6997733e 100644 --- a/patches/content-browser-webui-web_ui_impl.cc.patch +++ b/patches/content-browser-webui-web_ui_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc -index 8bf0b601706121ac947f49bf4f7d9395314123a8..2f2d72cb31a2f4cd0f1398b1640d99c4a684a3dd 100644 +index a4f08bc2f83c6bce669cf1a6e694d98a1aac9a4e..e97c17130ffb3e691f53cab548ebdad47f71d445 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc @@ -89,6 +89,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHost* frame_host) diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index e37a68de6d36..b270b3744ce2 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 8f47984d72b93e5178ec93a68711f03d6eca3cdb..651c62a7a283a3fd97d656971777c4e083479d1d 100644 +index 5dd064f5fa6a01031c4f2a97223109e730488ca8..6f2a5df09bff80afa8dff2d0841cac0c2885a4dd 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -37,6 +37,7 @@ source_set("common") { diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index ba147d26fdba..ca6514d2d5d5 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,5 +1,5 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 718fc096bd1087ef89d599f572abe20d4173a41c..9e8e5f04d4ccdf43a25723e46e4d3db12c262c5c 100644 +index c2642a399f14edb12cd752e6e61bd249c4f20ff8..45438592e4ce57e97c29a0814f956858b368f13b 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -1788,6 +1788,7 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 30ca4ac7820e..e774343ab3c1 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 00fa473eba005dd07045c026bef264a29acec916..503926e43da73f73b8020a80f96a93550af68f1d 100644 +index 671d6851e1605ea6a9002e0731ed540e04b59359..f5f23f07321424e193a9447c9b9e4c55e7b2d0b1 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1012,6 +1012,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { +@@ -1011,6 +1011,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/google_apis-google_api_keys.cc.patch b/patches/google_apis-google_api_keys.cc.patch index 3236f5818774..cf1984dbbe0f 100644 --- a/patches/google_apis-google_api_keys.cc.patch +++ b/patches/google_apis-google_api_keys.cc.patch @@ -1,8 +1,8 @@ diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc -index 327f894be773e64e4c865e29d8830c9f207f96d8..280c4bfdfe142b1c94080414e5d3cf61910f2b4f 100644 +index 917edc5590d8a29737f40c88d194e374de633344..9b7a7b829e789106cab4b043bf0f547d0bbca2f2 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc -@@ -209,6 +209,7 @@ class APIKeyCache { +@@ -220,6 +220,7 @@ class APIKeyCache { #if defined(OS_IOS) void set_api_key(const std::string& api_key) { api_key_ = api_key; } #endif diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 71ca0870d96a..8b2a7b865553 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index adc6d76a2dbc76d86692b177d711eaa6e66e7b5e..9a1223a0df6feb8bf72714455cbca0e2bd8653f3 100644 +index c3ef470248cb3789812515fdc0145a7a6889a0c4..534f05fe4d8796e8b492d80bf4d09ec137a8e8c7 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1182,6 +1182,7 @@ component("net") { diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index a6054d4f632a..60f146cf5738 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index cc148fc2e8f9f896876f0cc0fae75d00c340d621..f332229d01e6d541dd4d713db525dfb996a9ddaa 100644 +index d66d36e59a30a19dd6150da6111d9533dfe3290b..575498f2be653ad6304b5831ce941b5f7da480de 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn @@ -146,6 +146,7 @@ component("cpp") { diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index 0c365725e8b4..10bec2cd3793 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 1301aa2ad8d14962bb0caeaffcd6b31aed7f4bc0..1f0908040fafe677de9ccb716ab71a84be5d01e6 100644 +index d95886012c43ab714c013c62e08475d05956a900..655ecec8c62fd3f5108fa05eb8ba94aca86e3eb1 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -126,6 +126,7 @@ component("core") { diff --git a/patches/third_party-blink-renderer-core-dom-document.cc.patch b/patches/third_party-blink-renderer-core-dom-document.cc.patch index 7b5aeb2460a4..ff05d4f156a7 100644 --- a/patches/third_party-blink-renderer-core-dom-document.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-document.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index addb2d72ece5d65a9c17bab67297c3e2a251bba7..f2ac4689046610912ca60e4e29e5c1add06b003d 100644 +index 3c9277ec1df9ec6b34ea589bd07b61cddce685df..e03f2a4d862e45ba243f51ea6aaf76e1411aecc2 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -33,7 +33,7 @@ diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index ba9e9362bea9..c921e6ce4040 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 8ab1063ef6ea43caf37244229b7c90308c912cc4..d35b256393056bb8363b4fcf3e0502c0e4ca8a20 100644 +index bd0c13e67cff16316328ea32598cba81d1a57933..448a93f0c4b80a101b7a05b4fb327fd61a9e7ba1 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -970,6 +970,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -973,6 +973,7 @@ String HTMLCanvasElement::ToDataURLInternal( scoped_refptr image_bitmap = Snapshot(source_buffer); if (image_bitmap) { diff --git a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch index 768b6d059192..5ea1cf283a22 100644 --- a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch +++ b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc -index b7ec37b07760fb36b577869b50f438e28b4e1ece..ddcc59bca198ce0370b273af7c01b58134995439 100644 +index 8ae33d3b689fd9888fca3861b6ac4ed18c9595bb..f6b1986e4406ac9bba6d245a710eeb953cf7c893 100644 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc @@ -309,6 +309,7 @@ bool AutoplayPolicy::IsGestureNeededForPlayback() const { diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 1c78061681d2..65e50ae051df 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index f3641ca8328feb847cc4f94acd9c46ecbdda9407..07ba7e5f77f839f964e1d215ebbb5f4134ee3d8e 100644 +index 244cbcfde840ddbdc62e9006a3038da322b6a32b..3f34d50c00564dd2ddb2cc4f6c849b842087d500 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -16,6 +16,7 @@ if (is_android) { diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index 83b8f3e477df..6445479c1376 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index 653a5945de27c756219c32c20b01ae1c65702b67..013b3c635c092856e408022ba667c52c29fa394b 100644 +index 76a77084142a7e4e0f97bdfe258053206cabb5d0..b16c1f48ebb31c2957f6e3da8643f7faff21c03f 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc @@ -1577,6 +1577,7 @@ ImageData* BaseRenderingContext2D::createImageData( diff --git a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch index 910c27481f48..b0e9e532e507 100644 --- a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch +++ b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc -index 0e8354b706b594d67dbc68f1a147a2206f13f559..abe03c13e11f99cd11a3575f7dfb7c903f7dd1c8 100644 +index ace49af90f105d7d166e17dcefb4ac3abc8d5c74..e7abd3e788b0e1bf55e0fdae43ed760fb3a5cc83 100644 --- a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc +++ b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc @@ -80,6 +80,7 @@ base::Optional ToCanonicalCookie( diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index c6d40b175927..87ee363826e7 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,5 +1,5 @@ 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 -index 02283cec8026abef54127d18a87342867d3e8e7a..8e8de2609ede651e27eab5309e8c2be3dfeb13e6 100644 +index 3b4eca07d5997b5763cc14de64b655a2da344fcf..2af7723bab81e8ee27b3af1f7d7571d577ddfcf9 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc @@ -2941,6 +2941,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( diff --git a/patches/third_party-widevine-cdm-widevine.gni.patch b/patches/third_party-widevine-cdm-widevine.gni.patch index 03addceaea09..fc2906bbd390 100644 --- a/patches/third_party-widevine-cdm-widevine.gni.patch +++ b/patches/third_party-widevine-cdm-widevine.gni.patch @@ -1,5 +1,5 @@ diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni -index ddf5c9475a8dbc03d6150b19e47df782290c5161..19b1e2dad089f893df1ccd74534b4d126d6e2e8c 100644 +index 5572a1dae88c44ff50c0c71dba626cebe0987080..83a75ea911258765be02d33eb6d821f227295c14 100644 --- a/third_party/widevine/cdm/widevine.gni +++ b/third_party/widevine/cdm/widevine.gni @@ -41,6 +41,8 @@ enable_widevine_cdm_component = diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index ad831b6caac3..026400961086 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 902db6a26179014a5154915082e5c6b37543e964..06774374e1f90746b0b18c1071aa6b0272b3becf 100644 +index 9ee0acf3ade8dd4789f40a2b17bfeabbfa5e3cf8..2603cb4c8d213497bd633d27fee6888261cdf219 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index 902db6a26179014a5154915082e5c6b37543e964..06774374e1f90746b0b18c1071aa6b02 "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -387,6 +390,9 @@ +@@ -393,6 +396,9 @@ "META": {"align": 100}, "messages": [2700], }, diff --git a/patches/tools-json_schema_compiler-feature_compiler.py.patch b/patches/tools-json_schema_compiler-feature_compiler.py.patch index d9b56a82af3e..890291481262 100644 --- a/patches/tools-json_schema_compiler-feature_compiler.py.patch +++ b/patches/tools-json_schema_compiler-feature_compiler.py.patch @@ -1,8 +1,8 @@ diff --git a/tools/json_schema_compiler/feature_compiler.py b/tools/json_schema_compiler/feature_compiler.py -index acb4e45508512eb9af4660369f03e781e7e058bc..6bf22c7a07f79f8c553cdfb07ce4da97902d3c58 100644 +index 92d4dcf8ceb97d47e8a30952c47f1df23186c673..9cf762f489c7c06d4a193d5d42e6cadf8e76b1a1 100644 --- a/tools/json_schema_compiler/feature_compiler.py +++ b/tools/json_schema_compiler/feature_compiler.py -@@ -744,6 +744,14 @@ class FeatureCompiler(object): +@@ -745,6 +745,14 @@ class FeatureCompiler(object): abs_source_file) raise dupes = set(f_json) & set(self._json) diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch index b7cc6c8ab0e8..d573d92498a0 100644 --- a/patches/tools-metrics-histograms-histograms.xml.patch +++ b/patches/tools-metrics-histograms-histograms.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml -index 305e198790e8fbf92fc6dc982fe2f087d75e2418..6a53dd324f8dd2a5be6ff56c64c665232cabdcf3 100644 +index 6124dbded858bf5a3f957465447b7397dac2492b..5241b681ebec98730dbc23bde3b68ce9ed619574 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml -@@ -214162,6 +214162,7 @@ regressions. --> +@@ -210770,6 +210770,7 @@ regressions. --> diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index d2dcad948d3c..58ba2a2cce43 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 5d8906947786e05e5aa5a5ec83471badb5456f0c..4982db0908dafbc9fc0fa1e261a7b556d8af9853 100644 +index 7f993aa14fc1f179f4fa952241761bb826c787e9..b9441a7e94ca4ae701ce113fe2de0a9ccfa1842e 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -457,6 +457,7 @@ component("base") { diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch index d3f6dd7ea305..ff8f61d40e92 100644 --- a/patches/ui-native_theme-native_theme_win.cc.patch +++ b/patches/ui-native_theme-native_theme_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc -index 91c5532be895114ac532d270cb5e00cbfd4abf89..3063d2280ef7b72840f0c09d632728a7eea003eb 100644 +index d6fa761fafbc7cfea744a34b1101fb33a5ac1ba2..131a78b806a17c52bc7d102ef4d872559d98014f 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc -@@ -1641,6 +1641,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { +@@ -1643,6 +1643,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { &apps_use_light_theme); dark_mode_enabled = (apps_use_light_theme == 0); } From 6db88ac5bd630ae2812fbc3f9e92be793f5da746 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 11:18:20 -0400 Subject: [PATCH 040/152] Conflict-resolved patches from Chromium 87.0.4263.3 to Chromium 87.0.4270.0. --- patches/build-config-android-config.gni.patch | 6 ++-- patches/chrome-VERSION.patch | 6 ++-- ...rome-android-chrome_java_sources.gni.patch | 6 ++-- ...ome-android-java-AndroidManifest.xml.patch | 8 ++--- patches/chrome-browser-BUILD.gn.patch | 12 ++++---- ...rivate-webrtc_logging_private_api.cc.patch | 4 +-- ...notification_display_service_impl.cc.patch | 6 ++-- ...rowser-resources-extensions-BUILD.gn.patch | 6 ++-- ...tings-privacy_page-privacy_page.html.patch | 30 +++++++++---------- ...ings-site_settings-site_details.html.patch | 8 ++--- patches/chrome-browser-ui-browser.h.patch | 8 ++--- ...ws-bookmarks-bookmark_bubble_view.cc.patch | 8 ++--- ...ble-permission_prompt_bubble_view.cc.patch | 8 ++--- ...ome-installer-mac-signing-signing.py.patch | 10 +++---- ...nts-permissions-permission_request.h.patch | 6 ++-- ...s-permissions-permission_uma_util.cc.patch | 6 ++-- ...-blink-key_system_config_selector.cc.patch | 6 ++-- 17 files changed, 72 insertions(+), 72 deletions(-) diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index d07ed9ea2f15..fae91a341257 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,9 +1,9 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 0b942fa4cf9ce965d9ba5d93ac25e42baf7bbfe8..ee0e84a822681db8282e35d6d9e1f0d0c7aa7cb6 100644 +index 42dae77e1709293ee3745469570d13404b1c8c65..858e9a3a03925fe1f7d39a57c318eab95e2ec914 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni -@@ -3,6 +3,7 @@ - # found in the LICENSE file. +@@ -7,6 +7,7 @@ + import("//build/config/chromeos/ui_mode.gni") # This file contains common system config stuff for the Android build. +import("//brave/build/android/config.gni") diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 7e8759a12700..96cc8f4702c6 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index b8886ed6d9518bfc6dcf5c31597c735825cdea23..977465f2d49bf2289b7934c07266323e3c967742 100644 +index 572ffda3954b1e864e632a21b95afb24b2f4797d..977465f2d49bf2289b7934c07266323e3c967742 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=87 -MINOR=0 --BUILD=4263 --PATCH=3 +-BUILD=4270 +-PATCH=0 +MINOR=1 +BUILD=18 +PATCH=15 diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index d63c2c9947c2..cf8ad68c20a8 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,10 +1,10 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index e7fe71f05e0867be88b8dda6cb1c5ba0c2c09f52..642fdd5f0fca210eceb52d414ac779d8fb7c36c9 100644 +index 53d7e20ccf24dfa7d69aff3b90a16e4de4528ae2..141fa1d079561ca9409435e1a598176216053aa1 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1708,3 +1708,4 @@ chrome_java_sources = [ +@@ -1694,3 +1694,4 @@ chrome_java_sources = [ + "java/src/org/chromium/chrome/browser/webauth/HandlerResponseCallback.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", - "java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java", ] +chrome_java_sources -= ["java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java",] \ No newline at end of file diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 23bec8fd10d4..68e105dd08ef 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 3b1a51fe42f01e1c4d0c9b018c283675c2703106..bf977767a3f2d88099ce388332d836652945a297 100644 +index bf4b2d47b7e26e9567f8582e0084904cee785573..d443349e977a7876b0fd4142d9030c0eaaa1664f 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -34,7 +34,9 @@ by a child template that "extends" this file. @@ -54,7 +54,7 @@ index 3b1a51fe42f01e1c4d0c9b018c283675c2703106..bf977767a3f2d88099ce388332d83665 android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="{% block application_label %}@string/app_name{% endblock %}" -@@ -198,6 +209,7 @@ by a child template that "extends" this file. +@@ -199,6 +210,7 @@ by a child template that "extends" this file. @@ -62,11 +62,11 @@ index 3b1a51fe42f01e1c4d0c9b018c283675c2703106..bf977767a3f2d88099ce388332d83665 {% endif %} -@@ -1203,6 +1215,7 @@ by a child template that "extends" this file. +@@ -1204,6 +1216,7 @@ by a child template that "extends" this file. {% endif %} + {% include "//brave/android/java/AndroidManifest.xml" %} {% block extra_application_definitions %} - - - Add Bookmark - - - Edit Bookmark + + + Add Bookmark + + + Edit Bookmark + + + Read Later + + + Mark as Read + + + + + Add bookmark + + + Edit bookmark + + + Read later + + + Mark as read + + + + + + Read later - - Add to Read later + + UNREAD - - Mark as Read + + PAGES YOU'VE READ @@ -5679,6 +5714,12 @@ Keep your key file in a safe place. You will need it to create new versions of y To browse privately, click the dots icon menu to open a private window + + Get captions for your media + + + Get captions for your media by enabling Live Caption in settings + Open a new tab with one click @@ -5697,12 +5738,22 @@ Keep your key file in a safe place. You will need it to create new versions of y To group tabs together, right-click a tab - - Dismiss - - - Remind me later - + + + Got It + + + Remind Me Later + + + + + Got it + + + Remind me later + + @@ -5906,7 +5957,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Save - + Never @@ -7363,7 +7414,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Thumbnail removed. - + Don't show on this page @@ -9067,6 +9118,9 @@ Please help our engineers fix this problem. Tell us what happened right before y + + Live Caption + Turn off Live Caption for now @@ -9079,9 +9133,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Live Caption is not available right now - - Live Caption - @@ -9618,8 +9669,8 @@ Please help our engineers fix this problem. Tell us what happened right before y Open Settings to connect $1Nexus 5 to $2Linux - - Open Settings to connect $1Nexus 5 + + Open Settings to connect $1Nexus 5 to Parallels Desktop or Linux USB device detected @@ -9801,7 +9852,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - + Always allow ads on this site @@ -10336,7 +10387,10 @@ Please help our engineers fix this problem. Tell us what happened right before y - Close guest + {0, plural, + =1 {Close guest} + other {Close guest} + } @@ -10543,12 +10597,10 @@ Please help our engineers fix this problem. Tell us what happened right before y - This is an Arm64 Brave on Arm64, so things might not work quite right -yet! + Brave can’t play premium videos or music on this device yet. Brave will update automatically when this issue is fixed. - This is an x86-64 Brave on Arm64, so things might not work quite right -yet! + This is an x86-64 Brave on Arm64, so things might not work quite right yet! Learn more diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 19ed8c90e49a..8463f2cd59ff 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -470,6 +470,11 @@ are declared in tools/grit/grit_rule.gni. + + + + + @@ -490,6 +495,11 @@ are declared in tools/grit/grit_rule.gni. To browse privately, click the dots icon menu to open a private window + + + + + diff --git a/app/nearby_share_strings.grdp b/app/nearby_share_strings.grdp index 048e0f9e8ace..fc5153684c6e 100644 --- a/app/nearby_share_strings.grdp +++ b/app/nearby_share_strings.grdp @@ -17,8 +17,11 @@ Contacts - - Devices near you when Nearby Share is open + + Devices near you when Nearby Share is open on their device + + + Devices near you when Nearby Share is open on your device No contacts are available. To use Nearby Share with your contacts, add the email address linked with their Brave sync chain to your contacts. @@ -36,7 +39,7 @@ All contacts near you when your screen is unlocked - No one unless you open Nearby Share + No one unless you open Nearby Share on your device Selected contacts near you when your screen is unlocked diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index 93a5bbed2b08..1ab61e8ca3da 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -875,10 +875,10 @@ Input - - Change system language + + Change device language - + Translation suggestion @@ -887,10 +887,10 @@ Add input methods - + Spell check - + Customize spell check diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index bde569ab12c3..b1ae0a4dcc40 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -251,47 +251,44 @@ Input - - System display language + + Device language - - System features like launcher, Settings and Files will appear in this language. - - + Change - - Change system language. Current language is $1English. System features like launcher, Settings and Files will appear in the language you choose. + + Change device language. Current language is $1English. - + Change device language - - The change in device language requires a restart. <a target="_blank" href="$1">Learn more</a> + + You need to restart your Bravebook to change the device language. <a target="_blank" href="$1">Learn more</a> - + Confirm and restart - - Languages you read + + Languages for apps and websites - - Add and order languages you read. Apps and websites will be displayed in the most preferred language available. <a target="_blank" href="$1">Learn more</a> + + Apps and websites that support multiple languages will use the first supported language from this list. Language preferences sync to Brave browser. <a target="_blank" href="$1">Learn more</a> - - The language is used when translating pages + + Language used when translating pages - + Translation suggestion - - Allow the system to offer to translate web pages when it detects languages you don't read + + Offer to translate websites in other languages Input methods - Open options page for $1US keyboard + Open options page for $1US keyboard Add input methods @@ -299,30 +296,60 @@ Remove $1US keyboard? - + + Suggested + + + All input methods + + + Search by languages or input names + + + Your administrator doesn't allow this input method + + Spell check - - Enhanced spell check in Brave browser only (text is sent to Brave) + + Enhanced spell check in Brave browser (text is sent to Brave for spelling suggestions) - + Spell check languages - + Languages available for spell check is based on your languages settings - + Couldn’t download spell check dictionary - + Try again - + Couldn’t download spell check dictionary for $1English. Try again. - + Customize spell check + + Add words you want spell check to skip + + + Add word + + + Word already added + + + Use 99 letters or fewer for new words + + + Delete word + + + Saved custom words will appear here + Languages @@ -1177,7 +1204,7 @@ Remove - USB preferences + Manage USB devices Give Linux apps permission to access USB devices. Linux won't remember a USB device after it's removed. @@ -1188,6 +1215,12 @@ Available USB devices will appear here. + + Device in use + + + "$1Nexus 5" is in use. Reassigning the device while it's in use could cause errors. Are you sure you want to continue? + Develop Android apps @@ -2551,8 +2584,11 @@ Keep display on - - Other + + Shut down + + + Sign out Sleep when cover is closed @@ -3052,11 +3088,20 @@ Stop sharing + + Couldn't unshare because an application is using this folder. The folder will be unshared when Parallels Desktop is next shut down. + + + Unshare failed + + + Try again + Shared folders will appear here - USB preferences + Manage USB devices Give Parallels Desktop permission to access USB devices. Parallels Desktop won't remember a USB device after it's removed. @@ -3067,6 +3112,12 @@ Available USB devices will appear here. + + Device in use + + + "$1Nexus 5" is in use. Reassigning the device while it's in use could cause errors. Are you sure you want to continue? + diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index fc48f6b34568..04b9c4187c0c 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -428,8 +428,8 @@ Warn you if passwords are exposed in a data breach - - When you sign in to your Brave sync chain, this feature is turned on + + When you sign in to your Brave sync chain, this feature is turned on. Saved Passwords @@ -1033,6 +1033,9 @@ Add languages or reorder list. + + Manage languages in Chrome OS settings + @@ -1612,6 +1615,219 @@ Sites automatically follow this setting when you visit them + + Sites usually show ads so they can provide content or services for free. But, some sites are known to show intrusive or misleading ads. + + + All sites can show any ads to you + + + Block ads on sites that show intrusive or misleading ads (recommended) + + + Sites usually track your camera position for AR features, like games or heads-up directions + + + Sites can ask to track your camera position + + + Block sites from tracking your camera position + + + Sites might automatically download related files together to save you time + + + Sites can ask to automatically download multiple files (recommended) + + + Block sites from automatically downloading multiple files + + + After you leave or go offline, sites usually keep syncing to finish tasks, like uploading photos or sending a chat message + + + Recently closed sites can finish sending and receiving data (recommended) + + + Block closed sites from sending and receiving data + + + Sites usually use your video camera for communication features like video chatting + + + Sites can ask to use your camera (recommended) + + + Block sites from using your camera + + + Features that need a camera won't work + + + Sites usually read your clipboard for features like keeping the formatting of text you copied + + + Sites can ask to see text and images on your clipboard + + + Block sites from seeing text and images on your clipboard + + + Sites usually access files and folders on your device for features like automatically saving your work + + + Sites can ask to edit files or folders on your device (recommended) + + + Block sites from editing files and folders on your device + + + Sites usually use your location for relevant features or info, like local news or nearby shops + + + Sites can ask for your location (recommended) + + + Block sites from seeing your location + + + Features that need your location won't work + + + Sites usually show images to provide illustration, like photos for online stores or news articles + + + Sites can show images (recommended) + + + Block images + + + Sites usually use Javascript to display interactive features, like video games or web forms + + + Sites can use Javascript (recommended) + + + Block Javascript + + + Sites usually use your microphone for communication features like video chatting + + + Sites can ask to use your microphone (recommended) + + + Block sites from using your microphone + + + Features that need a microphone won't work + + + Sites usually connect to MIDI devices for features for creating and editing music + + + Sites can ask to connect to MIDI devices + + + Block sites from connecting to MIDI devices + + + Sites usually install payment handlers for shopping features like easier checkout + + + Sites can install payment handlers (recommended) + + + Block payment handlers + + + Sites usually use Flash to play audio, video, or video games. Flash Player will no longer be supported after December 2020. + + + Sites can ask to use Flash + + + Block Flash (recommended) + + + Sites might send pop-ups to show ads, or use redirects to lead you to websites you may not want to visit + + + Sites can send pop-ups and use redirects + + + Block pop-ups and redirects (recommended) + + + When a site plays content protected by copyright, it might ask to recognize your device + + + Sites can ask to play protected content (recommended) + + + Block protected content + + + Sites usually use your device's motion sensors for features like virtual reality or step counting + + + Sites can use motion sensors + + + Block sites from using motion sensors + + + Features that need motion sensors won't work + + + Sites usually connect to serial devices for data transfer features, like setting up your network + + + Sites can ask to connect to serial devices + + + Block sites from connecting to serial devices + + + Sites might play sound to provide audio for music, videos, and other media + + + Sites can play sound (recommended) + + + Mute sound + + + Sites usually use plugins for features like streaming videos or installing apps + + + Sites can ask to use a plugin to access your computer (recommended) + + + Block plugins from accessing your computer + + + Sites usually connect to USB devices for features like printing a document or saving to a storage device + + + Sites can ask to connect to USB devices + + + Block sites from connecting to USB devices + + + Sites usually use your virtual reality devices and data to let you enter VR sessions + + + Sites can ask to use virtual reality devices and data + + + Block sites from using virtual reality devices and data + + + You can set how much you zoom in or out on certain websites + Ads @@ -1980,7 +2196,7 @@ Allow recently closed sites to finish sending and receiving data (recommended) - + Do not allow recently closed sites to finish sending and receiving data @@ -2055,6 +2271,15 @@ Block sites from using fonts installed on your device + + User presence + + + Ask when a site wants to know when you're present + + + Block sites from knowing when you're present + Allowed diff --git a/app/shared_settings_strings.grdp b/app/shared_settings_strings.grdp index 5dbf332fdcc8..70821a65c657 100644 --- a/app/shared_settings_strings.grdp +++ b/app/shared_settings_strings.grdp @@ -106,11 +106,8 @@ Device Name - - New device name - - Change name + Change device name Current device name is $1Michael's Bravebook diff --git a/app/sharesheet_strings.grdp b/app/sharesheet_strings.grdp new file mode 100644 index 000000000000..8e7d28e273c7 --- /dev/null +++ b/app/sharesheet_strings.grdp @@ -0,0 +1,9 @@ + + + + + + + Share + + diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index ad05c8cf3cbb..e9a4643078d0 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -2058,7 +2058,7 @@ To change this setting, <resetlink>reset sync

- Install web app + Install app Add @@ -2398,16 +2398,23 @@ To change this setting, <resetlink>reset sync

Add account to device - - Sign in temporarily - - - A new private tab will open + + Go Private Waiting for Google Play Services to finish updating + + + Go Private + + + To clear your sign-in information and other data from Brave, close all Private tabs. + +In Private, your activity might still be visible to websites that you visit, your employer or school, and your internet service provider. + + Turn on sync? @@ -2431,7 +2438,7 @@ To change this setting, <resetlink>reset sync

- You’ll be signed in with your Brave sync chain\n(this won’t turn on Brave Sync) + Sign in to this site, your Brave sync chain, and Brave. You may turn on sync later. Signing in... @@ -2827,6 +2834,41 @@ To change this setting, <resetlink>reset sync

+ + + Reading list + + + Read + + + Unread + + + Ready for offline + + + Mark as read + + + Share + + + Catch up on your reading list + + + You have %1$d5 pages + + + %1$d5 unread pages + + + Save this page for later and get a reminder + + + Find your reading list in Bookmarks + + Viewing an offline copy of this page @@ -3261,7 +3303,7 @@ To change this setting, <resetlink>reset sync

- You'll see your %1$swww.youtube.com sign-in status, browsing data, and site data in Brave. + You'll see your %1$swww.youtube.com sign-in status, browsing data, and site data in Brave Got it @@ -3583,6 +3625,9 @@ To change this setting, <resetlink>reset sync

Open Settings + + image + @@ -3834,12 +3879,8 @@ To change this setting, <resetlink>reset sync

%1$s1582667748515 - - Share link to the highlighted text in an app - - - - Can't create link to text. Share link to page in an app. + + Can't create link to text. Share link to page. @@ -3859,6 +3900,10 @@ To change this setting, <resetlink>reset sync

+ + Screenshot %1$s2020-09-16 + + chrome_screenshot_%1$s1582667748515 diff --git a/browser/ui/android/strings/android_chrome_strings_override.grd b/browser/ui/android/strings/android_chrome_strings_override.grd index 28ecb6332cf3..ebc1e300a154 100644 --- a/browser/ui/android/strings/android_chrome_strings_override.grd +++ b/browser/ui/android/strings/android_chrome_strings_override.grd @@ -144,9 +144,18 @@ CHAR-LIMIT guidelines: Close all private tabs - - A new private tab will open + + Go Private + + Go Private + + + To clear your sign-in information and other data from Brave, close all Private tabs. + +In Private, your activity might still be visible to websites that you visit, your employer or school, and your internet service provider. + + New private tab diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index d4558446396a..b2c8afff1784 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp @@ -246,6 +246,9 @@ Background Sync + + User presence + Images diff --git a/components/permissions_strings.grdp b/components/permissions_strings.grdp index 80e82784d8c8..8dc24f710542 100644 --- a/components/permissions_strings.grdp +++ b/components/permissions_strings.grdp @@ -31,6 +31,9 @@ • Create a 3D map of your surroundings and track camera position • Use your camera + + $1google.com wants to know when you're present + Notifications for $1example.com are blocked @@ -109,9 +112,10 @@ Create a 3D map of your surroundings and track camera position - + Access cookies and site data. - + + Do you want to allow $1news.site to use cookies and site data on $2content_domain.site? This will otherwise be blocked by your privacy settings. This will allow the content you interacted with to work correctly, but may allow $1news.site to track your activity. @@ -122,6 +126,9 @@ This will otherwise be blocked by your privacy settings. This will allow the con Use the fonts installed on your computer so you can create advanced typography + + Know when you're present + Allow @@ -157,6 +164,9 @@ This will otherwise be blocked by your privacy settings. This will allow the con Allow AR? + + Share your presence? + From 7a0602e79c0c7baa1d3997c0dfdf6a03cccd7946 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 13:45:38 -0400 Subject: [PATCH 042/152] Replaced prefs_utils.h patch with an override. The name of method we were patching changed from GetWhitelistedKeys to GetAllowlistedKeys. Chromium change: https://source.chromium.org/chromium/chromium/src/+/a8ed6173f4b8897b3ff82a6f9d271b861e5bd3aa commit a8ed6173f4b8897b3ff82a6f9d271b861e5bd3aa Author: Alex Danilo Date: Tue Sep 15 12:03:04 2020 +0000 Rename 'whitelist' occurrences in chrome/browser/extensions Bug: 1097252 --- .../api/settings_private/brave_prefs_util.cc | 124 +++++++++--------- .../api/settings_private/brave_prefs_util.h | 11 +- .../api/settings_private/prefs_util.h | 16 +++ ...ns-api-settings_private-prefs_util.h.patch | 13 -- 4 files changed, 84 insertions(+), 80 deletions(-) create mode 100644 chromium_src/chrome/browser/extensions/api/settings_private/prefs_util.h delete mode 100644 patches/chrome-browser-extensions-api-settings_private-prefs_util.h.patch diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc index 10f4dc8db73b..d82262059fbb 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.cc +++ b/browser/extensions/api/settings_private/brave_prefs_util.cc @@ -54,151 +54,151 @@ using ntp_background_images::prefs::kNewTabPageSuperReferralThemesOption; namespace settings_api = api::settings_private; -const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetWhitelistedKeys() { +const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() { // Static cache, similar to parent class - static PrefsUtil::TypedPrefMap* s_brave_whitelist = nullptr; - if (s_brave_whitelist) - return *s_brave_whitelist; - s_brave_whitelist = new PrefsUtil::TypedPrefMap(); - // Start with parent class whitelist - const auto chromium_prefs = PrefsUtil::GetWhitelistedKeys(); - s_brave_whitelist->insert(chromium_prefs.begin(), chromium_prefs.end()); - // Add Brave values to the whitelist + static PrefsUtil::TypedPrefMap* s_brave_allowlist = nullptr; + if (s_brave_allowlist) + return *s_brave_allowlist; + s_brave_allowlist = new PrefsUtil::TypedPrefMap(); + // Start with parent class allowlist + const auto chromium_prefs = PrefsUtil::GetAllowlistedKeys(); + s_brave_allowlist->insert(chromium_prefs.begin(), chromium_prefs.end()); + // Add Brave values to the allowlist // import data - (*s_brave_whitelist)[kImportDialogExtensions] = + (*s_brave_allowlist)[kImportDialogExtensions] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kImportDialogPayments] = + (*s_brave_allowlist)[kImportDialogPayments] = settings_api::PrefType::PREF_TYPE_BOOLEAN; // Default Brave shields - (*s_brave_whitelist)[kShieldsAdvancedViewEnabled] = + (*s_brave_allowlist)[kShieldsAdvancedViewEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kShieldsStatsBadgeVisible] = + (*s_brave_allowlist)[kShieldsStatsBadgeVisible] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kAdControlType] = + (*s_brave_allowlist)[kAdControlType] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kHTTPSEVerywhereControlType] = + (*s_brave_allowlist)[kHTTPSEVerywhereControlType] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNoScriptControlType] = + (*s_brave_allowlist)[kNoScriptControlType] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kGoogleLoginControlType] = + (*s_brave_allowlist)[kGoogleLoginControlType] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kFBEmbedControlType] = + (*s_brave_allowlist)[kFBEmbedControlType] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kTwitterEmbedControlType] = + (*s_brave_allowlist)[kTwitterEmbedControlType] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kLinkedInEmbedControlType] = + (*s_brave_allowlist)[kLinkedInEmbedControlType] = settings_api::PrefType::PREF_TYPE_BOOLEAN; // appearance prefs - (*s_brave_whitelist)[kLocationBarIsWide] = + (*s_brave_allowlist)[kLocationBarIsWide] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kAutocompleteEnabled] = + (*s_brave_allowlist)[kAutocompleteEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kTopSiteSuggestionsEnabled] = + (*s_brave_allowlist)[kTopSiteSuggestionsEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kBraveSuggestedSiteSuggestionsEnabled] = + (*s_brave_allowlist)[kBraveSuggestedSiteSuggestionsEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[brave_rewards::prefs::kHideButton] = + (*s_brave_allowlist)[brave_rewards::prefs::kHideButton] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kAskWidevineInstall] = + (*s_brave_allowlist)[kAskWidevineInstall] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageSuperReferralThemesOption] = + (*s_brave_allowlist)[kNewTabPageSuperReferralThemesOption] = settings_api::PrefType::PREF_TYPE_NUMBER; // new tab prefs - (*s_brave_whitelist)[kNewTabPageShowSponsoredImagesBackgroundImage] = + (*s_brave_allowlist)[kNewTabPageShowSponsoredImagesBackgroundImage] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageShowBackgroundImage] = + (*s_brave_allowlist)[kNewTabPageShowBackgroundImage] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageShowClock] = + (*s_brave_allowlist)[kNewTabPageShowClock] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageShowStats] = + (*s_brave_allowlist)[kNewTabPageShowStats] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageShowRewards] = + (*s_brave_allowlist)[kNewTabPageShowRewards] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageShowBinance] = + (*s_brave_allowlist)[kNewTabPageShowBinance] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageShowTogether] = + (*s_brave_allowlist)[kNewTabPageShowTogether] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageShowAddCard] = + (*s_brave_allowlist)[kNewTabPageShowAddCard] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kNewTabPageShowGemini] = + (*s_brave_allowlist)[kNewTabPageShowGemini] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #if BUILDFLAG(MOONPAY_ENABLED) - (*s_brave_whitelist)[kMoonpayNewTabPageShowBitcoinDotCom] = + (*s_brave_allowlist)[kMoonpayNewTabPageShowBitcoinDotCom] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif #if BUILDFLAG(CRYPTO_DOT_COM_ENABLED) - (*s_brave_whitelist)[kCryptoDotComNewTabPageShowCryptoDotCom] = + (*s_brave_allowlist)[kCryptoDotComNewTabPageShowCryptoDotCom] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif // Clear browsing data on exit prefs. - (*s_brave_whitelist)[browsing_data::prefs::kDeleteBrowsingHistoryOnExit] = + (*s_brave_allowlist)[browsing_data::prefs::kDeleteBrowsingHistoryOnExit] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[browsing_data::prefs::kDeleteDownloadHistoryOnExit] = + (*s_brave_allowlist)[browsing_data::prefs::kDeleteDownloadHistoryOnExit] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[browsing_data::prefs::kDeleteCacheOnExit] = + (*s_brave_allowlist)[browsing_data::prefs::kDeleteCacheOnExit] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[browsing_data::prefs::kDeleteCookiesOnExit] = + (*s_brave_allowlist)[browsing_data::prefs::kDeleteCookiesOnExit] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[browsing_data::prefs::kDeletePasswordsOnExit] = + (*s_brave_allowlist)[browsing_data::prefs::kDeletePasswordsOnExit] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[browsing_data::prefs::kDeleteFormDataOnExit] = + (*s_brave_allowlist)[browsing_data::prefs::kDeleteFormDataOnExit] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[browsing_data::prefs::kDeleteSiteSettingsOnExit] = + (*s_brave_allowlist)[browsing_data::prefs::kDeleteSiteSettingsOnExit] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[browsing_data::prefs::kDeleteHostedAppsDataOnExit] = + (*s_brave_allowlist)[browsing_data::prefs::kDeleteHostedAppsDataOnExit] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kAlwaysShowBookmarkBarOnNTP] = + (*s_brave_allowlist)[kAlwaysShowBookmarkBarOnNTP] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_whitelist)[kMRUCyclingEnabled] = + (*s_brave_allowlist)[kMRUCyclingEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; // WebTorrent pref - (*s_brave_whitelist)[kWebTorrentEnabled] = + (*s_brave_allowlist)[kWebTorrentEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #if BUILDFLAG(ENABLE_BRAVE_WAYBACK_MACHINE) - (*s_brave_whitelist)[kBraveWaybackMachineEnabled] = + (*s_brave_allowlist)[kBraveWaybackMachineEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif // Hangouts pref - (*s_brave_whitelist)[kHangoutsEnabled] = + (*s_brave_allowlist)[kHangoutsEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; // IPFS Companion pref - (*s_brave_whitelist)[kIPFSCompanionEnabled] = + (*s_brave_allowlist)[kIPFSCompanionEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; // Brave Wallet pref #if BUILDFLAG(BRAVE_WALLET_ENABLED) - (*s_brave_whitelist)[kBraveWalletWeb3Provider] = + (*s_brave_allowlist)[kBraveWalletWeb3Provider] = settings_api::PrefType::PREF_TYPE_NUMBER; - (*s_brave_whitelist)[kLoadCryptoWalletsOnStartup] = + (*s_brave_allowlist)[kLoadCryptoWalletsOnStartup] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif // IPFS pref #if BUILDFLAG(IPFS_ENABLED) - (*s_brave_whitelist)[kIPFSResolveMethod] = + (*s_brave_allowlist)[kIPFSResolveMethod] = settings_api::PrefType::PREF_TYPE_NUMBER; - (*s_brave_whitelist)[kIPFSAutoFallbackToGateway] = + (*s_brave_allowlist)[kIPFSAutoFallbackToGateway] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif // Media Router Pref - (*s_brave_whitelist)[kBraveEnabledMediaRouter] = + (*s_brave_allowlist)[kBraveEnabledMediaRouter] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #if !BUILDFLAG(USE_GCM_FROM_PLATFORM) // Push Messaging Pref - (*s_brave_whitelist)[kBraveGCMChannelStatus] = + (*s_brave_allowlist)[kBraveGCMChannelStatus] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif // Omnibox pref - (*s_brave_whitelist)[omnibox::kPreventUrlElisionsInOmnibox] = + (*s_brave_allowlist)[omnibox::kPreventUrlElisionsInOmnibox] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #if BUILDFLAG(ENABLE_TOR) - (*s_brave_whitelist)[tor::prefs::kAutoOnionLocation] = + (*s_brave_allowlist)[tor::prefs::kAutoOnionLocation] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif - (*s_brave_whitelist)[prefs::kWebRTCIPHandlingPolicy] = + (*s_brave_allowlist)[prefs::kWebRTCIPHandlingPolicy] = settings_api::PrefType::PREF_TYPE_STRING; - return *s_brave_whitelist; + return *s_brave_allowlist; } } // namespace extensions diff --git a/browser/extensions/api/settings_private/brave_prefs_util.h b/browser/extensions/api/settings_private/brave_prefs_util.h index fd8383f2e4f0..6b5af99ecfc7 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.h +++ b/browser/extensions/api/settings_private/brave_prefs_util.h @@ -1,4 +1,5 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -11,10 +12,10 @@ namespace extensions{ class BravePrefsUtil : public PrefsUtil { public: using PrefsUtil::PrefsUtil; - // Gets the list of whitelisted pref keys -- that is, those which correspond - // to prefs that clients of the settingsPrivate API may retrieve and - // manipulate. - const PrefsUtil::TypedPrefMap& GetWhitelistedKeys() override; + // Gets the list of allowlisted pref keys -- that is, those which correspond + // to prefs that clients of the settingsPrivate API may retrieve and + // manipulate. + const PrefsUtil::TypedPrefMap& GetAllowlistedKeys() override; }; } diff --git a/chromium_src/chrome/browser/extensions/api/settings_private/prefs_util.h b/chromium_src/chrome/browser/extensions/api/settings_private/prefs_util.h new file mode 100644 index 000000000000..65ad643ec9d7 --- /dev/null +++ b/chromium_src/chrome/browser/extensions/api/settings_private/prefs_util.h @@ -0,0 +1,16 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_PREFS_UTIL_H_ +#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_PREFS_UTIL_H_ + +#define GetAllowlistedKeys \ + Dummy(); \ + virtual const TypedPrefMap& GetAllowlistedKeys + +#include "../../../../../../../chrome/browser/extensions/api/settings_private/prefs_util.h" +#undef GetAllowlistedKeys + +#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_PREFS_UTIL_H_ diff --git a/patches/chrome-browser-extensions-api-settings_private-prefs_util.h.patch b/patches/chrome-browser-extensions-api-settings_private-prefs_util.h.patch deleted file mode 100644 index 6c876a5f191c..000000000000 --- a/patches/chrome-browser-extensions-api-settings_private-prefs_util.h.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.h b/chrome/browser/extensions/api/settings_private/prefs_util.h -index a67fb4f57879b17015ecd0097d3b67bc82f43605..d9ff5ba6f32fa43e90c67f29bcc98145d6bb8bc2 100644 ---- a/chrome/browser/extensions/api/settings_private/prefs_util.h -+++ b/chrome/browser/extensions/api/settings_private/prefs_util.h -@@ -32,7 +32,7 @@ class PrefsUtil { - // Gets the list of whitelisted pref keys -- that is, those which correspond - // to prefs that clients of the settingsPrivate API may retrieve and - // manipulate. -- const TypedPrefMap& GetWhitelistedKeys(); -+ virtual const TypedPrefMap& GetWhitelistedKeys(); - - // Returns the pref type for |pref_name| or PREF_TYPE_NONE if not in the - // whitelist. From d79792b329b137a374166e79ae3f1fa63dbd24ae Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 15:59:15 -0400 Subject: [PATCH 043/152] Workaround for upstream enable_rlz_support bug. Chromium change below put several rlz build targets inside enable_rlz_support flag but didn't update other locations that use those targets with the same flag. Consequently: ERROR Unresolved dependencies. //:gn_all(//build/toolchain/win:win_clang_x64) needs //rlz:rlz_lib(//build/toolchain/win:win_clang_x64) //:gn_all(//build/toolchain/win:win_clang_x64) needs //rlz:rlz_unittests(//build/toolchain/win:win_clang_x64) //chrome/installer/setup:setup(//build/toolchain/win:win_clang_x64) needs //rlz:rlz_lib_no_network(//build/toolchain/win:win_clang_x64) //rlz:rlz(//build/toolchain/win:win_clang_x64) needs //rlz:rlz_lib(//build/toolchain/win:win_clang_x64) //rlz:rlz_id(//build/toolchain/win:win_clang_x64) needs //rlz:rlz_lib(//build/toolchain/win:win_clang_x64) Chromium change: https://source.chromium.org/chromium/chromium/src/+/fcd0f0a18273c93993759e0d817051d5cdc668b2 commit fcd0f0a18273c93993759e0d817051d5cdc668b2 Author: Glen Robertson Date: Mon Sep 14 15:19:16 2020 +0000 Make RLZ build targets exist only when `enable_rlz_support`. These targets fail to build or link if depended upon without `enable_rlz_support`. It is a stronger and more relevant condition than `!is_android`, see: rlz/buildflags/buildflags.gni Split out from crrev.com/c/2383400 Bug: 898837 --- patches/rlz-BUILD.gn.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 patches/rlz-BUILD.gn.patch diff --git a/patches/rlz-BUILD.gn.patch b/patches/rlz-BUILD.gn.patch new file mode 100644 index 000000000000..2b3c8b9a83c7 --- /dev/null +++ b/patches/rlz-BUILD.gn.patch @@ -0,0 +1,12 @@ +diff --git a/rlz/BUILD.gn b/rlz/BUILD.gn +index 37247ec1e5683d6124335bb1f6405618169283a4..371f42d8ce0fc86f7946615b5119fcce84071565 100644 +--- a/rlz/BUILD.gn ++++ b/rlz/BUILD.gn +@@ -208,6 +208,7 @@ if (enable_rlz_support) { + } + } + } ++else { group("rlz_lib") {} group("rlz_lib_no_network") {} group("rlz_unittests") {} } + + if (!is_ios && !is_android) { + executable("rlz_id") { From f96cee8587f959410731346c9ac6bc3c099673d0 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 16:15:43 -0400 Subject: [PATCH 044/152] //services/service_manager/embedded target was removed. Chromium change: https://source.chromium.org/chromium/chromium/src/+/30f6a4ab3493eead7741e74585fce93c4c66915d commit 30f6a4ab3493eead7741e74585fce93c4c66915d Author: Ken Rockot Date: Thu Sep 17 08:34:01 2020 +0000 Remove //services/service_manager/embedder target Sources for this target are moved back into //content/common. No behavioral changes. Bug: 977637 --- browser/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/BUILD.gn b/browser/BUILD.gn index aa3bb5904849..1baccb1b3f60 100644 --- a/browser/BUILD.gn +++ b/browser/BUILD.gn @@ -191,7 +191,6 @@ source_set("browser_process") { "//content/public/common", "//extensions/buildflags", "//services/network/public/cpp", - "//services/service_manager/embedder", "//third_party/blink/public/mojom:mojom_platform_headers", "//third_party/widevine/cdm:buildflags", "//ui/base", From c0d24f9e80a0087a89d490f398032039aaf977cf Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 18:13:28 -0400 Subject: [PATCH 045/152] content/browser/frame_host headers moved to renderer_host. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/c492bf822b4b44da5bbfb8ab4997333165ededd0 commit c492bf822b4b44da5bbfb8ab4997333165ededd0 Author: danakj Date: Wed Sep 9 20:02:44 2020 +0000 Move content/browser/frame_host/* over to content/browser/renderer_host/ We allow these directories to work together now and have decided to merge them to simplify understanding the code relationships. Add forwarding headers in content/browser/frame_host/ to make this transition easier. PRESUBMIT and tricum errors are not addressed in this CL as it is just moving code. TBR=avi@chromium.org Bug: 1091083 --- browser/brave_content_browser_client.cc | 2 +- .../browser/brave_shields_web_contents_observer.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 8e49b8c1c771..6eed7c6afb15 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -42,7 +42,7 @@ #include "components/content_settings/browser/page_specific_content_settings.h" #include "components/prefs/pref_service.h" #include "components/services/heap_profiling/public/mojom/heap_profiling_client.mojom.h" -#include "content/browser/frame_host/render_frame_host_impl.h" +#include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" diff --git a/components/brave_shields/browser/brave_shields_web_contents_observer.cc b/components/brave_shields/browser/brave_shields_web_contents_observer.cc index d9a5c494e9d9..a153bf2755ea 100644 --- a/components/brave_shields/browser/brave_shields_web_contents_observer.cc +++ b/components/brave_shields/browser/brave_shields_web_contents_observer.cc @@ -24,8 +24,8 @@ #include "components/content_settings/core/common/content_settings_utils.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" -#include "content/browser/frame_host/frame_tree_node.h" -#include "content/browser/frame_host/navigator.h" +#include "content/browser/renderer_host/frame_tree_node.h" +#include "content/browser/renderer_host/navigator.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/navigation_handle.h" From c4c41467cc5a594a1418d1758d01f6f2787ae3c5 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 18:54:16 -0400 Subject: [PATCH 046/152] set_ink_drop_visible_opacity -> SetInkDropVisibleOpacity. Chromium change: https://source.chromium.org/chromium/chromium/src/+/d8e1b85666bb79f398bcef8db42ed0116e1bc5ae commit d8e1b85666bb79f398bcef8db42ed0116e1bc5ae Author: Allen Bauer Date: Fri Sep 18 17:22:06 2020 +0000 Convert InkDropHostView get/set items to proper properties with metadata. Bug: 938501 --- .../ui/views/brave_actions/brave_rewards_action_stub_view.cc | 2 +- browser/ui/views/location_bar/onion_location_view.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc index 6cd0240bef0e..81958ed4b2f2 100644 --- a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc +++ b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc @@ -60,7 +60,7 @@ BraveRewardsActionStubView::BraveRewardsActionStubView(Profile* profile, SetInkDropMode(InkDropMode::ON); set_has_ink_drop_action_on_click(true); SetHorizontalAlignment(gfx::ALIGN_CENTER); - set_ink_drop_visible_opacity(kToolbarInkDropVisibleOpacity); + SetInkDropVisibleOpacity(kToolbarInkDropVisibleOpacity); // Create badge-and-image source like an extension icon would auto preferred_size = GetPreferredSize(); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); diff --git a/browser/ui/views/location_bar/onion_location_view.cc b/browser/ui/views/location_bar/onion_location_view.cc index c1199a092ac0..4051799beeaf 100644 --- a/browser/ui/views/location_bar/onion_location_view.cc +++ b/browser/ui/views/location_bar/onion_location_view.cc @@ -96,7 +96,7 @@ class OnionLocationButtonView : public views::LabelButton, SetBorder(views::CreateEmptyBorder( GetLayoutInsets(LOCATION_BAR_ICON_INTERIOR_PADDING))); set_has_ink_drop_action_on_click(true); - set_ink_drop_visible_opacity(kToolbarInkDropVisibleOpacity); + SetInkDropVisibleOpacity(kToolbarInkDropVisibleOpacity); UpdateBorder(); // Ensure focus ring follows border views::HighlightPathGenerator::Install( From 0ed102eff1a17dd6248f0f110a68269eaab9412e Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 19:03:04 -0400 Subject: [PATCH 047/152] network::features::kOutOfBlinkCors has been removed. Followed code changes in extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc Chromium change: https://source.chromium.org/chromium/chromium/src/+/5e2b0a53dadc927a5c9cb8e6df2c3719552ed729 commit 5e2b0a53dadc927a5c9cb8e6df2c3719552ed729 Author: Takashi Toyoshima Date: Thu Sep 17 07:07:50 2020 +0000 Reland "Reland "OOR-CORS: Remove BlinkCORS supporting code outside Blink"" This reverts commit 42502d6b0aa9b5967e3838acceb615c269ff94ff. Reason for revert: needed to wait for a while to roll the fix in the internal repos. Original change's description: > Revert "Reland "OOR-CORS: Remove BlinkCORS supporting code outside Blink"" > > This reverts commit 746ea10b4ec90b7dc71a9eacf7f983ce5abf1562. > > Reason for revert: Breaks Chrome OS builds as some internal code (tab_search_browsertest) still ref r to kOutOfBlinkCors feature. > https://ci.chromium.org/p/chrome/builders/ci/linux-chromeos-chrome/8532 > > See chrome/browser/resources/tab_search/test... > > Original change's description: > > Reland "OOR-CORS: Remove BlinkCORS supporting code outside Blink" > > > > This reverts commit efd0a0a1f33b543956d4552c0ea3fa451d15856f. > > > > Reason for revert: The failed internal test was fixed in the internal repos by > > https://chrome-internal-review.googlesource.com/c/chrome/browser/resources/tab_search/+/3263707 > > > > Original change's description: > > > Revert "OOR-CORS: Remove BlinkCORS supporting code outside Blink" > > > > > > This reverts commit 1047b88998d2e97aeef682f07b2a0807d7f2bd3e. > > > > > > Reason for revert: Build failure on mac-builder-perf: https://ci.chromium.org/p/chrome/builders ci/mac-builder-perf/220028 > > > > > > Original change's description: > > > > OOR-CORS: Remove BlinkCORS supporting code outside Blink > > > > > > > > As OOR-CORS was fully launched, this patch removes BlinkCORS > > > > supporting code that exists outside Blink. > > > > > > > > We still have some dead code in Blink, and subsequent cleanup > > > > changes will remove them all. > > > > Bug: 1053866 Bug: 1126827 --- .../net/brave_proxying_url_loader_factory.cc | 43 ++++++------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/browser/net/brave_proxying_url_loader_factory.cc b/browser/net/brave_proxying_url_loader_factory.cc index 3a36d0ba831d..f368590e2c64 100644 --- a/browser/net/brave_proxying_url_loader_factory.cc +++ b/browser/net/brave_proxying_url_loader_factory.cc @@ -303,36 +303,19 @@ void BraveProxyingURLLoaderFactory::InProgressRequest:: "Non-Authoritative-Reason: WebRequest API\n\n", kInternalRedirectStatusCode, redirect_url_.spec().c_str()); - if (base::FeatureList::IsEnabled(network::features::kOutOfBlinkCors)) { - // Cross-origin requests need to modify the Origin header to 'null'. Since - // CorsURLLoader sets |request_initiator| to the Origin request header in - // NetworkService, we need to modify |request_initiator| here to craft the - // Origin header indirectly. - // Following checks implement the step 10 of "4.4. HTTP-redirect fetch", - // https://fetch.spec.whatwg.org/#http-redirect-fetch - if (request_.request_initiator && - (!url::Origin::Create(redirect_url_) - .IsSameOriginWith(url::Origin::Create(request_.url)) && - !request_.request_initiator->IsSameOriginWith( - url::Origin::Create(request_.url)))) { - // Reset the initiator to pretend tainted origin flag of the spec is set. - request_.request_initiator = url::Origin(); - } - } else { - // If this redirect is used in a cross-origin request, add CORS headers to - // make sure that the redirect gets through the Blink CORS. Note that the - // destination URL is still subject to the usual CORS policy, i.e. the - // resource will only be available to web pages if the server serves the - // response with the required CORS response headers. Matches the behavior in - // url_request_redirect_job.cc. - std::string http_origin; - if (request_.headers.GetHeader("Origin", &http_origin)) { - headers += base::StringPrintf( - "\n" - "Access-Control-Allow-Origin: %s\n" - "Access-Control-Allow-Credentials: true", - http_origin.c_str()); - } + // Cross-origin requests need to modify the Origin header to 'null'. Since + // CorsURLLoader sets |request_initiator| to the Origin request header in + // NetworkService, we need to modify |request_initiator| here to craft the + // Origin header indirectly. + // Following checks implement the step 10 of "4.4. HTTP-redirect fetch", + // https://fetch.spec.whatwg.org/#http-redirect-fetch + if (request_.request_initiator && + (!url::Origin::Create(redirect_url_) + .IsSameOriginWith(url::Origin::Create(request_.url)) && + !request_.request_initiator->IsSameOriginWith( + url::Origin::Create(request_.url)))) { + // Reset the initiator to pretend tainted origin flag of the spec is set. + request_.request_initiator = url::Origin(); } head->headers = base::MakeRefCounted( net::HttpUtil::AssembleRawHeaders(headers)); From c52d1d838c9044329ce3c201e50fa87f3b884eeb Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 20:01:34 -0400 Subject: [PATCH 048/152] CreateWebUIURLLoader -> CreateWebUIURLLoaderFactory. Chromium change: https://chromium.googlesource.com/chromium/src/+/7f6955321792ce372e935f49cd4420b5b6ecb15f commit 7f6955321792ce372e935f49cd4420b5b6ecb15f Author: Lukasz Anforowicz Date: Tue Sep 15 16:05:22 2020 +0000 Make WebUIURLLoaderFactory always owned by its |receivers_|. This CL changes (and slightly renames) CreateWebUIURLLoaderFactory so that it returns mojo::PendingRemote to a WebUIURLLoaderFactory that is owned by its |receivers_| and will self-delete when the last receiver disconnects. This CL removes the ability to directly construct and own a std::unique_ptr, because this ability means that the factory can be destructed while receivers bound via the Clone method are still alive (see the associated bug). This CL mostly just follows the pattern established earlier by https://crrev.com/c/2337411. Bug: 1106995 --- .../browser/webui/web_ui_url_loader_factory.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/chromium_src/content/browser/webui/web_ui_url_loader_factory.cc b/chromium_src/content/browser/webui/web_ui_url_loader_factory.cc index 295967d36036..3650708fbcad 100644 --- a/chromium_src/content/browser/webui/web_ui_url_loader_factory.cc +++ b/chromium_src/content/browser/webui/web_ui_url_loader_factory.cc @@ -5,9 +5,9 @@ #include "content/public/browser/web_ui_url_loader_factory.h" -#define CreateWebUIURLLoader CreateWebUIURLLoader_ChromiumImpl +#define CreateWebUIURLLoaderFactory CreateWebUIURLLoaderFactory_ChromiumImpl #include "../../../../../content/browser/webui/web_ui_url_loader_factory.cc" -#undef CreateWebUIURLLoader +#undef CreateWebUIURLLoaderFactory namespace { constexpr char kBraveUIResourceHost[] = "brave-resources"; @@ -15,16 +15,16 @@ constexpr char kBraveUIResourceHost[] = "brave-resources"; namespace content { -std::unique_ptr CreateWebUIURLLoader( - RenderFrameHost* render_frame_host, - const std::string& scheme, - base::flat_set allowed_hosts) { +mojo::PendingRemote +CreateWebUIURLLoaderFactory(RenderFrameHost* render_frame_host, + const std::string& scheme, + base::flat_set allowed_hosts) { if (allowed_hosts.find(kChromeUIResourcesHost) != allowed_hosts.end()) { allowed_hosts.emplace(kBraveUIResourceHost); } - return CreateWebUIURLLoader_ChromiumImpl(render_frame_host, scheme, - allowed_hosts); + return CreateWebUIURLLoaderFactory_ChromiumImpl(render_frame_host, scheme, + allowed_hosts); } } // namespace content From 079cd5eccfaa72c8b59cc491f9aa6d3d63ac8502 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 23 Sep 2020 20:23:48 -0400 Subject: [PATCH 049/152] views::Link::set_callback signature changed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The method we were using had a signature change, but we don't use the argument anyway, so instead use the overload that takes RepeatingCallback. Chromium change: https://source.chromium.org/chromium/chromium/src/+/9a611f597a0a5b5f85a24a9fcba6f76dce26add2 commit 9a611f597a0a5b5f85a24a9fcba6f76dce26add2 Author: Peter Boström Date: Tue Sep 15 02:14:01 2020 +0000 Add const ui::Event& to Link::ClickedCallback This makes it more consistent with Button::PressedCallback. It's also to be used in a pending change integrating StyledLabel with BubbleDialogModelHost where link callbacks, like button callbacks, will have access an Event. Bug: 1106422 --- browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc | 3 ++- browser/ui/views/bookmarks/bookmark_bar_instructions_view.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc index 7dd2efd469f2..6e8a93b8335c 100644 --- a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc +++ b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc @@ -17,6 +17,7 @@ #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/native_theme/native_theme.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" @@ -111,7 +112,7 @@ void BookmarkBarInstructionsView::GetAccessibleNodeData( instructions_->GetAccessibleNodeData(node_data); } -void BookmarkBarInstructionsView::LinkClicked(int event_flags) { +void BookmarkBarInstructionsView::LinkClicked() { chrome::ShowImportDialog(browser_); } diff --git a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h index 8ca735b2bb33..90df8ca1db05 100644 --- a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h +++ b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h @@ -44,7 +44,7 @@ class BookmarkBarInstructionsView : public views::View, ui::MenuSourceType source_type) override; void UpdateColors(); - void LinkClicked(int event_flags); + void LinkClicked(); views::Label* instructions_; views::Link* import_link_; From 9d8d920946e4fe62b127c279c35bfaedc25a2f2a Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 24 Sep 2020 08:54:05 -0400 Subject: [PATCH 050/152] Output dir of gen extensions resources changed. Chromium change: https://source.chromium.org/chromium/chromium/src/+/d8f713b1f203116ba3440a52664c16dac30712cf commit d8f713b1f203116ba3440a52664c16dac30712cf Author: rbpotter Date: Wed Sep 16 16:11:48 2020 +0000 Reland Extensions: use preprocessing for generating rollup input Bug: 1128583 --- browser/resources/extensions/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/resources/extensions/BUILD.gn b/browser/resources/extensions/BUILD.gn index 8693d25ef5c5..5b9dbbdefeff 100644 --- a/browser/resources/extensions/BUILD.gn +++ b/browser/resources/extensions/BUILD.gn @@ -36,7 +36,7 @@ action("unpak_brave_extensions_resources") { script = "//chrome/browser/resources/unpack_pak.py" pak_file = "brave_extensions_resources.pak" - out_folder = "$root_gen_dir/chrome/browser/resources/extensions/extensions_resources.unpak" + out_folder = "$root_gen_dir/chrome/browser/resources/extensions/preprocessed" inputs = [ "$target_gen_dir/brave_extensions_resources.pak", From 2d8d206a54558f42f23a264746b14433ca969a03 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 24 Sep 2020 09:00:09 -0400 Subject: [PATCH 051/152] kPassiveMixedContentWarning feature flag has been removed. The feature is now always on. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/7b5aff044cdf358e47121a0da973268283591863 commit 7b5aff044cdf358e47121a0da973268283591863 Author: Hwanseung Lee Date: Tue Sep 15 02:47:51 2020 +0000 Clean up "kPassiveMixedContentWarning" feature Passive mixed content warnings launched in M80, and there is no plan to remove them. The feature flag cleaned up and removeed it for chrome://flags Bug: 1114276 --- app/brave_main_delegate.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index 022fd572d1c3..eb17eaedc992 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -39,7 +39,6 @@ #include "components/omnibox/common/omnibox_features.h" #include "components/password_manager/core/common/password_manager_features.h" #include "components/safe_browsing/core/features.h" -#include "components/security_state/core/features.h" #include "components/sync/base/sync_base_switches.h" #include "components/translate/core/browser/translate_prefs.h" #include "components/version_info/channel.h" @@ -210,11 +209,8 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { net::features::kLegacyTLSEnforced.name, // Remove URL bar mixed control and allow site specific override instead features::kMixedContentSiteSetting.name, - // Warn about Mixed Content optionally blockable content - security_state::features::kPassiveMixedContentWarning.name, // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated - // on - // this feature. + // on this feature. features::kWebUIDarkMode.name, blink::features::kPrefetchPrivacyChanges.name, blink::features::kReducedReferrerGranularity.name, From 083e1026a2b82943ff5394a442deedc2745c588c Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 28 Sep 2020 17:47:43 +0200 Subject: [PATCH 052/152] Adapt Chromium override to whitelist Brave-specific extensions Otherwise we'll get a crash on startup, and losts of browser tests failing. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/a8ed6173f4b8897b3ff82a6f9d271b861e5bd3aa commit a8ed6173f4b8897b3ff82a6f9d271b861e5bd3aa Author: Alex Danilo Date: Tue Sep 15 12:03:04 2020 +0000 Rename 'whitelist' occurrences in chrome/browser/extensions Bug: 1097252 --- .../allowlist.cc} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename chromium_src/chrome/browser/extensions/{component_extensions_whitelist/whitelist.cc => component_extensions_allowlist/allowlist.cc} (77%) diff --git a/chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc similarity index 77% rename from chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc rename to chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc index 5106b14b0075..8200bbb82d1e 100644 --- a/chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc +++ b/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#define IsComponentExtensionWhitelisted IsComponentExtensionWhitelisted_ChromiumImpl // NOLINT -#include "../../../../../../chrome/browser/extensions/component_extensions_whitelist/whitelist.cc" // NOLINT -#undef IsComponentExtensionWhitelisted +#define IsComponentExtensionAllowlisted IsComponentExtensionAllowlisted_ChromiumImpl // NOLINT +#include "../../../../../../chrome/browser/extensions/component_extensions_allowlist/allowlist.cc" // NOLINT +#undef IsComponentExtensionAllowlisted #include "base/stl_util.h" #include "brave/components/brave_extension/grit/brave_extension.h" @@ -21,7 +21,7 @@ namespace extensions { - bool IsComponentExtensionWhitelisted(const std::string& extension_id) { + bool IsComponentExtensionAllowlisted(const std::string& extension_id) { const char* const kAllowed[] = { brave_extension_id, brave_rewards_extension_id, @@ -36,10 +36,10 @@ namespace extensions { return true; } - return IsComponentExtensionWhitelisted_ChromiumImpl(extension_id); + return IsComponentExtensionAllowlisted_ChromiumImpl(extension_id); } - bool IsComponentExtensionWhitelisted(int manifest_resource_id) { + bool IsComponentExtensionAllowlisted(int manifest_resource_id) { switch (manifest_resource_id) { // Please keep the list in alphabetical order. case IDR_BRAVE_EXTENSION: @@ -48,7 +48,7 @@ namespace extensions { return true; } - return IsComponentExtensionWhitelisted_ChromiumImpl(manifest_resource_id); + return IsComponentExtensionAllowlisted_ChromiumImpl(manifest_resource_id); } } // namespace extensions From 2ba7f6a66ede11d5653269d8461905222a94d5f0 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 28 Sep 2020 18:51:23 +0200 Subject: [PATCH 053/152] Drop override for ShouldManagePasswordsinGooglePasswordManager() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is no longer used anywhere in Chromium and Brave does not rely on the navigateToGooglePasswordManager setting, so it's safe to remove. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/5f16dae4a93f982ba7907eda21e9123af6c06565 commit 5f16dae4a93f982ba7907eda21e9123af6c06565 Author: Jan Wilken Dörrie Date: Wed Sep 9 18:01:53 2020 +0000 [Passwords] Remove stale kGooglePasswordManager flag This change removes the stale kGooglePasswordManager base::Feature from both Desktop and Android code. In addition, it also removes the corresponding chrome://flag and associated navigation to settings logic. Bug: 903249, 904821, 1126051 --- .../ui/passwords/manage_passwords_view_utils.cc | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 chromium_src/chrome/browser/ui/passwords/manage_passwords_view_utils.cc diff --git a/chromium_src/chrome/browser/ui/passwords/manage_passwords_view_utils.cc b/chromium_src/chrome/browser/ui/passwords/manage_passwords_view_utils.cc deleted file mode 100644 index 5dfda7198518..000000000000 --- a/chromium_src/chrome/browser/ui/passwords/manage_passwords_view_utils.cc +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#define ShouldManagePasswordsinGooglePasswordManager \ - ShouldManagePasswordsinGooglePasswordManager_ChromiumImpl -#include "../../../../../../chrome/browser/ui/passwords/manage_passwords_view_utils.cc" -#undef ShouldManagePasswordsinGooglePasswordManager -bool ShouldManagePasswordsinGooglePasswordManager(Profile* profile) { - return false; -} From 34188b9f24d4394db733b04fc8f46ad447a9e547 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 28 Sep 2020 14:46:02 -0400 Subject: [PATCH 054/152] [Android] Some resources were moved Chromium change: https://chromium.googlesource.com/chromium/src/+/2c43385a51e189b4d36d1827e2d146bc38403f40 Reland "Add build flag for building //chrome in a DFM" This is a reland of eea2a6fbd8fb51a7c1ab57cc6c1c878789e21e79 Original change's description: > Add build flag for building //chrome in a DFM > > This change adds much of the support needed for building //chrome in a > DFM. Some TODOs have been scattered around for follow up changes. A gn > flag enable_chrome_module has been added to toggle the DFM. > > The main pieces here are (when the gn flag is enabled): > 1. All //chrome Java code will be moved into a "chrome" DFM. > > 2. All DFM Java code will also be moved into the chrome DFM. > > 3. All //chrome-specific definitions in the manifest are > moved to the "chrome" DFM manifest. This was done by moving all of > the definitions in the main AndroidManifest.xml into a jinja macro > which can either be called in the main AndroidManifest.xml or in > the DFM AndroidManifest.xml. > > 4. Resources needed in the base AndroidManfiest.xml are moved to a > separate target so they can be included only in the base module. > > 5. Changes were added to lint.py to allow linting the chrome DFM > manifest along with the base manifest to avoid unused resource > errors. > > Still TODO in follow ups: > - Address TODOs added in this change. > - Make a similar change in //clank. > - Deal with org.chromium.chrome.browser.ChromeBackupAgent which must > be referenced in application tag of the base manifest, but will be > defined in the chrome DFM. > - Change the application class to allow loading with isolated splits. > - Collect loadable modules from DFMs and put in base. > - Probably more... > > Bug: 1126301 > Change-Id: I3fac243101eb2fb1e4af21ee99c2349fb074677b > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2412553 > Reviewed-by: Matthew Jones > Reviewed-by: Andrew Grieve > Commit-Queue: Clark DuVall > Cr-Commit-Position: refs/heads/master@{#807704} TBR=agrieve@chromium.org,mdjones@chromium.org Bug: 1126301 --- .../mipmap-hdpi/app_icon.png | Bin .../mipmap-mdpi/app_icon.png | Bin .../mipmap-xhdpi/app_icon.png | Bin .../mipmap-xxhdpi/app_icon.png | Bin .../mipmap-xxxhdpi/app_icon.png | Bin .../mipmap-hdpi/app_icon.png | Bin .../mipmap-mdpi/app_icon.png | Bin .../mipmap-xhdpi/app_icon.png | Bin .../mipmap-xxhdpi/app_icon.png | Bin .../mipmap-xxxhdpi/app_icon.png | Bin .../values/channel_constants.xml | 0 .../mipmap-hdpi/app_icon.png | Bin .../mipmap-mdpi/app_icon.png | Bin .../mipmap-xhdpi/app_icon.png | Bin .../mipmap-xxhdpi/app_icon.png | Bin .../mipmap-xxxhdpi/app_icon.png | Bin .../values/channel_constants.xml | 0 .../mipmap-hdpi/app_icon.png | Bin 0 -> 2685 bytes .../mipmap-mdpi/app_icon.png | Bin 0 -> 1734 bytes .../mipmap-xhdpi/app_icon.png | Bin 0 -> 3748 bytes .../mipmap-xxhdpi/app_icon.png | Bin 0 -> 6720 bytes .../mipmap-xxxhdpi/app_icon.png | Bin 0 -> 6670 bytes .../values/channel_constants.xml | 0 .../mipmap-hdpi/app_icon.png | Bin .../mipmap-mdpi/app_icon.png | Bin .../mipmap-xhdpi/app_icon.png | Bin .../mipmap-xxhdpi/app_icon.png | Bin .../mipmap-xxxhdpi/app_icon.png | Bin .../values/channel_constants.xml | 0 .../mipmap-hdpi/app_icon.png | Bin .../mipmap-mdpi/app_icon.png | Bin .../mipmap-xhdpi/app_icon.png | Bin .../mipmap-xxhdpi/app_icon.png | Bin .../mipmap-xxxhdpi/app_icon.png | Bin .../values/channel_constants.xml | 0 .../brave/android/values/channel_constants.xml | 11 +++++++++++ build/commands/lib/util.js | 3 +++ 37 files changed, 14 insertions(+) rename app/theme/brave/android/{res_brave_default => }/mipmap-hdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_default => }/mipmap-mdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_default => }/mipmap-xhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_default => }/mipmap-xxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_default => }/mipmap-xxxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave => res_brave_base}/mipmap-hdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave => res_brave_base}/mipmap-mdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave => res_brave_base}/mipmap-xhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave => res_brave_base}/mipmap-xxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave => res_brave_base}/mipmap-xxxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave => res_brave_base}/values/channel_constants.xml (100%) rename app/theme/brave/android/{res_brave_beta => res_brave_beta_base}/mipmap-hdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_beta => res_brave_beta_base}/mipmap-mdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_beta => res_brave_beta_base}/mipmap-xhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_beta => res_brave_beta_base}/mipmap-xxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_beta => res_brave_beta_base}/mipmap-xxxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_beta => res_brave_beta_base}/values/channel_constants.xml (100%) create mode 100644 app/theme/brave/android/res_brave_default_base/mipmap-hdpi/app_icon.png create mode 100644 app/theme/brave/android/res_brave_default_base/mipmap-mdpi/app_icon.png create mode 100644 app/theme/brave/android/res_brave_default_base/mipmap-xhdpi/app_icon.png create mode 100644 app/theme/brave/android/res_brave_default_base/mipmap-xxhdpi/app_icon.png create mode 100644 app/theme/brave/android/res_brave_default_base/mipmap-xxxhdpi/app_icon.png rename app/theme/brave/android/{res_brave_default => res_brave_default_base}/values/channel_constants.xml (100%) rename app/theme/brave/android/{res_brave_dev => res_brave_dev_base}/mipmap-hdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_dev => res_brave_dev_base}/mipmap-mdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_dev => res_brave_dev_base}/mipmap-xhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_dev => res_brave_dev_base}/mipmap-xxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_dev => res_brave_dev_base}/mipmap-xxxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_dev => res_brave_dev_base}/values/channel_constants.xml (100%) rename app/theme/brave/android/{res_brave_nightly => res_brave_nightly_base}/mipmap-hdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_nightly => res_brave_nightly_base}/mipmap-mdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_nightly => res_brave_nightly_base}/mipmap-xhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_nightly => res_brave_nightly_base}/mipmap-xxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_nightly => res_brave_nightly_base}/mipmap-xxxhdpi/app_icon.png (100%) rename app/theme/brave/android/{res_brave_nightly => res_brave_nightly_base}/values/channel_constants.xml (100%) create mode 100644 app/theme/brave/android/values/channel_constants.xml diff --git a/app/theme/brave/android/res_brave_default/mipmap-hdpi/app_icon.png b/app/theme/brave/android/mipmap-hdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_default/mipmap-hdpi/app_icon.png rename to app/theme/brave/android/mipmap-hdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_default/mipmap-mdpi/app_icon.png b/app/theme/brave/android/mipmap-mdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_default/mipmap-mdpi/app_icon.png rename to app/theme/brave/android/mipmap-mdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_default/mipmap-xhdpi/app_icon.png b/app/theme/brave/android/mipmap-xhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_default/mipmap-xhdpi/app_icon.png rename to app/theme/brave/android/mipmap-xhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_default/mipmap-xxhdpi/app_icon.png b/app/theme/brave/android/mipmap-xxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_default/mipmap-xxhdpi/app_icon.png rename to app/theme/brave/android/mipmap-xxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_default/mipmap-xxxhdpi/app_icon.png b/app/theme/brave/android/mipmap-xxxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_default/mipmap-xxxhdpi/app_icon.png rename to app/theme/brave/android/mipmap-xxxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave/mipmap-hdpi/app_icon.png b/app/theme/brave/android/res_brave_base/mipmap-hdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave/mipmap-hdpi/app_icon.png rename to app/theme/brave/android/res_brave_base/mipmap-hdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave/mipmap-mdpi/app_icon.png b/app/theme/brave/android/res_brave_base/mipmap-mdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave/mipmap-mdpi/app_icon.png rename to app/theme/brave/android/res_brave_base/mipmap-mdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave/mipmap-xhdpi/app_icon.png b/app/theme/brave/android/res_brave_base/mipmap-xhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave/mipmap-xhdpi/app_icon.png rename to app/theme/brave/android/res_brave_base/mipmap-xhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave/mipmap-xxhdpi/app_icon.png b/app/theme/brave/android/res_brave_base/mipmap-xxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave/mipmap-xxhdpi/app_icon.png rename to app/theme/brave/android/res_brave_base/mipmap-xxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave/mipmap-xxxhdpi/app_icon.png b/app/theme/brave/android/res_brave_base/mipmap-xxxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave/mipmap-xxxhdpi/app_icon.png rename to app/theme/brave/android/res_brave_base/mipmap-xxxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave/values/channel_constants.xml b/app/theme/brave/android/res_brave_base/values/channel_constants.xml similarity index 100% rename from app/theme/brave/android/res_brave/values/channel_constants.xml rename to app/theme/brave/android/res_brave_base/values/channel_constants.xml diff --git a/app/theme/brave/android/res_brave_beta/mipmap-hdpi/app_icon.png b/app/theme/brave/android/res_brave_beta_base/mipmap-hdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_beta/mipmap-hdpi/app_icon.png rename to app/theme/brave/android/res_brave_beta_base/mipmap-hdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_beta/mipmap-mdpi/app_icon.png b/app/theme/brave/android/res_brave_beta_base/mipmap-mdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_beta/mipmap-mdpi/app_icon.png rename to app/theme/brave/android/res_brave_beta_base/mipmap-mdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_beta/mipmap-xhdpi/app_icon.png b/app/theme/brave/android/res_brave_beta_base/mipmap-xhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_beta/mipmap-xhdpi/app_icon.png rename to app/theme/brave/android/res_brave_beta_base/mipmap-xhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_beta/mipmap-xxhdpi/app_icon.png b/app/theme/brave/android/res_brave_beta_base/mipmap-xxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_beta/mipmap-xxhdpi/app_icon.png rename to app/theme/brave/android/res_brave_beta_base/mipmap-xxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_beta/mipmap-xxxhdpi/app_icon.png b/app/theme/brave/android/res_brave_beta_base/mipmap-xxxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_beta/mipmap-xxxhdpi/app_icon.png rename to app/theme/brave/android/res_brave_beta_base/mipmap-xxxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_beta/values/channel_constants.xml b/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml similarity index 100% rename from app/theme/brave/android/res_brave_beta/values/channel_constants.xml rename to app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml diff --git a/app/theme/brave/android/res_brave_default_base/mipmap-hdpi/app_icon.png b/app/theme/brave/android/res_brave_default_base/mipmap-hdpi/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7fc7e518f41323ebb17fcb761f547162345b6d51 GIT binary patch literal 2685 zcmV-@3WD{CP)521dvx0Av`prBB0c^R;Odb8;g&BI`~&-N=MqFwbM@jYp0!x zwvJPosSi*Ztuhs*=yWWKK$g4!A0%P|F(%o~lWek^eed3T`$sm*?%lh0H%pxH>_6F) zbIu#x+SA^;O2IjiylBZ+Shv-)Y}UIYTL03v-46l6f4fOMkm zS8pb!zsr5ZlZ#Xo04$uqiJA>i_Ms-hmH%0NB44Shx0J`lucvkgQhv)s;(d1fX2DZR z-kU2dcyh<@CZ3fGxw3515!{DF8J3^U`BQ94?;GQ`KiGV(=Vg|lP8T468Ca=!MEqTz zGD%}pKUeLGy&BI`M!5hvD8WZKj;&TbsF(`To4DY`*tq<*1?EtOm*GMIZDBWeP((m& zn02n`_o}^MUA9;bNw>3>8cGOokym&lD_d24wYQrNh~3|uwNZ~Kj}gdU?QPQQ?D$4a z<}OjJ?jo3<+S{Z$u|p-F52(mQ2@@uYoS4zB(EEs5afIT0IAoLRcu>``DREQ;0#m|F zPs~9v^Oy}>Wsm@1PQ0axN*ooCFlD^C3bo=b9wJ~2sFXwOR5Q$Cj52Bo;bIsM0bwI7P9%1fg<8`amMm7@G%$evo)_>Vp%VNz3 z<#4JtgjmLwY0>n}+)OA<(_+DvLt2lLLH?oE@aQ#FjWdIXuuKae3%i&}JjEbH#ylN4 z)xP>R$2>X79+@r7Nf0|uoG>9m$dpon)!^_5!;B+QL=i=pF=Gbiu!TCL1d~)83#!+i zcNqc_ta(UHx|1;LxFhlR03Xmp5CsJlE9ER^8A}szuZ^p8(MdNRVt|B%gQfhC1pwSm zJ5AV=FMR967v52geA$BeKWSCV6JDBGJWgo}xxeCbIv7P@MnOhkWj))H_pa~`%|uZ# zBZvdDSV0X-u_br$^Bki|If${ttKEGDzHHSNsXU&i70Js zP6CSa1yL->L@A+~8mcqALkYF~Gif4CWh=M4U&wxCqUup4x%pyhbgj%<)-uRNS{O#9 zGKKP1Dj6Y01?ySE+${X6;SAl0gB7YC;XtYh*JzoXv|Mp2GR)YuQOW)MjDrt`Pb`wmUZh>3{a8g@1cYW1~{GdnNN5VDS4=1 z@Pfb3*mcBvlPpq^kU317?$#chNX*lryF`65@lGGD)S+-~e?f13E?-7(qavqTg*dO# zp|kmicy$5IL&D34I#0Co8gWuHDMfZQ<&3EZFZsJfibpmR<`uru!lnreX69!cJ0CMv zn(5KZcXE&j=G3Sff7jrpoPZ+3{pUnlcxEQZ%bEiQ@u32WZdpRb$56WV@-jipq&uqq zbCKcPS%>O6lNmVpc#%~0-O6SJF<$2|r@6uyUcSaj9d*PIZ06RK)oxy5TqlTepUDif zb@DP-OFWDwOSR(RMfN0pyOpi1a7wm+)ZEI9m?)w&azU z4R?6kg(izqu;J#Dv~@SLmrd9aK!_j;0vnsyn+69y!;K9^o0l=xF?=~MK(epDQRw7l zmJI)7V=H@DLIi;z!V>ndH6_%TwBA-7t_cPjWp93&tJ+(inQz8f$SR%1%h=100C*rn zHWOndi;3yvyuI~$B_rJmn)^b`o0*$!$P!!I*vf3m*_I)jNt$lZkxLjy^|)8_5U8;~4wJM+&bPIHhrGKcs$XVEmpjXUMw6pEg` zXVK_HkS}#tzQ-G=NJyx>$uZqE?F11T2K6*dsS4ZwS!ggFl8MuVG^@P4$}vnx#0aBc z;yqr;2<*a~N(N+;aKcvyKAjSvfP3T4T8%N*=e*$oRb#E23Gpa%xQdfTMi8i2s9`;DJtlYva3~-i4hB!_G zm0ZQ6V+<6<)iC8M>~LG4$5ExVA69&LFe51DF7D09TVWnM`5tFDiw7SjtQi_65p)f; zP8m>Wc(`S0l^*G=$b5$f3=*B$Z0GxYz(=|i6&L<7f?8NH^~ufdc|QAZ_v%ov_w07jBatXsenw=*8mTd0~@mJ1aM`S%w z5FYF{%+L)11$)~M=juq=>EszM1MNIR7sf3k6CH>B-9{@k6*TShMN58symV!*re>TX z7STgENBd2}-*IGf=qqius^%*plu+Nvr(|EQ#;lnL?Zk4zQN}-hD%5M->oh(~MRuJ! zu{Sp)35!8_Yhr~we&UxsA0eX@4hUjIJKue8x3{&R?q&*id|$l(*p;J1$QB8jiBpo=YH>Hq6D({$qNAl0visBSMOZ^MA1SyFWH3q zn)bK;8$UrJM!HoPpb7mh##Xlc?tN9;6+`V6NOb?lxqtK$Q3Bb6jq3#j0y_>$*6dvW zqfppCkl5$DR8Zy*R;}P@ca(nFc_Ua;?)CkI9L1+!}qp3g%r!c&vY^aGl-Pi7!a rC?B2rrU6Z;mI-qC@d5yS8^-?uQWj>szRS?900000NkvXXu0mjfS^)P^ literal 0 HcmV?d00001 diff --git a/app/theme/brave/android/res_brave_default_base/mipmap-mdpi/app_icon.png b/app/theme/brave/android/res_brave_default_base/mipmap-mdpi/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..10a941e1b0925128e31a42de78d68efcc4f87cab GIT binary patch literal 1734 zcmV;%208hOP)3$c6Mji zHdQ&le0T0S-#zD^d+xawlCM@g^M3@mhf+*b1fcRCUI*YOPt~@YMU)jHd-gpn@zKU* zn1IAYA*RiY(HI+)?eqOte8Sa0KW7&QJVqNUB-%t(x%4b$8%@>oIG}6+9xU`B71TcuvlnM_`~M0RLXgN^SIVmUAs}Ov(@dl(8Qj)z+T5Q5W+7JDhX+ z@mHL&ZneyVpu#qvl~T$r^Uz4E6|Ri*{a!b-htZayHxn_5M3Q71o4!;**u*xHWV92} z;9CVZxwcL#l|Y(CZUs`DBSDH3m8^96FwGbj@!=ytJwA5uIb&#mR#w{(A1MG>f2ZQr zk$BjN4=@;^kF%ulv5b1IW)lLC^l^ePQPOBMv57iBV<-DC5vbk`-#ydi0#sC9(P|(` z^G#L(P{MY$G0Xrbi7>%=)}sM)yiEj^TAJBFqaEc{+`u6;bgpQv_!+T0K;>Hh*9;^Y z*XGpACYrc~0p6sVOi|NVPMn==AdnZf7CJEj-^$80e4Gb}jU}R5l| zJ<^UDX%2829}>Fon`(Fx(GP#j?s?X#sKFo=sH$Kk$4!ecVZp8xfz{* zbDA_avD-2aI)iv@9nkd!0F(XEPlY{Mrv;z=t%O~)b0w>3XBXMRuCW!}))B-`O$-zT z7|C!~HuL>llb4Fs`0+WiDI?bqaGZ+qE+bJC0Ha5w6;0{-nBpZqCCL7~QzF3Dk&JcZ zH)lB#?oCZ&MRS%OXZYAhHxh%7`7Mq#p@$iSrIVgH*Sla>F?}{VRJ%3fu$K>LU?ULa zD2JJ(ignZxB*+tdgBz#@`gtF(?QwMIVrW5t)Wb(>w@Su1BE*!_iZWcgeX$8n3aAjk~2CKa=;7RB{JjXPN!$TGkTc0}eBX55+bw89(A~ zkn`mH@x%q^25NZt9<8?dd1>N@Y(dx;KR_}TIld@hc6_QodloW>{~*U)#W~5J>BZ}q zDVQ3Fk1Yy7p6hS|Bnp$f$R9{K&pf~4T?|AHAl&J`Cfoo(o<#5q-8zW2!E6CaYwowyhPz@s*7 zzHj5bLM#4^mFa;Odw!#jqPrWN#Q~sD(s1kbkFRKU`yo)7I@$U2v3Hm)^u$~m00bVb zspY||et>G`X16hP;FD)lXDAZGr2;b6N*lj@-J{j(OsjOLM1x149R52q7{%YvO9y29 zSlx1e^WBOUq%m}$XK(T|>y7w-0RX66*6^+7?+fMRt0VtdXzl+iAXB@`5nLqAqW`3E c0lq5v0!6`$`hir)p#T5?07*qoM6N<$f}<%R4*&oF literal 0 HcmV?d00001 diff --git a/app/theme/brave/android/res_brave_default_base/mipmap-xhdpi/app_icon.png b/app/theme/brave/android/res_brave_default_base/mipmap-xhdpi/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..571295bc07297ee8d1aa210a0664d5781e825a98 GIT binary patch literal 3748 zcmV;V4qNewP)WUB;C)m#F4oGp4|01R|usB6@hMtXvhdnyW^vwDrUl`FFYgKDJSro1Xcqh$)E zpO^u4C9rH*g2lo<$`IlwlWJXkWB%MYl^ zBRs;K6nWJV6w}7QC-tH;IpuSN=j6Xx10(YTlf=uc&44&(jGXHDjL%c}HOsk=^TYH5 z5{lHfSS$JB{`hNU3njyKWJSuGeCrDjc2>AUa8{ur^-Wd{KUS5Pm{@>Mdn%FP@5S&ifz?R1kMjzmR8Vju`Hmj%qFWa!}r?bLCKCI*mbfQf~`PXUuDUcx-`nzJOLEaXmGa~90O{-qTlV5{$|SxD4*2dLhpOK)b>SN-8Y zy;JNsjeABXhO<$I^-L$>z<$q(!+Y>~^aDNTj=!PUxD|sS_cCG3O#XP*Q-EPZS#b1! zq7gjqfPq!LDcY8OcrET`=9qe|ncR(K!{b6S;2tYA5f?B*Cg3`#SU zLQu+4eCXW39bBCwJ4h-r)oF%As0FvP&x0A&>tu%X#(S%DGK(K^J#kc<6siQ3I5+S^ z8;y4;RG_6PkwxN^7e65CYGPgKrmr`TV()TPe3WK=Q;H9j@;r*MT_n<=#yig($;NI2 z;KKRd8j<1!O+F#+z2b}{KylXfVgl}oW5$ZH7YQlRP|u;x4le*Od(MVa18+a4*yOo( ze3B@|WEbs16cgoy=L+l_)TRWV5Z;S%=fd2kdesy^AOcey(x=5I`ZyPS@FB5WVw@r@ zBtB|svH7-ww-G3|8F3_>=*SCzjMY~<`C7>v9JFDsm>3d`23l>BSBqBa(U8O_w&{)> z;7z1sZLT3KZIx!szRsj!@ERJ6)2>e7A>QLKD)nsSDz0W4)0l)p53RJ& zLSh;>W~9 z5X1)<#4*rNNidn!+-BpwUnJqkzM#M6kE@NyAOPvHKOl|H=CI;Ygc@M0jYw|eQEoy< z5X6s3lqd!o1qgI*;!zv+O|}tr$)pvU!)B*b2i6e)`ngJ6dM6s)wzi~%4Sb&oM3IPO z`CSraJomG~)<+v$M0M-ZaIRA7`2$d!s^dMvr7$wzvA4dQ$G90i3D7|2W*%dOV@`LC zgIOI^phQn|wY?8;0|2tKrT?&S#OGs~OK@Dw27bUqOiU*5fP?HWSEhX~J^KEmkrrGO z%n^Xu)lexMwpFK$`8i^ma_$Et_pvO;opYE+!hw>YF>G}?<8uK3=PRY-mrFh5R^w4n zD9m}E!cv#rY^xZmFXjaRl!n8xcDpYug3QXvRyS{BV6d4k4@KReL&_BEXsU7J(hY#@ zYwJ1Se9GNd8_#kI4Ij1qp4OZxj1zmk2YcGxh`9o=dh2XWsUS+DD??{^hQ?%0<)?*b zTq00_1_lteCbT|m^|-5_n^?q!3d><4tja|!H9W_Klvc>0+~QDu`^vgc(ocZQ7l2ms;|~iKI~`aHlMs^rA?Aa8jc+j5p;%bK zXS63lgb+ksW+VjB6R&(Lan2n;&X%uvp*1{jvE@iaBgWv!WP$*-q{D759>MWV7UNDX`HK^zrl+oUcwy?l25NWuVfkf`GiOg6DVk@l<{2U)La3L zL}{st_vK^j7w2uf)tfi|l3aL^RjLBifYQ5OlV1lKYtItQNe(|AL3XoJ4m^HA?Qbgr|;A zPh0OnJPb)H1USxb9mBSBY-AUzZQPTol>LXhTD|b*34qnp@TuZ)vOGW!FR@99oACSV_vV9s5HFwr+={e?6V&^OaL08 ziDm0v4_%kvt2!1&GEVibezDWo2^nI7UnLhd)m=kKN0E3W?Sok2LScu%C|`832m`^u|xOJ=j&L<}osmkM4I@ zzyDzUUUUZVeAv96fx+ctJi&q~S_{_x@%7zn}gXeQ1Vo%m9E!knyM!rk4NxydNQ~5zAgs`)bA07h5suC6>$E zj2ytAX&FZWzUx+%|4V3&IU?D|>MQ^A*asw%s*_V5qXA&BX2o##PeYUaVG!}hC(er%+ck}^V+K2H32rT}a zCI473+jO=$O$VQ<*(#$X=p#0qvp+Tf2Irv)C`6e&yZq;6-_5p50)@tRDt^~diyWTp z#}>fl^AN=U)m69tQ)s@KCi`eZ^^-@oCv8rQVf(+a1aSF0sFSX~Jw_d!z%waEyx)9l5_*WQ1T z04~K#Aqvm{gBSxNm;IFmFlcuC$!3i1EzbG>1>jPwoca$^t^|ND+xkDc+m+`m+b-e& O0000M&i8kA_iu#a_bpe`eh)$J7RdI8KLbE#H4X|800yMV~X=R zRw1)=CuhcnJHyL30Q|@wK=aDdNBIVkdGGhXFu*fek@&!fn5KO}d{@msJgBhvu6AId zXRyEwQd;>ZD!*x#EsQCUODexr9`F0rLb7N<@prW9dmj3ZwR)i}rNXLu=sVRPwY3ij zKmr4u00ssIi0Zwc`o2@`EaWS|+4!mNZNA459{>@PRPsf}S&Kjr5Ndn!JJwETmc>{Y zh}imx?;QGzp1OdVHjiSl>L7)UgN=p|R0qBtyk{ZVGYg`R3!0@;BnhF-qf%NJ z=@qQ!f7^d>qr7wn<9?oYsvY6rV9zUK7Y3l!e1pdnH}1zl{sI4!4a~bPS^$7lrS_lo zCvS9&r{GV-|6t8^ToyM^2L%aW5C&3M*jPwlss7jcmnAo&iN{5Z|HJ@bU=XH)2#P7j zF-aAsm;wdrm?Bp5aqeUdWk?eAbB-f4i9ql#gMZ_2vzq?rfeF5e;9>4#3spo=Omdk< zeoZ42{y`GTf3O-7+xRL6D81&EDOqn_4t`P;-^}P+S*l(v6SrLV2b;I~Chy9azhKor zK+Ciz#n-O`=Y!JzmwcK*KLGhv(pBQWiEn>k;eo&9>FX5vJnEn-{=4|n2RjET4k(R( z&!vSh^HqF9e2EWy6QAc>tet;=D*3wh6#puk_&neC3Q@o_d%iBdys*NhW>lw`F$xRT zK8NH#coDRKNA`R}Jmqh)!q?U6s`yFGIKg7Uo+-Ydgcn`p1)wV76CQaL7s$$oY0e0A zN?FB9A_x=-uFy{u2bq&k>KZ_OLiBkh`0IQS1w0AYQ~ubnj1`O#$Hu}!%`oBpsZIx( z0Ya3rk=v-EeAZxW#_6YnE~YTCXV@fWU{y2F8yM)6Qo#VjzE~$drzHQ8-hu$q04Z3` zf922p=pK_5e3oh)M(AgNA)>^Ik(jmMl3qM2p@LOx;}(J$hP9mK+<{3a&Ga)$^cr63 zL?|UfDV0>QigE<)9Aqd%Z#mi*fWKl$Q@%ru$Iz$7bj-3^9eqQkGFp8OvGDifgW{TVhX_k&tr~in#1^(-GDZT8Qc5tgTzMxW{0`F> zMB=t7x*DRUcxd)c{&qOBd=hk>1E+yR>YdE_Fv9;t7D6b^RE zY(A747CCJf?B>Bm7LY#39t2KK4HEBbIV>ekuFJGMcH5RtN5kMrJqL=CjXbi@!DRvM z5jI{E<6S%T!IKx;rG-^EKwy&!>%o$2B$Zf{@zA1B&etpJhbhNGW*vLc$}$5pC(ZH# z_5TUYLPvZ^VAd)Tr_^FFt655cVJ#bL$1E!)F(Zh-Q-Eh_@+9?^(9F!5<)(JvPcnS zn0~tHV*&?(BtV2>iYcOq5Md(R!uqSG6yiZHXN~bwZ2wrzisGJv0IG5Wsa1EeM`fXC zi2E}5K2grnOA^O@vpSl)cT+LO0H-OXiYnH!mL-(t2|JQRnV^?T4AM^woe%*RT1ARD z1K3D(idf6a3_j5V9Ky`PA-QYaUZYRu*j|(spngD69RBRb?W}p9ZQPTg!=2nt9~Wq6 z*iBNrzpADY1T4B}CqxO$*~D(vWU+ygK5FS;j3`M0gebqtr&A~dVMEC6-VOVP|0YBj?e2Stcw zY-AI+vOKQ_TgiR=npDQg%8GptO?E5Gw}@TBAsE^4L?%~DA*jY%s;H7m_R~iTZ442` zMxePGLAhy+Y|7doc-5v1i9`{gj1_EQ3#&Y@TJ7aL7myh^q*(IBrWdSn-7i2fDl}uu z(tFH|`lp1C_*hcYSiff8oykpWkn)8K$@es_m8)W>!M(RL+6|!GN>d%ibz%sl-5G&YgWuT z*KN{{L#EkGwRZMPy^v^Ln0EA?OqeS!ab}JKRyar`MLET_oFejMv^=&`T+R}aO&qsm z_N1$pBU$DsyX)P|H>G%u<~a>G#Q<>(%E`5*v50aE5)6=>)6>rJ24xFm3Ff1Vi7}RD7CiAs^UZjsu7V*+)J!6mOT4&4ykeTXe z(NfuNHR#~Q^sZW8EkO;#gm5UyyJ5DJQWPOZs3lPVJTGvOVAdrCk?d+Q%|e%bK%$ae z$qc4`+C&<(aFAi2_N#?@0w@GaDa&(pIZFYBLA`IYFvv@^yHQ`}@h96;T{)LN@&Kfi zoanuDUe9rRkS1Pc#K*8FIm0AD7ohwiwiJQHV3IRT_;}7R2WcjlV~RSL&W~SGvT%ST zG9DW^r{z?m0UCIPG0*&I%fW|;$B96?p z(;*LoP>QJJ07=w%bh0Mj!m@$J2@Vs>t2R&J5O4u1@{|=Qqu2!~fWs*_g_gZV zIm}7)yuvG(tQn8y+e(x_gCMbokL5oUX&^Yxo5XWU>_xg~mTV-&9!0E}X+3JtLwC+s z9_MwAAqaRl$T@NhJKs(#4-B%+rgJi$U-=p+j_@yeq9$in9>DUH6R>90HnB72m1n0k z-r^Vn!-F!H@eAi|a~>F^oY4`x&dctNAd=tko2)^Bpqkw%60RqHi8pCyIP3K`BXsa4 zy{@a5K(U+ZtPrJmo8KTkZ3GrLXNO0WlaE39(<}<9CN7=0^2T3#5e6CvALU@GeO>`d2()9`+V?D>{z#@XfAcJUV6tRpIln_7>XOt^U zx)DGKoj8h3JiuL9EtAC&-oo+-k3v&T=ge4cAILLlNKV$8x&<&mY#Mk z_p^=@oMwy&#YiNQ7*ll4EL3Y~=mgNvv6x~h`?-fzITK=Uk|c!JLKyP$WRG&@gF&E> zvF@RUqY5K;2tvtYj_qEP& zL;PZXc)T8{Qf(o)^nUzEW%f9P7pvG*un$c>7l29yEVb< zE0kuUK|1+0kY^E-a-cEVAKB<_|GGp`$tF)!-^V&maEdWPGv159!la!2+&jHbDNnnV zN+$F8NVEAJ8|ZJ4GItc_9UxFjUAZ!Gq1Yop3WM7`#aU?{eTI!3rFF)GNut=w1MKp= z*i+7Cx-+huW(H{d!j(a#yb#XoVx?5p)NwpjVgZ|_?D3Jg32-M*@Ce0NfJHG6^Eh|; zS_`|A3LKBMVjy-x+RP(B3Tc~d?@7m-fC+A8ozLuFC7xzdoHXb zRoi>EzY=r^uqNwH zid?OOqr@pD$x&JhxIe@ibPoXOwAPwa3jmO94s+A+`w(!~qZ7tlx8 z+jJ)TI&E{l0Ro9k_C_1MWZ3+#fu80UbP{q?`5}6Ek#~JpLrQv>vmkyx)$PSa^b3$e zP7QXQ*YlWAflZ$;h#Y>)OAHWUx^JBbS2)PqzBbvI^kHRP15-17cb}gc^vWN9)nBBU z8gI&HC^Qt8=<(cXio?9Z7-6(ol@tVFCU}+CeC+Dzr5BlZLP8EVnMv)IvI&mV`1qp%(30~)AMm_db$9P`XQeciw)+@)Gljs*9C7u56;WjM~ zi8UO~<%#9ft&`{ZEjAHmFHXHb@(7Bf{M?gG>!tyR{9_ww@9%QtLI9Lj(}~!b{5|W8 z@OqwAvT@$vS!#fgJ6ho$PKgsEgXgv&|M?but_2*qLN}_j1Wa5jE;duKd;fuZgyljvXI~~ z=d+#)yZRkpc~@HARkUA#q-}L|>>tppWL^$A9LM1k*B#dEqlpH(Nnp651r9M3E7`<$ zRujaepC&pP03zswvAIAOXSjpyY`9L39p(hK3w7=nXODF>Tb6eL^IPOiB9jxzlO>OO z$@JJ9W0FtII#Je5J?H5oNx!r2MDA!aq;9Gk9zCcrj~K;V-pbuY2*U^?$JyQkR)+f!e(}H z3su)>kTS}s<}NN$Pb=f-gfTF=NFNPs6-p z7_&U6Jc(eZtvMC_(_g9KeDboWCV0!a#!rQFY*toKl}vVsaW zv5yAMFoaHs2o6IGlCEhhJkQr@i}fn$M+5m6F@-bL*Ij?>F0aYg>4S6AV~S%_&fVuhx{pN;kT-IMMgAeoE~G;i{GlWRjrP|9xhvax{U zFkxylr*}s6X)cp=bZekOk;q3+|PzNoE3_&nYHZY zU1~`BJX9wqZ+r4_M>wG7ip*hj?>ow4rz zX6gG3j{hTAO3CQ>WTW331(3vKep)}1xynXmoap%ZsZk|w06-wk$#*6AD$5T6`go4B za|TE94nL-!ps%MZ;-_WGQ_^~lA|}By+su66H({ zA1|b&l12zcBhUKE6;7u#Ugqbtq2)MxksYAP6EaEx02Ol5QK6Etmh&45`~r%O;0nLy zBA>i2GSA-HI7}0^=fL9H)>N0A@)u;x2_R`r^s0+&q@ddcK^$ti!XNP=Pxl<>bp~AS zr~;nI;AoFy`3o`%7cr1HiN2vaokCl>hHoz~a44_oPx1=CWFY-Xu7cR3GgX)D!ztv` zBZUE^Q1Q|327L}+ zqVO{A3NWxZ#yF2<*$vXmLC&EH=8pTM$>CbdEJVNxXAn|eX}VHVxR6aZ13^8{WHkIu zJVOIw4mHox92l-2XpnYc7#CXYL84+~mtL8V>WMlA9sHEj*Zlq@&(eW0=aK?~zF$R0 z3Z-D-0Abr5C#Fu$$M?51f(-CHZ_H>>$zfh#(6>XFsqc7w^Y1LnzYje(fE13BBLnB2 z)#m{qg+_=84)IF{a2Viu4l(6!W|%8Ko1Pi%Q!@X#p7~VLuBmrYtw+}!T>r<`JU|3N zk{qFxWsJ~=Ge^Zdt>G>oy70E0z%I19Md1?S;NVOSHT;v=Iv*@bzio#e>gYzI&rg3{ z^*B(x!?~ys8w+{qe9ia7)O?k?)zHxh%*&Sr1zMu!d)@VJNzj`Bkb{L~ndjcD zc{-rxuNttJr(Oco{awRhD~Uy_@bWQpdsPl8%w+WJ3unI-kUEQ}=@>MAxAtd=N$k16 zGuIE%N^FwoiODn1ILW*Ittyp^0v-)5Ui?lN3=B-tE^y0R#{vOc7y>vSm9zzT+!_mDWvx$G{mn_m7RQjSbvrsYs`6p`2J=V|WbkOsKlaq8Ol%UwN&3qGEhIo`K?@Qgf}!bUD|df( z+n2R6`-Z_2Kt)@ASbK1MP)bY^BryFthYJf(+O`G>5g|k%7+$~UzOR(teIr!1AVBoY zi62~iFO|R{Nt_h6|2l>X4-n|+1c?wPq-jf6?f$~HCspyne%M$?OSb*A_W9vHX_F#J z0<*BXf;R%7bk+SJL5c{Wha=T@@Bho(&p<%_10SNaz zZ@LD*p=%ZE_C8+yqzc*#pm%UOfBN1}M|&Ixiv&qhIE7`NZzMp|R?Q$xm@t9j$ZdD; z{7Tu*`Q(uxz|@7te`q-tjbmfZaAyvt^F{)cRu0p4EvU0>?fyUA_(f^VkLlOYoZjb7 zJv-FxC@kV6F>`-_W-$UZt&hS)2%&`{oA2NMwW95F<&hvjvhB?GTaLz~SLvNOV}IiT zN-K(h3sO+mmapCS-miwX z6k=!uI#$P-e`tC;5krw8K>{oN6|@gBKO4~bg^Rn-hXq;6H2#zaz~dvzc~Hl zE1izQc5T)?apz_OG#yDAgef9~Rvg)K-yL6BvcvKrsj=3^A2c6{Ca`C?GtX&*n+;G} zABBhzCaBAbHT$33__&HlFM7x9eeu+fhPoYrMUupPb7!#tl=hE;geW42W`wHm{_xjI zcIP63Kqt}k-uIi2nMou`5+t!%kW|5904P1<8M~%YQFYgWTmMumb+X_|qUZV3&kpxV zT!U_6749p45CD4L&khkGf-sEDAG+(SOZGX}RiM&HG}e5-`B=(AksyxgelKZ(+TsBy zJ$u9Dk)f&5<$Dio{WDSK%+wFk5Q+Amo%zY=fD~B7Ns(GO?kqllrd?vgRoVeV-?)3% zft3&HO8``S=tSdl9j8*3t9MdvwaEodE-f~I(!w^)qp+YjQh9sPR*Ffa+6NkGjEF#ptLlF2oWYsP#_!tr73|;f&?kdLN@RI>j5YYQNT@(7zEIe*jOYnN!=Lk zEN*~i8-D{G4TX*Ef^!3xMiw(buEXs9On=oz-PlFi#SRc|>3RUU&=zYR0Q!APxBn0N WU1-P0U9$=R0000G000002VoOIv0RM-N z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;tK`~88hu>SqlIF8J|f+K~#9! z?VWjiRn@h}zjw?4h(H--Py__wfl5Jb6>+u>)S*rlTkZ6GO6_}Xty6KrQnjy6eWlXTpiZEGfRKq90mBpsguxIJAR*(u_YCikdv0=*+~n+Y&OW&}z{)3|59FS6?mp|c zroHysYkPD~QZmVVk_9ILIHAdJc7dl&hVfKKX44mdOoEL*>eytAorHu&=UBqOhp7Qz zCpSJ-)fR7NX5u}13IOm_kOf@c#-g{3Yn}=xAAl4vLHGEX-RA6vOPO?>*50@Qi!T^RuLV`Q77QZX+j`q5ycF_`T<$qz>TMPdu4i2$Jc9 zJx~11Gd=lMSpUywUd6TfXzE5mp2;_P=A_0vM89XsyKX^{vH<+?a_@pB5r6VX({Gvb zu{#i?C;*S0?_b0zDKsGsYu7%z@nOCdd?&?n0+q_uQ}a#;03Pe-&*L;wkIK}` z{8Rs20-E%MPgO(h*uB*<~{D`aQ)#S5sKIc6aOwm&cfXV0Z zIJdNTvBna;%yTF0hV)IIezazawlIYcL_lZ*048_jdHy5WS;b`N3HMCdpL75oJ(MbvfTB{JaI1zhvq;Js) z&wj}8e)^b$6>YBr_Afc1jgKSbi$6^x^;&k|B@?z#}8Qj@h5deRKn=D5jWiIY^lhyZj7fIK${5aBUUa z$fpoR=(#=VLvMQ1lQiHkZy4p%&LH^n66pXuJjj>ll>L70;fyAKi%@L*l#nRV9%Kk- zGn6!o-xXpTTPPru;Injt>AmTWugPb-d0Pm&)@48$`ND2707UD9J>EY$xBb^QV?PAw zPk#V3%Id+W#!q+pGnm2HD`8G!6r)hsMFD#`OdXx+Z7{yIJo6b`&qq#Qw4?7{o)oi$ zenA82rL)sfjb)5UK-PmEj55HGvsUWoEY7lc<XCwZre#GVr2_K;RVwz*oD#*^mZs zeOqKmq|o)8?(hl6mf#axA@K^zzi-~B+Ce9Q9iJKJ%&gooSdW;Oo#znw=>P*G)SfR2hn zgh;^*tIju__Dt#AMZnSoV8c5oL{P+L0pb8?C@4f0Yz(auAI$`M)8466_0{66qIu^GcFaoybCvRywDGY zJwf{T3r?{j|JF1>L;2nfVkXhc?UwVGsY_|xCdw$^=m}Qj-&)c|L+fyxXzV}0(ktpz zQ%)rj*O^(%QA(+>m~!qfJSWJ!U0nLX%7Tms-@U_oel6y>Cbg3JsiTrgs*K<0zpK%V zPdm_q0Ssn<)Z9^oLJHVR3E{X1rz4%{L`UPd1E&VzQH#F#gtn~l@ zPnWyJR|}?f)n`9L z8QaPhwk+n0Jm%2Hr*8|zR9fDeuy4}U9p;NzOS7#46>MN#0@-VQ6n#013xsm2$H-$F z2Q4nm_hmGrOkmde2ZbVj=B8Iajd=oTOOklgCz@Xtd0gPspjZD=T)|!tZ*za~;6U&AQo1nl%^GDrcEA!cri@BI$*0PaG zvnX5OX=e3tof*w&+a(?zZsJu_`x3aDH^dZM%mjJwIkU%hGwzP#I)@>n$`01CwUuCR z3_mh?#vInR;-Q8!nn8{e`Qos zc^`q^Exf|%jAo>y^vLC`Go2Bf@)I7#V{U{50q~g`puW;F|CwCC1(cG<>Sn2lUZ!{V zNg($Za)D{|WQ962lyA(0>Bl@Sl9UhxzgpwECbMwiH=H45>ro8 z0MPJ>cmb~f`#t!S6=s*Yv0JYz_tCG>|IJNEdLwrC=igmmzeq3;$-*mAnj(@7_2RA0 zHlNP8L1|2k%YTclul0#DJ`=4iC<>Fgxvk0(E6ozq0B=E#*=6OpL#Hy_HUPt&7qqrO zC8k&8=SZ!LTlTF|)cRsvK5kLZ`tRr?2te%mp017Q8EFd4PB?P{9Vtqp9W}RG1d0gf|veiWVn|l_qMas5Lp}m+t2s z3&~}X?9dk$W1z;mvQX-1BFqqof1oxORkSok6aWq7aJI-G3z#YKrB}weyFNAmI6|&O zVVJ>Qp({&c21wc#B^?bld#%7?5RlJ@l5B5?#c>1eC467cxX5XV*q{a2|E^%1r`N7n zC$~7)@B$?@q4i>eUC$gTFTFg@srR%{rs9jsOjYxhlu%$6TLiBSuQ^;Nw>&*&gw&dB z(Hcpig*y|fWO>{Zt(E!qiMw;Tgcb%L@U?J#XmyS_`z@Iu)Z#4hA?M<7TP2GdMO4;0 z3ZK@lvNjx@xvaDC;-57czxAH- zeVRSdI_258Ygd*P7i@KZfSOgL?zcLm*;Z;*0oc;40MPnYr>1ulVfAo~^~|+CTiBOf z+bf6;J zx+*Kev&d*Nqqy1Mte>gS{EkEQc~z0w{Ck$*iqWxbYw~Y(hm4B4DaTHpL1DU3U2&9A z&B=PFiA2lhM+EQP$xM4qoAhsTMbprBG(bl~%`b~=vop2`ZwaQd`Z{1;1C^Twr!7Zd z(`{~*ifr3dX3Yg#(*PqBt;?}BI_h{cfpKY0rzhwwF^gpudb!oIjDI%!>p2Pfbv38` z{N46WwYprZ2FThLB|`@eXLtIAy#dzpI=`m7>2-J0hsBMIKpmekpMIQ9Kl-;=SX)gI zd)UM7W;Vdjl|rSH#k}btdwMk6s{C7PTj{|^8X0}N-}<%3_9>8^xnHO<`5?2{-{Lf@ zKmF)OH`4JE;TQ)gqNv3+>Au`4l*}$;nuElh9+@+0e<`(u;#1Lb&kyhsB!dnQ%n6=v zdz^G*l2E;l#!?nJ?qKNWDlQYUwB@|wsB36=&9qynrj~Gg7DaCFXu}KC<~U)=VO|$f zb1zr$JB#~`o6-P&%N0T|S;y-Ro3_^GSoZ)n0Vv6GCY6VT6I?xckQ;0^5A$;a4+^iN zEpuE{QbC%MI4qk451!;-H#v zXl2@!PKIkOuJ6Hve8mD`f8gg@##`J6Q|@pbJG8ncY&{0DsR5|fInLxI!{YTGF6Chc z3d;UNmSn%>nX?tDvE>2m0HC9x7CH0+cG~!The_OIatgYi3H-*^W|4Co0VSAPsB;Z49C4kky4N($M-HV)3n624p3N5HcGA$!0MJoU zk7nB$>~Lutx(n+6wN26!{fxAAUq!ZE17vp_m4=48Hcz*asvIbZSv%s2zOtol5j@it zH#X+kb;0&EKtnC6RKB);a~CO$TGwdZO64t9N_noG-OiEx9Y^iW0qko)Y|l)t9p!OO zOPg&1(U{E_B!}v9thH*D1%QTHW+N1JdQh6qJU&VI$rsFW4DV4J_Z-f#8v)q|Algq| zUA{r9wmM}gbi^Qqw;SymX#BI1Hyv&g++}?d7FxN+zWm$Q038jrG90#i-qU6WEUM)- zlQPGx{LSVuiBWhrTD~W|uB67k2XLYR8Y)VSTdeuH&w7nZ(y^V^9 znp`Ia$O!;C8tMTXbAe^H#=4)s3T+XE!@O+M&@Hub&!KGllQ0PYEZwe_TD6)btg`%d zt9V&pgLLetiodbk@^`G^Tk9vr99z1{3HzP&v(TcUXvjt=`Y~3Plq;Cdd*9BC7e94JL$Fh9gcqfU|}o8X9Vqjdg))rVDQ74zY+ovB}o(w)1B`73|Hc@|G>< zU7h310O8=cI3pvpBdfcOn|JdLKQ&o{s%8Z%Oxk~V=!u`o7G@U_7PEryGv1_anaWI? z&35)?JClFQN18VxA3-wdaQ{-DtrW^oe%@jaxN??~YhreKaRH-^8oPb0Vr`4%yFSKn zMT@ItA!e}E7W35N*Dj>WC`N2iPTkUghHB~DOj`hK+*Qo(=3V@D^T9KW3x4j3H@K=5s*Aou* zu$axQzE2M>Vr;@alYYi9hGKG9oxt+zY-A%txRRl9f6eC|;STQ2sVW!6$sE9`35r%r zXAbIh%?A4=1s=Z3dGtnSA1hk5#2$t*KH=#W&5g<$meW$%Mn5j5FJ4O7$T~;mSXpB? z?xCh}HMCU|*DHdcZBo|DG-8$LMr^#eP0#lN;UR z94ti2GC`hbDB7jVotr%AZkU~GB$S&(GfC1xP(K@4RBGk{+&4iw8tT!y$m-xYnQ!M| zEI*LMe1N|EQZfk2#-d86lQ8E1G!(4o$OFK`dHlel!xaUgm@il_1%%oh=W_r#0BEQv z2eW1MD9>P$!)-~eQE%>L3~xwyQdzDH7c8T@ua1WL)fVlD92Sjnk^NB`A)%$WR-0#` zF`t_N7>$ipB`m2wWTDhfpNZ!O6^@^wtUg*N!vjdu0DEca#PQ0DF7==W(DZ3joKhoXj4+h?i`+E1jl$4 z@oM-wrtzga15r0++usl4mJ^OOGph})NV~=@2o&C@m|F#QL>^|E3#P{~Kx+z)$aBGR zH9$kHSct2%jMq%f%5I)_jr~x)P^JNrY=Tg-7V5{`h2R_h(&|2zb-YBSYu~Pi)_vl< z6vYhy3|KhIYvWp=_J!xX+#`Rq$ehoiZx# z@QF(m5V5x`oKbIpQd0v^))v*w!*vStW|Q+ds(D4yR@GMIe__^E6cl*|NbY%;8Y&9P zx@mgIeF${s@qYabxr7%i&J*kepj%%-k(Gv)8-~Vd080M1Bc^rvEp0$q>|!h(*-sws zV}9(dRlA7D2EbWeP}58O1j!^bqtjh;{6jgeNZmX4heyh(rj`(jH~@MZnxLo-M2OVZ zZGJ?rJ+Am4+4j(pY9d5XWX*x)1AqZQn8>Q_#m^j1{4aeWYZGC@vJH^@L#H*AC%bY`Fl$j8KRW;SXM{`Q&(Df9;naPBqvcksE@#p#eG?3SmNo z)$r^mYv#9q_RoDJ9EysReD=F>?!9jKfe_(v=%0^QzTckNU;VFH4^`C=1t20b1>r^* z+Hi}H0BK~9K^lRZZ|m^~0_`#KEPZM2KZy{cmRjoU0iY)V0Pw~^5F~KX$YIa*(n%xGBes zq@(PQ&V3zZ|C0$o6ap`P0;CZnjUWMhLwjHNRNDEe$NuowYbI~rXPBO_A^VEc#h2s) z5Pd*2CJGvw5Ww&C-FQd$-+0nei2ISluYde*IAWNd*tAQ+#4Gs#G?=1*0YMNyzH`qw zZ%SZ9YH(lKvH6Kr+ffYD6O(-@)o-Z)K+F{R2pCQ|NC1C&aKg{J{>st86*5Sxc=xk6 zDr-><=0|fr($;-b1Av$*^5Qp4Q84NcE*v)e8ULUpPPdA-J(;yJx{6^Ko(K_{Whbcv zK)fCV>-E6bDdW0doqCT8IVl0&RL=VB)rz`=c3)b~CzSwbaLMs;kssgpN1Xk%Z(tkC z{=R~zzgmY{Z}(kUZb>}=;zQG5eQ4_MoPO;Co$qQpJ*b?s=#|ncL-xal>5(k^sR}^6 z9yIs^Kfa4c4Sm`-pbccdxbUeZt5H#i5F$*7NWI&YZ|71HfW~?dbIJZL8P`78=?=HP zGD=k+efigel}5-JbGs5ZT(lPen(ILt0sQ#Jj~@J_ub)d1XX);z7v~tVAB*>6X=ayd z8dDj7*c7cHE(#F9-!=0G|JCVM`CnG^*^<8;sAyQPBTU#$*>4X3L?7QUMGMCC;PSBp zpY-*SDf>mwE?f~O`(Y#G)ZJx&>I0BS4}$pdckg)Bq)xZX`TFXQmcCRk`wcOV>NfM+ z3jj^^zz9w8jUPRDveURoE!p$T;@tWabK`hlcmLJe2LSPU5UdYQ{rEelUweP&iT39Q zm2(!qdZ;ovvfthSh(h4OA2&Y;MCZxFp7z_AC#wevpQ(@clOX%;4}b@n;5a z_(hkWTgsd2m9szp+mV`Pvah)_-8y~%h}VNganabpBcJvQHjPk=3ZD6DeX?c0y#mlY zE;8oH>46*W?slKandYEXytiOlMP2<|H{AAizx@Lc(}QSS6qhd=J#f_IU@L8smBQ^$ zWo=Fk*>B$fw4?_u3S|`0&;b&S;kt$NX3|o1W~UyW70G?cPE&n5?0o#!Qg`L2QF;B(-E;jM@hP zG#p)rii$#jAbz}fiEarocBa+GJhTt?w;urF^&kpB#4tnkJM@i+r`^bYd-4HI{ec%B zKEnigVuvcq>1KY?35y1&UOadKPrYX7sVMu$BLJ~s#eVg;UyeHfPLjLiJ;{QT0G!bD Y{~sN(EyuXeUH||907*qoM6N<$g7CfRQ~&?~ literal 0 HcmV?d00001 diff --git a/app/theme/brave/android/res_brave_default/values/channel_constants.xml b/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml similarity index 100% rename from app/theme/brave/android/res_brave_default/values/channel_constants.xml rename to app/theme/brave/android/res_brave_default_base/values/channel_constants.xml diff --git a/app/theme/brave/android/res_brave_dev/mipmap-hdpi/app_icon.png b/app/theme/brave/android/res_brave_dev_base/mipmap-hdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_dev/mipmap-hdpi/app_icon.png rename to app/theme/brave/android/res_brave_dev_base/mipmap-hdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_dev/mipmap-mdpi/app_icon.png b/app/theme/brave/android/res_brave_dev_base/mipmap-mdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_dev/mipmap-mdpi/app_icon.png rename to app/theme/brave/android/res_brave_dev_base/mipmap-mdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_dev/mipmap-xhdpi/app_icon.png b/app/theme/brave/android/res_brave_dev_base/mipmap-xhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_dev/mipmap-xhdpi/app_icon.png rename to app/theme/brave/android/res_brave_dev_base/mipmap-xhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_dev/mipmap-xxhdpi/app_icon.png b/app/theme/brave/android/res_brave_dev_base/mipmap-xxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_dev/mipmap-xxhdpi/app_icon.png rename to app/theme/brave/android/res_brave_dev_base/mipmap-xxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_dev/mipmap-xxxhdpi/app_icon.png b/app/theme/brave/android/res_brave_dev_base/mipmap-xxxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_dev/mipmap-xxxhdpi/app_icon.png rename to app/theme/brave/android/res_brave_dev_base/mipmap-xxxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_dev/values/channel_constants.xml b/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml similarity index 100% rename from app/theme/brave/android/res_brave_dev/values/channel_constants.xml rename to app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml diff --git a/app/theme/brave/android/res_brave_nightly/mipmap-hdpi/app_icon.png b/app/theme/brave/android/res_brave_nightly_base/mipmap-hdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_nightly/mipmap-hdpi/app_icon.png rename to app/theme/brave/android/res_brave_nightly_base/mipmap-hdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_nightly/mipmap-mdpi/app_icon.png b/app/theme/brave/android/res_brave_nightly_base/mipmap-mdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_nightly/mipmap-mdpi/app_icon.png rename to app/theme/brave/android/res_brave_nightly_base/mipmap-mdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_nightly/mipmap-xhdpi/app_icon.png b/app/theme/brave/android/res_brave_nightly_base/mipmap-xhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_nightly/mipmap-xhdpi/app_icon.png rename to app/theme/brave/android/res_brave_nightly_base/mipmap-xhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_nightly/mipmap-xxhdpi/app_icon.png b/app/theme/brave/android/res_brave_nightly_base/mipmap-xxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_nightly/mipmap-xxhdpi/app_icon.png rename to app/theme/brave/android/res_brave_nightly_base/mipmap-xxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_nightly/mipmap-xxxhdpi/app_icon.png b/app/theme/brave/android/res_brave_nightly_base/mipmap-xxxhdpi/app_icon.png similarity index 100% rename from app/theme/brave/android/res_brave_nightly/mipmap-xxxhdpi/app_icon.png rename to app/theme/brave/android/res_brave_nightly_base/mipmap-xxxhdpi/app_icon.png diff --git a/app/theme/brave/android/res_brave_nightly/values/channel_constants.xml b/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml similarity index 100% rename from app/theme/brave/android/res_brave_nightly/values/channel_constants.xml rename to app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml diff --git a/app/theme/brave/android/values/channel_constants.xml b/app/theme/brave/android/values/channel_constants.xml new file mode 100644 index 000000000000..bf3e867eaa07 --- /dev/null +++ b/app/theme/brave/android/values/channel_constants.xml @@ -0,0 +1,11 @@ + + + + + + Brave - Debug + Brave bookmarks + Brave search + diff --git a/build/commands/lib/util.js b/build/commands/lib/util.js index 5cc60c993b28..def26b9e886b 100755 --- a/build/commands/lib/util.js +++ b/build/commands/lib/util.js @@ -334,6 +334,8 @@ const util = { const androidIconSource = path.join(braveAppDir, 'theme', 'brave', 'android', androidIconSet) const androidIconDest = path.join(config.srcDir, 'chrome', 'android', 'java', 'res_chromium') + const androidIconBaseSource = path.join(braveAppDir, 'theme', 'brave', 'android', androidIconSet + '_base') + const androidIconBaseDest = path.join(config.srcDir, 'chrome', 'android', 'java', 'res_chromium_base') const androidResSource = path.join(config.braveCoreDir, 'android', 'java', 'res') const androidResDest = path.join(config.srcDir, 'chrome', 'android', 'java', 'res') const androidResTemplateSource = path.join(config.braveCoreDir, 'android', 'java', 'res_template') @@ -346,6 +348,7 @@ const util = { // Mapping for copying Brave's Android resource into chromium folder. const copyAndroidResourceMapping = { [androidIconSource]: [androidIconDest], + [androidIconBaseSource]: [androidIconBaseDest], [androidResSource]: [androidResDest], [androidResTemplateSource]: [androidResTemplateDest], [androidContentPublicResSource]: [androidContentPublicResDest], From 046a41d2b1674dee6bb3c28ee269da89cd5cff3d Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 28 Sep 2020 15:03:26 -0400 Subject: [PATCH 055/152] [Android] OverviewModeBehaviorSupplier is used via OneshotSupplier Chromium change: https://chromium.googlesource.com/chromium/src/+/f1cc25e4827732c787a2833610f414d74c74bb17 Add OneshotSupplier and convert OverviewModeBehaviorSupplier to use it This CL adds a OneshotSupplier interface and implementation. This allows for dependencies to express that they're only supplied once, and for dependent objects to avoid extra bookkeeping that handling changing dependencies requires, e.g. un-registering observers at destruction time. Bug: 1084528 --- .../browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index 35d0fd20220f..a7ee96377030 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -15,6 +15,7 @@ import androidx.appcompat.content.res.AppCompatResources; import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.OneshotSupplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.BraveFeatureList; @@ -40,7 +41,7 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context, MultiWindowModeStateDispatcher multiWindowModeStateDispatcher, TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView, AppMenuDelegate appMenuDelegate, - @Nullable ObservableSupplier overviewModeBehaviorSupplier, + OneshotSupplier overviewModeBehaviorSupplier, ObservableSupplier bookmarkBridgeSupplier) { super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector, toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier, From b7fa98d94a7826c3a857f5b255236aa7f92f7f73 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 28 Sep 2020 15:11:54 -0400 Subject: [PATCH 056/152] [Android] Added video iph card Chromium change: https://chromium.googlesource.com/chromium/src/+/1edd6aa74a4f0835f65483d27929717eaadff0b9 Video IPH : Added video iph card This CL adds: 1 - VideoIPHCreator that takes a ViewStub and inflates into an IPH 2 - A manager class on NTP to manage showing various video tutorial IPHs 3 - Added IPH features for search and download 4 - Moved VideoTutorialServiceFactory package to upper level TODO: - The IPH layout isn't upto spec. Needs one more pass. - The IPH configs aren't fully correct. Needs one more pass. I added them here for the sake of review clarity and completeness. Bug: 1117147 --- android/java/res/layout/new_tab_page_layout.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/android/java/res/layout/new_tab_page_layout.xml b/android/java/res/layout/new_tab_page_layout.xml index 9c13e956a7a8..914c11e8e40d 100644 --- a/android/java/res/layout/new_tab_page_layout.xml +++ b/android/java/res/layout/new_tab_page_layout.xml @@ -102,6 +102,15 @@ android:layout_marginTop="16dp" android:visibility="gone"/> + + + Date: Mon, 28 Sep 2020 16:20:30 -0400 Subject: [PATCH 057/152] [Android] kTranslateUI feature renamed to kTranslate Chromium change: https://chromium.googlesource.com/chromium/src/+/d2d8f27f33709d0b8bcee33aafdbf71596d26d68 Rename kTranslateUI feature to kTranslate. New name for feature is more accurate, as it is used to completely disable Translate and is not UI specific. Bug: 770776 --- app/brave_main_delegate.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index eb17eaedc992..2bd169767e7a 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -245,7 +245,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { safe_browsing::kEnhancedProtection.name, #if defined(OS_ANDROID) feed::kInterestFeedContentSuggestions.name, - translate::kTranslateUI.name, + translate::kTranslate.name, offline_pages::kPrefetchingOfflinePagesFeature.name, #endif }; From 6409a6374311d5b381e516027e039e7da6c87913 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 28 Sep 2020 13:40:00 -0400 Subject: [PATCH 058/152] [Android] Move BottomToolbar code to brave-core (stage 2) Code clean up Chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- android/brave_java_sources.gni | 5 +- .../BraveTabbedAppMenuPropertiesDelegate.java | 4 +- .../document/BraveLauncherActivity.java | 4 +- .../settings/AppearancePreferences.java | 6 +- .../toolbar/bottom/BookmarksButton.java | 7 +- ...ottomTabSwitcherActionMenuCoordinator.java | 7 +- ...n.java => BottomToolbarConfiguration.java} | 2 +- .../bottom/BottomToolbarCoordinator.java | 154 +++++++++++-- .../bottom/BottomToolbarNewTabButton.java | 7 +- .../bottom/BottomToolbarVariationManager.java | 19 +- .../bottom/BraveBottomToolbarCoordinator.java | 203 ------------------ ...eBrowsingModeBottomToolbarCoordinator.java | 100 --------- .../bottom/BraveSearchAccelerator.java | 20 -- .../BrowsingModeBottomToolbarCoordinator.java | 56 ++++- ...BrowsingModeBottomToolbarLinearLayout.java | 7 +- .../BrowsingModeBottomToolbarMediator.java | 7 +- .../BrowsingModeBottomToolbarModel.java | 7 +- .../BrowsingModeBottomToolbarViewBinder.java | 7 +- .../toolbar/bottom/SearchAccelerator.java | 10 +- .../browser/toolbar/bottom/ShareButton.java | 7 +- .../TabSwitcherBottomToolbarCoordinator.java | 7 +- .../TabSwitcherBottomToolbarMediator.java | 7 +- .../bottom/TabSwitcherBottomToolbarModel.java | 7 +- .../TabSwitcherBottomToolbarViewBinder.java | 7 +- .../res/layout/bottom_toolbar_browsing.xml | 2 +- 25 files changed, 266 insertions(+), 403 deletions(-) rename android/java/org/chromium/chrome/browser/toolbar/bottom/{BraveBottomToolbarConfiguration.java => BottomToolbarConfiguration.java} (98%) delete mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java delete mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java delete mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index c62f0d291aa9..04db61511c99 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -151,10 +151,7 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java", - "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java", - "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java", - "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java", - "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java", diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index a7ee96377030..dc2fcbd7c930 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -29,7 +29,7 @@ import org.chromium.chrome.browser.tabbed_mode.TabbedAppMenuPropertiesDelegate; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.toolbar.ToolbarManager; -import org.chromium.chrome.browser.toolbar.bottom.BraveBottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler; @@ -115,7 +115,7 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) { // Hide bookmark button if bottom toolbar is enabled ImageButton bookmarkButton = view.findViewById(R.id.bookmark_this_page_id); - if (bookmarkButton != null && BraveBottomToolbarConfiguration.isBottomToolbarEnabled()) { + if (bookmarkButton != null && BottomToolbarConfiguration.isBottomToolbarEnabled()) { bookmarkButton.setVisibility(View.GONE); } diff --git a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java index 6108592d9c26..941189052763 100644 --- a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java +++ b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java @@ -10,7 +10,7 @@ import org.chromium.chrome.browser.BraveHelper; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.toolbar.bottom.BraveBottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; /** * Base class for ChromeLauncherActivity @@ -23,7 +23,7 @@ public void onCreate(Bundle savedInstanceState) { // Disable key checker to avoid asserts on Brave keys in debug SharedPreferencesManager.getInstance().disableKeyCheckerForTesting(); - BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + BottomToolbarConfiguration.isBottomToolbarEnabled(); BraveHelper.DisableFREDRP(); } } diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java index 50c8470a0d75..087588b264b1 100644 --- a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java @@ -22,7 +22,7 @@ import org.chromium.chrome.browser.night_mode.NightModeUtils; import org.chromium.chrome.browser.preferences.BravePreferenceKeys; import org.chromium.chrome.browser.settings.BravePreferenceFragment; -import org.chromium.chrome.browser.toolbar.bottom.BraveBottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.ui.base.DeviceFormFactor; @@ -90,7 +90,7 @@ public void onActivityCreated(Bundle savedInstanceState) { ContextUtils.getApplicationContext()); ((ChromeSwitchPreference) enableBottomToolbar) .setChecked(!isTablet - && BraveBottomToolbarConfiguration.isBottomToolbarEnabled()); + && BottomToolbarConfiguration.isBottomToolbarEnabled()); } } @@ -116,7 +116,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); if (BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY.equals(key)) { SharedPreferences prefs = ContextUtils.getAppSharedPreferences(); - Boolean originalStatus = BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + Boolean originalStatus = BottomToolbarConfiguration.isBottomToolbarEnabled(); prefs.edit() .putBoolean(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, !originalStatus) diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java index 4268889e1fa4..f8ae4db05419 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java @@ -1,6 +1,7 @@ -// Copyright 2019 The Brave Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java index 8f4ee18048dc..f10faae96177 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java @@ -1,6 +1,7 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java similarity index 98% rename from android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java rename to android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java index 5d33f455fbc1..37261d3dbc45 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java @@ -18,7 +18,7 @@ import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; import org.chromium.ui.base.DeviceFormFactor; -public class BraveBottomToolbarConfiguration { +public class BottomToolbarConfiguration { private static final int SMALL_SCREEN_WIDTH = 360; private static final int SMALL_SCREEN_HEIGHT = 640; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java index 431f4ab37dd3..0ae734a1120c 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -1,9 +1,12 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; +import android.content.Context; +import android.content.res.Resources; import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; @@ -11,6 +14,7 @@ import android.view.ViewStub; import org.chromium.base.Callback; +import org.chromium.base.ContextUtils; import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; @@ -19,26 +23,34 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.OverviewModeObserver; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; +import org.chromium.chrome.browser.homepage.HomepageManager; import org.chromium.chrome.browser.omnibox.LocationBar; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; +import org.chromium.chrome.browser.toolbar.HomeButton; import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.toolbar.bottom.BookmarksButton; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarNewTabButton; +import org.chromium.chrome.browser.toolbar.bottom.SearchAccelerator; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; +import org.chromium.chrome.browser.util.TabUtils; import org.chromium.components.feature_engagement.EventConstants; import org.chromium.components.feature_engagement.Tracker; +import org.chromium.ui.widget.Toast; /** * The root coordinator for the bottom toolbar. It has two sub-components: the browsing mode bottom * toolbar and the tab switcher mode bottom toolbar. */ -class BottomToolbarCoordinator { +class BottomToolbarCoordinator implements View.OnLongClickListener { /** The browsing mode bottom toolbar component */ protected final BrowsingModeBottomToolbarCoordinator mBrowsingModeCoordinator; @@ -66,6 +78,15 @@ class BottomToolbarCoordinator { private ObservableSupplier mOverviewModeBehaviorSupplier; private Callback mOverviewModeBehaviorSupplierObserver; private AppMenuButtonHelper mMenuButtonHelper; + private BottomControlsMediator mBottomControlsMediator; + private Runnable mOriginalHomeButtonRunnable; + private final ScrollingBottomViewResourceFrameLayout mScrollingBottomView; + private HomeButton mHomeButton; + private BookmarksButton mBookmarksButton; + private SearchAccelerator mSearchAccelerator; + private BottomToolbarNewTabButton mNewTabButton; + + private final Context mContext = ContextUtils.getApplicationContext(); /** * Build the coordinator that manages the bottom toolbar. @@ -81,13 +102,15 @@ class BottomToolbarCoordinator { * @param overviewModeBehaviorSupplier Supplier for the overview mode manager. * @param menuButtonHelperSupplier */ - BottomToolbarCoordinator(ViewStub stub, ActivityTabProvider tabProvider, + BottomToolbarCoordinator(ScrollingBottomViewResourceFrameLayout scrollingBottomView, + ViewStub stub, ActivityTabProvider tabProvider, OnLongClickListener tabsSwitcherLongClickListner, ThemeColorProvider themeColorProvider, ObservableSupplier shareDelegateSupplier, Supplier showStartSurfaceCallable, Runnable openHomepageAction, Callback setUrlBarFocusAction, ObservableSupplier overviewModeBehaviorSupplier, - ObservableSupplier menuButtonHelperSupplier) { + ObservableSupplier menuButtonHelperSupplier, + BottomControlsMediator bottomControlsMediator) { View root = stub.inflate(); mOverviewModeBehaviorSupplierObserver = this::setOverviewModeBehavior; @@ -108,7 +131,7 @@ class BottomToolbarCoordinator { setUrlBarFocusAction.onResult(LocationBar.OmniboxFocusReason.ACCELERATOR_TAP); }; - mBrowsingModeCoordinator = new BraveBrowsingModeBottomToolbarCoordinator(root, tabProvider, + mBrowsingModeCoordinator = new BrowsingModeBottomToolbarCoordinator(root, tabProvider, homeButtonListener, searchAcceleratorListener, mShareButtonListenerSupplier, tabsSwitcherLongClickListner, mOverviewModeBehaviorSupplier); @@ -126,6 +149,9 @@ class BottomToolbarCoordinator { mMenuButtonHelper = menuButtonHelper; } }); + mBottomControlsMediator = bottomControlsMediator; + mOriginalHomeButtonRunnable = openHomepageAction; + mScrollingBottomView = scrollingBottomView; } /** @@ -158,7 +184,6 @@ void initializeWithNative(OnClickListener tabSwitcherListener, closeAllTabsAction.run(); }; - mBrowsingModeCoordinator.initializeWithNative(newTabClickListener, tabSwitcherListener, mMenuButtonHelper, tabCountProvider, mThemeColorProvider, incognitoStateProvider); mTabSwitcherModeCoordinator = new TabSwitcherBottomToolbarCoordinator(mTabSwitcherModeStub, @@ -172,31 +197,104 @@ void initializeWithNative(OnClickListener tabSwitcherListener, mOverviewModeObserver = new EmptyOverviewModeObserver() { @Override public void onOverviewModeStartedShowing(boolean showToolbar) { - mBrowsingModeCoordinator.getSearchAccelerator().setEnabled(false); + mBottomControlsMediator.setCompositedViewVisibile(false); + BrowsingModeBottomToolbarCoordinator browsingModeCoordinator = + (BrowsingModeBottomToolbarCoordinator) mBrowsingModeCoordinator; + browsingModeCoordinator.getSearchAccelerator().setVisibility(View.GONE); if (BottomToolbarVariationManager.isShareButtonOnBottom()) { - mBrowsingModeCoordinator.getShareButton().setEnabled(false); + browsingModeCoordinator.getShareButton().setVisibility(View.GONE); } if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { - mBrowsingModeCoordinator.getHomeButton().setEnabled(false); + browsingModeCoordinator.getHomeButton().setVisibility(View.INVISIBLE); + } + if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { + browsingModeCoordinator.getBookmarkButton().setVisibility(View.INVISIBLE); + } + if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { + browsingModeCoordinator.getTabSwitcherButtonView().setVisibility( + View.INVISIBLE); + } + if (BottomToolbarVariationManager.isNewTabButtonOnBottom()) { + browsingModeCoordinator.getNewTabButtonParent().setVisibility(View.VISIBLE); } } @Override public void onOverviewModeStartedHiding( boolean showToolbar, boolean delayAnimation) { - mBrowsingModeCoordinator.getSearchAccelerator().setEnabled(true); + BrowsingModeBottomToolbarCoordinator browsingModeCoordinator = + (BrowsingModeBottomToolbarCoordinator) mBrowsingModeCoordinator; + browsingModeCoordinator.getSearchAccelerator().setVisibility(View.VISIBLE); if (BottomToolbarVariationManager.isShareButtonOnBottom()) { - mBrowsingModeCoordinator.getShareButton().updateButtonEnabledState( + browsingModeCoordinator.getShareButton().setVisibility(View.VISIBLE); + browsingModeCoordinator.getShareButton().updateButtonEnabledState( mTabProvider.get()); } if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { - mBrowsingModeCoordinator.getHomeButton().updateButtonEnabledState( + browsingModeCoordinator.getHomeButton().setVisibility(View.VISIBLE); + browsingModeCoordinator.getHomeButton().updateButtonEnabledState( mTabProvider.get()); } + if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { + browsingModeCoordinator.getBookmarkButton().setVisibility(View.VISIBLE); + } + if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { + browsingModeCoordinator.getTabSwitcherButtonView().setVisibility( + View.VISIBLE); + } + if (BottomToolbarVariationManager.isNewTabButtonOnBottom()) { + browsingModeCoordinator.getNewTabButtonParent().setVisibility(View.GONE); + } + } + + @Override + public void onOverviewModeFinishedHiding() { + mBottomControlsMediator.setCompositedViewVisibile(true); } }; mOverviewModeBehaviorSupplier.addObserver(mOverviewModeBehaviorSupplierObserver); } + + View root = (View) topToolbarRoot.getParent(); + View bottomToolbarBrowsing = root.findViewById(R.id.bottom_toolbar_browsing); + View bottomToolbarButtons = root.findViewById(R.id.bottom_toolbar_buttons); + + mHomeButton = bottomToolbarBrowsing.findViewById(R.id.bottom_home_button); + if (mHomeButton != null) { + mHomeButton.setOnLongClickListener(this); + + final OnClickListener homeButtonListener = v -> { + final boolean isHomepageEnabled = HomepageManager.isHomepageEnabled(); + if (isHomepageEnabled) { + mOriginalHomeButtonRunnable.run(); + } else { + newTabClickListener.onClick(v); + } + }; + + mHomeButton.setOnClickListener(homeButtonListener); + } + + mBookmarksButton = bottomToolbarBrowsing.findViewById(R.id.bottom_bookmark_button); + if (mBookmarksButton != null) { + mBookmarksButton.setOnLongClickListener(this); + } + + mSearchAccelerator = bottomToolbarBrowsing.findViewById(R.id.search_accelerator); + if (mSearchAccelerator != null) { + mSearchAccelerator.setOnLongClickListener(this); + } + + mNewTabButton = bottomToolbarButtons.findViewById(R.id.bottom_new_tab_button); + if (mNewTabButton != null) { + mNewTabButton.setOnLongClickListener(this); + } + + ChromeActivity activity = TabUtils.getChromeActivity(); + if (mScrollingBottomView != null && activity != null) { + mScrollingBottomView.setSwipeDetector( + activity.getCompositorViewHolder().getLayoutManager().getToolbarSwipeHandler()); + } } /** @@ -255,8 +353,34 @@ private void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { if (mBrowsingModeCoordinator != null) { - ((BraveBrowsingModeBottomToolbarCoordinator) mBrowsingModeCoordinator) + ((BrowsingModeBottomToolbarCoordinator) mBrowsingModeCoordinator) .updateBookmarkButton(isBookmarked, editingAllowed); } } + + @Override + public boolean onLongClick(View v) { + String description = ""; + Resources resources = mContext.getResources(); + + if (v == mHomeButton) { + // It is currently a new tab button when homepage is disabled. + if (!HomepageManager.isHomepageEnabled()) { + TabUtils.showTabPopupMenu(mContext, v); + return true; + } + + description = resources.getString(R.string.accessibility_toolbar_btn_home); + } else if (v == mBookmarksButton) { + description = resources.getString(R.string.accessibility_toolbar_btn_bookmark); + } else if (v == mSearchAccelerator) { + description = + resources.getString(R.string.accessibility_toolbar_btn_search_accelerator); + } else if (v == mNewTabButton) { + TabUtils.showTabPopupMenu(mContext, v); + return true; + } + + return Toast.showAnchoredToast(mContext, v, description); + } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java index a501280fc8a2..2f0416e60ff9 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java index 5445578d59ae..1a9bdf8e96db 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java @@ -1,6 +1,7 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; @@ -37,7 +38,7 @@ public static boolean isShareButtonOnBottom() { * in portrait mode in the current variation. */ public static boolean isNewTabButtonOnBottom() { - return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + return BottomToolbarConfiguration.isBottomToolbarEnabled(); } /** @@ -45,7 +46,7 @@ public static boolean isNewTabButtonOnBottom() { * in portrait mode in the current variation. */ public static boolean isMenuButtonOnBottom() { - return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + return BottomToolbarConfiguration.isBottomToolbarEnabled(); } /** @@ -53,7 +54,7 @@ public static boolean isMenuButtonOnBottom() { * in the current variation. */ public static boolean shouldBottomToolbarBeVisibleInOverviewMode() { - return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + return BottomToolbarConfiguration.isBottomToolbarEnabled(); } /** @@ -61,7 +62,7 @@ public static boolean shouldBottomToolbarBeVisibleInOverviewMode() { * in current variation. */ public static boolean isHomeButtonOnBottom() { - return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + return BottomToolbarConfiguration.isBottomToolbarEnabled(); } /** @@ -69,7 +70,7 @@ public static boolean isHomeButtonOnBottom() { * of portrait mode in current variation. */ public static boolean isTabSwitcherOnBottom() { - return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + return BottomToolbarConfiguration.isBottomToolbarEnabled(); } /** @@ -77,6 +78,6 @@ public static boolean isTabSwitcherOnBottom() { * of portrait mode in current variation. */ public static boolean isBookmarkButtonOnBottom() { - return BraveBottomToolbarConfiguration.isBottomToolbarEnabled(); + return BottomToolbarConfiguration.isBottomToolbarEnabled(); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java deleted file mode 100644 index 7a37226ddcb0..000000000000 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java +++ /dev/null @@ -1,203 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.toolbar.bottom; - -import android.content.Context; -import android.content.res.Resources; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnLongClickListener; -import android.view.ViewGroup; -import android.view.ViewStub; - -import org.chromium.base.Callback; -import org.chromium.base.ContextUtils; -import org.chromium.base.supplier.ObservableSupplier; -import org.chromium.base.supplier.Supplier; -import org.chromium.chrome.R; -import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.app.BraveActivity; -import org.chromium.chrome.browser.app.ChromeActivity; -import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; -import org.chromium.chrome.browser.homepage.HomepageManager; -import org.chromium.chrome.browser.share.ShareDelegate; -import org.chromium.chrome.browser.toolbar.HomeButton; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; -import org.chromium.chrome.browser.toolbar.TabCountProvider; -import org.chromium.chrome.browser.toolbar.bottom.BookmarksButton; -import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarNewTabButton; -import org.chromium.chrome.browser.toolbar.bottom.SearchAccelerator; -import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; -import org.chromium.chrome.browser.util.TabUtils; -import org.chromium.ui.widget.Toast; - -public class BraveBottomToolbarCoordinator - extends BottomToolbarCoordinator implements View.OnLongClickListener { - private HomeButton mHomeButton; - private BookmarksButton mBookmarksButton; - private SearchAccelerator mSearchAccelerator; - private BottomToolbarNewTabButton mNewTabButton; - private ActivityTabProvider mBraveTabProvider; - private Runnable mOriginalHomeButtonRunnable; - private final ScrollingBottomViewResourceFrameLayout rootView; - - private final Context mContext = ContextUtils.getApplicationContext(); - - BraveBottomToolbarCoordinator(ScrollingBottomViewResourceFrameLayout root, ViewStub stub, - ActivityTabProvider tabProvider, OnLongClickListener tabsSwitcherLongClickListner, - ThemeColorProvider themeColorProvider, - ObservableSupplier shareDelegateSupplier, - Supplier showStartSurfaceCallable, Runnable openHomepageAction, - Callback setUrlBarFocusAction, - ObservableSupplier overviewModeBehaviorSupplier, - ObservableSupplier menuButtonHelperSupplier) { - super(stub, tabProvider, tabsSwitcherLongClickListner, themeColorProvider, - shareDelegateSupplier, showStartSurfaceCallable, openHomepageAction, - setUrlBarFocusAction, overviewModeBehaviorSupplier, menuButtonHelperSupplier); - mBraveTabProvider = tabProvider; - mOriginalHomeButtonRunnable = openHomepageAction; - rootView = root; - } - - @Override - public boolean onLongClick(View v) { - String description = ""; - Resources resources = mContext.getResources(); - - if (v == mHomeButton) { - // It is currently a new tab button when homepage is disabled. - if (!HomepageManager.isHomepageEnabled()) { - TabUtils.showTabPopupMenu(mContext, v); - return true; - } - - description = resources.getString(R.string.accessibility_toolbar_btn_home); - } else if (v == mBookmarksButton) { - description = resources.getString(R.string.accessibility_toolbar_btn_bookmark); - } else if (v == mSearchAccelerator) { - description = - resources.getString(R.string.accessibility_toolbar_btn_search_accelerator); - } else if (v == mNewTabButton) { - TabUtils.showTabPopupMenu(mContext, v); - return true; - } - - return Toast.showAnchoredToast(mContext, v, description); - } - - @Override - void initializeWithNative(OnClickListener tabSwitcherListener, - OnClickListener newTabClickListener, TabCountProvider tabCountProvider, - IncognitoStateProvider incognitoStateProvider, ViewGroup topToolbarRoot, - Runnable closeAllTabsAction) { - super.initializeWithNative(tabSwitcherListener, newTabClickListener, tabCountProvider, - incognitoStateProvider, topToolbarRoot, closeAllTabsAction); - - View root = (View) topToolbarRoot.getParent(); - View bottom_toolbar_browsing = root.findViewById(R.id.bottom_toolbar_browsing); - View bottom_toolbar_buttons = root.findViewById(R.id.bottom_toolbar_buttons); - - mHomeButton = bottom_toolbar_browsing.findViewById(R.id.bottom_home_button); - if (mHomeButton != null) { - mHomeButton.setOnLongClickListener(this); - - final OnClickListener homeButtonListener = v -> { - final boolean isHomepageEnabled = HomepageManager.isHomepageEnabled(); - if (isHomepageEnabled) { - mOriginalHomeButtonRunnable.run(); - } else { - newTabClickListener.onClick(v); - } - }; - - mHomeButton.setOnClickListener(homeButtonListener); - } - - mBookmarksButton = bottom_toolbar_browsing.findViewById(R.id.bottom_bookmark_button); - if (mBookmarksButton != null) { - mBookmarksButton.setOnLongClickListener(this); - } - - mSearchAccelerator = bottom_toolbar_browsing.findViewById(R.id.search_accelerator); - if (mSearchAccelerator != null) { - mSearchAccelerator.setOnLongClickListener(this); - } - - mNewTabButton = bottom_toolbar_buttons.findViewById(R.id.bottom_new_tab_button); - if (mNewTabButton != null) { - mNewTabButton.setOnLongClickListener(this); - } - - if (mOverviewModeObserver != null) { - if (mOverviewModeBehavior != null) { - // We create new observer here so remove previous - mOverviewModeBehavior.removeOverviewModeObserver(mOverviewModeObserver); - } - mOverviewModeObserver = new EmptyOverviewModeObserver() { - @Override - public void onOverviewModeStartedShowing(boolean showToolbar) { - BraveBrowsingModeBottomToolbarCoordinator browsingModeCoordinator = - (BraveBrowsingModeBottomToolbarCoordinator)mBrowsingModeCoordinator; - browsingModeCoordinator.getSearchAccelerator().setVisibility(View.GONE); - if (BottomToolbarVariationManager.isShareButtonOnBottom()) { - browsingModeCoordinator.getShareButton().setVisibility(View.GONE); - } - if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { - browsingModeCoordinator.getHomeButton().setVisibility(View.INVISIBLE); - } - if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { - browsingModeCoordinator.getBookmarkButton().setVisibility(View.INVISIBLE); - } - if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { - browsingModeCoordinator.getTabSwitcherButtonView().setVisibility(View.INVISIBLE); - } - if (BottomToolbarVariationManager.isNewTabButtonOnBottom()) { - browsingModeCoordinator.getNewTabButtonParent().setVisibility(View.VISIBLE); - } - } - - @Override - public void onOverviewModeStartedHiding( - boolean showToolbar, boolean delayAnimation) { - BraveBrowsingModeBottomToolbarCoordinator browsingModeCoordinator = - (BraveBrowsingModeBottomToolbarCoordinator)mBrowsingModeCoordinator; - browsingModeCoordinator.getSearchAccelerator().setVisibility(View.VISIBLE); - if (BottomToolbarVariationManager.isShareButtonOnBottom()) { - browsingModeCoordinator.getShareButton().setVisibility(View.VISIBLE); - browsingModeCoordinator.getShareButton().updateButtonEnabledState( - mBraveTabProvider.get()); - } - if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { - browsingModeCoordinator.getHomeButton().setVisibility(View.VISIBLE); - browsingModeCoordinator.getHomeButton().updateButtonEnabledState( - mBraveTabProvider.get()); - } - if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { - browsingModeCoordinator.getBookmarkButton().setVisibility(View.VISIBLE); - } - if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { - browsingModeCoordinator.getTabSwitcherButtonView().setVisibility(View.VISIBLE); - } - if (BottomToolbarVariationManager.isNewTabButtonOnBottom()) { - browsingModeCoordinator.getNewTabButtonParent().setVisibility(View.GONE); - } - } - }; - if (mOverviewModeBehavior != null) { - mOverviewModeBehavior.addOverviewModeObserver(mOverviewModeObserver); - } - } - - BraveActivity braveActivity = BraveActivity.getBraveActivity(); - if (rootView != null && braveActivity != null) { - rootView.setSwipeDetector(braveActivity.getCompositorViewHolder() - .getLayoutManager() - .getToolbarSwipeHandler()); - } - } -} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java deleted file mode 100644 index 8f6af7808af9..000000000000 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java +++ /dev/null @@ -1,100 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.toolbar.bottom; - -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnLongClickListener; - -import org.chromium.base.supplier.ObservableSupplier; -import org.chromium.chrome.R; -import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.app.BraveActivity; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; -import org.chromium.chrome.browser.tab.TabImpl; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; -import org.chromium.chrome.browser.toolbar.TabCountProvider; -import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; -import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; - -/** - * Brave's extension to BrowsingModeBottomToolbarCoordinator. - */ -public class BraveBrowsingModeBottomToolbarCoordinator - extends BrowsingModeBottomToolbarCoordinator { - private final BrowsingModeBottomToolbarLinearLayout mBraveToolbarRoot; - private final ActivityTabProvider mBraveTabProvider; - private final BookmarksButton mBookmarkButton; - private final MenuButton mMenuButton; - private final BottomToolbarNewTabButton mBraveNewTabButton; - - BraveBrowsingModeBottomToolbarCoordinator(View root, ActivityTabProvider tabProvider, - OnClickListener homeButtonListener, OnClickListener searchAcceleratorListener, - ObservableSupplier shareButtonListenerSupplier, - OnLongClickListener tabSwitcherLongClickListener, - ObservableSupplier overviewModeBehaviorSupplier) { - super(root, tabProvider, homeButtonListener, searchAcceleratorListener, - shareButtonListenerSupplier, tabSwitcherLongClickListener, - overviewModeBehaviorSupplier); - mBraveTabProvider = tabProvider; - mBraveToolbarRoot = root.findViewById(R.id.bottom_toolbar_browsing); - mBraveNewTabButton = mBraveToolbarRoot.findViewById(R.id.bottom_new_tab_button); - mBookmarkButton = mBraveToolbarRoot.findViewById(R.id.bottom_bookmark_button); - if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { - mBookmarkButton.setVisibility(View.VISIBLE); - getNewTabButtonParent().setVisibility(View.GONE); - OnClickListener bookmarkClickHandler = v -> { - TabImpl tab = (TabImpl) mBraveTabProvider.get(); - BraveActivity activity = BraveActivity.getBraveActivity(); - if (tab == null || activity == null) { - assert false; - return; - } - activity.addOrEditBookmark(tab); - }; - mBookmarkButton.setOnClickListener(bookmarkClickHandler); - } - mMenuButton = mBraveToolbarRoot.findViewById(R.id.menu_button_wrapper); - if (!BottomToolbarVariationManager.isMenuButtonOnBottom()) { - mMenuButton.setVisibility(View.GONE); - } - } - - @Override - public void initializeWithNative(OnClickListener newTabListener, - OnClickListener tabSwitcherListener, AppMenuButtonHelper menuButtonHelper, - TabCountProvider tabCountProvider, ThemeColorProvider themeColorProvider, - IncognitoStateProvider incognitoStateProvider) { - super.initializeWithNative(newTabListener, tabSwitcherListener, menuButtonHelper, - tabCountProvider, themeColorProvider, incognitoStateProvider); - mBookmarkButton.setThemeColorProvider(themeColorProvider); - - mMenuButton.setAppMenuButtonHelper(menuButtonHelper); - mMenuButton.setThemeColorProvider(themeColorProvider); - } - - public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { - if (mBookmarkButton != null) { - mBookmarkButton.updateBookmarkButton(isBookmarked, editingAllowed); - } - } - - @Override - public void destroy() { - super.destroy(); - mBookmarkButton.destroy(); - mMenuButton.destroy(); - } - - View getNewTabButtonParent() { - return (View)mBraveNewTabButton.getParent(); - } - - BookmarksButton getBookmarkButton() { - return mBookmarkButton; - } -} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java deleted file mode 100644 index b097c05b5a88..000000000000 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.toolbar.bottom; - -import android.content.Context; -import android.graphics.Color; -import android.util.AttributeSet; - -/** - * The Brave's search accelerator extension. - */ -class BraveSearchAccelerator extends SearchAccelerator { - public BraveSearchAccelerator(Context context, AttributeSet attrs) { - super(context, attrs); - setBackgroundColor(Color.TRANSPARENT); - } -} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index 2ffa1c03d947..2e7643b7e04c 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; @@ -29,6 +30,9 @@ import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.components.feature_engagement.Tracker; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; +import org.chromium.chrome.browser.tab.TabImpl; +import org.chromium.chrome.browser.app.BraveActivity; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; /** * The coordinator for the browsing mode bottom toolbar. This class has two primary components, @@ -74,6 +78,8 @@ public class BrowsingModeBottomToolbarCoordinator { private Callback mOverviewModeBehaviorSupplierObserver; private ObservableSupplier mOverviewModeBehaviorSupplier; + private final BookmarksButton mBookmarkButton; + private final MenuButton mMenuButton; /** * Build the coordinator that manages the browsing mode bottom toolbar. @@ -137,6 +143,27 @@ public class BrowsingModeBottomToolbarCoordinator { mOverviewModeBehaviorSupplier = overviewModeBehaviorSupplier; mOverviewModeBehaviorSupplierObserver = this::setOverviewModeBehavior; mOverviewModeBehaviorSupplier.addObserver(mOverviewModeBehaviorSupplierObserver); + + mBookmarkButton = mToolbarRoot.findViewById(R.id.bottom_bookmark_button); + if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { + mBookmarkButton.setVisibility(View.VISIBLE); + getNewTabButtonParent().setVisibility(View.GONE); + OnClickListener bookmarkClickHandler = v -> { + TabImpl tab = (TabImpl) mTabProvider.get(); + BraveActivity activity = BraveActivity.getBraveActivity(); + if (tab == null || activity == null) { + assert false; + return; + } + activity.addOrEditBookmark(tab); + }; + mBookmarkButton.setOnClickListener(bookmarkClickHandler); + } + + mMenuButton = mToolbarRoot.findViewById(R.id.menu_button_wrapper); + if (!BottomToolbarVariationManager.isMenuButtonOnBottom()) { + mMenuButton.setVisibility(View.GONE); + } } /** @@ -182,6 +209,11 @@ void initializeWithNative(OnClickListener newTabListener, OnClickListener tabSwi mTabSwitcherButtonCoordinator.setThemeColorProvider(themeColorProvider); mTabSwitcherButtonCoordinator.setTabCountProvider(tabCountProvider); } + + mBookmarkButton.setThemeColorProvider(themeColorProvider); + + mMenuButton.setAppMenuButtonHelper(menuButtonHelper); + mMenuButton.setThemeColorProvider(themeColorProvider); } private void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { @@ -192,7 +224,7 @@ private void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) // disabled based on the overview state. if (ReturnToChromeExperimentsUtil.shouldShowStartSurfaceAsTheHomePage()) { mShareButton.setOverviewModeBehavior(overviewModeBehavior); - mTabSwitcherButtonCoordinator.setOverviewModeBehavior(overviewModeBehavior); + // mTabSwitcherButtonCoordinator.setOverviewModeBehavior(overviewModeBehavior); mHomeButton.setOverviewModeBehavior(overviewModeBehavior); } } @@ -257,5 +289,21 @@ public void destroy() { mShareButton.destroy(); mSearchAccelerator.destroy(); mTabSwitcherButtonCoordinator.destroy(); + mBookmarkButton.destroy(); + mMenuButton.destroy(); + } + + public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { + if (mBookmarkButton != null) { + mBookmarkButton.updateBookmarkButton(isBookmarked, editingAllowed); + } + } + + View getNewTabButtonParent() { + return (View)mNewTabButton.getParent(); + } + + BookmarksButton getBookmarkButton() { + return mBookmarkButton; } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java index cf6fb2bd13f1..742d9637d8db 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java index 3daa61ac1e59..f5da6fe240f6 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java index 0d866623f65c..b31a35b3214d 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java index 74c1f61d0cc2..933ad78e1822 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java index e4bacfa1192b..35b9ba416658 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java @@ -1,12 +1,14 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; +import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.util.AttributeSet; @@ -46,6 +48,8 @@ public SearchAccelerator(Context context, AttributeSet attrs) { mBackground = ApiCompatibilityUtils.getDrawable(mResources, R.drawable.ntp_search_box); mBackground.mutate(); setBackground(mBackground); + + setBackgroundColor(Color.TRANSPARENT); } void setThemeColorProvider(ThemeColorProvider themeColorProvider) { diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java index b54faf1afa0f..8367f6549c2d 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java index 28aaa3ba8f78..979d9b7b9de8 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java index fdbbd0e497c1..9575ae284ee2 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java index 03a43a3314c5..f6b1658d9ac6 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java index c262a5386e1c..b306cd2b3901 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java @@ -1,6 +1,7 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.toolbar.bottom; diff --git a/android/java/res/layout/bottom_toolbar_browsing.xml b/android/java/res/layout/bottom_toolbar_browsing.xml index 97b06f328597..65e17d4ad4ff 100644 --- a/android/java/res/layout/bottom_toolbar_browsing.xml +++ b/android/java/res/layout/bottom_toolbar_browsing.xml @@ -41,7 +41,7 @@ - Date: Tue, 29 Sep 2020 16:09:39 -0400 Subject: [PATCH 059/152] [Android] Changes for menu on bottom toolbar Chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- android/brave_java_sources.gni | 2 + android/java/apk_for_test.flags | 4 ++ .../chromium/chrome/browser/BytecodeTest.java | 3 + .../browser/ui/appmenu/BraveAppMenu.java | 55 +++++++++++++++++++ build/android/bytecode/BUILD.gn | 1 + build/android/bytecode/bytecode_rewriter.gni | 3 +- .../bytecode/BraveAppMenuClassAdapter.java | 19 +++++++ .../org/brave/bytecode/BraveClassAdapter.java | 1 + ...nu_button-MenuButtonCoordinator.java.patch | 18 ------ ...ui-android-appmenu-internal-BUILD.gn.patch | 12 ++++ ...rome-browser-ui-appmenu-AppMenu.java.patch | 12 ++++ 11 files changed, 111 insertions(+), 19 deletions(-) create mode 100644 browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveAppMenuClassAdapter.java delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch create mode 100644 patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch create mode 100644 patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 04db61511c99..2ca9d94ebac5 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -217,5 +217,7 @@ if (enable_brave_sync) { brave_components_browser_ui_site_settings_android_java = [ "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java" ] +brave_browser_ui_android_appmenu_internal_sources = [ "//brave/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java" ] + brave_java_base_sources = [ "//brave/android/java/org/chromium/base/BraveCommandLineInitUtil.java" ] diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 03b577a33292..ae44c96e47e3 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -73,3 +73,7 @@ -keep class org.chromium.base.CommandLineInitUtil { *** initCommandLine(...); } + +-keep class org.chromium.chrome.browser.ui.appmenu.AppMenu { + *** getPopupPosition(...); +} diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 7391a16c2280..f8a2867cd2a1 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -40,6 +40,7 @@ public void testClassesExist() throws Exception { Assert.assertTrue(classExists( "org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter")); Assert.assertTrue(classExists("org/chromium/base/CommandLineInitUtil")); + Assert.assertTrue(classExists("org/chromium/chrome/browser/ui/appmenu/AppMenu")); } @Test @@ -67,6 +68,8 @@ public void testMethodsExist() throws Exception { "org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter", "sortAndFilterUnnecessaryTemplateUrl")); Assert.assertTrue(methodExists("org/chromium/base/CommandLineInitUtil", "initCommandLine")); + Assert.assertTrue( + methodExists("org/chromium/chrome/browser/ui/appmenu/AppMenu", "getPopupPosition")); } @Test diff --git a/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java b/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java new file mode 100644 index 000000000000..691424ba6327 --- /dev/null +++ b/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java @@ -0,0 +1,55 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.ui.appmenu; + +import android.content.SharedPreferences; +import android.graphics.Rect; +import android.view.View; + +import org.chromium.base.ContextUtils; +import org.chromium.chrome.browser.ui.appmenu.internal.R; +import org.chromium.ui.base.DeviceFormFactor; + +class BraveAppMenu { + private static final String BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY = + "brave_bottom_toolbar_enabled_key"; + private static final String BRAVE_BOTTOM_TOOLBAR_SET_KEY = "brave_bottom_toolbar_enabled"; + + public static int[] getPopupPosition(int[] tempLocation, boolean isByPermanentButton, + int negativeSoftwareVerticalOffset, int negativeVerticalOffsetNotTopAnchored, + int screenRotation, Rect appRect, Rect padding, View anchorView, int popupWidth, + int popupHeight, int viewLayoutDirection) { + int[] position = AppMenu.getPopupPosition(tempLocation, isByPermanentButton, + negativeSoftwareVerticalOffset, negativeVerticalOffsetNotTopAnchored, + screenRotation, appRect, padding, anchorView, popupWidth, popupHeight, + viewLayoutDirection); + if (isBottomToolbarEnabled()) { + anchorView.getLocationOnScreen(tempLocation); + int anchorViewLocationOnScreenY = tempLocation[1]; + position[1] += appRect.bottom - anchorViewLocationOnScreenY - popupHeight; + position[1] -= negativeVerticalOffsetNotTopAnchored; + position[1] += padding.bottom; + } + return position; + } + + public static int getAnimationStyle() { + return isBottomToolbarEnabled() ? R.style.OverflowMenuAnimBottom : R.style.OverflowMenuAnim; + } + + private static boolean isBottomToolbarEnabled() { + if (DeviceFormFactor.isNonMultiDisplayContextOnTablet( + ContextUtils.getApplicationContext())) { + return false; + } + SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences(); + if (sharedPreferences.getBoolean(BRAVE_BOTTOM_TOOLBAR_SET_KEY, false)) { + return sharedPreferences.getBoolean(BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, true); + } + assert (false); + return false; + } +} diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn index e7975c735b89..7d761002b18b 100644 --- a/build/android/bytecode/BUILD.gn +++ b/build/android/bytecode/BUILD.gn @@ -11,6 +11,7 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAndroidSyncSettingsClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAppMenuClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveCommandLineInitUtilClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java", diff --git a/build/android/bytecode/bytecode_rewriter.gni b/build/android/bytecode/bytecode_rewriter.gni index 7fc8784bc89b..1b8c30b01c5c 100644 --- a/build/android/bytecode/bytecode_rewriter.gni +++ b/build/android/bytecode/bytecode_rewriter.gni @@ -2,8 +2,9 @@ import("//build/config/python.gni") brave_bytecode_jars = [ "obj/chrome/android/chrome_java.javac.jar", - "obj/components/sync/android/sync_java.javac.jar", + "obj/chrome/browser/ui/android/appmenu/internal/java.javac.jar", "obj/components/external_intents/android/java.javac.jar", + "obj/components/sync/android/sync_java.javac.jar", ] template("brave_bytecode_rewriter") { diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveAppMenuClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveAppMenuClassAdapter.java new file mode 100644 index 000000000000..8f5c4280dc0e --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveAppMenuClassAdapter.java @@ -0,0 +1,19 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveAppMenuClassAdapter extends BraveClassVisitor { + static String sAppMenuClassName = "org/chromium/chrome/browser/ui/appmenu/AppMenu"; + + static String sBraveAppMenuClassName = "org/chromium/chrome/browser/ui/appmenu/BraveAppMenu"; + + public BraveAppMenuClassAdapter(ClassVisitor visitor) { + super(visitor); + changeMethodOwner(sAppMenuClassName, "getPopupPosition", sBraveAppMenuClassName); + } +} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java index aa769da8bb46..153deeeea6b3 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java @@ -20,6 +20,7 @@ public static ClassVisitor createAdapter(ClassVisitor chain) { chain = new BraveEditUrlSuggestionProcessorClassAdapter(chain); chain = new BraveSearchEngineAdapterClassAdapter(chain); chain = new BraveCommandLineInitUtilClassAdapter(chain); + chain = new BraveAppMenuClassAdapter(chain); return chain; } } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch deleted file mode 100644 index 24bbd1643c7d..000000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java -index 3e2ce3901540e00d9158be7e3304c5bdfdd1cc51..25f3125c019907ea246e4cb2a1e39a40198faf80 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java -@@ -292,6 +292,7 @@ public class MenuButtonCoordinator implements AppMenuObserver { - mAppMenuHandler = appMenuHandler; - mAppMenuHandler.addObserver(this); - mAppMenuButtonHelper = mAppMenuHandler.createAppMenuButtonHelper(); -+ mAppMenuButtonHelper.setMenuShowsFromBottom(mBottomToolbarEnabled); - mAppMenuButtonHelper.setOnAppMenuShownListener( - () -> { RecordUserAction.record("MobileToolbarShowMenu"); }); - if (mMenuButton != null) { -@@ -325,4 +326,5 @@ public class MenuButtonCoordinator implements AppMenuObserver { - mMenuButton.removeAppMenuUpdateBadge(false); - } - } -+ private boolean mBottomToolbarEnabled = false; public void setBottomMenu(boolean enabled) {mBottomToolbarEnabled = enabled;if (mAppMenuButtonHelper != null) mAppMenuButtonHelper.setMenuShowsFromBottom(enabled); } - } diff --git a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch new file mode 100644 index 000000000000..31428399cf2c --- /dev/null +++ b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn +index d06aceed7443a093d85bbfc340fe1a50a9613ac9..a41f90a8a60019a06ac5c22acec4f98a35d2aa17 100644 +--- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn ++++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn +@@ -21,6 +21,7 @@ android_library("java") { + "java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java", + "java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemIcon.java", + ] ++ sources += brave_browser_ui_android_appmenu_internal_sources + + deps = [ + ":java_resources", diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch new file mode 100644 index 000000000000..e9d616d110f8 --- /dev/null +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +index 12a4e3b5ed297e047ae2ea07b6aa7ca1dad6052d..5ca045d1a4b8c64d4609ae766e4a2e479efc1634 100644 +--- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java ++++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +@@ -209,6 +209,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuAdapter.OnCl + mPopup.setBackgroundDrawable(ApiCompatibilityUtils.getDrawable( + context.getResources(), R.drawable.popup_bg_tinted)); + if (!isByPermanentButton) mPopup.setAnimationStyle(R.style.OverflowMenuAnim); ++ if (!isByPermanentButton) mPopup.setAnimationStyle(BraveAppMenu.getAnimationStyle()); + + // Turn off window animations for low end devices. + if (SysUtils.isLowEndDevice()) mPopup.setAnimationStyle(0); From 1eb1a92d0309ddd2db24462205d04bea9d058c12 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 2 Oct 2020 14:49:04 -0400 Subject: [PATCH 060/152] Updated patches after rebase on master. --- patches/chrome-VERSION.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 2 +- patches/chrome-renderer-BUILD.gn.patch | 2 +- .../chrome-renderer-worker_content_settings_client.h.patch | 4 ++-- patches/components-omnibox-browser-BUILD.gn.patch | 2 +- ...nderer-modules-webgl-webgl_rendering_context_base.cc.patch | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 96cc8f4702c6..8efb8a52784c 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,5 +1,5 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 572ffda3954b1e864e632a21b95afb24b2f4797d..977465f2d49bf2289b7934c07266323e3c967742 100644 +index 572ffda3954b1e864e632a21b95afb24b2f4797d..d70c78e41d865865c07ef267e7a9e394da10d3cb 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index fa422016fa61..20c2d0878e87 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 3f89c70d1fe370ef15db842266d767d214b57992..546b8a90cd12eb1d17d9f8d22b3f28c0425bfe67 100644 +index 3f89c70d1fe370ef15db842266d767d214b57992..7fc8163f42af8edb05f804f5eeb0c99a0bb8f37f 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2266,6 +2266,7 @@ static_library("browser") { diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 10b855108482..2b0e24f78be1 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 62747b5714ed02fee4c9df7c55b28d95f3ac2a46..2b0f6ca51e39ac1cca91037aed056cf6e5016b63 100644 +index 62747b5714ed02fee4c9df7c55b28d95f3ac2a46..b262047966653217f82bdd0018cf3e8a0cfa3413 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -195,6 +195,7 @@ static_library("renderer") { diff --git a/patches/chrome-renderer-worker_content_settings_client.h.patch b/patches/chrome-renderer-worker_content_settings_client.h.patch index 9268ecf4a7d0..7b76fd34a30e 100644 --- a/patches/chrome-renderer-worker_content_settings_client.h.patch +++ b/patches/chrome-renderer-worker_content_settings_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/worker_content_settings_client.h b/chrome/renderer/worker_content_settings_client.h -index a468fb993c4797525794358bab77763d46a5894b..831b766c295accb37577ac0e73ed012a0206f5c0 100644 +index a0f4e0db463ef34a3790da84d9cb960ef0a731f7..41f3e365e7127b07a9408b1e6027db1f12e9574c 100644 --- a/chrome/renderer/worker_content_settings_client.h +++ b/chrome/renderer/worker_content_settings_client.h -@@ -38,6 +38,7 @@ class WorkerContentSettingsClient : public blink::WebContentSettingsClient { +@@ -35,6 +35,7 @@ class WorkerContentSettingsClient : public blink::WebContentSettingsClient { bool AllowScriptFromSource(bool enabled_per_settings, const blink::WebURL& script_url) override; bool ShouldAutoupgradeMixedContent() override; diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 99ba0801137a..439fb637e442 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index f7266475b1fdef082cbde96b227d4e1fdaa3e544..82eb2fcec51ea92c2dc95e8f36cac6b4cec097d3 100644 +index f7266475b1fdef082cbde96b227d4e1fdaa3e544..47af128d751c92b4662c6ed34f6b70d040424578 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -253,6 +253,7 @@ static_library("browser") { diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 87ee363826e7..c23a1514ab99 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,5 +1,5 @@ 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 -index 3b4eca07d5997b5763cc14de64b655a2da344fcf..2af7723bab81e8ee27b3af1f7d7571d577ddfcf9 100644 +index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee354e46b12 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc @@ -2941,6 +2941,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( From 2b51e004228df7cea93129514eb37a932ed300f4 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 2 Oct 2020 15:48:25 -0400 Subject: [PATCH 061/152] net::TCPClientSocket signature changed. Chromium change: https://chromium.googlesource.com/chromium/src/+/2bc771681e3200fa3b5a30aa0c844d735a51fef2 commit 2bc771681e3200fa3b5a30aa0c844d735a51fef2 Author: Eric Roman Date: Wed Sep 16 18:30:45 2020 +0000 Plumb a NetworkQualityEstimator* into TCPClientSocket. This is strictly a re-factor, however a follow-up CL uses the parameter for access the estimated transport RTT. Bug: 1123197 --- components/tor/tor_control.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/tor/tor_control.cc b/components/tor/tor_control.cc index a66416fb1e13..ee29add92d3b 100644 --- a/components/tor/tor_control.cc +++ b/components/tor/tor_control.cc @@ -449,7 +449,7 @@ void TorControl::OpenControl(int portno, std::vector cookie) { net::AddressList addrlist = net::AddressList::CreateFromIPAddress( net::IPAddress::IPv4Localhost(), portno); socket_ = std::make_unique( - addrlist, nullptr, net::NetLog::Get(), net::NetLogSource()); + addrlist, nullptr, nullptr, net::NetLog::Get(), net::NetLogSource()); int rv = socket_->Connect(base::BindOnce( &TorControl::Connected, base::Unretained(this), std::move(cookie))); if (rv == net::ERR_IO_PENDING) From 9be7c4987f09b0e80aa2de8640dd873812b2b4ef Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 5 Oct 2020 12:28:39 -0400 Subject: [PATCH 062/152] [Android] Moved back string for Fullscreen Otherwise there is an error: ../../chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java:515: error: cannot find symbol int resId = R.string.immersive_fullscreen_api_notification; --- browser/ui/android/strings/android_chrome_strings.grd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index e9a4643078d0..8cafb0a71179 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -2112,6 +2112,11 @@ To change this setting, <resetlink>reset sync

+ + + Drag from top and touch the back button to exit full screen. + + Download complete From c86d69b8667d13cbf9b793b494f9b2a338b5a33e Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 5 Oct 2020 14:45:27 -0400 Subject: [PATCH 063/152] [Android] Move BottomToolbar code to brave-core (stage 3) Pacthes to integrate BottomToolbar back to Chromium Chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- android/brave_java_resources.gni | 1 + android/brave_java_sources.gni | 7 + android/java/apk_for_test.flags | 47 ++++ .../BraveTabbedRootUiCoordinator.java | 50 +++++ .../browser/toolbar/BraveToolbarManager.java | 206 ++++++++++++++++++ .../bottom/BottomToolbarCoordinator.java | 37 ++-- .../BraveBottomControlsCoordinator.java | 129 +++++++++++ .../bottom/BraveBottomControlsMediator.java | 25 +++ .../BrowsingModeBottomToolbarCoordinator.java | 25 +-- ...raveTabSwitcherModeTTCoordinatorPhone.java | 38 ++++ .../top/BraveTabSwitcherModeTTPhone.java | 65 ++++++ .../top/BraveTopToolbarCoordinator.java | 64 ++++++ .../res/layout/bottom_control_container.xml | 44 ++++ .../java/res/layout/tab_switcher_toolbar.xml | 98 +++++++++ .../chromium/chrome/browser/BytecodeTest.java | 141 ++++++++++-- .../browser/ui/appmenu/BraveAppMenu.java | 21 +- build/android/bytecode/BUILD.gn | 5 + ...BottomControlsCoordinatorClassAdapter.java | 22 ++ .../org/brave/bytecode/BraveClassAdapter.java | 5 + ...herModeTTCoordinatorPhoneClassAdapter.java | 22 ++ ...aveTabSwitcherModeTTPhoneClassAdapter.java | 41 ++++ .../BraveToolbarManagerClassAdapter.java | 84 +++++++ ...raveTopToolbarCoordinatorClassAdapter.java | 25 +++ ...me-browser-ChromeTabbedActivity.java.patch | 11 +- ...-browser-toolbar-ToolbarManager.java.patch | 13 ++ ...ottom-BottomControlsCoordinator.java.patch | 13 ++ ...olbar-top-TopToolbarCoordinator.java.patch | 13 ++ ...me-browser-ui-RootUiCoordinator.java.patch | 13 ++ 28 files changed, 1195 insertions(+), 70 deletions(-) create mode 100644 android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java create mode 100644 android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java create mode 100644 android/java/res/layout/bottom_control_container.xml create mode 100644 android/java/res/layout/tab_switcher_toolbar.xml create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveBottomControlsCoordinatorClassAdapter.java create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter.java create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TopToolbarCoordinator.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 149610aa3371..ccb5f9bfa508 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -690,6 +690,7 @@ brave_java_resources = [ "java/res/layout/binance_spinner_dropdown_item.xml", "java/res/layout/binance_spinner_item.xml", "java/res/layout/binance_summary_item.xml", + "java/res/layout/bottom_control_container.xml", "java/res/layout/bottom_toolbar.xml", "java/res/layout/bottom_toolbar_browsing.xml", "java/res/layout/bottom_toolbar_menu_button.xml", diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 2ca9d94ebac5..077c81961062 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -144,14 +144,18 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java", "../../brave/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java", "../../brave/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java", + "../../brave/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java", @@ -163,7 +167,10 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/ui/brave_tricks/checkbox_to_switch/CheckBoxPreference.java", "../../brave/android/java/org/chromium/chrome/browser/ui/messages/infobar/BraveSimpleConfirmInfoBarBuilder.java", "../../brave/android/java/org/chromium/chrome/browser/upgrade/BravePackageReplacedBroadcastReceiver.java", diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index ae44c96e47e3..89b58c743a17 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -77,3 +77,50 @@ -keep class org.chromium.chrome.browser.ui.appmenu.AppMenu { *** getPopupPosition(...); } + +-keep class org.chromium.chrome.browser.toolbar.bottom.BottomControlsCoordinator { + *** mMediator; +} + +-keep class org.chromium.chrome.browser.toolbar.ToolbarManager { + *** mBottomControlsCoordinator; + *** mBrowserControlsSizer; + *** mFullscreenManager; + *** mActivityTabProvider; + *** mAppThemeColorProvider; + *** mShareDelegateSupplier; + *** mScrimCoordinator; + *** mActivity; + *** mShowStartSurfaceSupplier; + *** mOverviewModeBehaviorSupplier; + *** mMenuButtonCoordinator; + *** mToolbarTabController; + *** mLocationBar; + *** mActionModeController; + *** mLocationBarModel; + *** mToolbar; + *** mBookmarkBridgeSupplier; + *** onOrientationChange(...); + *** updateButtonStatus(...); + *** updateBookmarkButtonStatus(...); + *** updateReloadState(...); +} + +-keep class org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator { + *** mTabSwitcherModeCoordinatorPhone; + *** mOptionalButtonController; +} + +-keep class org.chromium.chrome.browser.toolbar.top.TabSwitcherModeTTCoordinatorPhone { + *** mTabSwitcherModeToolbar; +} + +-keep class org.chromium.chrome.browser.toolbar.top.TabSwitcherModeTTPhone { + *** mNewTabViewButton; + *** mNewTabImageButton; + *** mToggleTabStackButton; + *** mMenuButton; + *** mShouldShowNewTabVariation; + *** updateNewTabButtonVisibility(...); + *** shouldShowIncognitoToggle(...); +} diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java new file mode 100644 index 000000000000..586b6fb0e3f5 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java @@ -0,0 +1,50 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.tabbed_mode; + +import org.chromium.base.Callback; +import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.ObservableSupplierImpl; +import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.ActivityTabProvider; +import org.chromium.chrome.browser.app.ChromeActivity; +import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.share.ShareDelegate; +import org.chromium.chrome.browser.tabmodel.TabModelSelector; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; + +public class BraveTabbedRootUiCoordinator extends TabbedRootUiCoordinator { + public BraveTabbedRootUiCoordinator(ChromeActivity activity, + Callback onOmniboxFocusChangedListener, + ObservableSupplier intentWithEffect, + ObservableSupplier shareDelegateSupplier, + ActivityTabProvider tabProvider, + ObservableSupplierImpl ephemeralTabCoordinatorSupplier, + ObservableSupplier profileSupplier, + ObservableSupplier bookmarkBridgeSupplier, + OneshotSupplier overviewModeBehaviorSupplier, + Supplier contextualSearchManagerSupplier, + ObservableSupplier tabModelSelectorSupplier) { + super(activity, onOmniboxFocusChangedListener, intentWithEffect, shareDelegateSupplier, + tabProvider, ephemeralTabCoordinatorSupplier, profileSupplier, + bookmarkBridgeSupplier, overviewModeBehaviorSupplier, + contextualSearchManagerSupplier, tabModelSelectorSupplier); + } + + @Override + protected void initializeToolbar() { + super.initializeToolbar(); + + if (BottomToolbarConfiguration.isBottomToolbarEnabled()) { + getToolbarManager().enableBottomControls(); + } + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java new file mode 100644 index 000000000000..ced24f06b64c --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -0,0 +1,206 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.toolbar; + +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewStub; + +import androidx.annotation.Nullable; + +import org.chromium.base.ApiCompatibilityUtils; +import org.chromium.base.Callback; +import org.chromium.base.ContextUtils; +import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ActivityTabProvider; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.app.ChromeActivity; +import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; +import org.chromium.chrome.browser.compositor.Invalidator; +import org.chromium.chrome.browser.compositor.layouts.LayoutManager; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.findinpage.FindToolbarManager; +import org.chromium.chrome.browser.fullscreen.FullscreenManager; +import org.chromium.chrome.browser.identity_disc.IdentityDiscController; +import org.chromium.chrome.browser.omnibox.LocationBar; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.share.ShareDelegate; +import org.chromium.chrome.browser.tab.SadTab; +import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tabmodel.TabModelSelector; +import org.chromium.chrome.browser.toolbar.bottom.BottomControlsCoordinator; +import org.chromium.chrome.browser.toolbar.bottom.BottomTabSwitcherActionMenuCoordinator; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; +import org.chromium.chrome.browser.toolbar.bottom.BraveBottomControlsCoordinator; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; +import org.chromium.chrome.browser.toolbar.top.ActionModeController; +import org.chromium.chrome.browser.toolbar.top.BraveTopToolbarCoordinator; +import org.chromium.chrome.browser.toolbar.top.ToolbarActionModeCallback; +import org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer; +import org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator; +import org.chromium.chrome.browser.ui.TabObscuringHandler; +import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator; +import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; + +import java.util.List; + +public class BraveToolbarManager extends ToolbarManager { + private static final String BRAVE_BOTTOM_TOOLBAR_CURRENTLY_VISIBLE = + "brave_bottom_toolbar_currently_visible"; + + private BottomControlsCoordinator mBottomControlsCoordinator; + private BrowserControlsSizer mBrowserControlsSizer; + private FullscreenManager mFullscreenManager; + private ActivityTabProvider mActivityTabProvider; + private AppThemeColorProvider mAppThemeColorProvider; + private ObservableSupplier mShareDelegateSupplier; + private ScrimCoordinator mScrimCoordinator; + private ChromeActivity mActivity; + private Supplier mShowStartSurfaceSupplier; + private OneshotSupplier mOverviewModeBehaviorSupplier; + private MenuButtonCoordinator mMenuButtonCoordinator; + private ToolbarTabControllerImpl mToolbarTabController; + private LocationBar mLocationBar; + private ActionModeController mActionModeController; + private LocationBarModel mLocationBarModel; + private TopToolbarCoordinator mToolbar; + private ObservableSupplier mBookmarkBridgeSupplier; + + private boolean mIsBottomToolbarVisible; + private View mRootBottomView; + + public BraveToolbarManager(ChromeActivity activity, BrowserControlsSizer controlsSizer, + FullscreenManager fullscreenManager, ToolbarControlContainer controlContainer, + Invalidator invalidator, Callback urlFocusChangedCallback, + ThemeColorProvider themeColorProvider, TabObscuringHandler tabObscuringHandler, + ObservableSupplier shareDelegateSupplier, + IdentityDiscController identityDiscController, + List buttonDataProviders, ActivityTabProvider tabProvider, + ScrimCoordinator scrimCoordinator, ToolbarActionModeCallback toolbarActionModeCallback, + FindToolbarManager findToolbarManager, ObservableSupplier profileSupplier, + ObservableSupplier bookmarkBridgeSupplier, + @Nullable Supplier canAnimateNativeBrowserControls, + OneshotSupplier overviewModeBehaviorSupplier, + OneshotSupplier appMenuCoordinatorSupplier, + boolean shouldShowUpdateBadge, + ObservableSupplier tabModelSelectorSupplier) { + super(activity, controlsSizer, fullscreenManager, controlContainer, invalidator, + urlFocusChangedCallback, themeColorProvider, tabObscuringHandler, + shareDelegateSupplier, identityDiscController, buttonDataProviders, tabProvider, + scrimCoordinator, toolbarActionModeCallback, findToolbarManager, profileSupplier, + bookmarkBridgeSupplier, canAnimateNativeBrowserControls, + overviewModeBehaviorSupplier, appMenuCoordinatorSupplier, shouldShowUpdateBadge, + tabModelSelectorSupplier); + } + + @Override + public void enableBottomControls() { + ViewStub viewStub = mActivity.findViewById(R.id.bottom_controls_stub); + viewStub.setOnInflateListener((stub, inflated) -> { mRootBottomView = inflated; }); + mBottomControlsCoordinator = new BraveBottomControlsCoordinator( + BottomTabSwitcherActionMenuCoordinator.createOnLongClickListener( + id -> mActivity.onOptionsItemSelected(id, null)), + mBrowserControlsSizer, mFullscreenManager, viewStub, mActivityTabProvider, + mAppThemeColorProvider, mShareDelegateSupplier, + mMenuButtonCoordinator.getMenuButtonHelperSupplier(), mShowStartSurfaceSupplier, + mToolbarTabController::openHomepage, + (reason) + -> setUrlBarFocus(true, reason), + mOverviewModeBehaviorSupplier, mScrimCoordinator); + ((BraveBottomControlsCoordinator) mBottomControlsCoordinator).setRootView(mRootBottomView); + boolean isBottomToolbarVisible = BottomToolbarConfiguration.isBottomToolbarEnabled() + && mActivity.getResources().getConfiguration().orientation + != Configuration.ORIENTATION_LANDSCAPE; + setBottomToolbarVisible(isBottomToolbarVisible); + } + + @Override + public void initializeWithNative(LayoutManager layoutManager, + OnClickListener tabSwitcherClickHandler, OnClickListener newTabClickHandler, + OnClickListener bookmarkClickHandler, OnClickListener customTabsBackClickHandler, + Supplier showStartSurfaceSupplier) { + super.initializeWithNative(layoutManager, tabSwitcherClickHandler, newTabClickHandler, + bookmarkClickHandler, customTabsBackClickHandler, showStartSurfaceSupplier); + + if (mBottomControlsCoordinator != null) { + ApiCompatibilityUtils.setAccessibilityTraversalBefore( + mLocationBar.getContainerView(), R.id.bottom_toolbar); + } + } + + @Override + public @Nullable View getMenuButtonView() { + if (mMenuButtonCoordinator.getMenuButton() == null) return null; + return super.getMenuButtonView(); + } + + protected void onOrientationChange(int newOrientation) { + if (mActionModeController != null) mActionModeController.showControlsOnOrientationChange(); + + if (mBottomControlsCoordinator != null + && BottomToolbarConfiguration.isBottomToolbarEnabled()) { + boolean isBottomToolbarVisible = newOrientation != Configuration.ORIENTATION_LANDSCAPE; + setBottomToolbarVisible(isBottomToolbarVisible); + } + } + + protected void updateButtonStatus() { + Tab currentTab = mLocationBarModel.getTab(); + boolean tabCrashed = currentTab != null && SadTab.isShowing(currentTab); + + mToolbar.updateButtonVisibility(); + mToolbar.updateBackButtonVisibility(currentTab != null && currentTab.canGoBack()); + mToolbar.updateForwardButtonVisibility(currentTab != null && currentTab.canGoForward()); + updateReloadState(tabCrashed); + updateBookmarkButtonStatus(); + + if (mToolbar.getMenuButtonWrapper() != null && !isBottomToolbarVisible()) { + mToolbar.getMenuButtonWrapper().setVisibility(View.VISIBLE); + } + } + + protected void updateBookmarkButtonStatus() { + Tab currentTab = mLocationBarModel.getTab(); + BookmarkBridge bridge = mBookmarkBridgeSupplier.get(); + boolean isBookmarked = + currentTab != null && bridge != null && bridge.hasBookmarkIdForTab(currentTab); + boolean editingAllowed = + currentTab == null || bridge == null || bridge.isEditBookmarksEnabled(); + mToolbar.updateBookmarkButton(isBookmarked, editingAllowed); + + if (mBottomControlsCoordinator instanceof BraveBottomControlsCoordinator) { + ((BraveBottomControlsCoordinator) mBottomControlsCoordinator) + .updateBookmarkButton(isBookmarked, editingAllowed); + } + } + + protected void updateReloadState(boolean tabCrashed) { + assert (false); + } + + private void setBottomToolbarVisible(boolean visible) { + mIsBottomToolbarVisible = visible; + if (mToolbar instanceof BraveTopToolbarCoordinator) { + ((BraveTopToolbarCoordinator) mToolbar).onBottomToolbarVisibilityChanged(visible); + } + mBottomControlsCoordinator.setBottomControlsVisible(visible); + SharedPreferences prefs = ContextUtils.getAppSharedPreferences(); + Boolean isMenuFromBottom = + mIsBottomToolbarVisible && BottomToolbarConfiguration.isBottomToolbarEnabled(); + prefs.edit().putBoolean(BRAVE_BOTTOM_TOOLBAR_CURRENTLY_VISIBLE, isMenuFromBottom).apply(); + } + + public boolean isBottomToolbarVisible() { + return mIsBottomToolbarVisible; + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java index 0ae734a1120c..3dc91f1e7bb8 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -14,11 +14,13 @@ import android.view.ViewStub; import org.chromium.base.Callback; +import org.chromium.base.CallbackController; import org.chromium.base.ContextUtils; import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.base.supplier.OneShotCallback; +import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; @@ -75,8 +77,7 @@ class BottomToolbarCoordinator implements View.OnLongClickListener { private ObservableSupplierImpl mShareButtonListenerSupplier = new ObservableSupplierImpl<>(); private final Supplier mShowStartSurfaceCallable; - private ObservableSupplier mOverviewModeBehaviorSupplier; - private Callback mOverviewModeBehaviorSupplierObserver; + private CallbackController mCallbackController = new CallbackController(); private AppMenuButtonHelper mMenuButtonHelper; private BottomControlsMediator mBottomControlsMediator; private Runnable mOriginalHomeButtonRunnable; @@ -108,13 +109,13 @@ class BottomToolbarCoordinator implements View.OnLongClickListener { ObservableSupplier shareDelegateSupplier, Supplier showStartSurfaceCallable, Runnable openHomepageAction, Callback setUrlBarFocusAction, - ObservableSupplier overviewModeBehaviorSupplier, - ObservableSupplier menuButtonHelperSupplier, + OneshotSupplier overviewModeBehaviorSupplier, + AppMenuButtonHelper menuButtonHelper, BottomControlsMediator bottomControlsMediator) { View root = stub.inflate(); - mOverviewModeBehaviorSupplierObserver = this::setOverviewModeBehavior; - mOverviewModeBehaviorSupplier = overviewModeBehaviorSupplier; + overviewModeBehaviorSupplier.onAvailable(mCallbackController.makeCancelable( + (overviewModeBehavior) -> { setOverviewModeBehavior(overviewModeBehavior); })); mShowStartSurfaceCallable = showStartSurfaceCallable; final OnClickListener homeButtonListener = v -> { @@ -133,7 +134,7 @@ class BottomToolbarCoordinator implements View.OnLongClickListener { mBrowsingModeCoordinator = new BrowsingModeBottomToolbarCoordinator(root, tabProvider, homeButtonListener, searchAcceleratorListener, mShareButtonListenerSupplier, - tabsSwitcherLongClickListner, mOverviewModeBehaviorSupplier); + tabsSwitcherLongClickListner, overviewModeBehaviorSupplier); mTabSwitcherModeStub = root.findViewById(R.id.bottom_toolbar_tab_switcher_mode_stub); @@ -144,11 +145,7 @@ class BottomToolbarCoordinator implements View.OnLongClickListener { mShareDelegateSupplierCallback = this::onShareDelegateAvailable; mShareDelegateSupplier.addObserver(mShareDelegateSupplierCallback); - new OneShotCallback<>(menuButtonHelperSupplier, (menuButtonHelper) -> { - if (menuButtonHelper != null) { - mMenuButtonHelper = menuButtonHelper; - } - }); + mMenuButtonHelper = menuButtonHelper; mBottomControlsMediator = bottomControlsMediator; mOriginalHomeButtonRunnable = openHomepageAction; mScrollingBottomView = scrollingBottomView; @@ -197,7 +194,10 @@ void initializeWithNative(OnClickListener tabSwitcherListener, mOverviewModeObserver = new EmptyOverviewModeObserver() { @Override public void onOverviewModeStartedShowing(boolean showToolbar) { - mBottomControlsMediator.setCompositedViewVisibile(false); + if (mBottomControlsMediator instanceof BraveBottomControlsMediator) { + ((BraveBottomControlsMediator) mBottomControlsMediator) + .setCompositedViewVisibile(false); + } BrowsingModeBottomToolbarCoordinator browsingModeCoordinator = (BrowsingModeBottomToolbarCoordinator) mBrowsingModeCoordinator; browsingModeCoordinator.getSearchAccelerator().setVisibility(View.GONE); @@ -249,10 +249,12 @@ public void onOverviewModeStartedHiding( @Override public void onOverviewModeFinishedHiding() { - mBottomControlsMediator.setCompositedViewVisibile(true); + if (mBottomControlsMediator instanceof BraveBottomControlsMediator) { + ((BraveBottomControlsMediator) mBottomControlsMediator) + .setCompositedViewVisibile(true); + } } }; - mOverviewModeBehaviorSupplier.addObserver(mOverviewModeBehaviorSupplierObserver); } View root = (View) topToolbarRoot.getParent(); @@ -320,11 +322,6 @@ void destroy() { mOverviewModeBehavior.removeOverviewModeObserver(mOverviewModeObserver); mOverviewModeBehavior = null; } - if (mOverviewModeBehaviorSupplier != null) { - mOverviewModeBehaviorSupplier.removeObserver(mOverviewModeBehaviorSupplierObserver); - mOverviewModeBehaviorSupplier = null; - mOverviewModeBehaviorSupplierObserver = null; - } mThemeColorProvider.destroy(); mShareDelegateSupplier.removeObserver(mShareDelegateSupplierCallback); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java new file mode 100644 index 000000000000..7f2da1b708c6 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java @@ -0,0 +1,129 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.toolbar.bottom; + +import android.view.View; +import android.view.View.OnClickListener; +import android.view.View.OnLongClickListener; +import android.view.ViewGroup; +import android.view.ViewStub; + +import androidx.annotation.Nullable; + +import org.chromium.base.Callback; +import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.OneShotCallback; +import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ActivityTabProvider; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.app.ChromeActivity; +import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; +import org.chromium.chrome.browser.compositor.layouts.LayoutManager; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.fullscreen.FullscreenManager; +import org.chromium.chrome.browser.share.ShareDelegate; +import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; +import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; +import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; +import org.chromium.ui.base.WindowAndroid; +import org.chromium.ui.resources.ResourceManager; + +public class BraveBottomControlsCoordinator extends BottomControlsCoordinator { + private BottomControlsMediator mMediator; + + private @Nullable BottomToolbarCoordinator mBottomToolbarCoordinator; + private OnLongClickListener mTabSwitcherLongclickListener; + private ActivityTabProvider mTabProvider; + private ThemeColorProvider mThemeColorProvider; + private ObservableSupplier mShareDelegateSupplier; + private AppMenuButtonHelper mMenuButtonHelper; + private Supplier mShowStartSurfaceCallable; + private Runnable mOpenHomepageAction; + private Callback mSetUrlBarFocusAction; + private OneshotSupplier mOverviewModeBehaviorSupplier; + private ScrollingBottomViewResourceFrameLayout mRoot; + + public BraveBottomControlsCoordinator(OnLongClickListener tabSwitcherLongclickListener, + BrowserControlsSizer controlsSizer, FullscreenManager fullscreenManager, ViewStub stub, + ActivityTabProvider tabProvider, ThemeColorProvider themeColorProvider, + ObservableSupplier shareDelegateSupplier, + ObservableSupplier menuButtonHelperSupplier, + Supplier showStartSurfaceCallable, Runnable openHomepageAction, + Callback setUrlBarFocusAction, + OneshotSupplier overviewModeBehaviorSupplier, + ScrimCoordinator scrimCoordinator) { + super(controlsSizer, fullscreenManager, stub, tabProvider, themeColorProvider, + shareDelegateSupplier, menuButtonHelperSupplier, showStartSurfaceCallable, + openHomepageAction, setUrlBarFocusAction, overviewModeBehaviorSupplier, + scrimCoordinator); + + mTabSwitcherLongclickListener = tabSwitcherLongclickListener; + mTabProvider = tabProvider; + mThemeColorProvider = themeColorProvider; + mShareDelegateSupplier = shareDelegateSupplier; + mShowStartSurfaceCallable = showStartSurfaceCallable; + mOpenHomepageAction = openHomepageAction; + mSetUrlBarFocusAction = setUrlBarFocusAction; + mOverviewModeBehaviorSupplier = overviewModeBehaviorSupplier; + new OneShotCallback<>(menuButtonHelperSupplier, (menuButtonHelper) -> { + if (menuButtonHelper != null) { + mMenuButtonHelper = menuButtonHelper; + } + }); + } + + public void setRootView(View root) { + assert (root != null); + mRoot = (ScrollingBottomViewResourceFrameLayout) root; + } + + @Override + public void initializeWithNative(ChromeActivity chromeActivity, ResourceManager resourceManager, + LayoutManager layoutManager, OnClickListener tabSwitcherListener, + OnClickListener newTabClickListener, WindowAndroid windowAndroid, + TabCountProvider tabCountProvider, IncognitoStateProvider incognitoStateProvider, + ViewGroup topToolbarRoot, Runnable closeAllTabsAction) { + super.initializeWithNative(chromeActivity, resourceManager, layoutManager, + tabSwitcherListener, newTabClickListener, windowAndroid, tabCountProvider, + incognitoStateProvider, topToolbarRoot, closeAllTabsAction); + + if (BottomToolbarConfiguration.isBottomToolbarEnabled()) { + mBottomToolbarCoordinator = new BottomToolbarCoordinator(mRoot, + mRoot.findViewById(R.id.bottom_toolbar_stub), mTabProvider, + mTabSwitcherLongclickListener, mThemeColorProvider, mShareDelegateSupplier, + mShowStartSurfaceCallable, mOpenHomepageAction, mSetUrlBarFocusAction, + mOverviewModeBehaviorSupplier, mMenuButtonHelper, mMediator); + + mBottomToolbarCoordinator.initializeWithNative(tabSwitcherListener, newTabClickListener, + tabCountProvider, incognitoStateProvider, topToolbarRoot, closeAllTabsAction); + } + } + + @Override + public void setBottomControlsVisible(boolean isVisible) { + super.setBottomControlsVisible(isVisible); + + if (mBottomToolbarCoordinator != null) { + mBottomToolbarCoordinator.setBottomToolbarVisible(isVisible); + } + } + + @Override + public void destroy() { + super.destroy(); + + if (mBottomToolbarCoordinator != null) mBottomToolbarCoordinator.destroy(); + } + + public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { + if (mBottomToolbarCoordinator != null) { + mBottomToolbarCoordinator.updateBookmarkButton(isBookmarked, editingAllowed); + } + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java new file mode 100644 index 000000000000..642709a69c4c --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java @@ -0,0 +1,25 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.toolbar.bottom; + +import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; +import org.chromium.chrome.browser.fullscreen.FullscreenManager; +import org.chromium.ui.modelutil.PropertyModel; + +class BraveBottomControlsMediator extends BottomControlsMediator { + private final PropertyModel mModel; + + BraveBottomControlsMediator(PropertyModel model, BrowserControlsSizer controlsSizer, + FullscreenManager fullscreenManager, int bottomControlsHeight) { + super(model, controlsSizer, fullscreenManager, bottomControlsHeight); + + mModel = model; + } + + public void setCompositedViewVisibile(boolean visible) { + mModel.set(BottomControlsProperties.COMPOSITED_VIEW_VISIBLE, visible); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index 2e7643b7e04c..995c0af497d3 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -10,15 +10,19 @@ import android.view.View.OnLongClickListener; import org.chromium.base.Callback; +import org.chromium.base.CallbackController; import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.OneshotSupplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider.HintlessActivityTabObserver; import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tab.TabImpl; import org.chromium.chrome.browser.tab.TabUtils; import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.chrome.browser.toolbar.HomeButton; @@ -26,13 +30,11 @@ import org.chromium.chrome.browser.toolbar.TabCountProvider; import org.chromium.chrome.browser.toolbar.TabSwitcherButtonCoordinator; import org.chromium.chrome.browser.toolbar.TabSwitcherButtonView; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.components.feature_engagement.Tracker; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; -import org.chromium.chrome.browser.tab.TabImpl; -import org.chromium.chrome.browser.app.BraveActivity; -import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; /** * The coordinator for the browsing mode bottom toolbar. This class has two primary components, @@ -76,8 +78,7 @@ public class BrowsingModeBottomToolbarCoordinator { /** The activity tab provider that used for making the IPH. */ private final ActivityTabProvider mTabProvider; - private Callback mOverviewModeBehaviorSupplierObserver; - private ObservableSupplier mOverviewModeBehaviorSupplier; + private CallbackController mCallbackController = new CallbackController(); private final BookmarksButton mBookmarkButton; private final MenuButton mMenuButton; @@ -94,7 +95,7 @@ public class BrowsingModeBottomToolbarCoordinator { OnClickListener homeButtonListener, OnClickListener searchAcceleratorListener, ObservableSupplier shareButtonListenerSupplier, OnLongClickListener tabSwitcherLongClickListener, - ObservableSupplier overviewModeBehaviorSupplier) { + OneshotSupplier overviewModeBehaviorSupplier) { mModel = new BrowsingModeBottomToolbarModel(); mToolbarRoot = root.findViewById(R.id.bottom_toolbar_browsing); mTabProvider = tabProvider; @@ -140,9 +141,10 @@ public class BrowsingModeBottomToolbarCoordinator { mShareButtonListenerSupplier.addObserver(mShareButtonListenerSupplierCallback); } - mOverviewModeBehaviorSupplier = overviewModeBehaviorSupplier; - mOverviewModeBehaviorSupplierObserver = this::setOverviewModeBehavior; - mOverviewModeBehaviorSupplier.addObserver(mOverviewModeBehaviorSupplierObserver); + overviewModeBehaviorSupplier.onAvailable( + mCallbackController.makeCancelable((overviewModeBehavior) -> { + setOverviewModeBehavior(overviewModeBehavior); + })); mBookmarkButton = mToolbarRoot.findViewById(R.id.bottom_bookmark_button); if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { @@ -279,11 +281,6 @@ public void destroy() { if (mShareButtonListenerSupplier != null) { mShareButtonListenerSupplier.removeObserver(mShareButtonListenerSupplierCallback); } - if (mOverviewModeBehaviorSupplier != null) { - mOverviewModeBehaviorSupplier.removeObserver(mOverviewModeBehaviorSupplierObserver); - mOverviewModeBehaviorSupplier = null; - mOverviewModeBehaviorSupplierObserver = null; - } mMediator.destroy(); mHomeButton.destroy(); mShareButton.destroy(); diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java new file mode 100644 index 000000000000..901315a4136e --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java @@ -0,0 +1,38 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.toolbar.top; + +import android.view.ViewStub; + +class BraveTabSwitcherModeTTCoordinatorPhone extends TabSwitcherModeTTCoordinatorPhone { + private TabSwitcherModeTTPhone mTabSwitcherModeToolbar; + + private boolean mIsBottomToolbarVisible; + + BraveTabSwitcherModeTTCoordinatorPhone(ViewStub tabSwitcherToolbarStub) { + super(tabSwitcherToolbarStub); + } + + @Override + public void setTabSwitcherMode(boolean inTabSwitcherMode) { + super.setTabSwitcherMode(inTabSwitcherMode); + if (inTabSwitcherMode && (mTabSwitcherModeToolbar instanceof BraveTabSwitcherModeTTPhone)) { + ((BraveTabSwitcherModeTTPhone) mTabSwitcherModeToolbar) + .onBottomToolbarVisibilityChanged(mIsBottomToolbarVisible); + } + } + + void onBottomToolbarVisibilityChanged(boolean isVisible) { + if (mIsBottomToolbarVisible == isVisible) { + return; + } + mIsBottomToolbarVisible = isVisible; + if (mTabSwitcherModeToolbar instanceof BraveTabSwitcherModeTTPhone) { + ((BraveTabSwitcherModeTTPhone) mTabSwitcherModeToolbar) + .onBottomToolbarVisibilityChanged(isVisible); + } + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java new file mode 100644 index 000000000000..67bea7634d68 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java @@ -0,0 +1,65 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.toolbar.top; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; + +import org.chromium.chrome.browser.toolbar.NewTabButton; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; + +public class BraveTabSwitcherModeTTPhone extends TabSwitcherModeTTPhone { + private View mNewTabViewButton; + private NewTabButton mNewTabImageButton; + private ToggleTabStackButton mToggleTabStackButton; + private MenuButton mMenuButton; + private boolean mShouldShowNewTabVariation; + + private boolean mShouldShowNewTabButton; + + public BraveTabSwitcherModeTTPhone(Context context, AttributeSet attrs) { + super(context, attrs); + } + + protected void updateNewTabButtonVisibility() { + if (mNewTabViewButton != null) { + mNewTabViewButton.setVisibility( + mShouldShowNewTabVariation && mShouldShowNewTabButton ? VISIBLE : GONE); + } + if (mNewTabImageButton != null) { + mNewTabImageButton.setVisibility( + !mShouldShowNewTabVariation && mShouldShowNewTabButton ? VISIBLE : GONE); + } + } + + protected boolean shouldShowIncognitoToggle() { + assert (false); + return false; + } + + private void setMenuButtonVisibility(boolean isButtonVisible) { + if (mMenuButton != null) { + mMenuButton.setVisibility(isButtonVisible ? VISIBLE : GONE); + } + } + + void onBottomToolbarVisibilityChanged(boolean isVisible) { + mShouldShowNewTabButton = !isVisible + || (BottomToolbarConfiguration.isBottomToolbarEnabled() + && !BottomToolbarVariationManager.isNewTabButtonOnBottom()); + updateNewTabButtonVisibility(); + // Show tab switcher button on the top in landscape mode. + if (BottomToolbarVariationManager.isTabSwitcherOnBottom() && !shouldShowIncognitoToggle()) { + mToggleTabStackButton.setVisibility(isVisible ? GONE : VISIBLE); + } + setMenuButtonVisibility(!isVisible + || (BottomToolbarConfiguration.isBottomToolbarEnabled() + && !BottomToolbarVariationManager.isMenuButtonOnBottom())); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java new file mode 100644 index 000000000000..51fd7360ec6b --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -0,0 +1,64 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.toolbar.top; + +import android.content.Context; + +import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ThemeColorProvider; +import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.identity_disc.IdentityDiscController; +import org.chromium.chrome.browser.tabmodel.TabModelSelector; +import org.chromium.chrome.browser.toolbar.ButtonDataProvider; +import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; +import org.chromium.chrome.browser.toolbar.ToolbarTabController; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; +import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; +import org.chromium.chrome.browser.user_education.UserEducationHelper; +import org.chromium.chrome.features.start_surface.StartSurfaceConfiguration; + +import java.util.List; + +public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { + private TabSwitcherModeTTCoordinatorPhone mTabSwitcherModeCoordinatorPhone; + private OptionalBrowsingModeButtonController mOptionalButtonController; + + public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, + ToolbarLayout toolbarLayout, IdentityDiscController identityDiscController, + ToolbarDataProvider toolbarDataProvider, ToolbarTabController tabController, + UserEducationHelper userEducationHelper, List buttonDataProviders, + OneshotSupplier overviewModeBehaviorSupplier, + ThemeColorProvider normalThemeColorProvider, + ThemeColorProvider overviewThemeColorProvider, + MenuButtonCoordinator browsingModeMenuButtonCoordinator, + MenuButtonCoordinator startSurfaceMenuButtonCoordinator, + ObservableSupplier appMenuButtonHelperSupplier, Context context, + ObservableSupplier tabModelSelectorSupplier) { + super(controlContainer, toolbarLayout, identityDiscController, toolbarDataProvider, + tabController, userEducationHelper, buttonDataProviders, + overviewModeBehaviorSupplier, normalThemeColorProvider, overviewThemeColorProvider, + browsingModeMenuButtonCoordinator, startSurfaceMenuButtonCoordinator, + appMenuButtonHelperSupplier, context, tabModelSelectorSupplier); + + if (toolbarLayout instanceof ToolbarPhone) { + if (!StartSurfaceConfiguration.isStartSurfaceEnabled()) { + mTabSwitcherModeCoordinatorPhone = new BraveTabSwitcherModeTTCoordinatorPhone( + controlContainer.getRootView().findViewById( + R.id.tab_switcher_toolbar_stub)); + } + } + } + + public void onBottomToolbarVisibilityChanged(boolean isVisible) { + if (mTabSwitcherModeCoordinatorPhone instanceof BraveTabSwitcherModeTTCoordinatorPhone) { + ((BraveTabSwitcherModeTTCoordinatorPhone) mTabSwitcherModeCoordinatorPhone) + .onBottomToolbarVisibilityChanged(isVisible); + } + mOptionalButtonController.updateButtonVisibility(); + } +} diff --git a/android/java/res/layout/bottom_control_container.xml b/android/java/res/layout/bottom_control_container.xml new file mode 100644 index 000000000000..299df52de67e --- /dev/null +++ b/android/java/res/layout/bottom_control_container.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + diff --git a/android/java/res/layout/tab_switcher_toolbar.xml b/android/java/res/layout/tab_switcher_toolbar.xml new file mode 100644 index 000000000000..5c2516c0aedd --- /dev/null +++ b/android/java/res/layout/tab_switcher_toolbar.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index f8a2867cd2a1..201bb9db287c 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -41,23 +41,40 @@ public void testClassesExist() throws Exception { "org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter")); Assert.assertTrue(classExists("org/chromium/base/CommandLineInitUtil")); Assert.assertTrue(classExists("org/chromium/chrome/browser/ui/appmenu/AppMenu")); + Assert.assertTrue(classExists( + "org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator")); + Assert.assertTrue(classExists("org/chromium/chrome/browser/toolbar/ToolbarManager")); + Assert.assertTrue( + classExists("org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator")); + Assert.assertTrue(classExists( + "org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTCoordinatorPhone")); + Assert.assertTrue( + classExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone")); } @Test @SmallTest public void testMethodsExist() throws Exception { - Assert.assertTrue(methodExists("org/chromium/chrome/browser/sync/AndroidSyncSettings", "notifyObservers")); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/sync/AndroidSyncSettings", "updateCachedSettings")); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/sync/AndroidSyncSettings", "setChromeSyncEnabled")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/sync/AndroidSyncSettings", "notifyObservers")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/sync/AndroidSyncSettings", "updateCachedSettings")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/sync/AndroidSyncSettings", "setChromeSyncEnabled")); Assert.assertTrue(methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", "extensiveBookmarkChangesBeginning")); - Assert.assertTrue( - methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", "extensiveBookmarkChangesEnded")); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", "createBookmarkItem")); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/LaunchIntentDispatcher", "isCustomTabIntent")); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/homepage/HomepageManager", "shouldCloseAppWithZeroTabs")); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/ntp/NewTabPageLayout", "insertSiteSectionView")); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/ntp/NewTabPageLayout", "getMaxRowsForMostVisitedTiles")); + Assert.assertTrue(methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", + "extensiveBookmarkChangesEnded")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/bookmarks/BookmarkBridge", "createBookmarkItem")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/LaunchIntentDispatcher", "isCustomTabIntent")); + Assert.assertTrue(methodExists("org/chromium/chrome/browser/homepage/HomepageManager", + "shouldCloseAppWithZeroTabs")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/ntp/NewTabPageLayout", "insertSiteSectionView")); + Assert.assertTrue(methodExists("org/chromium/chrome/browser/ntp/NewTabPageLayout", + "getMaxRowsForMostVisitedTiles")); Assert.assertTrue(methodExists( "org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter", "getPermissionsLinkMessage")); @@ -70,21 +87,45 @@ public void testMethodsExist() throws Exception { Assert.assertTrue(methodExists("org/chromium/base/CommandLineInitUtil", "initCommandLine")); Assert.assertTrue( methodExists("org/chromium/chrome/browser/ui/appmenu/AppMenu", "getPopupPosition")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "onOrientationChange")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "updateButtonStatus")); + Assert.assertTrue(methodExists("org/chromium/chrome/browser/toolbar/ToolbarManager", + "updateBookmarkButtonStatus")); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "updateReloadState")); + Assert.assertTrue( + methodExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", + "updateNewTabButtonVisibility")); + Assert.assertTrue( + methodExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", + "shouldShowIncognitoToggle")); } @Test @SmallTest public void testFieldsExist() throws Exception { - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/sync/AndroidSyncSettings", "mIsSyncable")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/sync/AndroidSyncSettings", "mChromeSyncEnabled")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/sync/AndroidSyncSettings", "mMasterSyncEnabled")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/ntp/NewTabPageLayout", "mSiteSectionView")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mActivity")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mScrollViewForPolicy")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mNtpHeader")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mRootView")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/ntp/NewTabPage", "mNewTabPageLayout")); - Assert.assertTrue(fieldExists("org/chromium/chrome/browser/ntp/NewTabPage", "mFeedSurfaceProvider")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/sync/AndroidSyncSettings", "mIsSyncable")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/sync/AndroidSyncSettings", "mChromeSyncEnabled")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/sync/AndroidSyncSettings", "mMasterSyncEnabled")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/ntp/NewTabPageLayout", "mSiteSectionView")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mActivity")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mScrollViewForPolicy")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mNtpHeader")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mRootView")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/ntp/NewTabPage", "mNewTabPageLayout")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/ntp/NewTabPage", "mFeedSurfaceProvider")); Assert.assertTrue(fieldExists( "org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor", "mHasClearedOmniboxForFocus")); @@ -98,6 +139,66 @@ public void testFieldsExist() throws Exception { Assert.assertTrue( fieldExists("org/chromium/chrome/browser/sync/settings/ManageSyncSettings", "mSyncPaymentsIntegration")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator", + "mMediator")); + Assert.assertTrue(fieldExists("org/chromium/chrome/browser/toolbar/ToolbarManager", + "mBottomControlsCoordinator")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mBrowserControlsSizer")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mFullscreenManager")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mActivityTabProvider")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mAppThemeColorProvider")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mShareDelegateSupplier")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mScrimCoordinator")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/ToolbarManager", "mActivity")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mShowStartSurfaceSupplier")); + Assert.assertTrue(fieldExists("org/chromium/chrome/browser/toolbar/ToolbarManager", + "mOverviewModeBehaviorSupplier")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mMenuButtonCoordinator")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mToolbarTabController")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/ToolbarManager", "mLocationBar")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mActionModeController")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mLocationBarModel")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/ToolbarManager", "mToolbar")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", "mBookmarkBridgeSupplier")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator", + "mTabSwitcherModeCoordinatorPhone")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator", + "mOptionalButtonController")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTCoordinatorPhone", + "mTabSwitcherModeToolbar")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", + "mNewTabViewButton")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", + "mNewTabImageButton")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", + "mToggleTabStackButton")); + Assert.assertTrue(fieldExists( + "org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", "mMenuButton")); + Assert.assertTrue( + fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", + "mShouldShowNewTabVariation")); } private boolean classExists(String className) { diff --git a/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java b/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java index 691424ba6327..84e983fd9737 100644 --- a/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java +++ b/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java @@ -14,9 +14,8 @@ import org.chromium.ui.base.DeviceFormFactor; class BraveAppMenu { - private static final String BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY = - "brave_bottom_toolbar_enabled_key"; - private static final String BRAVE_BOTTOM_TOOLBAR_SET_KEY = "brave_bottom_toolbar_enabled"; + private static final String BRAVE_BOTTOM_TOOLBAR_CURRENTLY_VISIBLE = + "brave_bottom_toolbar_currently_visible"; public static int[] getPopupPosition(int[] tempLocation, boolean isByPermanentButton, int negativeSoftwareVerticalOffset, int negativeVerticalOffsetNotTopAnchored, @@ -26,7 +25,7 @@ public static int[] getPopupPosition(int[] tempLocation, boolean isByPermanentBu negativeSoftwareVerticalOffset, negativeVerticalOffsetNotTopAnchored, screenRotation, appRect, padding, anchorView, popupWidth, popupHeight, viewLayoutDirection); - if (isBottomToolbarEnabled()) { + if (isMenuFromBottom()) { anchorView.getLocationOnScreen(tempLocation); int anchorViewLocationOnScreenY = tempLocation[1]; position[1] += appRect.bottom - anchorViewLocationOnScreenY - popupHeight; @@ -37,19 +36,11 @@ public static int[] getPopupPosition(int[] tempLocation, boolean isByPermanentBu } public static int getAnimationStyle() { - return isBottomToolbarEnabled() ? R.style.OverflowMenuAnimBottom : R.style.OverflowMenuAnim; + return isMenuFromBottom() ? R.style.OverflowMenuAnimBottom : R.style.OverflowMenuAnim; } - private static boolean isBottomToolbarEnabled() { - if (DeviceFormFactor.isNonMultiDisplayContextOnTablet( - ContextUtils.getApplicationContext())) { - return false; - } + private static boolean isMenuFromBottom() { SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences(); - if (sharedPreferences.getBoolean(BRAVE_BOTTOM_TOOLBAR_SET_KEY, false)) { - return sharedPreferences.getBoolean(BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, true); - } - assert (false); - return false; + return sharedPreferences.getBoolean(BRAVE_BOTTOM_TOOLBAR_CURRENTLY_VISIBLE, false); } } diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn index 7d761002b18b..210271b7b9ff 100644 --- a/build/android/bytecode/BUILD.gn +++ b/build/android/bytecode/BUILD.gn @@ -12,6 +12,7 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAndroidSyncSettingsClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAppMenuClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBottomControlsCoordinatorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveCommandLineInitUtilClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java", @@ -22,6 +23,10 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSearchEngineAdapterClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/ByteCodeProcessor.java", "//brave/build/android/bytecode/java/org/brave/bytecode/ClassPathValidator.java", "//brave/build/android/bytecode/java/org/brave/bytecode/ThreadAssertionClassAdapter.java", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveBottomControlsCoordinatorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveBottomControlsCoordinatorClassAdapter.java new file mode 100644 index 000000000000..44b55b1d85a5 --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveBottomControlsCoordinatorClassAdapter.java @@ -0,0 +1,22 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveBottomControlsCoordinatorClassAdapter extends BraveClassVisitor { + static String sBottomControlsCoordinatorClassName = + "org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator"; + static String sBraveBottomControlsCoordinatorClassName = + "org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator"; + + public BraveBottomControlsCoordinatorClassAdapter(ClassVisitor visitor) { + super(visitor); + + deleteField(sBraveBottomControlsCoordinatorClassName, "mMediator"); + makeProtectedField(sBottomControlsCoordinatorClassName, "mMediator"); + } +} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java index 153deeeea6b3..33e501e23160 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java @@ -21,6 +21,11 @@ public static ClassVisitor createAdapter(ClassVisitor chain) { chain = new BraveSearchEngineAdapterClassAdapter(chain); chain = new BraveCommandLineInitUtilClassAdapter(chain); chain = new BraveAppMenuClassAdapter(chain); + chain = new BraveBottomControlsCoordinatorClassAdapter(chain); + chain = new BraveToolbarManagerClassAdapter(chain); + chain = new BraveTopToolbarCoordinatorClassAdapter(chain); + chain = new BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter(chain); + chain = new BraveTabSwitcherModeTTPhoneClassAdapter(chain); return chain; } } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter.java new file mode 100644 index 000000000000..0ea3e680a8a1 --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter.java @@ -0,0 +1,22 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter extends BraveClassVisitor { + static String sTabSwitcherModeTTCoordinatorPhoneClassName = + "org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTCoordinatorPhone"; + static String sBraveTabSwitcherModeTTCoordinatorPhoneClassName = + "org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone"; + + public BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter(ClassVisitor visitor) { + super(visitor); + + deleteField(sBraveTabSwitcherModeTTCoordinatorPhoneClassName, "mTabSwitcherModeToolbar"); + makeProtectedField(sTabSwitcherModeTTCoordinatorPhoneClassName, "mTabSwitcherModeToolbar"); + } +} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java new file mode 100644 index 000000000000..beb6210f97e6 --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java @@ -0,0 +1,41 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveTabSwitcherModeTTPhoneClassAdapter extends BraveClassVisitor { + static String sTabSwitcherModeTTPhoneClassName = + "org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone"; + static String sBraveTabSwitcherModeTTPhoneClassName = + "org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone"; + + public BraveTabSwitcherModeTTPhoneClassAdapter(ClassVisitor visitor) { + super(visitor); + + deleteField(sBraveTabSwitcherModeTTPhoneClassName, "mNewTabViewButton"); + makeProtectedField(sTabSwitcherModeTTPhoneClassName, "mNewTabViewButton"); + + deleteField(sBraveTabSwitcherModeTTPhoneClassName, "mNewTabImageButton"); + makeProtectedField(sTabSwitcherModeTTPhoneClassName, "mNewTabImageButton"); + + deleteField(sBraveTabSwitcherModeTTPhoneClassName, "mToggleTabStackButton"); + makeProtectedField(sTabSwitcherModeTTPhoneClassName, "mToggleTabStackButton"); + + deleteField(sBraveTabSwitcherModeTTPhoneClassName, "mMenuButton"); + makeProtectedField(sTabSwitcherModeTTPhoneClassName, "mMenuButton"); + + deleteField(sBraveTabSwitcherModeTTPhoneClassName, "mShouldShowNewTabVariation"); + makeProtectedField(sTabSwitcherModeTTPhoneClassName, "mShouldShowNewTabVariation"); + + makePublicMethod(sTabSwitcherModeTTPhoneClassName, "updateNewTabButtonVisibility"); + addMethodAnnotation(sBraveTabSwitcherModeTTPhoneClassName, "updateNewTabButtonVisibility", + "Ljava/lang/Override;"); + + makePublicMethod(sTabSwitcherModeTTPhoneClassName, "shouldShowIncognitoToggle"); + deleteMethod(sBraveTabSwitcherModeTTPhoneClassName, "shouldShowIncognitoToggle"); + } +} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java new file mode 100644 index 000000000000..39b7afbb6dab --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java @@ -0,0 +1,84 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveToolbarManagerClassAdapter extends BraveClassVisitor { + static String sToolbarManagerClassName = "org/chromium/chrome/browser/toolbar/ToolbarManager"; + static String sBraveToolbarManagerClassName = + "org/chromium/chrome/browser/toolbar/BraveToolbarManager"; + + public BraveToolbarManagerClassAdapter(ClassVisitor visitor) { + super(visitor); + + deleteField(sBraveToolbarManagerClassName, "mBottomControlsCoordinator"); + makeProtectedField(sToolbarManagerClassName, "mBottomControlsCoordinator"); + + deleteField(sBraveToolbarManagerClassName, "mBrowserControlsSizer"); + makeProtectedField(sToolbarManagerClassName, "mBrowserControlsSizer"); + + deleteField(sBraveToolbarManagerClassName, "mFullscreenManager"); + makeProtectedField(sToolbarManagerClassName, "mFullscreenManager"); + + deleteField(sBraveToolbarManagerClassName, "mActivityTabProvider"); + makeProtectedField(sToolbarManagerClassName, "mActivityTabProvider"); + + deleteField(sBraveToolbarManagerClassName, "mAppThemeColorProvider"); + makeProtectedField(sToolbarManagerClassName, "mAppThemeColorProvider"); + + deleteField(sBraveToolbarManagerClassName, "mShareDelegateSupplier"); + makeProtectedField(sToolbarManagerClassName, "mShareDelegateSupplier"); + + deleteField(sBraveToolbarManagerClassName, "mScrimCoordinator"); + makeProtectedField(sToolbarManagerClassName, "mScrimCoordinator"); + + deleteField(sBraveToolbarManagerClassName, "mActivity"); + makeProtectedField(sToolbarManagerClassName, "mActivity"); + + deleteField(sBraveToolbarManagerClassName, "mShowStartSurfaceSupplier"); + makeProtectedField(sToolbarManagerClassName, "mShowStartSurfaceSupplier"); + + deleteField(sBraveToolbarManagerClassName, "mOverviewModeBehaviorSupplier"); + makeProtectedField(sToolbarManagerClassName, "mOverviewModeBehaviorSupplier"); + + deleteField(sBraveToolbarManagerClassName, "mMenuButtonCoordinator"); + makeProtectedField(sToolbarManagerClassName, "mMenuButtonCoordinator"); + + deleteField(sBraveToolbarManagerClassName, "mToolbarTabController"); + makeProtectedField(sToolbarManagerClassName, "mToolbarTabController"); + + deleteField(sBraveToolbarManagerClassName, "mLocationBar"); + makeProtectedField(sToolbarManagerClassName, "mLocationBar"); + + deleteField(sBraveToolbarManagerClassName, "mActionModeController"); + makeProtectedField(sToolbarManagerClassName, "mActionModeController"); + + deleteField(sBraveToolbarManagerClassName, "mLocationBarModel"); + makeProtectedField(sToolbarManagerClassName, "mLocationBarModel"); + + deleteField(sBraveToolbarManagerClassName, "mToolbar"); + makeProtectedField(sToolbarManagerClassName, "mToolbar"); + + deleteField(sBraveToolbarManagerClassName, "mBookmarkBridgeSupplier"); + makeProtectedField(sToolbarManagerClassName, "mBookmarkBridgeSupplier"); + + makePublicMethod(sToolbarManagerClassName, "onOrientationChange"); + addMethodAnnotation( + sBraveToolbarManagerClassName, "onOrientationChange", "Ljava/lang/Override;"); + + makePublicMethod(sToolbarManagerClassName, "updateButtonStatus"); + addMethodAnnotation( + sBraveToolbarManagerClassName, "updateButtonStatus", "Ljava/lang/Override;"); + + makePublicMethod(sToolbarManagerClassName, "updateBookmarkButtonStatus"); + addMethodAnnotation(sBraveToolbarManagerClassName, "updateBookmarkButtonStatus", + "Ljava/lang/Override;"); + + makePublicMethod(sToolbarManagerClassName, "updateReloadState"); + deleteMethod(sBraveToolbarManagerClassName, "updateReloadState"); + } +} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java new file mode 100644 index 000000000000..4b8b0200db26 --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java @@ -0,0 +1,25 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveTopToolbarCoordinatorClassAdapter extends BraveClassVisitor { + static String sTopToolbarCoordinatorClassName = + "org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator"; + static String sBraveTopToolbarCoordinatorClassName = + "org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator"; + + public BraveTopToolbarCoordinatorClassAdapter(ClassVisitor visitor) { + super(visitor); + + deleteField(sBraveTopToolbarCoordinatorClassName, "mTabSwitcherModeCoordinatorPhone"); + makeProtectedField(sTopToolbarCoordinatorClassName, "mTabSwitcherModeCoordinatorPhone"); + + deleteField(sBraveTopToolbarCoordinatorClassName, "mOptionalButtonController"); + makeProtectedField(sTopToolbarCoordinatorClassName, "mOptionalButtonController"); + } +} diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 4c0a670fdc02..d99ec7517435 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 1e8697a4a42e061cf4397f40fb62b698ce75f567..a5d1f5044c0bd31cbba83881ba33ec81068e754d 100644 +index 1e8697a4a42e061cf4397f40fb62b698ce75f567..41364b1a5088077b88298ab142df1aa6c9ea2f02 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java @@ -181,7 +181,7 @@ import java.util.Locale; @@ -20,6 +20,15 @@ index 1e8697a4a42e061cf4397f40fb62b698ce75f567..a5d1f5044c0bd31cbba83881ba33ec81 assert profile != null : "Unexpectedly null profile from TabModel."; if (profile == null) return; +@@ -1425,7 +1425,7 @@ public class ChromeTabbedActivity extends ChromeActivity Date: Wed, 23 Sep 2020 21:43:44 -0400 Subject: [PATCH 064/152] Remove override of use_blink_v8_binding_new_idl_interface. The override was added in https://github.com/brave/brave-core/pull/6195/commits/ea29650533277ae7bf629184fd63a9c01fb29352 due to build errors like gen/third_party/blink/renderer/bindings/modules/v8/v8_shared_worker_global_scope.cc:4614:34: error: no member named 'isReportingObserversEnabled' in 'blink::ContextFeatureSettings' context_feature_settings->isReportingObserversEnabled())) { ~~~~~~~~~~~~~~~~~~~~~~~~ ^ 1 error generated. As it turns out, the error were due to us making ReportingObservers ContextEnabled in this change: https://github.com/brave/brave-core/pull/4578/files To fix added missing methods to blink::ContextFeatureSettings similarly to how MojoJS is handled. --- build/commands/lib/config.js | 7 ----- .../context_feature_settings.h | 30 +++++++++++++++++++ ..._features-context_feature_settings.h.patch | 12 ++++++++ 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 chromium_src/third_party/blink/renderer/core/context_features/context_feature_settings.h create mode 100644 patches/third_party-blink-renderer-core-context_features-context_feature_settings.h.patch diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index 062cb5072801..7dd3ecc79dc5 100755 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -222,13 +222,6 @@ Config.prototype.buildArgs = function () { enable_cdm_host_verification: this.enableCDMHostVerification(), skip_signing: !this.shouldSign(), chrome_pgo_phase: this.chromePgoPhase, - // When enabled (see third_party/blink/renderer/config.gni), we end up with - // multiple files giving compilation error similar to: - // gen/third_party/blink/renderer/bindings/modules/v8/v8_shared_worker_global_scope.cc:4614:34: - // error: no member named 'isReportingObserversEnabled' in 'blink::ContextFeatureSettings' - // cs.chromium.org shows the same files not having any calls to isReportingObserversEnabled, - // which makes me think that Chromium also disables it in their builds. - use_blink_v8_binding_new_idl_interface: false, ...this.extraGnArgs, } diff --git a/chromium_src/third_party/blink/renderer/core/context_features/context_feature_settings.h b/chromium_src/third_party/blink/renderer/core/context_features/context_feature_settings.h new file mode 100644 index 000000000000..73a637e7c9f7 --- /dev/null +++ b/chromium_src/third_party/blink/renderer/core/context_features/context_feature_settings.h @@ -0,0 +1,30 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_CONTEXT_FEATURES_CONTEXT_FEATURE_SETTINGS_H_ +#define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_CONTEXT_FEATURES_CONTEXT_FEATURE_SETTINGS_H_ + +// ContextEnabled=ReportingObservers feature methods need to be added since we +// patched ReportingObservers as ContextEnabled into +// third_party/blink/renderer/core/frame/reporting_observer.idl +#define BRAVE_CONTEXT_FEATURE_SETTINGS_H_ \ + public: \ + void enableReportingObservers(bool enable) { \ + enable_reporting_observers_ = enable; \ + } \ + bool isReportingObserversEnabled() const { \ + return enable_reporting_observers_; \ + } \ + \ + private: \ + bool enable_reporting_observers_ = false; \ + \ + public: +// #define BRAVE_CONTEXT_FEATURE_SETTINGS_H_ + +#include "../../../../../../../third_party/blink/renderer/core/context_features/context_feature_settings.h" +#undef BRAVE_CONTEXT_FEATURE_SETTINGS_H_ + +#endif // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_CONTEXT_FEATURES_CONTEXT_FEATURE_SETTINGS_H_ diff --git a/patches/third_party-blink-renderer-core-context_features-context_feature_settings.h.patch b/patches/third_party-blink-renderer-core-context_features-context_feature_settings.h.patch new file mode 100644 index 000000000000..24d512daef80 --- /dev/null +++ b/patches/third_party-blink-renderer-core-context_features-context_feature_settings.h.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/blink/renderer/core/context_features/context_feature_settings.h b/third_party/blink/renderer/core/context_features/context_feature_settings.h +index 9c9a289262c01daa45e24d4cb553b7d90797f7b8..de4e8ced39169f817f6c22842013557198630137 100644 +--- a/third_party/blink/renderer/core/context_features/context_feature_settings.h ++++ b/third_party/blink/renderer/core/context_features/context_feature_settings.h +@@ -35,6 +35,7 @@ class CORE_EXPORT ContextFeatureSettings final + bool isMojoJSEnabled() const { return enable_mojo_js_; } + + void Trace(Visitor*) const override; ++ BRAVE_CONTEXT_FEATURE_SETTINGS_H_ + + private: + bool enable_mojo_js_ = false; From 8b8c40e1e254535e49b733ff3b6f0853b6803a49 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 30 Sep 2020 20:21:53 +0200 Subject: [PATCH 065/152] Use full relative path to Brave module files from generated V8 bindings The new IDL compiler removes the ../../ prefix for include files in an attempt to "canonicalize the paths heuristically", which works well for modules under //third_party/blink/renderer/modules. Unfortunately, that does not work well with our Brave module since it lives under //brave/third_party/blink/renderer/modules, and the prefix needs to be kept so that header files can be correctly included from the generated sources' directory. This patch adapts the python code that does this adjustment so that it does not remove the prefix for Brave-specific files. --- ...renderer-bindings-idl_in_modules.gni.patch | 12 ++++++++++ ...scripts-web_idl-composition_parts.py.patch | 23 +++++++++++++++++++ third_party/blink/renderer/includes.gni | 8 +++++++ 3 files changed, 43 insertions(+) create mode 100644 patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch create mode 100644 patches/third_party-blink-renderer-bindings-scripts-web_idl-composition_parts.py.patch diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch new file mode 100644 index 000000000000..af8fdb714361 --- /dev/null +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni +index 0ea2e923a37a2698921c6c0a98828940a4ac64ae..5fd4cc47377990bab6b6a4df00d9e552815d38e3 100644 +--- a/third_party/blink/renderer/bindings/idl_in_modules.gni ++++ b/third_party/blink/renderer/bindings/idl_in_modules.gni +@@ -1023,6 +1023,7 @@ static_idl_files_in_modules = get_path_info( + "//third_party/blink/renderer/modules/xr/xr_world_tracking_state.idl", + ], + "abspath") ++static_idl_files_in_modules += get_path_info(brave_static_idl_files_in_modules, "abspath") + + # Serial + if (!is_android) { diff --git a/patches/third_party-blink-renderer-bindings-scripts-web_idl-composition_parts.py.patch b/patches/third_party-blink-renderer-bindings-scripts-web_idl-composition_parts.py.patch new file mode 100644 index 000000000000..ab44efca01fc --- /dev/null +++ b/patches/third_party-blink-renderer-bindings-scripts-web_idl-composition_parts.py.patch @@ -0,0 +1,23 @@ +diff --git a/third_party/blink/renderer/bindings/scripts/web_idl/composition_parts.py b/third_party/blink/renderer/bindings/scripts/web_idl/composition_parts.py +index 5e8de89409976528f8d97d4962f9f111c6d158a1..d8eca553b5c3aaa2ae3f8644457d20a7c4bb399b 100644 +--- a/third_party/blink/renderer/bindings/scripts/web_idl/composition_parts.py ++++ b/third_party/blink/renderer/bindings/scripts/web_idl/composition_parts.py +@@ -147,6 +147,9 @@ class Location(object): + _blink_path_prefix = posixpath.sep + posixpath.join( + 'third_party', 'blink', 'renderer', '') + ++ _brave_path_prefix = posixpath.sep + posixpath.join( ++ 'brave', 'third_party', 'blink', 'renderer', '') ++ + def __init__(self, filepath=None, line_number=None, position=None): + assert filepath is None or isinstance(filepath, str) + assert line_number is None or isinstance(line_number, int) +@@ -155,7 +158,7 @@ class Location(object): + # idl_parser produces paths based on the working directory, which may + # not be the project root directory, e.g. "../../third_party/blink/...". + # Canonicalize the paths heuristically. +- if filepath is not None: ++ if filepath is not None and filepath.find(self._brave_path_prefix) < 0: + index = filepath.find(self._blink_path_prefix) + if index >= 0: + filepath = filepath[index + 1:] diff --git a/third_party/blink/renderer/includes.gni b/third_party/blink/renderer/includes.gni index 1be86945c8e2..3efb82c4a24c 100644 --- a/third_party/blink/renderer/includes.gni +++ b/third_party/blink/renderer/includes.gni @@ -25,3 +25,11 @@ brave_idl_imports = [ "//brave/third_party/blink/renderer/modules/brave/idls.gni", "//brave/third_party/blink/renderer/modules/global_privacy_control/idls.gni" ] + +# common includes which can help minimize patches for +# third_party/blink/renderer/bindings/idl_in_modules.gni +brave_static_idl_files_in_modules = [ + "//brave/third_party/blink/renderer/modules/brave/brave.idl", + "//brave/third_party/blink/renderer/modules/brave/navigator_brave.idl", + "//brave/third_party/blink/renderer/modules/global_privacy_control/navigator_global_privacy_control.idl", +] From ef00b7dff27ec3a14ca7f90b838c44dd3b53174f Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 5 Oct 2020 21:21:05 +0200 Subject: [PATCH 066/152] List generated V8 bindings for Brave module in generated_in_modules.gni With the new IDL compiler, every source file related to a Blink module needs to be listed here so that the right symbols get properly exposed and we don't find build errors like the following one while linking: ld.lld: error: undefined symbol: blink::Brave::wrapper_type_info_ >>> referenced by navigator_brave.cc >>> obj/brave/third_party/blink/renderer/modules/brave/brave/navigator_brave.o:(blink::Brave::GetWrapperTypeInfo() const) This patch adds v8_brave.{h,cc} to the list so that we can keep building the Brave module with the new IDL compiler enabled, which is the default upstream now. --- ...-renderer-bindings-generated_in_modules.gni.patch | 12 ++++++++++++ third_party/blink/renderer/includes.gni | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100644 patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch new file mode 100644 index 000000000000..f2cee260114c --- /dev/null +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni +index 613efdd10d3645c3f3124bc97f512be07fa669aa..3b7354f6a04271dbc281eee82b666c51e4fadc66 100644 +--- a/third_party/blink/renderer/bindings/generated_in_modules.gni ++++ b/third_party/blink/renderer/bindings/generated_in_modules.gni +@@ -2134,6 +2134,7 @@ generated_interface_sources_in_modules = [ + "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.cc", + "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.h", + ] ++generated_interface_sources_in_modules += brave_generated_interface_sources_in_modules + + # Serial + if (!is_android) { diff --git a/third_party/blink/renderer/includes.gni b/third_party/blink/renderer/includes.gni index 3efb82c4a24c..cf727405a12f 100644 --- a/third_party/blink/renderer/includes.gni +++ b/third_party/blink/renderer/includes.gni @@ -33,3 +33,10 @@ brave_static_idl_files_in_modules = [ "//brave/third_party/blink/renderer/modules/brave/navigator_brave.idl", "//brave/third_party/blink/renderer/modules/global_privacy_control/navigator_global_privacy_control.idl", ] + +# common includes which can help minimize patches for +# third_party/blink/renderer/bindings/generated_in_modules.gni +brave_generated_interface_sources_in_modules = [ + "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_brave.h", + "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_brave.cc", +] From a0bbd27a4a08dc2a3d3d0b181f27023a143e741a Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 5 Oct 2020 17:30:33 -0400 Subject: [PATCH 067/152] [Android] Block creation of ImageFetcher We don't have feed in Brave and thus don't need to create ImageFetcher Chromium change: https://chromium.googlesource.com/chromium/src/+/403351cb4188dafdce7e60080d02534f59b75414 Remove some dead Zine code - Offline pages integration with zine is not needed, since Zine is iOS only, and offline_pages is Android only. This includes code in both ntp_snippets/ and offline_pages/. - Remove SuggestionsEventReporter Java integration, none of these apply to the new Feed. Bug: 1069183 --- .../prefetch/prefetch_service_factory.cc | 15 +++++++++++++++ ...ges-prefetch-prefetch_service_factory.cc.patch | 12 ++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 chromium_src/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc create mode 100644 patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch diff --git a/chromium_src/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b/chromium_src/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc new file mode 100644 index 000000000000..f3bbb1c8bc2d --- /dev/null +++ b/chromium_src/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc @@ -0,0 +1,15 @@ +/* Copyright 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// We don't have feed in Brave and thus don't need to create ImageFetcher +#define BRAVE_GET_IMAGE_FETCHER \ + const bool feed_enabled = \ + base::FeatureList::IsEnabled(feed::kInterestFeedContentSuggestions) || \ + base::FeatureList::IsEnabled(feed::kInterestFeedV2); \ + DCHECK(!feed_enabled); \ + return nullptr; + +#include "../../../../../../chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc" +#undef BRAVE_GET_IMAGE_FETCHER diff --git a/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch b/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch new file mode 100644 index 000000000000..110c9d3468be --- /dev/null +++ b/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc +index 8f6d95dda58140306405948ba124b8ad3fc95620..9e91d9a86ec3e5d59e8a1c7a833ede2f81aebdee 100644 +--- a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc ++++ b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc +@@ -51,6 +51,7 @@ namespace { + image_fetcher::ImageFetcher* GetImageFetcher( + ProfileKey* key, + image_fetcher::ImageFetcherConfig config) { ++ BRAVE_GET_IMAGE_FETCHER + image_fetcher::ImageFetcherService* image_fetcher_service = + ImageFetcherServiceFactory::GetForKey(key); + DCHECK(image_fetcher_service); From 498e7083d6c94d91dfc5b76d4714ebaf9f3cfcc6 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 2 Oct 2020 18:39:17 -0400 Subject: [PATCH 068/152] [Android] CustomTabToolbar moved to customtabs/features/toolbar. Chromium change: https://chromium.googlesource.com/chromium/src/+/6fd2d9fe48d63008fa3c89d2bb666f1432fc54ee commit 6fd2d9fe48d63008fa3c89d2bb666f1432fc54ee Author: Jinsuk Kim Date: Sun Sep 27 20:48:06 2020 +0000 Toolbar: Move CustomTabToolbar to customtabs/features/toolbar Class CustomToolbar inherits ToolbarLayout for the layout for Custom Tab Toolbar. It also provides an implementation of LocationBar interface used in omnibox. The concrete implementation classes for Custom Tab don't necessarily have to be a part of toolbar/. This CL moves the class to customtab/features/toolbar where other implementation of Custom Tab features are placed. This also helps reduce the outbound dependencies the class brought in to toolbar/. Bug: 1127732 --- ...abs-features-toolbar-CustomTabToolbar.java.patch | 13 +++++++++++++ ...-browser-toolbar-top-CustomTabToolbar.java.patch | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch new file mode 100644 index 000000000000..7b845e5f2933 --- /dev/null +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch @@ -0,0 +1,13 @@ +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java +index 1be17e15f4f6c3c8b7f4a0a3ee37161f35c16dcc..47087c7946b7a0581f1d6c516e18f52fbc9a50b1 100644 +--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java +@@ -97,7 +97,7 @@ import java.util.regex.Pattern; + /** + * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs. + */ +-public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickListener { ++public class CustomTabToolbar extends BraveToolbarLayout implements View.OnLongClickListener { + private static final Object ORIGIN_SPAN = new Object(); + + /** diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch deleted file mode 100644 index 3b0713255f0c..000000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java -index e327ea90675087a5e497d66e405c395734bc5b3d..eb7748a45e58b2fc9bd46a890593644049532067 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java -@@ -92,7 +92,7 @@ import java.util.regex.Pattern; - /** - * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs. - */ --public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickListener { -+public class CustomTabToolbar extends BraveToolbarLayout implements View.OnLongClickListener { - private static final Object ORIGIN_SPAN = new Object(); - - /** From 491a4c7056080f8ebb0b0ec60495d9515c78212b Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 2 Oct 2020 19:27:42 -0400 Subject: [PATCH 069/152] histograms.xml was split into smaller xmls. Chromium change: https://chromium.googlesource.com/chromium/src/+/56830939ffe2ec4c7d98025d9556468210eb36eb commit 56830939ffe2ec4c7d98025d9556468210eb36eb Author: Weilun Shi Date: Mon Sep 28 01:34:19 2020 +0000 Split histograms.xml into multiple smaller xmls Split the rest of the histograms.xml into multiple smaller xmls. This makes all histograms are searchable from code search and reduces the load time to render a histograms.xml file. This cl hasn't deleted the old histograms.xml yet because there are other code referencing to it. Bug: 993193 --- .../tools-metrics-histograms-histograms.xml.patch | 12 ------------ ...-histograms_xml-histogram_suffixes_list.xml.patch | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 patches/tools-metrics-histograms-histograms.xml.patch create mode 100644 patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch deleted file mode 100644 index d573d92498a0..000000000000 --- a/patches/tools-metrics-histograms-histograms.xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml -index 6124dbded858bf5a3f957465447b7397dac2492b..5241b681ebec98730dbc23bde3b68ce9ed619574 100644 ---- a/tools/metrics/histograms/histograms.xml -+++ b/tools/metrics/histograms/histograms.xml -@@ -210770,6 +210770,7 @@ regressions. --> - - - -+ - - diff --git a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch new file mode 100644 index 000000000000..b8ed22509cd5 --- /dev/null +++ b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch @@ -0,0 +1,12 @@ +diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +index 408df4b147a7eae7af8dff8f6d26351e08c45e53..545af8b7fe6dd69af15f5835d914080aa76368e4 100644 +--- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml ++++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +@@ -13683,6 +13683,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. + + + ++ + + From 673155d0f8a95d2f3ac8998bf930e7843e9549d4 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 2 Oct 2020 19:39:56 -0400 Subject: [PATCH 070/152] Conflict-resolved patches from Chromium 87.0.4270.0 to Chromium 87.0.4278.0. --- patches/build-config-android-config.gni.patch | 6 +-- patches/chrome-BUILD.gn.patch | 30 ++++++------- patches/chrome-VERSION.patch | 4 +- patches/chrome-android-BUILD.gn.patch | 14 +++--- ...me-browser-ChromeTabbedActivity.java.patch | 16 +++---- ...stions-tile-SuggestionsTileView.java.patch | 6 +-- ...rowser-sync-AndroidSyncSettings.java.patch | 8 ++-- ...-browser-toolbar-ToolbarManager.java.patch | 20 ++++----- ...rowser-toolbar-top-ToolbarPhone.java.patch | 20 ++++----- ...olbar-top-TopToolbarCoordinator.java.patch | 12 ++--- patches/chrome-browser-BUILD.gn.patch | 10 ++--- ...-browser-resources-settings-BUILD.gn.patch | 10 ++--- ...er_ui-site_settings-android-BUILD.gn.patch | 5 +-- ...er-extension_event_histogram_value.h.patch | 6 +-- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- 15 files changed, 105 insertions(+), 106 deletions(-) diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index fae91a341257..d07ed9ea2f15 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,9 +1,9 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 42dae77e1709293ee3745469570d13404b1c8c65..858e9a3a03925fe1f7d39a57c318eab95e2ec914 100644 +index 0b942fa4cf9ce965d9ba5d93ac25e42baf7bbfe8..ee0e84a822681db8282e35d6d9e1f0d0c7aa7cb6 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni -@@ -7,6 +7,7 @@ - import("//build/config/chromeos/ui_mode.gni") +@@ -3,6 +3,7 @@ + # found in the LICENSE file. # This file contains common system config stuff for the Android build. +import("//brave/build/android/config.gni") diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 747811d8c4ae..0c51389502dd 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda8b64988a 100644 +index bfaf61fe2622812724617267bfe099bb9608dfff..b02d6c823a019e1b410e902915567f6c08f4d6e4 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -146,6 +146,10 @@ if (!is_android && !is_mac) { +@@ -154,6 +154,10 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -13,7 +13,7 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda deps += [ ":chrome_dll", -@@ -402,11 +406,12 @@ if (is_win) { +@@ -416,11 +420,12 @@ if (is_win) { "--bundle_id=$chrome_mac_bundle_id", ] } @@ -27,7 +27,7 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -424,6 +429,7 @@ if (is_win) { +@@ -438,6 +443,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -35,7 +35,7 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -492,7 +498,7 @@ if (is_win) { +@@ -506,7 +512,7 @@ if (is_win) { args = [ "-b", @@ -44,7 +44,7 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda "-v", rebase_path(chrome_version_file, root_build_dir), "-g", -@@ -561,6 +567,7 @@ if (is_win) { +@@ -575,6 +581,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -52,7 +52,7 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda } } -@@ -593,6 +600,7 @@ if (is_win) { +@@ -607,6 +614,7 @@ if (is_win) { "--scm=0", ] } @@ -64,7 +64,7 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -616,7 +625,7 @@ if (is_win) { +@@ -630,7 +639,7 @@ if (is_win) { output_name = chrome_helper_name + invoker.helper_name_suffix @@ -73,7 +73,7 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1004,6 +1013,10 @@ if (is_win) { +@@ -1017,6 +1026,10 @@ if (is_win) { if (is_chrome_branded) { deps += [ ":default_apps" ] } @@ -84,15 +84,15 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1161,6 +1174,7 @@ if (is_win) { +@@ -1174,6 +1187,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ + "//brave:browser_dependencies", - "//chrome/browser", - "//chrome/common", - "//components/gwp_asan/buildflags", -@@ -1236,12 +1250,13 @@ group("child_dependencies") { + "//build:branding_buildflags", + "//build:chromeos_buildflags", + "//chrome/app:shutdown_signal_handlers", +@@ -1274,12 +1288,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -107,7 +107,7 @@ index e561fed130ff8a4e3c40ebc6997225cf050c952f..4f0c19b408224470e6b33a7a3fd25dda output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1295,6 +1310,7 @@ group("resources") { +@@ -1333,6 +1348,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 8efb8a52784c..22788d63e33a 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 572ffda3954b1e864e632a21b95afb24b2f4797d..d70c78e41d865865c07ef267e7a9e394da10d3cb 100644 +index 801f8a1c4763ad368297b3a5a5dbd0414140de93..d70c78e41d865865c07ef267e7a9e394da10d3cb 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=87 -MINOR=0 --BUILD=4270 +-BUILD=4278 -PATCH=0 +MINOR=1 +BUILD=18 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 047746c065a0..53ca9e73d447 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,16 +1,16 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index b1449fc06f0475232ed9924beb6c821d2a9f3143..faaa4dd480d32efcc6628addeb77559c9cca6d4a 100644 +index b6ce2c5e4dc999fc812f7efbcdccc07021dee281..e6d9fa416181b46a08ef6dc2cb17d21e7f07e309 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -229,6 +229,7 @@ android_resources("chrome_app_java_resources") { +@@ -231,6 +231,7 @@ android_resources("chrome_app_java_resources") { "//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:material_design_java", ] + deps += brave_chrome_app_java_resources_deps sources += brave_java_resources resource_overlay = true - create_srcjar = false } -@@ -515,6 +516,7 @@ android_library("chrome_java") { + if (enable_vr) { +@@ -522,6 +523,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,7 +18,7 @@ index b1449fc06f0475232ed9924beb6c821d2a9f3143..faaa4dd480d32efcc6628addeb77559c srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -548,6 +550,7 @@ android_library("chrome_java") { +@@ -555,6 +557,7 @@ android_library("chrome_java") { "//components/ui_metrics:ui_metrics_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index b1449fc06f0475232ed9924beb6c821d2a9f3143..faaa4dd480d32efcc6628addeb77559c # From java_sources.gni. sources = chrome_java_sources + [ -@@ -672,6 +675,7 @@ group("jni_headers") { +@@ -681,6 +684,7 @@ group("jni_headers") { "//chrome/browser/webauthn/android:jni_headers", "//components/media_router/browser/android:jni_headers", ] @@ -34,7 +34,7 @@ index b1449fc06f0475232ed9924beb6c821d2a9f3143..faaa4dd480d32efcc6628addeb77559c } action("chrome_android_java_google_api_keys_srcjar") { -@@ -1758,6 +1762,7 @@ if (current_toolchain == default_toolchain) { +@@ -1774,6 +1778,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index d99ec7517435..aad8c8c4bc90 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 1e8697a4a42e061cf4397f40fb62b698ce75f567..41364b1a5088077b88298ab142df1aa6c9ea2f02 100644 +index b2258ddf5738d94865bd543a55dec173cf28d1ff..334d2d7a5031fb3b18870b056b1c9c9ee424da34 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java @@ -181,7 +181,7 @@ import java.util.Locale; @@ -11,7 +11,7 @@ index 1e8697a4a42e061cf4397f40fb62b698ce75f567..41364b1a5088077b88298ab142df1aa6 implements ChromeAccessibilityUtil.Observer { private static final String TAG = "ChromeTabbedActivity"; -@@ -984,7 +984,7 @@ public class ChromeTabbedActivity extends ChromeActivity( @@ -20,7 +20,7 @@ index 1e8697a4a42e061cf4397f40fb62b698ce75f567..41364b1a5088077b88298ab142df1aa6 assert profile != null : "Unexpectedly null profile from TabModel."; if (profile == null) return; -@@ -1425,7 +1425,7 @@ public class ChromeTabbedActivity extends ChromeActivityObject()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3541,6 +3547,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3569,6 +3575,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: + BRAVE_WEBGL_GET_PARAMETER_UNMASKED_RENDERER if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { - if (IsUserInIdentifiabilityStudy()) { + if (IdentifiabilityStudySettings::Get()->IsActive()) { RecordIdentifiableGLParameterDigest( -@@ -3555,6 +3562,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3583,6 +3590,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: + BRAVE_WEBGL_GET_PARAMETER_UNMASKED_VENDOR if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { - if (IsUserInIdentifiabilityStudy()) { + if (IdentifiabilityStudySettings::Get()->IsActive()) { RecordIdentifiableGLParameterDigest( -@@ -3642,6 +3650,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3670,6 +3678,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( ScriptState* script_state, WebGLProgram* program, GLenum pname) { @@ -74,7 +74,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3703,6 +3712,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3731,6 +3740,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3713,6 +3723,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3741,6 +3751,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3758,6 +3769,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3786,6 +3797,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( ScriptState* script_state, WebGLShader* shader, GLenum pname) { @@ -98,7 +98,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3789,6 +3801,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3817,6 +3829,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,15 +106,15 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3819,6 +3832,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3847,6 +3860,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); + BRAVE_WEBGL_RENDERING_CONTEXT_BASE_GETSHADERINFOLOG - return MakeGarbageCollected(range[0], range[1], - precision); - } -@@ -3826,6 +3840,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( + auto* result = MakeGarbageCollected( + range[0], range[1], precision); + RecordShaderPrecisionFormatForStudy(shader_type, precision_type, result); +@@ -3856,6 +3870,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 return EnsureNotNull(shader->Source()); } -@@ -3833,6 +3848,7 @@ base::Optional> +@@ -3863,6 +3878,7 @@ base::Optional> WebGLRenderingContextBase::getSupportedExtensions() { if (isContextLost()) return base::nullopt; @@ -130,7 +130,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 Vector result; -@@ -3855,6 +3871,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3885,6 +3901,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3889,6 +3906,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3919,6 +3936,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -146,7 +146,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4169,6 +4187,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4199,6 +4217,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -154,7 +154,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4193,6 +4212,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4223,6 +4242,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -162,7 +162,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4270,6 +4290,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4300,6 +4320,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -170,7 +170,7 @@ index 3b4eca07d5997b5763cc14de64b655a2da344fcf..7d71129db5880b3f2a3bd67c88d9fee3 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4627,6 +4648,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4657,6 +4678,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; From 515b160c4d66da6150a023733c463b18791f9339 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 2 Oct 2020 22:19:55 -0400 Subject: [PATCH 071/152] Updated patches from Chromium 87.0.4270.0 to Chromium 87.0.4278.0. --- patches/base-BUILD.gn.patch | 4 ++-- patches/build-config-BUILDCONFIG.gn.patch | 4 ++-- ...ld-config-android-internal_rules.gni.patch | 4 ++-- patches/build-config-android-rules.gni.patch | 2 +- patches/build-config-compiler-BUILD.gn.patch | 4 ++-- ...rome-android-chrome_java_sources.gni.patch | 4 ++-- ...ome-android-java-AndroidManifest.xml.patch | 4 ++-- ...a-res-layout-custom_tabs_toolbar.xml.patch | 2 +- ...er-TabbedModeTabDelegateFactory.java.patch | 4 ++-- ...rome-browser-app-ChromeActivity.java.patch | 4 ++-- ...DataReductionPreferenceFragment.java.patch | 2 +- ...document-ChromeLauncherActivity.java.patch | 4 ++-- ...guage-settings-LanguageSettings.java.patch | 4 ++-- ...tifications-NotificationService.java.patch | 4 ++-- ...DropdownItemViewInfoListBuilder.java.patch | 4 ++-- ...nager-settings-PasswordSettings.java.patch | 2 +- ...rivacy-settings-PrivacySettings.java.patch | 8 ++++---- ...tings-AccountManagementFragment.java.patch | 4 ++-- ...ync-settings-ManageSyncSettings.java.patch | 2 +- ...ettings-SyncAndServicesSettings.java.patch | 2 +- ...ottom-BottomControlsCoordinator.java.patch | 2 +- ...owser-toolbar-top-ToolbarTablet.java.patch | 2 +- ...me-browser-ui-RootUiCoordinator.java.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 4 ++-- ...wser-chrome_content_browser_client.h.patch | 4 ++-- .../chrome-browser-extensions-BUILD.gn.patch | 4 ++-- ...r-extensions-extension_management.cc.patch | 4 ++-- ...er-extensions-extension_management.h.patch | 4 ++-- ...flags-android-chrome_feature_list.cc.patch | 2 +- ...e_metrics_services_manager_client.cc.patch | 4 ++-- ...et-system_network_context_manager.cc.patch | 4 ++-- ...notification_display_service_impl.cc.patch | 2 +- ...-notification_platform_bridge_mac.mm.patch | 6 +++--- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +++--- .../chrome-browser-profiles-profile.cc.patch | 4 ++-- ...e-browser-profiles-profile_manager.h.patch | 4 ++-- ...ext_menu-render_view_context_menu.cc.patch | 4 ++-- ...text_menu-render_view_context_menu.h.patch | 4 ++-- ...sources-bookmarks-command_manager.js.patch | 4 ++-- ...ser-resources-downloads-manager.html.patch | 2 +- ...owser-resources-downloads-toolbar.js.patch | 2 +- ...wser-resources-extensions-manager.js.patch | 2 +- ...autofill_page-passwords_section.html.patch | 2 +- ...ettings-people_page-sync_controls.js.patch | 6 +++--- ...tings-privacy_page-privacy_page.html.patch | 6 +++--- ...ettings-privacy_page-privacy_page.js.patch | 2 +- ...-browser-resources-settings-route.js.patch | 4 ++-- ...ings-site_settings-site_details.html.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +++--- ...ui-android-appmenu-internal-BUILD.gn.patch | 2 +- ...rome-browser-ui-appmenu-AppMenu.java.patch | 4 ++-- patches/chrome-browser-ui-browser.h.patch | 4 ++-- ...rowser-ui-cocoa-main_menu_builder.mm.patch | 6 +++--- ...rtup-startup_browser_creator_impl.cc.patch | 4 ++-- .../chrome-browser-ui-tab_helpers.cc.patch | 2 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 2 +- ...-views-download-download_item_view.h.patch | 4 ++-- ...ws-profiles-avatar_toolbar_button.cc.patch | 4 ++-- ...ws-profiles-profile_menu_view_base.h.patch | 4 ++-- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 2 +- ...s-translate-translate_bubble_view.cc.patch | 2 +- ...ws-translate-translate_bubble_view.h.patch | 4 ++-- ...r-ui-webui-bookmarks-bookmarks_ui.cc.patch | 4 ++-- ...-chrome_web_ui_controller_factory.cc.patch | 4 ++-- ...ui-webui-extensions-extensions_ui.cc.patch | 4 ++-- ...ttings_localized_strings_provider.cc.patch | 4 ++-- ...me_authenticator_request_delegate.cc.patch | 4 ++-- .../chrome-chrome_repack_locales.gni.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 8 ++++---- ...ome-installer-mac-signing-signing.py.patch | 4 ++-- patches/chrome-installer-util-BUILD.gn.patch | 4 ++-- patches/chrome-renderer-BUILD.gn.patch | 4 ++-- ...er-chrome_content_renderer_client.cc.patch | 2 +- ...rer-chrome_content_renderer_client.h.patch | 4 ++-- patches/chrome-test-BUILD.gn.patch | 4 ++-- patches/chrome-utility-BUILD.gn.patch | 4 ++-- ...settings-SingleCategorySettings.java.patch | 2 +- ...er-page_specific_content_settings.cc.patch | 2 +- ...derer-content_settings_agent_impl.cc.patch | 4 ++-- ...nderer-content_settings_agent_impl.h.patch | 4 ++-- ...ts-external_intents-android-BUILD.gn.patch | 4 ++-- .../components-omnibox-browser-BUILD.gn.patch | 2 +- ...x-browser-autocomplete_controller.cc.patch | 2 +- ...mnibox-browser-omnibox_edit_model.cc.patch | 2 +- ...components-page_info-page_info_ui.cc.patch | 2 +- ...nager-core-browser-login_database.cc.patch | 4 ++-- ...ore-browser-password_form_filling.cc.patch | 4 ++-- ...nts-permissions-permission_request.h.patch | 4 ++-- ...s-permissions-permission_uma_util.cc.patch | 4 ++-- ...ch_engines-prepopulated_engines.json.patch | 2 +- patches/components-sync-BUILD.gn.patch | 2 +- ...s-sync-driver-profile_sync_service.h.patch | 2 +- ...onents-vector_icons-vector_icons.gni.patch | 20 +++++++++---------- ...-renderer_host-navigation_request.cc.patch | 2 +- patches/content-common-BUILD.gn.patch | 4 ++-- ...lic-browser-content_browser_client.h.patch | 4 ++-- ...ntent-renderer-render_thread_impl.cc.patch | 4 ++-- ...r-api-web_request-web_request_api.cc.patch | 4 ++-- patches/net-BUILD.gn.patch | 4 ++-- ...services-network-public-cpp-BUILD.gn.patch | 2 +- ...er-bindings-generated_in_modules.gni.patch | 4 ++-- ...renderer-bindings-idl_in_modules.gni.patch | 4 ++-- ...d_party-blink-renderer-core-BUILD.gn.patch | 2 +- ...-blink-renderer-core-dom-document.cc.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 ++-- ...arty-blink-renderer-modules-BUILD.gn.patch | 2 +- ...snapshot-win-process_snapshot_win.cc.patch | 2 +- ...shpad-util-net-http_transport_win.cc.patch | 2 +- ...hird_party-widevine-cdm-widevine.gni.patch | 4 ++-- ...tools-gritsettings-resource_ids.spec.patch | 4 ++-- ..._schema_compiler-feature_compiler.py.patch | 4 ++-- patches/ui-base-BUILD.gn.patch | 4 ++-- .../ui-native_theme-native_theme_win.cc.patch | 4 ++-- ...ews-controls-button-md_text_button.h.patch | 4 ++-- 114 files changed, 207 insertions(+), 207 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 4750fbb0b07d..47135da4ee9e 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 0b65fbd05cdfbd6fdd616c7c0cdb0bca34820cd4..4ae9df289f8b0c73def054e29e1c10d440e1e94c 100644 +index 9b4aab55e48d56e70ad14b1f084181edc3348857..ee04db48f1f2858c027d5baa7a8a0f291b785356 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3675,6 +3675,7 @@ if (is_android) { +@@ -3686,6 +3686,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index 6d09b3107dfb..1e894a8f74e5 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index bb656fa19ff32fa407a01f302ea989ffcacc45f8..882a1b75b079151296497dbc9938dbba83924710 100644 +index 3082046a91da5fe400d8405da61f55ad66fa5e74..fed50d2b9c2350a1c159d7be696d6e0a4c1cd4f4 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -328,6 +328,7 @@ set_sources_assignment_filter(sources_assignment_filter) +@@ -315,6 +315,7 @@ is_posix = !is_win && !is_fuchsia # Holds all configs used for running the compiler. default_compiler_configs = [ diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index a3926aa17ff1..c4e120ae1f64 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 1003633a13a282b67a6cd25a3bca0d9c33d89b3e..65a45bd516c1b0ce266c4085292fb4e28a733693 100644 +index 1c24bc8de19f8ddf50592e7795a5310fe86a39dd..c909ceb6fbd3b11558a4b9706d3f186692aa23d9 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -2021,6 +2021,7 @@ if (enable_java_templates) { +@@ -2028,6 +2028,7 @@ if (enable_java_templates) { _deps = [ ":$_desugar_target" ] _previous_output_jar = _desugar_output_jar } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 1e9391c302e6..7a018ad905b8 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index cd97b2984ac6a7a2d0daf5627c87d456fbf3ca52..5b6857eb818c9485b6ce0447cf4b86907724096c 100644 +index 63e98022318d716baf1394d8ee05d153e1537316..17e33faa9042f3a4d227956b9816a3d390fb42ba 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -509,6 +509,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 319594329127..9cc37a2ee528 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index c9ef45a1495e620aba3dc42527e991495aaf4bf8..9c332952b8f7819fdb5e2d13d5b57c6ea96cdf4f 100644 +index 4f6461b6b5f5b42669e03e4334a297011caa2e98..ed4e2540fc50bb3d20ce65fd4db9dce12815039c 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1666,6 +1666,7 @@ config("chromium_code") { +@@ -1646,6 +1646,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index cf8ad68c20a8..f4b782d0861a 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 53d7e20ccf24dfa7d69aff3b90a16e4de4528ae2..141fa1d079561ca9409435e1a598176216053aa1 100644 +index 65fa9615d45d7b88bff488ea7812dcaad8032f6d..250dd262477a180c3de40b1961676fbb4844c7d3 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1694,3 +1694,4 @@ chrome_java_sources = [ +@@ -1695,3 +1695,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/HandlerResponseCallback.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 68e105dd08ef..f7e900f62993 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index bf4b2d47b7e26e9567f8582e0084904cee785573..d443349e977a7876b0fd4142d9030c0eaaa1664f 100644 +index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47cc3e9d835 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -34,7 +34,9 @@ by a child template that "extends" this file. @@ -62,7 +62,7 @@ index bf4b2d47b7e26e9567f8582e0084904cee785573..d443349e977a7876b0fd4142d9030c0e {% endif %} -@@ -1204,6 +1216,7 @@ by a child template that "extends" this file. +@@ -1215,6 +1227,7 @@ by a child template that "extends" this file. {% endif %} diff --git a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch index dbb35ca7e74e..129cfde05df4 100644 --- a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch +++ b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml -index 36f574ae9585c6fea193b25303c43ebaf79819f8..5ea345af4f96f4dea75be25ea2b6780e481bf56c 100644 +index 1bf7d593480f8dc9dcd4574c8f5499d9a9604b13..3044833633f8268dd4309b77130ecb4132b74317 100644 --- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml +++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml @@ -97,7 +97,7 @@ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch index 79fc38afa1f2..d7a565c3cdce 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java -index 9962326c6d99865c2c437587ad31d43fc0c88229..26f242820e5aad184f06fbdc4cc60fa8a240f121 100644 +index 8d2a47311ce2f686cc343fc16c775008bffe855a..c05e6c020335951b421dcfd4c3918415ffe6bf79 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java -@@ -55,7 +55,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { +@@ -56,7 +56,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { @Override public ExternalNavigationHandler createExternalNavigationHandler(Tab tab) { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch index 80b0072ff580..e42a1d25f9c9 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch @@ -1,8 +1,8 @@ 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 87b244ecf219f5fe74bba538e32c3bb5bd26d845..16b27e7cdecac47e75eb6cce2d001f1606788013 100644 +index a7c8ecf5c8e7651f1328b9bf61849eb793cc0941..2a68e54aa7e386878f0c19044ca282629c916f9e 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 -@@ -326,7 +326,7 @@ public abstract class ChromeActivity +@@ -333,7 +333,7 @@ public abstract class ChromeActivity NightModeReparentingController mNightModeReparentingController; protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch index 89ea7ee26284..af0752a7f9c3 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java -index 98b52351c1ac9044f579ef123cb543e015272450..ed75714069734e2b51bd9fb2513ccf1d18f05ea6 100644 +index b70672231cc7201475f8a955096b978945801af8..12ccdd194c5ed813e5f135e6b8908df03356481a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java @@ -37,7 +37,7 @@ import java.util.Locale; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-document-ChromeLauncherActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-document-ChromeLauncherActivity.java.patch index 5dde66060761..d11ed514a6b9 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-document-ChromeLauncherActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-document-ChromeLauncherActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java -index b795617bbf9700a06c8db6065321349e853d06ee..245f06cdfb0bb7a3c90ece2f04cf9931e67535ac 100644 +index 62a752d560e6b2f32842b6cb6729adada5578e31..bf36828c345156247e0b27d62cfac0767697db0d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java -@@ -17,7 +17,7 @@ import org.chromium.chrome.browser.vr.VrModuleProvider; +@@ -16,7 +16,7 @@ import org.chromium.chrome.browser.vr.VrModuleProvider; * Dispatches incoming intents to the appropriate activity based on the current configuration and * Intent fired. */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch index 16545333dc21..68e68536f328 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -index fc76e81f8a554d0d11cccdb5e6602de2fd4460d4..be8102fdd9a81bb22ea65ed4db956c11f3e84110 100644 +index a1ccd5fcdb64cce72c965c06124f092f5c70a735..b93ae42cc3534119800e630c265356967622e28c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -@@ -28,7 +28,7 @@ import org.chromium.components.user_prefs.UserPrefs; +@@ -29,7 +29,7 @@ import org.chromium.components.user_prefs.UserPrefs; * seamlessly find and manage their languages preferences across platforms. */ public class LanguageSettings diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationService.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationService.java.patch index 6891dc2e2a54..4c5cb073d39f 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationService.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationService.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationService.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationService.java -index baa1b123c8a648782370d8c4317479c6b2a4b382..8a415e40bab3169e8a4ed7e2d767a6b4b8e6cc97 100644 +index c72c14123e2e6eae4be3185a67820aa538f1d1fb..9e8cfc74b4bfbd23017efcd6e0c8c945a73904b2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationService.java -@@ -117,7 +117,7 @@ public class NotificationService extends IntentService { +@@ -109,7 +109,7 @@ public class NotificationService extends IntentService { // Now that the browser process is initialized, we pass forward the call to the // NotificationPlatformBridge which will take care of delivering the appropriate events. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch index 6e666d8d1deb..30f1b59176d6 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -index efe9b333b35ec6745e2a2c1999b749e647efda2b..1c10adb31c1faa961f34272ba211a4ff90111696 100644 +index 5623cc5b7be3abedc440df0657b581992c11009b..d36afd4d8094f5df1212b0f1faf5ab76a4b6abd0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -@@ -90,7 +90,7 @@ class DropdownItemViewInfoListBuilder { +@@ -89,7 +89,7 @@ class DropdownItemViewInfoListBuilder { () -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get(); mHeaderProcessor = new HeaderProcessor(context, host, delegate); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch index c289fee4f1c1..7886dd301473 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -index 947741134a3323bcdd98a270625ccd981db57afd..116f89b8f104625b27043934814be787cf5a04e2 100644 +index 58dacf01c3693c8bca33dfdb52825d53f5f1ecaa..180f30a38a0293cb756fcd6f22bef28fda72c381 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -58,7 +58,7 @@ import java.util.Locale; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch index fc10c1098b97..68873d8c92f8 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -index 4dcd1b269aa6177ee214211e3f44e5747cf74f0d..dd1bfff95274d48698e9aa7aca13f99a4ddf4ff3 100644 +index 12713055582e86326be472da0e2d83fd39ab02b7..e67e1ab2d5aef2290f9ade198d4863a2748adb19 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -39,7 +39,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -44,7 +44,7 @@ import org.chromium.ui.text.SpanApplier; * Fragment to keep track of the all the privacy related preferences. */ public class PrivacySettings @@ -11,7 +11,7 @@ index 4dcd1b269aa6177ee214211e3f44e5747cf74f0d..dd1bfff95274d48698e9aa7aca13f99a private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_NETWORK_PREDICTIONS = "preload_pages"; private static final String PREF_SECURE_DNS = "secure_dns"; -@@ -201,6 +201,7 @@ public class PrivacySettings +@@ -234,6 +234,7 @@ public class PrivacySettings @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index 4dcd1b269aa6177ee214211e3f44e5747cf74f0d..dd1bfff95274d48698e9aa7aca13f99a MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(VectorDrawableCompat.create( -@@ -215,6 +216,6 @@ public class PrivacySettings +@@ -248,6 +249,6 @@ public class PrivacySettings null); return true; } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch index 6ba82aeb3bff..6185db478d48 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java -index 1376ef85d1fcc012a03cbb5b9c853c05b8aa404c..86ace931630ba41ad6f037a0ce28c15b7ff7e340 100644 +index 8f958b6cf487ae60c68580547dc8d4239651ee52..ef17dd64cadd0b63d7122ffa8c959fae5889d1d3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java -@@ -63,7 +63,7 @@ import java.util.List; +@@ -62,7 +62,7 @@ import java.util.List; * * Note: This can be triggered from a web page, e.g. a GAIA sign-in page. */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index b6d6bb991fc7..9c52494fbe4d 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 68c1015194d673c58ef5b8ba272d9ac8a8656a8c..eef7ebf72a42797d9bede08d4503ad68f68c2ee7 100644 +index 98c57f7da4cac37321f505be6bf42a7f3699dfe9..6754ca8368b906dc97f058415239f96a534f46da 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -26,7 +26,7 @@ import androidx.appcompat.app.AlertDialog; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch index b3f7072cbbfd..6453aa156a94 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java -index b0ab35192a4c5e6a29b4cd47cca4a3dfc0536d41..b474666e588bb65364d67b6b00ce12ebdf4b1db5 100644 +index 6e7dd0b39f10fd13f91fb4ddc2315961c2635aa2..ec1806a51f9ff59ffc921fafd91fda7a0a7eb3c3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java @@ -76,7 +76,7 @@ import org.chromium.ui.widget.ButtonCompat; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch index b537d767d939..861a10c6c554 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -index 91aa31578289562f4329164ebe161c705a59cd1c..479eedf32692412ce84af8a572af866840842eec 100644 +index ff4c9fb019d1a4a5c23f5ea61f25e49c888bc497..a04533730c90a03f1fee8c72693f23b5dd789b89 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java @@ -101,7 +101,7 @@ public class BottomControlsCoordinator { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index 276a9a2c20ad..439874d0b046 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index 18d8ddb15d8f79103bbba4b11dbe91c22a8f0b3f..44cafe634a6943d21e8edfe511416a2ba9bc0957 100644 +index 5391fe73ac8f0ae90ac427fe04a4b64a6a5324fe..571a80a03fb674e9055412d75d1b45c0261efa4d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java @@ -59,7 +59,7 @@ import java.util.Collection; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch index 0c95dffe91f9..99fb14aa9cc5 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch @@ -1,8 +1,8 @@ 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 a6e0d0bb507d080885b477b96f480dc9a172b871..4f90f253c99107951c4a78dc2ff4f5b6dd58b485 100644 +index 6637681570bece4a834d6307f5c2f5125613114d..549a931654030190ee68d802102c80d1d57d9ccf 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 -@@ -505,7 +505,7 @@ public class RootUiCoordinator +@@ -525,7 +525,7 @@ public class RootUiCoordinator mActivityTabProvider, mShareDelegateSupplier, new ShareUtils(), mActivity.getLifecycleDispatcher(), mActivity.getModalDialogManager()); mButtonDataProviders = Arrays.asList(mIdentityDiscController, shareButtonController); diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 00833464fb9b..29c8faac2f0d 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 9ca1ad5edd0cc96ec15616b5ba639b637c204eec..aefacfe0c1f6a8a7dc36516238f51774993db226 100644 +index c487b04f5e1e594d865db56425c2b5b21bde032f..f14e2a2ce745dacf51de481f1b618f261a05b2a7 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -294,14 +294,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { @@ -21,7 +21,7 @@ index 9ca1ad5edd0cc96ec15616b5ba639b637c204eec..aefacfe0c1f6a8a7dc36516238f51774 const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -6445,6 +6445,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6469,6 +6469,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index c4c478fe17d6..7878d5ee38ac 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 0e025853ca666f193a2487a1b042918d725dccbc..1457beb0792ebf30002fb1e19d457c8ccf6a48bc 100644 +index 002c5a57f8900520cd0e3b367b010c51f52143c8..97e57bab2b69825f3f4547cc2a55432058bf6239 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -706,6 +706,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -710,6 +710,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 5caf59a5cc5d..e509327fedf9 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 4dd8bc6cd96de7b89a6fd03c30038adb691dfcc1..9704aead36429c23673df091fc244e107a66876c 100644 +index 61574852f686ee68479b0cb714852e4271a0806d..20b107a476df4d4ec755308fdd6bcb6a2d316d4c 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1258,6 +1258,7 @@ static_library("extensions") { +@@ -1255,6 +1255,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index b0c07128be73..0ce8ee394e9d 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index 9d8854fde0bc139a3c7056567daf1297d13b3e70..accce246cf3f47021d032c6834e2c1f124b3aa7a 100644 +index 518c3927ae085bac2a70dcc6635266fa6972f0d6..369f70aaa709efac43bcf6f800eda1f63c194848 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -17,6 +17,7 @@ @@ -10,7 +10,7 @@ index 9d8854fde0bc139a3c7056567daf1297d13b3e70..accce246cf3f47021d032c6834e2c1f1 #include "chrome/browser/extensions/extension_management_constants.h" #include "chrome/browser/extensions/extension_management_internal.h" #include "chrome/browser/extensions/external_policy_loader.h" -@@ -661,7 +662,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -676,7 +677,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-extensions-extension_management.h.patch b/patches/chrome-browser-extensions-extension_management.h.patch index 55e3cb076d50..a8536c044aeb 100644 --- a/patches/chrome-browser-extensions-extension_management.h.patch +++ b/patches/chrome-browser-extensions-extension_management.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h -index 6fa7e74a46bbd8e3859bdba57539c2a8290cd735..559e012a55132ff2a9a13e6ea40afc0c6e104375 100644 +index 53e7ae9056f2b6458836e274a74b5d7338900f0e..e07d64b193c222c51d4d77fe5207ee4dafe38a04 100644 --- a/chrome/browser/extensions/extension_management.h +++ b/chrome/browser/extensions/extension_management.h -@@ -197,6 +197,7 @@ class ExtensionManagement : public KeyedService { +@@ -198,6 +198,7 @@ class ExtensionManagement : public KeyedService { bool is_child() const { return is_child_; } private: diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 902ce44ec625..535bb83055f6 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index a9c7991e57e1f8de94dc8e4a2c07d591f92f8188..cbd4e96392ee8affb3c7d9ce22d23c51290f509a 100644 +index 45429c5ff6d3cc95543109b7707242481670b59b..213b7978d352fb4080b4b15c12f8cd82d7c04e97 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -266,6 +266,7 @@ const base::Feature* kFeaturesExposedToJava[] = { diff --git a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch index 6b864ac3cf14..c0b8e7746b1b 100644 --- a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch +++ b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -index 36396922a5ccb8b78ae9e6b6389bbe1e0d18595b..23e43a1de5245dfcbd4906382760a48decba5b1d 100644 +index 5bc58e3dd54dfc76b5789792ad8e958fc5043ab1..3ad736794d9edb979fe2f120b5fed055fb3a3c13 100644 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -@@ -153,7 +153,7 @@ class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider +@@ -154,7 +154,7 @@ class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider } bool IsReportingEnabled() const override { diff --git a/patches/chrome-browser-net-system_network_context_manager.cc.patch b/patches/chrome-browser-net-system_network_context_manager.cc.patch index 49041b72c03e..748b923b63a8 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 7df1c47e8ed886507f602d855154855eb285688d..457616ee8108b3ad2c672abda91a948dbff8e02b 100644 +index c53056f7a4ba5a5df21a10facb53c8c81745d5bf..75078d8540264201c330a355927c352bbecef6d7 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -217,7 +217,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem +@@ -218,7 +218,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem if (!manager_) return; manager_->GetURLLoaderFactory()->CreateLoaderAndStart( diff --git a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch index 11727cef647d..fb2504a01290 100644 --- a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch +++ b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc -index f52424fc5203040ff2a68ddc8b0f6bfc7409a281..250bde945528eb536b18f696792b8c4e44499fc7 100644 +index 286b6af7d35c5acdebcbb41bc9acf468f93f5f0d..f168680bee4cbc64519004c38f92f2d80a2cb482 100644 --- a/chrome/browser/notifications/notification_display_service_impl.cc +++ b/chrome/browser/notifications/notification_display_service_impl.cc @@ -100,6 +100,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch index f603347fd86f..c698100a0587 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm -index 2893564b41274ed0096253646ccf147cb6157534..4317310d2c30a0c65188d644bf790fe33719b84f 100644 +index c2905bfd0df776166b6bb2a34c4a1520e89ceb5e..17542f257c74e734b53d84e239cab6afd5ae126a 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm -@@ -183,6 +183,7 @@ base::string16 CreateNotificationContext( +@@ -92,6 +92,7 @@ bool IsPersistentNotification( // an expensive call. Instead use NotificationPlatformBridgeMac::SupportsAlerts // which caches this value. bool SupportsAlertsImpl() { @@ -10,7 +10,7 @@ index 2893564b41274ed0096253646ccf147cb6157534..4317310d2c30a0c65188d644bf790fe3 int32_t major, minor, bugfix; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); // Allow alerts on all versions except 10.15.0, 10.15.1 & 10.15.2. -@@ -325,6 +326,7 @@ void NotificationPlatformBridgeMac::Display( +@@ -237,6 +238,7 @@ void NotificationPlatformBridgeMac::Display( } else { NSUserNotification* toast = [builder buildUserNotification]; [notification_center_ deliverNotification:toast]; diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index fb7b44eda4a8..a8c570ec33dc 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 526799941ae30a8bb969e761c470d40892eeffa8..f35ce1b3dcaddc732d70c714f332d398fec2c525 100644 +index 9de1468f1bd02ab7901a5afd54545109c49e73f9..d46cdc3eecb73bc7a5476e79c60bec6d4565be4d 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -735,6 +735,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -738,6 +738,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 526799941ae30a8bb969e761c470d40892eeffa8..f35ce1b3dcaddc732d70c714f332d398 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1005,6 +1006,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1009,6 +1010,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 0344c60cf968..cf129515a832 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index b5ab768526f77b37790de3b1b79960a8050d6524..0c0cb5d511cdd34e50ed4e348368d01c44f0a2ca 100644 +index b841f58d27ad64fcb892fdf8792fc33c45ac68bd..00661079a39bd963c10e736930cdc1b59624e582 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -262,7 +262,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -261,7 +261,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index ccd501950b8a..9dbea13c2596 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index f27f42540638bb57848714dd33aafb8987cd28b6..02a3b4299a825332a2256ed552124b864a5fec7f 100644 +index 8d0793739a72cb0dcdb2f8a26b9ad4487e465e74..6ba3dd73fb870d68bb2907f7546c12c0f5db8c43 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -265,6 +265,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -268,6 +268,7 @@ class ProfileManager : public content::NotificationObserver, void set_do_final_services_init(bool do_final_services_init) { do_final_services_init_ = do_final_services_init; } diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 15d4f6cdd486..f65368309884 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 132619a0f0af52b836c813abda2bca5cea5e7f12..e031356deb2cb75491af995d5d096d80cfc280bf 100644 +index b5bc18f42059c28ec258f174c8ad9ba585c4b0e3..0f6d4fba8b8b66eaa21e55f98290eb3b3e26b064 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1617,6 +1617,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1628,6 +1628,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index 8bc80eb6be0f..52aead087e8c 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index 209983847a2ca07c077f3cb101e9d5a20fb73516..706d66c8695f6c136675381528f9c728e4e9c759 100644 +index cd477e3ba1b44eb27bf0b94b89d26915d9603386..1030c1de5cb6d89d33b831cc7426efabc92f3124 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -119,6 +119,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { +@@ -120,6 +120,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { // Returns true if keyboard lock is active and requires the user to press and // hold escape to exit exclusive access mode. bool IsPressAndHoldEscRequiredToExitFullscreen() const; diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.js.patch b/patches/chrome-browser-resources-bookmarks-command_manager.js.patch index 3b7be917c3e6..b13428b3da17 100644 --- a/patches/chrome-browser-resources-bookmarks-command_manager.js.patch +++ b/patches/chrome-browser-resources-bookmarks-command_manager.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/command_manager.js b/chrome/browser/resources/bookmarks/command_manager.js -index 67e6e6a96452df424d56fe022c29f360b002b783..9e54f31a6270bb09638a3571d37262f281968c30 100644 +index 380391c08d649e5c40c044fd98a54b8096ed49b0..91310adc0baf34e9d7cfd92f8db6232cc6ba1699 100644 --- a/chrome/browser/resources/bookmarks/command_manager.js +++ b/chrome/browser/resources/bookmarks/command_manager.js -@@ -448,7 +448,7 @@ export const CommandManager = Polymer({ +@@ -442,7 +442,7 @@ export const CommandManager = Polymer({ chrome.bookmarks.export(); break; case Command.HELP_CENTER: diff --git a/patches/chrome-browser-resources-downloads-manager.html.patch b/patches/chrome-browser-resources-downloads-manager.html.patch index c4f301b994b4..2ec0c12a9195 100644 --- a/patches/chrome-browser-resources-downloads-manager.html.patch +++ b/patches/chrome-browser-resources-downloads-manager.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/downloads/manager.html b/chrome/browser/resources/downloads/manager.html -index 8c5e0d7a682c11c589527ffefdb8c868f3d24c68..f25291992504370135e6e085a9ac353482ab36d0 100644 +index 9797412714937f11e2c6388b9de56cbd1293e5b2..6016a51912120dfda32af491baafdbcc6e7f1765 100644 --- a/chrome/browser/resources/downloads/manager.html +++ b/chrome/browser/resources/downloads/manager.html @@ -1,4 +1,4 @@ diff --git a/patches/chrome-browser-resources-downloads-toolbar.js.patch b/patches/chrome-browser-resources-downloads-toolbar.js.patch index bee8cc4d49c6..e6578e13327e 100644 --- a/patches/chrome-browser-resources-downloads-toolbar.js.patch +++ b/patches/chrome-browser-resources-downloads-toolbar.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/downloads/toolbar.js b/chrome/browser/resources/downloads/toolbar.js -index d7219c061c686d3d750b37017032a5b3330a2ef2..9c0993216cb4aa3cdca6df668e0036e9988df654 100644 +index 2dfdab18bf6a489a195cadfaa18a6456cd44c4f1..b61d01de3d21ec63edc207d90b0963b1d1a6d693 100644 --- a/chrome/browser/resources/downloads/toolbar.js +++ b/chrome/browser/resources/downloads/toolbar.js @@ -4,7 +4,7 @@ diff --git a/patches/chrome-browser-resources-extensions-manager.js.patch b/patches/chrome-browser-resources-extensions-manager.js.patch index 9797eb792ca2..49a37bebea1e 100644 --- a/patches/chrome-browser-resources-extensions-manager.js.patch +++ b/patches/chrome-browser-resources-extensions-manager.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/manager.js b/chrome/browser/resources/extensions/manager.js -index 1b80446a0b746c228ff2d9ae0ba67c7668613a84..690a82cf13a09452300ecc1f74fff015ed7a7cd6 100644 +index 271dfba94a3cbd6b53b17f99ba94634c1bbc3b1a..1dd5c561924f4aed399836b70de51b00fe1ca0c7 100644 --- a/chrome/browser/resources/extensions/manager.js +++ b/chrome/browser/resources/extensions/manager.js @@ -5,7 +5,6 @@ diff --git a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch index 0f76046f8909..79ada900bd50 100644 --- a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch +++ b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.html b/chrome/browser/resources/settings/autofill_page/passwords_section.html -index 2c62d1493d1d6b2257231301c580676e6f4e3693..c308ed981596aec8277cabe60204a7b61ac6fee4 100644 +index 737197e790e1f703852096f44ff99ae7e0f3a649..6ab992318ab58e029eee0d61cee1361cdeb78848 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.html +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html @@ -141,11 +141,16 @@ diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch index 0fbce92cc151..bba570c5aa54 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.js b/chrome/browser/resources/settings/people_page/sync_controls.js -index 0ff778824d81b54fd0fb6dbe3a597b9710f5894a..7901856c98937fddaba1a208fbf24a736d369350 100644 +index 8a60f0d3bceea5c142797a1db16bbdb75f26a175..12c8a63724d5e7f3490dede654fc2611bfa86889 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.js +++ b/chrome/browser/resources/settings/people_page/sync_controls.js -@@ -99,7 +99,7 @@ Polymer({ +@@ -88,7 +88,7 @@ Polymer({ 'sync-prefs-changed', this.handleSyncPrefsChanged_.bind(this)); const router = settings.Router.getInstance(); @@ -11,7 +11,7 @@ index 0ff778824d81b54fd0fb6dbe3a597b9710f5894a..7901856c98937fddaba1a208fbf24a73 this.browserProxy_.didNavigateToSyncPage(); } }, -@@ -226,6 +226,7 @@ Polymer({ +@@ -215,6 +215,7 @@ Polymer({ * @private */ syncControlsHidden_() { diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index 7598b2b69333..b2d624c73572 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index d8d14c34243481715d836e84be7055306bb6d45f..45dee92ca5e3e7870c30bbfdadddfa3771cc7f83 100644 +index 94dae1df4ab0fb938bc3f15944a760ca640102b0..456af41b965c8165dcb28984cacb06ac023a87ff 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -11,6 +11,7 @@ @@ -26,7 +26,7 @@ index d8d14c34243481715d836e84be7055306bb6d45f..45dee92ca5e3e7870c30bbfdadddfa37 diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch index 1c9879a3308e..01953c47c3ad 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js -index c5a450dbafcadc64deaacd2e39372d125974d7e6..54228efc42de2928ffc298993e855c88c85136c1 100644 +index f3c5ae161018f3f3da960116da4eb624ca9c38ed..14d234821b168d35ec9b01dcd965049e2874ed67 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js @@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; diff --git a/patches/chrome-browser-resources-settings-route.js.patch b/patches/chrome-browser-resources-settings-route.js.patch index e1385e1bac15..426c264f84bf 100644 --- a/patches/chrome-browser-resources-settings-route.js.patch +++ b/patches/chrome-browser-resources-settings-route.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js -index 9caa01cd88b349c490f5522f942948a5a7a017bb..d89ac587c16674c631b3b045e4f69590ab1e8203 100644 +index f8dbb8bd1c0bd44e759f104e3e6dfb689c95c213..b3e2e18d037039c3df478e6219f3560f58760872 100644 --- a/chrome/browser/resources/settings/route.js +++ b/chrome/browser/resources/settings/route.js @@ -34,7 +34,9 @@ function addPrivacyChildRoutes(r) { @@ -12,7 +12,7 @@ index 9caa01cd88b349c490f5522f942948a5a7a017bb..d89ac587c16674c631b3b045e4f69590 r.SITE_SETTINGS_AR = r.SITE_SETTINGS.createChild('ar'); r.SITE_SETTINGS_AUTOMATIC_DOWNLOADS = r.SITE_SETTINGS.createChild('automaticDownloads'); -@@ -179,7 +181,9 @@ function createBrowserSettingsRoutes() { +@@ -176,7 +178,9 @@ function createBrowserSettingsRoutes() { } r.PRINTING = r.ADVANCED.createSection('/printing', 'printing'); diff --git a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch index ba91fbef5850..fe04e456d44b 100644 --- a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch +++ b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html -index 85817fb9137ebdb47136446b24994241279626f9..c06d6f68c562304c556958272552490f2ad6a67c 100644 +index e22ec5ea4bb8d86e0906287a05eedeb6869fce62..111daa0f58498172460485b167e76a1c0bacdd75 100644 --- a/chrome/browser/resources/settings/site_settings/site_details.html +++ b/chrome/browser/resources/settings/site_settings/site_details.html @@ -195,6 +195,11 @@ diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 1ca46e77fbf4..3c52f0ba0a37 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 58a6545751b2e35368435cda4ffc1bf6834253e9..cdb83851c1ba1ff6251c2e74c723dd1f7746b805 100644 +index 523123b9aaa76824378ab9b3d27eb771a177e957..ca7ed8867ca4764c77866920dc0bfc98f1dfcee2 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -592,6 +592,7 @@ static_library("ui") { +@@ -586,6 +586,7 @@ static_library("ui") { "//ui/webui/resources/cr_components/customize_themes:mojom", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 58a6545751b2e35368435cda4ffc1bf6834253e9..cdb83851c1ba1ff6251c2e74c723dd1f allow_circular_includes_from += [ "//chrome/browser/ui/webui/bluetooth_internals" ] -@@ -3141,10 +3142,13 @@ static_library("ui") { +@@ -3151,10 +3152,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch index 31428399cf2c..6b57d366a0f4 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn -index d06aceed7443a093d85bbfc340fe1a50a9613ac9..a41f90a8a60019a06ac5c22acec4f98a35d2aa17 100644 +index a677a598fc874690a4c40f260162126c5a686930..10ccf5a71816f916a2a0b21807feeb5eb80aeb69 100644 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn @@ -21,6 +21,7 @@ android_library("java") { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch index e9d616d110f8..02d4d5767ecb 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -index 12a4e3b5ed297e047ae2ea07b6aa7ca1dad6052d..5ca045d1a4b8c64d4609ae766e4a2e479efc1634 100644 +index 989cb20c474658c2f90379eb52a22da50c70d549..79b272af2f8d02bc4d2d6eae77b1d84026a766fa 100644 --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -209,6 +209,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuAdapter.OnCl +@@ -209,6 +209,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler mPopup.setBackgroundDrawable(ApiCompatibilityUtils.getDrawable( context.getResources(), R.drawable.popup_bg_tinted)); if (!isByPermanentButton) mPopup.setAnimationStyle(R.style.OverflowMenuAnim); diff --git a/patches/chrome-browser-ui-browser.h.patch b/patches/chrome-browser-ui-browser.h.patch index 3e191343bc80..bb893cf3ad96 100644 --- a/patches/chrome-browser-ui-browser.h.patch +++ b/patches/chrome-browser-ui-browser.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h -index 7c4a3b819cfd51483374859e96adef63b95d36b3..0411b803e963f5909798e01a5ee307e478f029c7 100644 +index c67b79ec647a2ddfd7bb5adc583a9ac8659c6fe5..30cafe4cc4f1fb9e1010c1ec61f096ecda3c6f74 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h -@@ -671,6 +671,7 @@ class Browser : public TabStripModelObserver, +@@ -677,6 +677,7 @@ class Browser : public TabStripModelObserver, // Sets the browser's user title. Setting it to an empty string clears it. void SetWindowUserTitle(const std::string& user_title); diff --git a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch index 84bd58fc9f0c..b6f99c9dd24e 100644 --- a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch +++ b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm -index aa163bc80a278110470b8f194c71ee5e88fa4718..c14fefa9728ebce24435e50326896aa65a8a2934 100644 +index bcef3c790369522c0dbee269e3ceb4f5ecd6649a..cf5eb4219b8a7043f3b2a8768c1a8c428f366e5e 100644 --- a/chrome/browser/ui/cocoa/main_menu_builder.mm +++ b/chrome/browser/ui/cocoa/main_menu_builder.mm -@@ -104,6 +104,7 @@ base::scoped_nsobject BuildFileMenu( +@@ -103,6 +103,7 @@ base::scoped_nsobject BuildFileMenu( Item(IDS_NEW_INCOGNITO_WINDOW_MAC) .command_id(IDC_NEW_INCOGNITO_WINDOW) .remove_if(is_pwa), @@ -10,7 +10,7 @@ index aa163bc80a278110470b8f194c71ee5e88fa4718..c14fefa9728ebce24435e50326896aa6 Item(IDS_REOPEN_CLOSED_TABS_MAC) .command_id(IDC_RESTORE_TAB) .remove_if(is_pwa), -@@ -467,6 +468,7 @@ base::scoped_nsobject BuildHelpMenu( +@@ -462,6 +463,7 @@ base::scoped_nsobject BuildHelpMenu( #if BUILDFLAG(GOOGLE_CHROME_BRANDING) Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK), #endif diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 5b03215a662b..74a09bb8ac0e 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index 47ddd90ab37cd6d1d59b59380bf49ec476efda1a..555b153fe5ff68a0e144fc39f4544659ccb50958 100644 +index 453a5fc76b491d62c1a04274f2ed831030685d3c..ffde4e0a23a69f2451a909e39bc7764c94f7edff 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -666,6 +666,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -516,6 +516,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); #endif // !defined(OS_CHROMEOS) diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index ae60ff6c80ed..4d01cd9b5320 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 440f669fcf3b24f8777a474c8355afdea701ce3e..3586b30ad80e4dece2f62f76a8442fc86437a054 100644 +index 5877e77bdabb60b6ffea7a16dd062a6d05e35bde..6737aa2481c87d66aee68dcc68a3c13b2861e7e5 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc @@ -473,4 +473,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 44387f923bd1..cb025d0ddc9a 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 4cbb2c09d8469c3b6e308c07106daf4f8a9cfc2f..554b337751ce6e1725ad48311bba9c5d711c41fa 100644 +index 93302e77e28a49b06f6b5943d7ca44e2553ec202..6fd6cd73cd792f955698a0a5ead3b46d5901116d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -844,6 +844,7 @@ void BookmarkBarView::Layout() { diff --git a/patches/chrome-browser-ui-views-download-download_item_view.h.patch b/patches/chrome-browser-ui-views-download-download_item_view.h.patch index efda52b28e3f..cff5e47e545e 100644 --- a/patches/chrome-browser-ui-views-download-download_item_view.h.patch +++ b/patches/chrome-browser-ui-views-download-download_item_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h -index 108df89672d65d32c8f8d840323b19c81a93ab75..6dde04d48647ab715ba1209d49c7dc0baf906e0b 100644 +index e3a1921f916f2193a1bfa1726590a4c8c583a5b5..84d1acc3fa6b059f6de9b4270acd58bcbb92e068 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h -@@ -116,6 +116,7 @@ class DownloadItemView : public views::View, +@@ -112,6 +112,7 @@ class DownloadItemView : public views::View, void OnPaintBackground(gfx::Canvas* canvas) override; void OnPaint(gfx::Canvas* canvas) override; void OnThemeChanged() override; diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch index 6b755ed87bbe..997f0873216e 100644 --- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch +++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc -index d78b095a932f2f152fee533538219fd7711155b3..6566e7c3693812ac37e5c45fdd044ec564e05e7f 100644 +index 15949d01a13bc8c8449ea22bb31ce8c92a10356b..12a2c45e9ae3038dfca827ca24523498536eb8d8 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc -@@ -241,6 +241,7 @@ void AvatarToolbarButton::NotifyClick(const ui::Event& event) { +@@ -246,6 +246,7 @@ void AvatarToolbarButton::NotifyClick(const ui::Event& event) { } base::string16 AvatarToolbarButton::GetAvatarTooltipText() const { diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch index 528f109fb37d..51f52bfbccbf 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -index e4cf1181d859b21cc235dd561f99ae3e1c21939d..21b4aa9bfcd262130d48e42da06ae9449257a986 100644 +index c1492c4dcbcea0ef58307d0de5428ff9f4b72dba..5f90da599e3558901a774e99dfd85f4b12a7e402 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -@@ -168,6 +168,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, +@@ -169,6 +169,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, void set_perform_menu_actions_for_testing(bool perform_menu_actions) { perform_menu_actions_ = perform_menu_actions; } diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 450d37028c7b..63cad2519809 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 8d66d50525f97a06f9cc6501017e4b4a1e42f4d5..dde22ef0e8da16259eaa45f1cf3fb43681d8383b 100644 +index 40698b8a9893814230297ed506e0894fc2c77d38..f6c6bd6eb872550cb01d2482e41940fbd05f6170 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -275,7 +275,7 @@ void ToolbarView::Init() { diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch index c65bc7a61ce4..ec1254a2932e 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc -index a8152b0e02ed5371be13465e3f97830aee673d41..626f32fb0d45caec898fe8564dc1c41573f95660 100644 +index 1c738c44351397b739409eea71bc009fc16f7012..585de1ce9728f14b86847fffcf465085e54c7d67 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc @@ -175,7 +175,7 @@ views::Widget* TranslateBubbleView::ShowBubble( diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch index ccff80b3a346..90ad3cc50826 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h -index e328162d034f60918bc51b251199bc59d1c2c9eb..cf8258b887431807c7471574074388bde7ee4760 100644 +index 440325dfbc2932ece15ee61a0fd3500b97946959..929a7f418b624e11635435b289062d90fe662768 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.h +++ b/chrome/browser/ui/views/translate/translate_bubble_view.h -@@ -102,6 +102,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView, +@@ -100,6 +100,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView, // Returns the current view state. TranslateBubbleModel::ViewState GetViewState() const; diff --git a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch index e666a70a01b4..fcc9bacb784b 100644 --- a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -index 60ec5a0f6002cf8547aa6dae4c6b0a036d535d5f..4e6c7d7ec8c5345a69332010de1846b75e3511de 100644 +index 18e0b1ab4879937d5581749214b6d17a36dc359c..e78321121ad363e8c93ff45d9df5f44b39ddd49d 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -@@ -134,6 +134,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { +@@ -140,6 +140,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { for (const auto& str : kStrings) AddLocalizedString(source, str.name, str.id); diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 20ab195438d9..66da9eb9bb71 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index 9f7728fec9767158e4ffbf1e0cc551b6bf7916b1..bf72558b8bc0afb3ac78b8100baa5845110ab6f6 100644 +index eb6691efc99df4fc2b798bb4783ff8897187c936..e9a442acf86812e94e4acd1e1f44ea3bf694b3a2 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -12,6 +12,7 @@ @@ -10,7 +10,7 @@ index 9f7728fec9767158e4ffbf1e0cc551b6bf7916b1..bf72558b8bc0afb3ac78b8100baa5845 #include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/accessibility_ui.h" -@@ -1028,7 +1029,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1031,7 +1032,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index cf1f0e1c9c6e..031388c1e83a 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index 559e1d5ed99131b943a230fa47cc84fb6ca591a8..40e01575520d030eb8fd27e181503f187f6f785f 100644 +index 293d9ea8fa4932a57f9ea47fa9251735183dd17c..259d4226c5f3ecbb215c8070729dce67e7b6b89b 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -353,6 +353,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile, +@@ -354,6 +354,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile, } source->AddString(kLoadTimeClassesKey, GetLoadTimeClasses(in_dev_mode)); diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index d76c072672d5..c7c35d429ac3 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index fc0d14e47edb637b85b5ebb8f967aa838b7d48ad..7ebeaaa1fa4f1e1da5e75bbd46d47473533b0c63 100644 +index 1a24e4ed09520910fd3d7df15b26373a2f0eb019..b45a8066db3d5f048a1c42d68034e399f71f5eae 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2377,6 +2377,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2386,6 +2386,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch index 55d2954e2e89..c0a96d549da1 100644 --- a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch +++ b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -index 3f73a0535e227a3af7c044cf4199b9fc5a245e42..243255a3fa2bdfdf86c850473abfcf6af398e765 100644 +index cc26114a37f18cbbdf5d4efcb415fda8603059a0..2d1ddfe07254620ca9face56753fb2741f0c57be 100644 --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -433,6 +433,7 @@ std::string TouchIdMetadataSecret(Profile* profile) { +@@ -436,6 +436,7 @@ std::string TouchIdMetadataSecret(Profile* profile) { ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfig ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfigForProfile( Profile* profile) { diff --git a/patches/chrome-chrome_repack_locales.gni.patch b/patches/chrome-chrome_repack_locales.gni.patch index 5ee4ac512a32..3f6db28e26c2 100644 --- a/patches/chrome-chrome_repack_locales.gni.patch +++ b/patches/chrome-chrome_repack_locales.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni -index b714d4e3b4cef6cc2f24ec2ad6f16be388ae12bf..a5e48daa6479f644cf7549242879b23b42fd1b53 100644 +index e303c7f0e63f4eb60f8c86761a13357e545f2d6f..cec6137b8bba355e2912bc37db82242c1ed84a42 100644 --- a/chrome/chrome_repack_locales.gni +++ b/chrome/chrome_repack_locales.gni @@ -36,6 +36,7 @@ template("chrome_repack_locales") { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index a1f529f35118..5a0253042916 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 16fe306a6097e354858dd8ebe83b924174c55415..2781f10e6dba98b980f4b5161d6c3a3c9b87ef7d 100644 +index 74519a6a808d65fe4e003069713c215ccdf8f861..b8fe445de64ac5770366e86f71684713d3d7eb50 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -64,6 +64,7 @@ source_set("channel_info") { +@@ -61,6 +61,7 @@ source_set("channel_info") { "channel_info.h", ] deps = [ "//build:branding_buildflags" ] @@ -10,7 +10,7 @@ index 16fe306a6097e354858dd8ebe83b924174c55415..2781f10e6dba98b980f4b5161d6c3a3c public_deps = [ "//base", "//components/version_info", -@@ -149,6 +150,7 @@ static_library("common") { +@@ -146,6 +147,7 @@ static_library("common") { ] public_deps = [ @@ -18,7 +18,7 @@ index 16fe306a6097e354858dd8ebe83b924174c55415..2781f10e6dba98b980f4b5161d6c3a3c ":available_offline_content_mojom", ":buildflags", ":channel_info", -@@ -553,6 +555,7 @@ static_library("non_code_constants") { +@@ -550,6 +552,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-installer-mac-signing-signing.py.patch b/patches/chrome-installer-mac-signing-signing.py.patch index 0220c8234a6f..846028d3cca5 100644 --- a/patches/chrome-installer-mac-signing-signing.py.patch +++ b/patches/chrome-installer-mac-signing-signing.py.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/mac/signing/signing.py b/chrome/installer/mac/signing/signing.py -index eb3b4e4fe4628aab2441f4b83ff58ac982748756..decbf4310b8af915d763fd83a88678b330972b97 100644 +index a710b52cd8dbd2973476e125b04736aada73ff1e..b63e282672e86eaa8a17011e348f61a60b7825c6 100644 --- a/chrome/installer/mac/signing/signing.py +++ b/chrome/installer/mac/signing/signing.py -@@ -78,7 +78,7 @@ def sign_part(paths, config, part): +@@ -69,7 +69,7 @@ def sign_part(paths, config, part): part: The |model.CodeSignedProduct| to sign. The product's |path| must be in |paths.work|. """ diff --git a/patches/chrome-installer-util-BUILD.gn.patch b/patches/chrome-installer-util-BUILD.gn.patch index ef6732c9238a..394edbdfec10 100644 --- a/patches/chrome-installer-util-BUILD.gn.patch +++ b/patches/chrome-installer-util-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn -index 2ea95551d977717045804377090c4e57bb4e0518..cf2c6401223c15a684e07d274c8466b87c199ea0 100644 +index 4d66944fd8a99098db3083b184aed14018134064..159dbb52c7d511f5fcd6607cea7acf8d5143c5f4 100644 --- a/chrome/installer/util/BUILD.gn +++ b/chrome/installer/util/BUILD.gn -@@ -225,7 +225,20 @@ generate_embedded_i18n("generate_strings") { +@@ -232,7 +232,20 @@ generate_embedded_i18n("generate_strings") { output_file_name_base = "installer_util_strings" diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 2b0e24f78be1..28be24c77152 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 62747b5714ed02fee4c9df7c55b28d95f3ac2a46..b262047966653217f82bdd0018cf3e8a0cfa3413 100644 +index 11e52c29181412d3853dc16e7106720613395384..74ccc65ae634a4a3bef2e482238131491edd8e09 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -195,6 +195,7 @@ static_library("renderer") { +@@ -202,6 +202,7 @@ static_library("renderer") { "//v8", ] diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index a63afb3787ac..cc0433e645f4 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 87243e716262b31c49a2bf18fc3b3b8c38b29c53..384627707dbdbe3961a178b966886cbc81285581 100644 +index c9852764a59cb37f312978d8aa14ec51c308502b..e38fb9970fb6a931c96bdc6e5bafc9c73f0adb42 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -487,7 +487,7 @@ void ChromeContentRendererClient::RenderFrameCreated( diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch index 7fef2c2d2dc7..681b0148ddba 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index 04d63a82dde7b1ec4259ec90e0733f3536e97ad0..ce53857b344e8c56706b8980c86219f81ee0d0d8 100644 +index b5f29c1f2193dfd0f72ab238c9474dc5a20ee235..ac79503fb5a6b16d77f7ec91a0565b289374f421 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h -@@ -238,6 +238,7 @@ class ChromeContentRendererClient +@@ -229,6 +229,7 @@ class ChromeContentRendererClient #endif private: diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 91807eb4e460..adbf29c95f50 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 24b1e6d45fd1a13892f6a30ae9bc587bbf6dfbdf..d08479d044b4492f94a41301ed4239c587d68449 100644 +index 7983783c4ebfa9632d06024baf75185f5e5bead3..861a241c12ea05b50c6a38554cd0df40c777f27b 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -828,6 +828,7 @@ if (!is_android) { +@@ -838,6 +838,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index a030149bdd42..5353ac36817c 100644 --- a/patches/chrome-utility-BUILD.gn.patch +++ b/patches/chrome-utility-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn -index 8ca2f3bdf8362bcedeb8784f08fd9c4c9fa15b16..4b9e26ec210f9e4a540ce4f4e0b2a4bb0c62ee70 100644 +index f86605d537c532c504cd17509f3de4912299c271..d6628eaa01fb5b7915e836cc6f33695777694a35 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn -@@ -28,6 +28,7 @@ static_library("utility") { +@@ -35,6 +35,7 @@ static_library("utility") { public_deps = [] deps = [ diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index 81ca65da2f47..f1bce2840f42 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index 2d8dce05a67a7df3d8e83465ff7df2124e89659b..fae600026640d7a36cab7494263d66b239d911e2 100644 +index 4040f963321177b8cfaff5329f107558b77f945e..5d58803836104e01c650e77502c216437f17f9fa 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java @@ -394,7 +394,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch index 8434b9fad646..91f5d0a11f94 100644 --- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index 7da0c1acfdc39cd7c226b05678910801b9d7e805..888ea24176b6466e973d3db16339b5050dff1217 100644 +index b56f59f67c2bb1537e061a8931caf05f6db182cc..514b34ddf07306641bc3ffcf2a4ed4fbbaed098e 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc @@ -493,6 +493,7 @@ bool PageSpecificContentSettings::IsContentBlocked( diff --git a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch index 6e19493aacdd..f49e793f1984 100644 --- a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch +++ b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc -index 370251296f0b21a0605b03452a239535f38ffb4c..a2f035c705225809f8c003276f0c6e72bf565c58 100644 +index 20ae512af8064faf5b8a7364ebd631dafb15f3b0..c5ff13fcff0aa39dbbb4c121919290537f681be1 100644 --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -486,6 +486,7 @@ bool ContentSettingsAgentImpl::IsWhitelistedForContentSettings() const { +@@ -483,6 +483,7 @@ bool ContentSettingsAgentImpl::IsWhitelistedForContentSettings() const { const WebDocument& document = render_frame()->GetWebFrame()->GetDocument(); WebSecurityOrigin origin = document.GetSecurityOrigin(); WebURL document_url = document.Url(); diff --git a/patches/components-content_settings-renderer-content_settings_agent_impl.h.patch b/patches/components-content_settings-renderer-content_settings_agent_impl.h.patch index 7ab9a79ed54f..89b8b8a3924f 100644 --- a/patches/components-content_settings-renderer-content_settings_agent_impl.h.patch +++ b/patches/components-content_settings-renderer-content_settings_agent_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h -index e6f97a1ebb4d706c9b113da8f8d799cd668c7efd..d5fa4f8628cefc143c0f78340f7e03bc6d1cf225 100644 +index 41dcaac27827b1a8001ea57c5f6f764ec6e129d9..02a499417da90842d2eef4af6ee9fbb35fdd518b 100644 --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -118,6 +118,7 @@ class ContentSettingsAgentImpl +@@ -115,6 +115,7 @@ class ContentSettingsAgentImpl const blink::WebFrame* frame, const blink::WebURL& secondary_url); diff --git a/patches/components-external_intents-android-BUILD.gn.patch b/patches/components-external_intents-android-BUILD.gn.patch index 3966fc9409fe..aa0e2aa30650 100644 --- a/patches/components-external_intents-android-BUILD.gn.patch +++ b/patches/components-external_intents-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/external_intents/android/BUILD.gn b/components/external_intents/android/BUILD.gn -index 1d5981d364cb671f2d017b98fbf9de2df1fd730d..3743c491f7861747bccf8cfc50b4ed05403a4b54 100644 +index 2eccc0ef9a0add5185cb474d8803b0588519c817..82a87d900968a1b8764fe192e67ca62f85c84d42 100644 --- a/components/external_intents/android/BUILD.gn +++ b/components/external_intents/android/BUILD.gn -@@ -65,6 +65,7 @@ static_library("android") { +@@ -64,6 +64,7 @@ static_library("android") { "//components/navigation_interception", "//content/public/browser", ] diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 439fb637e442..677d0b45e7e5 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index f7266475b1fdef082cbde96b227d4e1fdaa3e544..47af128d751c92b4662c6ed34f6b70d040424578 100644 +index 5704e982a63599700caa66e83dc58fddd785b9cb..287e7a5460c8e70fb5debf7ae71c0f8ec3dac2e8 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -253,6 +253,7 @@ static_library("browser") { diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index bc96eef8b29d..8f4def47c9bb 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index 42ecf277e74c976ff633c6d234431e52c67ae9d1..f93f744eea6cc61151fc3a27cbe9b92769a51453 100644 +index 6c2eeecbb056e00bbd5c0692cf40f066531e0c0f..0ab839ba80e762429a583fe4dcca6c8462007a1e 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -261,6 +261,7 @@ AutocompleteController::AutocompleteController( diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 87b57cc1924a..dacac318f86e 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 663b125aae694017d0fba04ea5e2dddc8bdcee91..aea5087eb5ac4d99b5f4585af34c14bc5f044483 100644 +index 54de686b9c9b749752bd6e6ba195c65fb73d0ea5..0a53abdf973f7e95814820721837fab0cb62556b 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc @@ -371,6 +371,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, diff --git a/patches/components-page_info-page_info_ui.cc.patch b/patches/components-page_info-page_info_ui.cc.patch index 6806d2774c0d..aae67cdd5f48 100644 --- a/patches/components-page_info-page_info_ui.cc.patch +++ b/patches/components-page_info-page_info_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc -index 3da415e052e9a4f047f4aaeea1d5cc5677602677..aa1894cccbef67ccee310dc629c468b7e6d7c419 100644 +index 982612bcb931fd738fb2d6b857721a45d9de23ae..f6a9cb6faae2398221c5647226f58a6bdf56f0bf 100644 --- a/components/page_info/page_info_ui.cc +++ b/components/page_info/page_info_ui.cc @@ -554,6 +554,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon( diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index 185dceb8dbb6..043f28b59bbb 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index 74c6c4f1409ff5a0505eac79f5638f81d24547db..78014cd72ba4e69e1bf6b5a1e1e75269f05190e2 100644 +index e490aa5476aa81622582a2b8f616ce936b88c438..78b8ccda13ddaf7503c9f2ee5a2782e5e014ec3f 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -1977,6 +1977,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -1980,6 +1980,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-password_manager-core-browser-password_form_filling.cc.patch b/patches/components-password_manager-core-browser-password_form_filling.cc.patch index 290689a0d8f7..9656a75ce709 100644 --- a/patches/components-password_manager-core-browser-password_form_filling.cc.patch +++ b/patches/components-password_manager-core-browser-password_form_filling.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc -index bcc720dce57a39d7af7dbf7da62613d97d2fdd70..c0769b57a4cebdb929c3795abf97452a2fbf151b 100644 +index 7f6c5f760f5f7aa777da0689d91da4bd1416a0da..0d795a9d16eb5cd62d797bf5f39737c14a0dd917 100644 --- a/components/password_manager/core/browser/password_form_filling.cc +++ b/components/password_manager/core/browser/password_form_filling.cc -@@ -203,6 +203,9 @@ LikelyFormFilling SendFillInformationToRenderer( +@@ -202,6 +202,9 @@ LikelyFormFilling SendFillInformationToRenderer( bool wait_for_username = wait_for_username_reason != WaitForUsernameReason::kDontWait; diff --git a/patches/components-permissions-permission_request.h.patch b/patches/components-permissions-permission_request.h.patch index 614d7fa24bae..ef7e39a121fb 100644 --- a/patches/components-permissions-permission_request.h.patch +++ b/patches/components-permissions-permission_request.h.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_request.h b/components/permissions/permission_request.h -index 20bedc709a3d96e8408fbbba60a2bdaf99a1ed8f..942b95442fb9b9bf78a17d3fb5dfb5d390b440ab 100644 +index 64358a516f01b2049e0228220ac19535ea5cab8b..c2a23a9d09d2855103ae866fe7e7f35e6ff10386 100644 --- a/components/permissions/permission_request.h +++ b/components/permissions/permission_request.h -@@ -58,6 +58,7 @@ enum class PermissionRequestType { +@@ -59,6 +59,7 @@ enum class PermissionRequestType { PERMISSION_WINDOW_PLACEMENT = 25, PERMISSION_FONT_ACCESS = 26, PERMISSION_IDLE_DETECTION = 27, diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index 26b3eaebe19f..d76f42e21e25 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index 865ae3d522f4699606ba4a7cd184024d8941e030..16de91714d7b280069b32db9ac753c0101c785f5 100644 +index 45cc84456ea8695a63c00e9e77ea2ed9a96a029b..0045c0ce4b5663a4fc28b04fc301243232b3fd80 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -50,7 +50,7 @@ namespace { @@ -11,7 +11,7 @@ index 865ae3d522f4699606ba4a7cd184024d8941e030..16de91714d7b280069b32db9ac753c01 switch (type) { case PermissionRequestType::MULTIPLE: return "AudioAndVideoCapture"; -@@ -572,6 +572,7 @@ void PermissionUmaUtil::RecordPermissionAction( +@@ -585,6 +585,7 @@ void PermissionUmaUtil::RecordPermissionAction( base::UmaHistogramEnumeration("Permissions.Action.IdleDetection", action, PermissionAction::NUM); break; diff --git a/patches/components-search_engines-prepopulated_engines.json.patch b/patches/components-search_engines-prepopulated_engines.json.patch index 815a7b71d8d9..92af73592913 100644 --- a/patches/components-search_engines-prepopulated_engines.json.patch +++ b/patches/components-search_engines-prepopulated_engines.json.patch @@ -1,5 +1,5 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json -index bc5fb3f15a9d0e711ac80033ef3150d23379d821..f07b13475802ce22bf94eb3955a01ed7f9bcfff4 100644 +index dc87e8a6da3996ea596a39426e0e734b49cf9133..a0f6f5b6f7cbb6e118d4c9a2bd6d20e0e7b4127e 100644 --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json @@ -91,17 +91,6 @@ diff --git a/patches/components-sync-BUILD.gn.patch b/patches/components-sync-BUILD.gn.patch index 68673d7e62b5..75e4133dcb33 100644 --- a/patches/components-sync-BUILD.gn.patch +++ b/patches/components-sync-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn -index f1091ab89e50f163b7903357dac3b48a59ca54bb..aa306762fc95574ca5f6161ff5e7e757470b2232 100644 +index d3b3f040afb59cc4ba659a4a754ec7dd9d22e08d..35156a489c8a1ec530086cd2ee38ba359bf2550a 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn @@ -305,6 +305,7 @@ static_library("rest_of_sync") { diff --git a/patches/components-sync-driver-profile_sync_service.h.patch b/patches/components-sync-driver-profile_sync_service.h.patch index a5f8a4146703..7009c5def9a4 100644 --- a/patches/components-sync-driver-profile_sync_service.h.patch +++ b/patches/components-sync-driver-profile_sync_service.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/driver/profile_sync_service.h b/components/sync/driver/profile_sync_service.h -index 475bd2f73eb88a007f5792b7052f0eca175088c0..f468fcbd303b26244cfc98a11edac427d984d382 100644 +index b809a57c5a691a043eee6b370bf123169d3b9835..cf62448fbd230a8df9796e72996741728b772012 100644 --- a/components/sync/driver/profile_sync_service.h +++ b/components/sync/driver/profile_sync_service.h @@ -257,6 +257,7 @@ class ProfileSyncService : public SyncService, diff --git a/patches/components-vector_icons-vector_icons.gni.patch b/patches/components-vector_icons-vector_icons.gni.patch index f0de81385b12..04ffe7ab116e 100644 --- a/patches/components-vector_icons-vector_icons.gni.patch +++ b/patches/components-vector_icons-vector_icons.gni.patch @@ -1,8 +1,16 @@ diff --git a/components/vector_icons/vector_icons.gni b/components/vector_icons/vector_icons.gni -index b8ba375a6c4866b061fc8cf2659578c45f5c6be7..40c4ccbbb9017673a2cf82e6b5f4cd2e27e027bd 100644 +index d068c55a04ac027af5c3c3c9be8e13df4df5f09a..25ca9fabf28ee55b52dfeee3b4330fa5bfa687f7 100644 --- a/components/vector_icons/vector_icons.gni +++ b/components/vector_icons/vector_icons.gni -@@ -40,6 +40,8 @@ template("aggregate_vector_icons") { +@@ -60,6 +60,7 @@ template("aggregate_vector_icons2") { + "--file_list={{response_file_name}}", + "--output_cc=" + rebase_path(output_cc, root_build_dir), + "--output_h=" + rebase_path(output_h, root_build_dir), ++ "--alt_working_directory=" + alt_icons_dir_rel, + ] + } + } +@@ -84,6 +85,8 @@ template("aggregate_vector_icons") { "vector_icons.cc.template", "vector_icons.h.template", ] @@ -11,11 +19,3 @@ index b8ba375a6c4866b061fc8cf2659578c45f5c6be7..40c4ccbbb9017673a2cf82e6b5f4cd2e inputs = rebase_path(templates + invoker.icons, ".", invoker.icon_directory) + [ "//components/vector_icons/aggregate_vector_icons.py" ] -@@ -58,6 +60,7 @@ template("aggregate_vector_icons") { - "--file_list={{response_file_name}}", - "--output_cc=" + rebase_path(output_cc, root_build_dir), - "--output_h=" + rebase_path(output_h, root_build_dir), -+ "--alt_working_directory=" + alt_icons_dir_rel, - ] - } - } diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 2cb3484e6275..5db6d3349cad 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 9e83a156d7e1341054817765c347a9f91e31c669..2c6560b07abb805540995a87f7cc33f4bd34521b 100644 +index 6881841560dc0049f12fcaeaef912a83d715b4a6..879fab05adfda60bc8468c84391bd17aca8d1d8c 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -1812,6 +1812,7 @@ void NavigationRequest::OnRequestRedirected( diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index b270b3744ce2..4b28a0b750d0 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 5dd064f5fa6a01031c4f2a97223109e730488ca8..6f2a5df09bff80afa8dff2d0841cac0c2885a4dd 100644 +index d4fd985389bb9fae80377c9f686e7868f250eba9..ca72d1789fb6d1bfb1559307f6ec2301a51a74f6 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn -@@ -37,6 +37,7 @@ source_set("common") { +@@ -44,6 +44,7 @@ source_set("common") { visibility = [ "//content/*", "//tools/ipc_fuzzer/message_replay:ipc_fuzzer_replay", diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index ca6514d2d5d5..e5289191ed46 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index c2642a399f14edb12cd752e6e61bd249c4f20ff8..45438592e4ce57e97c29a0814f956858b368f13b 100644 +index 8f60ee555af7f3a628dcec8234f02d21080023c4..9311f04b9f999456d5d444eaf7dc18ed3fe569a4 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1788,6 +1788,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1780,6 +1780,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index e774343ab3c1..573ec1982693 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 671d6851e1605ea6a9002e0731ed540e04b59359..f5f23f07321424e193a9447c9b9e4c55e7b2d0b1 100644 +index 0352f12717108a0ed5263f5b2d2a6b9af05756b0..ce202c5af7aa21bd32e4ff7b970c2d935ffe7736 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1011,6 +1011,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { +@@ -1022,6 +1022,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch index 30aa17dbefb2..e4a9b263e106 100644 --- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch +++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index 77ac9a9c242b0142ad6b9057f403af8ee496f432..05fe7913a10b142f62e135feba1c67101dc35dca 100644 +index 86dbbf736eaf59500af84735c6862e34ccadcf20..ed04c4d7d36408bff406e03c2aa7501f85afb890 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1291,6 +1291,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1301,6 +1301,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 8b2a7b865553..78edec50fada 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index c3ef470248cb3789812515fdc0145a7a6889a0c4..534f05fe4d8796e8b492d80bf4d09ec137a8e8c7 100644 +index 017e7416b49fbaf0f17412c9b3f279881589b51d..f131de1734c8e94da1cd1e57cd7d8bac8bb6b0c5 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1182,6 +1182,7 @@ component("net") { +@@ -1183,6 +1183,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 60f146cf5738..46727eccbb9e 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index d66d36e59a30a19dd6150da6111d9533dfe3290b..575498f2be653ad6304b5831ce941b5f7da480de 100644 +index 3e240ba3c7a5a48f64df5d2e6537f545ea31bb39..19dba0f569de12b9c29ca0a25f6e52910fde6865 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn @@ -146,6 +146,7 @@ component("cpp") { diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index f2cee260114c..0e1744add007 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 613efdd10d3645c3f3124bc97f512be07fa669aa..3b7354f6a04271dbc281eee82b666c51e4fadc66 100644 +index 959bde96dc21a2eb08d764709b64502cdd6e2d0e..66286cab4c08d00557f15ea30025b8d46fa6e4fb 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2134,6 +2134,7 @@ generated_interface_sources_in_modules = [ +@@ -2228,6 +2228,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index af8fdb714361..12318f7bcda2 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index 0ea2e923a37a2698921c6c0a98828940a4ac64ae..5fd4cc47377990bab6b6a4df00d9e552815d38e3 100644 +index 2b539d5df015256073e72aa8d429735a617d94a7..8cc90e73a455a280a15aaa0a2f34a1238a0823d8 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1023,6 +1023,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1027,6 +1027,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_world_tracking_state.idl", ], "abspath") diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index 10bec2cd3793..5fd1bb3da1dc 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index d95886012c43ab714c013c62e08475d05956a900..655ecec8c62fd3f5108fa05eb8ba94aca86e3eb1 100644 +index 7a14170592c8e587696c6ec7aaa4811d8f900a99..45edffc6512f07f4bd86af1ba43cd1271684ea31 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -126,6 +126,7 @@ component("core") { diff --git a/patches/third_party-blink-renderer-core-dom-document.cc.patch b/patches/third_party-blink-renderer-core-dom-document.cc.patch index ff05d4f156a7..76b1034f24c6 100644 --- a/patches/third_party-blink-renderer-core-dom-document.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-document.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 3c9277ec1df9ec6b34ea589bd07b61cddce685df..e03f2a4d862e45ba243f51ea6aaf76e1411aecc2 100644 +index cc64b6a88e3bd6661bc8adbbae16eadf8a879917..ec79e61454af18328017ae23a36fe7b9cd07f956 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -33,7 +33,7 @@ diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index c921e6ce4040..f70ebd269ed8 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index bd0c13e67cff16316328ea32598cba81d1a57933..448a93f0c4b80a101b7a05b4fb327fd61a9e7ba1 100644 +index 334657202facd61b15867dbfeef155a19da8a578..5d30d8dc4a026302b72b78a3bfac91f33efcd53f 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -973,6 +973,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -972,6 +972,7 @@ String HTMLCanvasElement::ToDataURLInternal( scoped_refptr image_bitmap = Snapshot(source_buffer); if (image_bitmap) { diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 65e50ae051df..1ae8e07dc865 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 244cbcfde840ddbdc62e9006a3038da322b6a32b..3f34d50c00564dd2ddb2cc4f6c849b842087d500 100644 +index 5046242e2c69d53a5803feec6f9415972bf5fe9b..b8bd7301caf480a57be9058deec0c24f895df24f 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -16,6 +16,7 @@ if (is_android) { diff --git a/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch b/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch index 29295511b9a8..2af766f203c1 100644 --- a/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch +++ b/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc -index cafe7b4299fbd30e22185c18138c57f1ece0b6e2..3d84ff8f8b9569969d53bf734e5c61cc7f91cee5 100644 +index 4be203326f93472916245c31d4dbe17eaf6f589d..696c01d5c2b2cf5222c89489dd556c7209e9a345 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc +++ b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc @@ -523,6 +523,7 @@ void ProcessSnapshotWin::AddMemorySnapshotForLdrLIST_ENTRY( diff --git a/patches/third_party-crashpad-crashpad-util-net-http_transport_win.cc.patch b/patches/third_party-crashpad-crashpad-util-net-http_transport_win.cc.patch index 2ae2b55c4297..2e037bc866d6 100644 --- a/patches/third_party-crashpad-crashpad-util-net-http_transport_win.cc.patch +++ b/patches/third_party-crashpad-crashpad-util-net-http_transport_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/crashpad/crashpad/util/net/http_transport_win.cc b/third_party/crashpad/crashpad/util/net/http_transport_win.cc -index 06ecc4f38f6d3e85f157a7210d363c924b0d3da9..88be195051a00c8500f793b4e175d898a30101f8 100644 +index 9618fbefbd53ca891a6651e7f2b0073aec9551a2..0766cddb38fb61eaaa5d0a49644632eb3a9a5678 100644 --- a/third_party/crashpad/crashpad/util/net/http_transport_win.cc +++ b/third_party/crashpad/crashpad/util/net/http_transport_win.cc @@ -156,6 +156,8 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) { diff --git a/patches/third_party-widevine-cdm-widevine.gni.patch b/patches/third_party-widevine-cdm-widevine.gni.patch index fc2906bbd390..b3e8d9865f11 100644 --- a/patches/third_party-widevine-cdm-widevine.gni.patch +++ b/patches/third_party-widevine-cdm-widevine.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni -index 5572a1dae88c44ff50c0c71dba626cebe0987080..83a75ea911258765be02d33eb6d821f227295c14 100644 +index 036d03e36a13b7947f0a3cc1dfdc81823b080645..ab3eaf80f7f711d901d76cfb445afcec73c5ed51 100644 --- a/third_party/widevine/cdm/widevine.gni +++ b/third_party/widevine/cdm/widevine.gni -@@ -41,6 +41,8 @@ enable_widevine_cdm_component = +@@ -42,6 +42,8 @@ enable_widevine_cdm_component = # Widevine CDM is bundled as part of Google Chrome builds. bundle_widevine_cdm = enable_library_widevine_cdm && is_chrome_branded diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 026400961086..3202bc565be3 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 9ee0acf3ade8dd4789f40a2b17bfeabbfa5e3cf8..2603cb4c8d213497bd633d27fee6888261cdf219 100644 +index a411c2a5788df546764d5c4493dff876a8c93156..b0b9f014193bb78f52606c3f8c76b89d8d00f1ff 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index 9ee0acf3ade8dd4789f40a2b17bfeabbfa5e3cf8..2603cb4c8d213497bd633d27fee68882 "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -393,6 +396,9 @@ +@@ -396,6 +399,9 @@ "META": {"align": 100}, "messages": [2700], }, diff --git a/patches/tools-json_schema_compiler-feature_compiler.py.patch b/patches/tools-json_schema_compiler-feature_compiler.py.patch index 890291481262..78af28c702b8 100644 --- a/patches/tools-json_schema_compiler-feature_compiler.py.patch +++ b/patches/tools-json_schema_compiler-feature_compiler.py.patch @@ -1,8 +1,8 @@ diff --git a/tools/json_schema_compiler/feature_compiler.py b/tools/json_schema_compiler/feature_compiler.py -index 92d4dcf8ceb97d47e8a30952c47f1df23186c673..9cf762f489c7c06d4a193d5d42e6cadf8e76b1a1 100644 +index 3827dc3cdb7385290aac2dc674066f2ba7308a7d..cbb6df36a1f8df563614ded56277f1818675531e 100644 --- a/tools/json_schema_compiler/feature_compiler.py +++ b/tools/json_schema_compiler/feature_compiler.py -@@ -745,6 +745,14 @@ class FeatureCompiler(object): +@@ -768,6 +768,14 @@ class FeatureCompiler(object): abs_source_file) raise dupes = set(f_json) & set(self._json) diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index 58ba2a2cce43..1a6417f87873 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 7f993aa14fc1f179f4fa952241761bb826c787e9..b9441a7e94ca4ae701ce113fe2de0a9ccfa1842e 100644 +index 60d58740ef212431f9e3125ae5dff627bec4efc2..c6ce481f70dce7be6be86bf5536a0ee913bddd88 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -457,6 +457,7 @@ component("base") { +@@ -451,6 +451,7 @@ component("base") { "//ui/strings", "//url", ] diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch index ff8f61d40e92..1d5b8c5037c3 100644 --- a/patches/ui-native_theme-native_theme_win.cc.patch +++ b/patches/ui-native_theme-native_theme_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc -index d6fa761fafbc7cfea744a34b1101fb33a5ac1ba2..131a78b806a17c52bc7d102ef4d872559d98014f 100644 +index 950956142148d2127135386dd2b9d0076b7aa148..fcc3dcaf5c3e8badff59b27354b6c4873603b520 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc -@@ -1643,6 +1643,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { +@@ -1644,6 +1644,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { &apps_use_light_theme); dark_mode_enabled = (apps_use_light_theme == 0); } diff --git a/patches/ui-views-controls-button-md_text_button.h.patch b/patches/ui-views-controls-button-md_text_button.h.patch index 6119b08c772e..cdeaa0c618d0 100644 --- a/patches/ui-views-controls-button-md_text_button.h.patch +++ b/patches/ui-views-controls-button-md_text_button.h.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/controls/button/md_text_button.h b/ui/views/controls/button/md_text_button.h -index 15818a3e2e7d94ee4877c26ec467a812b6ee7833..613a5d466210cc09b44e4d3a60c53a857d0b8695 100644 +index b9aa8505a8ed43a2dece11a6752704a748ce7ec2..e341f903fde23820a3efdf0eef5ff8f2973ce073 100644 --- a/ui/views/controls/button/md_text_button.h +++ b/ui/views/controls/button/md_text_button.h -@@ -60,11 +60,13 @@ class VIEWS_EXPORT MdTextButton : public LabelButton { +@@ -59,11 +59,13 @@ class VIEWS_EXPORT MdTextButton : public LabelButton { void OnBlur() override; private: From e5b8e78fa580c007614b9f2a4b70424b505a1482 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Sat, 3 Oct 2020 13:28:02 -0400 Subject: [PATCH 072/152] Changes to aggregate_vector_icons gn template. Chromium changes: https://source.chromium.org/chromium/chromium/src/+/f67c9bc921198f690a0a50c178ae3dcc6dcc2a61 commit f67c9bc921198f690a0a50c178ae3dcc6dcc2a61 Author: Evan Stade Date: Thu Oct 1 17:52:39 2020 +0000 Update aggregate_vector_icons gn template, step 2. Switch aggregate_vector_icons to the new version, without removing aggregate_vector_icons2. This will allow downstream clients to switch back to aggregate_vector_icons before aggregate_vector_icons2 is removed. Bug: 1132894 https://source.chromium.org/chromium/chromium/src/+/ede44987413e4997ed18b04798312b53b2bb6154 commit ede44987413e4997ed18b04798312b53b2bb6154 Author: Evan Stade Date: Mon Sep 28 22:18:23 2020 +0000 Reland "Adjust aggregate_vector_icons GN template." This reverts commit f56db26f51a5f6b88137bc346a6c947caddf1fd1. Reason for revert: breakage was already fixed in 1df2fd67fc183d6b6c31e78f768341e5b14c043f Original change's description: > Revert "Adjust aggregate_vector_icons GN template." > > This reverts commit 6197ec2721959f8c2af6f71efa3bcabebcf586cc. > > Reason for revert: Broke chromeos-betty-pi-arc-cfi-thin-lto-chrome > > BUG=1133015 > > Original change's description: > > Adjust aggregate_vector_icons GN template. > > > > Change the name of the icon list from `icons` to `sources`. This makes > > gn format alphabetize the list. > > > > Bug: 1132894 --- app/vector_icons/BUILD.gn | 4 ++-- components/vector_icons/BUILD.gn | 4 ++-- ...onents-vector_icons-vector_icons.gni.patch | 22 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/vector_icons/BUILD.gn b/app/vector_icons/BUILD.gn index b436032efed3..2dfe9a28cf7b 100644 --- a/app/vector_icons/BUILD.gn +++ b/app/vector_icons/BUILD.gn @@ -4,10 +4,10 @@ import("//components/vector_icons/vector_icons.gni") -aggregate_vector_icons("brave_vector_icons") { +aggregate_vector_icons2("brave_vector_icons") { icon_directory = "." - icons = [ + sources = [ "download_unlock.icon", "open_in_tor.icon", "speedreader.icon", diff --git a/components/vector_icons/BUILD.gn b/components/vector_icons/BUILD.gn index 5a54aaba340c..7c74295f992f 100644 --- a/components/vector_icons/BUILD.gn +++ b/components/vector_icons/BUILD.gn @@ -5,10 +5,10 @@ import("//components/vector_icons/vector_icons.gni") -aggregate_vector_icons("brave_components_vector_icons") { +aggregate_vector_icons2("brave_components_vector_icons") { icon_directory = "." - icons = [ "autoplay_status.icon" ] + sources = [ "autoplay_status.icon" ] } static_library("vector_icons") { diff --git a/patches/components-vector_icons-vector_icons.gni.patch b/patches/components-vector_icons-vector_icons.gni.patch index 04ffe7ab116e..81d8e0057352 100644 --- a/patches/components-vector_icons-vector_icons.gni.patch +++ b/patches/components-vector_icons-vector_icons.gni.patch @@ -1,21 +1,21 @@ diff --git a/components/vector_icons/vector_icons.gni b/components/vector_icons/vector_icons.gni -index d068c55a04ac027af5c3c3c9be8e13df4df5f09a..25ca9fabf28ee55b52dfeee3b4330fa5bfa687f7 100644 +index d068c55a04ac027af5c3c3c9be8e13df4df5f09a..47609044402cde99c4beceb8a97c234bd11be2f9 100644 --- a/components/vector_icons/vector_icons.gni +++ b/components/vector_icons/vector_icons.gni -@@ -60,6 +60,7 @@ template("aggregate_vector_icons2") { - "--file_list={{response_file_name}}", - "--output_cc=" + rebase_path(output_cc, root_build_dir), - "--output_h=" + rebase_path(output_h, root_build_dir), -+ "--alt_working_directory=" + alt_icons_dir_rel, - ] - } - } -@@ -84,6 +85,8 @@ template("aggregate_vector_icons") { +@@ -42,6 +42,8 @@ template("aggregate_vector_icons2") { "vector_icons.cc.template", "vector_icons.h.template", ] + alt_icons_dir = "//brave/vector_icons/"+ rebase_path(invoker.icon_directory, "//") + alt_icons_dir_rel = rebase_path(alt_icons_dir, root_build_dir) inputs = - rebase_path(templates + invoker.icons, ".", invoker.icon_directory) + + rebase_path(templates + invoker.sources, ".", invoker.icon_directory) + [ "//components/vector_icons/aggregate_vector_icons.py" ] +@@ -60,6 +62,7 @@ template("aggregate_vector_icons2") { + "--file_list={{response_file_name}}", + "--output_cc=" + rebase_path(output_cc, root_build_dir), + "--output_h=" + rebase_path(output_h, root_build_dir), ++ "--alt_working_directory=" + alt_icons_dir_rel, + ] + } + } From 025056e27cdc7f00587d66c14bf013ef056a3843 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Sat, 3 Oct 2020 13:43:14 -0400 Subject: [PATCH 073/152] Updated strings for Chromium 87.0.4278.0. --- app/bookmarks_strings.grdp | 29 ++- app/bookmarks_strings_override.grdp | 7 +- app/brave_strings.grd | 7 +- app/extensions_strings.grdp | 3 + app/generated_resources.grd | 123 +++++++++--- app/generated_resources_override.grd | 12 +- app/nearby_share_strings.grdp | 14 ++ app/os_settings_search_tag_strings.grdp | 13 +- app/os_settings_strings.grdp | 96 +++++----- app/profiles_strings.grdp | 12 ++ app/settings_strings.grdp | 72 ++++--- app/sharesheet_strings.grdp | 9 + .../strings/android_chrome_strings.grd | 179 +++++++++++++++++- components/dom_distiller_strings.grdp | 39 ++++ components/omnibox_strings.grdp | 4 +- components/pdf_strings.grdp | 12 ++ components/policy_strings.grdp | 21 ++ components/translate_strings.grdp | 6 + 18 files changed, 526 insertions(+), 132 deletions(-) diff --git a/app/bookmarks_strings.grdp b/app/bookmarks_strings.grdp index 7c21b9d1279b..98909cac6bd6 100644 --- a/app/bookmarks_strings.grdp +++ b/app/bookmarks_strings.grdp @@ -66,19 +66,19 @@ {COUNT, plural, =0 {&Open all} =1 {&Open bookmark} - other {&Open all (#)}} + other {&Open all ({COUNT})}} {COUNT, plural, =0 {Open all in &new window} =1 {Open in &new window} - other {Open all (#) in &new window}} + other {Open all ({COUNT}) in &new window}} {COUNT, plural, =0 {Open all in &private window} =1 {Open in &private window} - other {Open all (#) in &private window}} + other {Open all ({COUNT}) in &private window}} &Open in new tab @@ -118,19 +118,19 @@ {COUNT, plural, =0 {&Open All} =1 {&Open Bookmark} - other {&Open All (#)}} + other {&Open All ({COUNT})}} {COUNT, plural, =0 {Open All in &New Window} =1 {Open in &New Window} - other {Open All (#) in &New Window}} + other {Open All ({COUNT}) in &New Window}} {COUNT, plural, =0 {Open All in &Private Window} =1 {Open in &Private Window} - other {Open All (#) in &Private Window}} + other {Open All ({COUNT}) in &Private Window}} &Open in New Tab @@ -342,7 +342,7 @@ {COUNT, plural, =1 {1 item in bookmark list} - other {# items in bookmark list}} + other {{COUNT} items in bookmark list}} Bookmark list @@ -375,14 +375,23 @@ Import bookmarks - Open all bookmarks + Open all + + + Open all ($15) Open all in new window + + Open all ($15) in new window + Open all in private window + + Open all ($15) in private window + Open in new tab @@ -431,7 +440,7 @@ {COUNT, plural, =1 {1 bookmark deleted} - other {# bookmarks deleted}} + other {{COUNT} bookmarks deleted}} URL copied @@ -442,7 +451,7 @@ {COUNT, plural, =1 {1 item copied} - other {# items copied}} + other {{COUNT} items copied}} diff --git a/app/bookmarks_strings_override.grdp b/app/bookmarks_strings_override.grdp index 9cda3649ba82..9f9d0372e6cf 100644 --- a/app/bookmarks_strings_override.grdp +++ b/app/bookmarks_strings_override.grdp @@ -15,7 +15,7 @@ {COUNT, plural, =0 {Open all in &private window} =1 {Open in &private window} - other {Open all (#) in &private window}} + other {Open all ({COUNT}) in &private window}} Open in &private window @@ -31,7 +31,7 @@ {COUNT, plural, =0 {Open All in &Private Window} =1 {Open in &Private Window} - other {Open All (#) in &Private Window}} + other {Open All ({COUNT}) in &Private Window}} Open in &Private Window @@ -61,6 +61,9 @@ Open all in private window + + Open all ($15) in private window + Open in private window diff --git a/app/brave_strings.grd b/app/brave_strings.grd index 970169755f03..c984ce60f295 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -289,9 +289,12 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> Not used in Brave. Placeholder to keep resource maps in sync. + + This computer will soon stop receiving Brave updates because its hardware is no longer supported. + - - Brave may not function correctly because it is no longer supported on Mac OS X 10.9. + + To get future Brave updates, you'll need OS X 10.11 or later. This computer is using OS X 10.10. diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp index b0e737b4573a..71135f83be92 100644 --- a/app/extensions_strings.grdp +++ b/app/extensions_strings.grdp @@ -17,6 +17,9 @@ background page + + service worker + This extension may have been corrupted. diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 2d7bdf9c40b7..6f2bb168ea92 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -1190,6 +1190,9 @@ are declared in tools/grit/grit_rule.gni. R&eopen closed window + + &Name window... + @@ -1222,6 +1225,9 @@ are declared in tools/grit/grit_rule.gni. R&eopen Closed Window + + &Name Window... + @@ -1349,13 +1355,13 @@ are declared in tools/grit/grit_rule.gni. ''' - ''' - - &Edit search engines... + + &Manage search engines... - - &Edit Search Engines... + + &Manage Search Engines... @@ -5426,21 +5432,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Dark purple - - Dummy - Super Duper Module - - Dummy 2 - Even Better Module - - Kaleidoscope - Top picks for you @@ -5492,16 +5489,29 @@ Keep your key file in a safe place. You will need it to create new versions of y - - - Read later - + + + + Reading List + + + + + Reading list + + UNREAD PAGES YOU'VE READ + + Mark as read + + + Mark as unread + @@ -5545,9 +5555,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Search by voice - - Read later - Save card @@ -5978,9 +5985,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Manage passwords - + Use other password + + Use other username + Suggest strong password @@ -6420,6 +6430,11 @@ Keep your key file in a safe place. You will need it to create new versions of y {NUM_TABS, plural, =1 {Unmute site} other {Unmute sites}} + + {NUM_TABS, plural, + =1 {Read tab later} + other {Read tabs later}} + {NUM_TABS, plural, =1 {Add tab to group} @@ -6487,6 +6502,11 @@ Keep your key file in a safe place. You will need it to create new versions of y {NUM_TABS, plural, =1 {Unmute Site} other {Unmute Sites}} + + {NUM_TABS, plural, + =1 {Read Tab Later} + other {Read Tabs Later}} + {NUM_TABS, plural, =1 {Add Tab to Group} @@ -6547,6 +6567,37 @@ Keep your key file in a safe place. You will need it to create new versions of y + + + + Search Tabs + + + No Results Found + + + Close Tab + + + Submit Feedback + + + Tab Closed + + + Found $11 Tab + + + Found $12 Tabs + + + Found $11 Tab For '$2google' + + + Found $12 Tabs For '$2google' + + + @@ -7053,6 +7104,11 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't create QR code + + + Clipboard + + Text copied from other device @@ -9644,6 +9700,9 @@ Please help our engineers fix this problem. Tell us what happened right before y FIDO + + Serial + File Info @@ -10382,14 +10441,20 @@ Please help our engineers fix this problem. Tell us what happened right before y Exit Private - Close private + Close Private - + + {0, plural, + =1 {# open window} + other {# open windows} + } + + {0, plural, - =1 {Close guest} - other {Close guest} + =1 {Close Guest} + other {Close Guest} } @@ -10606,15 +10671,19 @@ Please help our engineers fix this problem. Tell us what happened right before y Learn more - https://www.google.com + https://support.google.com/chrome/?p=mac_ARM Learn more - https://www.google.com + https://support.google.com/chrome/?p=mac_ARM + + + Set Window Name + diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 8463f2cd59ff..76a597e9d575 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -475,6 +475,10 @@ are declared in tools/grit/grit_rule.gni. + + + + @@ -570,6 +574,9 @@ are declared in tools/grit/grit_rule.gni. + + + @@ -873,7 +880,7 @@ are declared in tools/grit/grit_rule.gni. Exit Private - Close private + Close Private @@ -887,6 +894,7 @@ are declared in tools/grit/grit_rule.gni. - + + diff --git a/app/nearby_share_strings.grdp b/app/nearby_share_strings.grdp index fc5153684c6e..19fd123de411 100644 --- a/app/nearby_share_strings.grdp +++ b/app/nearby_share_strings.grdp @@ -54,6 +54,17 @@ Your device visibility controls who can share with you while your screen is unlocked + + + Add a device name to continue + + + Device name too long + + + Device name contains invalid characters + + Make sure both devices are unlocked, close together, and have Bluetooth turned on. If you’re sharing with a Bravebook, make sure it has Nearby Sharing turned on (open the status area by selecting the time, then select Nearby Share). @@ -103,6 +114,9 @@ Reject + + $1Josh's $2Bravebook + {COUNT, plural, =1 {1 app} other {# apps}} diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index 1ab61e8ca3da..8987cd40a402 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -867,13 +867,13 @@ - Languages and input + Languages and inputs - + Languages - - Input + + Inputs Change device language @@ -884,7 +884,7 @@ Add languages - + Add input methods @@ -1097,6 +1097,9 @@ Change channel + + + Copy build details Check for update diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index b1ae0a4dcc40..df2fecf521c4 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -21,11 +21,11 @@ {NUM_DAYS, plural, - =1 {{1}example.com requires you to back up your data and return this {2}Bravebook today.<a target="_blank" href="{3}https://google.com/">See details</a>} - other {{1}example.com requires you to back up your data and return this {2}Bravebook within {NUM_DAYS} days.<a target="_blank" href="{3}https://google.com/">See details</a>}} + =1 {{1}example.com requires you to back up your data and return this {2}Bravebook today.<a target="_blank" rel="noopener noreferrer" href="{3}https://google.com/">See details</a>} + other {{1}example.com requires you to back up your data and return this {2}Bravebook within {NUM_DAYS} days.<a target="_blank" rel="noopener noreferrer" href="{3}https://google.com/">See details</a>}} - $1example.com requires you to back up your data and return this $2Bravebook within 1 week.<a target="_blank" href="$3https://google.com/">See details</a> + $1example.com requires you to back up your data and return this $2Bravebook within 1 week.<a target="_blank" rel="noopener noreferrer" href="$3https://google.com/">See details</a> @@ -161,13 +161,13 @@ Your $1Bravebook is up to date - This device will get automatic software and security updates until $1September 2020. <a target="_blank" href="$2https://google.com/">Learn more</a> + This device will get automatic software and security updates until $1September 2020. <a target="_blank" rel="noopener noreferrer" href="$2https://google.com/">Learn more</a> - This device stopped getting automatic software and security updates in $1September 2020. <a target="_blank" href="$2https://google.com/">Learn more</a> + This device stopped getting automatic software and security updates in $1September 2020. <a target="_blank" rel="noopener noreferrer" href="$2https://google.com/">Learn more</a> - This is the last automatic software and security update for this $1Bravebook. To get future updates, upgrade to a newer model. <a target="_blank" href="$2https://google.com/">Learn more</a> + This is the last automatic software and security update for this $1Bravebook. To get future updates, upgrade to a newer model. <a target="_blank" rel="noopener noreferrer" href="$2https://google.com/">Learn more</a> @@ -242,14 +242,14 @@ - - Languages and input + + Languages and inputs - + Languages - - Input + + Inputs Device language @@ -264,7 +264,13 @@ Change device language - You need to restart your Bravebook to change the device language. <a target="_blank" href="$1">Learn more</a> + You need to restart your Bravebook to change the device language. <a target="_blank" rel="noopener noreferrer" href="$1">Learn more</a> + + + $1English selected. Press Search plus Space to unselect. + + + $1English not selected. Press Search plus Space to select. Confirm and restart @@ -273,28 +279,31 @@ Languages for apps and websites - Apps and websites that support multiple languages will use the first supported language from this list. Language preferences sync to Brave browser. <a target="_blank" href="$1">Learn more</a> + Apps and websites that support multiple languages will use the first supported language from this list. Language preferences sync to Brave browser. <a target="_blank" rel="noopener noreferrer" href="$1">Learn more</a> Language used when translating pages + + Offer to translate pages in this language + Translation suggestion Offer to translate websites in other languages - + Input methods - - Open options page for $1US keyboard + + Open settings page for $1US keyboard - + Add input methods - - Remove $1US keyboard? + + Remove $1US keyboard Suggested @@ -302,10 +311,10 @@ All input methods - - Search by languages or input names + + Search by language or input name - + Your administrator doesn't allow this input method @@ -318,7 +327,7 @@ Spell check languages - Languages available for spell check is based on your languages settings + Languages for spell check are based on your language preference Couldn’t download spell check dictionary @@ -490,14 +499,11 @@ - Reverse scrolling <a>Learn more</a> + Enable reverse scrolling <a>Learn more</a> Device - - Scrolling - @@ -607,10 +613,10 @@ Select $1Brave Photos albums - Relive your favorite memories. To add or edit albums, go to<a target="_blank" href="$1https://google.com/">Brave Photos</a>. + Relive your favorite memories. To add or edit albums, go to<a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Brave Photos</a>. - No albums. Create an album in<a target="_blank" href="$1https://google.com/">Brave Photos</a>. + No albums. Create an album in<a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Brave Photos</a>. Your best photos, selected automatically @@ -1375,7 +1381,7 @@ Reserve size - A factory reset of this Bravebook is required to enable ADB debugging. <a target="_blank" href="$1">Learn more</a> + A factory reset of this Bravebook is required to enable ADB debugging. <a target="_blank" rel="noopener noreferrer" href="$1">Learn more</a> To enable ADB debugging, a restart of this $1Bravebook is required. Disabling it requires a reset to factory settings. @@ -1384,7 +1390,7 @@ Disabling ADB debugging will reset this $1Bravebook to factory settings. All user accounts and local data will be erased. - Run Linux tools, editors, and IDEs on your $1Bravebook. <a target="_blank" href="$2https://google.com/">Learn more</a> + Run Linux tools, editors, and IDEs on your $1Bravebook. <a target="_blank" rel="noopener noreferrer" href="$2https://google.com/">Learn more</a> Remove Linux for $1Bravebook @@ -1633,7 +1639,7 @@ Swap primary mouse button - Reverse scrolling + Enable reverse scrolling <a>Learn more</a> Enable mouse acceleration @@ -2105,13 +2111,13 @@ This network is shared with you. - This network is not synced to your account. <a target="_blank" href="$1https://google.com/">Learn more</a> + This network is not synced to your account. <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Learn more</a> - Synced with other devices on your account. Settings modified by other users will not be synced. <a target="_blank" href="$1https://google.com/">Learn more</a> + Synced with other devices on your account. Settings modified by other users will not be synced. <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Learn more</a> - Synced with other devices on your account. <a target="_blank" href="$1https://google.com/">Learn more</a> + Synced with other devices on your account. <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Learn more</a> Network out of range @@ -2186,7 +2192,7 @@ Connect - Looking for a mobile network. <a target="_blank" href="$1">Learn more</a> + Looking for a mobile network. <a target="_blank" rel="noopener noreferrer" href="$1">Learn more</a> @@ -2250,7 +2256,7 @@ Messages - Send and receive text messages from your $1Bravebook. <a target="_blank" href="$2https://google.com/">Learn more</a> + Send and receive text messages from your $1Bravebook. <a target="_blank" rel="noopener noreferrer" href="$2https://google.com/">Learn more</a> Phone Hub @@ -2295,7 +2301,7 @@ Wi-Fi Sync - Sync Wi-Fi networks with your phone <a target="_blank" href="$1https://google.com/">Learn more</a> + Sync Wi-Fi networks with your phone <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Learn more</a> @@ -2381,16 +2387,16 @@ Disconnect - Connect your $1Bravebook with your phone. <a target="_blank" href="$2https://google.com/">Learn more</a> + Connect your $1Bravebook with your phone. <a target="_blank" rel="noopener noreferrer" href="$2https://google.com/">Learn more</a> - No eligible devices. <a target="_blank" href="$1https://google.com/">Learn more</a> + No eligible devices. <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Learn more</a> - Waiting for verification. <a target="_blank" href="$1https://google.com/">Learn more</a> + Waiting for verification. <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Learn more</a> - Unlock your $1Bravebook with your phone. <a target="_blank" href="$2https://google.com/">Learn more</a> + Unlock your $1Bravebook with your phone. <a target="_blank" rel="noopener noreferrer" href="$2https://google.com/">Learn more</a> Lock screen from sleep mode @@ -2532,7 +2538,7 @@ Valid for $17 hours 12 minutes - Choose a ticket to use for authentication. <a target="_blank" href="$1https://google.com/">Learn more</a> + Choose a ticket to use for authentication. <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Learn more</a> Kerberos tickets @@ -3043,7 +3049,7 @@ Android settings - Install apps and games from Google Play on your $1Bravebook. <a target="_blank" href="$2https://google.com/">Learn more</a> + Install apps and games from Google Play on your $1Bravebook. <a target="_blank" rel="noopener noreferrer" href="$2https://google.com/">Learn more</a> @@ -3172,7 +3178,7 @@ External storage preferences - Apps from Google Play may require full file system access to read and write files on external storage devices. Files and folders created on the device are visible to anyone who uses the external drive. <a target="_blank" href="$1https://google.com/">Learn more</a> + Apps from Google Play may require full file system access to read and write files on external storage devices. Files and folders created on the device are visible to anyone who uses the external drive. <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">Learn more</a> Available devices will appear here. diff --git a/app/profiles_strings.grdp b/app/profiles_strings.grdp index 86e0ff111fc2..b43329da83c2 100644 --- a/app/profiles_strings.grdp +++ b/app/profiles_strings.grdp @@ -18,6 +18,18 @@ Current user + + {0, plural, + =1 {Guest} + other {Guest (#)} + } + + + {0, plural, + =1 {Guest} + other {# open guest windows} + } + {0, plural, =1 {Private} diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 04b9c4187c0c..5ea3b2a3fdc1 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -180,7 +180,7 @@ Search settings - Go to <a target="_blank" href="$1">Brave help</a> if you can't find what you're looking for + Go to <a target="_blank" rel="noopener noreferrer" href="$1">Brave help</a> if you can't find what you're looking for Settings @@ -273,7 +273,7 @@ Edit card - To add or manage Brave Pay payment methods, visit your <a href="$1" target="_blank">Brave sync chain</a> + To add or manage Brave Pay payment methods, visit your <a href="$1" target="_blank" rel="noopener noreferrer">Brave sync chain</a> This card will be saved to this device only @@ -341,7 +341,7 @@ Canceled - + Checked passwords @@ -353,6 +353,12 @@ =1 {{COUNT} compromised password} other {{COUNT} compromised passwords}} + + {COUNT, plural, + =0 {No security issues found} + =1 {Found {COUNT} security issue} + other {Found {COUNT} security issues}} + Check again @@ -374,6 +380,13 @@ Change these passwords immediately to keep your account safe: + + Weak passwords + + + Weak passwords are easy to guess. Make sure you're creating strong passwords. + <br/><a target='_blank' href='$1'>See more security tips.</a> + Change password @@ -470,6 +483,9 @@ Make sure the password you are saving matches your password for $1airbnb.com + + You already saved this username for this site + Copy password @@ -561,19 +577,19 @@ Save all your passwords in your Brave sync chain, so you can use them on all your devices - View and manage saved passwords in your <a is="action-link" href="$1" target="_blank">Brave sync chain</a> + View and manage saved passwords in your <a is="action-link" href="$1" target="_blank" rel="noopener noreferrer">Brave sync chain</a> View and manage saved passwords in your Brave sync chain - You can also show passwords from your <a is="action-link" href="$1" target="_blank">Brave sync chain</a> here + You can also show passwords from your <a is="action-link" href="$1" target="_blank" rel="noopener noreferrer">Brave sync chain</a> here Show - Showing passwords from your <a is="action-link" href="$1" target="_blank">Brave sync chain</a> + Showing passwords from your <a is="action-link" href="$1" target="_blank" rel="noopener noreferrer">Brave sync chain</a> Remove from device @@ -858,16 +874,16 @@ Time range - To clear browsing data from this device only, while keeping it in your Brave sync chain, <a href="#" target="_blank">sign out</a>. + To clear browsing data from this device only, while keeping it in your Brave sync chain, <a href="#" target="_blank" rel="noopener noreferrer">sign out</a>. - To clear browsing data from all of your synced devices and your Brave sync chain, <a href="#" target="_blank">visit sync settings</a>. + To clear browsing data from all of your synced devices and your Brave sync chain, <a href="#" target="_blank" rel="noopener noreferrer">visit sync settings</a>. - To clear browsing data from all of your synced devices and your Brave sync chain, <a href="#" target="_blank">enter your passphrase</a>. + To clear browsing data from all of your synced devices and your Brave sync chain, <a href="#" target="_blank" rel="noopener noreferrer">enter your passphrase</a>. - To clear browsing data from all of your synced devices and your Brave sync chain, <a href="#" target="_blank">sign in</a>. + To clear browsing data from all of your synced devices and your Brave sync chain, <a href="#" target="_blank" rel="noopener noreferrer">sign in</a>. Browsing history @@ -955,7 +971,7 @@ Google Cloud Print will no longer be supported after December 31 - Google Cloud Print will no longer be supported after December 31. <a target="_blank" href="$1">Learn more</a> + Google Cloud Print will no longer be supported after December 31. <a target="_blank" rel="noopener noreferrer" href="$1">Learn more</a> Google Cloud Print will no longer be supported after December 31. Contact your administrator. @@ -1210,7 +1226,7 @@ Updates - Updates are managed by <a target="_blank" href="$1">your administrator</a> + Updates are managed by <a target="_blank" rel="noopener noreferrer" href="$1">your administrator</a> Passwords @@ -1234,7 +1250,7 @@ Enhanced Protection is on - <a target="_blank" href="$1">Your administrator</a> has turned off Safe Browsing + <a target="_blank" rel="noopener noreferrer" href="$1">Your administrator</a> has turned off Safe Browsing An extension has turned off Safe Browsing @@ -1358,7 +1374,7 @@ Do Not Track - Enabling "Do Not Track" means that a request will be included with your browsing traffic. Any effect depends on whether a website responds to the request, and how the request is interpreted. For example, some websites may respond to this request by showing you ads that aren't based on other websites you've visited. Many websites will still collect and use your browsing data - for example to improve security, to provide content, services, ads and recommendations on their websites, and to generate reporting statistics. <a target="_blank" href="$1">Learn more</a></a> + Enabling "Do Not Track" means that a request will be included with your browsing traffic. Any effect depends on whether a website responds to the request, and how the request is interpreted. For example, some websites may respond to this request by showing you ads that aren't based on other websites you've visited. Many websites will still collect and use your browsing data - for example to improve security, to provide content, services, ads and recommendations on their websites, and to generate reporting statistics. <a target="_blank" rel="noopener noreferrer" href="$1">Learn more</a></a> Permissions and content settings @@ -1406,7 +1422,7 @@ With - See this provider's <a target="_blank" href="$1https://google.com/">privacy policy</a> + See this provider's <a target="_blank" rel="noopener noreferrer" href="$1https://google.com/">privacy policy</a> This setting is disabled on managed browsers @@ -2185,10 +2201,10 @@ Your Flash settings will be kept until you quit Brave. - Settings with "*" wildcards are no longer supported. Contact the extension developer or your administrator to <a is="action-link" href="$1" target="_blank">change these settings</a>. + Settings with "*" wildcards are no longer supported. Contact the extension developer or your administrator to <a is="action-link" href="$1" target="_blank" rel="noopener noreferrer">change these settings</a>. - Settings with "*" wildcards are no longer supported. Contact your administrator to <a is="action-link" href="$1" target="_blank">change these settings</a>. + Settings with "*" wildcards are no longer supported. Contact your administrator to <a is="action-link" href="$1" target="_blank" rel="noopener noreferrer">change these settings</a>. Allow recently closed sites to finish sending and receiving data @@ -2360,15 +2376,15 @@ Additional content settings - To change this setting, first <a target="_blank" href="$1">turn on identifiers</a> + To change this setting, first <a target="_blank" rel="noopener noreferrer" href="$1">turn on identifiers</a> Allowlisted internally - + Site shows intrusive or misleading ads - + Block if site shows intrusive or misleading ads @@ -2683,7 +2699,7 @@ Sign in - Because this account is managed by $1example.com, your bookmarks, history, passwords, and other settings will be cleared from this device. However, your data will remain stored in your Brave sync chain and can be managed on <a href="$2" target="_blank"><a href="$2" target="_blank">Brave Dashboard</a></a>. + Because this account is managed by $1example.com, your bookmarks, history, passwords, and other settings will be cleared from this device. However, your data will remain stored in your Brave sync chain and can be managed on <a href="$2" target="_blank" rel="noopener noreferrer"><a href="$2" target="_blank">Brave Dashboard</a></a>. Edit profile @@ -2711,7 +2727,7 @@ - Changes to your bookmarks, history, passwords, and other settings will no longer be synced to your Brave sync chain. However, your existing data will remain stored in your Brave sync chain and can be managed on <a href="$1" target="_blank"><a href="$1" target="_blank">Brave Dashboard</a></a>. + Changes to your bookmarks, history, passwords, and other settings will no longer be synced to your Brave sync chain. However, your existing data will remain stored in your Brave sync chain and can be managed on <a href="$1" target="_blank" rel="noopener noreferrer"><a href="$1" target="_blank">Brave Dashboard</a></a>. This will sign you out of your Brave sync chains. Your bookmarks, history, passwords, and more will no longer be synced. @@ -2738,19 +2754,19 @@ Manage synced data on Brave Dashboard - Encrypt synced data with your own <a href="$1" target="_blank"><a href="$1" target="_blank">sync passphrase</a></a>. This doesn't include payment methods and addresses from Brave Pay. + Encrypt synced data with your own <a href="$1" target="_blank" rel="noopener noreferrer"><a href="$1" target="_blank">sync passphrase</a></a>. This doesn't include payment methods and addresses from Brave Pay. - Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Brave. If you forget your passphrase or want to change this setting, you'll need to <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a>. + Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Brave. If you forget your passphrase or want to change this setting, you'll need to <a href="$1" target="_blank" rel="noopener noreferrer"><a href="$1" target="_blank">reset sync</a></a>. - To change this setting, <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a> to remove your sync passphrase + To change this setting, <a href="$1" target="_blank" rel="noopener noreferrer"><a href="$1" target="_blank">reset sync</a></a> to remove your sync passphrase - To turn this on, <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a> to remove your sync passphrase + To turn this on, <a href="$1" target="_blank" rel="noopener noreferrer"><a href="$1" target="_blank">reset sync</a></a> to remove your sync passphrase - If you forgot your passphrase or want to change this setting, <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a>. + If you forgot your passphrase or want to change this setting, <a href="$1" target="_blank" rel="noopener noreferrer"><a href="$1" target="_blank">reset sync</a></a>. Control how your browsing history is used to personalize Search, ads, and more @@ -3002,7 +3018,7 @@ other {To ensure that you can keep browsing the web, ask your administrator to remove these applications.}} - <a target="_blank" href="$1">Learn how to update applications</a> + <a target="_blank" rel="noopener noreferrer" href="$1">Learn how to update applications</a> {NUM_APLLICATIONS, plural, diff --git a/app/sharesheet_strings.grdp b/app/sharesheet_strings.grdp index 8e7d28e273c7..26611fe1ce54 100644 --- a/app/sharesheet_strings.grdp +++ b/app/sharesheet_strings.grdp @@ -6,4 +6,13 @@ Share + + Apps list + + + More apps + + + Fewer apps + diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 8cafb0a71179..8b49b03a40b8 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -341,9 +341,15 @@ CHAR-LIMIT guidelines: Sends URLs of pages you visit to Brave - + For more settings that relate to privacy, security, and data collection, see <link>Sync and Brave services</link> + + For more settings that relate to privacy, security, and data collection, see <link1>Sync</link1> and <link2>Brave services</link2> + + + For more settings that relate to privacy, security, and data collection, see <link>Brave services</link> + Help improve Brave's features and performance @@ -1089,15 +1095,42 @@ Your Brave account may have other forms of browsing history like searches and ac Languages + + %1$sBrave’s language + + + Default device language + Add language + + Change language + + + Select language + + + Suggested languages + + + Other languages + + + Content languages + + + To show content in your preferred languages, the sites you visit can see your preferences + Websites will show text in your preferred language, when possible. Offer to translate pages in other languages + + Offer to send pages in other languages to Brave Translate + Offer to translate @@ -1110,6 +1143,36 @@ Your Brave account may have other forms of browsing history like searches and ac What languages do you read? + + Downloading %1$sHindi… + + + Language ready, restart %1$sBrave + + + %1$sHindi is ready. + + + Restart Brave + + + Translation settings + + + Advanced + + + Translate into this language + + + Automatically translate these languages + + + Don’t offer to translate these languages + + + Don’t offer to translate these sites + @@ -1403,9 +1466,15 @@ Your Brave account may have other forms of browsing history like searches and ac Sync is off - + + No data selected to sync + + Initial sync setup was not finished. Sync is off. + + Tap to continue sync setup + Sync is disabled by your administrator @@ -1690,6 +1759,9 @@ To change this setting, <resetlink>reset sync

+ Choose what to sync below + + To start sync, turn on "Sync your Brave data". @@ -1712,12 +1784,6 @@ To change this setting, <resetlink>reset sync

Sign in again - - Confirm sync - - - Cancel sync setup - Unlock with Screen Lock @@ -2635,6 +2701,67 @@ In Private, your activity might still be visible to websites that you visit, you See popular websites by tapping the "Top sites" button + + + How to use Brave + + + How to search with Brave + + + How to search with your voice + + + How to download content for later + + + Videos about how to use Brave + + + Learn Brave + + + Popular videos + + + Navigate Brave + + + Search the internet + + + Use voice search + + + Download content + + + Pick your language + + + Watch + + + Try now + + + Watch next video + + + Change %1$sHindi? + + + Share + + + Close + + + Tap here to start + + + Type here or tap the voice icon to start + @@ -2744,6 +2871,12 @@ In Private, your activity might still be visible to websites that you visit, you Group tabs + + Get image descriptions + + + Stop image descriptions + @@ -3052,7 +3185,12 @@ In Private, your activity might still be visible to websites that you visit, you Switch To Tab - + + Showing suggestion for %1$sCrater Lake National Park (U.S. National Park Service) + + + %1$sCrater Lake National Park (U.S. National Park Service): %1$shttps://www.nps.gov/crla + {NUM_SELECTED, plural, @@ -3630,9 +3768,18 @@ In Private, your activity might still be visible to websites that you visit, you Open Settings + + audio + image + + text + + + video + @@ -3998,6 +4145,20 @@ In Private, your activity might still be visible to websites that you visit, you Save up to 60% data, read today's news + + + + Get image descriptions? + + + Images are sent to Brave to improve descriptions for you. + + + Only on Wi-Fi + + + Get descriptions + diff --git a/components/dom_distiller_strings.grdp b/components/dom_distiller_strings.grdp index 8d4a51facbf8..ca050ee2f3d4 100644 --- a/components/dom_distiller_strings.grdp +++ b/components/dom_distiller_strings.grdp @@ -44,6 +44,45 @@ + + Customize appearance + + + Font style + + + Sans-serif Font + + + Serif Font + + + Monospace Font + + + Page Color + + + Light + + + Sepia + + + Dark + + + Font Size + + + Small + + + Large + + + Close + No data found. diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp index f8edaa53b0ac..43751f4fedae 100644 --- a/components/omnibox_strings.grdp +++ b/components/omnibox_strings.grdp @@ -255,8 +255,8 @@ $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to search - - Search button, press Enter to search $1Youtube + + Search mode, press Enter to search $1Youtube diff --git a/components/pdf_strings.grdp b/components/pdf_strings.grdp index e2a09422950a..17df312116e8 100644 --- a/components/pdf_strings.grdp +++ b/components/pdf_strings.grdp @@ -106,6 +106,18 @@ Annotation not available + + Edit annotations in default view? + + + When you edit annotations, this document will return to its original rotation + + + When you edit annotations, this document will return to single page view + + + When you edit annotations, this document will return to single page view and its original rotation + Document is too large to be annotated diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index cd690062a530..7d8d0f1b014e 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -59,6 +59,9 @@ Request is too large + + Too many requests + Can't enroll with consumer account (packaged license available). @@ -566,4 +569,22 @@ Additional details: This application has been blocked by your administrator + + + + Pasting to this location is blocked by your administrator + + + Your administrator has blocked sharing this content to $1Linux + + + Your administrator has blocked sharing this content to $1Linux and $2Parallels + + + Android apps + + + Printing of this content is blocked by your administrator + + diff --git a/components/translate_strings.grdp b/components/translate_strings.grdp index 0ce4c79cec27..c50a08f7dd88 100644 --- a/components/translate_strings.grdp +++ b/components/translate_strings.grdp @@ -64,6 +64,9 @@ Never translate this site + + Don‘t offer to translate this site + Always translate pages in %1$sFrench @@ -71,6 +74,9 @@ Never translate pages in %1$sFrench + + Don‘t offer to translate pages in %1$sFrench + More languages From 7710ae7ee3a4744753c45c5d96de5e36325861a5 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 5 Oct 2020 18:08:17 -0400 Subject: [PATCH 074/152] ContentBrowserClient::WillCreateURLLoaderFactory signature changed. Chromium change: https://source.chromium.org/chromium/chromium/src/+/f334d64f906974059805a40bac911b68219af0ad commit f334d64f906974059805a40bac911b68219af0ad Author: Maks Orlovich Date: Mon Sep 21 22:19:59 2020 +0000 Study whether blocking of requests via webRequest is fingerprintable This is sadly somewhat invasive since it needs to wire the UKM ID for navigations further down. Bug: 1103288 --- browser/brave_content_browser_client.cc | 3 ++- browser/brave_content_browser_client.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 6eed7c6afb15..1b285b25a8ab 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -297,6 +297,7 @@ bool BraveContentBrowserClient::WillCreateURLLoaderFactory( URLLoaderFactoryType type, const url::Origin& request_initiator, base::Optional navigation_id, + base::UkmSourceId ukm_source_id, mojo::PendingReceiver* factory_receiver, mojo::PendingRemote* header_client, @@ -312,7 +313,7 @@ bool BraveContentBrowserClient::WillCreateURLLoaderFactory( use_proxy |= ChromeContentBrowserClient::WillCreateURLLoaderFactory( browser_context, frame, render_process_id, type, request_initiator, - std::move(navigation_id), factory_receiver, header_client, + std::move(navigation_id), ukm_source_id, factory_receiver, header_client, bypass_redirect_checks, disable_secure_dns, factory_override); return use_proxy; diff --git a/browser/brave_content_browser_client.h b/browser/brave_content_browser_client.h index 251c44f41281..75322a466231 100644 --- a/browser/brave_content_browser_client.h +++ b/browser/brave_content_browser_client.h @@ -68,6 +68,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient { URLLoaderFactoryType type, const url::Origin& request_initiator, base::Optional navigation_id, + base::UkmSourceId ukm_source_id, mojo::PendingReceiver* factory_receiver, mojo::PendingRemote* header_client, From f380a1f789afdc5129a641a048ce0dabc1c5ed64 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 5 Oct 2020 18:22:08 -0400 Subject: [PATCH 075/152] Some Button mothods have been renamed. set_triggerable_event_flags -> SetTriggerableEventFlags. set_has_ink_drop_action_on_click -> SetHasInkDropActionOnClick Chromium change: https://source.chromium.org/chromium/chromium/src/+/050820044ded2831282516495ab60ee423079c1e commit 050820044ded2831282516495ab60ee423079c1e Author: Allen Bauer Date: Tue Sep 22 23:28:39 2020 +0000 Rename Button methods to be suitable for builders and properties. Update metadata and builder for the views::Button class. Bug: 938501, 1130078 --- .../views/brave_actions/brave_rewards_action_stub_view.cc | 2 +- browser/ui/views/location_bar/onion_location_view.cc | 2 +- browser/ui/views/toolbar/brave_toolbar_view.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc index 81958ed4b2f2..ef8aec9e3ff7 100644 --- a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc +++ b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc @@ -58,7 +58,7 @@ BraveRewardsActionStubView::BraveRewardsActionStubView(Profile* profile, profile_(profile), delegate_(delegate) { SetInkDropMode(InkDropMode::ON); - set_has_ink_drop_action_on_click(true); + SetHasInkDropActionOnClick(true); SetHorizontalAlignment(gfx::ALIGN_CENTER); SetInkDropVisibleOpacity(kToolbarInkDropVisibleOpacity); // Create badge-and-image source like an extension icon would diff --git a/browser/ui/views/location_bar/onion_location_view.cc b/browser/ui/views/location_bar/onion_location_view.cc index 4051799beeaf..ad7e12593735 100644 --- a/browser/ui/views/location_bar/onion_location_view.cc +++ b/browser/ui/views/location_bar/onion_location_view.cc @@ -95,7 +95,7 @@ class OnionLocationButtonView : public views::LabelButton, SetInkDropMode(InkDropMode::ON); SetBorder(views::CreateEmptyBorder( GetLayoutInsets(LOCATION_BAR_ICON_INTERIOR_PADDING))); - set_has_ink_drop_action_on_click(true); + SetHasInkDropActionOnClick(true); SetInkDropVisibleOpacity(kToolbarInkDropVisibleOpacity); UpdateBorder(); // Ensure focus ring follows border diff --git a/browser/ui/views/toolbar/brave_toolbar_view.cc b/browser/ui/views/toolbar/brave_toolbar_view.cc index a7c8c3033c26..551fa51de79f 100644 --- a/browser/ui/views/toolbar/brave_toolbar_view.cc +++ b/browser/ui/views/toolbar/brave_toolbar_view.cc @@ -134,8 +134,8 @@ void BraveToolbarView::Init() { base::Unretained(this))); bookmark_ = new BookmarkButton(this); - bookmark_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | - ui::EF_MIDDLE_MOUSE_BUTTON); + bookmark_->SetTriggerableEventFlags(ui::EF_LEFT_MOUSE_BUTTON | + ui::EF_MIDDLE_MOUSE_BUTTON); DCHECK(location_bar_); AddChildViewAt(bookmark_, GetIndexOf(location_bar_)); bookmark_->UpdateImage(); @@ -144,8 +144,8 @@ void BraveToolbarView::Init() { // Speedreader. if (base::FeatureList::IsEnabled(speedreader::kSpeedreaderFeature)) { speedreader_ = new SpeedreaderButton(this, profile->GetPrefs()); - speedreader_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | - ui::EF_MIDDLE_MOUSE_BUTTON); + speedreader_->SetTriggerableEventFlags(ui::EF_LEFT_MOUSE_BUTTON | + ui::EF_MIDDLE_MOUSE_BUTTON); } if (speedreader_) { From 75aa3aafc6e1828d7f41989914fa3260fdf24aa3 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 5 Oct 2020 18:32:04 -0400 Subject: [PATCH 076/152] Build Android's BraveShieldsWebContentsObserver only on Android. Separated .cc into a conditional clause for Android. --- components/brave_shields/browser/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/brave_shields/browser/BUILD.gn b/components/brave_shields/browser/BUILD.gn index a885f531e67f..484439a2095b 100644 --- a/components/brave_shields/browser/BUILD.gn +++ b/components/brave_shields/browser/BUILD.gn @@ -30,7 +30,6 @@ source_set("browser") { "brave_shields_p3a.h", "brave_shields_util.cc", "brave_shields_util.h", - "brave_shields_web_contents_observer_android.cc", "brave_shields_web_contents_observer.cc", "brave_shields_web_contents_observer.h", "cookie_pref_service.cc", @@ -42,6 +41,10 @@ source_set("browser") { "tracking_protection_service.h", ] + if (is_android) { + sources += [ "brave_shields_web_contents_observer_android.cc" ] + } + if (brave_stp_enabled) { sources += [ "tracking_protection_helper.cc", From 9dccc28baebbd9139ca9a97b348c2def8c14f0f2 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 5 Oct 2020 18:53:44 -0400 Subject: [PATCH 077/152] More changes to MdTextButton. Chromium change: https://source.chromium.org/chromium/chromium/src/+/acdea310014330859d7908556dd2b2d083e9476b commit acdea310014330859d7908556dd2b2d083e9476b Author: Peter Kasting Date: Tue Sep 29 01:36:39 2020 +0000 Make porting ButtonListener to Button::PressedCallback easier. * Convert PressedCallback into a class to allow it to be constructed from the various different callbacks and listeners. This reduces the number of overloads needed in APIs (though, sadly, not by as much as I'd hoped, since the ButtonListener constructor is two-arg and thus cannot be implicitly run in all the existing locations). * Convert various APIs to take a PressedCallback primarily, with a temporary ButtonListener* overload. Bug: 772945 --- .../ui/views/controls/button/md_text_button.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/chromium_src/ui/views/controls/button/md_text_button.cc b/chromium_src/ui/views/controls/button/md_text_button.cc index 5ccb935b9646..b1e81a29dd7d 100644 --- a/chromium_src/ui/views/controls/button/md_text_button.cc +++ b/chromium_src/ui/views/controls/button/md_text_button.cc @@ -33,17 +33,14 @@ class BraveTextButtonHighlightPathGenerator namespace views { MdTextButton::MdTextButton(ButtonListener* listener, - const base::string16& text, - int button_context) - : MdTextButton(ListenerToPressedCallback(this, listener), - text, - button_context) { -} + const base::string16& text, + int button_context) + : MdTextButtonBase(PressedCallback(listener, this), text, button_context) {} MdTextButton::MdTextButton(PressedCallback callback, - const base::string16& text, - int button_context) - : MdTextButtonBase(callback, text, button_context) { + const base::string16& text, + int button_context) + : MdTextButtonBase(std::move(callback), text, button_context) { SetCornerRadius(100); views::HighlightPathGenerator::Install( this, std::make_unique()); From e68008bc1c62b8f6f13e215b92077a2e9c0857f4 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Mon, 5 Oct 2020 22:30:53 -0400 Subject: [PATCH 078/152] Do not use platform filter in //brave/browser/themes/BUILD.gn Separated platform dependent sources. See https://bugs.chromium.org/p/chromium/issues/detail?id=1018739 --- browser/themes/BUILD.gn | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/browser/themes/BUILD.gn b/browser/themes/BUILD.gn index d8e388d6df75..2e487807fcbb 100644 --- a/browser/themes/BUILD.gn +++ b/browser/themes/BUILD.gn @@ -1,8 +1,5 @@ source_set("themes") { - sources = [ - "brave_dark_mode_utils.h", - "brave_dark_mode_utils_android.cc", - ] + sources = [ "brave_dark_mode_utils.h" ] deps = [ "//base", @@ -10,17 +7,34 @@ source_set("themes") { "//brave/common:switches", ] + if (is_android) { + sources += [ "brave_dark_mode_utils_android.cc" ] + } + if (!is_android) { sources += [ "brave_dark_mode_utils_internal.cc", "brave_dark_mode_utils_internal.h", - "brave_dark_mode_utils_linux.cc", - "brave_dark_mode_utils_mac.mm", - "brave_dark_mode_utils_win.cc", "theme_properties.cc", "theme_properties.h", ] + if (is_linux) { + sources += [ "brave_dark_mode_utils_linux.cc" ] + } + + if (is_mac) { + sources += [ "brave_dark_mode_utils_mac.mm" ] + } + + if (is_win) { + sources += [ + "brave_dark_mode_utils_win.cc", + "brave_theme_helper_win.cc", + "brave_theme_helper_win.h", + ] + } + deps += [ "//chrome/browser:theme_properties", "//skia:skia", From d1914b76d99b662fb7cdb7f06d2c50f050e8a2e6 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Tue, 6 Oct 2020 13:21:47 -0400 Subject: [PATCH 079/152] kMixedcontentContentSiteSetting feature flag was removed. We were enabling this feature but it has been enabled by default since M81. Chromium change: commit ed46b84e268a73210e519b78315e289fbde354af Author: Carlos IL Date: Thu Sep 24 20:46:00 2020 +0000 Remove kMixedcontentContentSiteSetting flag This feature launched as enabled by default on M81, and there are no plans to revert it. This CL cleans up the feature flag (and should cause no behavior changes). There is still cleanup left from the feature launch, notably removing the shield UI that is no longer used. That will be cleaned up in a follow up CL. Bug: 1078193 --- app/brave_main_delegate.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index 2bd169767e7a..df2560d9e7a3 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -207,8 +207,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { blink::features::kMixedContentAutoupgrade.name, password_manager::features::kPasswordImport.name, net::features::kLegacyTLSEnforced.name, - // Remove URL bar mixed control and allow site specific override instead - features::kMixedContentSiteSetting.name, // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated // on this feature. features::kWebUIDarkMode.name, From 8f0b523db439ffc14b5be1da8a4ade4a1dddd9bc Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Tue, 6 Oct 2020 13:54:43 -0400 Subject: [PATCH 080/152] kOmniboxContextMenuShowFullUrls feature flag was removed. The feature is always enabled now. Chromium change: commit 777f242c759b61c398edca589340b42fe716a399 Author: Livvie Lin Date: Tue Sep 22 19:24:15 2020 +0000 Clean up OmniboxContextMenuShowFullUrls experiment logic --- app/brave_main_delegate.cc | 1 - app/brave_main_delegate_browsertest.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index df2560d9e7a3..b4b637670e03 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -215,7 +215,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { #if defined(OS_WIN) features::kWinrtGeolocationImplementation.name, #endif - omnibox::kOmniboxContextMenuShowFullUrls.name, }; if (!base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index 97419a7c915a..1dd3d481ba61 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -88,7 +88,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, EnabledFeatures) { #if defined(OS_WIN) &features::kWinrtGeolocationImplementation, #endif - &omnibox::kOmniboxContextMenuShowFullUrls, &net::features::kLegacyTLSEnforced, }; From 2002471a9a2775d621745befd8d4044ac5b02719 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 6 Oct 2020 14:23:46 -0400 Subject: [PATCH 081/152] Updated url_constants.cc override. --- chromium_src/chrome/common/url_constants.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index 8a6a23a15b16..a2033e9b5c73 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -114,6 +114,8 @@ const char kContentSettingsExceptionsLearnMoreURL[] = const char kCookiesSettingsHelpCenterURL[] = "https://support.brave.com/hc/en-us/articles/" "360018205431-How-do-I-change-site-permissions-"; +const char kCpuX86Sse2ObsoleteURL[] = + "https://support.brave.com/"; const char kCrashReasonURL[] = "https://support.brave.com/hc/en-us/articles/" @@ -204,6 +206,8 @@ const char kSafeBrowsingHelpCenterURL[] = const char kSafetyTipHelpCenterURL[] = "https://support.brave.com/"; +const char kSeeMoreSecurityTipsURL[] = + "https://support.brave.com/"; const char kSettingsSearchHelpURL[] = "https://support.brave.com/"; From 8870f74b84dd45ae6c7434ddb221df851037dcda Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 6 Oct 2020 15:19:42 -0400 Subject: [PATCH 082/152] Output dir of gen settings resources changed. Chromium change: https://source.chromium.org/chromium/chromium/src/+/02c27a6434c0df14c260594b66767d69ca018901 commit 02c27a6434c0df14c260594b66767d69ca018901 Author: rbpotter Date: Wed Sep 23 17:27:20 2020 +0000 Settings: Use preprocessing to generate rollup input Note: in_files lists were generated (other than OS specific exceptions) using a local script, from settings_resources_v3.grdp Bug: 1128583 --- browser/resources/settings/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/resources/settings/BUILD.gn b/browser/resources/settings/BUILD.gn index 407b4f9c0f67..c1a08f59d85e 100644 --- a/browser/resources/settings/BUILD.gn +++ b/browser/resources/settings/BUILD.gn @@ -53,7 +53,7 @@ if (optimize_webui) { script = "//chrome/browser/resources/unpack_pak.py" pak_file = "brave_settings_resources.pak" - out_folder = "$root_gen_dir/chrome/browser/resources/settings/settings_resources.unpak" + out_folder = "$root_gen_dir/chrome/browser/resources/settings/preprocessed" inputs = [ "$target_gen_dir/brave_settings_resources.pak", From 530c4199993aee8dfce878fbff47a1def26457ca Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Tue, 6 Oct 2020 16:11:21 -0400 Subject: [PATCH 083/152] [Browser Tests] StartupBrowserCreatorImpl::Launch sig changed. Chromium change: https://source.chromium.org/chromium/chromium/src/+/d4826c9e51f8cf0715797b79f02b6d3ce6d726a3 commit d4826c9e51f8cf0715797b79f02b6d3ce6d726a3 Author: David Bienvenu Date: Tue Sep 22 01:35:54 2020 +0000 Break out LaunchModeRecorder class, pass to Launch methods. LaunchModeRecorder logs the launch mode on destruction, if set. Launch methods now take an optional LaunchModeRecorder instance for those callers that originate from an external launch. This fixes two bugs: launching multiple profiles logs multiple launch modes, and opening a profile from the user manager records a launch mode. Bug: 1032501 --- browser/ui/webui/brave_welcome_ui_browsertest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/ui/webui/brave_welcome_ui_browsertest.cc b/browser/ui/webui/brave_welcome_ui_browsertest.cc index d55d002b6863..d96c6e628e68 100644 --- a/browser/ui/webui/brave_welcome_ui_browsertest.cc +++ b/browser/ui/webui/brave_welcome_ui_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/startup/launch_mode_recorder.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -25,7 +26,7 @@ Browser* OpenNewBrowser(Profile* profile) { base::CommandLine dummy(base::CommandLine::NO_PROGRAM); StartupBrowserCreatorImpl creator(base::FilePath(), dummy, chrome::startup::IS_FIRST_RUN); - creator.Launch(profile, std::vector(), false); + creator.Launch(profile, std::vector(), false, nullptr); return chrome::FindBrowserWithProfile(profile); } } From 4b6047259fa0363f32be01b029ec49b3e21a6c93 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Tue, 6 Oct 2020 16:20:55 -0400 Subject: [PATCH 084/152] [Unit Tests] TranslateManage::GetLanguageState now returns pointer. Chromium change: https://source.chromium.org/chromium/chromium/src/+/83f98320cc0144937d3399b6462f4e3ceaf57816 commit 83f98320cc0144937d3399b6462f4e3ceaf57816 Author: Evan Stade Date: Mon Sep 28 20:56:16 2020 +0000 Make TranslateManager::GetLanguageState return a pointer instead of ref Also make ChromeTranslateClient return const& instead of &. Non-const refs are forbidden by the style guide. Bug: none --- .../translate/core/browser/translate_manager_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium_src/components/translate/core/browser/translate_manager_unittest.cc b/chromium_src/components/translate/core/browser/translate_manager_unittest.cc index 21b713c1e645..06b5e09357d4 100644 --- a/chromium_src/components/translate/core/browser/translate_manager_unittest.cc +++ b/chromium_src/components/translate/core/browser/translate_manager_unittest.cc @@ -26,7 +26,7 @@ TEST_F(TranslateManagerTest, CanManuallyTranslate_WithoutAPIKey) { .WillByDefault(Return(true)); network_notifier_.SimulateOnline(); - translate_manager_->GetLanguageState().LanguageDetermined("de", true); + translate_manager_->GetLanguageState()->LanguageDetermined("de", true); EXPECT_TRUE(translate_manager_->CanManuallyTranslate()); ::google_apis::SetAPIKeyForTesting(api_key); @@ -48,7 +48,7 @@ TEST_F(TranslateManagerTest, CanManuallyTranslate_WithAPIKey) { .WillByDefault(Return(true)); network_notifier_.SimulateOnline(); - translate_manager_->GetLanguageState().LanguageDetermined("de", true); + translate_manager_->GetLanguageState()->LanguageDetermined("de", true); EXPECT_TRUE(translate_manager_->CanManuallyTranslate()); ::google_apis::SetAPIKeyForTesting(api_key); From 6cc08268edd2e76ee08213c084eff5440a67943b Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 11:58:03 -0400 Subject: [PATCH 085/152] [Android] SetUnhandledSignals added to CrashpadClient Chromium change: https://chromium.googlesource.com/chromium/src/+/1c92945c0e3457c11f50ec4b6bc620163c030fe4 crash: don't handle browser SIGQUIT on Android. On Android, SIGQUIT is masked by default and handled specially by ART to generate stack traces on demand (usually during an ANR or bugreport) in a way that does not intrinsically terminate the process (though the process may be killed afterward in some cases). Apps that use WebView sometimes unmask SIGQUIT in the browser process due to having their own crash handler or similar, and if that happens, we don't want to treat this as a browser process crash and generate a minidump, as there's no real way to know why the signal was sent. Just disable handling SIGQUIT on Android in the browser process. This leaves child processes alone; they only run our code so can't end up with SIGQUIT accidentally unmasked. Fixed: 1077890 --- .../components/crash/core/app/crashpad_android.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/chromium_src/components/crash/core/app/crashpad_android.cc b/chromium_src/components/crash/core/app/crashpad_android.cc index a1c497cc9b7d..287a33451819 100644 --- a/chromium_src/components/crash/core/app/crashpad_android.cc +++ b/chromium_src/components/crash/core/app/crashpad_android.cc @@ -48,6 +48,8 @@ class BraveCrashpadClient { const std::map& annotations, const std::vector& arguments); + void SetUnhandledSignals(const std::set& unhandled_signals); + static bool StartHandlerWithLinkerForClient( const std::string& handler_trampoline, const std::string& handler_library, @@ -147,6 +149,12 @@ bool BraveCrashpadClient::StartHandlerWithLinkerAtCrash( metrics_dir, brave_crash_url, annotations, arguments); } +void BraveCrashpadClient::SetUnhandledSignals( + const std::set& unhandled_signals) { + return crash_reporter::GetCrashpadClient().SetUnhandledSignals( + unhandled_signals); +} + // static bool BraveCrashpadClient::StartHandlerWithLinkerForClient( const std::string& handler_trampoline, From 1af664a343d8016cb6e8dc93c1bad190e6b5788b Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 12:42:59 -0400 Subject: [PATCH 086/152] [Android] SuggestionHost moved to common Suggestions namespace Chromium change: https://chromium.googlesource.com/chromium/src/+/7f54adf541bda0f3e7f859638d4f26c399119ad6 Move the SuggestionHost and SuggestionViewDelegate to common Suggestions namespace. This change moves the two frequently used interfaces to a shared Omnibox suggestions namespace. Bug: 1106109 --- .../suggestions/editurl/BraveEditUrlSuggestionProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java b/android/java/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java index e5ddb02bd4d3..92e21966ed9e 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java +++ b/android/java/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java @@ -11,8 +11,8 @@ import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion; +import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost; import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate; -import org.chromium.chrome.browser.omnibox.suggestions.basic.SuggestionHost; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.ui.favicon.LargeIconBridge; From 76f9bd10549f19ba13069e2b7aaa2f9d7b356229 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 12:44:22 -0400 Subject: [PATCH 087/152] [Android] AndroidSyncSettings ctor changed Chromium changes: https://chromium.googlesource.com/chromium/src/+/e61a284712dafc93e2edc3d1f408e0721093ee89 Adapt SyncTestRule to allow AndroidSyncSettings to depend on PSS Problem: AndroidSyncSettings (ASS) will soon depend on ProfileSyncService (PSS), particularly in its constructor. Although this is is fine in production code, SyncTestRule poses two issues for this setup on test code. - ASS is created before a fake PSS provided by tests can be injected. This is a problem because the initial state of PSS will be relevant to the constructor logic of ASS, so we need to be able to fake this initial state to write good tests. - ASS is created before the JNI loads in startMainActivityForSyncTest(). For tests that don't provide a fake PSS, ASS will then attempt to talk to the real PSS before JNI is loaded, causing an error. Solution: When SyncTestRule creates an ASS, the goal is actually just to fake one of its internal dependencies, SyncContentResolverDelegate. In this CL, we convert SyncContentResolverDelegate into a singleton. In this way, a fake for this object can be injected without needing to early construct ASS*. Furthermore, JNI is loaded earlier so that the rule can safely use tools like FakeServer and FakeProfileSyncService. * Note that constructing after startMainActivityForSyncTest() is not an option because there's already code talking to ASS when this function is running. Bug: 1125622 --- .../chrome/browser/sync/BraveAndroidSyncSettings.java | 7 ++++--- ...mium-chrome-browser-sync-AndroidSyncSettings.java.patch | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java b/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java index 08359cfa2e7d..e52df3e51d31 100644 --- a/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java +++ b/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java @@ -5,15 +5,16 @@ package org.chromium.chrome.browser.sync; +import android.accounts.Account; + import org.chromium.chrome.browser.sync.ProfileSyncService; -import org.chromium.components.sync.SyncContentResolverDelegate; // see org.brave.bytecode.BraveAndroidSyncSettingsAdapter public class BraveAndroidSyncSettings extends AndroidSyncSettings { private boolean mMasterSyncEnabled; - public BraveAndroidSyncSettings(SyncContentResolverDelegate syncContentResolverDelegate) { - super(syncContentResolverDelegate); + public BraveAndroidSyncSettings(Account account) { + super(account); } // Chromium's AndroidSyncSettings.mChromeSyncEnabled is never set to true diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch index c69ea2cad8bc..dffe03ed8678 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java -index 09c8dfc92481b272b536fdc05dfb7b11fbca616d..c7e325ac1062731e389059ce522045fcaf9b4e44 100644 +index 09c8dfc92481b272b536fdc05dfb7b11fbca616d..629b7c451cba0e9f7d0f5c25cf561b76221a68d9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java @@ -74,7 +74,7 @@ public class AndroidSyncSettings { @@ -7,7 +7,7 @@ index 09c8dfc92481b272b536fdc05dfb7b11fbca616d..c7e325ac1062731e389059ce522045fc ThreadUtils.assertOnUiThread(); if (sInstance == null) { - sInstance = new AndroidSyncSettings(getSyncAccount()); -+ sInstance = new BraveAndroidSyncSettings(contentResolver); ++ sInstance = new BraveAndroidSyncSettings(getSyncAccount()); } return sInstance; } From 82e8f27fdd1cf002e18dcca883ba138c6c6c2e30 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 12:45:30 -0400 Subject: [PATCH 088/152] [Android] TileView and TileWithTextView classes are collapsed Chromium change: https://chromium.googlesource.com/chromium/src/+/7561e2f936dbd8563840ee776a7dcb036515373c Create a basic TileView MVC component. This change introduces a set of classes and properties enabling the TileView to become a MVC component. The change collapses the TileView and TileWithTextView classes into one to avoid awkward naming. The TileView base class is never used as a stand-alone component and MVC allows the class to control the visibility of the TextView with ease. The MVC component features all UI specific features used by TileView, TileWithTextView, SuggestionsTileView and TopSitesTileView. Bug: 1106109 --- android/brave_java_sources.gni | 2 +- .../tile/BraveTileView.java} | 15 ++++++++------- ...uggestions-tile-SuggestionsTileView.java.patch | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) rename android/java/org/chromium/chrome/browser/{widget/tile/BraveTileWithTextView.java => suggestions/tile/BraveTileView.java} (81%) diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 077c81961062..3adee83c8509 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -142,6 +142,7 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java", "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java", "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java", + "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java", "../../brave/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java", "../../brave/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java", "../../brave/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java", @@ -198,7 +199,6 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/ConvertAsset.java", "../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/CryptoWidgetBottomSheetDialogFragment.java", "../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/CryptoWidgetTabAdapter.java", - "../../brave/android/java/org/chromium/chrome/browser/widget/tile/BraveTileWithTextView.java", ] if (brave_rewards_enabled || enable_brave_referrals) { diff --git a/android/java/org/chromium/chrome/browser/widget/tile/BraveTileWithTextView.java b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java similarity index 81% rename from android/java/org/chromium/chrome/browser/widget/tile/BraveTileWithTextView.java rename to android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java index 90b35f5fec9b..79959d7e8aa5 100644 --- a/android/java/org/chromium/chrome/browser/widget/tile/BraveTileWithTextView.java +++ b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java @@ -3,25 +3,26 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.widget.tile; +package org.chromium.chrome.browser.suggestions.tile; import android.content.Context; +import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.TextView; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.ChromeTabbedActivity; +import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil; +import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil; import org.chromium.chrome.browser.preferences.BravePref; -import org.chromium.components.user_prefs.UserPrefs; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.suggestions.tile.TileWithTextView; +import org.chromium.chrome.browser.suggestions.tile.TileView; import org.chromium.chrome.browser.tabmodel.TabModel; -import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil; -import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil; +import org.chromium.components.user_prefs.UserPrefs; -public class BraveTileWithTextView extends TileWithTextView { - public BraveTileWithTextView(Context context, AttributeSet attrs) { +public class BraveTileView extends TileView { + public BraveTileView(Context context, AttributeSet attrs) { super(context, attrs); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-SuggestionsTileView.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-SuggestionsTileView.java.patch index 079daf95b689..8aa68d93f887 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-SuggestionsTileView.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-SuggestionsTileView.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java -index 219aad30b54a4cdbd9530b7f908ec07c4910b174..6ae04ddfe9e0188c81ba2ca3b81f568086299135 100644 +index 219aad30b54a4cdbd9530b7f908ec07c4910b174..032f16f18f71ad72eebec2c0e8bdae869d5b73a6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java @@ -17,7 +17,7 @@ import org.chromium.url.GURL; @@ -7,7 +7,7 @@ index 219aad30b54a4cdbd9530b7f908ec07c4910b174..6ae04ddfe9e0188c81ba2ca3b81f5680 * large icon isn't available, displays a rounded rectangle with a single letter in its place. */ -public class SuggestionsTileView extends TileView { -+public class SuggestionsTileView extends org.chromium.chrome.browser.widget.tile.BraveTileWithTextView { ++public class SuggestionsTileView extends org.chromium.chrome.browser.suggestions.tile.BraveTileView { /** The data currently associated to this tile. */ private SiteSuggestion mData; From 603dfb6a715b56b6540545b762b3eb2e993bd801 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 12:52:19 -0400 Subject: [PATCH 089/152] [Android] IncognitoStateProvider moved to chrome/browser/tabmodel Chromium change: https://chromium.googlesource.com/chromium/src/+/c9569b318d4fdde05de54bc5fe9e388c17554a42 Move IncognitoStateProvider to chrome/browser/tabmodel IncognitoStateProvider uses a tab model to provide its incognito state, used by toolbar/omnibox. This CL moves it to tabmodel module, in an effort to reduce the omnibox's dependency on toolbar. Bug: 1127732 --- .../browser/toolbar/bottom/BottomToolbarCoordinator.java | 2 +- .../browser/toolbar/bottom/BottomToolbarNewTabButton.java | 4 ++-- .../toolbar/bottom/BraveBottomControlsCoordinator.java | 2 +- .../toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java | 2 +- .../chrome/browser/toolbar/bottom/SearchAccelerator.java | 4 ++-- .../toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java index 3dc91f1e7bb8..05b606d3db14 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -35,9 +35,9 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.chrome.browser.toolbar.HomeButton; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; import org.chromium.chrome.browser.toolbar.bottom.BookmarksButton; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarNewTabButton; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java index 2f0416e60ff9..5f69dee7e789 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java @@ -19,8 +19,8 @@ import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider.IncognitoStateObserver; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider.IncognitoStateObserver; import org.chromium.chrome.browser.toolbar.ToolbarColors; import org.chromium.ui.widget.ChromeImageButton; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java index 7f2da1b708c6..12a862bbb8f4 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java @@ -27,7 +27,7 @@ import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.share.ShareDelegate; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index 995c0af497d3..61c78cb6b18a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -24,9 +24,9 @@ import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabImpl; import org.chromium.chrome.browser.tab.TabUtils; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.chrome.browser.toolbar.HomeButton; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; import org.chromium.chrome.browser.toolbar.TabSwitcherButtonCoordinator; import org.chromium.chrome.browser.toolbar.TabSwitcherButtonView; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java index 35b9ba416658..2400e1c711bc 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java @@ -18,8 +18,8 @@ import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider.IncognitoStateObserver; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider.IncognitoStateObserver; import org.chromium.chrome.browser.toolbar.ToolbarColors; import org.chromium.ui.widget.ChromeImageButton; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java index 979d9b7b9de8..729803da4526 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java @@ -14,7 +14,7 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; From e3efd90e260fbae194f16b94f5bad183c09733b5 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Oct 2020 19:36:11 +0200 Subject: [PATCH 090/152] Ensure to import brave_rollup_overrides.js correctly from any location The import for the 'brave_rollup_override' NodeJS module that is done from chrome/browser/resources/tools/rollup_plugin.js using relative paths from the current directory worked well so far, but this file can be now referenced from different locations, causing the import to fail in those cases where the current directory is not exactly two levels up in the filesystem than brave_rollup_overrides.js. Since we know where the generated directory is, and this module is always under gen/chrome/browser/resources/brave_rollup_overrides.js, we can avoid this problem by building the path from genPath, instead of using the '../../' prefix. --- patches/chrome-browser-resources-tools-rollup_plugin.js.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-browser-resources-tools-rollup_plugin.js.patch b/patches/chrome-browser-resources-tools-rollup_plugin.js.patch index a2abd33fae4f..2bfa2b279e67 100644 --- a/patches/chrome-browser-resources-tools-rollup_plugin.js.patch +++ b/patches/chrome-browser-resources-tools-rollup_plugin.js.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/resources/tools/rollup_plugin.js b/chrome/browser/resources/tools/rollup_plugin.js -index b541233a644bc428257dafcea7198d2d4a529d98..793639a113a26f5488279f76c748cf197ee88aa2 100644 +index b541233a644bc428257dafcea7198d2d4a529d98..356397cbf7b9aa3371458c4cd6331877e1823e9c 100644 --- a/chrome/browser/resources/tools/rollup_plugin.js +++ b/chrome/browser/resources/tools/rollup_plugin.js @@ -71,6 +71,8 @@ export default function plugin(srcPath, genPath, rootPath, host, excludes) { return joinPaths(polymerSrcPath, pathFromPolymer); } -+ const resolvedByBrave = require(path.join(__dirname, '..', '..', 'brave_rollup_overrides')).braveResolveId({srcPath, genPath, excludes}, source, origin, relativePath, joinPaths, combinePaths, chromeResourcesUrl, schemeRelativeResourcesUrl); if (resolvedByBrave) { return resolvedByBrave; } ++ const resolvedByBrave = require(path.join(genPath, 'chrome', 'browser', 'resources', 'brave_rollup_overrides')).braveResolveId({srcPath, genPath, excludes}, source, origin, relativePath, joinPaths, combinePaths, chromeResourcesUrl, schemeRelativeResourcesUrl); if (resolvedByBrave) { return resolvedByBrave; } + // Get path from ui/webui/resources let pathFromResources = ''; From fd3b4486e621760ba265aafcd04e95069075916d Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 17:05:44 -0400 Subject: [PATCH 091/152] [Android] Platform check is added in browser_list.h and browser_list_observer.h Chromium change: https://chromium.googlesource.com/chromium/src/+/06abf006f7c6616f2b301f07dc1254639c699ecd Add platform check in browser_list.h and browser_list_observer.h These files are included in Android builds, but they shouldn't be. This adds checks and fixes the include errors. These checks are a step toward enabling gn check in chrome/browser. Bug: 949535 --- browser/brave_browser_process_impl.cc | 2 ++ browser/brave_rewards/rewards_tab_helper.h | 4 ++++ components/brave_ads/browser/ads_tab_helper.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc index 0dc99dc198d4..f04f2044f44e 100644 --- a/browser/brave_browser_process_impl.cc +++ b/browser/brave_browser_process_impl.cc @@ -36,7 +36,9 @@ #include "brave/services/network/public/cpp/system_request_handler.h" #include "chrome/browser/component_updater/component_updater_utils.h" #include "chrome/browser/net/system_network_context_manager.h" +#if !defined(OS_ANDROID) #include "chrome/browser/ui/browser_list.h" +#endif #include "chrome/common/buildflags.h" #include "chrome/common/chrome_paths.h" #include "components/component_updater/component_updater_service.h" diff --git a/browser/brave_rewards/rewards_tab_helper.h b/browser/brave_rewards/rewards_tab_helper.h index 30d82bdadfbd..a05807feee30 100644 --- a/browser/brave_rewards/rewards_tab_helper.h +++ b/browser/brave_rewards/rewards_tab_helper.h @@ -11,7 +11,9 @@ #include "base/macros.h" #include "brave/components/brave_rewards/browser/rewards_service_observer.h" #include "build/build_config.h" +#if !defined(OS_ANDROID) #include "chrome/browser/ui/browser_list_observer.h" +#endif #include "components/sessions/core/session_id.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" @@ -24,7 +26,9 @@ class RewardsService; class RewardsTabHelper : public RewardsServiceObserver, public content::WebContentsObserver, +#if !defined(OS_ANDROID) public BrowserListObserver, +#endif public content::WebContentsUserData { public: explicit RewardsTabHelper(content::WebContents*); diff --git a/components/brave_ads/browser/ads_tab_helper.h b/components/brave_ads/browser/ads_tab_helper.h index e22a4341878c..393929318734 100644 --- a/components/brave_ads/browser/ads_tab_helper.h +++ b/components/brave_ads/browser/ads_tab_helper.h @@ -12,7 +12,9 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" +#if !defined(OS_ANDROID) #include "chrome/browser/ui/browser_list_observer.h" +#endif #include "components/sessions/core/session_id.h" #include "content/public/browser/media_player_id.h" #include "content/public/browser/web_contents_observer.h" From c4e4751d1f3ef9795db92c1a6538df6f457bf34f Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 17:15:20 -0400 Subject: [PATCH 092/152] [Android] MenuButton related changes Chromium changes: https://chromium.googlesource.com/chromium/src/+/a65f80f87cc151be897131164e015d37bea1d155 [ToolbarMVC] Remove direct MenuButton interactions from Tabswitcher This only requires giving TabSwitcherModeTTCoordinatorPhone a MenuButtonCoordinator and setting the MenuButton view once inflation happens. The logic removed (tinting, setting the onClick/accessibilityDelegate) is now handled internally by MenuButtonCoordinator/MenuButton. Bug: 1086676 https://chromium.googlesource.com/chromium/src/+/fbc145eeea76493c5469953975322db185826e3f [ToolbarMVC] Reimplement MenuButton internals to follow MVC This adds the familiar MVC pieces, in addition to the existing Coordinator and View: a Mediator, a ViewBinder, and a Properties class. Logic is moved out of the MenuButton and MenuButtonCoordinator to the Mediator. Of note, there are two compound properties for combinations of properties that need to be set together: * show/hide badge and shouldAnimate * useLight and ColorStateList Bug: 1086676 --- .../BrowsingModeBottomToolbarCoordinator.java | 2 -- .../TabSwitcherBottomToolbarCoordinator.java | 2 -- ...raveTabSwitcherModeTTCoordinatorPhone.java | 7 ++-- .../toolbar/top/BraveToolbarLayout.java | 6 ++-- .../top/BraveTopToolbarCoordinator.java | 36 +++++++++++-------- ...olbar-top-TopToolbarCoordinator.java.patch | 13 ------- 6 files changed, 30 insertions(+), 36 deletions(-) delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TopToolbarCoordinator.java.patch diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index 61c78cb6b18a..532fe7438b21 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -215,7 +215,6 @@ void initializeWithNative(OnClickListener newTabListener, OnClickListener tabSwi mBookmarkButton.setThemeColorProvider(themeColorProvider); mMenuButton.setAppMenuButtonHelper(menuButtonHelper); - mMenuButton.setThemeColorProvider(themeColorProvider); } private void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { @@ -287,7 +286,6 @@ public void destroy() { mSearchAccelerator.destroy(); mTabSwitcherButtonCoordinator.destroy(); mBookmarkButton.destroy(); - mMenuButton.destroy(); } public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java index 729803da4526..948a8e7cbf62 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java @@ -83,7 +83,6 @@ public class TabSwitcherBottomToolbarCoordinator { assert menuButtonHelper != null; mMenuButton = root.findViewById(R.id.menu_button_wrapper); - mMenuButton.setThemeColorProvider(themeColorProvider); mMenuButton.setAppMenuButtonHelper(menuButtonHelper); } @@ -107,6 +106,5 @@ void setVisible(boolean visible) { public void destroy() { mMediator.destroy(); mNewTabButton.destroy(); - mMenuButton.destroy(); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java index 901315a4136e..3ba1e8e96f76 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java @@ -7,13 +7,16 @@ import android.view.ViewStub; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; + class BraveTabSwitcherModeTTCoordinatorPhone extends TabSwitcherModeTTCoordinatorPhone { private TabSwitcherModeTTPhone mTabSwitcherModeToolbar; private boolean mIsBottomToolbarVisible; - BraveTabSwitcherModeTTCoordinatorPhone(ViewStub tabSwitcherToolbarStub) { - super(tabSwitcherToolbarStub); + BraveTabSwitcherModeTTCoordinatorPhone( + ViewStub tabSwitcherToolbarStub, MenuButtonCoordinator menuButtonCoordinator) { + super(tabSwitcherToolbarStub, menuButtonCoordinator); } @Override diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index 962263a717bd..edc3cb18f172 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -238,13 +238,13 @@ public void savedBandwidth(long savings) { updateBraveShieldsButtonState(null); if (this instanceof ToolbarPhone) { if (super.getMenuButtonCoordinator() != null && BottomToolbarVariationManager.isMenuButtonOnBottom()) { - super.getMenuButtonCoordinator().setVisibility(View.GONE); + super.getMenuButtonCoordinator().setVisibility(false); } } } @Override - void onNativeLibraryReady() { + protected void onNativeLibraryReady() { super.onNativeLibraryReady(); mBraveShieldsContentSettings = BraveShieldsContentSettings.getInstance(); mBraveShieldsContentSettings.addObserver(mBraveShieldsContentSettingsObserver); @@ -772,7 +772,7 @@ private void updateVerifiedPublisherMark() { public void onBottomToolbarVisibilityChanged(boolean isVisible) { if (this instanceof ToolbarPhone && super.getMenuButtonCoordinator() != null) { - super.getMenuButtonCoordinator().setVisibility(isVisible ? View.GONE : View.VISIBLE); + super.getMenuButtonCoordinator().setVisibility(isVisible); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index 51fd7360ec6b..ca02e9bcf02d 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -7,13 +7,16 @@ import android.content.Context; +import org.chromium.base.Callback; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.identity_disc.IdentityDiscController; import org.chromium.chrome.browser.tabmodel.TabModelSelector; +import org.chromium.chrome.browser.toolbar.ButtonData; import org.chromium.chrome.browser.toolbar.ButtonDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarTabController; @@ -29,27 +32,32 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { private OptionalBrowsingModeButtonController mOptionalButtonController; public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, - ToolbarLayout toolbarLayout, IdentityDiscController identityDiscController, - ToolbarDataProvider toolbarDataProvider, ToolbarTabController tabController, - UserEducationHelper userEducationHelper, List buttonDataProviders, + ToolbarLayout toolbarLayout, ToolbarDataProvider toolbarDataProvider, + ToolbarTabController tabController, UserEducationHelper userEducationHelper, + List buttonDataProviders, OneshotSupplier overviewModeBehaviorSupplier, ThemeColorProvider normalThemeColorProvider, ThemeColorProvider overviewThemeColorProvider, MenuButtonCoordinator browsingModeMenuButtonCoordinator, - MenuButtonCoordinator startSurfaceMenuButtonCoordinator, - ObservableSupplier appMenuButtonHelperSupplier, Context context, - ObservableSupplier tabModelSelectorSupplier) { - super(controlContainer, toolbarLayout, identityDiscController, toolbarDataProvider, - tabController, userEducationHelper, buttonDataProviders, - overviewModeBehaviorSupplier, normalThemeColorProvider, overviewThemeColorProvider, - browsingModeMenuButtonCoordinator, startSurfaceMenuButtonCoordinator, - appMenuButtonHelperSupplier, context, tabModelSelectorSupplier); + MenuButtonCoordinator overviewModeMenuButtonCoordinator, + ObservableSupplier appMenuButtonHelperSupplier, + ObservableSupplier tabModelSelectorSupplier, + ObservableSupplier homeButtonVisibilitySupplier, + ObservableSupplier identityDiscStateSupplier, + Callback invalidatorCallback, + Supplier identityDiscButtonSupplier) { + super(controlContainer, toolbarLayout, toolbarDataProvider, tabController, + userEducationHelper, buttonDataProviders, overviewModeBehaviorSupplier, + normalThemeColorProvider, overviewThemeColorProvider, + browsingModeMenuButtonCoordinator, overviewModeMenuButtonCoordinator, + appMenuButtonHelperSupplier, tabModelSelectorSupplier, homeButtonVisibilitySupplier, + identityDiscStateSupplier, invalidatorCallback, identityDiscButtonSupplier); if (toolbarLayout instanceof ToolbarPhone) { if (!StartSurfaceConfiguration.isStartSurfaceEnabled()) { - mTabSwitcherModeCoordinatorPhone = new BraveTabSwitcherModeTTCoordinatorPhone( - controlContainer.getRootView().findViewById( - R.id.tab_switcher_toolbar_stub)); + mTabSwitcherModeCoordinatorPhone = new TabSwitcherModeTTCoordinatorPhone( + controlContainer.getRootView().findViewById(R.id.tab_switcher_toolbar_stub), + overviewModeMenuButtonCoordinator); } } } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TopToolbarCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TopToolbarCoordinator.java.patch deleted file mode 100644 index fb2acff95e9f..000000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TopToolbarCoordinator.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java -index 0075d29673fea5507d7380b703ac698bee04efb4..f9ce34cc6ffab30fa5f32266b473a1adc3b45a1b 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java -@@ -131,7 +131,7 @@ public class TopToolbarCoordinator implements Toolbar { - identityDiscStateSupplier, overviewThemeColorProvider, - overviewModeMenuButtonCoordinator, identityDiscButtonSupplier); - } else { -- mTabSwitcherModeCoordinatorPhone = new TabSwitcherModeTTCoordinatorPhone( -+ mTabSwitcherModeCoordinatorPhone = new BraveTabSwitcherModeTTCoordinatorPhone( - controlContainer.getRootView().findViewById(R.id.tab_switcher_toolbar_stub), - overviewModeMenuButtonCoordinator); - } From 14622b03174559eaf0eb99a8d36594904873de06 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 17:17:04 -0400 Subject: [PATCH 093/152] [Android] CustomTabToolbar moved to customtabs/features/toolbar Chromium change: https://chromium.googlesource.com/chromium/src/+/6fd2d9fe48d63008fa3c89d2bb666f1432fc54ee Toolbar: Move CustomTabToolbar to customtabs/features/toolbar Class CustomToolbar inherits ToolbarLayout for the layout for Custom Tab Toolbar. It also provides an implementation of LocationBar interface used in omnibox. The concrete implementation classes for Custom Tab don't necessarily have to be a part of toolbar/. This CL moves the class to customtab/features/toolbar where other implementation of Custom Tab features are placed. This also helps reduce the outbound dependencies the class brought in to toolbar/. Bug: 1127732 --- ...er-customtabs-features-toolbar-CustomTabToolbar.java.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch index 7b845e5f2933..3921307c392a 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java -index 1be17e15f4f6c3c8b7f4a0a3ee37161f35c16dcc..47087c7946b7a0581f1d6c516e18f52fbc9a50b1 100644 +index 1be17e15f4f6c3c8b7f4a0a3ee37161f35c16dcc..34f9551f8de23d0fe716b8e1af13811a2443dd60 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java @@ -97,7 +97,7 @@ import java.util.regex.Pattern; @@ -7,7 +7,7 @@ index 1be17e15f4f6c3c8b7f4a0a3ee37161f35c16dcc..47087c7946b7a0581f1d6c516e18f52f * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs. */ -public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickListener { -+public class CustomTabToolbar extends BraveToolbarLayout implements View.OnLongClickListener { ++public class CustomTabToolbar extends org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout implements View.OnLongClickListener { private static final Object ORIGIN_SPAN = new Object(); /** From 7186c55d60939deef201eb8638acc0240f0f3331 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 7 Oct 2020 17:59:54 -0400 Subject: [PATCH 094/152] [Android] Fullscreen string was moved Chromium change: https://chromium.googlesource.com/chromium/src/+/d7f8f34e564b8870eb5e6827b14bd73ae70945cf weblayer: shows toast when entering fullscreen As the delegate is ultimately responsible for configuring fullscreen the code adds a OnSystemUiVisibilityChangeListener. If the right mode is entered in a short amount of time, the toast is shown. I'm adding Skip-Translation-Screenshots-Check as I'm moving the string, which has already been translated and didn't have a screenshot. BUG=1127486 --- browser/ui/android/strings/android_chrome_strings.grd | 5 ----- 1 file changed, 5 deletions(-) diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 8b49b03a40b8..6c3d7c8b6f06 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -2178,11 +2178,6 @@ To change this setting, <resetlink>reset sync

- - - Drag from top and touch the back button to exit full screen. - - Download complete From 0ee14927f93fee0625e1f115a740bb823b9875f6 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 7 Oct 2020 16:24:05 -0400 Subject: [PATCH 095/152] [Win] Use clang-cl response file for system includes. Save system include paths into a file under src and then use it as a response file when building CXX targets. This is to get around exceeding command line length. --- patches/build-toolchain-win-BUILD.gn.patch | 12 ++++++++++++ patches/build-toolchain-win-setup_toolchain.py.patch | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 patches/build-toolchain-win-BUILD.gn.patch diff --git a/patches/build-toolchain-win-BUILD.gn.patch b/patches/build-toolchain-win-BUILD.gn.patch new file mode 100644 index 000000000000..922d943d49fa --- /dev/null +++ b/patches/build-toolchain-win-BUILD.gn.patch @@ -0,0 +1,12 @@ +diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn +index be0893059aa8adc8ca0147b68466203c5e29fe85..9662054dce89e86ccb0e4bba6f012a6b76cabca6 100644 +--- a/build/toolchain/win/BUILD.gn ++++ b/build/toolchain/win/BUILD.gn +@@ -221,6 +221,7 @@ template("msvc_toolchain") { + outputs = [ "$object_subdir/{{source_name_part}}.obj" ] + + command = "$coverage_wrapper$env_wrapper$cl /nologo $show_includes $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\"" ++ if (toolchain_args.is_clang) { command = "$coverage_wrapper$env_wrapper$cl /nologo $show_includes @../../include_imsvc {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\"" } + } + + tool("rc") { diff --git a/patches/build-toolchain-win-setup_toolchain.py.patch b/patches/build-toolchain-win-setup_toolchain.py.patch index aadb025bbdf0..a4a4e54fd411 100644 --- a/patches/build-toolchain-win-setup_toolchain.py.patch +++ b/patches/build-toolchain-win-setup_toolchain.py.patch @@ -1,12 +1,12 @@ diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py -index 58bf3e8caf4e0a0fdcba03c5b8bf72b30ea8f075..81e1ccc1b8ccff4ebce2b93519ceaa5975f5a55f 100644 +index 58bf3e8caf4e0a0fdcba03c5b8bf72b30ea8f075..b504e562355cc2468a1c661a4daec983e68dfb6a 100644 --- a/build/toolchain/win/setup_toolchain.py +++ b/build/toolchain/win/setup_toolchain.py @@ -277,6 +277,7 @@ def main(): return s if re.match(r'^[a-zA-Z0-9._/\\:-]*$', s) else '"' + s + '"' include_I = ' '.join([q('/I' + i) for i in include]) include_imsvc = ' '.join([q('-imsvc' + i) for i in include]) -+ import win32api; include_imsvc = ' '.join([q('-imsvc' + win32api.GetShortPathName(i)) for i in include]) ++ open(os.path.abspath(os.path.join(SCRIPT_DIR, '..', '..', '..', "include_imsvc")), "w").writelines([(q('-imsvc' + i) + '\n') for i in include]) libpath_flags = ' '.join([q('-libpath:' + i) for i in lib]) if (environment_block_name != ''): From 2dbf59f81e22c976dbe3e5a94cd77f3f57637794 Mon Sep 17 00:00:00 2001 From: samartnik Date: Thu, 8 Oct 2020 11:23:59 -0400 Subject: [PATCH 096/152] [Android] Fix for lint errors We intentionally use the same names in brave_colors to override Chromium's values. Sample of error fixed: ../../chrome/android/java/res/values/brave_colors.xml:50: Error: ntp_bg_incognito has already been defined in this folder [DuplicateDefinition] @color/incognito_modern_primary_color ~~~~~~~~~~~~~~~~~~~~~~~ ../../chrome/android/java/res/values/colors.xml:58: Previously defined here --- ...me-android-expectations-lint-suppressions.xml.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 patches/chrome-android-expectations-lint-suppressions.xml.patch diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch new file mode 100644 index 000000000000..21dd47fee2d4 --- /dev/null +++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch @@ -0,0 +1,10 @@ +diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml +index 6835ceb237296c9b182a6865f0b36818904a4d73..d3c42bf2324c9369d552001651737e7a7d5efff1 100644 +--- a/chrome/android/expectations/lint-suppressions.xml ++++ b/chrome/android/expectations/lint-suppressions.xml +@@ -364,4 +364,5 @@ Still reading? + + + ++ + From 77b844b84628fb2a060143d676b23e1c2e5b695e Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Oct 2020 11:17:34 -0400 Subject: [PATCH 097/152] [Unit Tests] Moved mac speficif test under plafrom guard. --- test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/BUILD.gn b/test/BUILD.gn index 0ba0acc327ed..38de045d1537 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -103,7 +103,6 @@ test("brave_unit_tests") { "//brave/browser/net/brave_system_request_handler_unittest.cc", "//brave/chromium_src/chrome/browser/history/history_utils_unittest.cc", "//brave/chromium_src/chrome/browser/lookalikes/lookalike_url_navigation_throttle_unittest.cc", - "//brave/chromium_src/chrome/browser/shell_integration_unittest_mac.cc", "//brave/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc", "//brave/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc", "//brave/chromium_src/components/metrics/enabled_state_provider_unittest.cc", @@ -237,6 +236,7 @@ test("brave_unit_tests") { if (is_mac) { sources += [ + "//brave/chromium_src/chrome/browser/shell_integration_unittest_mac.cc", "//brave/chromium_src/chrome/common/chrome_constants_unittest_mac.cc", ] } From 84e2d96709cb95afc9734f4670c3842a9d64a9d6 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Oct 2020 10:55:05 -0400 Subject: [PATCH 098/152] [Unit Tests] Moved metrics unit test to its own BUILD.gn. This test only runs on linux and wasn't separated from all platforms sources. Took this opportunity to move it out completely to its own BUILD.gn under browser/metrics where the source is locate. --- browser/metrics/test/BUILD.gn | 31 +++++++++++++++++++++++++++++++ test/BUILD.gn | 6 +++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 browser/metrics/test/BUILD.gn diff --git a/browser/metrics/test/BUILD.gn b/browser/metrics/test/BUILD.gn new file mode 100644 index 000000000000..296d7d64ff18 --- /dev/null +++ b/browser/metrics/test/BUILD.gn @@ -0,0 +1,31 @@ +# Copyright (c) 2020 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. */ + +import("//brave/build/config.gni") +import("//brave/components/brave_ads/browser/buildflags/buildflags.gni") +import("//build/config/sanitizers/sanitizers.gni") +import("//testing/test.gni") + +source_set("brave_metrics_unit_tests") { + testonly = true + if (is_linux) { + sources = [ "//brave/browser/metrics/metrics_reporting_util_unittest_linux.cc" ] + + deps = [ + "//base/test:test_support", + "//brave/base:base", + "//brave/browser:browser_process", + "//brave/test:brave_browser_tests", + "//chrome/browser:browser", + "//chrome/common:channel_info", + "//components/version_info:channel", + "//content/test:test_support", + ] + + configs += [ + "//brave/build/linux:linux_channel_names", + ] + } +} diff --git a/test/BUILD.gn b/test/BUILD.gn index 38de045d1537..12120a5aaf19 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -92,7 +92,6 @@ test("brave_unit_tests") { "//brave/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc", "//brave/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc", "//brave/browser/download/brave_download_item_model_unittest.cc", - "//brave/browser/metrics/metrics_reporting_util_unittest_linux.cc", "//brave/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc", "//brave/browser/net/brave_block_safebrowsing_urls_unittest.cc", "//brave/browser/net/brave_common_static_redirect_network_delegate_helper_unittest.cc", @@ -143,6 +142,7 @@ test("brave_unit_tests") { deps = [ ":test_support", "//brave/base:base_unittests", + "//brave/browser/metrics/test:brave_metrics_unit_tests", "//brave/browser/safebrowsing", "//brave/browser/tor:unit_tests", "//brave/components/brave_ads/test:brave_ads_unit_tests", @@ -258,7 +258,7 @@ test("brave_unit_tests") { ] deps += [ "//brave/components/crypto_dot_com/browser", - ] + ] } if (is_linux) { @@ -647,7 +647,7 @@ if (!is_android) { } if (crypto_dot_com_enabled) { - sources += [ "//brave/components/crypto_dot_com/browser/crypto_dot_com_service_browsertest.cc" ] + sources += [ "//brave/components/crypto_dot_com/browser/crypto_dot_com_service_browsertest.cc" ] } if (brave_rewards_enabled) { From 9c61785d87c6e4bef3b45e5f42f139a0b816d37b Mon Sep 17 00:00:00 2001 From: samartnik Date: Thu, 8 Oct 2020 17:52:21 -0400 Subject: [PATCH 099/152] [Android] Fix for unit tests --- .../chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java | 2 ++ android/javatests/org/chromium/chrome/browser/BytecodeTest.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java index 67bea7634d68..879c05d26088 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java @@ -9,6 +9,7 @@ import android.util.AttributeSet; import android.view.View; +import org.chromium.chrome.R; import org.chromium.chrome.browser.toolbar.NewTabButton; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; @@ -25,6 +26,7 @@ public class BraveTabSwitcherModeTTPhone extends TabSwitcherModeTTPhone { public BraveTabSwitcherModeTTPhone(Context context, AttributeSet attrs) { super(context, attrs); + mMenuButton = findViewById(R.id.menu_button_wrapper); } protected void updateNewTabButtonVisibility() { diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 201bb9db287c..35300e22e0f2 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -194,8 +194,6 @@ public void testFieldsExist() throws Exception { Assert.assertTrue( fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", "mToggleTabStackButton")); - Assert.assertTrue(fieldExists( - "org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", "mMenuButton")); Assert.assertTrue( fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone", "mShouldShowNewTabVariation")); From 7c703e2d8617a01a255b4e47129528cda467af92 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Oct 2020 14:32:30 -0400 Subject: [PATCH 100/152] Conflict-resolved patches from Chromium 87.0.4278.0 to Chromium 87.0.4280.11. --- patches/chrome-VERSION.patch | 6 ++--- patches/chrome-android-BUILD.gn.patch | 14 ++++++------ ...ome-android-java-AndroidManifest.xml.patch | 22 +++++++++---------- ...rome-browser-profiles-profile_impl.h.patch | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 22788d63e33a..54d4877a60c2 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 801f8a1c4763ad368297b3a5a5dbd0414140de93..d70c78e41d865865c07ef267e7a9e394da10d3cb 100644 +index 82d566f627782396b6932d4eebc074d4078edf2c..d70c78e41d865865c07ef267e7a9e394da10d3cb 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=87 -MINOR=0 --BUILD=4278 --PATCH=0 +-BUILD=4280 +-PATCH=11 +MINOR=1 +BUILD=18 +PATCH=15 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 53ca9e73d447..bcb20a360144 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index b6ce2c5e4dc999fc812f7efbcdccc07021dee281..e6d9fa416181b46a08ef6dc2cb17d21e7f07e309 100644 +index 606f75c5a288e46c2e135ffd0cdce2581e4e0c68..fac971e66956b6c1651ac495dc3254c079a3b93f 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -231,6 +231,7 @@ android_resources("chrome_app_java_resources") { +@@ -234,6 +234,7 @@ android_resources("chrome_app_java_resources") { "//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:material_design_java", ] @@ -10,7 +10,7 @@ index b6ce2c5e4dc999fc812f7efbcdccc07021dee281..e6d9fa416181b46a08ef6dc2cb17d21e } if (enable_vr) { -@@ -522,6 +523,7 @@ android_library("chrome_java") { +@@ -526,6 +527,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,15 +18,15 @@ index b6ce2c5e4dc999fc812f7efbcdccc07021dee281..e6d9fa416181b46a08ef6dc2cb17d21e srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -555,6 +557,7 @@ android_library("chrome_java") { +@@ -557,6 +559,7 @@ android_library("chrome_java") { "//components/ui_metrics:ui_metrics_enums_java", "//net:effective_connection_type_java", ] + srcjar_deps += brave_chrome_java_srcjar_deps # From java_sources.gni. - sources = chrome_java_sources + [ -@@ -681,6 +684,7 @@ group("jni_headers") { + sources = chrome_java_sources + [ app_hooks_impl ] +@@ -677,6 +680,7 @@ group("jni_headers") { "//chrome/browser/webauthn/android:jni_headers", "//components/media_router/browser/android:jni_headers", ] @@ -34,7 +34,7 @@ index b6ce2c5e4dc999fc812f7efbcdccc07021dee281..e6d9fa416181b46a08ef6dc2cb17d21e } action("chrome_android_java_google_api_keys_srcjar") { -@@ -1774,6 +1778,7 @@ if (current_toolchain == default_toolchain) { +@@ -1760,6 +1764,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index f7e900f62993..9eb6a0aeace9 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47cc3e9d835 100644 +index 4d0a6e271de41347ae81170fd6ee32521c6109c5..9387bcfa09bba250795f8812058ea9c79e6d7653 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -34,7 +34,9 @@ by a child template that "extends" this file. +@@ -38,7 +38,9 @@ by a child template that "extends" this file. {% endif %} @@ -12,7 +12,7 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c -@@ -44,9 +46,13 @@ by a child template that "extends" this file. +@@ -48,9 +50,13 @@ by a child template that "extends" this file. {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %} {% endif %} @@ -26,7 +26,7 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c -@@ -54,7 +60,9 @@ by a child template that "extends" this file. +@@ -58,7 +64,9 @@ by a child template that "extends" this file. @@ -36,7 +36,7 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c -@@ -101,7 +109,9 @@ by a child template that "extends" this file. +@@ -105,7 +113,9 @@ by a child template that "extends" this file. @@ -46,15 +46,15 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c {% block extra_uses_permissions %} {% endblock %} -@@ -148,6 +158,7 @@ by a child template that "extends" this file. - - @@ -62,7 +62,7 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c {% endif %} -@@ -1215,6 +1227,7 @@ by a child template that "extends" this file. +@@ -1172,6 +1184,7 @@ by a child template that "extends" this file. {% endif %} diff --git a/patches/chrome-browser-profiles-profile_impl.h.patch b/patches/chrome-browser-profiles-profile_impl.h.patch index 04c7635b814e..5812334dc853 100644 --- a/patches/chrome-browser-profiles-profile_impl.h.patch +++ b/patches/chrome-browser-profiles-profile_impl.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h -index e05b687a9f709b93138e18fec6fd9d233e8e3e26..9e12e682345495c2219e3e1e7a54ce38b307fdf1 100644 +index 562decfb766d6a12123fb2b14246ac2e9ee62ed3..055b8f13134c69a8ae13926545983f3db526f38e 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -171,6 +171,7 @@ class ProfileImpl : public Profile { @@ -9,4 +9,4 @@ index e05b687a9f709b93138e18fec6fd9d233e8e3e26..9e12e682345495c2219e3e1e7a54ce38 + BRAVE_PROFILE_IMPL_H_ void SetCreationTimeForTesting(base::Time creation_time) override; - + void RecordMainFrameNavigation() override {} From f92dbd254c014b55d8d2381e639c83e5833689ff Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Oct 2020 14:45:25 -0400 Subject: [PATCH 101/152] Updated patches from Chromium 87.0.4278.0 to Chromium 87.0.4280.11. --- patches/base-BUILD.gn.patch | 2 +- ...ld-config-android-internal_rules.gni.patch | 2 +- patches/build-config-android-rules.gni.patch | 2 +- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 6 +-- ...d-expectations-lint-suppressions.xml.patch | 2 +- ...me-browser-ChromeTabbedActivity.java.patch | 10 ++-- ...rome-browser-app-ChromeActivity.java.patch | 4 +- ...atures-toolbar-CustomTabToolbar.java.patch | 2 +- ...rowser-sync-AndroidSyncSettings.java.patch | 2 +- ...tings-AccountManagementFragment.java.patch | 4 +- ...ync-settings-ManageSyncSettings.java.patch | 4 +- ...-browser-toolbar-ToolbarManager.java.patch | 4 +- ...ottom-BottomControlsCoordinator.java.patch | 2 +- patches/chrome-android-java_sources.gni.patch | 2 +- ...-app-chrome_crash_reporter_client.cc.patch | 4 +- patches/chrome-browser-BUILD.gn.patch | 6 +-- patches/chrome-browser-about_flags.cc.patch | 4 +- ...hrome-browser-browser_process_impl.h.patch | 4 +- ...ing_data_remover_delegate_factory.cc.patch | 4 +- ...wser-chrome_content_browser_client.h.patch | 4 +- .../chrome-browser-extensions-BUILD.gn.patch | 2 +- ...flags-android-chrome_feature_list.cc.patch | 2 +- ...prefetch-prefetch_service_factory.cc.patch | 2 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +-- .../chrome-browser-profiles-profile.cc.patch | 4 +- ...ext_menu-render_view_context_menu.cc.patch | 4 +- ...tings-privacy_page-privacy_page.html.patch | 2 +- ...ettings-privacy_page-privacy_page.js.patch | 2 +- ...-browser-resources-settings-route.js.patch | 4 +- ...-settings-settings_ui-settings_ui.js.patch | 2 +- ...ings-site_settings-site_details.html.patch | 4 +- patches/chrome-browser-ui-BUILD.gn.patch | 4 +- ...-save_card_bubble_controller_impl.cc.patch | 2 +- ...rowser-ui-cocoa-main_menu_builder.mm.patch | 6 +-- ...rtup-startup_browser_creator_impl.cc.patch | 2 +- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 2 +- ...ws-location_bar-location_bar_view.cc.patch | 4 +- ...ews-location_bar-location_bar_view.h.patch | 8 ++-- ...owser-ui-views-tabs-new_tab_button.h.patch | 2 +- ...me-browser-ui-views-tabs-tab_icon.cc.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...ttings_localized_strings_provider.cc.patch | 4 +- ...bui-settings-site_settings_helper.cc.patch | 4 +- patches/chrome-common-BUILD.gn.patch | 4 +- ...bian-update_dist_package_versions.py.patch | 4 +- ...linux-rpm-update_package_provides.py.patch | 4 +- patches/chrome-renderer-BUILD.gn.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 4 +- .../chrome-test-base-testing_profile.cc.patch | 4 +- patches/chrome-utility-services.cc.patch | 4 +- ...settings-SingleCategorySettings.java.patch | 4 +- ...er-page_specific_content_settings.cc.patch | 2 +- ...ings-core-common-content_settings.cc.patch | 4 +- .../components-omnibox-browser-BUILD.gn.patch | 2 +- ...mnibox-browser-omnibox_edit_model.cc.patch | 2 +- .../components-page_info-page_info.cc.patch | 4 +- patches/components-sync-BUILD.gn.patch | 4 +- patches/components-sync-driver-BUILD.gn.patch | 4 +- ...onents-vector_icons-vector_icons.gni.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 4 +- patches/content-common-BUILD.gn.patch | 2 +- ...lic-browser-content_browser_client.h.patch | 4 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- patches/net-BUILD.gn.patch | 4 +- .../sandbox-policy-win-sandbox_win.cc.patch | 4 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...renderer-bindings-idl_in_modules.gni.patch | 2 +- ...-blink-renderer-core-dom-document.cc.patch | 2 +- ...-canvas-canvas_async_blob_creator.cc.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 2 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 2 +- ...anvas2d-base_rendering_context_2d.cc.patch | 2 +- ...canvas2d-base_rendering_context_2d.h.patch | 4 +- ...vas2d-canvas_rendering_context_2d.cc.patch | 4 +- ...as2d-canvas_rendering_context_2d.idl.patch | 6 +-- ...reen_canvas_rendering_context_2d.idl.patch | 6 +-- ...nderer-modules-modules_idl_files.gni.patch | 2 +- ...bgl-webgl2_rendering_context_base.cc.patch | 8 ++-- ...ebgl-webgl_rendering_context_base.cc.patch | 46 +++++++++---------- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +- ...ces-cr_elements-shared_vars_css.html.patch | 2 +- 84 files changed, 169 insertions(+), 169 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 47135da4ee9e..e04f8990df93 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 9b4aab55e48d56e70ad14b1f084181edc3348857..ee04db48f1f2858c027d5baa7a8a0f291b785356 100644 +index 1d449b35bf403ffc933cceabffc1f1e570fdae16..9c196bbfae226682d064e801c2f1e2625ef45eb8 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -3686,6 +3686,7 @@ if (is_android) { diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index c4e120ae1f64..04bb2ff5613f 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 1c24bc8de19f8ddf50592e7795a5310fe86a39dd..c909ceb6fbd3b11558a4b9706d3f186692aa23d9 100644 +index af22e3e45c0b0f1d90e73a9eb2785bc5eb67c2f8..0e1d64b187e2c5c2c788278ded92513764a63173 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -2028,6 +2028,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 7a018ad905b8..104ff9640db0 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 63e98022318d716baf1394d8ee05d153e1537316..17e33faa9042f3a4d227956b9816a3d390fb42ba 100644 +index f5c704898d06ee71905b0f81f786cdc4f76bdfd1..0aacd27c927d97c1f2bbadc1956d350c3f6e01b3 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -509,6 +509,7 @@ if (enable_java_templates) { diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index f4b782d0861a..4448e882e0b6 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 65fa9615d45d7b88bff488ea7812dcaad8032f6d..250dd262477a180c3de40b1961676fbb4844c7d3 100644 +index 9caba09c98899c4e6b1889d4ce7d76320f7cb81a..a76d0af46bce46f69f78c9431bea46a6b5feeab4 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1695,3 +1695,4 @@ chrome_java_sources = [ +@@ -1702,3 +1702,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/HandlerResponseCallback.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index f68f46601c4c..2dd3c416e287 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 40c3e5e44b9a476ccdd3022e86576d677445a09b..eeccf8dd7c591862f53b4c2bd3eff21d9d285f02 100644 +index 44cbc2fdde8c1c0b74aa38d70df63286426c5643..f037d055863b1d900da4e85fa592670b670bfc0d 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -213,6 +213,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -212,6 +212,7 @@ template("chrome_public_common_apk_or_module_tmpl") { "${_material_package}:[Ss]lider", "${_material_package}:[Tt]oolbarLayout", ] @@ -10,7 +10,7 @@ index 40c3e5e44b9a476ccdd3022e86576d677445a09b..eeccf8dd7c591862f53b4c2bd3eff21d if (!_is_monochrome) { product_config_java_packages = [ "org.chromium.chrome.browser" ] -@@ -322,6 +323,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -321,6 +322,7 @@ template("chrome_public_common_apk_or_module_tmpl") { if (!defined(proguard_configs)) { proguard_configs = [] } diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index 21dd47fee2d4..23edaa43b7af 100644 --- a/patches/chrome-android-expectations-lint-suppressions.xml.patch +++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml -index 6835ceb237296c9b182a6865f0b36818904a4d73..d3c42bf2324c9369d552001651737e7a7d5efff1 100644 +index f5e6db4ae73283b30e22a937628548a1f2d1cee2..3f433109e8b9c7ee8a31ba82fded6436c838c5b6 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml @@ -364,4 +364,5 @@ Still reading? diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index aad8c8c4bc90..f872d68addfd 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index b2258ddf5738d94865bd543a55dec173cf28d1ff..334d2d7a5031fb3b18870b056b1c9c9ee424da34 100644 +index f065dec4047591e6e764a2fde92639992bb7c2b5..b107bab44e8033ac72195f632c84af05d14a0e6c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -181,7 +181,7 @@ import java.util.Locale; +@@ -184,7 +184,7 @@ import java.util.Locale; * This is the main activity for ChromeMobile when not running in document mode. All the tabs * are accessible via a chrome specific tab switching UI. */ @@ -29,7 +29,7 @@ index b2258ddf5738d94865bd543a55dec173cf28d1ff..334d2d7a5031fb3b18870b056b1c9c9e mIntentWithEffectSupplier, getShareDelegateSupplier(), getActivityTabProvider(), mEphemeralTabCoordinatorSupplier, mTabModelProfileSupplier, mBookmarkBridgeSupplier, getOverviewModeBehaviorSupplier(), this::getContextualSearchManager, -@@ -1569,7 +1569,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -332,7 +332,7 @@ public abstract class ChromeActivity NightModeReparentingController mNightModeReparentingController; protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch index 3921307c392a..eacb10b380cc 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java -index 1be17e15f4f6c3c8b7f4a0a3ee37161f35c16dcc..34f9551f8de23d0fe716b8e1af13811a2443dd60 100644 +index 52c86139804e02f2548cc3890e7848f08c52cfca..619d73a5dd9aac2e26a0cc9330dd17698a4ce155 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java @@ -97,7 +97,7 @@ import java.util.regex.Pattern; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch index dffe03ed8678..2864bcc0b87d 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java -index 09c8dfc92481b272b536fdc05dfb7b11fbca616d..629b7c451cba0e9f7d0f5c25cf561b76221a68d9 100644 +index ff9f5ccac61823d09b6f98c91e6dbc16bc035ab8..683ed920aa2440e6d40911d19aeade983eb05f62 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java @@ -74,7 +74,7 @@ public class AndroidSyncSettings { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch index 6185db478d48..3b1e0e0418c1 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java -index 8f958b6cf487ae60c68580547dc8d4239651ee52..ef17dd64cadd0b63d7122ffa8c959fae5889d1d3 100644 +index e1fc83073e097e78a922c8f14ecf98c56ed46448..f9f2e6881cb9d3729203beb9fe02a1ac164d34b1 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java -@@ -62,7 +62,7 @@ import java.util.List; +@@ -63,7 +63,7 @@ import java.util.List; * * Note: This can be triggered from a web page, e.g. a GAIA sign-in page. */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index 9c52494fbe4d..781f9c98d824 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 98c57f7da4cac37321f505be6bf42a7f3699dfe9..6754ca8368b906dc97f058415239f96a534f46da 100644 +index 9e594d7ec075c1528d1f5e8530b07fb968e9c7b0..4513f5d58c8a04124e828ef77e206a50415cb90f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -26,7 +26,7 @@ import androidx.appcompat.app.AlertDialog; @@ -11,7 +11,7 @@ index 98c57f7da4cac37321f505be6bf42a7f3699dfe9..6754ca8368b906dc97f058415239f96a import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -@@ -369,7 +369,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat +@@ -350,7 +350,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat IdentityServicesProvider.get() .getIdentityManager(Profile.getLastUsedRegularProfile()) .getPrimaryAccountInfo(ConsentLevel.SYNC)); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch index 363900da9cd8..1b5bd3551d3e 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch @@ -1,8 +1,8 @@ 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 1bed46ff22c180a59d80210a5160e6501071a33d..52e3870dc07d2181f70a1c6847bc037487898d32 100644 +index dbffdea2287f9d3d008cde7068c1ace68a0d70fe..23a6f93b9d0c11e99467f1ee8302a35c71f56f15 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 -@@ -629,7 +629,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -631,7 +631,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve ThemeColorProvider browsingModeThemeColorProvider, MenuButtonCoordinator startSurfaceMenuButtonCoordinator, Invalidator invalidator, IdentityDiscController identityDiscController) { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch index 861a10c6c554..c9e4d78562fe 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -index ff4c9fb019d1a4a5c23f5ea61f25e49c888bc497..a04533730c90a03f1fee8c72693f23b5dd789b89 100644 +index 43d168eed3178c3fe45769d48dadbb9e8e108729..7e2767c6c8b271e3ad0f8b12c21bfbe0915fe80c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java @@ -101,7 +101,7 @@ public class BottomControlsCoordinator { diff --git a/patches/chrome-android-java_sources.gni.patch b/patches/chrome-android-java_sources.gni.patch index cdaace027999..64db0d569309 100644 --- a/patches/chrome-android-java_sources.gni.patch +++ b/patches/chrome-android-java_sources.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni -index d71e9f6da63f3c8384ac85fbe6e2baa81baac49b..a2b6910f95633fc86a9ed0df292751b360306763 100644 +index 2dcef8bd76e082f8c011601e6017f38c3eddfeed..b7e31de137a56b379563c3874dc7b4c6b8dc2ae4 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni @@ -20,6 +20,7 @@ import("//components/offline_pages/buildflags/features.gni") diff --git a/patches/chrome-app-chrome_crash_reporter_client.cc.patch b/patches/chrome-app-chrome_crash_reporter_client.cc.patch index bb2791e3cc37..fe15a3cdb849 100644 --- a/patches/chrome-app-chrome_crash_reporter_client.cc.patch +++ b/patches/chrome-app-chrome_crash_reporter_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc -index 14c5f665194daf7c16252aa0b3e122d48be5bc3c..a4b66a75917ddf6dddea24f03ccedc8b187561b4 100644 +index 8ee07e7b83a137f485d2e49407bc5cb19f8977a8..ab019b4c3938e7d1bd476b14e150018867f088fd 100644 --- a/chrome/app/chrome_crash_reporter_client.cc +++ b/chrome/app/chrome_crash_reporter_client.cc -@@ -155,7 +155,7 @@ bool ChromeCrashReporterClient::IsRunningUnattended() { +@@ -154,7 +154,7 @@ bool ChromeCrashReporterClient::IsRunningUnattended() { } bool ChromeCrashReporterClient::GetCollectStatsConsent() { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 61e913a21a73..1d38a10357d9 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 51b25f1a89699984c4daf7e8da6e8c9fd5c59750..7c7478f1944fe76f71d4aab517f2b443177ba6ae 100644 +index e462f7d8bef19577547cacc76fc794ab6fa17dcf..17ab7457880c8bf2cb19e71482664e0da93dc744 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2268,6 +2268,7 @@ static_library("browser") { +@@ -2274,6 +2274,7 @@ static_library("browser") { "//ui/web_dialogs", "//ui/webui", "//ui/webui/resources/cr_components/customize_themes:mojom", @@ -10,7 +10,7 @@ index 51b25f1a89699984c4daf7e8da6e8c9fd5c59750..7c7478f1944fe76f71d4aab517f2b443 ] if (is_chromeos) { deps += [ -@@ -4003,6 +4004,7 @@ static_library("browser") { +@@ -4014,6 +4015,7 @@ static_library("browser") { sources += [ "first_run/first_run_internal_posix.cc" ] } } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 29c8faac2f0d..2ef5197859c3 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index c487b04f5e1e594d865db56425c2b5b21bde032f..f14e2a2ce745dacf51de481f1b618f261a05b2a7 100644 +index b04778c5e67af899330f00818e348da5bca387fb..2f124db00752d15ceff19968db2ac929d34ed7ac 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -294,14 +294,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { @@ -21,7 +21,7 @@ index c487b04f5e1e594d865db56425c2b5b21bde032f..f14e2a2ce745dacf51de481f1b618f26 const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -6469,6 +6469,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6648,6 +6648,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 0f3ca4c6b644..737d38056c2b 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index f22581ef5d5cf31c1bc9d8660ccbb71d9b96f870..e1f96733790ee47d037a7cbce1798521f91a4789 100644 +index 8a8d8a8206907722a2d4db3288c90f9ad7e7b3c4..f9d1eae11e3f2472bac157573bcc0143840aff58 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -200,6 +200,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -202,6 +202,7 @@ class BrowserProcessImpl : public BrowserProcess, static void RegisterPrefs(PrefRegistrySimple* registry); private: diff --git a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch index 779280f8b81d..8ceca8d2baaa 100644 --- a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch +++ b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc -index 470dbea2910aebff729b7510b9c605a0e42c823d..b079c9f0914f4253e2afa0e954acb2a7a958d43b 100644 +index eaf6e97877dfa1f8c0a2e477913b6efdee80cecd..5f224da9b0038a13d160c5e9da8b6e9ae3ea820e 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc -@@ -106,5 +106,5 @@ ChromeBrowsingDataRemoverDelegateFactory::GetBrowserContextToUse( +@@ -108,5 +108,5 @@ ChromeBrowsingDataRemoverDelegateFactory::GetBrowserContextToUse( KeyedService* ChromeBrowsingDataRemoverDelegateFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index 7878d5ee38ac..d5517202cfa8 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 002c5a57f8900520cd0e3b367b010c51f52143c8..97e57bab2b69825f3f4547cc2a55432058bf6239 100644 +index ef7da434358103fed7253ef3080b0dccba5d632e..5a4a3bb6d468bc1f6b06cbd8fe2a1638b0888093 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -710,6 +710,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -720,6 +720,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index e509327fedf9..f5f5be4d65e0 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 61574852f686ee68479b0cb714852e4271a0806d..20b107a476df4d4ec755308fdd6bcb6a2d316d4c 100644 +index d02c734af5c04b95a0e7ad0deed114705dd37257..8671fa3810b31cf192d8fc9754f49a5a8fd03864 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -1255,6 +1255,7 @@ static_library("extensions") { diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 535bb83055f6..dc1f8813f278 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index 45429c5ff6d3cc95543109b7707242481670b59b..213b7978d352fb4080b4b15c12f8cd82d7c04e97 100644 +index 08dcb6405f5dc717fc59f28a0a9c24fd7092336c..a304556de0bbceaf3eae78c52e26232bfba1af82 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -266,6 +266,7 @@ const base::Feature* kFeaturesExposedToJava[] = { diff --git a/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch b/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch index 110c9d3468be..18e2f63c9e00 100644 --- a/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch +++ b/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc -index 8f6d95dda58140306405948ba124b8ad3fc95620..9e91d9a86ec3e5d59e8a1c7a833ede2f81aebdee 100644 +index d2c8ad6ca350d7ac7eaceb8a0b71d8fa551740ec..f25aebb0450e625cd5c8b482400e5c45b5a69556 100644 --- a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc +++ b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc @@ -51,6 +51,7 @@ namespace { diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index a8c570ec33dc..205f6b207198 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 9de1468f1bd02ab7901a5afd54545109c49e73f9..d46cdc3eecb73bc7a5476e79c60bec6d4565be4d 100644 +index 9f4f2905702eb59ddb92049b16370b4efa204b11..10d3c7d3f10fce56ce7244c319a811d35dacb4d9 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -738,6 +738,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -729,6 +729,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 9de1468f1bd02ab7901a5afd54545109c49e73f9..d46cdc3eecb73bc7a5476e79c60bec6d // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1009,6 +1010,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -991,6 +992,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index cf129515a832..8e4505720286 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index b841f58d27ad64fcb892fdf8792fc33c45ac68bd..00661079a39bd963c10e736930cdc1b59624e582 100644 +index ca36c316828f3d5ab3fb511d73cb975a86286c5e..b435bcf5ad55a48a21aa545d82553deb55486087 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -261,7 +261,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -266,7 +266,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index f65368309884..5b4185263744 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index b5bc18f42059c28ec258f174c8ad9ba585c4b0e3..0f6d4fba8b8b66eaa21e55f98290eb3b3e26b064 100644 +index 4842820f87afc037044b62f6e7b0fe11cccc74ff..8dba7a8ce64abd59311e4d76370d1450c8d9a7f0 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1628,6 +1628,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1627,6 +1627,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index b2d624c73572..c38e70450d5c 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 94dae1df4ab0fb938bc3f15944a760ca640102b0..456af41b965c8165dcb28984cacb06ac023a87ff 100644 +index 58c5fe913a850a6ea11bb72056814350f78fe17e..34d86995e5439f4ef817c2d6f8b97b2c1e5cd6cb 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -11,6 +11,7 @@ diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch index 01953c47c3ad..d328d91a25c1 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js -index f3c5ae161018f3f3da960116da4eb624ca9c38ed..14d234821b168d35ec9b01dcd965049e2874ed67 100644 +index 4618929810b8dac6684faef7ee144dc52c5af228..25185fa31c26b668f617dd8a492ec39adf1abaaf 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js @@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; diff --git a/patches/chrome-browser-resources-settings-route.js.patch b/patches/chrome-browser-resources-settings-route.js.patch index 426c264f84bf..566a287d7002 100644 --- a/patches/chrome-browser-resources-settings-route.js.patch +++ b/patches/chrome-browser-resources-settings-route.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js -index f8dbb8bd1c0bd44e759f104e3e6dfb689c95c213..b3e2e18d037039c3df478e6219f3560f58760872 100644 +index 1a2e94d4d42abc20f22fe616afd9c4a1433061fe..b3462b3f2634cbbc01e4fa6f6d45f8b0cfee666d 100644 --- a/chrome/browser/resources/settings/route.js +++ b/chrome/browser/resources/settings/route.js @@ -34,7 +34,9 @@ function addPrivacyChildRoutes(r) { @@ -12,7 +12,7 @@ index f8dbb8bd1c0bd44e759f104e3e6dfb689c95c213..b3e2e18d037039c3df478e6219f3560f r.SITE_SETTINGS_AR = r.SITE_SETTINGS.createChild('ar'); r.SITE_SETTINGS_AUTOMATIC_DOWNLOADS = r.SITE_SETTINGS.createChild('automaticDownloads'); -@@ -176,7 +178,9 @@ function createBrowserSettingsRoutes() { +@@ -173,7 +175,9 @@ function createBrowserSettingsRoutes() { } r.PRINTING = r.ADVANCED.createSection('/printing', 'printing'); diff --git a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch index adca1ef0630c..52cd05fab253 100644 --- a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch +++ b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.js b/chrome/browser/resources/settings/settings_ui/settings_ui.js -index d9459ba22b9ed42f87b915505ff66819fa5f2ce3..0de948cdf040763448c42f6859bbbb050f2271a6 100644 +index 041bcd6d58416ce7b224ffad5a7e42a9e7155d76..1edd6f1def8dc7f35263b669b18d3a8a83007ef3 100644 --- a/chrome/browser/resources/settings/settings_ui/settings_ui.js +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.js @@ -12,7 +12,7 @@ diff --git a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch index fe04e456d44b..f18ca28be69f 100644 --- a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch +++ b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html -index e22ec5ea4bb8d86e0906287a05eedeb6869fce62..111daa0f58498172460485b167e76a1c0bacdd75 100644 +index 41e59a524e5a9a21fc1c4e2068f2988d3d7db9b8..e0c372f82dd4507a4988264ad4d4e12b1ea71b5c 100644 --- a/chrome/browser/resources/settings/site_settings/site_details.html +++ b/chrome/browser/resources/settings/site_settings/site_details.html -@@ -195,6 +195,11 @@ +@@ -193,6 +193,11 @@ category="[[ContentSettingsTypes.UNSANDBOXED_PLUGINS]]" icon="cr:extension" label="$i18n{siteSettingsUnsandboxedPlugins}"> diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 3c52f0ba0a37..fd705d8f1a13 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 523123b9aaa76824378ab9b3d27eb771a177e957..ca7ed8867ca4764c77866920dc0bfc98f1dfcee2 100644 +index bf4ca6cdccc421c46c3e0c7f14b86b1929503e69..2c894c79cba37a4e99bacf914667641d524242f6 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -586,6 +586,7 @@ static_library("ui") { @@ -10,7 +10,7 @@ index 523123b9aaa76824378ab9b3d27eb771a177e957..ca7ed8867ca4764c77866920dc0bfc98 allow_circular_includes_from += [ "//chrome/browser/ui/webui/bluetooth_internals" ] -@@ -3151,10 +3152,13 @@ static_library("ui") { +@@ -3161,10 +3162,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-autofill-payments-save_card_bubble_controller_impl.cc.patch b/patches/chrome-browser-ui-autofill-payments-save_card_bubble_controller_impl.cc.patch index 5f71a49c6083..f14053b5f5fc 100644 --- a/patches/chrome-browser-ui-autofill-payments-save_card_bubble_controller_impl.cc.patch +++ b/patches/chrome-browser-ui-autofill-payments-save_card_bubble_controller_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc -index 1a7e0c10e8873de616f50e309dc3ba4bc4544149..51bfbfa91987fa0f17560c37d5b71b08e9110753 100644 +index e2230f7605e9b7f6f21bce5ad6c7d0f9f11b2c59..bdd59a0d059ef723ad193ac3a4012dd8bd9f3798 100644 --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc @@ -331,6 +331,7 @@ bool SaveCardBubbleControllerImpl::ShouldRequestExpirationDateFromUser() const { diff --git a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch index b6f99c9dd24e..fb7a8e6308e1 100644 --- a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch +++ b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm -index bcef3c790369522c0dbee269e3ceb4f5ecd6649a..cf5eb4219b8a7043f3b2a8768c1a8c428f366e5e 100644 +index 9659d68c224c83f8c258fa7b2a89cb627149eb1f..2e05ef22deeade7b57efc2240224531af7b3f307 100644 --- a/chrome/browser/ui/cocoa/main_menu_builder.mm +++ b/chrome/browser/ui/cocoa/main_menu_builder.mm -@@ -103,6 +103,7 @@ base::scoped_nsobject BuildFileMenu( +@@ -104,6 +104,7 @@ base::scoped_nsobject BuildFileMenu( Item(IDS_NEW_INCOGNITO_WINDOW_MAC) .command_id(IDC_NEW_INCOGNITO_WINDOW) .remove_if(is_pwa), @@ -10,7 +10,7 @@ index bcef3c790369522c0dbee269e3ceb4f5ecd6649a..cf5eb4219b8a7043f3b2a8768c1a8c42 Item(IDS_REOPEN_CLOSED_TABS_MAC) .command_id(IDC_RESTORE_TAB) .remove_if(is_pwa), -@@ -462,6 +463,7 @@ base::scoped_nsobject BuildHelpMenu( +@@ -468,6 +469,7 @@ base::scoped_nsobject BuildHelpMenu( #if BUILDFLAG(GOOGLE_CHROME_BRANDING) Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK), #endif diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 74a09bb8ac0e..18c17fb93856 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index 453a5fc76b491d62c1a04274f2ed831030685d3c..ffde4e0a23a69f2451a909e39bc7764c94f7edff 100644 +index 393a018c135a76739d38180ce3fd681c71b3a98b..a378db2d6404ae8020a5b197d7515d7fab28d70a 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -516,6 +516,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 4d01cd9b5320..64004cfc7bae 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 5877e77bdabb60b6ffea7a16dd062a6d05e35bde..6737aa2481c87d66aee68dcc68a3c13b2861e7e5 100644 +index 4d73e1ce38e0c17c6d268b0fa8df1bbbedfdcc2e..8e898c461f44fd1b18a036fbd025ac45b5e531f5 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -473,4 +473,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -475,4 +475,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and // organized. diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index cb025d0ddc9a..c2299f00e207 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 93302e77e28a49b06f6b5943d7ca44e2553ec202..6fd6cd73cd792f955698a0a5ead3b46d5901116d 100644 +index 6880ef875715ca44996ca09e63b45fc71fa027a2..d397cca371b7a0628783a2e32384032dc33da12e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -844,6 +844,7 @@ void BookmarkBarView::Layout() { diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index c7a8464475a2..de449e962470 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 2889d7f988f222eafdba8247110f879a7f2b18b9..db1d7186b8b55b84d0118e024c3ebfffb4f9cb12 100644 +index c5859e342846e264ad739ba03bceaa2ef226b5f8..986272edd5cfe7c4636b20bc0ddbf6eab114221e 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -568,6 +568,7 @@ void LocationBarView::Layout() { +@@ -570,6 +570,7 @@ void LocationBarView::Layout() { } }; diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch index 5e9ab2a62920..6cc019438565 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h -index 2da858b874e505c380a2fb09a1b8cf4b1619a61f..63e626d051c1a6207a7eb18e3d4bde274af45239 100644 +index 8471c31543ae1de888975623f8935bf507141ea8..8a073c38f7ae6a1a32905a247951d888091369f8 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h -@@ -107,6 +107,7 @@ class LocationBarView : public LocationBar, +@@ -105,6 +105,7 @@ class LocationBarView : public LocationBar, int GetBorderRadius() const; // Initializes the LocationBarView. @@ -10,7 +10,7 @@ index 2da858b874e505c380a2fb09a1b8cf4b1619a61f..63e626d051c1a6207a7eb18e3d4bde27 void Init(); // True if this instance has been initialized by calling Init, which can only -@@ -162,6 +163,7 @@ class LocationBarView : public LocationBar, +@@ -160,6 +161,7 @@ class LocationBarView : public LocationBar, // Updates the controller, and, if |contents| is non-null, restores saved // state that the tab holds. @@ -18,7 +18,7 @@ index 2da858b874e505c380a2fb09a1b8cf4b1619a61f..63e626d051c1a6207a7eb18e3d4bde27 void Update(content::WebContents* contents); // Clears the location bar's state for |contents|. -@@ -232,6 +234,7 @@ class LocationBarView : public LocationBar, +@@ -227,6 +229,7 @@ class LocationBarView : public LocationBar, security_state::SecurityLevel security_level) const override; ui::ImageModel GetLocationIcon(LocationIconView::Delegate::IconFetchedCallback on_icon_fetched) const override; diff --git a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch index e1675f685a4c..f40fc0f7846a 100644 --- a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch +++ b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/new_tab_button.h b/chrome/browser/ui/views/tabs/new_tab_button.h -index ee8566dae908581c8be0eb6680dff1a78ade35fb..fd221468d234d1701f19f4fe6543e9182309b821 100644 +index 0a9554f6e697eaeb12aba9c59e34c349f1dfd283..d2ddc77ad8817bf74a544b4d498eeab79d0dee8d 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.h +++ b/chrome/browser/ui/views/tabs/new_tab_button.h @@ -45,6 +45,7 @@ class NewTabButton : public views::ImageButton, diff --git a/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch index db7fd99116bb..3d6e028ba10f 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_icon.cc b/chrome/browser/ui/views/tabs/tab_icon.cc -index 5d67756c4e6815e19f32307a74510f66d362a91c..66d0f7a11131eda7c7fccf2f9c555c7e19c1d9a4 100644 +index 53b9666b3e47dc1de750ebc792eee9012c4ce222..4735e35cce1c1e9b12507f82d2ecfa062dc636d3 100644 --- a/chrome/browser/ui/views/tabs/tab_icon.cc +++ b/chrome/browser/ui/views/tabs/tab_icon.cc @@ -357,7 +357,7 @@ void TabIcon::SetIcon(const GURL& url, const gfx::ImageSkia& icon) { diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 66da9eb9bb71..216c1b6a9fb3 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index eb6691efc99df4fc2b798bb4783ff8897187c936..e9a442acf86812e94e4acd1e1f44ea3bf694b3a2 100644 +index c9abbd97037be8c09034f3f8cfb154baf0d4af9d..69964767c8fcac4fae83c5fd8e0403985b954943 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -12,6 +12,7 @@ @@ -10,7 +10,7 @@ index eb6691efc99df4fc2b798bb4783ff8897187c936..e9a442acf86812e94e4acd1e1f44ea3b #include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/accessibility_ui.h" -@@ -1031,7 +1032,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1029,7 +1030,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index c7c35d429ac3..2454ea56b14c 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 1a24e4ed09520910fd3d7df15b26373a2f0eb019..b45a8066db3d5f048a1c42d68034e399f71f5eae 100644 +index 15ada6af32df70d8cd5543f873806fc228ddca36..8f9199c4340213903a01721177fb9229ddef22cb 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2386,6 +2386,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2391,6 +2391,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 570432776e59..e72e2cc33370 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 54e1de7f3f861e4796e495141389347d98f8d3ac..f7abbbb19381edb9194391b34f27049c4c009ebe 100644 +index d8c3c135ab3f844c628f4e1bd77227aca0efecfb..f3d09b0558eba749ff096623ad6be02c5b1dbd31 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -373,6 +373,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -374,6 +374,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(const std::string& name) { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 5a0253042916..4c7a2b8b3a92 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 74519a6a808d65fe4e003069713c215ccdf8f861..b8fe445de64ac5770366e86f71684713d3d7eb50 100644 +index 52ae4877ab7bd03044ac42a221a4551cda057132..264fedaaa0fd82f473e75d11bd4a5669e3473d23 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -61,6 +61,7 @@ source_set("channel_info") { @@ -18,7 +18,7 @@ index 74519a6a808d65fe4e003069713c215ccdf8f861..b8fe445de64ac5770366e86f71684713 ":available_offline_content_mojom", ":buildflags", ":channel_info", -@@ -550,6 +552,7 @@ static_library("non_code_constants") { +@@ -549,6 +551,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-installer-linux-debian-update_dist_package_versions.py.patch b/patches/chrome-installer-linux-debian-update_dist_package_versions.py.patch index d76849061505..0f62937a68df 100644 --- a/patches/chrome-installer-linux-debian-update_dist_package_versions.py.patch +++ b/patches/chrome-installer-linux-debian-update_dist_package_versions.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/debian/update_dist_package_versions.py b/chrome/installer/linux/debian/update_dist_package_versions.py -index eda5c180ee40eb5a8f3c7118454f7f65b27234cb..474152347f0b4271571e6a4863ab417b656a0852 100755 +index 6f03f8907ba29384dade8e68ae8d21ccc05f2353..06cfc83f3cd69a7cc1a620f80dbf2e943061c150 100755 --- a/chrome/installer/linux/debian/update_dist_package_versions.py +++ b/chrome/installer/linux/debian/update_dist_package_versions.py @@ -42,6 +42,7 @@ PACKAGE_FILTER = set([ @@ -10,7 +10,7 @@ index eda5c180ee40eb5a8f3c7118454f7f65b27234cb..474152347f0b4271571e6a4863ab417b "libcups2", "libdbus-1-3", "libdrm2", -@@ -73,6 +74,7 @@ PACKAGE_FILTER = set([ +@@ -72,6 +73,7 @@ PACKAGE_FILTER = set([ "libxrender1", "libxss1", "libxtst6", diff --git a/patches/chrome-installer-linux-rpm-update_package_provides.py.patch b/patches/chrome-installer-linux-rpm-update_package_provides.py.patch index 223f0e74746e..54e6d0be60fd 100644 --- a/patches/chrome-installer-linux-rpm-update_package_provides.py.patch +++ b/patches/chrome-installer-linux-rpm-update_package_provides.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/rpm/update_package_provides.py b/chrome/installer/linux/rpm/update_package_provides.py -index ef5c5989f8cbff3dbaa045f12a5a1970a461dde6..165c851193371db6487da53603ce9b6d7eb2039d 100755 +index 0f38d92d83e8baef7fabc5cf0a274970d98bcdc7..572ea3af09d2f6c0db23cefa7eaaa91f6c75ac1c 100755 --- a/chrome/installer/linux/rpm/update_package_provides.py +++ b/chrome/installer/linux/rpm/update_package_provides.py @@ -33,6 +33,7 @@ LIBRARY_FILTER = set([ @@ -21,7 +21,7 @@ index ef5c5989f8cbff3dbaa045f12a5a1970a461dde6..165c851193371db6487da53603ce9b6d "librt.so", "libsmime3.so", "libstdc++.so", -@@ -62,6 +66,7 @@ LIBRARY_FILTER = set([ +@@ -61,6 +65,7 @@ LIBRARY_FILTER = set([ "libxkbcommon.so.0", "libxcb.so", "libxcb-dri3.so.0", diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 28be24c77152..6e651823bcc5 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 11e52c29181412d3853dc16e7106720613395384..74ccc65ae634a4a3bef2e482238131491edd8e09 100644 +index ce49b59249865391e199bf88480b156cb10cd11d..4957f200d6c12381c59123625bc64ae413faefab 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -202,6 +202,7 @@ static_library("renderer") { diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index adbf29c95f50..a4c94f69ca60 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 7983783c4ebfa9632d06024baf75185f5e5bead3..861a241c12ea05b50c6a38554cd0df40c777f27b 100644 +index 315e5dd2439edc534d83d595ccbd1f3d34fb74ba..a8e7c3c1a8bded3236892d61639434a47bdd8c07 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -838,6 +838,7 @@ if (!is_android) { +@@ -840,6 +840,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/chrome-test-base-testing_profile.cc.patch b/patches/chrome-test-base-testing_profile.cc.patch index 9743d6b028cb..cd647a0f2fec 100644 --- a/patches/chrome-test-base-testing_profile.cc.patch +++ b/patches/chrome-test-base-testing_profile.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc -index cd31628f7ff2bb0684ec250358f3e113b7a38403..e19418e465c90f04ccd3b0f0a40800a96d1547db 100644 +index 4574f3d923eff0c6c3ff5282ce52280c402f741b..607d487d803fa250906454ccfb3566a3b4c70d81 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc -@@ -324,6 +324,7 @@ void TestingProfile::Init() { +@@ -329,6 +329,7 @@ void TestingProfile::Init() { EnsureBrowserContextKeyedServiceFactoriesBuilt(); #if BUILDFLAG(ENABLE_SUPERVISED_USERS) diff --git a/patches/chrome-utility-services.cc.patch b/patches/chrome-utility-services.cc.patch index 64eb17e94a14..98277434094d 100644 --- a/patches/chrome-utility-services.cc.patch +++ b/patches/chrome-utility-services.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc -index a1e8b1f17864e009e92d19944a7352e9a72af138..1eb196a840cf1a228ee9508958547c91b721383f 100644 +index 8fd970b5b092212288a1a45e0f739f231b89610c..a61344b90a0c38b65a726b34ab040a9dd9da20af 100644 --- a/chrome/utility/services.cc +++ b/chrome/utility/services.cc -@@ -324,6 +324,7 @@ mojo::ServiceFactory* GetMainThreadServiceFactory() { +@@ -325,6 +325,7 @@ mojo::ServiceFactory* GetMainThreadServiceFactory() { RunAssistantAudioDecoder, #endif #endif diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index f1bce2840f42..7313cebca8ee 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index 4040f963321177b8cfaff5329f107558b77f945e..5d58803836104e01c650e77502c216437f17f9fa 100644 +index 76eb6b5020192a018956880cb486e606795af8ed..4cf557f875bb231514a3e10ffd9f7f8d43b6955e 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -394,7 +394,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -387,7 +387,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment if (queryHasChanged) getInfoForOrigins(); return true; } diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch index 91f5d0a11f94..16ac25882a87 100644 --- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index b56f59f67c2bb1537e061a8931caf05f6db182cc..514b34ddf07306641bc3ffcf2a4ed4fbbaed098e 100644 +index 4570fb4ce1f099aba375338b147e93e307754589..8a451059acf51364b41bfd0d04ff3954a91d784b 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc @@ -493,6 +493,7 @@ bool PageSpecificContentSettings::IsContentBlocked( diff --git a/patches/components-content_settings-core-common-content_settings.cc.patch b/patches/components-content_settings-core-common-content_settings.cc.patch index 82863e86459d..9086ec54ed30 100644 --- a/patches/components-content_settings-core-common-content_settings.cc.patch +++ b/patches/components-content_settings-core-common-content_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc -index fed84cf57ac87df1c82d81c7b9ef9e7f7b0f0c63..93bbe7d94af08a74886f40ed1c403e3d5cc73f6e 100644 +index c6f6ff7ca3714e9f13f6694d446a34b9d8e65ea3..74b4f7b1bbcdf1573e1269cadebc0d5c61fd936c 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -178,6 +178,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -179,6 +179,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::JAVASCRIPT || content_type == ContentSettingsType::CLIENT_HINTS || content_type == ContentSettingsType::POPUPS || diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 677d0b45e7e5..93bfd0a76f68 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 5704e982a63599700caa66e83dc58fddd785b9cb..287e7a5460c8e70fb5debf7ae71c0f8ec3dac2e8 100644 +index 88dc82b07f792de9daf897f8222a3e04636eee14..f6251fb8db36ea1c9663df1b40f7b3be47da6a74 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -253,6 +253,7 @@ static_library("browser") { diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index dacac318f86e..78d747d18b88 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 54de686b9c9b749752bd6e6ba195c65fb73d0ea5..0a53abdf973f7e95814820721837fab0cb62556b 100644 +index 4bb2750730e06fbb91e2b6259fca34cc19cc84cc..1cb4b19814be131257c30951a7f32b800a476444 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc @@ -371,6 +371,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index 1599988dc680..db18cc2cfbc0 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index d0172a94ab89c5b861a122e10f8b5e48866fdc3a..a4110c7525a16ed402b4b218f4d1d7b6a6a78375 100644 +index 73f62f4016ddf7d10258a230c732c21ffe18d92e..cfad55ca0baac6536db0cc75f56838ee9ee5ea38 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -969,6 +969,7 @@ void PageInfo::PresentSitePermissions() { +@@ -974,6 +974,7 @@ void PageInfo::PresentSitePermissions() { } } diff --git a/patches/components-sync-BUILD.gn.patch b/patches/components-sync-BUILD.gn.patch index 75e4133dcb33..3240e88f17ab 100644 --- a/patches/components-sync-BUILD.gn.patch +++ b/patches/components-sync-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn -index d3b3f040afb59cc4ba659a4a754ec7dd9d22e08d..35156a489c8a1ec530086cd2ee38ba359bf2550a 100644 +index 01059c3ee520e42892d94620a898b341c0f08882..897b5ca70e401c94229794966e5c5ea445730635 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn -@@ -305,6 +305,7 @@ static_library("rest_of_sync") { +@@ -288,6 +288,7 @@ static_library("rest_of_sync") { "nigori/pending_local_nigori_commit.cc", "nigori/pending_local_nigori_commit.h", ] diff --git a/patches/components-sync-driver-BUILD.gn.patch b/patches/components-sync-driver-BUILD.gn.patch index 390eed9099ac..7586261c6b5e 100644 --- a/patches/components-sync-driver-BUILD.gn.patch +++ b/patches/components-sync-driver-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn -index 8baa714b0341b6164d1975a8a2cea18b21a778a9..ea6a392244751b12c9ddc160cb33ff543f796ad4 100644 +index 8476be77b63ca638fb1c41c489111a0407c1f614..6e1c329d52d96a3773388b10c31a3af415cf1c29 100644 --- a/components/sync/driver/BUILD.gn +++ b/components/sync/driver/BUILD.gn -@@ -116,6 +116,7 @@ static_library("driver") { +@@ -113,6 +113,7 @@ static_library("driver") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patches/components-vector_icons-vector_icons.gni.patch b/patches/components-vector_icons-vector_icons.gni.patch index 81d8e0057352..e2633ec692e6 100644 --- a/patches/components-vector_icons-vector_icons.gni.patch +++ b/patches/components-vector_icons-vector_icons.gni.patch @@ -1,5 +1,5 @@ diff --git a/components/vector_icons/vector_icons.gni b/components/vector_icons/vector_icons.gni -index d068c55a04ac027af5c3c3c9be8e13df4df5f09a..47609044402cde99c4beceb8a97c234bd11be2f9 100644 +index 0bff996946f6d1bd82fdee1751986a73b9779529..26fd3ae4ca37496a81f53299232b23402b25553e 100644 --- a/components/vector_icons/vector_icons.gni +++ b/components/vector_icons/vector_icons.gni @@ -42,6 +42,8 @@ template("aggregate_vector_icons2") { diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index ea19497ed62c..bb9e6b4260d9 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index d50253cb9c4de436ac4ac4b5316834814aef248d..46516a48db6d97bf21d3da3c059a49234e2c9440 100644 +index 18f5da7bc5953282e72933fffd7e37bbf77bfb31..2fc15cdbf3a213792536cd7f2fcd2d550dbb5573 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3016,16 +3016,17 @@ void NavigationControllerImpl::NavigateWithoutEntry( +@@ -3017,16 +3017,17 @@ void NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 5db6d3349cad..792b746261be 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 6881841560dc0049f12fcaeaef912a83d715b4a6..879fab05adfda60bc8468c84391bd17aca8d1d8c 100644 +index 7253ef9c4e55ff6a0122d20ea3fd25c70141b284..537a34cdab2279eee0cda68871e544bbebbf0faf 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -1812,6 +1812,7 @@ void NavigationRequest::OnRequestRedirected( @@ -10,7 +10,7 @@ index 6881841560dc0049f12fcaeaef912a83d715b4a6..879fab05adfda60bc8468c84391bd17a common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -2784,6 +2785,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -2768,6 +2769,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 4b28a0b750d0..9723fea10c59 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index d4fd985389bb9fae80377c9f686e7868f250eba9..ca72d1789fb6d1bfb1559307f6ec2301a51a74f6 100644 +index a4d7f7df57cb9b407531ff8ad09bcce1c31d0feb..6111e75be9d92eb321ff8641b40692d3aa3d8568 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -44,6 +44,7 @@ source_set("common") { diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index e5289191ed46..14c3f3b67e29 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 8f60ee555af7f3a628dcec8234f02d21080023c4..9311f04b9f999456d5d444eaf7dc18ed3fe569a4 100644 +index 27b7e117b531bb370ea948e56b33d1a07eef11c6..187ebeaa802b23da9e884f33f59294e91e90cc50 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1780,6 +1780,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1781,6 +1781,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 573ec1982693..dc85a27c2cf3 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 0352f12717108a0ed5263f5b2d2a6b9af05756b0..ce202c5af7aa21bd32e4ff7b970c2d935ffe7736 100644 +index 91daa69bf55a0e3bcc0b67699b975efcba91aaa9..7f15139a2c84e362d95245eb88b42f405630f902 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1022,6 +1022,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { +@@ -1029,6 +1029,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 78edec50fada..3bd134f3a04c 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index 017e7416b49fbaf0f17412c9b3f279881589b51d..f131de1734c8e94da1cd1e57cd7d8bac8bb6b0c5 100644 +index c399590e2b02df92594b52ce49fb8c30c385ccff..217727123ad63c2f9ef5eaac7969675c1f8def85 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1183,6 +1183,7 @@ component("net") { +@@ -1185,6 +1185,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index d202ab76a695..e2301b719a38 100644 --- a/patches/sandbox-policy-win-sandbox_win.cc.patch +++ b/patches/sandbox-policy-win-sandbox_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc -index d63d942c7e3e894884403d720e29b06f882a5905..47b71a2c9e3d2c21b3145cf549d21dd3e15c4043 100644 +index 8c1e3aa58b6dbc5c2be9bfa7e8d0bb8fb6125f12..70fa4c2d7b681b091d50696c117ebc96b69af657 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -887,6 +887,7 @@ ResultCode SandboxWin::StartSandboxedProcess( +@@ -935,6 +935,7 @@ ResultCode SandboxWin::StartSandboxedProcess( launcher_process_command_line.HasSwitch(switches::kNoSandbox)) { base::LaunchOptions options; options.handles_to_inherit = handles_to_inherit; diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index 0e1744add007..97b967739464 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 959bde96dc21a2eb08d764709b64502cdd6e2d0e..66286cab4c08d00557f15ea30025b8d46fa6e4fb 100644 +index 6cf406aec26395d294bb6790799d97e2c609b22b..65978853971403df2793e625c83b09a8367557cb 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2228,6 +2228,7 @@ generated_interface_sources_in_modules = [ +@@ -2230,6 +2230,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index 12318f7bcda2..d1a4fb3bb0e1 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index 2b539d5df015256073e72aa8d429735a617d94a7..8cc90e73a455a280a15aaa0a2f34a1238a0823d8 100644 +index e67237dc1f60044ccbc290927078bcf0f215ae9c..d140d679026d5eb6e023884e44d5d3e47bab84af 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni @@ -1027,6 +1027,7 @@ static_idl_files_in_modules = get_path_info( diff --git a/patches/third_party-blink-renderer-core-dom-document.cc.patch b/patches/third_party-blink-renderer-core-dom-document.cc.patch index 76b1034f24c6..e5f0626c65df 100644 --- a/patches/third_party-blink-renderer-core-dom-document.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-document.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index cc64b6a88e3bd6661bc8adbbae16eadf8a879917..ec79e61454af18328017ae23a36fe7b9cd07f956 100644 +index 8b47d934ac695add402447daa88b4984fda9dc90..17ea22cbc21306e782696b7b7a35fe429058991f 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -33,7 +33,7 @@ diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch index 0c7fddae2d46..7bc0a44f65a0 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -index 585d9c7657b474411a79633ae6692a300813cbd5..b0e02f8a2c3eeee964b160a5d0e1ad52aaaac808 100644 +index 82028fb263ed05e87befe5d52aaa76b65455b137..a9c7986c9913914b992032a79a89d3fb728ccd2e 100644 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -190,6 +190,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index f70ebd269ed8..06e455bc297c 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 334657202facd61b15867dbfeef155a19da8a578..5d30d8dc4a026302b72b78a3bfac91f33efcd53f 100644 +index 9503246f89846dc84989ed6fa95c7a442c6c6daf..b15eec8d7194062109f05ff1c2ba4d61726433a9 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc @@ -972,6 +972,7 @@ String HTMLCanvasElement::ToDataURLInternal( diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 1ae8e07dc865..985957767254 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 5046242e2c69d53a5803feec6f9415972bf5fe9b..b8bd7301caf480a57be9058deec0c24f895df24f 100644 +index 694ff382d40c3759e3cfe3a852f5b2829d43aed7..f8d424aea0156a1a12f3b280078fd8fccc283471 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -16,6 +16,7 @@ if (is_android) { diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index 6445479c1376..62dc4baf91fa 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index 76a77084142a7e4e0f97bdfe258053206cabb5d0..b16c1f48ebb31c2957f6e3da8643f7faff21c03f 100644 +index 4c512aea8daf7bbd44013157e67d90d80c962f74..a66717a0e21be9abf054bbf647cf185daa08546b 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc @@ -1577,6 +1577,7 @@ ImageData* BaseRenderingContext2D::createImageData( diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch index 5f41b633be68..9d7b79c6e4f3 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h -index 8cfe814b458b86f713e12a0326c384cd8fd146e5..5dc2d56dc32268741fb83818a38811920af00bf6 100644 +index f7fc03fa5078d2de8061720ab4909bcba456d0db..cd6d12b4512a893d44e29fa743088cb42aec21c9 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h -@@ -320,6 +320,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, +@@ -319,6 +319,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, const UsageCounters& GetUsage(); diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch index 33aa10110bea..ff72d083abef 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -index 2f35115caa53f97c4fd7f00236070905db2c6a9a..043252a61496677f0a041f65b13828857459610e 100644 +index ffbbcba2fb9b3df8eec7023a5c30e0f72dbe673c..f94cd488bc8044957eaf84b561530eaeab3e5d4c 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -824,6 +824,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -827,6 +827,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch index 2278daa8a08b..7d57e47179dc 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -index dc3d6e8a9ac9faf410340b086b9731f95807c353..35318e91d9c472cf33b1b9fa49ff6a4fedeffd49 100644 +index 9a27c3af043f0c1c8d4df93252c8cac34bee7bcc..3d53d435ed98952bed17f9cfefc3c70f607f6d8e 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -@@ -104,9 +104,13 @@ interface CanvasRenderingContext2D { +@@ -106,9 +106,13 @@ interface CanvasRenderingContext2D { [RuntimeEnabled=Canvas2dScrollPathIntoView] void scrollPathIntoView(optional Path2D path); void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); @@ -16,7 +16,7 @@ index dc3d6e8a9ac9faf410340b086b9731f95807c353..35318e91d9c472cf33b1b9fa49ff6a4f boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y); // text (see also the CanvasDrawingStyles interface) -@@ -127,7 +131,7 @@ interface CanvasRenderingContext2D { +@@ -129,7 +133,7 @@ interface CanvasRenderingContext2D { // pixel manipulation [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh); diff --git a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch index 1457e079ba66..11daa628fec4 100644 --- a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -index 5ff46e9890eac5ad02a024976d3245d98783af00..e65561cecb1c80e57aba1a241360aa534d77c82b 100644 +index ae62768191e06361bc62f787235b5f06a1ae16f6..97a869e302f0bfc5a543b8e426a74478d7711d1f 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -@@ -63,10 +63,10 @@ +@@ -65,10 +65,10 @@ void stroke(Path2D path); void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); @@ -17,7 +17,7 @@ index 5ff46e9890eac5ad02a024976d3245d98783af00..e65561cecb1c80e57aba1a241360aa53 // text (see also the CanvasDrawingStyles interface) void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth); -@@ -81,7 +81,7 @@ +@@ -83,7 +83,7 @@ // pixel manipulation [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData(long sw, long sh); diff --git a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch index f842b761c27a..9eb7175d2c3a 100644 --- a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch +++ b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/modules_idl_files.gni b/third_party/blink/renderer/modules/modules_idl_files.gni -index c584bc8ab46cd6d0d1f8808c01e73ecf462202df..21ee7fecda4b513174fba0a0614653c3a42cdeff 100644 +index 2872dcb23d41a69c3c0dc93b7c84c2f94fa84889..c700bf05185ce47527520bf9f3e98fefeecb8092 100644 --- a/third_party/blink/renderer/modules/modules_idl_files.gni +++ b/third_party/blink/renderer/modules/modules_idl_files.gni @@ -142,6 +142,7 @@ _idl_imports = [ diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch index 48143ab1494a..70415bc2787b 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index 2d8068bf9f28ed7c5e33e7dee7003963aca89a0e..f71dd39a2070fdcb111be4a61087a9ff95f4d68a 100644 +index 9d96ae4f9c6f646685acddfdf44cb410f18a9b7a..c9b2f0c2de91fac709eee699e6f14140e298837e 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -@@ -5062,6 +5062,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, +@@ -5081,6 +5081,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -10,7 +10,7 @@ index 2d8068bf9f28ed7c5e33e7dee7003963aca89a0e..f71dd39a2070fdcb111be4a61087a9ff switch (pname) { case GL_SHADING_LANGUAGE_VERSION: { return WebGLAny( -@@ -5603,6 +5604,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( +@@ -5622,6 +5623,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc( kFunctionName, target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -18,7 +18,7 @@ index 2d8068bf9f28ed7c5e33e7dee7003963aca89a0e..f71dd39a2070fdcb111be4a61087a9ff WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target); DCHECK(!framebuffer_binding || framebuffer_binding->Object()); -@@ -5815,6 +5817,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( +@@ -5834,6 +5836,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost() || !ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index bd0b23f8003d..b88e0a6dd92d 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ 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 -index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2859f00cb 100644 +index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87b4437ba5 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -2941,6 +2941,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -2956,6 +2956,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -2972,6 +2973,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -2987,6 +2988,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3002,6 +3004,7 @@ base::Optional>> +@@ -3017,6 +3019,7 @@ base::Optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return base::nullopt; @@ -26,7 +26,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 HeapVector> shader_objects; const GLenum kShaderType[] = {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER, -@@ -3018,6 +3021,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3033,6 +3036,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3051,6 +3055,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3066,6 +3070,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3187,6 +3192,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3202,6 +3207,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3569,6 +3575,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3596,6 +3602,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->IsActive()) { RecordIdentifiableGLParameterDigest( -@@ -3583,6 +3590,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3610,6 +3617,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->IsActive()) { RecordIdentifiableGLParameterDigest( -@@ -3670,6 +3678,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3697,6 +3705,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( ScriptState* script_state, WebGLProgram* program, GLenum pname) { @@ -74,7 +74,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3731,6 +3740,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3758,6 +3767,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3741,6 +3751,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3768,6 +3778,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3786,6 +3797,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3812,6 +3823,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( ScriptState* script_state, WebGLShader* shader, GLenum pname) { @@ -98,7 +98,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3817,6 +3829,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3843,6 +3855,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3847,6 +3860,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3873,6 +3886,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 auto* result = MakeGarbageCollected( range[0], range[1], precision); RecordShaderPrecisionFormatForStudy(shader_type, precision_type, result); -@@ -3856,6 +3870,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3882,6 +3896,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 return EnsureNotNull(shader->Source()); } -@@ -3863,6 +3878,7 @@ base::Optional> +@@ -3889,6 +3904,7 @@ base::Optional> WebGLRenderingContextBase::getSupportedExtensions() { if (isContextLost()) return base::nullopt; @@ -130,7 +130,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 Vector result; -@@ -3885,6 +3901,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3911,6 +3927,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3919,6 +3936,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3945,6 +3962,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -146,7 +146,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4199,6 +4217,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4225,6 +4243,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -154,7 +154,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4223,6 +4242,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4249,6 +4268,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -162,7 +162,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4300,6 +4320,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4326,6 +4346,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -170,7 +170,7 @@ index 1579bc45d3185de9fd4c39ecd7cdcdbf062da46a..f297353c6d759392e6f9952c70defcc2 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4657,6 +4678,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4683,6 +4704,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch index b8ed22509cd5..51afdada97cf 100644 --- a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -index 408df4b147a7eae7af8dff8f6d26351e08c45e53..545af8b7fe6dd69af15f5835d914080aa76368e4 100644 +index 35e8e506bd1a5aecb55061bd8924f18fdbd41b7a..e4181153e331c3b42ec6bd17b25eed5006c342af 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -13683,6 +13683,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -13719,6 +13719,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch index 72b69c3e891d..57786a38cc9b 100644 --- a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch +++ b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/cr_elements/shared_vars_css.html b/ui/webui/resources/cr_elements/shared_vars_css.html -index d7dd909fea1c92b67a91d1d9fe4a143937184aaa..253cc82bebcbce0c67d1a2f517c231325a397092 100644 +index df1e1f42726ee767c05c93696dec06bbf1940699..65eade81566788a831cdb3784504d22001b3df46 100644 --- a/ui/webui/resources/cr_elements/shared_vars_css.html +++ b/ui/webui/resources/cr_elements/shared_vars_css.html @@ -1,6 +1,7 @@ From 3fbfdb6accc34b72939e41f598a8ca0fc446dd56 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Oct 2020 15:02:56 -0400 Subject: [PATCH 102/152] [Android] enable_feed_in_chrome was removed. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/e274ab4bfbb68201b4c2cf36e8b7c0cf29981c17 commit e274ab4bfbb68201b4c2cf36e8b7c0cf29981c17 Author: Dan Harrington Date: Wed Sep 30 19:06:12 2020 +0000 Add enable_feed_v1 compile flag And restructure feed code so that we can use it. This flag pulls Feed v1 out of the build. It's a bit different that enable_feed_v2. enable_feed_v2 retains most of the v2 code in chromium -- only the internal code is actually removed when enable_feed_v2 is off. If both flags are ON (the default), we use the InterestFeedV2 feature to select which version to use. To facilitate this, only feed_feature_list.cc and FeedFeatures.java should inspect the state of this feature directly. If both build flags are OFF, we use the V2 UI classes as essentially a pass-through to a recycler view, but will not request any Feed content. The compile flag enable_feed_in_chrome was removed. Other changes: * I've moved some files around to make it more clear what code is for v1 only. * I've added FeedV1 and FeedV2 java classes to wrap access to version specific things, so that FeedV1 can be removed using the compile flag. Bug: 1129187 --- android/brave_java_sources.gni | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 3adee83c8509..1ce65f92e0ef 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -12,6 +12,7 @@ import("//brave/components/safetynet/java_sources.gni") import("//components/feed/features.gni") brave_java_sources = [ + "../../brave/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/BraveAppHooks.java", "../../brave/android/java/org/chromium/chrome/browser/BraveBadge.java", "../../brave/android/java/org/chromium/chrome/browser/BraveFeatureList.java", @@ -209,10 +210,6 @@ if (brave_ads_enabled) { brave_java_sources += brave_ads_java_sources } -if (enable_feed_in_chrome) { - brave_java_sources += [ "//brave/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java" ] -} - if (enable_brave_sync) { brave_java_sources += [ "../../brave/android/java/org/chromium/chrome/browser/BraveSyncInformers.java", From 96024eaa1184269dec5f52e1d504467626cdcf2f Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Oct 2020 17:40:11 -0400 Subject: [PATCH 103/152] Updated strings for Chromium 87.0.4280.11. --- app/brave_strings.grd | 10 ++++ app/generated_resources.grd | 28 ++++++++- app/os_settings_strings.grdp | 3 + app/printing_strings.grdp | 8 +-- app/settings_brave_strings.grdp | 6 ++ .../strings/android_chrome_strings.grd | 57 ++++++++++++------- .../android_chrome_strings_override.grd | 13 ++--- components/pdf_strings.grdp | 9 +++ components/permissions_strings.grdp | 2 +- components/policy_strings.grdp | 6 +- 10 files changed, 107 insertions(+), 35 deletions(-) diff --git a/app/brave_strings.grd b/app/brave_strings.grd index c984ce60f295..b7b70b539694 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -311,6 +311,16 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> Brave is unresponsive. Relaunch now? + + + To send a number from here to your Android phone, sign in to Brave on both devices. + + + To send a number from $1www.google.com to your Android phone, sign in to Brave on both devices. + + + Make sure you are signed in to Brave on your $1Pixel XL and then try sending again. + diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 6f2bb168ea92..b4f8a6ad2583 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -397,6 +397,9 @@ are declared in tools/grit/grit_rule.gni. local or shared file + + temporary data + Crashed. @@ -5432,6 +5435,15 @@ Keep your key file in a safe place. You will need it to create new versions of y Dark purple + + Why am I seeing this? + + + Remove + + + Removed $1Office and Desk Chairs + Super Duper Module @@ -5441,7 +5453,18 @@ Keep your key file in a safe place. You will need it to create new versions of y Top picks for you - + + Why am I seeing this? + + + You’re seeing this item based on your previous activity using Brave services. You can see your data, delete it, and change your settings at <a href="$1" target="_blank" rel="noopener noreferrer">myactivity.google.com</a>. + + + Learn about the data Brave collects and why at <a href="$1" target="_blank" rel="noopener noreferrer">policies.google.com</a>. + + + Close + Web browsing should be fast. Take a moment to <a href="chrome://extensions">check your extensions</a> now. @@ -10684,6 +10707,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Set Window Name + + Window name + diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index df2fecf521c4..5070c9d7d44a 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -3022,6 +3022,9 @@ Change language and input settings + + Change input settings + Launcher diff --git a/app/printing_strings.grdp b/app/printing_strings.grdp index cf56e2681505..1852e6efb48b 100644 --- a/app/printing_strings.grdp +++ b/app/printing_strings.grdp @@ -156,16 +156,16 @@ Margins - + Default - + None - + Custom - + Minimum diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp index 3b2d790ddb39..7ccb49f643b7 100644 --- a/app/settings_brave_strings.grdp +++ b/app/settings_brave_strings.grdp @@ -68,6 +68,12 @@ Brave will notify you when you sign in with a compromised password + + To check if your passwords are safe from data breaches and other security issues, <a target='_blank' href='$1'>sign in to Brave</a>. + + + To check if your other passwords are safe from data breaches and other security issues, <br/><a target='_blank' href='$1'>sign in to Brave</a>. + If so, please edit your saved password in Brave so it matches your new password. diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 6c3d7c8b6f06..be0a3fe1f841 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -274,6 +274,9 @@ CHAR-LIMIT guidelines: You are currently customizing your Sync and Brave service settings. To finish turning on sync, tap the Confirm button near the bottom of the screen. Navigate up + + Not signed in + Sync and personalize across devices @@ -317,6 +320,12 @@ CHAR-LIMIT guidelines: Brave services + + Allow Brave sign-in + + + Show Brave sign-in prompts when you sign in to your Brave sync chain + Autocomplete searches and URLs @@ -1098,7 +1107,7 @@ Your Brave account may have other forms of browsing history like searches and ac %1$sBrave’s language - + Default device language @@ -1113,7 +1122,7 @@ Your Brave account may have other forms of browsing history like searches and ac Suggested languages - + Other languages @@ -1128,7 +1137,7 @@ Your Brave account may have other forms of browsing history like searches and ac Offer to translate pages in other languages - + Offer to send pages in other languages to Brave Translate @@ -1146,7 +1155,7 @@ Your Brave account may have other forms of browsing history like searches and ac Downloading %1$sHindi… - + Language ready, restart %1$sBrave @@ -1473,7 +1482,7 @@ Your Brave account may have other forms of browsing history like searches and ac Initial sync setup was not finished. Sync is off. - Tap to continue sync setup + Tap to set up sync Sync is disabled by your administrator @@ -2464,8 +2473,8 @@ To change this setting, <resetlink>reset sync

Add account to device - - Go Private + + Open a Private tab Waiting for Google Play Services to finish updating @@ -2473,14 +2482,13 @@ To change this setting, <resetlink>reset sync

- Go Private + Use Private to sign in - - To clear your sign-in information and other data from Brave, close all Private tabs. + +In Private, your activity <b1>might still be visible </b1>to websites that you visit, your employer or school, and your internet service provider. -In Private, your activity might still be visible to websites that you visit, your employer or school, and your internet service provider. +Data from your Private session will only be cleared from Brave when you <b2>close all Private tabs</b2>. - Turn on sync? @@ -2504,7 +2512,7 @@ In Private, your activity might still be visible to websites that you visit, you Choose an account - Sign in to this site, your Brave sync chain, and Brave. You may turn on sync later. + Sign in to this site and Brave with your Brave sync chain. You can turn on sync later. Signing in... @@ -3063,7 +3071,7 @@ In Private, your activity might still be visible to websites that you visit, you Lite - + Preview @@ -3181,7 +3189,7 @@ In Private, your activity might still be visible to websites that you visit, you Switch To Tab - Showing suggestion for %1$sCrater Lake National Park (U.S. National Park Service) + Showing suggestions for %1$sCrater Lake National Park (U.S. National Park Service) %1$sCrater Lake National Park (U.S. National Park Service): %1$shttps://www.nps.gov/crla @@ -3954,6 +3962,10 @@ In Private, your activity might still be visible to websites that you visit, you More + + Copy + + Copy link @@ -3974,6 +3986,10 @@ In Private, your activity might still be visible to websites that you visit, you Link to text + + Copied + + Text Copied @@ -4083,11 +4099,14 @@ In Private, your activity might still be visible to websites that you visit, you - - This is a preview + + Previewing this page + + + Reload - - View live page + + Viewing live page diff --git a/browser/ui/android/strings/android_chrome_strings_override.grd b/browser/ui/android/strings/android_chrome_strings_override.grd index ebc1e300a154..46c12379c8e6 100644 --- a/browser/ui/android/strings/android_chrome_strings_override.grd +++ b/browser/ui/android/strings/android_chrome_strings_override.grd @@ -144,18 +144,17 @@ CHAR-LIMIT guidelines: Close all private tabs - - Go Private + + Open a Private tab - Go Private + Use Private to sign in - - To clear your sign-in information and other data from Brave, close all Private tabs. + +In Private, your activity <b1>might still be visible </b1>to websites that you visit, your employer or school, and your internet service provider. -In Private, your activity might still be visible to websites that you visit, your employer or school, and your internet service provider. +Data from your Private session will only be cleared from Brave when you <b2>close all Private tabs</b2>. - New private tab diff --git a/components/pdf_strings.grdp b/components/pdf_strings.grdp index 17df312116e8..db4809f6e9cb 100644 --- a/components/pdf_strings.grdp +++ b/components/pdf_strings.grdp @@ -37,6 +37,9 @@ Bookmarks + + Section + Rotate clockwise @@ -62,6 +65,9 @@ Annotations + + Zoom level + Zoom in @@ -87,6 +93,9 @@ =1 {PDF document containing {COUNT} page} other {PDF document containing {COUNT} pages}} + + Thumbnail for page 1$1 + Discard changes? diff --git a/components/permissions_strings.grdp b/components/permissions_strings.grdp index 8dc24f710542..6f0836d44b95 100644 --- a/components/permissions_strings.grdp +++ b/components/permissions_strings.grdp @@ -124,7 +124,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con Open and place windows on your screens - Use the fonts installed on your computer so you can create advanced typography + Use the fonts on your computer so you can create high-fidelity content Know when you're present diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index 7d8d0f1b014e..4e225347f5c0 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -572,13 +572,13 @@ Additional details: - Pasting to this location is blocked by your administrator + Pasting from $1corp.google.com to this location is blocked by your administrator - Your administrator has blocked sharing this content to $1Linux + Your administrator has blocked sharing from $1corp.google.com to $2Linux - Your administrator has blocked sharing this content to $1Linux and $2Parallels + Your administrator has blocked sharing from $1corp.google.com to $2Linux and $3Parallels Android apps From bd5878b57ecb11a90f75bf8f580a0ea4f95b1a87 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Oct 2020 17:55:05 -0400 Subject: [PATCH 104/152] kZygoteProcess switch moved. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/4e805fd3546176a9bf98ba8e5975b6ba1bade7af commit 4e805fd3546176a9bf98ba8e5975b6ba1bade7af Author: Ken Rockot Date: Thu Oct 1 03:07:39 2020 +0000 Reland "Delete service_manager/embedder/switches.h" This is a reland of 18096716fa45e1128f1109665208eefa24d93751 No interesting changes, just updated to resolve a compile-breaking collision with another CL that landed earlier today. (see PS3) Original change's description: > Delete service_manager/embedder/switches.h > > Each switch is either deleted because it's no longer used, or migrated > to a more appropriate layer (generally Content). > > Bug: 977637 --- common/resource_bundle_helper.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/resource_bundle_helper.cc b/common/resource_bundle_helper.cc index 6d14c7143f44..6de1eb4f5180 100644 --- a/common/resource_bundle_helper.cc +++ b/common/resource_bundle_helper.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" -#include "services/service_manager/embedder/switches.h" #include "ui/base/resource/resource_bundle.h" #if !defined(OS_IOS) @@ -96,7 +95,7 @@ bool SubprocessNeedsResourceBundle() { return #if defined(OS_POSIX) && !defined(OS_MAC) // The zygote process opens the resources for the renderers. - process_type == service_manager::switches::kZygoteProcess || + process_type == switches::kZygoteProcess || #endif // defined(OS_POSIX) && !defined(OS_MAC) #if defined(OS_MAC) // Mac needs them too for scrollbar related images and for sandbox From 28fd63d2400484352dd1a9018d743f55b936ed8f Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Oct 2020 17:58:54 -0400 Subject: [PATCH 105/152] IdentifiableSurface::FromTypeAndInput -> FromTypeAndToken. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/5ae3f7f8d1b43a58e941caba6c732d3173ffad24 commit 5ae3f7f8d1b43a58e941caba6c732d3173ffad24 Author: Asanka Herath Date: Wed Sep 30 19:08:30 2020 +0000 [privacy-budget] Remove IdentifiableSurface::FromTypeAndInput Callsites should only use FromTypeAndToken. Bug: 973801 --- .../modules/canvas/canvas2d/canvas_rendering_context_2d.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc index 9693689fe01a..307b97f63b71 100644 --- a/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc @@ -26,7 +26,7 @@ ImageData* CanvasRenderingContext2D::getImageData( int sh, ExceptionState& exception_state) { blink::IdentifiabilityMetricBuilder(ukm_source_id_) - .Set(blink::IdentifiableSurface::FromTypeAndInput( + .Set(blink::IdentifiableSurface::FromTypeAndToken( blink::IdentifiableSurface::Type::kCanvasReadback, GetContextType()), 0) From 7e4ba81a4ef873b53561ee642c8ac2f55e6d6ae9 Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 9 Oct 2020 11:56:14 -0400 Subject: [PATCH 106/152] [Android] ThemeColorProvider moved to toolbar/ Chromium change: https://chromium.googlesource.com/chromium/src/+/73ff9e7a8f7b2a59009fefa3f64dd943199a55a5 Toolbar: Move ThemeColorProvider to toolbar/ ThemeColorProvider deals with colors on toolbar for a suitable theme. It is mainly used within toolbar/, only by a few outside the package(namely task.tab_management). This CL moves the class to toolbar/ which it can be justified to be a part of. Bug: 1127732 --- .../chrome/browser/toolbar/BraveToolbarManager.java | 1 - .../chrome/browser/toolbar/bottom/BookmarksButton.java | 6 +++--- .../browser/toolbar/bottom/BottomToolbarCoordinator.java | 2 +- .../browser/toolbar/bottom/BottomToolbarNewTabButton.java | 6 +++--- .../toolbar/bottom/BraveBottomControlsCoordinator.java | 2 +- .../bottom/BrowsingModeBottomToolbarCoordinator.java | 2 +- .../toolbar/bottom/BrowsingModeBottomToolbarMediator.java | 4 ++-- .../chrome/browser/toolbar/bottom/SearchAccelerator.java | 6 +++--- .../chromium/chrome/browser/toolbar/bottom/ShareButton.java | 4 ++-- .../toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java | 2 +- .../toolbar/bottom/TabSwitcherBottomToolbarMediator.java | 4 ++-- .../browser/toolbar/top/BraveTopToolbarCoordinator.java | 2 +- 12 files changed, 20 insertions(+), 21 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index ced24f06b64c..99b20a83d844 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -21,7 +21,6 @@ import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java index f8ae4db05419..0df0c1b459b4 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java @@ -15,11 +15,11 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; -import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.TintObserver; import org.chromium.ui.widget.ChromeImageButton; /** diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java index 05b606d3db14..93bb93c6353a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -24,7 +24,6 @@ import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; @@ -39,6 +38,7 @@ import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.chrome.browser.toolbar.HomeButton; import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.bottom.BookmarksButton; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarNewTabButton; import org.chromium.chrome.browser.toolbar.bottom.SearchAccelerator; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java index 5f69dee7e789..85551992b39d 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java @@ -16,11 +16,11 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; -import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; -import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider.IncognitoStateObserver; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.TintObserver; import org.chromium.chrome.browser.toolbar.ToolbarColors; import org.chromium.ui.widget.ChromeImageButton; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java index 12a862bbb8f4..fe97838aa3a5 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java @@ -20,7 +20,6 @@ import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.compositor.layouts.LayoutManager; @@ -29,6 +28,7 @@ import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; import org.chromium.ui.base.WindowAndroid; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index 532fe7438b21..f96dfd26160e 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -16,7 +16,6 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider.HintlessActivityTabObserver; -import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; @@ -30,6 +29,7 @@ import org.chromium.chrome.browser.toolbar.TabCountProvider; import org.chromium.chrome.browser.toolbar.TabSwitcherButtonCoordinator; import org.chromium.chrome.browser.toolbar.TabSwitcherButtonView; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.components.feature_engagement.FeatureConstants; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java index f5da6fe240f6..a605891ad0ee 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java @@ -16,10 +16,10 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; import org.chromium.chrome.browser.AppHooks; -import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver; import org.chromium.components.browser_ui.widget.FeatureHighlightProvider; import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.components.feature_engagement.Tracker; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java index 2400e1c711bc..c30e53e7d079 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java @@ -15,11 +15,11 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; -import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; -import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider.IncognitoStateObserver; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.TintObserver; import org.chromium.chrome.browser.toolbar.ToolbarColors; import org.chromium.ui.widget.ChromeImageButton; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java index 8367f6549c2d..be2a2ce70f5a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java @@ -12,12 +12,12 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider.ActivityTabTabObserver; -import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.ThemeColorProvider.TintObserver; import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.share.ShareUtils; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.TintObserver; import org.chromium.ui.widget.ChromeImageButton; /** diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java index 948a8e7cbf62..65eab0a6fb4a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java @@ -13,9 +13,9 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; -import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java index 9575ae284ee2..580934843f10 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java @@ -5,9 +5,9 @@ package org.chromium.chrome.browser.toolbar.bottom; -import org.chromium.chrome.browser.ThemeColorProvider; -import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver; import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver; /** * This class is responsible for reacting to events from the outside world, interacting with other diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index ca02e9bcf02d..d4261dd095b5 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -12,12 +12,12 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; -import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.identity_disc.IdentityDiscController; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.toolbar.ButtonData; import org.chromium.chrome.browser.toolbar.ButtonDataProvider; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarTabController; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; From 1c35164aa1c4fc07947fb29cfe405b2c55e8bd22 Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 9 Oct 2020 13:06:32 -0400 Subject: [PATCH 107/152] [Android] New constant in chrome_constants Chromium change: https://chromium.googlesource.com/chromium/src/+/8c5f8763dda6616e36d8e4fe728c4778a0fd329f Video Tutorials : Hooked up dependencies for the service This CL adds : 1 - Sending Country code, and accept language to the server. 2 - Provides dependencies for video tutorial service creation. TBR=dtrainor@chromium.org Bug: 1133657 --- chromium_src/chrome/common/chrome_constants.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chromium_src/chrome/common/chrome_constants.cc b/chromium_src/chrome/common/chrome_constants.cc index 47d9effb12de..79154c3df760 100644 --- a/chromium_src/chrome/common/chrome_constants.cc +++ b/chromium_src/chrome/common/chrome_constants.cc @@ -163,6 +163,8 @@ const base::FilePath::CharType kPreferencesFilename[] = FPL("Preferences"); const base::FilePath::CharType kPreviewsOptOutDBFilename[] = FPL("previews_opt_out.db"); const base::FilePath::CharType kQueryTileStorageDirname[] = FPL("Query Tiles"); +const base::FilePath::CharType kVideoTutorialsStorageDirname[] = + FPL("Video Tutorials"); const base::FilePath::CharType kReadmeFilename[] = FPL("README"); const base::FilePath::CharType kSecurePreferencesFilename[] = FPL("Secure Preferences"); From 80ba0ab0774df143a8938774610c336b717380cb Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 9 Oct 2020 13:07:53 -0400 Subject: [PATCH 108/152] [Android] Changes in FeedSurfaceCoordinator Chromium change: https://chromium.googlesource.com/chromium/src/+/e274ab4bfbb68201b4c2cf36e8b7c0cf29981c17 Add enable_feed_v1 compile flag And restructure feed code so that we can use it. This flag pulls Feed v1 out of the build. It's a bit different that enable_feed_v2. enable_feed_v2 retains most of the v2 code in chromium -- only the internal code is actually removed when enable_feed_v2 is off. If both flags are ON (the default), we use the InterestFeedV2 feature to select which version to use. To facilitate this, only feed_feature_list.cc and FeedFeatures.java should inspect the state of this feature directly. If both build flags are OFF, we use the V2 UI classes as essentially a pass-through to a recycler view, but will not request any Feed content. The compile flag enable_feed_in_chrome was removed. Other changes: * I've moved some files around to make it more clear what code is for v1 only. * I've added FeedV1 and FeedV2 java classes to wrap access to version specific things, so that FeedV1 can be removed using the compile flag. Bug: 1129187 --- .../chrome/browser/feed/BraveFeedSurfaceCoordinator.java | 7 +++---- .../org/chromium/chrome/browser/ntp/BraveNewTabPage.java | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java index 56276e20f00d..3acc5b487531 100644 --- a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java +++ b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java @@ -15,7 +15,6 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; -import org.chromium.chrome.browser.feed.action.FeedActionHandler; import org.chromium.chrome.browser.feed.library.api.host.action.ActionApi; import org.chromium.chrome.browser.feed.shared.FeedSurfaceDelegate; import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate; @@ -37,13 +36,13 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator { public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarManager, TabModelSelector tabModelSelector, Supplier tabProvider, @Nullable SnapScrollHelper snapScrollHelper, @Nullable View ntpHeader, - @Nullable SectionHeaderView sectionHeaderView, FeedActionHandler.Options actionOptions, + @Nullable SectionHeaderView sectionHeaderView, FeedV1ActionOptions actionOptions, boolean showDarkBackground, FeedSurfaceDelegate delegate, @Nullable NativePageNavigationDelegate pageNavigationDelegate, Profile profile, - boolean isPlaceholderShown, BottomSheetController bottomSheetController) { + boolean isPlaceholderRequested, BottomSheetController bottomSheetController) { super(activity, snackbarManager, tabModelSelector, tabProvider, snapScrollHelper, ntpHeader, sectionHeaderView, actionOptions, showDarkBackground, delegate, - pageNavigationDelegate, profile, isPlaceholderShown, bottomSheetController); + pageNavigationDelegate, profile, isPlaceholderRequested, bottomSheetController); } @Override diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index a2b96e9b54a2..bd866411ae05 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -13,7 +13,7 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator; -import org.chromium.chrome.browser.feed.FeedProcessScopeFactory; +import org.chromium.chrome.browser.feed.shared.FeedFeatures; import org.chromium.chrome.browser.feed.shared.FeedSurfaceProvider; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.profiles.Profile; @@ -52,7 +52,7 @@ protected void initializeMainView(Activity activity, Supplier tabProvider, // Override surface provider Profile profile = Profile.fromWebContents(mTab.getWebContents()); - assert !FeedProcessScopeFactory.isFeedProcessEnabled(); + assert !FeedFeatures.isFeedEnabled(); mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager, tabModelSelector, tabProvider, new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageLayout, From 072bcd84a065246d7563cfcefdca9e46131ecc28 Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 9 Oct 2020 13:19:32 -0400 Subject: [PATCH 109/152] [Android] Fix for unit tests II Chromium change: https://chromium.googlesource.com/chromium/src/+/a65f80f87cc151be897131164e015d37bea1d155 [ToolbarMVC] Remove direct MenuButton interactions from Tabswitcher This only requires giving TabSwitcherModeTTCoordinatorPhone a MenuButtonCoordinator and setting the MenuButton view once inflation happens. The logic removed (tinting, setting the onClick/accessibilityDelegate) is now handled internally by MenuButtonCoordinator/MenuButton. Bug: 1086676 --- .../bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java index beb6210f97e6..3a4673abb350 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java @@ -25,9 +25,6 @@ public BraveTabSwitcherModeTTPhoneClassAdapter(ClassVisitor visitor) { deleteField(sBraveTabSwitcherModeTTPhoneClassName, "mToggleTabStackButton"); makeProtectedField(sTabSwitcherModeTTPhoneClassName, "mToggleTabStackButton"); - deleteField(sBraveTabSwitcherModeTTPhoneClassName, "mMenuButton"); - makeProtectedField(sTabSwitcherModeTTPhoneClassName, "mMenuButton"); - deleteField(sBraveTabSwitcherModeTTPhoneClassName, "mShouldShowNewTabVariation"); makeProtectedField(sTabSwitcherModeTTPhoneClassName, "mShouldShowNewTabVariation"); From d6e820f179d3f5f72837d6be69bab8b87467e550 Mon Sep 17 00:00:00 2001 From: Simon Hong Date: Mon, 12 Oct 2020 11:06:56 +0900 Subject: [PATCH 110/152] kMac10_9_ObsoleteURL is replaced with kMac10_10_ObsoleteURL Chromium change: https://chromium-review.googlesource.com/c/chromium/src/+/2422479 mac: add 10.10 deprecation infobar The strings in this change are from UX. Bug: 1126056 --- chromium_src/chrome/common/url_constants.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index a2033e9b5c73..074e478c93cd 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -250,7 +250,7 @@ const char kEnhancedPlaybackNotificationLearnMoreURL[] = const char kChromeEnterpriseSignInLearnMoreURL[] = "https://support.brave.com/"; -const char kMac10_9_ObsoleteURL[] = +const char kMac10_10_ObsoleteURL[] = "https://support.brave.com/hc/en-us/articles/" "360025390311-How-do-I-download-and-install-Brave-"; #endif From b3036e24a0d1e37ac7691a4b18e18f2ec5ed4b03 Mon Sep 17 00:00:00 2001 From: Simon Hong Date: Mon, 12 Oct 2020 11:01:32 +0900 Subject: [PATCH 111/152] Fix safari history import Makes all supported import service available always. --- .../common/importer/safari_importer_utils.mm | 13 ++++++++++--- .../chrome/utility/importer/safari_importer.h | 5 ++--- .../chrome/utility/importer/safari_importer.mm | 18 ++++++++++++++++++ ...e-utility-importer-safari_importer.mm.patch | 12 ++++++++++++ utility/importer/brave_safari_importer.mm | 1 - 5 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 chromium_src/chrome/utility/importer/safari_importer.mm create mode 100644 patches/chrome-utility-importer-safari_importer.mm.patch diff --git a/chromium_src/chrome/common/importer/safari_importer_utils.mm b/chromium_src/chrome/common/importer/safari_importer_utils.mm index cb7abf98e67e..d2430b77d888 100644 --- a/chromium_src/chrome/common/importer/safari_importer_utils.mm +++ b/chromium_src/chrome/common/importer/safari_importer_utils.mm @@ -3,17 +3,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#define SafariImporterCanImport SafariImporterCanImport_ChromiumImpl +#define SafariImporterCanImport SafariImporterCanImport_Chromium_Unused #include "../../../../../chrome/common/importer/safari_importer_utils.mm" #undef SafariImporterCanImport +// Upstream only shows supported list when browser can access to bookmarks. +// But, we let users know about disk access permission is needed when user +// select any services and we don't have proper access permission about it. +// So, we displays all supported services always. bool SafariImporterCanImport(const base::FilePath& library_dir, uint16_t* services_supported) { - SafariImporterCanImport_ChromiumImpl(library_dir, services_supported); + base::FilePath safari_dir = library_dir.Append("Safari"); - if (base::PathExists(library_dir.Append("Safari").Append("History.db"))) + if (base::PathExists(safari_dir.Append("Bookmarks.plist"))) + *services_supported |= importer::FAVORITES; + + if (base::PathExists(safari_dir.Append("History.db"))) *services_supported |= importer::HISTORY; return *services_supported != importer::NONE; diff --git a/chromium_src/chrome/utility/importer/safari_importer.h b/chromium_src/chrome/utility/importer/safari_importer.h index b7f3d11d75ff..6bbe04f9c142 100644 --- a/chromium_src/chrome/utility/importer/safari_importer.h +++ b/chromium_src/chrome/utility/importer/safari_importer.h @@ -7,9 +7,8 @@ #define BRAVE_CHROMIUM_SRC_CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ #define BRAVE_SAFARI_IMPORTER_H \ - friend class BraveSafariImporter; - -#define ImportHistory virtual ImportHistory + friend class BraveSafariImporter; \ + virtual void ImportHistory() {} #include "../../../../../chrome/utility/importer/safari_importer.h" diff --git a/chromium_src/chrome/utility/importer/safari_importer.mm b/chromium_src/chrome/utility/importer/safari_importer.mm new file mode 100644 index 000000000000..46f1c9d3b484 --- /dev/null +++ b/chromium_src/chrome/utility/importer/safari_importer.mm @@ -0,0 +1,18 @@ +/* Copyright 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// Can't avoid this injection because this code should be surrounded by +// ImporterBridge::NotifyStarted() and NotifyEnded() with other import logic. +#define BRAVE_START_IMPORT \ + if ((items & importer::HISTORY) && !cancelled()) { \ + bridge_->NotifyItemStarted(importer::HISTORY); \ + ImportHistory(); \ + bridge_->NotifyItemEnded(importer::HISTORY); \ + } + +#include "../../../../../chrome/utility/importer/safari_importer.mm" + +#undef BRAVE_START_IMPORT + diff --git a/patches/chrome-utility-importer-safari_importer.mm.patch b/patches/chrome-utility-importer-safari_importer.mm.patch new file mode 100644 index 000000000000..9f317691dc8e --- /dev/null +++ b/patches/chrome-utility-importer-safari_importer.mm.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/utility/importer/safari_importer.mm b/chrome/utility/importer/safari_importer.mm +index a83d19200f9b73f3adb22db0005891ab80d3dc80..7943f958997afe14390df7ceb77e95ade3385b5d 100644 +--- a/chrome/utility/importer/safari_importer.mm ++++ b/chrome/utility/importer/safari_importer.mm +@@ -47,6 +47,7 @@ void SafariImporter::StartImport(const importer::SourceProfile& source_profile, + ImportBookmarks(); + bridge_->NotifyItemEnded(importer::FAVORITES); + } ++ BRAVE_START_IMPORT + + bridge_->NotifyEnded(); + } diff --git a/utility/importer/brave_safari_importer.mm b/utility/importer/brave_safari_importer.mm index a4ac51a6fe34..2429661be14b 100644 --- a/utility/importer/brave_safari_importer.mm +++ b/utility/importer/brave_safari_importer.mm @@ -33,7 +33,6 @@ NSString* history_db = [safari_dir stringByAppendingPathComponent:@"History.db"]; - // Import favicons. sql::Database db; const char* db_path = [history_db fileSystemRepresentation]; if (!db.Open(base::FilePath(db_path))) From 6dc52a9ee2f6f00e1b104d3da70d3eddf1233b32 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 13 Oct 2020 13:31:28 -0400 Subject: [PATCH 112/152] Updated patches after rebase on master. --- patches/chrome-BUILD.gn.patch | 4 ++-- patches/chrome-VERSION.patch | 2 +- patches/chrome-browser-ui-browser.cc.patch | 4 ++-- patches/chrome-browser-ui-tabs-tab_strip_model.h.patch | 4 ++-- patches/content-renderer-render_frame_impl.cc.patch | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 0c51389502dd..b15032a6d88f 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index bfaf61fe2622812724617267bfe099bb9608dfff..b02d6c823a019e1b410e902915567f6c08f4d6e4 100644 +index bfaf61fe2622812724617267bfe099bb9608dfff..138f2fe59a57661ed99cda8e791fe68f6f5bdf29 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -154,6 +154,10 @@ if (!is_android && !is_mac) { @@ -52,7 +52,7 @@ index bfaf61fe2622812724617267bfe099bb9608dfff..b02d6c823a019e1b410e902915567f6c } } -@@ -607,6 +614,7 @@ if (is_win) { +@@ -607,9 +614,11 @@ if (is_win) { "--scm=0", ] } diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 54d4877a60c2..4315e86313a1 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,5 +1,5 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 82d566f627782396b6932d4eebc074d4078edf2c..d70c78e41d865865c07ef267e7a9e394da10d3cb 100644 +index 82d566f627782396b6932d4eebc074d4078edf2c..7f24bb0333a250354d0ed93b4ffcf42c9355a137 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index db7d895e1a81..3d4c53253cd6 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 71ec3bbbf1b63c188e4d4c02691a7c9969d9b3df..228fd24a5316f783688c343bda5715ea89c8cd3d 100644 +index 24954ee7e0e83d40b88884046731b09cbf4cccd0..f59088d81a3ffc103cc2bf1114006c552f56dd15 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -435,7 +435,7 @@ Browser::Browser(const CreateParams& params) +@@ -438,7 +438,7 @@ Browser::Browser(const CreateParams& params) tab_strip_model_delegate_( std::make_unique(this)), tab_strip_model_( diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index da4970317bfd..4bd526f47a8f 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index a8b4ddfe3849798f33121ce03895066b9e55f299..d1afe3f31b3223706c6a0fafd05248380f7344fc 100644 +index b7777d5c76a899ac4f126f4f3efe94811a5e8e64..d0e72c41eb3edd84e9c881b7a15c7a3a835cf521 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -569,6 +569,7 @@ class TabStripModel : public TabGroupController { +@@ -577,6 +577,7 @@ class TabStripModel : public TabGroupController { // current tree of openers). bool ShouldResetOpenerOnActiveTabChange(content::WebContents* contents) const; diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 1fa10bfcc519..e609d1568de0 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index c110db6a32bba72c7a89137fa39377c58f0061d8..bd82ce78d6be98b8369e8dbeb5c364fbd24c4578 100644 +index 3b2626c3ef9dab2aedddd09d24901e892605cf01..723bceaf86c735c08a3bbd2e5822b4aed4894133 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5030,7 +5030,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -5089,7 +5089,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (render_view_->GetWebView()->MainFrame()->IsWebRemoteFrame()) From 816a34c3942bac0a91ccf1a32637ec4815e30253 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 13 Oct 2020 16:53:07 -0400 Subject: [PATCH 113/152] DnsOverHttps is now enabled by default on Win, Mac, and Android. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/16e25a3ab375471e888c7c1e8b6a2ce3b4868bfe commit 16e25a3ab375471e888c7c1e8b6a2ce3b4868bfe Author: Eric Orth Date: Thu Sep 24 22:20:12 2020 +0000 Enable DoH by default in code The "DnsOverHttps" feature along with the "ShowUi" param is approved for launch and will soon be launched to 100% for win/mac/cros/android, so enable the feature/param by default for those platforms. There shouldn't be anything left with the feature enabled but the ShowUi param disabled, but I'm still switching the param on platform because I don't understand the UI code enough to be sure nothing in there will only check the param without the feature and not accidentally enable the UI. I'll figure that out and handle it later in a more thorough cleanup to fully delete the ShowUi param. Also note that it is traditional to delete the fieldtrial testing config entries when changing experiments to be enabled by default, but I'm leaving it in place here because it is covering testing of the "DisabledProviders" param that is not yet launching to a final state. Bug: 878582,1098039 --- app/brave_main_delegate.cc | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index b4b637670e03..860ee689bb3d 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -217,17 +217,12 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { #endif }; - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableDnsOverHttps)) { - enabled_features.insert(features::kDnsOverHttps.name); - } - if (chrome::GetChannel() == version_info::Channel::CANARY) { enabled_features.insert(features::kGlobalPrivacyControl.name); } // Disabled features. - const std::unordered_set disabled_features = { + std::unordered_set disabled_features = { autofill::features::kAutofillEnableAccountWalletStorage.name, autofill::features::kAutofillServerCommunication.name, blink::features::kTextFragmentAnchor.name, @@ -246,6 +241,19 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { offline_pages::kPrefetchingOfflinePagesFeature.name, #endif }; + +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_ANDROID) + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableDnsOverHttps)) { + disabled_features.insert(features::kDnsOverHttps.name); + } +#else + if (!base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableDnsOverHttps)) { + enabled_features.insert(features::kDnsOverHttps.name); + } +#endif + command_line.AppendFeatures(enabled_features, disabled_features); bool ret = ChromeMainDelegate::BasicStartupComplete(exit_code); From fd16cff67d2ef1338555d595a9d32a49912e7845 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 13 Oct 2020 18:34:43 -0400 Subject: [PATCH 114/152] Lint fixes --- .../api/settings_private/brave_prefs_util.h | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/browser/extensions/api/settings_private/brave_prefs_util.h b/browser/extensions/api/settings_private/brave_prefs_util.h index 6b5af99ecfc7..43319d27bbda 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.h +++ b/browser/extensions/api/settings_private/brave_prefs_util.h @@ -3,21 +3,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_BRAVE_PREFS_UTIL_H -#define BRAVE_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_BRAVE_PREFS_UTIL_H +#ifndef BRAVE_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_BRAVE_PREFS_UTIL_H_ +#define BRAVE_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_BRAVE_PREFS_UTIL_H_ #include "chrome/browser/extensions/api/settings_private/prefs_util.h" -namespace extensions{ + +namespace extensions { class BravePrefsUtil : public PrefsUtil { - public: - using PrefsUtil::PrefsUtil; - // Gets the list of allowlisted pref keys -- that is, those which correspond - // to prefs that clients of the settingsPrivate API may retrieve and - // manipulate. - const PrefsUtil::TypedPrefMap& GetAllowlistedKeys() override; + public: + using PrefsUtil::PrefsUtil; + // Gets the list of allowlisted pref keys -- that is, those which correspond + // to prefs that clients of the settingsPrivate API may retrieve and + // manipulate. + const PrefsUtil::TypedPrefMap& GetAllowlistedKeys() override; }; -} +} // namespace extensions -#endif \ No newline at end of file +#endif // BRAVE_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_BRAVE_PREFS_UTIL_H_ From 9b2f6e55a1fe84509dd3c61c6b243719c98db984 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 14 Oct 2020 16:40:30 +0200 Subject: [PATCH 115/152] Fix IPFSTabHelperTest tests that were timing out The Chromium's EmbeddedTestServer does no longer resolves dweb.link properly for and these tests timeout as a result of it, so we need to use a different gateway, let's use cloudfare-ipfs.com instead. --- browser/ipfs/ipfs_tab_helper_browsertest.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/ipfs/ipfs_tab_helper_browsertest.cc b/browser/ipfs/ipfs_tab_helper_browsertest.cc index aa26171dca27..ac614a6ea0d9 100644 --- a/browser/ipfs/ipfs_tab_helper_browsertest.cc +++ b/browser/ipfs/ipfs_tab_helper_browsertest.cc @@ -46,7 +46,6 @@ class IPFSTabHelperTest : public InProcessBrowserTest, void SetUpOnMainThread() override { InProcessBrowserTest::SetUpOnMainThread(); host_resolver()->AddRule("*", "127.0.0.1"); - content::SetupCrossSiteRedirector(embedded_test_server()); brave::RegisterPathProvider(); base::FilePath test_data_dir; base::PathService::Get(brave::DIR_TEST_DATA, &test_data_dir); @@ -131,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(IPFSTabHelperTest, InfobarAddWithAccept) { InfoBarService::FromWebContents(active_contents()); AddInfoBarObserver(infobar_service); EXPECT_TRUE(NavigateToURLUntilLoadStop( - "dweb.link", "/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR")); + "cloudflare-ipfs.com", "/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR")); WaitForInfobarAdded(); InfoBarAccept(ConfirmInfoBarDelegate::BUTTON_OK | @@ -148,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(IPFSTabHelperTest, InfobarAddWithSettings) { InfoBarService::FromWebContents(active_contents()); AddInfoBarObserver(infobar_service); EXPECT_TRUE(NavigateToURLUntilLoadStop( - "dweb.link", "/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR")); + "cloudflare-ipfs.com", "/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR")); WaitForInfobarAdded(); InfoBarCancel(ConfirmInfoBarDelegate::BUTTON_OK | From 190068e049380b703de12c2ce9da2ec17a2ab7d6 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 14 Oct 2020 11:35:20 -0400 Subject: [PATCH 116/152] [Android] Fix for unit tests Chromium change: https://chromium.googlesource.com/chromium/src/+/2dc64aab2f0e0ffe3ad4248fab4f213ca2cab024 Migrate some ChromeActivityTestRule usages to CTATestRule See https://chromium-review.googlesource.com/c/chromium/src/+/2435724/ for more thorough explanation. Bug: 989569 --- .../org/chromium/chrome/browser/BravePrivateTabTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/android/javatests/org/chromium/chrome/browser/BravePrivateTabTest.java b/android/javatests/org/chromium/chrome/browser/BravePrivateTabTest.java index ef24d4ff30c8..75922bdd4522 100644 --- a/android/javatests/org/chromium/chrome/browser/BravePrivateTabTest.java +++ b/android/javatests/org/chromium/chrome/browser/BravePrivateTabTest.java @@ -21,8 +21,8 @@ import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.settings.BraveSearchEngineUtils; -import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; +import org.chromium.chrome.test.ChromeTabbedActivityTestRule; import org.chromium.components.search_engines.TemplateUrl; import org.chromium.content_public.browser.test.util.TestThreadUtils; @@ -32,8 +32,7 @@ @RunWith(ChromeJUnit4ClassRunner.class) public class BravePrivateTabTest { @Rule - public ChromeActivityTestRule mActivityTestRule = new ChromeActivityTestRule<>( - ChromeActivity.class); + public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule(); @Before public void setUp() throws Exception { From 4a2c2724e575b6ec1dc00b23bb21da1bef72d443 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 14 Oct 2020 11:38:44 -0400 Subject: [PATCH 117/152] [Android] Fixes for menu and tab switcher buttons This commit fixes behaviour for menu and tab switcher buttons in landscape and overview mode when bottom toolbar is enabled. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- android/brave_java_sources.gni | 1 + .../browser/toolbar/BraveToolbarManager.java | 13 ++-- .../BraveMenuButtonCoordinator.java | 54 ++++++++++++++++ ...raveTabSwitcherModeTTCoordinatorPhone.java | 5 ++ .../top/BraveTabSwitcherModeTTPhone.java | 11 ---- .../toolbar/top/BraveToolbarLayout.java | 63 ++++++++++--------- .../top/BraveTopToolbarCoordinator.java | 8 ++- .../browser/ui/appmenu/BraveAppMenu.java | 5 +- ...-browser-toolbar-ToolbarManager.java.patch | 11 +++- 9 files changed, 118 insertions(+), 53 deletions(-) create mode 100644 android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 1ce65f92e0ef..d7977e110d44 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -169,6 +169,7 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java", diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 99b20a83d844..15a09e532d51 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -5,7 +5,6 @@ package org.chromium.chrome.browser.toolbar; -import android.content.SharedPreferences; import android.content.res.Configuration; import android.view.View; import android.view.View.OnClickListener; @@ -15,7 +14,6 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.Callback; -import org.chromium.base.ContextUtils; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; @@ -41,6 +39,7 @@ import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; import org.chromium.chrome.browser.toolbar.bottom.BraveBottomControlsCoordinator; +import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.top.ActionModeController; import org.chromium.chrome.browser.toolbar.top.BraveTopToolbarCoordinator; @@ -54,9 +53,6 @@ import java.util.List; public class BraveToolbarManager extends ToolbarManager { - private static final String BRAVE_BOTTOM_TOOLBAR_CURRENTLY_VISIBLE = - "brave_bottom_toolbar_currently_visible"; - private BottomControlsCoordinator mBottomControlsCoordinator; private BrowserControlsSizer mBrowserControlsSizer; private FullscreenManager mFullscreenManager; @@ -189,14 +185,13 @@ protected void updateReloadState(boolean tabCrashed) { private void setBottomToolbarVisible(boolean visible) { mIsBottomToolbarVisible = visible; + Boolean isMenuFromBottom = + mIsBottomToolbarVisible && BottomToolbarConfiguration.isBottomToolbarEnabled(); + BraveMenuButtonCoordinator.setMenuFromBottom(isMenuFromBottom); if (mToolbar instanceof BraveTopToolbarCoordinator) { ((BraveTopToolbarCoordinator) mToolbar).onBottomToolbarVisibilityChanged(visible); } mBottomControlsCoordinator.setBottomControlsVisible(visible); - SharedPreferences prefs = ContextUtils.getAppSharedPreferences(); - Boolean isMenuFromBottom = - mIsBottomToolbarVisible && BottomToolbarConfiguration.isBottomToolbarEnabled(); - prefs.edit().putBoolean(BRAVE_BOTTOM_TOOLBAR_CURRENTLY_VISIBLE, isMenuFromBottom).apply(); } public boolean isBottomToolbarVisible() { diff --git a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java new file mode 100644 index 000000000000..301b7de42a73 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java @@ -0,0 +1,54 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.toolbar.menu_button; + +import android.app.Activity; +import android.content.SharedPreferences; + +import androidx.annotation.IdRes; + +import org.chromium.base.ContextUtils; +import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate; +import org.chromium.chrome.browser.toolbar.ThemeColorProvider; +import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator; + +public class BraveMenuButtonCoordinator extends MenuButtonCoordinator { + private static final String BRAVE_IS_MENU_FROM_BOTTOM = "brave_is_menu_from_bottom"; + + public BraveMenuButtonCoordinator( + OneshotSupplier appMenuCoordinatorSupplier, + BrowserStateBrowserControlsVisibilityDelegate controlsVisibilityDelegate, + Activity activity, SetFocusFunction setUrlBarFocusFunction, + Runnable requestRenderRunnable, boolean shouldShowAppUpdateBadge, + Supplier isInOverviewModeSupplier, ThemeColorProvider themeColorProvider, + @IdRes int menuButtonId) { + super(appMenuCoordinatorSupplier, controlsVisibilityDelegate, activity, + setUrlBarFocusFunction, requestRenderRunnable, shouldShowAppUpdateBadge, + isInOverviewModeSupplier, themeColorProvider, menuButtonId); + } + + @Override + public MenuButton getMenuButton() { + return isMenuFromBottom() ? null : super.getMenuButton(); + } + + @Override + public void setVisibility(boolean visible) { + super.setVisibility(isMenuFromBottom() ? false : visible); + } + + public static void setMenuFromBottom(boolean isMenuFromBottom) { + SharedPreferences prefs = ContextUtils.getAppSharedPreferences(); + prefs.edit().putBoolean(BRAVE_IS_MENU_FROM_BOTTOM, isMenuFromBottom).apply(); + } + + public static boolean isMenuFromBottom() { + SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences(); + return sharedPreferences.getBoolean(BRAVE_IS_MENU_FROM_BOTTOM, false); + } +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java index 3ba1e8e96f76..0bc93b3b443b 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java @@ -13,10 +13,12 @@ class BraveTabSwitcherModeTTCoordinatorPhone extends TabSwitcherModeTTCoordinato private TabSwitcherModeTTPhone mTabSwitcherModeToolbar; private boolean mIsBottomToolbarVisible; + private MenuButtonCoordinator mBraveMenuButtonCoordinator; BraveTabSwitcherModeTTCoordinatorPhone( ViewStub tabSwitcherToolbarStub, MenuButtonCoordinator menuButtonCoordinator) { super(tabSwitcherToolbarStub, menuButtonCoordinator); + mBraveMenuButtonCoordinator = menuButtonCoordinator; } @Override @@ -26,6 +28,9 @@ public void setTabSwitcherMode(boolean inTabSwitcherMode) { ((BraveTabSwitcherModeTTPhone) mTabSwitcherModeToolbar) .onBottomToolbarVisibilityChanged(mIsBottomToolbarVisible); } + if (mBraveMenuButtonCoordinator != null && mIsBottomToolbarVisible) { + mBraveMenuButtonCoordinator.setVisibility(!inTabSwitcherMode); + } } void onBottomToolbarVisibilityChanged(boolean isVisible) { diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java index 879c05d26088..979354e5cd88 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java @@ -19,14 +19,12 @@ public class BraveTabSwitcherModeTTPhone extends TabSwitcherModeTTPhone { private View mNewTabViewButton; private NewTabButton mNewTabImageButton; private ToggleTabStackButton mToggleTabStackButton; - private MenuButton mMenuButton; private boolean mShouldShowNewTabVariation; private boolean mShouldShowNewTabButton; public BraveTabSwitcherModeTTPhone(Context context, AttributeSet attrs) { super(context, attrs); - mMenuButton = findViewById(R.id.menu_button_wrapper); } protected void updateNewTabButtonVisibility() { @@ -45,12 +43,6 @@ protected boolean shouldShowIncognitoToggle() { return false; } - private void setMenuButtonVisibility(boolean isButtonVisible) { - if (mMenuButton != null) { - mMenuButton.setVisibility(isButtonVisible ? VISIBLE : GONE); - } - } - void onBottomToolbarVisibilityChanged(boolean isVisible) { mShouldShowNewTabButton = !isVisible || (BottomToolbarConfiguration.isBottomToolbarEnabled() @@ -60,8 +52,5 @@ void onBottomToolbarVisibilityChanged(boolean isVisible) { if (BottomToolbarVariationManager.isTabSwitcherOnBottom() && !shouldShowIncognitoToggle()) { mToggleTabStackButton.setVisibility(isVisible ? GONE : VISIBLE); } - setMenuButtonVisibility(!isVisible - || (BottomToolbarConfiguration.isBottomToolbarEnabled() - && !BottomToolbarVariationManager.isMenuButtonOnBottom())); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index edc3cb18f172..a3b68974514b 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -14,25 +14,26 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.util.AttributeSet; +import android.util.Pair; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageButton; -import android.widget.TextView; import android.widget.ImageView; import android.widget.PopupWindow; -import android.util.Pair; +import android.widget.TextView; import androidx.appcompat.app.AlertDialog; import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.ContextUtils; +import org.chromium.base.Log; import org.chromium.base.MathUtils; -import org.chromium.base.task.AsyncTask; import org.chromium.base.ThreadUtils; -import org.chromium.base.Log; +import org.chromium.base.task.AsyncTask; import org.chromium.chrome.R; +import org.chromium.chrome.browser.BraveAdsNativeHelper; import org.chromium.chrome.browser.BraveFeatureList; import org.chromium.chrome.browser.BraveRelaunchUtils; import org.chromium.chrome.browser.BraveRewardsNativeWorker; @@ -40,17 +41,24 @@ import org.chromium.chrome.browser.BraveRewardsPanelPopup; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.app.ChromeActivity; +import org.chromium.chrome.browser.brave_stats.BraveStatsUtil; import org.chromium.chrome.browser.dialogs.BraveAdsSignupDialog; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.local_database.BraveStatsTable; +import org.chromium.chrome.browser.local_database.DatabaseHelper; +import org.chromium.chrome.browser.local_database.SavedBandwidthTable; +import org.chromium.chrome.browser.notifications.retention.RetentionNotificationUtil; +import org.chromium.chrome.browser.ntp.BraveNewTabPageLayout; import org.chromium.chrome.browser.ntp.NewTabPage; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; +import org.chromium.chrome.browser.onboarding.SearchActivity; import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; -import org.chromium.components.user_prefs.UserPrefs; import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettings; import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettingsObserver; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.AppearancePreferences; +import org.chromium.chrome.browser.settings.BraveSearchEngineUtils; import org.chromium.chrome.browser.shields.BraveShieldsHandler; import org.chromium.chrome.browser.shields.BraveShieldsMenuObserver; import org.chromium.chrome.browser.tab.Tab; @@ -66,25 +74,18 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; import org.chromium.chrome.browser.util.PackageUtils; import org.chromium.components.browser_ui.styles.ChromeColors; -import org.chromium.content_public.browser.NavigationHandle; import org.chromium.components.embedder_support.util.UrlUtilities; import org.chromium.components.url_formatter.UrlFormatter; +import org.chromium.components.user_prefs.UserPrefs; +import org.chromium.content_public.browser.NavigationHandle; import org.chromium.ui.UiUtils; import org.chromium.ui.interpolators.BakedBezierInterpolator; import org.chromium.ui.widget.Toast; -import org.chromium.chrome.browser.onboarding.SearchActivity; -import org.chromium.chrome.browser.BraveAdsNativeHelper; -import org.chromium.chrome.browser.local_database.DatabaseHelper; -import org.chromium.chrome.browser.local_database.BraveStatsTable; -import org.chromium.chrome.browser.local_database.SavedBandwidthTable; -import org.chromium.chrome.browser.brave_stats.BraveStatsUtil; -import org.chromium.chrome.browser.settings.BraveSearchEngineUtils; -import org.chromium.chrome.browser.notifications.retention.RetentionNotificationUtil; import java.net.URL; -import java.util.List; import java.util.Calendar; import java.util.Date; +import java.util.List; public abstract class BraveToolbarLayout extends ToolbarLayout implements OnClickListener, View.OnLongClickListener, @@ -120,6 +121,8 @@ public abstract class BraveToolbarLayout extends ToolbarLayout implements OnClic private PopupWindow mShieldsTooltipPopupWindow; + private boolean mIsBottomToolbarVisible; + public BraveToolbarLayout(Context context, AttributeSet attrs) { super(context, attrs); } @@ -237,9 +240,9 @@ public void savedBandwidth(long savings) { // shown and loading state is changed. updateBraveShieldsButtonState(null); if (this instanceof ToolbarPhone) { - if (super.getMenuButtonCoordinator() != null && BottomToolbarVariationManager.isMenuButtonOnBottom()) { - super.getMenuButtonCoordinator().setVisibility(false); - } + if (super.getMenuButtonCoordinator() != null && isMenuButtonOnBottom()) { + super.getMenuButtonCoordinator().setVisibility(false); + } } } @@ -771,9 +774,14 @@ private void updateVerifiedPublisherMark() { } public void onBottomToolbarVisibilityChanged(boolean isVisible) { - if (this instanceof ToolbarPhone && super.getMenuButtonCoordinator() != null) { - super.getMenuButtonCoordinator().setVisibility(isVisible); - } + mIsBottomToolbarVisible = isVisible; + if (this instanceof ToolbarPhone && super.getMenuButtonCoordinator() != null) { + super.getMenuButtonCoordinator().setVisibility(!isVisible); + ToggleTabStackButton toggleTabStackButton = findViewById(R.id.tab_switcher_button); + if (toggleTabStackButton != null) { + toggleTabStackButton.setVisibility(isTabSwitcherOnBottom() ? GONE : VISIBLE); + } + } } private void updateShieldsLayoutBackground(boolean rounded) { @@ -790,12 +798,11 @@ private void updateShieldsLayoutBackground(boolean rounded) { updateModernLocationBarColor(mCurrentToolbarColor); } - @Override - MenuButtonCoordinator getMenuButtonCoordinator() { - if (this instanceof ToolbarPhone && BottomToolbarVariationManager.isMenuButtonOnBottom() - && super.getMenuButtonCoordinator() != null) { - super.getMenuButtonCoordinator().disableMenuButton(); - } - return super.getMenuButtonCoordinator(); + private boolean isTabSwitcherOnBottom() { + return mIsBottomToolbarVisible && BottomToolbarVariationManager.isTabSwitcherOnBottom(); + } + + private boolean isMenuButtonOnBottom() { + return mIsBottomToolbarVisible && BottomToolbarVariationManager.isMenuButtonOnBottom(); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index d4261dd095b5..a6d60478dcb3 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -30,6 +30,7 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { private TabSwitcherModeTTCoordinatorPhone mTabSwitcherModeCoordinatorPhone; private OptionalBrowsingModeButtonController mOptionalButtonController; + private ToolbarLayout mBraveToolbarLayout; public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, ToolbarLayout toolbarLayout, ToolbarDataProvider toolbarDataProvider, @@ -53,9 +54,11 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, appMenuButtonHelperSupplier, tabModelSelectorSupplier, homeButtonVisibilitySupplier, identityDiscStateSupplier, invalidatorCallback, identityDiscButtonSupplier); + mBraveToolbarLayout = toolbarLayout; + if (toolbarLayout instanceof ToolbarPhone) { if (!StartSurfaceConfiguration.isStartSurfaceEnabled()) { - mTabSwitcherModeCoordinatorPhone = new TabSwitcherModeTTCoordinatorPhone( + mTabSwitcherModeCoordinatorPhone = new BraveTabSwitcherModeTTCoordinatorPhone( controlContainer.getRootView().findViewById(R.id.tab_switcher_toolbar_stub), overviewModeMenuButtonCoordinator); } @@ -63,6 +66,9 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, } public void onBottomToolbarVisibilityChanged(boolean isVisible) { + if (mBraveToolbarLayout instanceof BraveToolbarLayout) { + ((BraveToolbarLayout) mBraveToolbarLayout).onBottomToolbarVisibilityChanged(isVisible); + } if (mTabSwitcherModeCoordinatorPhone instanceof BraveTabSwitcherModeTTCoordinatorPhone) { ((BraveTabSwitcherModeTTCoordinatorPhone) mTabSwitcherModeCoordinatorPhone) .onBottomToolbarVisibilityChanged(isVisible); diff --git a/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java b/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java index 84e983fd9737..28e0343839b9 100644 --- a/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java +++ b/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java @@ -14,8 +14,7 @@ import org.chromium.ui.base.DeviceFormFactor; class BraveAppMenu { - private static final String BRAVE_BOTTOM_TOOLBAR_CURRENTLY_VISIBLE = - "brave_bottom_toolbar_currently_visible"; + private static final String BRAVE_IS_MENU_FROM_BOTTOM = "brave_is_menu_from_bottom"; public static int[] getPopupPosition(int[] tempLocation, boolean isByPermanentButton, int negativeSoftwareVerticalOffset, int negativeVerticalOffsetNotTopAnchored, @@ -41,6 +40,6 @@ public static int getAnimationStyle() { private static boolean isMenuFromBottom() { SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences(); - return sharedPreferences.getBoolean(BRAVE_BOTTOM_TOOLBAR_CURRENTLY_VISIBLE, false); + return sharedPreferences.getBoolean(BRAVE_IS_MENU_FROM_BOTTOM, false); } } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch index 1b5bd3551d3e..9f1f329f3ab4 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch @@ -1,7 +1,16 @@ 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 dbffdea2287f9d3d008cde7068c1ace68a0d70fe..23a6f93b9d0c11e99467f1ee8302a35c71f56f15 100644 +index dbffdea2287f9d3d008cde7068c1ace68a0d70fe..a4b1c87b3896aef7b1948ddb020f2c0f306c9978 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 +@@ -304,7 +304,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve + ThemeColorProvider overviewModeThemeColorProvider = mAppThemeColorProvider; + ToolbarLayout toolbarLayout = mActivity.findViewById(R.id.toolbar); + +- mMenuButtonCoordinator = new MenuButtonCoordinator(appMenuCoordinatorSupplier, ++ mMenuButtonCoordinator = new org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator(appMenuCoordinatorSupplier, + mControlsVisibilityDelegate, mActivity, + (focus, type) + -> setUrlBarFocus(focus, type), @@ -631,7 +631,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve ThemeColorProvider browsingModeThemeColorProvider, MenuButtonCoordinator startSurfaceMenuButtonCoordinator, Invalidator invalidator, From 808d7dbd6ed71f108c07ed01ab4d6dbf95f44d6f Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 14 Oct 2020 14:13:42 -0400 Subject: [PATCH 118/152] Updated patches from Chromium 87.0.4280.11 to Chromium 87.0.4280.20. --- patches/chrome-VERSION.patch | 4 +-- patches/chrome-android-BUILD.gn.patch | 2 +- ...rome-android-chrome_java_sources.gni.patch | 4 +-- ...ome-android-java-AndroidManifest.xml.patch | 4 +-- ...me-browser-ChromeTabbedActivity.java.patch | 8 ++--- ...-browser-toolbar-ToolbarManager.java.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 6 ++-- patches/chrome-browser-about_flags.cc.patch | 4 +-- .../chrome-browser-extensions-BUILD.gn.patch | 4 +-- ...flags-android-chrome_feature_list.cc.patch | 4 +-- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 ++-- patches/chrome-browser-ui-BUILD.gn.patch | 2 +- .../chrome-browser-ui-chrome_pages.cc.patch | 2 +- ...tings-content_setting_image_model.cc.patch | 4 +-- ...ttings_localized_strings_provider.cc.patch | 4 +-- patches/chrome-installer-mac-BUILD.gn.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 2 +- ...s-permissions-permission_uma_util.cc.patch | 4 +-- ...-renderer_host-navigation_request.cc.patch | 4 +-- ...ontent-renderer-render_frame_impl.cc.patch | 4 +-- ...-blink-renderer-core-dom-document.cc.patch | 2 +- ...-canvas-canvas_async_blob_creator.cc.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 2 +- ...ebgl-webgl_rendering_context_base.cc.patch | 34 +++++++++---------- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +-- 25 files changed, 60 insertions(+), 60 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 4315e86313a1..4faed99b4f2f 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 82d566f627782396b6932d4eebc074d4078edf2c..7f24bb0333a250354d0ed93b4ffcf42c9355a137 100644 +index 8075ee7823ef12e3794b70df18247820bbfe706d..7f24bb0333a250354d0ed93b4ffcf42c9355a137 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=87 -MINOR=0 -BUILD=4280 --PATCH=11 +-PATCH=20 +MINOR=1 +BUILD=18 +PATCH=15 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index bcb20a360144..16d3a62ac950 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 606f75c5a288e46c2e135ffd0cdce2581e4e0c68..fac971e66956b6c1651ac495dc3254c079a3b93f 100644 +index f8b356750cc629d80a409c8c0975eff1e3094e94..d1210468de4e9bb7811a755a334f69a5ca5dfa6e 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -234,6 +234,7 @@ android_resources("chrome_app_java_resources") { diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 4448e882e0b6..b00917f4e9c0 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 9caba09c98899c4e6b1889d4ce7d76320f7cb81a..a76d0af46bce46f69f78c9431bea46a6b5feeab4 100644 +index a8f04bd1adbd56111da4587b064780c87557aa45..f1be3a6ef699f74c0a8f380e4d718075fc1b2d23 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1702,3 +1702,4 @@ chrome_java_sources = [ +@@ -1705,3 +1705,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/HandlerResponseCallback.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 9eb6a0aeace9..21085c41c2ba 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 4d0a6e271de41347ae81170fd6ee32521c6109c5..9387bcfa09bba250795f8812058ea9c79e6d7653 100644 +index 4b942ff06700f6d8c6ccc1cb94878de7c7412d0d..e1d72e7237d4cf8cabf0974fbea0c55d0d9d5c0d 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -38,7 +38,9 @@ by a child template that "extends" this file. @@ -62,7 +62,7 @@ index 4d0a6e271de41347ae81170fd6ee32521c6109c5..9387bcfa09bba250795f8812058ea9c7 {% endif %} -@@ -1172,6 +1184,7 @@ by a child template that "extends" this file. +@@ -1171,6 +1183,7 @@ by a child template that "extends" this file. {% endif %} diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index f872d68addfd..af1e22897b4c 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index f065dec4047591e6e764a2fde92639992bb7c2b5..b107bab44e8033ac72195f632c84af05d14a0e6c 100644 +index 9cafb3fe5fa0fe0da154be0a9b3356e65e001606..ffeba32ce1ba6ce2afb88f6bb60a9a8d7de5363a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java @@ -184,7 +184,7 @@ import java.util.Locale; @@ -29,7 +29,7 @@ index f065dec4047591e6e764a2fde92639992bb7c2b5..b107bab44e8033ac72195f632c84af05 mIntentWithEffectSupplier, getShareDelegateSupplier(), getActivityTabProvider(), mEphemeralTabCoordinatorSupplier, mTabModelProfileSupplier, mBookmarkBridgeSupplier, getOverviewModeBehaviorSupplier(), this::getContextualSearchManager, -@@ -1573,7 +1573,7 @@ public class ChromeTabbedActivity extends ChromeActivity> result; for (auto type : kContentSettingImageOrder) result.push_back(CreateForContentType(type)); diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 2454ea56b14c..2de2bed0136f 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 15ada6af32df70d8cd5543f873806fc228ddca36..8f9199c4340213903a01721177fb9229ddef22cb 100644 +index bb0272c5a95f7f5ef0134447d54e7e00635a3b82..c6c4a32cf73d9b3174bc8d86cfae106bd9732141 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2391,6 +2391,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2392,6 +2392,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-installer-mac-BUILD.gn.patch b/patches/chrome-installer-mac-BUILD.gn.patch index 07bd941a55b4..a92a4f5c9be5 100644 --- a/patches/chrome-installer-mac-BUILD.gn.patch +++ b/patches/chrome-installer-mac-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn -index 108dd95d86750ead5ec49ec16835e0330b9575fa..268e82d54f7ad7e5eb3e56f4961f537f03f5308c 100644 +index 09faabc04c24b88a38a4fba62b729e6472544c4e..5b34241db42ac3f57f6c56398f18e8a86b8623d7 100644 --- a/chrome/installer/mac/BUILD.gn +++ b/chrome/installer/mac/BUILD.gn @@ -13,7 +13,7 @@ group("mac") { diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index a4c94f69ca60..03d6d4e2187c 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 315e5dd2439edc534d83d595ccbd1f3d34fb74ba..a8e7c3c1a8bded3236892d61639434a47bdd8c07 100644 +index 5a980cb49fcd7dc3c83b069ceadddd574799dd14..0de3f08124466d748e2848c7564a35bb2f080bf9 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -840,6 +840,7 @@ if (!is_android) { diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index d76f42e21e25..45318f9e0f09 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index 45cc84456ea8695a63c00e9e77ea2ed9a96a029b..0045c0ce4b5663a4fc28b04fc301243232b3fd80 100644 +index 422f18b73152d1f55f0666225e047c25cc057172..6432c79fc443b2393fe711ab043fdddb760d1a7e 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -50,7 +50,7 @@ namespace { @@ -11,7 +11,7 @@ index 45cc84456ea8695a63c00e9e77ea2ed9a96a029b..0045c0ce4b5663a4fc28b04fc3012432 switch (type) { case PermissionRequestType::MULTIPLE: return "AudioAndVideoCapture"; -@@ -585,6 +585,7 @@ void PermissionUmaUtil::RecordPermissionAction( +@@ -589,6 +589,7 @@ void PermissionUmaUtil::RecordPermissionAction( base::UmaHistogramEnumeration("Permissions.Action.IdleDetection", action, PermissionAction::NUM); break; diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 792b746261be..5fe564eeb181 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 7253ef9c4e55ff6a0122d20ea3fd25c70141b284..537a34cdab2279eee0cda68871e544bbebbf0faf 100644 +index ab58967aba4143d5a39f51d7bbeed0568e2fa012..720e9300bb66d352fd980e30fdc85671ac6f7d33 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -1812,6 +1812,7 @@ void NavigationRequest::OnRequestRedirected( @@ -10,7 +10,7 @@ index 7253ef9c4e55ff6a0122d20ea3fd25c70141b284..537a34cdab2279eee0cda68871e544bb common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -2768,6 +2769,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -2773,6 +2774,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index e609d1568de0..ba8c92f6c88d 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 3b2626c3ef9dab2aedddd09d24901e892605cf01..723bceaf86c735c08a3bbd2e5822b4aed4894133 100644 +index e811aec4853c1ba0dacdcad758a5bc834643d7e3..799a5504ecb259b28849dc32402581f8ef6ff912 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5089,7 +5089,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -5091,7 +5091,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (render_view_->GetWebView()->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/third_party-blink-renderer-core-dom-document.cc.patch b/patches/third_party-blink-renderer-core-dom-document.cc.patch index e5f0626c65df..17ae2e7fff8e 100644 --- a/patches/third_party-blink-renderer-core-dom-document.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-document.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 8b47d934ac695add402447daa88b4984fda9dc90..17ea22cbc21306e782696b7b7a35fe429058991f 100644 +index 20688b7ab11e83956cfbe2884ea79f85455c39f0..15d6ca090c591abf9640e6502d620097db1a7827 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -33,7 +33,7 @@ diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch index 7bc0a44f65a0..6ea63f4484a8 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -index 82028fb263ed05e87befe5d52aaa76b65455b137..a9c7986c9913914b992032a79a89d3fb728ccd2e 100644 +index c54955aa7664819a01b21d0b0dcbb0ab3131277b..40f2c00d98e5f2e1d42e44abc0b24f9cc8a17978 100644 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -190,6 +190,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 06e455bc297c..5929e12a7b6c 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 9503246f89846dc84989ed6fa95c7a442c6c6daf..b15eec8d7194062109f05ff1c2ba4d61726433a9 100644 +index d65546f5ca089083336f54770f1cab864d8c1f4a..52fc23ad50f202aa420964a29c3c4c7bcae6bc34 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc @@ -972,6 +972,7 @@ String HTMLCanvasElement::ToDataURLInternal( diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index b88e0a6dd92d..055a7e1de5d3 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,5 +1,5 @@ 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 -index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87b4437ba5 100644 +index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57e6763eb3 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc @@ -2956,6 +2956,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( @@ -50,7 +50,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3596,6 +3602,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3594,6 +3600,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->IsActive()) { RecordIdentifiableGLParameterDigest( -@@ -3610,6 +3617,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3608,6 +3615,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->IsActive()) { RecordIdentifiableGLParameterDigest( -@@ -3697,6 +3705,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3695,6 +3703,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( ScriptState* script_state, WebGLProgram* program, GLenum pname) { @@ -74,7 +74,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3758,6 +3767,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3756,6 +3765,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3768,6 +3778,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3766,6 +3776,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3812,6 +3823,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3810,6 +3821,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( ScriptState* script_state, WebGLShader* shader, GLenum pname) { @@ -98,7 +98,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3843,6 +3855,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3841,6 +3853,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3873,6 +3886,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3871,6 +3884,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 auto* result = MakeGarbageCollected( range[0], range[1], precision); RecordShaderPrecisionFormatForStudy(shader_type, precision_type, result); -@@ -3882,6 +3896,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3880,6 +3894,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 return EnsureNotNull(shader->Source()); } -@@ -3889,6 +3904,7 @@ base::Optional> +@@ -3887,6 +3902,7 @@ base::Optional> WebGLRenderingContextBase::getSupportedExtensions() { if (isContextLost()) return base::nullopt; @@ -130,7 +130,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 Vector result; -@@ -3911,6 +3927,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3909,6 +3925,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3945,6 +3962,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3943,6 +3960,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -146,7 +146,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4225,6 +4243,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4223,6 +4241,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -154,7 +154,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4249,6 +4268,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4247,6 +4266,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -162,7 +162,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4326,6 +4346,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4324,6 +4344,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -170,7 +170,7 @@ index 98aadee5b8d720f0992f95ccfd57b48853492b76..ba2ec9ec3b6dc41b3da79f270148dc87 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4683,6 +4704,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4680,6 +4701,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch index 51afdada97cf..f0e25dae2214 100644 --- a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -index 35e8e506bd1a5aecb55061bd8924f18fdbd41b7a..e4181153e331c3b42ec6bd17b25eed5006c342af 100644 +index ce699331d0bc63d43105113e465196b592f9ee4d..3cdb23407c8e5187bbcbf32665ecd07c9145212f 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -13719,6 +13719,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -13725,6 +13725,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. From 0942c77e928e50cb068d0501a8d2d7d80612b776 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 14 Oct 2020 15:38:35 -0400 Subject: [PATCH 119/152] Updated strings for Chromium 87.0.4280.20. --- app/brave_strings.grd | 2 +- app/extensions_strings.grdp | 2 +- app/generated_resources.grd | 49 +++++++++++-------- app/generated_resources_override.grd | 2 - app/settings_strings.grdp | 7 ++- .../strings/android_chrome_strings.grd | 9 +++- components/autofill_payments_strings.grdp | 8 +++ components/page_info_strings.grdp | 2 +- components/policy_strings.grdp | 3 ++ .../security_interstitials_strings.grdp | 3 ++ 10 files changed, 58 insertions(+), 29 deletions(-) diff --git a/app/brave_strings.grd b/app/brave_strings.grd index b7b70b539694..1fdb92b17d28 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -337,7 +337,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> Make Brave the default browser - + Chrome OS can't open this page. diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp index 71135f83be92..1902f28f9f4d 100644 --- a/app/extensions_strings.grdp +++ b/app/extensions_strings.grdp @@ -378,7 +378,7 @@ Extensions - Open web store + Open Web Store Keyboard shortcuts diff --git a/app/generated_resources.grd b/app/generated_resources.grd index b4f8a6ad2583..42f2d07046e5 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -5330,6 +5330,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Shortcuts + + Cards + Color and theme @@ -5357,6 +5360,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Shortcuts are curated by you + + Hide cards + + + Don't show cards on this page + Current theme you have installed @@ -7803,28 +7812,26 @@ Keep your key file in a safe place. You will need it to create new versions of y - - - Open $1Adobe Acrobat? - - - $1https://google.com wants to open this application. - - - A website wants to open this application. - - - Open $1Adobe Acrobat - - - Cancel - - - Always allow $1https://google.com to open links of this type in the associated app - - + + Open $1Adobe Acrobat? + + + $1https://google.com wants to open this application. + + + A website wants to open this application. + + + Open $1Adobe Acrobat + + + Cancel + + + Always allow $1https://google.com to open links of this type in the associated app + - + Close diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 76a597e9d575..30ba7947364e 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -695,8 +695,6 @@ are declared in tools/grit/grit_rule.gni. - - diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 5ea3b2a3fdc1..ffb972589996 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -146,11 +146,11 @@ Change - Open web store + Open Web Store - Pressing tab on a webpage highlights links, as well as form fields + Pressing Tab on a webpage highlights links, as well as form fields Show warning before quitting with ⌘Q @@ -359,6 +359,9 @@ =1 {Found {COUNT} security issue} other {Found {COUNT} security issues}} + + No weak passwords found + Check again diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index be0a3fe1f841..a6dccf6344c8 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -663,6 +663,13 @@ CHAR-LIMIT guidelines: Homepage changed + + + Get Brave’s strongest security + + + Enhanced protection does more to block phishing and malware + @@ -2364,7 +2371,7 @@ To change this setting, <resetlink>reset sync

Search your downloads - + %1$s1.56 MB • %2$swww.example.com diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index 865cf1feb607..799e9e418be1 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -505,4 +505,12 @@ No thanks + + + $15% Cash Back + + + $1$$3 Off + + diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index b2c8afff1784..c9cb885b7eff 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp @@ -319,7 +319,7 @@ Window placement - Local font access + Fonts HID devices diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index 4e225347f5c0..61d9a3d5d5da 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -445,6 +445,9 @@ Additional details: Enterprise default + + Default + Command line diff --git a/components/security_interstitials_strings.grdp b/components/security_interstitials_strings.grdp index 52b7a971e4d3..77cddb50dd03 100644 --- a/components/security_interstitials_strings.grdp +++ b/components/security_interstitials_strings.grdp @@ -246,6 +246,9 @@ Help improve security on the web for everyone by sending <a href="#" id="whitepaper-link">URLs of some pages you visit, limited system information, and some page content</a> to Brave. <a id="privacy-link" href="#">Privacy policy</a> + + To get Brave’s highest level of security, <a href="#" id="enhanced-protection-link">turn on enhanced protection</a>. + From 58be9aff88a7b42f2563c1c6a40abe27ac191a37 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 14 Oct 2020 19:30:11 -0400 Subject: [PATCH 120/152] SecurityInterstitialControllerClient c'tor sig changed. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/4ada215142fd8bf16cd98909ed3a3c526f52d3ff commit 4ada215142fd8bf16cd98909ed3a3c526f52d3ff Author: Xinghui Lu Date: Mon Oct 5 20:21:34 2020 +0000 Open security page when enhanced protection link is clicked. Implement OpenEnhancedProtectionSettings() in controller_client. Create an interface named settings_page_helper at component/ level and an implementation class named chrome_settings_page_helper at chrome/ level. The interface is injected to controller_client. Add Safe Browsing enhanced protection page in chrome_pages. The URL path is "security?q=enhanced". During navigation, it opens "chrome://settings/security" and expands the enhanced protection section. Bug: 1130721 --- components/ipfs/ipfs_interstitial_controller_client.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/ipfs/ipfs_interstitial_controller_client.cc b/components/ipfs/ipfs_interstitial_controller_client.cc index 164887a5fd62..d405ac709caf 100644 --- a/components/ipfs/ipfs_interstitial_controller_client.cc +++ b/components/ipfs/ipfs_interstitial_controller_client.cc @@ -8,6 +8,7 @@ #include "brave/components/ipfs/ipfs_utils.h" #include "brave/components/ipfs/pref_names.h" #include "components/prefs/pref_service.h" +#include "components/security_interstitials/content/settings_page_helper.h" #include "components/security_interstitials/core/metrics_helper.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" @@ -37,7 +38,8 @@ IPFSInterstitialControllerClient::IPFSInterstitialControllerClient( GetMetricsHelper(request_url), prefs, locale, - GURL("about:blank") /* default_safe_page */), + GURL("about:blank") /* default_safe_page */, + nullptr /* settings_page_helper */), request_url_(request_url) {} void IPFSInterstitialControllerClient::Proceed() { From b8d5a3780359727c87d6d4ba17e08104cd8bd256 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 14 Oct 2020 18:25:21 -0400 Subject: [PATCH 121/152] TemplateURLPrepopulateData::GetEngineType moved. This function now lives in search_engine_utils.h/cc which has its own build source_set and is being used in blink. Had to reshuffle our code so that Brave search engines can be accessed in search_engine_utils.cc: moved our engines map into brave_preopulated_engines.cc and added a function to get it. Added a patch to add brave_prepopulated_engines.h/cc into //components/search_engines:prepopulated_engines as additional sources. To do that patched json_to_struct GN template. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/2fd5742a51183821b2c7fbe139b962c40e8b99c8 commit 2fd5742a51183821b2c7fbe139b962c40e8b99c8 Author: Gayane Petrosyan Date: Fri Oct 2 17:13:43 2020 +0000 [SH-Blink] Adding histograms for Shared Highlights. Adding histograms to text fragment selector generation logic. Also adding a histogram that indicates if the origin of a link with text fragment is a known search engine. For finding out if a given url is a known search engine, I am separating template_url_prepopulate_data::GetEngineType and deps into a separate file to use it from blink/renderer/platform. Otherwise, template_url_prepopulate_data pulls deps that are also pulled by deps which somehow triggers AddressSanitizer: odr-violation(one definition rule) on some targets. See https://ci.chromium.org/p/chromium/builders/try/linux-libfuzzer-asan-rel/569669 Unit tests for histograms in in a followup. --- build/config/brave_build.gni | 1 + .../search_engines/search_engine_utils.cc | 36 ++++++++ .../template_url_prepopulate_data.cc | 86 +++---------------- .../brave_prepopulated_engines.cc | 54 ++++++++++++ .../brave_prepopulated_engines.h | 4 + components/search_engines/sources.gni | 9 ++ .../components-search_engines-BUILD.gn.patch | 12 +++ ...ls-json_to_struct-json_to_struct.gni.patch | 12 +++ 8 files changed, 141 insertions(+), 73 deletions(-) create mode 100644 chromium_src/components/search_engines/search_engine_utils.cc create mode 100644 components/search_engines/sources.gni create mode 100644 patches/components-search_engines-BUILD.gn.patch create mode 100644 patches/tools-json_to_struct-json_to_struct.gni.patch diff --git a/build/config/brave_build.gni b/build/config/brave_build.gni index 1631f25f4d59..4ce25534fb22 100644 --- a/build/config/brave_build.gni +++ b/build/config/brave_build.gni @@ -7,6 +7,7 @@ import("//brave/browser/sources.gni") import("//brave/build/config/compiler.gni") import("//brave/build/features.gni") import("//brave/components/omnibox/browser/sources.gni") +import("//brave/components/search_engines/sources.gni") import("//brave/components/sync/sources.gni") import("//brave/components/sync/driver/sources.gni") import("//brave/installer/linux/sources.gni") diff --git a/chromium_src/components/search_engines/search_engine_utils.cc b/chromium_src/components/search_engines/search_engine_utils.cc new file mode 100644 index 000000000000..c64db7bd76f1 --- /dev/null +++ b/chromium_src/components/search_engines/search_engine_utils.cc @@ -0,0 +1,36 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "components/search_engines/search_engine_utils.h" + +#include "brave/components/search_engines/brave_prepopulated_engines.h" + +#define GetEngineType GetEngineType_ChromiumImpl +#include "../../../../components/search_engines/search_engine_utils.cc" +#undef GetEngineType + +namespace SearchEngineUtils { + +SearchEngineType GetEngineType(const GURL& url) { + SearchEngineType type = GetEngineType_ChromiumImpl(url); + if (type == SEARCH_ENGINE_OTHER) { + const auto& brave_engines_map = + TemplateURLPrepopulateData::GetBraveEnginesMap(); + for (const auto& entry : brave_engines_map) { + const auto* engine = entry.second; + if (SameDomain(url, GURL(engine->search_url))) { + return engine->type; + } + for (size_t j = 0; j < engine->alternate_urls_size; ++j) { + if (SameDomain(url, GURL(engine->alternate_urls[j]))) { + return engine->type; + } + } + } + } + return type; +} + +} // namespace SearchEngineUtils diff --git a/chromium_src/components/search_engines/template_url_prepopulate_data.cc b/chromium_src/components/search_engines/template_url_prepopulate_data.cc index 2860f37ad514..afac12e229f3 100644 --- a/chromium_src/components/search_engines/template_url_prepopulate_data.cc +++ b/chromium_src/components/search_engines/template_url_prepopulate_data.cc @@ -3,26 +3,25 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "components/search_engines/template_url_prepopulate_data.h" + +#include +#include + #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" +#include "brave/components/search_engines/brave_prepopulated_engines.h" #include "components/country_codes/country_codes.h" -// Pull in definitions for Brave prepopulated engines. It's ugly but these need -// to be built as part of the search_engines static library. -#include "../../../components/search_engines/brave_prepopulated_engines.cc" // NOLINT -#include "../../../components/search_engines/brave_prepopulated_engines.h" - #define GetDataVersion GetDataVersion_ChromiumImpl -#define GetEngineType GetEngineType_ChromiumImpl #if defined(OS_ANDROID) #define GetLocalPrepopulatedEngines GetLocalPrepopulatedEngines_Unused #endif #define GetPrepopulatedDefaultSearch GetPrepopulatedDefaultSearch_Unused #define GetPrepopulatedEngine GetPrepopulatedEngine_Unused #define GetPrepopulatedEngines GetPrepopulatedEngines_Unused -#include "../../../../components/search_engines/template_url_prepopulate_data.cc" // NOLINT +#include "../../../../components/search_engines/template_url_prepopulate_data.cc" #undef GetDataVersion -#undef GetEngineType #if defined(OS_ANDROID) #undef GetLocalPrepopulatedEngines #endif @@ -37,51 +36,6 @@ void LocalizeEngineList( namespace { -// Maps BravePrepopulatedEngineID to Chromium's PrepopulatedEngine. -const std::map - brave_engines_map = { - {PREPOPULATED_ENGINE_ID_GOOGLE, &google}, - {PREPOPULATED_ENGINE_ID_YAHOO, &brave_yahoo}, - {PREPOPULATED_ENGINE_ID_YAHOO_AR, &brave_yahoo_ar}, - {PREPOPULATED_ENGINE_ID_YAHOO_AT, &brave_yahoo_at}, - {PREPOPULATED_ENGINE_ID_YAHOO_AU, &brave_yahoo_au}, - {PREPOPULATED_ENGINE_ID_YAHOO_BR, &brave_yahoo_br}, - {PREPOPULATED_ENGINE_ID_YAHOO_CA, &brave_yahoo_ca}, - {PREPOPULATED_ENGINE_ID_YAHOO_CH, &brave_yahoo_ch}, - {PREPOPULATED_ENGINE_ID_YAHOO_CL, &brave_yahoo_cl}, - {PREPOPULATED_ENGINE_ID_YAHOO_CO, &brave_yahoo_co}, - {PREPOPULATED_ENGINE_ID_YAHOO_DE, &brave_yahoo_de}, - {PREPOPULATED_ENGINE_ID_YAHOO_DK, &brave_yahoo_dk}, - {PREPOPULATED_ENGINE_ID_YAHOO_ES, &brave_yahoo_es}, - {PREPOPULATED_ENGINE_ID_YAHOO_FI, &brave_yahoo_fi}, - {PREPOPULATED_ENGINE_ID_YAHOO_FR, &brave_yahoo_fr}, - {PREPOPULATED_ENGINE_ID_YAHOO_HK, &brave_yahoo_hk}, - {PREPOPULATED_ENGINE_ID_YAHOO_ID, &brave_yahoo_id}, - {PREPOPULATED_ENGINE_ID_YAHOO_IE, &brave_yahoo_ie}, - {PREPOPULATED_ENGINE_ID_YAHOO_IN, &brave_yahoo_in}, - {PREPOPULATED_ENGINE_ID_YAHOO_IT, &brave_yahoo_it}, - {PREPOPULATED_ENGINE_ID_YAHOO_MX, &brave_yahoo_mx}, - {PREPOPULATED_ENGINE_ID_YAHOO_MY, &brave_yahoo_my}, - {PREPOPULATED_ENGINE_ID_YAHOO_NL, &brave_yahoo_nl}, - {PREPOPULATED_ENGINE_ID_YAHOO_NO, &brave_yahoo_no}, - {PREPOPULATED_ENGINE_ID_YAHOO_NZ, &brave_yahoo_nz}, - {PREPOPULATED_ENGINE_ID_YAHOO_PE, &brave_yahoo_pe}, - {PREPOPULATED_ENGINE_ID_YAHOO_PH, &brave_yahoo_ph}, - {PREPOPULATED_ENGINE_ID_YAHOO_SE, &brave_yahoo_se}, - {PREPOPULATED_ENGINE_ID_YAHOO_SG, &brave_yahoo_sg}, - {PREPOPULATED_ENGINE_ID_YAHOO_TH, &brave_yahoo_th}, - {PREPOPULATED_ENGINE_ID_YAHOO_TW, &brave_yahoo_tw}, - {PREPOPULATED_ENGINE_ID_YAHOO_UK, &brave_yahoo_uk}, - {PREPOPULATED_ENGINE_ID_YAHOO_VE, &brave_yahoo_ve}, - {PREPOPULATED_ENGINE_ID_YAHOO_VN, &brave_yahoo_vn}, - {PREPOPULATED_ENGINE_ID_BING, &bing}, - {PREPOPULATED_ENGINE_ID_DUCKDUCKGO, &duckduckgo}, - {PREPOPULATED_ENGINE_ID_DUCKDUCKGO_DE, &duckduckgo_de}, - {PREPOPULATED_ENGINE_ID_DUCKDUCKGO_AU_NZ_IE, &duckduckgo_au_nz_ie}, - {PREPOPULATED_ENGINE_ID_QWANT, &qwant}, - {PREPOPULATED_ENGINE_ID_STARTPAGE, &startpage}, -}; - // Default order in which engines will appear in the UI. const std::vector brave_engines_default = { PREPOPULATED_ENGINE_ID_GOOGLE, @@ -294,6 +248,8 @@ std::vector GetEnginesFromEngineIDs( BravePrepopulatedEngineID default_engine_id, size_t* default_search_provider_index = nullptr) { std::vector engines; + const auto& brave_engines_map = + TemplateURLPrepopulateData::GetBraveEnginesMap(); for (size_t i = 0; i < engine_ids.size(); ++i) { const PrepopulatedEngine* engine = brave_engines_map.at(engine_ids.at(i)); DCHECK(engine); @@ -372,8 +328,10 @@ GetBravePrepopulatedEnginesForCountryID( // The intention of this function is to find the generic one // (ex: PREPOPULATED_ENGINE_ID_YAHOO) and then substitute the // country specific version. -void LocalizeEngineList( - int country_id, std::vector* engines) { +// This function is not in the anonymous namespace because it +// is used in brave_template_url_service_util_unittest. +void LocalizeEngineList(int country_id, + std::vector* engines) { for (size_t i = 0; i < engines->size(); ++i) { if ((*engines)[i] == PREPOPULATED_ENGINE_ID_YAHOO) { const auto& it = yahoo_engines_by_country_id_map.find(country_id); @@ -434,24 +392,6 @@ std::vector> GetLocalPrepopulatedEngines( #endif -SearchEngineType GetEngineType(const GURL& url) { - SearchEngineType type = GetEngineType_ChromiumImpl(url); - if (type == SEARCH_ENGINE_OTHER) { - for (const auto& entry : brave_engines_map) { - const auto* engine = entry.second; - if (SameDomain(url, GURL(engine->search_url))) { - return engine->type; - } - for (size_t j = 0; j < engine->alternate_urls_size; ++j) { - if (SameDomain(url, GURL(engine->alternate_urls[j]))) { - return engine->type; - } - } - } - } - return type; -} - // Functions below are copied verbatim from // components\search_engines\template_url_prepopulate_data.cc because they // need to call our versions of redefined Chromium's functions. diff --git a/components/search_engines/brave_prepopulated_engines.cc b/components/search_engines/brave_prepopulated_engines.cc index fbcf328e1caa..3db7911db9ac 100644 --- a/components/search_engines/brave_prepopulated_engines.cc +++ b/components/search_engines/brave_prepopulated_engines.cc @@ -14,6 +14,53 @@ namespace TemplateURLPrepopulateData { // engines below or add/remove engines. const int kBraveCurrentDataVersion = 7; +namespace { + +// Maps BravePrepopulatedEngineID to Chromium's PrepopulatedEngine. +const std::map + brave_engines_map = { + {PREPOPULATED_ENGINE_ID_GOOGLE, &google}, + {PREPOPULATED_ENGINE_ID_YAHOO, &brave_yahoo}, + {PREPOPULATED_ENGINE_ID_YAHOO_AR, &brave_yahoo_ar}, + {PREPOPULATED_ENGINE_ID_YAHOO_AT, &brave_yahoo_at}, + {PREPOPULATED_ENGINE_ID_YAHOO_AU, &brave_yahoo_au}, + {PREPOPULATED_ENGINE_ID_YAHOO_BR, &brave_yahoo_br}, + {PREPOPULATED_ENGINE_ID_YAHOO_CA, &brave_yahoo_ca}, + {PREPOPULATED_ENGINE_ID_YAHOO_CH, &brave_yahoo_ch}, + {PREPOPULATED_ENGINE_ID_YAHOO_CL, &brave_yahoo_cl}, + {PREPOPULATED_ENGINE_ID_YAHOO_CO, &brave_yahoo_co}, + {PREPOPULATED_ENGINE_ID_YAHOO_DE, &brave_yahoo_de}, + {PREPOPULATED_ENGINE_ID_YAHOO_DK, &brave_yahoo_dk}, + {PREPOPULATED_ENGINE_ID_YAHOO_ES, &brave_yahoo_es}, + {PREPOPULATED_ENGINE_ID_YAHOO_FI, &brave_yahoo_fi}, + {PREPOPULATED_ENGINE_ID_YAHOO_FR, &brave_yahoo_fr}, + {PREPOPULATED_ENGINE_ID_YAHOO_HK, &brave_yahoo_hk}, + {PREPOPULATED_ENGINE_ID_YAHOO_ID, &brave_yahoo_id}, + {PREPOPULATED_ENGINE_ID_YAHOO_IE, &brave_yahoo_ie}, + {PREPOPULATED_ENGINE_ID_YAHOO_IN, &brave_yahoo_in}, + {PREPOPULATED_ENGINE_ID_YAHOO_IT, &brave_yahoo_it}, + {PREPOPULATED_ENGINE_ID_YAHOO_MX, &brave_yahoo_mx}, + {PREPOPULATED_ENGINE_ID_YAHOO_MY, &brave_yahoo_my}, + {PREPOPULATED_ENGINE_ID_YAHOO_NL, &brave_yahoo_nl}, + {PREPOPULATED_ENGINE_ID_YAHOO_NO, &brave_yahoo_no}, + {PREPOPULATED_ENGINE_ID_YAHOO_NZ, &brave_yahoo_nz}, + {PREPOPULATED_ENGINE_ID_YAHOO_PE, &brave_yahoo_pe}, + {PREPOPULATED_ENGINE_ID_YAHOO_PH, &brave_yahoo_ph}, + {PREPOPULATED_ENGINE_ID_YAHOO_SE, &brave_yahoo_se}, + {PREPOPULATED_ENGINE_ID_YAHOO_SG, &brave_yahoo_sg}, + {PREPOPULATED_ENGINE_ID_YAHOO_TH, &brave_yahoo_th}, + {PREPOPULATED_ENGINE_ID_YAHOO_TW, &brave_yahoo_tw}, + {PREPOPULATED_ENGINE_ID_YAHOO_UK, &brave_yahoo_uk}, + {PREPOPULATED_ENGINE_ID_YAHOO_VE, &brave_yahoo_ve}, + {PREPOPULATED_ENGINE_ID_YAHOO_VN, &brave_yahoo_vn}, + {PREPOPULATED_ENGINE_ID_BING, &bing}, + {PREPOPULATED_ENGINE_ID_DUCKDUCKGO, &duckduckgo}, + {PREPOPULATED_ENGINE_ID_DUCKDUCKGO_DE, &duckduckgo_de}, + {PREPOPULATED_ENGINE_ID_DUCKDUCKGO_AU_NZ_IE, &duckduckgo_au_nz_ie}, + {PREPOPULATED_ENGINE_ID_QWANT, &qwant}, + {PREPOPULATED_ENGINE_ID_STARTPAGE, &startpage}, +}; + PrepopulatedEngine ModifyEngineParams(const PrepopulatedEngine& engine, const wchar_t* const name, const wchar_t* const keyword, @@ -40,6 +87,8 @@ PrepopulatedEngine ModifyEngineParams(const PrepopulatedEngine& engine, id > 0 ? id : engine.id}; } +} // namespace + const PrepopulatedEngine duckduckgo = { L"DuckDuckGo", L":d", @@ -456,4 +505,9 @@ const PrepopulatedEngine brave_yahoo_vn = BRAVE_YAHOO_SUGGEST_URL("vn"), PREPOPULATED_ENGINE_ID_YAHOO_VN); +const std::map& +GetBraveEnginesMap() { + return brave_engines_map; +} + } // namespace TemplateURLPrepopulateData diff --git a/components/search_engines/brave_prepopulated_engines.h b/components/search_engines/brave_prepopulated_engines.h index eeb1b00a3cee..a2b77b8fb632 100644 --- a/components/search_engines/brave_prepopulated_engines.h +++ b/components/search_engines/brave_prepopulated_engines.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_SEARCH_ENGINES_BRAVE_PREPOPULATED_ENGINES_H_ #include +#include #include "build/build_config.h" #include "components/search_engines/prepopulated_engines.h" @@ -131,6 +132,9 @@ extern const PrepopulatedEngine brave_yahoo_uk; extern const PrepopulatedEngine brave_yahoo_ve; extern const PrepopulatedEngine brave_yahoo_vn; +const std::map& +GetBraveEnginesMap(); + } // namespace TemplateURLPrepopulateData #endif // BRAVE_COMPONENTS_SEARCH_ENGINES_BRAVE_PREPOPULATED_ENGINES_H_ diff --git a/components/search_engines/sources.gni b/components/search_engines/sources.gni new file mode 100644 index 000000000000..e6dcb2680c8b --- /dev/null +++ b/components/search_engines/sources.gni @@ -0,0 +1,9 @@ +# Copyright (c) 2020 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. + +brave_components_search_engines_sources = [ + "//brave/components/search_engines/brave_prepopulated_engines.cc", + "//brave/components/search_engines/brave_prepopulated_engines.h" +] diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch new file mode 100644 index 000000000000..6e86c37234d4 --- /dev/null +++ b/patches/components-search_engines-BUILD.gn.patch @@ -0,0 +1,12 @@ +diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn +index eb66a2d945650a81c3a3248975fb9deda036e51e..f11f019049297b7dd777a27b3a5bd4cd6a692784 100644 +--- a/components/search_engines/BUILD.gn ++++ b/components/search_engines/BUILD.gn +@@ -194,6 +194,7 @@ json_to_struct("prepopulated_engines") { + schema_file = "prepopulated_engines_schema.json" + namespace = "TemplateURLPrepopulateData" + deps = [ ":search_engine_type" ] ++ additional_sources = brave_components_search_engines_sources + } + + if (is_android) { diff --git a/patches/tools-json_to_struct-json_to_struct.gni.patch b/patches/tools-json_to_struct-json_to_struct.gni.patch new file mode 100644 index 000000000000..4771f3ada84e --- /dev/null +++ b/patches/tools-json_to_struct-json_to_struct.gni.patch @@ -0,0 +1,12 @@ +diff --git a/tools/json_to_struct/json_to_struct.gni b/tools/json_to_struct/json_to_struct.gni +index 29afcb2106c8366b62f783c6a590468025a84608..fc446fec551a75610ea419eab2fe72024e7c7834 100644 +--- a/tools/json_to_struct/json_to_struct.gni ++++ b/tools/json_to_struct/json_to_struct.gni +@@ -57,6 +57,7 @@ template("json_to_struct") { + } + + sources = get_target_outputs(":$action_name") ++ if (defined(invoker.additional_sources)) { sources += invoker.additional_sources } + + deps = [ ":$action_name" ] + From c7075d774bc00110d46dd1bc965a575a6ef11133 Mon Sep 17 00:00:00 2001 From: samartnik Date: Thu, 15 Oct 2020 14:48:21 -0400 Subject: [PATCH 122/152] [Android] Fix for linker error on release builds Fixes error: ld.lld: error: linking module flags 'ProfileSummary': IDs have conflicting values in 'obj/third_party/perfetto/src/tracing/client_api_without_backends/event_context.o' and 'ld-temp.o' Chromium change: https://chromium.googlesource.com/chromium/src/+/234e6c6a77f61ffad9335099d9b13892cf88fd44 Roll clang llvmorg-12-init-5035-gd0abc757-2 : llvmorg-12-init-5627-gf086e85e-1. Ran `./tools/clang/scripts/upload_revision.py f086e85eea94a51eb42115496ac5d24f07bc8791`. Bug: 1126953 --- build/config/compiler.gni | 8 ++++++++ patches/build-config-compiler-BUILD.gn.patch | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/build/config/compiler.gni b/build/config/compiler.gni index 4941a236cc7f..d787453b32b2 100644 --- a/build/config/compiler.gni +++ b/build/config/compiler.gni @@ -5,6 +5,14 @@ # Adjusts compiler flags in //build/config/compiler:chromium_code. brave_removed_chromium_code_cflags = [] +brave_removed_compiler_cflags = [] +brave_added_compiler_cflags = [] if (is_clang) { brave_removed_chromium_code_cflags += [ "-Wunreachable-code" ] + if (is_android) { + # We need to remove combination of "-mllvm" and "-enable-dse-memoryssa=false", + # but "-instcombine-lower-dbg-declare=0" is also used with "-mllvm" so we re-add that combination + brave_removed_compiler_cflags = [ "-mllvm", "-instcombine-lower-dbg-declare=0", "-enable-dse-memoryssa=false", ] + brave_added_compiler_cflags = [ "-mllvm", "-instcombine-lower-dbg-declare=0", ] + } } diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 9cc37a2ee528..ea7b61663a66 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,8 +1,16 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 4f6461b6b5f5b42669e03e4334a297011caa2e98..ed4e2540fc50bb3d20ce65fd4db9dce12815039c 100644 +index 4f6461b6b5f5b42669e03e4334a297011caa2e98..d1bd50b0e40ddea005c55f14a1962252fce5bf25 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1646,6 +1646,7 @@ config("chromium_code") { +@@ -730,6 +730,7 @@ config("compiler") { + asmflags += cflags + asmflags += cflags_c + } ++ cflags -= brave_removed_compiler_cflags cflags += brave_added_compiler_cflags + } + + # This provides the basic options to select the target CPU and ABI. +@@ -1646,6 +1647,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } From ff4a44f663b4e241b0a04ecd23aa3eb16409e31b Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 15 Oct 2020 11:24:25 -0400 Subject: [PATCH 123/152] Updated patches after rebase on master. --- patches/chrome-VERSION.patch | 2 +- ...ome-browser-ui-views-location_bar-location_bar_view.cc.patch | 2 +- ...enderer-modules-webgl-webgl2_rendering_context_base.cc.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 4faed99b4f2f..a1dec003f964 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,5 +1,5 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 8075ee7823ef12e3794b70df18247820bbfe706d..7f24bb0333a250354d0ed93b4ffcf42c9355a137 100644 +index 8075ee7823ef12e3794b70df18247820bbfe706d..36e236114f137df00fe91a3e44bbd6ec1093925d 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index de449e962470..c5385d2a79e0 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index c5859e342846e264ad739ba03bceaa2ef226b5f8..986272edd5cfe7c4636b20bc0ddbf6eab114221e 100644 +index c5859e342846e264ad739ba03bceaa2ef226b5f8..cec3a78bb5874d2a3da18cd44cac705530b39cb3 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -570,6 +570,7 @@ void LocationBarView::Layout() { diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch index 70415bc2787b..30b76daec408 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index 9d96ae4f9c6f646685acddfdf44cb410f18a9b7a..c9b2f0c2de91fac709eee699e6f14140e298837e 100644 +index 9d96ae4f9c6f646685acddfdf44cb410f18a9b7a..64251ff0b4bffe36dcc6ca70214d5c5d30532a69 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc @@ -5081,6 +5081,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, From 9d87b4c79ba870544095d01963be29f8da265555 Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 16 Oct 2020 09:47:05 -0400 Subject: [PATCH 124/152] [Android] Fixes for main menu related to BottomToolbar This commit fixes these issues: - Main menu is always on bottom, even when it is disabled. - Icons in main menu are always on top, even when bottom toolbar enabled. Underlying chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- .../BraveTabbedAppMenuPropertiesDelegate.java | 30 +++++++++++++++++++ .../settings/AppearancePreferences.java | 2 ++ 2 files changed, 32 insertions(+) diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index dc2fcbd7c930..b58932b14202 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -30,6 +30,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.toolbar.ToolbarManager; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler; @@ -59,6 +60,11 @@ public void prepareMenu(Menu menu, AppMenuHandler handler) { // and removed when menu is dismissed. if (!shouldShowPageMenu()) return; + if (isMenuButtonInBottomToolbar()) { + // Do not show icon row on top when menu itself is on bottom + menu.findItem(R.id.icon_row_menu_id).setVisible(false).setEnabled(false); + } + // Brave donesn't show help menu item in app menu. menu.findItem(R.id.help_id).setVisible(false).setEnabled(false); @@ -127,4 +133,28 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) { shareButton.setContentDescription(mContext.getString(R.string.share)); } } + + @Override + public boolean shouldShowHeader(int maxMenuHeight) { + if (isMenuButtonInBottomToolbar()) return false; + return super.shouldShowHeader(maxMenuHeight); + } + + @Override + public boolean shouldShowFooter(int maxMenuHeight) { + if (isMenuButtonInBottomToolbar()) return true; + return super.shouldShowFooter(maxMenuHeight); + } + + @Override + public int getFooterResourceId() { + if (isMenuButtonInBottomToolbar()) { + return shouldShowPageMenu() ? R.layout.icon_row_menu_footer : 0; + } + return super.getFooterResourceId(); + } + + private boolean isMenuButtonInBottomToolbar() { + return BraveMenuButtonCoordinator.isMenuFromBottom(); + } } diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java index 087588b264b1..ce7d0ddcc80d 100644 --- a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java @@ -23,6 +23,7 @@ import org.chromium.chrome.browser.preferences.BravePreferenceKeys; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.ui.base.DeviceFormFactor; @@ -121,6 +122,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { .putBoolean(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, !originalStatus) .apply(); + BraveMenuButtonCoordinator.setMenuFromBottom(!originalStatus); BraveRelaunchUtils.askForRelaunch(getActivity()); } else if (PREF_HIDE_BRAVE_REWARDS_ICON.equals(key)) { SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences(); From 33dc261aac31923488283b1984b3aed42469dd0b Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 16 Oct 2020 11:10:50 -0400 Subject: [PATCH 125/152] Lint fix. --- browser/ipfs/ipfs_tab_helper_browsertest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/ipfs/ipfs_tab_helper_browsertest.cc b/browser/ipfs/ipfs_tab_helper_browsertest.cc index ac614a6ea0d9..e59e3002b7f9 100644 --- a/browser/ipfs/ipfs_tab_helper_browsertest.cc +++ b/browser/ipfs/ipfs_tab_helper_browsertest.cc @@ -130,7 +130,8 @@ IN_PROC_BROWSER_TEST_F(IPFSTabHelperTest, InfobarAddWithAccept) { InfoBarService::FromWebContents(active_contents()); AddInfoBarObserver(infobar_service); EXPECT_TRUE(NavigateToURLUntilLoadStop( - "cloudflare-ipfs.com", "/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR")); + "cloudflare-ipfs.com", + "/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR")); WaitForInfobarAdded(); InfoBarAccept(ConfirmInfoBarDelegate::BUTTON_OK | @@ -147,7 +148,8 @@ IN_PROC_BROWSER_TEST_F(IPFSTabHelperTest, InfobarAddWithSettings) { InfoBarService::FromWebContents(active_contents()); AddInfoBarObserver(infobar_service); EXPECT_TRUE(NavigateToURLUntilLoadStop( - "cloudflare-ipfs.com", "/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR")); + "cloudflare-ipfs.com", + "/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR")); WaitForInfobarAdded(); InfoBarCancel(ConfirmInfoBarDelegate::BUTTON_OK | From 2a43216d51c7558bd323a3783a2cc94de242b7c3 Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 16 Oct 2020 16:43:19 -0400 Subject: [PATCH 126/152] [Android] Added proper tint changing for menu button on BottomToolbar Underlying chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- .../bottom/BrowsingModeBottomToolbarCoordinator.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index f96dfd26160e..dd5edd0ac03f 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -81,6 +81,7 @@ public class BrowsingModeBottomToolbarCoordinator { private CallbackController mCallbackController = new CallbackController(); private final BookmarksButton mBookmarkButton; private final MenuButton mMenuButton; + private ThemeColorProvider mThemeColorProvider; /** * Build the coordinator that manages the browsing mode bottom toolbar. @@ -189,6 +190,7 @@ void onVisibilityChanged(boolean isVisible) {} void initializeWithNative(OnClickListener newTabListener, OnClickListener tabSwitcherListener, AppMenuButtonHelper menuButtonHelper, TabCountProvider tabCountProvider, ThemeColorProvider themeColorProvider, IncognitoStateProvider incognitoStateProvider) { + mThemeColorProvider = themeColorProvider; mMediator.setThemeColorProvider(themeColorProvider); if (BottomToolbarVariationManager.isNewTabButtonOnBottom()) { mNewTabButton.setOnClickListener(newTabListener); @@ -215,6 +217,7 @@ void initializeWithNative(OnClickListener newTabListener, OnClickListener tabSwi mBookmarkButton.setThemeColorProvider(themeColorProvider); mMenuButton.setAppMenuButtonHelper(menuButtonHelper); + mThemeColorProvider.addTintObserver(mMenuButton); } private void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { @@ -286,6 +289,9 @@ public void destroy() { mSearchAccelerator.destroy(); mTabSwitcherButtonCoordinator.destroy(); mBookmarkButton.destroy(); + if (mThemeColorProvider != null) { + mThemeColorProvider.removeTintObserver(mMenuButton); + } } public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { From c807efdf03d00ed321b7c599cbb67ed58780a2b3 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 19 Oct 2020 11:02:26 -0400 Subject: [PATCH 127/152] [Android] Fixed crash on popup notification This commit fixes crash when popup notification appears (for instance when app requests some permission). Crash occurs due to NullPointerException on trying to disable menu button on top toolbar when bottom toolbar is enabled. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- .../chrome/browser/toolbar/BraveToolbarManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 15a09e532d51..2336716ead6f 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -135,7 +135,11 @@ public void initializeWithNative(LayoutManager layoutManager, @Override public @Nullable View getMenuButtonView() { - if (mMenuButtonCoordinator.getMenuButton() == null) return null; + if (mMenuButtonCoordinator.getMenuButton() == null) { + // Return fake view instead of null to avoid NullPointerException as some code within + // Chromium doesn't check for null. + return new View(mActivity); + } return super.getMenuButtonView(); } From a342d799c8fc985bc35ac3ca19f48b5bd2095ad5 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 19 Oct 2020 12:04:52 -0400 Subject: [PATCH 128/152] [Android] Fixed menu button visibility on overview animation This commit fixes issues with menu button visible on overview animation when bottom toolbar is visible. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- ...m-chrome-browser-toolbar-ToolbarManager.java.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch index 3537d610acb7..30c2a79e90b2 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch @@ -1,5 +1,5 @@ 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 f47d98236abb257f3a87e44c216f15bec6928b3c..bb361c1df24d7529e97aa5d516d55dc195457036 100644 +index f47d98236abb257f3a87e44c216f15bec6928b3c..0b8d4f7d51be81e3258ff399e427c20b4718f9f9 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 @@ -304,7 +304,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve @@ -11,6 +11,15 @@ index f47d98236abb257f3a87e44c216f15bec6928b3c..bb361c1df24d7529e97aa5d516d55dc1 mControlsVisibilityDelegate, mActivity, (focus, type) -> setUrlBarFocus(focus, type), +@@ -313,7 +313,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve + mActivity.isCustomTab() ? mCustomTabThemeColorProvider + : browsingModeThemeColorProvider, + R.id.menu_button_wrapper); +- MenuButtonCoordinator startSurfaceMenuButtonCoordinator = new MenuButtonCoordinator( ++ MenuButtonCoordinator startSurfaceMenuButtonCoordinator = new org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator( + appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mActivity, + (focus, type) + -> setUrlBarFocus(focus, type), @@ -631,7 +631,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve ThemeColorProvider browsingModeThemeColorProvider, MenuButtonCoordinator startSurfaceMenuButtonCoordinator, Invalidator invalidator, From eecdc2fa5edd41ebde79484b32c89ecd3713900a Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 20 Oct 2020 11:04:49 -0400 Subject: [PATCH 129/152] Updated patches after rebase on master. --- patches/chrome-VERSION.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index a1dec003f964..5f4e2c430c51 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,5 +1,5 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 8075ee7823ef12e3794b70df18247820bbfe706d..36e236114f137df00fe91a3e44bbd6ec1093925d 100644 +index 8075ee7823ef12e3794b70df18247820bbfe706d..3667f868a6f2d06babedef618419efd0585b0c11 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ From b027bd4427a7c700d03d10e761dd992d8e15e25f Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 20 Oct 2020 11:42:13 -0400 Subject: [PATCH 130/152] component_updater::RegisterFileTypePoliciesComponent signature changed. Chromium change: https://source.chromium.org/chromium/chromium/src/+/eb9b67c9dd2c52d1e8627f5269a387a1d6a74fc4 commit eb9b67c9dd2c52d1e8627f5269a387a1d6a74fc4 Author: cfredric Date: Tue Sep 8 22:39:33 2020 +0000 Remove unused user_data_dir parameter. Bug: 1126207 --- .../file_type_policies_component_installer.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chromium_src/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chromium_src/chrome/browser/component_updater/file_type_policies_component_installer.cc index 9764e1666376..ac18ca0c34d3 100644 --- a/chromium_src/chrome/browser/component_updater/file_type_policies_component_installer.cc +++ b/chromium_src/chrome/browser/component_updater/file_type_policies_component_installer.cc @@ -19,8 +19,7 @@ void OnFileTypePoliciesRegistered() { component_updater::BraveOnDemandUpdate(kFileTypePoliciesComponentId); } -void RegisterFileTypePoliciesComponent(ComponentUpdateService* cus, - const base::FilePath& user_data_dir) { +void RegisterFileTypePoliciesComponent(ComponentUpdateService* cus) { auto installer = base::MakeRefCounted( std::make_unique()); installer->Register(cus, base::Bind(&OnFileTypePoliciesRegistered)); From 761d3f1b574b9fb0ba11f9124040c2ea79954e24 Mon Sep 17 00:00:00 2001 From: samartnik Date: Tue, 20 Oct 2020 12:54:43 -0400 Subject: [PATCH 131/152] [Android] TabUtils were updated Change from master: https://github.com/brave/brave-core/commit/4641e84065dbd5327f439edc117a563ee5243ba5 Update TabUtils --- .../browser/toolbar/bottom/BottomToolbarCoordinator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java index 93bb93c6353a..c25ec4cf184c 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -24,6 +24,7 @@ import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; +import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; @@ -292,7 +293,7 @@ public void onOverviewModeFinishedHiding() { mNewTabButton.setOnLongClickListener(this); } - ChromeActivity activity = TabUtils.getChromeActivity(); + ChromeActivity activity = BraveActivity.getBraveActivity(); if (mScrollingBottomView != null && activity != null) { mScrollingBottomView.setSwipeDetector( activity.getCompositorViewHolder().getLayoutManager().getToolbarSwipeHandler()); From 1a436649f04ca309d0a4a6f67ca24edf64dcad96 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 21 Oct 2020 14:22:19 -0400 Subject: [PATCH 132/152] Updated patches from Chromium 87.0.4280.20 to Chromium 87.0.4280.27. --- patches/chrome-VERSION.patch | 4 +- patches/chrome-android-BUILD.gn.patch | 4 +- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...d-expectations-lint-suppressions.xml.patch | 4 +- ...me-browser-ChromeTabbedActivity.java.patch | 14 +++---- ...me-browser-ntp-NewTabPageLayout.java.patch | 2 +- ...tings-AccountManagementFragment.java.patch | 2 +- ...ync-settings-ManageSyncSettings.java.patch | 4 +- ...me-browser-ui-RootUiCoordinator.java.patch | 4 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 4 +- ...flags-android-chrome_feature_list.cc.patch | 4 +- ...tings-content_setting_image_model.cc.patch | 4 +- ...ws-bookmarks-bookmark_bubble_view.cc.patch | 4 +- ...ttings_localized_strings_provider.cc.patch | 4 +- patches/chrome-test-BUILD.gn.patch | 2 +- ...-canvas-canvas_async_blob_creator.cc.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...modules-mediastream-media_devices.cc.patch | 4 +- ...ebgl-webgl_rendering_context_base.cc.patch | 42 +++++++++---------- ...rams_xml-histogram_suffixes_list.xml.patch | 2 +- 21 files changed, 61 insertions(+), 61 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 5f4e2c430c51..17a9e408e381 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 8075ee7823ef12e3794b70df18247820bbfe706d..3667f868a6f2d06babedef618419efd0585b0c11 100644 +index daea3677a4069261ba8871bd8120473be228b9dd..457f6d1c67b3437bcbc613ee11c4e8c2b264d688 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=87 -MINOR=0 -BUILD=4280 --PATCH=20 +-PATCH=27 +MINOR=1 +BUILD=18 +PATCH=15 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 16d3a62ac950..3c7af247aa14 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index f8b356750cc629d80a409c8c0975eff1e3094e94..d1210468de4e9bb7811a755a334f69a5ca5dfa6e 100644 +index ab247dad56e8cc2ed16d3a9730a2f3403e50bf0b..ca4002ae3579327f935024cbc322bb2468307a10 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -234,6 +234,7 @@ android_resources("chrome_app_java_resources") { @@ -34,7 +34,7 @@ index f8b356750cc629d80a409c8c0975eff1e3094e94..d1210468de4e9bb7811a755a334f69a5 } action("chrome_android_java_google_api_keys_srcjar") { -@@ -1760,6 +1764,7 @@ if (current_toolchain == default_toolchain) { +@@ -1761,6 +1765,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index b00917f4e9c0..6f6fae83654d 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index a8f04bd1adbd56111da4587b064780c87557aa45..f1be3a6ef699f74c0a8f380e4d718075fc1b2d23 100644 +index 5353c2b915eb5e586f3e7a0f085c1d311baf741d..50503143f0a93ee8968a59fd57eea10021e5776e 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1705,3 +1705,4 @@ chrome_java_sources = [ +@@ -1707,3 +1707,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/HandlerResponseCallback.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index 23edaa43b7af..1dc7a3c50f10 100644 --- a/patches/chrome-android-expectations-lint-suppressions.xml.patch +++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml -index f5e6db4ae73283b30e22a937628548a1f2d1cee2..3f433109e8b9c7ee8a31ba82fded6436c838c5b6 100644 +index 203124f2932a9badc43045335a8d1140bc01e367..ee0a860dea77afdf362d5aea0a679cc3641c9642 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml -@@ -364,4 +364,5 @@ Still reading? +@@ -366,4 +366,5 @@ Still reading? diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index af1e22897b4c..cb4706c4732e 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 9cafb3fe5fa0fe0da154be0a9b3356e65e001606..ffeba32ce1ba6ce2afb88f6bb60a9a8d7de5363a 100644 +index ee8091e415ce9ce78c5a8928fed6a928a081d12a..114cb4a40d9dd96670ab1f55a9c24e8eea754729 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -184,7 +184,7 @@ import java.util.Locale; +@@ -183,7 +183,7 @@ import java.util.Locale; * This is the main activity for ChromeMobile when not running in document mode. All the tabs * are accessible via a chrome specific tab switching UI. */ @@ -11,7 +11,7 @@ index 9cafb3fe5fa0fe0da154be0a9b3356e65e001606..ffeba32ce1ba6ce2afb88f6bb60a9a8d implements ChromeAccessibilityUtil.Observer { private static final String TAG = "ChromeTabbedActivity"; -@@ -976,7 +976,7 @@ public class ChromeTabbedActivity extends ChromeActivity( @@ -20,7 +20,7 @@ index 9cafb3fe5fa0fe0da154be0a9b3356e65e001606..ffeba32ce1ba6ce2afb88f6bb60a9a8d assert profile != null : "Unexpectedly null profile from TabModel."; if (profile == null) return; -@@ -1417,7 +1417,7 @@ public class ChromeTabbedActivity extends ChromeActivity> result; for (auto type : kContentSettingImageOrder) result.push_back(CreateForContentType(type)); diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch index c4f5902990ed..002ca669a0c6 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -index 10a65bc6743544cdfd8d1d2578ab766149e10ccd..2042b465b0d074ade83c6f0165e5518ad0d86ad2 100644 +index b942c4bae3997aab4733f5111a2fc62ede8b9165..c64c9c2f69b01e7dad47bf644576bcdbc6377d9e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -@@ -224,6 +224,7 @@ void BookmarkBubbleView::ShowBubble( +@@ -227,6 +227,7 @@ void BookmarkBubbleView::ShowBubble( std::move(dialog_model), anchor_view, views::BubbleBorder::TOP_RIGHT); bubble->SelectAllText(kBookmarkName); bookmark_bubble_ = bubble.get(); diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 2de2bed0136f..f1c91af28e8e 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index bb0272c5a95f7f5ef0134447d54e7e00635a3b82..c6c4a32cf73d9b3174bc8d86cfae106bd9732141 100644 +index 898a006aafe350d5bf792c6132b43f436b04bf76..ea604aae865eddfb4a084d999fd2280a630f1c17 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2392,6 +2392,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2396,6 +2396,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 03d6d4e2187c..ab8aa6e41e47 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 5a980cb49fcd7dc3c83b069ceadddd574799dd14..0de3f08124466d748e2848c7564a35bb2f080bf9 100644 +index ef081dc339432bc7cb4e448b2616c6f8ba5567f0..416467abd1d9989d6eedc865ad2bc79acf655a18 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -840,6 +840,7 @@ if (!is_android) { diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch index 6ea63f4484a8..fdd7722febeb 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -index c54955aa7664819a01b21d0b0dcbb0ab3131277b..40f2c00d98e5f2e1d42e44abc0b24f9cc8a17978 100644 +index 8158fe91b8ef21e3307106b584690139f0d022f2..9755dac25a7cb34c0d1ae10689fbedb894a44834 100644 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -190,6 +190,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 5929e12a7b6c..64056213462a 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index d65546f5ca089083336f54770f1cab864d8c1f4a..52fc23ad50f202aa420964a29c3c4c7bcae6bc34 100644 +index b2d8597ef95e2f6fc2758cdac44337ea2927c178..71607594a40d4b35758c6a65e53b7e51ac2bdf9f 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -972,6 +972,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -974,6 +974,7 @@ String HTMLCanvasElement::ToDataURLInternal( scoped_refptr image_bitmap = Snapshot(source_buffer); if (image_bitmap) { diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch index 844b30d6e356..d2d74b98bdde 100644 --- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch +++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index 5a2adbb4956bc9a032450d305786d785a3091215..3cb58d3dde53f276f37f6923af55dc8edf9f557d 100644 +index 4958db291d8059948645122d4644af99adcb4526..7e0b472a2e2b85edbd618ec0a7fe05e0fd773262 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -351,6 +351,8 @@ void MediaDevices::DevicesEnumerated( +@@ -353,6 +353,8 @@ void MediaDevices::DevicesEnumerated( } } diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 055a7e1de5d3..1ef762055f16 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,5 +1,5 @@ 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 -index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57e6763eb3 100644 +index 57ae533584ba039421c22a814c11d46603c57197..95e28d3043b9eb332ba0c562304d38f866e18ea3 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc @@ -2956,6 +2956,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( @@ -50,23 +50,23 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3594,6 +3600,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3596,6 +3602,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: + BRAVE_WEBGL_GET_PARAMETER_UNMASKED_RENDERER if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { - if (IdentifiabilityStudySettings::Get()->IsActive()) { - RecordIdentifiableGLParameterDigest( -@@ -3608,6 +3615,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, + if (IdentifiabilityStudySettings::Get()->IsTypeAllowed( + blink::IdentifiableSurface::Type::kWebGLParameter)) { +@@ -3611,6 +3618,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: + BRAVE_WEBGL_GET_PARAMETER_UNMASKED_VENDOR if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { - if (IdentifiabilityStudySettings::Get()->IsActive()) { - RecordIdentifiableGLParameterDigest( -@@ -3695,6 +3703,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( + if (IdentifiabilityStudySettings::Get()->IsTypeAllowed( + blink::IdentifiableSurface::Type::kWebGLParameter)) { +@@ -3699,6 +3707,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( ScriptState* script_state, WebGLProgram* program, GLenum pname) { @@ -74,7 +74,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3756,6 +3765,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3760,6 +3769,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3766,6 +3776,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3770,6 +3780,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3810,6 +3821,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3814,6 +3825,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( ScriptState* script_state, WebGLShader* shader, GLenum pname) { @@ -98,7 +98,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3841,6 +3853,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3845,6 +3857,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3871,6 +3884,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3875,6 +3888,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 auto* result = MakeGarbageCollected( range[0], range[1], precision); RecordShaderPrecisionFormatForStudy(shader_type, precision_type, result); -@@ -3880,6 +3894,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3884,6 +3898,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 return EnsureNotNull(shader->Source()); } -@@ -3887,6 +3902,7 @@ base::Optional> +@@ -3891,6 +3906,7 @@ base::Optional> WebGLRenderingContextBase::getSupportedExtensions() { if (isContextLost()) return base::nullopt; @@ -130,7 +130,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 Vector result; -@@ -3909,6 +3925,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3913,6 +3929,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3943,6 +3960,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3947,6 +3964,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -146,7 +146,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4223,6 +4241,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4227,6 +4245,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -154,7 +154,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4247,6 +4266,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4251,6 +4270,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -162,7 +162,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4324,6 +4344,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4328,6 +4348,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -170,7 +170,7 @@ index 4e9e244462c46d7af818b73bf7e8b97a87e573f8..1f46ccdd448d96880393dcb704f2ed57 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4680,6 +4701,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4685,6 +4706,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch index f0e25dae2214..272b993ccb28 100644 --- a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch @@ -1,5 +1,5 @@ diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -index ce699331d0bc63d43105113e465196b592f9ee4d..3cdb23407c8e5187bbcbf32665ecd07c9145212f 100644 +index 3e9308869b0ad7c03ed975f776c2662c49cd9718..7344d9e933bc492a48474763e66ea3a83255b136 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml @@ -13725,6 +13725,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. From ee6dd43bfe6b0de4d06ab5180b06d20286669657 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 21 Oct 2020 15:56:45 -0400 Subject: [PATCH 133/152] Updated strings for Chromium 87.0.4280.27. --- app/settings_brave_strings.grdp | 5 ++++- app/settings_strings.grdp | 10 ++++++---- browser/ui/android/strings/android_chrome_strings.grd | 3 --- components/autofill_payments_strings.grdp | 5 +---- components/components_strings.grd | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp index 7ccb49f643b7..3a7863a2d6b0 100644 --- a/app/settings_brave_strings.grdp +++ b/app/settings_brave_strings.grdp @@ -72,7 +72,10 @@ To check if your passwords are safe from data breaches and other security issues, <a target='_blank' href='$1'>sign in to Brave</a>. - To check if your other passwords are safe from data breaches and other security issues, <br/><a target='_blank' href='$1'>sign in to Brave</a>. + To check if your other passwords are safe from data breaches and other security issues, <a target='_blank' href='$1'>sign in to Brave</a>. + + + Weak passwords are easy to guess. Let Brave <a target='_blank' href='$1'>create and remember strong passwords for you</a>. If so, please edit your saved password in Brave so it matches your new password. diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index ffb972589996..8c1399d0134e 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -359,8 +359,11 @@ =1 {Found {COUNT} security issue} other {Found {COUNT} security issues}} - - No weak passwords found + + {COUNT, plural, + =0 {No weak passwords found} + =1 {Found {COUNT} weak password} + other {Found {COUNT} weak passwords}} Check again @@ -387,8 +390,7 @@ Weak passwords - Weak passwords are easy to guess. Make sure you're creating strong passwords. - <br/><a target='_blank' href='$1'>See more security tips.</a> + Weak passwords are easy to guess. Make sure you're creating strong passwords. <a target='_blank' href='$1'>See more security tips.</a> Change password diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index a6dccf6344c8..a18093ce4878 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -4098,9 +4098,6 @@ Data from your Private session will only be cleared from Brave when you Displaying Paint Preview. Press back to exit the Paint Preview demo. - - Exited Paint Preview demo. - Paint Preview playback failed. diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index 799e9e418be1..6674ca6a7c36 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -507,10 +507,7 @@ - $15% Cash Back - - - $1$$3 Off + Cashback linked diff --git a/components/components_strings.grd b/components/components_strings.grd index c5efe982fcbd..9deb485b08fe 100644 --- a/components/components_strings.grd +++ b/components/components_strings.grd @@ -336,7 +336,7 @@ Close - + Clear From ba80dd65c28aff838bf52be5f0ca40dff5cef906 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 21 Oct 2020 16:10:16 -0400 Subject: [PATCH 134/152] Updated url_constants.cc override. --- chromium_src/chrome/common/url_constants.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index 074e478c93cd..afe338bf6194 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -180,6 +180,8 @@ const char kPageInfoHelpCenterURL[] = const char kPasswordCheckLearnMoreURL[] = "https://support.brave.com/"; +const char kPasswordGenerationLearnMoreURL[] = "https://support.brave.com/"; + const char kPasswordManagerLearnMoreURL[] = "https://support.brave.com/hc/en-us/articles/" "360018185951-How-do-I-use-the-built-in-password-manager-"; From e980ffb025450f4372c4d4ad41f6daa56566de41 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 22 Oct 2020 13:01:22 -0400 Subject: [PATCH 135/152] Minimized patching of composition_parts.py. --- ...scripts-web_idl-composition_parts.py.patch | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/patches/third_party-blink-renderer-bindings-scripts-web_idl-composition_parts.py.patch b/patches/third_party-blink-renderer-bindings-scripts-web_idl-composition_parts.py.patch index ab44efca01fc..97598402d01d 100644 --- a/patches/third_party-blink-renderer-bindings-scripts-web_idl-composition_parts.py.patch +++ b/patches/third_party-blink-renderer-bindings-scripts-web_idl-composition_parts.py.patch @@ -1,23 +1,12 @@ diff --git a/third_party/blink/renderer/bindings/scripts/web_idl/composition_parts.py b/third_party/blink/renderer/bindings/scripts/web_idl/composition_parts.py -index 5e8de89409976528f8d97d4962f9f111c6d158a1..d8eca553b5c3aaa2ae3f8644457d20a7c4bb399b 100644 +index 5e8de89409976528f8d97d4962f9f111c6d158a1..5e685b654bb347797d78ddff8d25db14f61f4cd2 100644 --- a/third_party/blink/renderer/bindings/scripts/web_idl/composition_parts.py +++ b/third_party/blink/renderer/bindings/scripts/web_idl/composition_parts.py -@@ -147,6 +147,9 @@ class Location(object): - _blink_path_prefix = posixpath.sep + posixpath.join( - 'third_party', 'blink', 'renderer', '') - -+ _brave_path_prefix = posixpath.sep + posixpath.join( -+ 'brave', 'third_party', 'blink', 'renderer', '') -+ - def __init__(self, filepath=None, line_number=None, position=None): - assert filepath is None or isinstance(filepath, str) - assert line_number is None or isinstance(line_number, int) -@@ -155,7 +158,7 @@ class Location(object): - # idl_parser produces paths based on the working directory, which may - # not be the project root directory, e.g. "../../third_party/blink/...". +@@ -157,6 +157,7 @@ class Location(object): # Canonicalize the paths heuristically. -- if filepath is not None: -+ if filepath is not None and filepath.find(self._brave_path_prefix) < 0: + if filepath is not None: index = filepath.find(self._blink_path_prefix) ++ if filepath.find(posixpath.sep + posixpath.join('brave', 'third_party', 'blink', 'renderer', '')) >= 0: index = -1 if index >= 0: filepath = filepath[index + 1:] + From 3b12f1fd163886f4da5518e2dedbc87ed49420b9 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 22 Oct 2020 14:18:58 -0400 Subject: [PATCH 136/152] Disables kSignedExchangeSubresourcePrefetch feature. Chromium change: https://source.chromium.org/chromium/chromium/src/+/03a3886037b487217478029bb7fa64271ac386c1 commit 03a3886037b487217478029bb7fa64271ac386c1 Author: Kunihiko Sakamoto Date: Fri Sep 18 05:19:16 2020 +0000 Enable SignedExchangeSubresourcePrefetch at tip of tree Intent to ship: https://groups.google.com/a/chromium.org/g/blink-dev/c/tybtqf-tdB4/m/PSNj5vSEAwAJ Bug: 935267 --- app/brave_main_delegate.cc | 1 + app/brave_main_delegate_browsertest.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index 860ee689bb3d..2120f61b35f5 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -229,6 +229,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { features::kAllowPopupsDuringPageUnload.name, features::kNotificationTriggers.name, features::kPrivacySettingsRedesign.name, + features::kSignedExchangeSubresourcePrefetch.name, features::kSmsReceiver.name, features::kVideoPlaybackQuality.name, features::kTabHoverCards.name, diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index 1dd3d481ba61..df99bff34ffa 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -68,6 +68,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &features::kAllowPopupsDuringPageUnload, &features::kNotificationTriggers, &features::kPrivacySettingsRedesign, + &features::kSignedExchangeSubresourcePrefetch, &features::kSmsReceiver, &features::kVideoPlaybackQuality, &features::kTabHoverCards, From 3189f9a291805626780115bc070461e5943536ba Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 22 Oct 2020 14:46:20 -0400 Subject: [PATCH 137/152] Fixes incorrectly merged patch for passwords_section.html --- ...urces-settings-autofill_page-passwords_section.html.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch index 79ada900bd50..45d93d8c6379 100644 --- a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch +++ b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch @@ -1,12 +1,11 @@ diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.html b/chrome/browser/resources/settings/autofill_page/passwords_section.html -index 737197e790e1f703852096f44ff99ae7e0f3a649..6ab992318ab58e029eee0d61cee1361cdeb78848 100644 +index 737197e790e1f703852096f44ff99ae7e0f3a649..f1ef1e92f6f444bc5edc2633b2782729c3f392b9 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.html +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html -@@ -141,11 +141,16 @@ +@@ -141,11 +141,15 @@ aria-label="$i18n{checkPasswords}"> -+ + - -+ -

-

- $i18n{savedPasswordsHeading} From 5a5dd2306c08a9969e71e79d1469d7145c2e327e Mon Sep 17 00:00:00 2001 From: samartnik Date: Sun, 25 Oct 2020 06:36:13 -0400 Subject: [PATCH 142/152] [Android] Revrted: Fix for linker error on release builds Reverted previous commit as error was related to sccache --- build/config/compiler.gni | 8 -------- patches/build-config-compiler-BUILD.gn.patch | 12 ++---------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build/config/compiler.gni b/build/config/compiler.gni index d787453b32b2..4941a236cc7f 100644 --- a/build/config/compiler.gni +++ b/build/config/compiler.gni @@ -5,14 +5,6 @@ # Adjusts compiler flags in //build/config/compiler:chromium_code. brave_removed_chromium_code_cflags = [] -brave_removed_compiler_cflags = [] -brave_added_compiler_cflags = [] if (is_clang) { brave_removed_chromium_code_cflags += [ "-Wunreachable-code" ] - if (is_android) { - # We need to remove combination of "-mllvm" and "-enable-dse-memoryssa=false", - # but "-instcombine-lower-dbg-declare=0" is also used with "-mllvm" so we re-add that combination - brave_removed_compiler_cflags = [ "-mllvm", "-instcombine-lower-dbg-declare=0", "-enable-dse-memoryssa=false", ] - brave_added_compiler_cflags = [ "-mllvm", "-instcombine-lower-dbg-declare=0", ] - } } diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index ea7b61663a66..9cc37a2ee528 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,16 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 4f6461b6b5f5b42669e03e4334a297011caa2e98..d1bd50b0e40ddea005c55f14a1962252fce5bf25 100644 +index 4f6461b6b5f5b42669e03e4334a297011caa2e98..ed4e2540fc50bb3d20ce65fd4db9dce12815039c 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -730,6 +730,7 @@ config("compiler") { - asmflags += cflags - asmflags += cflags_c - } -+ cflags -= brave_removed_compiler_cflags cflags += brave_added_compiler_cflags - } - - # This provides the basic options to select the target CPU and ABI. -@@ -1646,6 +1647,7 @@ config("chromium_code") { +@@ -1646,6 +1646,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } From 8aa280ad87a2e83de93beaec123e73e7caae6150 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 26 Oct 2020 12:06:45 -0400 Subject: [PATCH 143/152] Code Review: changed BraveP3AService::OnHistogramChangedOnUI signature. --- components/p3a/brave_p3a_service.cc | 4 ++-- components/p3a/brave_p3a_service.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/p3a/brave_p3a_service.cc b/components/p3a/brave_p3a_service.cc index 8af675d911b8..62d2f59fde9b 100644 --- a/components/p3a/brave_p3a_service.cc +++ b/components/p3a/brave_p3a_service.cc @@ -392,7 +392,7 @@ void BraveP3AService::OnHistogramChanged(const char* histogram_name, base::PostTask(FROM_HERE, {content::BrowserThread::UI}, base::BindOnce(&BraveP3AService::OnHistogramChangedOnUI, this, - base::StringPiece(histogram_name), + histogram_name, kSuspendedMetricValue, kSuspendedMetricBucket)); return; @@ -428,7 +428,7 @@ void BraveP3AService::OnHistogramChanged(const char* histogram_name, histogram_name, sample, bucket)); } -void BraveP3AService::OnHistogramChangedOnUI(base::StringPiece histogram_name, +void BraveP3AService::OnHistogramChangedOnUI(const char* histogram_name, base::HistogramBase::Sample sample, size_t bucket) { VLOG(2) << "BraveP3AService::OnHistogramChanged: histogram_name = " diff --git a/components/p3a/brave_p3a_service.h b/components/p3a/brave_p3a_service.h index 9cbda8fdaddf..54cd1374f15b 100644 --- a/components/p3a/brave_p3a_service.h +++ b/components/p3a/brave_p3a_service.h @@ -70,7 +70,7 @@ class BraveP3AService : public base::RefCountedThreadSafe, uint64_t name_hash, base::HistogramBase::Sample sample); - void OnHistogramChangedOnUI(base::StringPiece histogram_name, + void OnHistogramChangedOnUI(const char* histogram_name, base::HistogramBase::Sample sample, size_t bucket); From 99fd8b0b172ad0b42431f68d0b936030bfcd5330 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 26 Oct 2020 13:18:45 -0400 Subject: [PATCH 144/152] [Android] Moved patches for BraveToolbarLayout and BraveTileView to asm As per codereview suggetions: https://github.com/brave/brave-core/pull/6554#discussion_r510308692 https://github.com/brave/brave-core/pull/6554#discussion_r510320067 --- .../chromium/chrome/browser/BytecodeTest.java | 4 ++++ build/android/bytecode/BUILD.gn | 2 ++ .../org/brave/bytecode/BraveClassAdapter.java | 2 ++ .../bytecode/BraveTileViewClassAdapter.java | 21 +++++++++++++++++++ .../BraveToolbarLayoutClassAdapter.java | 21 +++++++++++++++++++ ...atures-toolbar-CustomTabToolbar.java.patch | 13 ------------ ...stions-tile-SuggestionsTileView.java.patch | 13 ------------ 7 files changed, 50 insertions(+), 26 deletions(-) create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveTileViewClassAdapter.java create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-SuggestionsTileView.java.patch diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 35300e22e0f2..c5b4fe75f55b 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -50,6 +50,10 @@ public void testClassesExist() throws Exception { "org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTCoordinatorPhone")); Assert.assertTrue( classExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone")); + Assert.assertTrue(classExists( + "org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar")); + Assert.assertTrue( + classExists("org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView")); } @Test diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn index 210271b7b9ff..f61dba1510b0 100644 --- a/build/android/bytecode/BUILD.gn +++ b/build/android/bytecode/BUILD.gn @@ -25,6 +25,8 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSearchEngineAdapterClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTileViewClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/ByteCodeProcessor.java", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java index 33e501e23160..cf02212f83f9 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java @@ -26,6 +26,8 @@ public static ClassVisitor createAdapter(ClassVisitor chain) { chain = new BraveTopToolbarCoordinatorClassAdapter(chain); chain = new BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter(chain); chain = new BraveTabSwitcherModeTTPhoneClassAdapter(chain); + chain = new BraveToolbarLayoutClassAdapter(chain); + chain = new BraveTileViewClassAdapter(chain); return chain; } } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTileViewClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTileViewClassAdapter.java new file mode 100644 index 000000000000..4ecdfa98a4ac --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTileViewClassAdapter.java @@ -0,0 +1,21 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveTileViewClassAdapter extends BraveClassVisitor { + static String sSuggestionsTileViewClassName = + "org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView"; + + static String sBraveSuggestionsTileViewBaseClassName = + "org/chromium/chrome/browser/suggestions/tile/BraveTileView"; + + public BraveTileViewClassAdapter(ClassVisitor visitor) { + super(visitor); + changeSuperName(sSuggestionsTileViewClassName, sBraveSuggestionsTileViewBaseClassName); + } +} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java new file mode 100644 index 000000000000..ea849a92b042 --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java @@ -0,0 +1,21 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveToolbarLayoutClassAdapter extends BraveClassVisitor { + static String sCustomTabToolbarClassName = + "org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar"; + + static String sBraveCustomTabToolbarBaseClassName = + "org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout"; + + public BraveToolbarLayoutClassAdapter(ClassVisitor visitor) { + super(visitor); + changeSuperName(sCustomTabToolbarClassName, sBraveCustomTabToolbarBaseClassName); + } +} diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch deleted file mode 100644 index eacb10b380cc..000000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-customtabs-features-toolbar-CustomTabToolbar.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java -index 52c86139804e02f2548cc3890e7848f08c52cfca..619d73a5dd9aac2e26a0cc9330dd17698a4ce155 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java -@@ -97,7 +97,7 @@ import java.util.regex.Pattern; - /** - * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs. - */ --public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickListener { -+public class CustomTabToolbar extends org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout implements View.OnLongClickListener { - private static final Object ORIGIN_SPAN = new Object(); - - /** diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-SuggestionsTileView.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-SuggestionsTileView.java.patch deleted file mode 100644 index 8aa68d93f887..000000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-SuggestionsTileView.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java -index 219aad30b54a4cdbd9530b7f908ec07c4910b174..032f16f18f71ad72eebec2c0e8bdae869d5b73a6 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java -@@ -17,7 +17,7 @@ import org.chromium.url.GURL; - * The view for a site suggestion tile. Displays the title of the site beneath a large icon. If a - * large icon isn't available, displays a rounded rectangle with a single letter in its place. - */ --public class SuggestionsTileView extends TileView { -+public class SuggestionsTileView extends org.chromium.chrome.browser.suggestions.tile.BraveTileView { - /** The data currently associated to this tile. */ - private SiteSuggestion mData; - From f341cd595db4c275fc3d3e587953fba60acbe321 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 26 Oct 2020 15:43:30 -0400 Subject: [PATCH 145/152] [Android] Reverted: Block creation of ImageFetcher We don't need it anymore as DCHECK, for which it was added, is no longer in Chromium's code. --- .../prefetch/prefetch_service_factory.cc | 15 --------------- ...ges-prefetch-prefetch_service_factory.cc.patch | 12 ------------ 2 files changed, 27 deletions(-) delete mode 100644 chromium_src/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc delete mode 100644 patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch diff --git a/chromium_src/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b/chromium_src/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc deleted file mode 100644 index f3bbb1c8bc2d..000000000000 --- a/chromium_src/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// We don't have feed in Brave and thus don't need to create ImageFetcher -#define BRAVE_GET_IMAGE_FETCHER \ - const bool feed_enabled = \ - base::FeatureList::IsEnabled(feed::kInterestFeedContentSuggestions) || \ - base::FeatureList::IsEnabled(feed::kInterestFeedV2); \ - DCHECK(!feed_enabled); \ - return nullptr; - -#include "../../../../../../chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc" -#undef BRAVE_GET_IMAGE_FETCHER diff --git a/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch b/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch deleted file mode 100644 index 18e2f63c9e00..000000000000 --- a/patches/chrome-browser-offline_pages-prefetch-prefetch_service_factory.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc -index d2c8ad6ca350d7ac7eaceb8a0b71d8fa551740ec..f25aebb0450e625cd5c8b482400e5c45b5a69556 100644 ---- a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc -+++ b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc -@@ -51,6 +51,7 @@ namespace { - image_fetcher::ImageFetcher* GetImageFetcher( - ProfileKey* key, - image_fetcher::ImageFetcherConfig config) { -+ BRAVE_GET_IMAGE_FETCHER - image_fetcher::ImageFetcherService* image_fetcher_service = - ImageFetcherServiceFactory::GetForKey(key); - DCHECK(image_fetcher_service); From 4efd6f87bd213ed5f301011fdb79309fd46f1235 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 26 Oct 2020 16:29:07 -0400 Subject: [PATCH 146/152] Removed RLZ patches. Cr87 code review. The patches are not needed because rlz_enabled is gated on is_chrome_branded which we set to false. --- patches/rlz-BUILD.gn.patch | 12 ------------ patches/rlz-buildflags-buildflags.gni.patch | 12 ------------ 2 files changed, 24 deletions(-) delete mode 100644 patches/rlz-BUILD.gn.patch delete mode 100644 patches/rlz-buildflags-buildflags.gni.patch diff --git a/patches/rlz-BUILD.gn.patch b/patches/rlz-BUILD.gn.patch deleted file mode 100644 index 2b3c8b9a83c7..000000000000 --- a/patches/rlz-BUILD.gn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/rlz/BUILD.gn b/rlz/BUILD.gn -index 37247ec1e5683d6124335bb1f6405618169283a4..371f42d8ce0fc86f7946615b5119fcce84071565 100644 ---- a/rlz/BUILD.gn -+++ b/rlz/BUILD.gn -@@ -208,6 +208,7 @@ if (enable_rlz_support) { - } - } - } -+else { group("rlz_lib") {} group("rlz_lib_no_network") {} group("rlz_unittests") {} } - - if (!is_ios && !is_android) { - executable("rlz_id") { diff --git a/patches/rlz-buildflags-buildflags.gni.patch b/patches/rlz-buildflags-buildflags.gni.patch deleted file mode 100644 index e53bf1f1fbb8..000000000000 --- a/patches/rlz-buildflags-buildflags.gni.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/rlz/buildflags/buildflags.gni b/rlz/buildflags/buildflags.gni -index f70c30ce60d9e08b6a8269d78328d5aaaef75ece..42a5b597d6b172f812042905704f9b1f4ec393e1 100644 ---- a/rlz/buildflags/buildflags.gni -+++ b/rlz/buildflags/buildflags.gni -@@ -6,6 +6,6 @@ import("//build/config/chrome_build.gni") - - # Whether we are using the rlz library or not. Platforms like Android send - # rlz codes for searches but do not use the library. --enable_rlz_support = is_win || is_apple || is_chromeos -+enable_rlz_support = false - - enable_rlz = is_chrome_branded && enable_rlz_support From 749c7b487e61676d019dbf41d4b2147d55303491 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 26 Oct 2020 16:45:03 -0400 Subject: [PATCH 147/152] Updated patches after a rebase on master. --- patches/chrome-VERSION.patch | 2 +- .../content-browser-renderer_host-navigation_request.cc.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 17a9e408e381..685956e89f7c 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,5 +1,5 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index daea3677a4069261ba8871bd8120473be228b9dd..457f6d1c67b3437bcbc613ee11c4e8c2b264d688 100644 +index daea3677a4069261ba8871bd8120473be228b9dd..266a214d1305f637c139371cc7acdcf5dd201a0b 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 5fe564eeb181..e4f513f97095 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index ab58967aba4143d5a39f51d7bbeed0568e2fa012..720e9300bb66d352fd980e30fdc85671ac6f7d33 100644 +index ab58967aba4143d5a39f51d7bbeed0568e2fa012..9d9f4df6e32f2014cfce6f2f14292162e095791c 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -1812,6 +1812,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -1820,6 +1820,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); From 2981a53e0f16c5ca32889b9d8e21ef2f0bfab63b Mon Sep 17 00:00:00 2001 From: Simon Hong Date: Tue, 27 Oct 2020 11:10:31 +0900 Subject: [PATCH 148/152] Revert "Fix safari history import" This reverts commit f42f9b0bed2185d175a53a71cc451f58eed4b55f. We will not support history import from safary as chrome doesn't support it. --- .../common/importer/safari_importer_utils.mm | 13 +++---------- .../chrome/utility/importer/safari_importer.h | 5 +++-- .../chrome/utility/importer/safari_importer.mm | 18 ------------------ ...e-utility-importer-safari_importer.mm.patch | 12 ------------ utility/importer/brave_safari_importer.mm | 1 + 5 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 chromium_src/chrome/utility/importer/safari_importer.mm delete mode 100644 patches/chrome-utility-importer-safari_importer.mm.patch diff --git a/chromium_src/chrome/common/importer/safari_importer_utils.mm b/chromium_src/chrome/common/importer/safari_importer_utils.mm index d2430b77d888..cb7abf98e67e 100644 --- a/chromium_src/chrome/common/importer/safari_importer_utils.mm +++ b/chromium_src/chrome/common/importer/safari_importer_utils.mm @@ -3,24 +3,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#define SafariImporterCanImport SafariImporterCanImport_Chromium_Unused +#define SafariImporterCanImport SafariImporterCanImport_ChromiumImpl #include "../../../../../chrome/common/importer/safari_importer_utils.mm" #undef SafariImporterCanImport -// Upstream only shows supported list when browser can access to bookmarks. -// But, we let users know about disk access permission is needed when user -// select any services and we don't have proper access permission about it. -// So, we displays all supported services always. bool SafariImporterCanImport(const base::FilePath& library_dir, uint16_t* services_supported) { - base::FilePath safari_dir = library_dir.Append("Safari"); + SafariImporterCanImport_ChromiumImpl(library_dir, services_supported); - if (base::PathExists(safari_dir.Append("Bookmarks.plist"))) - *services_supported |= importer::FAVORITES; - - if (base::PathExists(safari_dir.Append("History.db"))) + if (base::PathExists(library_dir.Append("Safari").Append("History.db"))) *services_supported |= importer::HISTORY; return *services_supported != importer::NONE; diff --git a/chromium_src/chrome/utility/importer/safari_importer.h b/chromium_src/chrome/utility/importer/safari_importer.h index 6bbe04f9c142..b7f3d11d75ff 100644 --- a/chromium_src/chrome/utility/importer/safari_importer.h +++ b/chromium_src/chrome/utility/importer/safari_importer.h @@ -7,8 +7,9 @@ #define BRAVE_CHROMIUM_SRC_CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ #define BRAVE_SAFARI_IMPORTER_H \ - friend class BraveSafariImporter; \ - virtual void ImportHistory() {} + friend class BraveSafariImporter; + +#define ImportHistory virtual ImportHistory #include "../../../../../chrome/utility/importer/safari_importer.h" diff --git a/chromium_src/chrome/utility/importer/safari_importer.mm b/chromium_src/chrome/utility/importer/safari_importer.mm deleted file mode 100644 index 46f1c9d3b484..000000000000 --- a/chromium_src/chrome/utility/importer/safari_importer.mm +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// Can't avoid this injection because this code should be surrounded by -// ImporterBridge::NotifyStarted() and NotifyEnded() with other import logic. -#define BRAVE_START_IMPORT \ - if ((items & importer::HISTORY) && !cancelled()) { \ - bridge_->NotifyItemStarted(importer::HISTORY); \ - ImportHistory(); \ - bridge_->NotifyItemEnded(importer::HISTORY); \ - } - -#include "../../../../../chrome/utility/importer/safari_importer.mm" - -#undef BRAVE_START_IMPORT - diff --git a/patches/chrome-utility-importer-safari_importer.mm.patch b/patches/chrome-utility-importer-safari_importer.mm.patch deleted file mode 100644 index 9f317691dc8e..000000000000 --- a/patches/chrome-utility-importer-safari_importer.mm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/utility/importer/safari_importer.mm b/chrome/utility/importer/safari_importer.mm -index a83d19200f9b73f3adb22db0005891ab80d3dc80..7943f958997afe14390df7ceb77e95ade3385b5d 100644 ---- a/chrome/utility/importer/safari_importer.mm -+++ b/chrome/utility/importer/safari_importer.mm -@@ -47,6 +47,7 @@ void SafariImporter::StartImport(const importer::SourceProfile& source_profile, - ImportBookmarks(); - bridge_->NotifyItemEnded(importer::FAVORITES); - } -+ BRAVE_START_IMPORT - - bridge_->NotifyEnded(); - } diff --git a/utility/importer/brave_safari_importer.mm b/utility/importer/brave_safari_importer.mm index 2429661be14b..a4ac51a6fe34 100644 --- a/utility/importer/brave_safari_importer.mm +++ b/utility/importer/brave_safari_importer.mm @@ -33,6 +33,7 @@ NSString* history_db = [safari_dir stringByAppendingPathComponent:@"History.db"]; + // Import favicons. sql::Database db; const char* db_path = [history_db fileSystemRepresentation]; if (!db.Open(base::FilePath(db_path))) From 9266cdf23ddfeac8aa97f5e66d0ffd078746e6f2 Mon Sep 17 00:00:00 2001 From: Simon Hong Date: Tue, 27 Oct 2020 11:11:17 +0900 Subject: [PATCH 149/152] Revert "Revert "Revert "Import History from Safari""" This reverts commit 02814998e1110acf2c4c59b4b47eb6436c15a784. We will not support history import from safari as chrome doesn't support it. --- app/brave_generated_resources.grd | 2 +- .../settings/brave_import_data_handler_mac.mm | 34 +-------- .../common/importer/safari_importer_utils.mm | 20 ------ .../utility/importer/importer_creator.cc | 10 --- .../chrome/utility/importer/safari_importer.h | 19 ----- ...e-utility-importer-safari_importer.h.patch | 12 ---- utility/BUILD.gn | 13 ---- utility/importer/brave_safari_importer.h | 25 ------- utility/importer/brave_safari_importer.mm | 71 ------------------- 9 files changed, 4 insertions(+), 202 deletions(-) delete mode 100644 chromium_src/chrome/common/importer/safari_importer_utils.mm delete mode 100644 chromium_src/chrome/utility/importer/importer_creator.cc delete mode 100644 chromium_src/chrome/utility/importer/safari_importer.h delete mode 100644 patches/chrome-utility-importer-safari_importer.h.patch delete mode 100644 utility/importer/brave_safari_importer.h delete mode 100644 utility/importer/brave_safari_importer.mm diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index b96a2426c9b7..1bfb5472ff33 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -953,7 +953,7 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U Full Disk Access required - Brave needs Full Disk Access to import your Bookmarks and History from Safari. + Brave needs Full Disk Access to import your Bookmarks from Safari. Learn how to grant Full Disk Access from your System Preferences. diff --git a/browser/ui/webui/settings/brave_import_data_handler_mac.mm b/browser/ui/webui/settings/brave_import_data_handler_mac.mm index 9a44093a94d2..15bf7f367b40 100644 --- a/browser/ui/webui/settings/brave_import_data_handler_mac.mm +++ b/browser/ui/webui/settings/brave_import_data_handler_mac.mm @@ -32,26 +32,6 @@ using content::BrowserThread; -class ScopedOpenFile { - public: - explicit ScopedOpenFile(const base::FilePath& file_path) { - file_ = base::OpenFile(file_path, "r"); - } - - ~ScopedOpenFile() { - if (file_) - base::CloseFile(file_); - } - - bool CanRead() const { return !!file_; } - - ScopedOpenFile(const ScopedOpenFile&) = delete; - ScopedOpenFile& operator=(const ScopedOpenFile&) = delete; - - private: - FILE* file_ = nullptr; -}; - class FullDiskAccessConfirmDialogDelegate : public TabModalConfirmDialogDelegate { public: @@ -124,8 +104,7 @@ bool HasProperDiskAccessPermission(uint16_t imported_items) { if (imported_items & importer::FAVORITES) { const base::FilePath bookmarks_path = safari_dir.Append("Bookmarks.plist"); - ScopedOpenFile open_file(bookmarks_path); - if(!open_file.CanRead()) { + if(!PathIsWritable(bookmarks_path)) { LOG(ERROR) << __func__ << " " << bookmarks_path << " is not accessible." << " Please check full disk access permission."; return false; @@ -133,15 +112,8 @@ bool HasProperDiskAccessPermission(uint16_t imported_items) { } if (imported_items & importer::HISTORY) { - // HISTORY is set if plist or db exists. - base::FilePath history_path = safari_dir.Append("History.plist"); - if (!base::PathExists(history_path)) { - history_path = safari_dir.Append("History.db"); - DCHECK(base::PathExists(history_path)); - } - - ScopedOpenFile open_file(history_path); - if(!open_file.CanRead()) { + const base::FilePath history_path = safari_dir.Append("History.plist"); + if(!PathIsWritable(history_path)) { LOG(ERROR) << __func__ << " " << history_path << " is not accessible." << " Please check full disk access permission."; return false; diff --git a/chromium_src/chrome/common/importer/safari_importer_utils.mm b/chromium_src/chrome/common/importer/safari_importer_utils.mm deleted file mode 100644 index cb7abf98e67e..000000000000 --- a/chromium_src/chrome/common/importer/safari_importer_utils.mm +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#define SafariImporterCanImport SafariImporterCanImport_ChromiumImpl - -#include "../../../../../chrome/common/importer/safari_importer_utils.mm" - -#undef SafariImporterCanImport - -bool SafariImporterCanImport(const base::FilePath& library_dir, - uint16_t* services_supported) { - SafariImporterCanImport_ChromiumImpl(library_dir, services_supported); - - if (base::PathExists(library_dir.Append("Safari").Append("History.db"))) - *services_supported |= importer::HISTORY; - - return *services_supported != importer::NONE; -} diff --git a/chromium_src/chrome/utility/importer/importer_creator.cc b/chromium_src/chrome/utility/importer/importer_creator.cc deleted file mode 100644 index e75af9eefb45..000000000000 --- a/chromium_src/chrome/utility/importer/importer_creator.cc +++ /dev/null @@ -1,10 +0,0 @@ -/* Copyright 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "brave/utility/importer/brave_safari_importer.h" - -#define SafariImporter BraveSafariImporter -#include "../../../../../chrome/utility/importer/importer_creator.cc" -#undef SafariImporter diff --git a/chromium_src/chrome/utility/importer/safari_importer.h b/chromium_src/chrome/utility/importer/safari_importer.h deleted file mode 100644 index b7f3d11d75ff..000000000000 --- a/chromium_src/chrome/utility/importer/safari_importer.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_CHROMIUM_SRC_CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ -#define BRAVE_CHROMIUM_SRC_CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ - -#define BRAVE_SAFARI_IMPORTER_H \ - friend class BraveSafariImporter; - -#define ImportHistory virtual ImportHistory - -#include "../../../../../chrome/utility/importer/safari_importer.h" - -#undef BRAVE_SAFARI_IMPORTER_H -#undef ImportHistory - -#endif // BRAVE_CHROMIUM_SRC_CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ diff --git a/patches/chrome-utility-importer-safari_importer.h.patch b/patches/chrome-utility-importer-safari_importer.h.patch deleted file mode 100644 index 0a1f82fd3010..000000000000 --- a/patches/chrome-utility-importer-safari_importer.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/utility/importer/safari_importer.h b/chrome/utility/importer/safari_importer.h -index 1891fa3eff16f4e7b8f0821bc9f793c5e00514f7..89bce81bbc3d2f682adb3aacd888ac29f6d06e74 100644 ---- a/chrome/utility/importer/safari_importer.h -+++ b/chrome/utility/importer/safari_importer.h -@@ -46,6 +46,7 @@ class SafariImporter : public Importer { - uint16_t items, - ImporterBridge* bridge) override; - -+ BRAVE_SAFARI_IMPORTER_H - private: - FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, BookmarkImport); - FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, diff --git a/utility/BUILD.gn b/utility/BUILD.gn index 31855780e4ec..3450c56d5a29 100644 --- a/utility/BUILD.gn +++ b/utility/BUILD.gn @@ -43,19 +43,6 @@ source_set("utility") { ] } - if (is_mac) { - sources += [ - "importer/brave_safari_importer.mm", - "importer/brave_safari_importer.h", - ] - - deps += [ - "//base", - "//sql", - "//url", - ] - } - if (enable_tor) { deps += [ "//brave/components/services/tor" ] } diff --git a/utility/importer/brave_safari_importer.h b/utility/importer/brave_safari_importer.h deleted file mode 100644 index 9b74c6bbbd55..000000000000 --- a/utility/importer/brave_safari_importer.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_UTILITY_IMPORTER_BRAVE_SAFARI_IMPORTER_H_ -#define BRAVE_UTILITY_IMPORTER_BRAVE_SAFARI_IMPORTER_H_ - -#include "chrome/utility/importer/safari_importer.h" - -class BraveSafariImporter : public SafariImporter { - public: - using SafariImporter::SafariImporter; - - BraveSafariImporter(const BraveSafariImporter&) = delete; - BraveSafariImporter& operator=(const BraveSafariImporter&) = delete; - - private: - // SafariImporter overrides: - void ImportHistory() override; - - ~BraveSafariImporter() override; -}; - -#endif // BRAVE_UTILITY_IMPORTER_BRAVE_SAFARI_IMPORTER_H_ diff --git a/utility/importer/brave_safari_importer.mm b/utility/importer/brave_safari_importer.mm deleted file mode 100644 index a4ac51a6fe34..000000000000 --- a/utility/importer/brave_safari_importer.mm +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include - -#include "brave/utility/importer/brave_safari_importer.h" - -#include -#include - -#include "base/files/file_path.h" -#include "base/files/file_util.h" -#include "base/strings/utf_string_conversions.h" -#include "base/time/time.h" -#include "chrome/common/importer/importer_bridge.h" -#include "chrome/common/importer/importer_url_row.h" -#include "sql/statement.h" -#include "url/gurl.h" - -BraveSafariImporter::~BraveSafariImporter() = default; - -void BraveSafariImporter::ImportHistory() { - // For importing history from History.plist. - SafariImporter::ImportHistory(); - - // From now, try to import history from History.db. - NSString* library_dir = [NSString - stringWithUTF8String:library_dir_.value().c_str()]; - NSString* safari_dir = [library_dir - stringByAppendingPathComponent:@"Safari"]; - NSString* history_db = [safari_dir - stringByAppendingPathComponent:@"History.db"]; - - // Import favicons. - sql::Database db; - const char* db_path = [history_db fileSystemRepresentation]; - if (!db.Open(base::FilePath(db_path))) - return; - - std::vector rows; - const char query[] = "SELECT hi.url, hi.visit_count, hv.visit_time, hv.title " - "FROM history_items as hi " - "JOIN history_visits as hv ON hi.id == hv.history_item"; - sql::Statement s(db.GetUniqueStatement(query)); - while (s.Step() && !cancelled()) { - const GURL url = GURL(s.ColumnString(0)); - if (!url.is_valid()) - continue; - - ImporterURLRow row(url); - row.visit_count = s.ColumnInt(1); - double visit_time = s.ColumnDouble(2); - if (!visit_time) - continue; - row.last_visit = - base::Time::FromDoubleT(visit_time + kCFAbsoluteTimeIntervalSince1970); - std::string title = s.ColumnString(3); - if (title.empty()) - title = url.spec(); - row.title = base::UTF8ToUTF16(title); - row.hidden = 0; - row.typed_count = 0; - rows.push_back(row); - } - - if (!rows.empty() && !cancelled()) { - bridge_->SetHistoryItems(rows, importer::VISIT_SOURCE_SAFARI_IMPORTED); - } -} From 4c25259f6e991c8b86a5f33c5e0dfe830a773645 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 27 Oct 2020 15:14:06 -0400 Subject: [PATCH 150/152] Fixes a bad merge of browser/themes/BUILD.gn brave_theme_helper_win.cc/h were moved out into sources.gni by https://github.com/brave/brave-core/pull/6887 --- browser/themes/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/themes/BUILD.gn b/browser/themes/BUILD.gn index 1acb019b91a4..6a35399692ec 100644 --- a/browser/themes/BUILD.gn +++ b/browser/themes/BUILD.gn @@ -28,8 +28,6 @@ source_set("themes") { if (is_win) { sources += [ "brave_dark_mode_utils_win.cc", - "brave_theme_helper_win.cc", - "brave_theme_helper_win.h", ] } From 6e17ab380f9934e4d62749472cb4f43aa0f1baaa Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 28 Oct 2020 10:33:24 -0400 Subject: [PATCH 151/152] [Android] Fix for menu location in CustomToolbar Fixes the error in CustomToolbar that menu is shown from bottom. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964 Duet: Clean up unused classes and resources Delete all the classes and resources left unused by Duet (BottomToolbar). Bug: 1081343 --- .../chrome/browser/toolbar/top/BraveToolbarLayout.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index a3b68974514b..c06ca2144fdb 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -69,7 +69,10 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver; import org.chromium.chrome.browser.toolbar.HomeButton; import org.chromium.chrome.browser.toolbar.ToolbarColors; +import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; +import org.chromium.chrome.browser.toolbar.ToolbarTabController; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; +import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; import org.chromium.chrome.browser.util.PackageUtils; @@ -805,4 +808,11 @@ private boolean isTabSwitcherOnBottom() { private boolean isMenuButtonOnBottom() { return mIsBottomToolbarVisible && BottomToolbarVariationManager.isMenuButtonOnBottom(); } + + @Override + protected void initialize(ToolbarDataProvider toolbarDataProvider, + ToolbarTabController tabController, MenuButtonCoordinator menuButtonCoordinator) { + super.initialize(toolbarDataProvider, tabController, menuButtonCoordinator); + BraveMenuButtonCoordinator.setMenuFromBottom(isMenuButtonOnBottom()); + } } From 030742a630f8d20e3fe97d220c657ee65566f10b Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 28 Oct 2020 14:05:12 -0400 Subject: [PATCH 152/152] Updated patches after a rebase on master --- patches/chrome-VERSION.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 685956e89f7c..25948986a5f5 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,5 +1,5 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index daea3677a4069261ba8871bd8120473be228b9dd..266a214d1305f637c139371cc7acdcf5dd201a0b 100644 +index daea3677a4069261ba8871bd8120473be228b9dd..2572ec24cea2bed2b3719813f64f35502cc7adb1 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@