diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 8fb814cc740..a30e66dffc6 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 39cbcd1d21b39ff4153a88d10bc39d4804844f44..0619121e02247d6f6f7bfd6bbcd9514e7ba3402d 100644 +index c924e997cc287724a95862c219515e617223049c..9d4bd409f07d3977e793f54aeb98d8d680eac61c 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=84 -MINOR=0 -BUILD=4147 --PATCH=45 +-PATCH=56 +MINOR=1 +BUILD=12 +PATCH=65 diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index df7b9a2167b..6a82cf185ca 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 f8b4a5dee82ec0584c88bbfd0a7ff0b8b562caa5..a1cb3dfbb44457e37897a8003cb49bc6fc850017 100644 +index 2b825ca5fc8769249ecded05a654c3b93946658e..4c681687de80efc1f26ab96e620ac7fb179cab6e 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1801,3 +1801,4 @@ chrome_java_sources = [ +@@ -1800,3 +1800,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/widget/bottomsheet/EmptyBottomSheetObserver.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/TouchRestrictingFrameLayout.java", ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index a5c130a0a32..3f7448f1351 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 4b89a92e661ba17b419a96a2dd9ca58ecacb2643..9e1545b66d4c975a1beadaaf62c5be70f3753c2f 100644 +index 8c264ba98b6af8e5921dbda61a76658040b6935c..062bc6a74940bd118237ce1c8a945cd299ce2165 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 4b89a92e661ba17b419a96a2dd9ca58ecacb2643..9e1545b66d4c975a1beadaaf62c5be70 {% endif %} -@@ -1216,6 +1228,7 @@ by a child template that "extends" this file. +@@ -1220,6 +1232,7 @@ by a child template that "extends" this file. {% endif %} diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch index 9ead6e07025..299861784e8 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -index 0d658e3b41141d63301dec5476ac688af78e855f..a0a9a9934addf4a6ceca6301134dfbfe6e9e3a58 100644 +index c35d53ca79a7b35fe39e4ca63e2c0c394a7f46a6..cfb2eabf2c9230895cf0c3df3719a7729dbf4089 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java @@ -314,7 +314,7 @@ public abstract class ChromeActivity 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 9604e9a2a8e..7926256b657 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 7f959ac34c2f9e57fc4645542f10d7cf7c3d2485..03895eb625787ab7d7ebc5ec1f0d1ddaff1d70a3 100644 +index 6fd876fabfd89d7e1b6c15f41153c61176004777..219b52a59fc95e61f19feecba00066522c788a19 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; 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 a2f6821848a..0eab1018949 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 a99dd2fb62e47c43b5efe2af6542b9fedda25f5c..103f24312c9c14101f599df3f2a613a8d7f384bf 100644 +index db3838fe87701dfe74770d319327a1c8336f2302..32c570e1eff0d0d91a436b0e92c9c746ba12247b 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 -@@ -1442,6 +1442,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -1449,6 +1449,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve boolean editingAllowed = currentTab == null || bridge == null || bridge.isEditBookmarksEnabled(); mToolbar.updateBookmarkButton(isBookmarked, editingAllowed); diff --git a/patches/chrome-browser-importer-external_process_importer_client.h.patch b/patches/chrome-browser-importer-external_process_importer_client.h.patch index 57220f1a39d..6895d347e90 100644 --- a/patches/chrome-browser-importer-external_process_importer_client.h.patch +++ b/patches/chrome-browser-importer-external_process_importer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h -index 8e4f47662a42cdde51125a3e58bc870d42f9bdd8..c27c70f569a18693e77c640a7e106fa94909e496 100644 +index e5f3b315b6f810ad4b334debb01a4da86567dc21..5f0f8ca4cb51019577d8e67f872b5ba20b5bbf26 100644 --- a/chrome/browser/importer/external_process_importer_client.h +++ b/chrome/browser/importer/external_process_importer_client.h -@@ -87,6 +87,7 @@ class ExternalProcessImporterClient +@@ -85,6 +85,7 @@ class ExternalProcessImporterClient const std::vector& autofill_form_data_entry_group) override; diff --git a/patches/chrome-browser-importer-in_process_importer_bridge.h.patch b/patches/chrome-browser-importer-in_process_importer_bridge.h.patch index e0feb20e4ab..e9e96c9f5c1 100644 --- a/patches/chrome-browser-importer-in_process_importer_bridge.h.patch +++ b/patches/chrome-browser-importer-in_process_importer_bridge.h.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/importer/in_process_importer_bridge.h b/chrome/browser/importer/in_process_importer_bridge.h -index 59ae2212add6c99401862e4fc72e93d66f6ad3f0..645ec7f24877a972a1973f51cd874b142fccd9a1 100644 +index d329ecc264edb68c3a479d621fd3d23733ee1038..cbd5b630f18986d4385b25ef23d1d0e83472c1ba 100644 --- a/chrome/browser/importer/in_process_importer_bridge.h +++ b/chrome/browser/importer/in_process_importer_bridge.h -@@ -59,6 +59,7 @@ class InProcessImporterBridge : public ImporterBridge { +@@ -56,6 +56,7 @@ class InProcessImporterBridge : public ImporterBridge { base::string16 GetLocalizedString(int message_id) override; // End ImporterBridge implementation. + BRAVE_IN_PROCESS_IMPORTER_BRIDGE_H private: - class SearchEnginesParser; - friend class SearchEnginesParser; + ~InProcessImporterBridge() override; + diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 55ed3e5fe7a..1ed78080714 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 7b6e68fd4d8f20382bad8d07e2ce554552889e57..0ba5b73ea1ec96a3b41c7f5f1bb30ee73bad99ea 100644 +index 4a31f9315ce898ed714a7efca6a8afca9d4baf76..767d1686fa4448a2bac4f1fbc7187c8a37e9e2e6 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -608,6 +608,9 @@ static_library("ui") { 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 f4a28a58963..c6f04a8d450 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 8fe9747b569895650ba06c0f238739a320f5ebbd..168dce3a44090ac8954595d7f87835dbf0a0355b 100644 +index 1062218316631d5a6bc14be1b24ef06a2c9e6552..2dad5f78a0fe37fa5c134f220538e64373184ffc 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -442,7 +442,7 @@ void LocationBarView::OnKeywordFaviconFetched(const gfx::Image& icon) { 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 a53df39be04..86930ea750f 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,5 +1,5 @@ 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 cad99d56bf40408d5b38554497b3e6e83cca8673..e6c22548d224585bc342599fa5531042269483fa 100644 +index de596baf4e6507a9039a307dd95a66daeb17cd24..275f219712b0c0b9c70fe6d2c17aac53aff70312 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -106,6 +106,7 @@ class LocationBarView : public LocationBar, diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch index 8f3a19fb70c..c61202c0186 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index f5028284290fd6ee9e21aaa7fb478085e7a88545..8a3b0697c3eef18e57a854e5567af0f29781f40d 100644 +index 7e3a867708072bb934688f2e40d854939d0446b0..e0e77f2c0fe44889853e70be53c7a6dc3288ccc4 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -869,7 +869,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync) { +@@ -870,7 +870,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync) { void PeopleHandler::BeforeUnloadDialogCancelled() { // The before unload dialog is only shown during the first sync setup. @@ -11,7 +11,7 @@ index f5028284290fd6ee9e21aaa7fb478085e7a88545..8a3b0697c3eef18e57a854e5567af0f2 syncer::SyncService* service = GetSyncService(); DCHECK(service && service->IsSetupInProgress() && !service->GetUserSettings()->IsFirstSetupComplete()); -@@ -917,6 +917,7 @@ std::unique_ptr PeopleHandler::GetSyncStatusDictionary() +@@ -918,6 +918,7 @@ std::unique_ptr PeopleHandler::GetSyncStatusDictionary() service && !disallowed_by_policy && service->IsSetupInProgress() && !service->GetUserSettings()->IsFirstSetupComplete() && identity_manager->HasPrimaryAccount()); @@ -19,7 +19,7 @@ index f5028284290fd6ee9e21aaa7fb478085e7a88545..8a3b0697c3eef18e57a854e5567af0f2 const sync_ui_util::StatusLabels status_labels = sync_ui_util::GetStatusLabels(profile_); -@@ -1064,6 +1065,7 @@ void PeopleHandler::MarkFirstSetupComplete() { +@@ -1065,6 +1066,7 @@ void PeopleHandler::MarkFirstSetupComplete() { } bool PeopleHandler::IsProfileAuthNeededOrHasErrors() { diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 58bed66a36d..52535b38414 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 993bca13e1b90c246e0546da29a9b57493afec31..45350c08ced1e18e70fc04e1d6a887148bdef89f 100644 +index fbbea351bd8ad009c81a41a7d1ba0590611c21bb..edc96d7f0b52ae06b336ff6d32ca055de5922ad9 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -745,6 +745,7 @@ if (!is_android) { diff --git a/patches/chrome-utility-importer-external_process_importer_bridge.h.patch b/patches/chrome-utility-importer-external_process_importer_bridge.h.patch index 784788ee6cb..f7a0ec50cbe 100644 --- a/patches/chrome-utility-importer-external_process_importer_bridge.h.patch +++ b/patches/chrome-utility-importer-external_process_importer_bridge.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/utility/importer/external_process_importer_bridge.h b/chrome/utility/importer/external_process_importer_bridge.h -index 58db1e3c50c057bdf49795d4042ce633e7a80890..1b025f0a71c993f4a4d31a39fbefff3cdf9c2dc7 100644 +index ffa0448258db541927c3c84ea7673819641f2b52..9dd4142fd0c1b355839845d03857ecf26c9318e9 100644 --- a/chrome/utility/importer/external_process_importer_bridge.h +++ b/chrome/utility/importer/external_process_importer_bridge.h -@@ -71,6 +71,7 @@ class ExternalProcessImporterBridge : public ImporterBridge { +@@ -68,6 +68,7 @@ class ExternalProcessImporterBridge : public ImporterBridge { base::string16 GetLocalizedString(int message_id) override; // End ImporterBridge implementation. diff --git a/patches/chrome-utility-services.cc.patch b/patches/chrome-utility-services.cc.patch index 803cb5530c3..ba7084fc05a 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 e5f664d649fbea46b8377956223ad5ed7cf86176..2debed72d9ec22437b058fb00214f9de79ae70a6 100644 +index 61a7bf55ce78a481f56b377b8cb441239169dafc..8012016d367deb26063741ae4cd2d8c13c2c08d8 100644 --- a/chrome/utility/services.cc +++ b/chrome/utility/services.cc -@@ -286,6 +286,7 @@ mojo::ServiceFactory* GetMainThreadServiceFactory() { +@@ -299,6 +299,7 @@ mojo::ServiceFactory* GetMainThreadServiceFactory() { RunAssistantAudioDecoder, #endif #endif diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index cb9742e4ea6..cefd17bad15 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index b7953ebb5aae4599e0726493d2521d2c04c90e73..3c8e5eb9644b77cbe82abd1342c439ae270d1d20 100644 +index bb87b51078a43852cc3e4b3ae428485886384cf5..9c9cf6f0838b550b768a9e0a0a1e8d266693755b 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -60,7 +60,7 @@ diff --git a/patches/components-content_settings-browser-tab_specific_content_settings.cc.patch b/patches/components-content_settings-browser-tab_specific_content_settings.cc.patch index af73571c095..f0b6eedcc26 100644 --- a/patches/components-content_settings-browser-tab_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-tab_specific_content_settings.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/browser/tab_specific_content_settings.cc b/components/content_settings/browser/tab_specific_content_settings.cc -index c968729c940e87f099ab49137986a66823a82b8a..ba0347f50620540d23e3e7c90bb25d2d83d17986 100644 +index b783a2c6fde5aa1c04164beb9a458b664abb8484..e87a8e06dd0885516cf6cdfc71f0bcdeef0dd1a6 100644 --- a/components/content_settings/browser/tab_specific_content_settings.cc +++ b/components/content_settings/browser/tab_specific_content_settings.cc @@ -220,6 +220,7 @@ bool TabSpecificContentSettings::IsContentBlocked( diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch index 4974fb51ab3..a178aae6040 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 19807f121050f7780965322f039e85e0db8cb5cc..e86488191a53b20d137c227d86300156a577035b 100644 +index 2ad7d70978c2d5a95101616b7186117b0674198c..f6854b15e52009d1eab20534d041be1436be0ab6 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml -@@ -201758,6 +201758,7 @@ regressions. --> +@@ -201956,6 +201956,7 @@ regressions. -->