diff --git a/patches/base-metrics-histogram_functions.h.patch b/patches/base-metrics-histogram_functions.h.patch index b73fffbf0d4..9c84174bd8e 100644 --- a/patches/base-metrics-histogram_functions.h.patch +++ b/patches/base-metrics-histogram_functions.h.patch @@ -1,12 +1,12 @@ diff --git a/base/metrics/histogram_functions.h b/base/metrics/histogram_functions.h -index 1fe7e3f414b2f888ec6fc2ecd306c26144719ddb..d37692dfbd363bda93c39e6d3367487c19510aaf 100644 +index eda83e423676e27631ff7b15bff03a89315fb3a6..0dd9bafa643ad34c2205398eb502f4cbeba8218f 100644 --- a/base/metrics/histogram_functions.h +++ b/base/metrics/histogram_functions.h -@@ -82,6 +82,7 @@ void UmaHistogramEnumeration(std::string_view name, T sample) { - static_assert(static_cast(T::kMaxValue) <= - static_cast(INT_MAX) - 1, - "Enumeration's kMaxValue is out of range of INT_MAX!"); +@@ -89,6 +89,7 @@ void UmaHistogramEnumeration(std::string_view name, T sample) { + "Enumeration's kMaxValue is out of range of " + "LinearHistogram::kBucketCount_MAX. Use a sparse histogram " + "instead."); + BRAVE_HISTOGRAM_FUNCTIONS_UMA_HISTOGRAM_ENUMERATION DCHECK_LE(static_cast(sample), static_cast(T::kMaxValue)); - // While UmaHistogramExactLinear’s documentation states that the third + return UmaHistogramExactLinear(name, static_cast(sample), kBucketCount); 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 8677dbffeea..69b2c763270 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,11 +1,11 @@ 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 0d0b4f241827a19fb267d035623ae0264a89bca3..5b4f6c44c2cfc5658fc1fdce6e365db0970c49a2 100644 +index 47cfe3b76ef1184e5aa18abd3cef7c43a23cf73f..a050d4a40ae625ffd19e1464dac31277f632d7f0 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 @@ -656,7 +656,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity mBottomContainer = findViewById(R.id.bottom_container); - mSnackbarManager = + SnackbarManager snackbarManager = - new SnackbarManager( + new org.chromium.chrome.browser.ui.messages.snackbar.BraveSnackbarManager( this, diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 5df15914fbd..e5471bab263 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 a2a14349d40ce34831ab063cd5eb55cd5085c814..420c646f054487e78a618c0aed92c28b977823ec 100644 +index 68375e1d44734b733c0716a37a5f0a88cbb441d5..76b8f6e83e7c81c5bf08ddb13738773e69901642 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2599,6 +2599,7 @@ static_library("browser") { @@ -10,7 +10,7 @@ index a2a14349d40ce34831ab063cd5eb55cd5085c814..420c646f054487e78a618c0aed92c28b if (is_android) { sources += [ -@@ -8579,6 +8580,7 @@ static_library("browser_public_dependencies") { +@@ -8451,6 +8452,7 @@ static_library("browser_public_dependencies") { "//rlz:rlz_lib", ] } diff --git a/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch b/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch index ea31bec97b5..3062ac91abe 100644 --- a/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch +++ b/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java -index f76e0f2d17879c0b5d9f357db61681b1cdbd6523..c99a7cf7b5ab33b73a214d7db70b88e723ce3105 100644 +index a1d4a79ba55d6fb968f632302f49860212b20a75..29d02f6d11bbe816e3d0f5eb3875087179da6735 100644 --- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java +++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java -@@ -74,6 +74,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -75,6 +75,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { ChannelId.COLLABORATION, ChannelId.DOWNLOADS, ChannelId.INCOGNITO, @@ -10,16 +10,16 @@ index f76e0f2d17879c0b5d9f357db61681b1cdbd6523..c99a7cf7b5ab33b73a214d7db70b88e7 ChannelId.MEDIA_PLAYBACK, ChannelId.SCREEN_CAPTURE, ChannelId.CONTENT_SUGGESTIONS, -@@ -136,7 +137,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { - // LINT.ThenChange(//tools/metrics/histograms/metadata/mobile/histograms.xml:NotificationChannelId) - // LINT.ThenChange(//chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/NotificationUmaTracker.java:NotificationChannelId) +@@ -142,7 +143,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { + // ) + // clang-format on - @StringDef({ChannelGroupId.GENERAL, ChannelGroupId.SITES}) + @StringDef({BraveChannelDefinitions.ChannelGroupId.BRAVE_ADS, ChannelGroupId.GENERAL, ChannelGroupId.SITES}) @Retention(RetentionPolicy.SOURCE) public @interface ChannelGroupId { String SITES = "sites"; -@@ -164,6 +165,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -170,6 +171,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { Map map = new HashMap<>(); Set startup = new HashSet<>(); @@ -27,7 +27,7 @@ index f76e0f2d17879c0b5d9f357db61681b1cdbd6523..c99a7cf7b5ab33b73a214d7db70b88e7 map.put( ChannelId.BROWSER, PredefinedChannel.create( -@@ -400,6 +402,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -414,6 +416,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { static { Map map = new HashMap<>(); diff --git a/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch b/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch index fa859a4872e..0f56d8510ab 100644 --- a/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch +++ b/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc -index 37210cb33ba7777a4466aac755c734502df88ea2..14215b26d9d0b414c3d907ebd2c4e0e7c7759f3f 100644 +index ffe2d52c0bf2b101a796ca8acbc5663ecd97016f..8e4a4ce18b6560920517760e0b8048a7c730b7ec 100644 --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -1106,6 +1106,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) { +@@ -1043,6 +1043,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) { // This method should be periodically pruned of year+ old migrations. void ProfileAttributesEntry::MigrateObsoleteProfileAttributes() { + BRAVE_PROFILE_ATTRIBUTES_ENTRY_MIGRATE_OBSOLETE_PROFILE_ATTRIBUTES // Added 3/2023. ClearValue(kAccountCategories); - } + // Added 2/2026. diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch index f7a4d64dc6a..89995b770c5 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch @@ -1,9 +1,9 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -index cc972b9323b250a42d4243a5a185371f776e82f7..a5a7440cdd98f26373997d78d97a87ce00264287 100644 +index 42daa10da6c8633342802123cb37152cae7f6dc8..d6772c72ba8c2f3b5408072d7c26a0ab1983d6b6 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -@@ -120,6 +120,7 @@ export class ProfilePickerMainViewElement extends - private eventTracker_: EventTracker = new EventTracker(); +@@ -155,6 +155,7 @@ export class ProfilePickerMainViewElement extends + } override firstUpdated() { + this.$.addProfile.style.borderRadius = '8px'; diff --git a/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch b/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch index 0515b49f945..be9ad4d88f9 100644 --- a/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch +++ b/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc -index 52a6425d1430975b78b720ad3b6e7edad962f7fb..c1f1010a5c9fb8bd6bc7d479d01d9b4d2ba01afc 100644 +index f11db47c92ff8bc14da47d494f6a14cd64832d41..4b936fdaaa876f7747761a856da4e8806f41646a 100644 --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -195,6 +195,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod( +@@ -86,6 +86,7 @@ signin::AccountConsistencyMethod ComputeAccountConsistencyMethod( Profile* profile) { - DCHECK(ShouldBuildServiceForProfile(profile)); + DCHECK(AccountConsistencyModeManager::ShouldBuildServiceForProfile(profile)); -+BRAVE_COMPUTE_ACCOUNT_CONSISTENCY_METHOD ++ BRAVE_COMPUTE_ACCOUNT_CONSISTENCY_METHOD #if BUILDFLAG(IS_CHROMEOS) - if (!ash::IsAccountManagerAvailable(profile)) + if (!ash::IsAccountManagerAvailable(profile)) { return AccountConsistencyMethod::kDisabled; diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch index 856fa9a9d0f..f34e8d7f7b8 100644 --- a/patches/chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc -index c75419f5d4310f05c0bf272f011febbddae808ad..a10984d02e2f36920b3806fbe5952f076e95f8f9 100644 +index 9292d9cc433f3da323170ab44d70bd9b5df6e431..6efda65c538c987e064fd11fb4409e76b365ebb1 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc -@@ -437,7 +437,7 @@ std::unique_ptr BuildSyncService( +@@ -444,7 +444,7 @@ std::unique_ptr BuildSyncService( } auto sync_service = diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 0e7420a32e9..c75f14873c4 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 c82c6fc5847e3a423ddd736e0c305c5f3784aa48..dc86c5e7d0d512cf7cb5c4a079f4540c8085cb70 100644 +index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cfe2bc2b3e 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -772,6 +772,7 @@ static_library("ui") { diff --git a/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch b/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch index e25d5dec85d..62356913923 100644 --- a/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch +++ b/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml -index 4ee0f59a9e23733351e19e354924f14534eaabce..8919708878ec23d0bed05a42135dc37fb539f92c 100644 +index cc6cadbfbdb44093896ae82798c19de29bc1a9d2..c86fe7510d2530f6eeae8365a76c3cd3cceead0d 100644 --- a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml +++ b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml -@@ -57,6 +57,7 @@ found in the LICENSE file. +@@ -60,6 +60,7 @@ found in the LICENSE file. app:layout_constraintTop_toBottomOf="@id/location_bar_attachments" app:layout_constraintEnd_toStartOf="@id/margin_spacer"/> @@ -10,12 +10,12 @@ index 4ee0f59a9e23733351e19e354924f14534eaabce..8919708878ec23d0bed05a42135dc37f -@@ -91,7 +92,7 @@ found in the LICENSE file. +@@ -94,7 +95,7 @@ found in the LICENSE file. android:contentDescription="@string/accessibility_toolbar_btn_delete_url" android:tooltipText="@string/accessibility_toolbar_btn_delete_url" app:layout_constraintTop_toBottomOf="@id/location_bar_attachments" - app:layout_constraintEnd_toStartOf="@id/margin_spacer"/> + app:layout_constraintEnd_toStartOf="@id/qr_button"/> - + diff --git a/patches/chrome-browser-ui-android-toolbar-adaptive_toolbar_enums.h.patch b/patches/chrome-browser-ui-android-toolbar-adaptive_toolbar_enums.h.patch index 592aa1180bc..94cd41a6eff 100644 --- a/patches/chrome-browser-ui-android-toolbar-adaptive_toolbar_enums.h.patch +++ b/patches/chrome-browser-ui-android-toolbar-adaptive_toolbar_enums.h.patch @@ -1,20 +1,20 @@ diff --git a/chrome/browser/ui/android/toolbar/adaptive_toolbar_enums.h b/chrome/browser/ui/android/toolbar/adaptive_toolbar_enums.h -index 346d0fc2b0fb5a9dcb093814511ffb2afa90f463..e721b50f63dfb3b488015d57d0ad0d4636a56e31 100644 +index bfcd84476de607d00df467ce6c62c8dbcffe40fd..2bea21fa092e838bf35bf5ef5c78e88f995a3933 100644 --- a/chrome/browser/ui/android/toolbar/adaptive_toolbar_enums.h +++ b/chrome/browser/ui/android/toolbar/adaptive_toolbar_enums.h -@@ -50,7 +50,15 @@ enum class AdaptiveToolbarButtonVariant { - // Tab grouping action. - kTabGrouping = 16, +@@ -52,7 +52,15 @@ enum class AdaptiveToolbarButtonVariant { + // Glic button. + kGlic = 17, -- kMaxValue = kTabGrouping, +- kMaxValue = kGlic, + // We have to use multiline patch since this enum is parsed by `java_cpp_enum.py` -+ kBookmarks = kTabGrouping + 1, -+ kHistory = kBookmarks + 1, -+ kDownloads = kHistory + 1, -+ kPlaylist = kDownloads + 1, -+ kLeo = kPlaylist + 1, -+ kWallet = kLeo + 1, -+ kNews = kWallet + 1, ++ kBookmarks, ++ kHistory, ++ kDownloads, ++ kPlaylist, ++ kLeo, ++ kWallet, ++ kNews, + kMaxValue = kNews, }; // LINT.ThenChange(/tools/metrics/histograms/enums.xml:AdaptiveToolbarButtonVariant) diff --git a/patches/chrome-browser-ui-browser_tabrestore.cc.patch b/patches/chrome-browser-ui-browser_tabrestore.cc.patch index ac024bc76fb..b68c7bfc7e9 100644 --- a/patches/chrome-browser-ui-browser_tabrestore.cc.patch +++ b/patches/chrome-browser-ui-browser_tabrestore.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc -index 08fd54ac9aae3897df33d7f98b984a4a31efd7bd..e0a40be1eec53c72ae66c64ca8954bd696b67366 100644 +index dc253dfd33c5b63dfdbbc89bd3718a5244546cf6..8b59879728a69c31c4df5d8bb6f818f133a47a38 100644 --- a/chrome/browser/ui/browser_tabrestore.cc +++ b/chrome/browser/ui/browser_tabrestore.cc -@@ -42,6 +42,12 @@ - #include "chrome/browser/glic/glic_tab_restore_helper.h" - #endif +@@ -39,6 +39,12 @@ + #include "ui/gfx/geometry/size.h" + #include "ui/gfx/range/range.h" +#include "brave/components/containers/buildflags/buildflags.h" + @@ -15,7 +15,7 @@ index 08fd54ac9aae3897df33d7f98b984a4a31efd7bd..e0a40be1eec53c72ae66c64ca8954bd6 using content::NavigationEntry; using content::RestoreType; using content::WebContents; -@@ -75,7 +81,14 @@ std::unique_ptr CreateRestoredTab( +@@ -72,7 +78,14 @@ std::unique_ptr CreateRestoredTab( browser->profile(), session_storage_namespace); WebContents::CreateParams create_params( browser->profile(), diff --git a/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch b/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch index c52280f26b3..88e8328e532 100644 --- a/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch +++ b/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/browser_window/internal/BUILD.gn b/chrome/browser/ui/browser_window/internal/BUILD.gn -index 76f31dc6de99c928919f8702c20bd9bb9094fffa..d5b0f4cff2ca3e26714bda1b58ba68caffa47f6d 100644 +index 14b978d8b87d58b1bee198f7a9b239b996c2c42d..9fc139b1964a2f96e6465dc17a079c6205ad9c61 100644 --- a/chrome/browser/ui/browser_window/internal/BUILD.gn +++ b/chrome/browser/ui/browser_window/internal/BUILD.gn -@@ -141,6 +141,7 @@ source_set("internal") { - deps += [ "//chrome/browser/ui:overscroll_pref_manager" ] - } +@@ -149,6 +149,7 @@ source_set("internal") { + if (enable_extensions_core) { + deps += [ "//chrome/browser/extensions" ] } + import("//brave/browser/ui/browser_window/internal/sources.gni") deps += brave_browser_window_internal_deps } 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 c7a3c2832c9..7697d980e5e 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 fd3ca1f90cc1060f4195a5bd61ee911e5efd8b56..f6b88a103f4c5f2c04cf7cd547d0fc2d049bd8b6 100644 +index 6b91efeea31ba927aff9c2f0a8891b96fbd6804e..5c35de3ccf6018e37b13712f79d806b1cbed7ab0 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -513,6 +513,7 @@ void BookmarkBubbleView::ShowBubble(views::View* anchor_view, @@ -7,6 +7,6 @@ index fd3ca1f90cc1060f4195a5bd61ee911e5efd8b56..f6b88a103f4c5f2c04cf7cd547d0fc2d views::BubbleBorder::TOP_RIGHT); bookmark_bubble_ = bubble.get(); + BRAVE_BOOKMARK_BUBBLE_VIEW_SHOW_BUBBLE_SET_ARROW - if (highlighted_button) { - bubble->SetHighlightedButton(highlighted_button); - } + bubble->SetHighlightedElement(kBookmarkStarViewElementId); + + if (ShouldShowShoppingCollectionFootnote(profile, bookmark_model, diff --git a/patches/chrome-browser-ui-views-frame-browser_view.cc.patch b/patches/chrome-browser-ui-views-frame-browser_view.cc.patch index 6eb4c6a49c9..7fc9c07aca1 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.cc.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc -index a29e3f73ef39bf2998b1fce9edc42b0f1290fcd4..8e74cee2611836c1e4781b9e1829a64475adcf9d 100644 +index e4d4e62095f96c75e9c88869dc867ee2e1cd2b62..613744bc89e8d2ef4e286d900f50b81bba8f5416 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -629,6 +629,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) { @@ -10,7 +10,7 @@ index a29e3f73ef39bf2998b1fce9edc42b0f1290fcd4..8e74cee2611836c1e4781b9e1829a644 views::View::ConvertPointToTarget(src, dst, point); return dst->HitTestPoint(*point); } -@@ -1933,6 +1934,7 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents, +@@ -1958,6 +1959,7 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents, !browser_->tab_strip_model()->closing_all() && GetWidget()->IsActive() && GetWidget()->IsVisible() && !tab_change_in_split_view; #endif 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 ca87c89eac5..ab58a5f5f08 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,10 +1,10 @@ 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 0c2d8d0557110b832ce8f5852b267c7cf154073a..1e0c99e3c718b077bfab14fbca9a353709121bdc 100644 +index 0621ead4149f85519ae9c359cedbabf33c240008..944929234a99bc93937c8bd59e529a6b03afe8b5 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -@@ -200,6 +200,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, +@@ -204,6 +204,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, + return identity_button_; } - bool actionable_item_clicked() const { return actionable_item_clicked_; } + BRAVE_PROFILE_MENU_VIEW_BASE_H_ private: diff --git a/patches/chrome-browser-ui-views-tabs-dragging-tab_drag_controller.h.patch b/patches/chrome-browser-ui-views-tabs-dragging-tab_drag_controller.h.patch index e716c1b3eb7..84211a000bb 100644 --- a/patches/chrome-browser-ui-views-tabs-dragging-tab_drag_controller.h.patch +++ b/patches/chrome-browser-ui-views-tabs-dragging-tab_drag_controller.h.patch @@ -1,11 +1,11 @@ diff --git a/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h b/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h -index a0d15aa1a0777306b1f02d8692bafce05c4ad12f..aa544007f56b5f29107b4f8b98a2ebfdba363b1d 100644 +index 48a432ac2db8c7119d3bf36754419f07390893f5..8c4deefe04c532f5370ef6ac6a8d224d408fcbbe 100644 --- a/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h +++ b/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h -@@ -133,7 +133,7 @@ class TabDragController : public views::WidgetObserver, - // and is only non-empty if the original selection isn't the same as the - // dragging set. Returns Liveness::DELETED if `this` was deleted during this +@@ -135,7 +135,7 @@ class TabDragController : public views::WidgetObserver, // call, and Liveness::ALIVE if `this` still exists. + // Note: `dragging_views` must be ordered by their position in the source + // tabstrip (both visually and in the model). - [[nodiscard]] Liveness Init(TabDragContext* source_context, + [[nodiscard]] virtual Liveness Init(TabDragContext* source_context, TabSlotView* source_view, 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 dece6dbefab..92bef2d52ff 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 4ad69dd085d4d0cb57604b00bc404b3026d55f20..a604450528fafc9cf5dd21f7d7e20278138fb86b 100644 +index 7e2880e8f281f35b4fdfda7b403ee3d2d65d34db..03ed856b3b88d3d240544c4eb774d75b4e8c9efa 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -433,6 +433,7 @@ void ToolbarView::Init() { +@@ -573,6 +573,7 @@ void ToolbarView::Init() { + media_button_ = AddChildView(std::move(media_button)); } - #endif // BUILDFLAG(ENABLE_GLIC) + BRAVE_TOOLBAR_VIEW_INIT avatar_ = AddChildView(std::make_unique(browser_view_)); diff --git a/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch b/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch index b9e11f6818a..cafd2e5c6ed 100644 --- a/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch +++ b/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/user_education/browser_user_education_service.cc b/chrome/browser/ui/views/user_education/browser_user_education_service.cc -index 92ce7d6f942799dcc844c16fd05d218c8563e21f..a999d9ff7d9dc3252ca381cb5985329877c85a6e 100644 +index 69dfb70378671bbd7f1153c177d375b42af0d892..9c84fccf9f7339fca013e008977dab6758ee2bc2 100644 --- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc +++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc @@ -269,6 +269,7 @@ void MaybeRegisterChromeFeaturePromos( diff --git a/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch b/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch index bba4cca141e..68187d17b15 100644 --- a/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc -index 2882c3dd8b35f3f385994ccf3d467d017d6d19ef..85ec1caba65153f453ac27c0aab4728d68684ebc 100644 +index c99a747c3fc33c3ee8261040b285e6a1e701fa5f..54bad0b3972d93c16c8299f65d79a9b5a35f7c13 100644 --- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc +++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc @@ -624,6 +624,7 @@ std::string SearchboxHandler::AutocompleteIconToResourceName( 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 db6e6039d2e..c6aa5344418 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 8f0484192905fcd21b274148cc863cf3e52366ee..519492d073dabd9fedf8f6cdc676b15410436eb8 100644 +index 6f70406bc570c23177338c26a08b1fbe656069eb..1458d42cdd2592c3f1e66ca842d41b15c14233a7 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -4225,6 +4225,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -4258,6 +4258,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-installer-linux-common-repo.cron.patch b/patches/chrome-installer-linux-common-repo.cron.patch index e0acd8786e3..eb5061beab2 100644 --- a/patches/chrome-installer-linux-common-repo.cron.patch +++ b/patches/chrome-installer-linux-common-repo.cron.patch @@ -1,10 +1,10 @@ diff --git a/chrome/installer/linux/common/repo.cron b/chrome/installer/linux/common/repo.cron -index ef812b2d993d34c705de2b3e3ae734373cbb18f9..f3511db4e79f08b4ca1120443b8f1d3754e42cd0 100755 +index 571fb836f3ac1a746408844290c75df662acd5a0..2973d3737933f40e14526f7c0bbe3061eb06b62d 100755 --- a/chrome/installer/linux/common/repo.cron +++ b/chrome/installer/linux/common/repo.cron -@@ -17,6 +17,9 @@ - # "false" as desired. An empty $DEFAULTS_FILE is the same as setting both values - # to "false". +@@ -19,6 +19,9 @@ + # The $DEFAULTS_FILE also has a setting "repo_add_once" which can be set + # to "false" to prevent the package install from adding the repo altogether. +# Don't add the Chrome repo (brave/brave-browser#1084) +exit 0 diff --git a/patches/chrome-installer-setup-install_worker.cc.patch b/patches/chrome-installer-setup-install_worker.cc.patch index ffce752cf74..686ac475c89 100644 --- a/patches/chrome-installer-setup-install_worker.cc.patch +++ b/patches/chrome-installer-setup-install_worker.cc.patch @@ -1,16 +1,16 @@ diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc -index 4ce4d015542292fc5563d9b8d13490fd1644c6aa..b38ef55d4b85d9b823af3521178654c4debe20ea 100644 +index 315760e9c64bb2767ce01ef2c7d8aa9a0d7f7c82..ada206aade3c8e8f3c1450f159a600490e4957e9 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc -@@ -106,6 +106,7 @@ void AddInstallerCopyTasks(const InstallParams& install_params, - install_list->AddCopyTreeWorkItem(setup_path, active_setup_exe, temp_path, - WorkItem::ALWAYS); +@@ -107,6 +107,7 @@ void AddInstallerCopyTasks(const InstallParams& install_params, + base::FilePath active_setup_exe(installer_dir.Append(kActiveSetupExe)); + install_list->AddCopyTreeWorkItem(setup_path, active_setup_exe, temp_path); } + BRAVE_ADD_INSTALLER_COPY_TASKS } // A callback invoked by |work_item| that adds firewall rules for Chrome. Rules -@@ -216,6 +217,7 @@ void AddChromeWorkItems(const InstallParams& install_params, +@@ -217,6 +218,7 @@ void AddChromeWorkItems(const InstallParams& install_params, installer_state.GetInstallerDirectory(current_version)); base::FilePath old_archive( old_installer_dir.Append(installer::kChromeArchive)); diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 0ed09acf3ad..7ad14367b5c 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 40ea51f97470e2b86f8d2d373ea99a2a71ad185e..9f29a746d916a8cf4fe95049998a30eb05ec2f13 100644 +index fb5537a69c76894e70e04f62a58ad003c993f89c..e5ec1ad537f01fb852efc98eaa5948f8f3f1f718 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -696,6 +696,7 @@ static_library("test_support") { diff --git a/patches/chrome-test-base-testing_browser_process.cc.patch b/patches/chrome-test-base-testing_browser_process.cc.patch index 421a0033ee9..af0a758485a 100644 --- a/patches/chrome-test-base-testing_browser_process.cc.patch +++ b/patches/chrome-test-base-testing_browser_process.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc -index 379e386017a164bf8c6734b2c435d798971b1091..d05261677d7b7f732b555adadb15ebe0a7237231 100644 +index ec5e24c732f6be2378ae4821b476c14a9f121c01..5fa90035afacd90056d93726246ad6234e81da01 100644 --- a/chrome/test/base/testing_browser_process.cc +++ b/chrome/test/base/testing_browser_process.cc -@@ -151,10 +151,12 @@ void TestingBrowserProcess::CreateInstance() { +@@ -151,15 +151,18 @@ void TestingBrowserProcess::CreateInstance() { std::move(fake_geolocation_system_permission_manager)); } #endif // BUILDFLAG(OS_LEVEL_GEOLOCATION_PERMISSION_SUPPORTED) @@ -12,10 +12,8 @@ index 379e386017a164bf8c6734b2c435d798971b1091..d05261677d7b7f732b555adadb15ebe0 // static void TestingBrowserProcess::DeleteInstance() { + BRAVE_TESTING_BROWSER_PROCESS_DELETE_INSTANCE - // g_browser_process must be null during its own destruction. - BrowserProcess* browser_process = g_browser_process; - g_browser_process = nullptr; -@@ -163,6 +165,7 @@ void TestingBrowserProcess::DeleteInstance() { + delete g_browser_process; + } // static void TestingBrowserProcess::TearDownAndDeleteInstance() { diff --git a/patches/components-feature_engagement-public-feature_list.h.patch b/patches/components-feature_engagement-public-feature_list.h.patch index 495406a45c0..dc92f3d3449 100644 --- a/patches/components-feature_engagement-public-feature_list.h.patch +++ b/patches/components-feature_engagement-public-feature_list.h.patch @@ -1,16 +1,16 @@ diff --git a/components/feature_engagement/public/feature_list.h b/components/feature_engagement/public/feature_list.h -index 67c7f37d9466bc1583ad4aaed391670645ecc100..74ffa5cf623a396595a4266a1b456c635e34b051 100644 +index 32f4722e71bb4180bced1544d7f387c046187a69..682067af9e9d28b21261bdc46e182f0e6bdb7f17 100644 --- a/components/feature_engagement/public/feature_list.h +++ b/components/feature_engagement/public/feature_list.h -@@ -562,6 +562,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSLensPromoDesktopFeature, - DEFINE_VARIATION_PARAM(kIPHiOSEnhancedBrowsingDesktopFeature, - "IPH_iOSEnhancedBrowsingDesktop"); +@@ -564,6 +564,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSTabGroupsDesktopFeature, + DEFINE_VARIATION_PARAM(kIPHiOSPriceTrackingDesktopFeature, + "IPH_iOSPriceTrackingDesktop"); #endif // !BUILDFLAG(IS_ANDROID) +BRAVE_FEATURE_ENGAGEMENT_VARIATION_PARAMS #if !BUILDFLAG(IS_IOS) DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); -@@ -572,6 +573,7 @@ DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); +@@ -574,6 +575,7 @@ DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); // are possible to enable on their own in demo mode. inline constexpr flags_ui::FeatureEntry::FeatureVariation kIPHDemoModeChoiceVariations[] = { diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index d76e9fa1581..9feb5ac292a 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,10 +1,10 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index bdc18b898dc90b9523d9614fa369101977b99f72..3e3c3edda0b1faf8eaec0bbb5aff04a2b8f972ce 100644 +index 1b5becf6063bb0afdc094303c84d9561f93e61e5..d8c888ea9914e70171f32538873811edb0e2201f 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -55,6 +55,8 @@ enum VisitSource { SOURCE_SAFARI_IMPORTED = 5, - SOURCE_ACTOR = 6, + SOURCE_ACTOR = 6, // Added by the GLIC actor. SOURCE_OS_MIGRATION_IMPORTED = 7, + SOURCE_CHROME_IMPORTED = 8, + SOURCE_BRAVE_IMPORTED = 9, diff --git a/patches/components-infobars-core-infobar_delegate.h.patch b/patches/components-infobars-core-infobar_delegate.h.patch index 01808f469bf..11d1f3f4807 100644 --- a/patches/components-infobars-core-infobar_delegate.h.patch +++ b/patches/components-infobars-core-infobar_delegate.h.patch @@ -1,11 +1,11 @@ diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h -index 4f9cd9e57e3bbbcec298aa4a3cc2408d4ef80780..2b81cd28880bf9e34cb8ee550c4cbe021d7b363f 100644 +index 5fe307d621193bf9d677eae6ed42378b51211c5f..c8b1b5a946ea1cf865f01ab4bfb9d0eedecd7c2d 100644 --- a/components/infobars/core/infobar_delegate.h +++ b/components/infobars/core/infobar_delegate.h -@@ -213,6 +213,7 @@ class InfoBarDelegate { - ROLL_BACK_MODE_B_INFOBAR_DELEGATE = 129, - DEV_TOOLS_REMOTE_DEBUGGING_INFOBAR_DELEGATE = 130, - STARTUP_LAUNCH_INFOBAR_DELEGATE = 131, +@@ -216,6 +216,7 @@ class InfoBarDelegate { + AUTOFILL_AI_SAVE_ENTITY_INFOBAR_DELEGATE_IOS = 132, + JS_OPTIMIZATIONS_INFOBAR_DELEGATE = 133, + WEB_APP_BLOCKED_MIGRATION_INFOBAR_DELEGATE = 134, + BRAVE_INFOBAR_DELEGATE_IDENTIFIERS }; // LINT.ThenChange(//tools/metrics/histograms/metadata/browser/enums.xml:InfoBarIdentifier) diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index 61be52fa57a..4b1e268ab00 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,9 +1,9 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index 783bf0ba119a3b1dd6cbc264c4392fd963d300b6..f159e7c340690a06e1db7c8b17813204e3791ddb 100644 +index 4a9ce1fc25663077e84d7e5ad8f9a779a9f49396..c803fa4bd43173d1d6911759bdb6acb01d4c263f 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -1377,6 +1377,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, - // via `HasContentSettingChangedViaPageInfo(type)`. +@@ -1383,6 +1383,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, + // second section, the default behavior used when no per-type exception applies. bool PageInfo::ShouldShowPermission( const PageInfo::PermissionInfo& info) const { + BRAVE_PAGE_INFO_SHOULD_SHOW_PERMISSION diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index b8f8ac40b58..9443cca88d1 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 738d2ac9e8526c14714e01224ed75c5937568424..304bee6094fcfcdff5db8fad7665219fb896d6df 100644 +index 92f1e4f81397b33b9b6ef8280c6c6112bd734504..7d81e6313ed30719e3af128ec8cc1cef1ec38083 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -640,6 +640,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -643,6 +643,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(signin_scoped_device_id); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,8 +10,8 @@ index 738d2ac9e8526c14714e01224ed75c5937568424..304bee6094fcfcdff5db8fad7665219f VISIT(sharing_fields); VISIT(model); VISIT(manufacturer); -@@ -671,6 +672,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { - VISIT(desktop_to_ios_promo_receiving_enabled); +@@ -675,6 +676,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { + VISIT_REP(desktop_to_ios_promo_receiving_types); } +BRAVE_VISIT_PROTO_FIELDS_BRAVE_SPECIFIC_FIELD diff --git a/patches/content-browser-BUILD.gn.patch b/patches/content-browser-BUILD.gn.patch index 27e7c785978..2f674af0955 100644 --- a/patches/content-browser-BUILD.gn.patch +++ b/patches/content-browser-BUILD.gn.patch @@ -1,10 +1,10 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 2f57856179bffdc35ca14cc7b1419bee9d7bbf8e..dbcc1d8d7507e42107f84fcd66ccc8e8f91a9cea 100644 +index c6757d57f5bc74fa885e64651a7daa1c94875fcd..c83cb249585eac285faae6bbd06b04170c34e5b2 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -3711,6 +3711,7 @@ source_set("browser") { - if (is_chromeos) { - deps += [ "//ash/constants" ] +@@ -3753,6 +3753,7 @@ source_set("browser") { + "surface_embed/surface_embed_connector_impl.h", + ] } + import("//brave/content/browser/sources.gni") sources += brave_content_browser_sources deps += brave_content_browser_deps } diff --git a/patches/crypto-aead.cc.patch b/patches/crypto-aead.cc.patch index 6c97f2ec162..2aa25fcc9e7 100644 --- a/patches/crypto-aead.cc.patch +++ b/patches/crypto-aead.cc.patch @@ -1,12 +1,12 @@ diff --git a/crypto/aead.cc b/crypto/aead.cc -index 286a7eeccf91a5cc6080afbba0e748e5fe7c29b4..2e16e63f6401f1142fba35d44f0be258b48ace25 100644 +index 0ffd7e43e94391e8fe83b2c37f18638b06c06067..6376abc2e1c51a6244ad6a18943d7121daa9e7da 100644 --- a/crypto/aead.cc +++ b/crypto/aead.cc -@@ -153,6 +153,7 @@ size_t Aead::KeyLength() const { +@@ -184,6 +184,7 @@ size_t Aead::KeyLength() const { } size_t Aead::NonceLength() const { + BRAVE_NONCE_LENGTH - return EVP_AEAD_nonce_length(AeadForAlgorithm(algorithm_)); + return aead::NonceSizeFor(algorithm_); } diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch index 09ac8374955..c6f4ba75d7d 100644 --- a/patches/services-network-cors-cors_url_loader.cc.patch +++ b/patches/services-network-cors-cors_url_loader.cc.patch @@ -1,12 +1,12 @@ diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc -index ad7380b048d56356e1ec9f5481444cc7f26bf6e1..d220466cf6aa7f263e3622740323498079f2b62c 100644 +index bad4f4062340b8db3e75ee50fe9702fda0d189ee..d79e40d0f02185c9b5c8f468b8d559299a9e39f0 100644 --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc -@@ -877,6 +877,7 @@ void CorsURLLoader::StartRequest() { - }; +@@ -917,6 +917,7 @@ void CorsURLLoader::StartRequest() { + cors::ShouldAllowUnsafeHeaders( + *origin_access_list_, request_.request_initiator, request_.url); - if (should_include_origin_header()) { + BRAVE_CORS_URL_LOADER_START_REQUEST - if (tainted_) { - request_.headers.SetHeader(net::HttpRequestHeaders::kOrigin, - url::Origin().Serialize()); + if (!has_custom_origin_header_with_bypass) { + if (tainted_) { + request_.headers.SetHeader(net::HttpRequestHeaders::kOrigin, diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch index 4a87b08d693..af05a636ed8 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch @@ -1,9 +1,9 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl -index dcd5c3349775da59c644b829a86948586574952f..5702e2e43b5e98d58a9a6e7c03e6e8beb56d37ad 100644 +index 33612db4a5f92e45034386e0f28ed72562194bc0..286b42c4cb2d0153e3aee3581e7f780cb9896bcb 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl -@@ -39,7 +39,7 @@ - [RuntimeEnabled=CanvasDrawElement] attribute boolean layoutSubtree; +@@ -41,7 +41,7 @@ + [RuntimeEnabled=CanvasDrawElement] void requestPaint(); [RuntimeEnabled=CanvasDrawElement, RaisesException] DOMMatrix getElementTransform(Element element, DOMMatrix draw_transform); - [MeasureAs=CanvasToDataURL, RaisesException] DOMString toDataURL(optional DOMString type = "image/png", optional any quality); diff --git a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch index d0ceedf0a8a..317ae681d0e 100644 --- a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch +++ b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index d5fe1468676285540909ee078d5b88a9bd8e197c..0f1049854970d348f7e944426008035b8d6478a4 100644 +index 9ba8c0055a45eb0a27a6374c52966c83d8384f12..a1f649358b447368d18f213defdc2df38d336f36 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -839,6 +839,11 @@ @@ -14,7 +14,7 @@ index d5fe1468676285540909ee078d5b88a9bd8e197c..0f1049854970d348f7e944426008035b { name: "BrowserInitiatedAutomaticPictureInPicture", public: true, -@@ -2523,6 +2528,7 @@ +@@ -2614,6 +2619,7 @@ // In-development features for the File System Access API. name: "FileSystemAccessAPIExperimental", status: "experimental", @@ -22,7 +22,7 @@ index d5fe1468676285540909ee078d5b88a9bd8e197c..0f1049854970d348f7e944426008035b }, { // The FileSystemHandle.getCloudIdentifiers() method (see -@@ -2537,6 +2543,7 @@ +@@ -2628,6 +2634,7 @@ // Non-OPFS File System Access API. name: "FileSystemAccessLocal", status: {"default": "stable"}, diff --git a/patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch b/patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch index 92d0e6ea3fe..9cb73520847 100644 --- a/patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch +++ b/patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch @@ -1,5 +1,5 @@ diff --git a/tools/metrics/histograms/metadata/permissions/histograms.xml b/tools/metrics/histograms/metadata/permissions/histograms.xml -index d454a72919b4eeea9f733bd8be9664e06b4a9d21..dceb8ee952405d1724d7cf70246f9c32281a1321 100644 +index 62669632086367232727df45c04c58e7a848f79f..730cf7bb4d44d0beb3e78d10cc5d8c098fa2e24d 100644 --- a/tools/metrics/histograms/metadata/permissions/histograms.xml +++ b/tools/metrics/histograms/metadata/permissions/histograms.xml @@ -53,6 +53,7 @@ chromium-metrics-reviews@google.com. @@ -17,4 +17,4 @@ index d454a72919b4eeea9f733bd8be9664e06b4a9d21..dceb8ee952405d1724d7cf70246f9c32 + - +