From 9f9065bc190fab452c472c046075230ee97c0fc2 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 24 May 2024 12:10:56 -0400 Subject: [PATCH] Merge pull request #23233 from brave/cr126 Upgrade from Chromium 125 to Chromium 126 --- .gitignore | 3 + android/brave_java_sources.gni | 2 +- .../BraveTabGroupUiCoordinator.java | 7 +- .../strings/android_chrome_tab_ui_strings.grd | 117 ++- android/java/apk_for_test.flags | 4 + .../homepage/BraveHomepageManager.java | 5 +- .../settings/BraveHomepageSettings.java | 11 +- .../BraveMultiInstanceManagerApi31.java | 6 +- .../BraveNotificationSettingsBridge.java | 25 - .../BraveSiteChannelsManagerBridge.java | 21 + .../browser/ntp/BraveNewTabPageLayout.java | 4 - .../browser/ntp/IncognitoNewTabPageView.java | 3 - .../BraveTabbedRootUiCoordinator.java | 8 +- .../browser/toolbar/BraveToolbarManager.java | 10 +- .../bottom/BottomToolbarCoordinator.java | 34 +- .../toolbar/top/BraveToolbarLayoutImpl.java | 27 +- .../top/BraveTopToolbarCoordinator.java | 14 +- .../chromium/chrome/browser/BytecodeTest.java | 162 +++- app/app_management_strings.grdp | 18 + app/brave_strings.grd | 140 ++-- app/brave_strings_override.grd | 21 +- app/extensions_strings.grdp | 34 +- app/extensions_strings_override.grdp | 6 + app/feature_defaults_unittest.cc | 19 +- app/generated_resources.grd | 710 ++++++++++++++---- app/generated_resources_override.grd | 56 +- app/os_settings_search_tag_strings.grdp | 43 +- app/os_settings_strings.grdp | 111 ++- app/password_manager_ui_strings.grdp | 25 +- app/profiles_strings.grdp | 39 +- app/profiles_strings_override.grdp | 4 + app/settings_brave_strings.grdp | 12 +- app/settings_strings.grdp | 222 ++++-- app/settings_strings_override.grdp | 14 +- .../base/cached_flags/BraveCachedFlag.java | 12 + .../notification_helper_impl_android.cc | 4 +- browser/brave_profile_prefs.cc | 16 +- browser/debounce/debounce_browsertest.cc | 3 +- .../ethereum_remote_client_service.cc | 4 +- ...mode_fingerprint_protection_browsertest.cc | 1 - .../brave_external_process_importer_host.cc | 2 +- browser/mac/keystone_infobar_delegate.mm | 196 +++++ ...cks_network_delegate_helper_browsertest.cc | 3 +- ...ect_network_delegate_helper_browsertest.cc | 3 +- .../custom_background_file_manager.cc | 8 +- .../mock_permission_lifetime_prompt.cc | 4 + .../mock_permission_lifetime_prompt.h | 1 + browser/playlist/playlist_data_source.cc | 10 +- browser/playlist/playlist_service_factory.cc | 5 +- .../settings/brave_overrides/basic_page.ts | 15 + .../settings/brave_overrides/cr_icon.ts | 36 + .../settings/brave_overrides/index.ts | 1 + .../settings/brave_overrides/iron_icon.ts | 10 +- browser/resources/settings/brave_routes.ts | 20 +- browser/resources/settings/sources.gni | 6 +- .../BraveManageAccountDevicesLinkView.java | 3 +- browser/sources.gni | 1 + browser/ui/BUILD.gn | 4 + .../browser/logo/BraveLogoMediator.java | 2 - browser/ui/android/omnibox/BUILD.gn | 1 + .../BraveAutocompleteCoordinator.java | 16 +- .../BraveDropdownItemViewInfoListBuilder.java | 2 +- .../strings/android_chrome_strings.grd | 212 ++++-- .../android_chrome_strings_override.grd | 7 +- browser/ui/brave_layout_constants.cc | 21 +- browser/ui/brave_layout_constants.h | 1 + browser/ui/color/brave_color_mixer.cc | 27 +- ...e_autoplay_content_setting_bubble_model.cc | 8 +- .../brave_startup_tab_provider_impl.cc | 20 + .../startup/brave_startup_tab_provider_impl.h | 25 + browser/ui/tabs/brave_tab_menu_model.cc | 2 +- browser/ui/tabs/shared_pinned_tab_service.cc | 12 +- .../test/split_view_browser_data_unittest.cc | 6 +- browser/ui/toolbar/brave_app_menu_model.cc | 26 +- .../brave_app_menu_model_browsertest.cc | 81 +- .../bookmarks/bookmark_bar_browsertest.cc | 2 +- .../bookmark_bar_instructions_view.cc | 3 +- .../bookmark_bar_instructions_view.h | 3 +- .../brave_saved_tab_group_button.cc | 2 +- .../brave_rewards_action_view.cc | 5 + .../views/brave_ads/notification_ad_popup.cc | 3 +- .../views/brave_ads/notification_ad_popup.h | 2 +- .../brave_news/brave_news_bubble_view.cc | 4 +- .../brave_news/brave_news_feed_item_view.cc | 4 +- .../brave_tooltips/brave_tooltip_popup.cc | 3 +- .../brave_tooltips/brave_tooltip_popup.h | 2 +- .../download/brave_download_item_view.cc | 5 +- .../views/download/brave_download_item_view.h | 3 +- .../frame/brave_tab_strip_region_view.cc | 49 +- .../views/frame/brave_tab_strip_region_view.h | 12 +- .../frame/vertical_tab_strip_region_view.cc | 12 +- .../frame/vertical_tab_strip_region_view.h | 3 +- .../location_bar/brave_location_bar_view.cc | 5 +- .../location_bar/brave_location_bar_view.h | 3 +- .../brave_search_conversion_promotion_view.cc | 7 +- .../brave_search_conversion_promotion_view.h | 3 +- .../brave_wallet_permission_prompt_impl.cc | 4 + .../brave_wallet_permission_prompt_impl.h | 1 + browser/ui/views/rounded_separator.cc | 3 +- browser/ui/views/rounded_separator.h | 3 +- .../playlist/playlist_contents_wrapper.cc | 3 +- .../playlist/playlist_contents_wrapper.h | 3 +- .../sidebar_add_item_bubble_delegate_view.cc | 3 +- .../ui/views/sidebar/sidebar_button_view.cc | 3 +- .../ui/views/sidebar/sidebar_button_view.h | 3 +- .../views/sidebar/sidebar_container_view.cc | 5 +- .../ui/views/sidebar/sidebar_container_view.h | 3 +- .../sidebar/sidebar_items_contents_view.cc | 5 +- .../sidebar/sidebar_items_contents_view.h | 3 +- .../sidebar/sidebar_items_scroll_view.cc | 6 +- .../views/sidebar/sidebar_items_scroll_view.h | 3 +- .../views/speedreader/reader_mode_bubble.cc | 6 +- .../ui/views/speedreader/reader_mode_bubble.h | 3 +- .../speedreader/reader_mode_toolbar_view.cc | 3 +- .../speedreader/reader_mode_toolbar_view.h | 3 +- .../tabs/brave_compound_tab_container.cc | 8 +- .../views/tabs/brave_compound_tab_container.h | 3 +- browser/ui/views/tabs/brave_new_tab_button.cc | 3 +- browser/ui/views/tabs/brave_new_tab_button.h | 3 +- browser/ui/views/tabs/brave_tab_container.cc | 5 +- browser/ui/views/tabs/brave_tab_container.h | 3 +- .../tabs/brave_tab_hover_card_controller.cc | 24 +- .../tabs/brave_tab_hover_card_controller.h | 2 + .../ui/views/tabs/brave_tab_search_button.cc | 21 +- .../ui/views/tabs/brave_tab_search_button.h | 1 - .../webui/ai_chat/ai_chat_ui_page_handler.cc | 7 +- browser/ui/webui/brave_rewards_source.cc | 8 +- .../brave_extensions_manifest_v2_handler.cc | 8 +- .../ui/webui/settings/brave_tor_handler.cc | 6 +- .../brave_tor_snowflake_extension_handler.cc | 2 +- .../brave_welcome_ui_browsertest.cc | 17 +- browser/ui/whats_new/whats_new_browsertest.cc | 8 + build/android/BUILD.gn | 2 +- .../BraveHomepageManagerClassAdapter.java | 9 +- .../BraveNewTabPageLayoutClassAdapter.java | 15 + .../BraveToolbarManagerClassAdapter.java | 3 + build/android/config.gni | 2 +- build/commands/lib/config.js | 5 +- .../commands/lib/updateUnsafeBuffersPaths.js | 61 ++ build/commands/lib/util.js | 3 + chromium_presubmit_config.json5 | 1 - .../chrome/browser/browser_features.cc | 1 - ...page_specific_content_settings_delegate.cc | 4 +- .../flags/android/chrome_feature_list.cc | 3 + .../chrome/browser/importer/profile_writer.cc | 2 +- .../chrome/browser/signin/signin_features.cc | 24 - .../ui/cocoa/keystone_infobar_delegate.cc | 7 + .../ui/cocoa/keystone_infobar_delegate.mm | 115 --- .../chrome/browser/ui/layout_constants.cc | 14 + .../lens_overlay_controller_browsertest.cc | 13 + .../default_browser_infobar_delegate.cc | 4 +- .../startup/startup_browser_creator_impl.cc | 42 +- .../views/bookmarks/bookmark_bubble_view.cc | 4 - .../ui/views/frame/tab_strip_region_view.h | 3 + .../views/location_bar/location_bar_util.cc | 22 + .../views/location_bar/location_bar_view.cc | 7 + .../ui/views/omnibox/omnibox_result_view.cc | 15 + .../ui/views/omnibox/omnibox_row_view.cc | 8 + .../ui/views/omnibox/omnibox_row_view.h | 19 + .../tabs/tab_group_editor_bubble_view.cc | 40 + .../views/tabs/tab_hover_card_bubble_view.cc | 8 - .../ui/views/tabs/tab_hover_card_controller.h | 5 + .../ui/views/tabs/tab_strip_control_button.cc | 26 + .../ui/views/tabs/tab_strip_control_button.h | 10 + .../ui/views/translate/translate_icon_view.cc | 15 +- .../chrome/browser/ui/webui/favicon_source.cc | 2 +- .../password_manager/password_manager_ui.cc | 8 +- .../bookmarks/bookmarks_side_panel_ui.h | 10 + .../top_chrome/webui_contents_wrapper.cc | 4 +- chromium_src/chrome/browser/unexpire_flags.cc | 5 - .../structured/structured_metrics_features.cc | 1 - .../permissions/permission_uma_util.cc | 10 + .../components/permissions/request_type.cc | 10 +- .../privacy_sandbox_features.cc | 1 - .../privacy_sandbox_settings_unittest.cc | 9 +- .../signin/public/base/signin_switches.cc | 15 + .../identity_manager/identity_manager.cc | 4 + .../identity_manager/identity_manager.h | 5 + .../sync/base/model_type_unittest.cc | 2 +- .../device_info_sync_bridge.cc | 4 +- .../device_info_sync_bridge_unittest.cc | 6 +- .../private_aggregation_features.cc | 4 +- .../web_package/signed_exchange_utils.cc | 21 + chromium_src/content/common/features.cc | 2 - .../content/public/common/content_features.cc | 2 - ...gle_api_keys.cc => google_api_keys-inc.cc} | 7 +- .../blink/public/web/web_document.h | 3 +- .../bindings/scripts/bind_gen/interface.py | 2 - .../renderer/core/exported/web_document.cc | 5 +- chromium_src/ui/base/ui_base_features.cc | 2 - chromium_src/ui/color/color_mixers.cc | 25 - .../ui/color/material_ui_color_mixer.cc | 13 +- chromium_src/ui/color/ui_color_mixer.cc | 18 +- chromium_src/ui/gfx/color_palette.h | 24 +- chromium_src/ui/native_theme/native_theme.cc | 3 +- .../views/controls/button/md_text_button.cc | 298 ++++---- .../ui/views/controls/button/md_text_button.h | 18 +- .../ui/views/controls/menu/menu_config.cc | 5 +- common/brave_content_client.cc | 2 +- components/ai_chat/content/browser/BUILD.gn | 1 + .../content/browser/ai_chat_tab_helper.cc | 4 +- .../content/browser/ai_chat_tab_helper.h | 2 +- ...chat_resource_sniffer_throttle_unittest.cc | 4 +- components/autofill_payments_strings.grdp | 28 +- components/autofill_strings.grdp | 38 +- .../body_sniffer/body_sniffer_url_loader.cc | 6 +- .../browser/brave_news_controller.cc | 6 +- .../brave_rewards/core/common/random_util.cc | 2 +- .../brave_rewards/core/common/signer.cc | 2 +- .../content/browser/brave_shields_util.cc | 2 +- .../core/browser/ad_block_list_p3a.h | 1 + components/brave_sync/crypto/crypto.cc | 2 +- .../brave_sync/crypto/crypto_unittest.cc | 14 +- .../android_page_appearing_browsertest.cc | 1 - .../browser/brave_wallet_utils.cc | 2 +- .../browser/ethereum_provider_impl.cc | 2 +- .../brave_wallet/browser/internal/hd_key.cc | 2 +- .../site_settings/BraveWebsite.java | 7 +- components/browsing_data_strings.grdp | 41 +- components/commerce_strings.grdp | 97 ++- components/compose_strings.grdp | 17 +- ...ettings_agent_impl_autoplay_browsertest.cc | 8 +- .../ephemeral_storage_service.cc | 2 +- components/error_page_strings.grdp | 2 +- components/facilitated_payments_strings.grdp | 7 + components/history_strings.grdp | 14 +- components/management_strings.grdp | 9 +- components/new_or_sad_tab_strings.grdp | 63 -- .../new_or_sad_tab_strings_override.grdp | 59 +- .../browser/ntp_widget_utils_oauth.cc | 2 +- components/omnibox_pedal_ui_strings.grdp | 10 +- components/omnibox_strings.grdp | 3 + components/page_info_strings.grdp | 7 +- components/password_manager_strings.grdp | 5 +- components/payments_strings.grdp | 6 + components/pdf_strings.grdp | 2 +- components/permissions_strings.grdp | 34 +- components/plus_addresses_strings.grdp | 6 + .../brave_privacy_sandbox_settings.cc | 9 +- .../brave_privacy_sandbox_settings.h | 11 +- .../privacy_sandbox_chrome_strings.grdp | 17 +- ...ivacy_sandbox_chrome_strings_override.grdp | 9 +- components/site_settings_strings.grdp | 3 + components/ssl_errors_strings.grdp | 7 + .../sync/service/brave_sync_service_impl.cc | 5 +- .../sync/service/brave_sync_service_impl.h | 1 - .../brave_sync_service_impl_unittest.cc | 1 - .../vector_icons/brave/product_refresh.icon | 157 ++++ ios/app/brave_core_main.mm | 2 +- .../App/Client.xcodeproj/project.pbxproj | 24 +- ios/brave-ios/Package.swift | 2 +- .../Messages/AIChatSuggestionsView.swift | 2 +- ...IChatAdvancedSettingsLabelDetailView.swift | 2 +- .../BVC+FindInPageDelegate.swift | 6 +- .../Frontend/Browser/FindInPageBar.swift | 6 +- .../Sandboxed/FindInPageScriptHandler.swift | 4 +- ios/browser/api/ads/brave_ads.mm | 2 +- .../bookmarks/bookmark_model_listener_ios.h | 6 +- .../bookmarks/bookmark_model_listener_ios.mm | 6 +- .../api/bookmarks/brave_bookmarks_api.mm | 7 +- .../exporter/brave_bookmarks_exporter.mm | 2 +- .../bookmarks/importer/bookmarks_importer.mm | 2 +- ios/browser/api/favicon/favicon_loader.mm | 2 +- .../api/password/brave_password_api.mm | 3 +- ios/browser/api/web/ui/BUILD.gn | 2 + ios/browser/api/web/ui/chrome_webview.mm | 5 +- .../favicon/brave_ios_favicon_loader.mm | 11 +- .../keyed_service_factory_wrapper.mm | 3 +- .../proxy_config_service_tor.cc | 2 +- package.json | 4 +- patches/base-BUILD.gn.patch | 8 +- ...est-launcher-test_results_tracker.cc.patch | 4 +- ...base-threading-thread_restrictions.h.patch | 4 +- ...ase-trace_event-builtin_categories.h.patch | 4 +- patches/build-android-gyp-lint.py.patch | 2 +- patches/build-android-gyp-proguard.py.patch | 4 +- ...d-android-gyp-util-resource_utils.py.patch | 2 +- patches/build-config-BUILDCONFIG.gn.patch | 2 +- patches/build-config-android-BUILD.gn.patch | 2 +- patches/build-config-android-config.gni.patch | 2 +- ...ld-config-android-internal_rules.gni.patch | 4 +- patches/build-config-android-rules.gni.patch | 6 +- patches/build-config-chrome_build.gni.patch | 2 +- patches/build-config-compiler-BUILD.gn.patch | 6 +- patches/build-rust-cargo_crate.gni.patch | 2 +- patches/build-rust-rust_target.gni.patch | 2 +- patches/chrome-BUILD.gn.patch | 12 +- patches/chrome-android-BUILD.gn.patch | 18 +- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 4 +- ...d-expectations-lint-suppressions.xml.patch | 4 +- ...ome-android-features-tab_ui-BUILD.gn.patch | 6 +- ...rowser-feed-FeedSurfaceMediator.java.patch | 2 +- ...ome-android-java-AndroidManifest.xml.patch | 4 +- ...a-res-layout-custom_tabs_toolbar.xml.patch | 4 +- ...menu-ChromeContextMenuPopulator.java.patch | 2 +- ...rowser-homepage-HomepageManager.java.patch | 13 + ...ions-NotificationPlatformBridge.java.patch | 6 +- ...rivacy-settings-PrivacySettings.java.patch | 6 +- ...ync-settings-ManageSyncSettings.java.patch | 12 +- ...ed_mode-TabbedRootUiCoordinator.java.patch | 4 +- patches/chrome-android-java_sources.gni.patch | 4 +- patches/chrome-app-BUILD.gn.patch | 4 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 6 +- ...rowsing_data-browsing_data_bridge.cc.patch | 4 +- ...chrome-browser-app_controller_mac.mm.patch | 8 +- ...hrome-browser-browser_process_impl.h.patch | 4 +- ...me_browsing_data_remover_delegate.cc.patch | 4 +- ...pecific_content_settings_delegate.cc.patch | 6 +- ...wnload-download_target_determiner.cc.patch | 6 +- .../chrome-browser-extensions-BUILD.gn.patch | 8 +- ..._private-extension_info_generator.cc.patch | 4 +- ...r-extensions-extension_management.cc.patch | 4 +- ...rotocol-external_protocol_handler.cc.patch | 4 +- ...me-browser-importer-importer_list.cc.patch | 2 +- ...-webrtc-webrtc_event_log_uploader.cc.patch | 2 +- ...-media-webrtc-webrtc_log_uploader.cc.patch | 4 +- ...t-profile_network_context_service.cc.patch | 4 +- ...et-system_network_context_manager.cc.patch | 4 +- ...annels-ChromeChannelDefinitions.java.patch | 4 +- ...notification_display_service_impl.cc.patch | 2 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 12 +- ...profiles-profile_avatar_icon_util.cc.patch | 8 +- ...ext_menu-render_view_context_menu.cc.patch | 4 +- ...text_menu-render_view_context_menu.h.patch | 4 +- ...browser-resources-bookmarks-BUILD.gn.patch | 2 +- ...r-resources-bookmarks-bookmarks.html.patch | 4 +- ...ser-resources-bookmarks-bookmarks.ts.patch | 4 +- ...sources-bookmarks-command_manager.ts.patch | 4 +- ...browser-resources-downloads-BUILD.gn.patch | 4 +- ...r-resources-downloads-downloads.html.patch | 4 +- ...rowser-resources-extensions-BUILD.gn.patch | 4 +- ...resources-extensions-extensions.html.patch | 2 +- ...r-resources-extensions-extensions.ts.patch | 2 +- ...-resources-extensions-item_list.html.patch | 4 +- ...er-resources-extensions-item_list.ts.patch | 4 +- ...e-browser-resources-history-BUILD.gn.patch | 4 +- ...owser-resources-history-history.html.patch | 4 +- ...browser-resources-history-history.ts.patch | 2 +- ...-resources-history-history_item.html.patch | 2 +- ...er-resources-history-history_item.ts.patch | 4 +- ...password_manager-password_manager.ts.patch | 2 +- ...es-password_manager-shared_style.css.patch | 2 +- ...-browser-resources-settings-BUILD.gn.patch | 4 +- ...ettings-people_page-sync_controls.ts.patch | 2 +- ...cy_page-personalization_options.html.patch | 6 +- ...vacy_page-personalization_options.ts.patch | 8 +- ...tings-privacy_page-privacy_page.html.patch | 2 +- ...ettings-privacy_page-privacy_page.ts.patch | 2 +- ...-browser-resources-settings-route.ts.patch | 4 +- ...browser-resources-settings-router.ts.patch | 2 +- ...ser-resources-settings-settings.html.patch | 4 +- ...owser-resources-settings-settings.ts.patch | 2 +- ...-settings-site_settings-constants.ts.patch | 4 +- ..._settings_page-site_settings_page.ts.patch | 2 +- ...el-bookmarks-power_bookmark_row.html.patch | 13 - ...anel-bookmarks-power_bookmark_row.ts.patch | 45 -- ...es-side_panel-read_anything-BUILD.gn.patch | 13 + ...nin-profile_picker-profile_card.html.patch | 2 +- ...picker-profile_picker_main_view.html.patch | 2 +- ...e_picker-profile_picker_main_view.ts.patch | 2 +- .../chrome-browser-shell_integration.h.patch | 8 +- ...e-browser-shell_integration_linux.cc.patch | 4 +- ...-account_consistency_mode_manager.cc.patch | 2 +- ...er-spellcheck_hunspell_dictionary.cc.patch | 2 +- ...e_access_grant_permission_context.cc.patch | 4 +- ...browser-sync-sync_service_factory.cc.patch | 4 +- ...wser-themes-theme_service_factory.cc.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +- ...rowser-ui-actions-chrome_action_id.h.patch | 4 +- ...-browser-ui-android-toolbar-BUILD.gn.patch | 2 +- ...rowser-toolbar-top-ToolbarPhone.java.patch | 14 +- ...owser-toolbar-top-ToolbarTablet.java.patch | 6 +- patches/chrome-browser-ui-browser.cc.patch | 6 +- ...rome-browser-ui-browser_navigator.cc.patch | 2 +- .../chrome-browser-ui-chrome_pages.cc.patch | 4 +- .../chrome-browser-ui-color-BUILD.gn.patch | 4 +- ...ions-icon_with_badge_image_source.cc.patch | 6 +- ...rtup-startup_browser_creator_impl.cc.patch | 12 - ...r-ui-startup-startup_tab_provider.cc.patch | 12 - .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...i-tabs-recent_tabs_sub_menu_model.cc.patch | 6 +- ...cent_tabs_sub_menu_model_unittest.cc.patch | 2 +- ...me-browser-ui-tabs-tab_strip_model.h.patch | 4 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 4 +- ...ws-bookmarks-bookmark_bubble_view.cc.patch | 16 +- ...-views-download-download_item_view.h.patch | 4 +- ...i-views-frame-browser_view_layout.cc.patch | 2 +- ...-views-frame-tab_strip_region_view.h.patch | 4 +- ...cation_bar-icon_label_bubble_view.cc.patch | 4 +- ...ws-location_bar-location_bar_view.cc.patch | 18 +- ...ews-location_bar-location_bar_view.h.patch | 4 +- ...s-location_bar-location_icon_view.cc.patch | 4 +- ...verlay-video_overlay_window_views.cc.patch | 6 +- ...-page_info-page_info_view_factory.cc.patch | 4 +- ...ermission_prompt_bubble_base_view.cc.patch | 8 +- ...ews-profiles-avatar_toolbar_button.h.patch | 4 +- ...i-views-profiles-profile_menu_view.h.patch | 4 +- ...ws-profiles-profile_menu_view_base.h.patch | 4 +- ...-side_panel-side_panel_coordinator.h.patch | 4 +- ...owser-ui-views-tabs-new_tab_button.h.patch | 2 +- .../chrome-browser-ui-views-tabs-tab.cc.patch | 8 +- ...ws-tabs-tab_hover_card_bubble_view.h.patch | 4 +- ...e-browser-ui-views-tabs-tab_strip.cc.patch | 12 +- ...-browser-ui-views-toolbar-app_menu.h.patch | 4 +- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 +- .../chrome-browser-ui-webui-BUILD.gn.patch | 6 +- ...r-ui-webui-bookmarks-bookmarks_ui.cc.patch | 4 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...r-ui-webui-downloads-downloads_ui.cc.patch | 4 +- ...ui-webui-extensions-extensions_ui.cc.patch | 4 +- ...owser-ui-webui-history-history_ui.cc.patch | 6 +- ...ui-print_preview-print_preview_ui.cc.patch | 2 +- ...-ui-webui-settings-people_handler.cc.patch | 8 +- ...ttings_localized_strings_provider.cc.patch | 4 +- ...bui-settings-site_settings_helper.cc.patch | 8 +- ...ome-browser-ui-webui-theme_source.cc.patch | 6 +- ..._integration-web_app_shortcut_mac.mm.patch | 4 +- .../chrome-chrome_repack_locales.gni.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 12 +- ...extensions-api-developer_private.idl.patch | 4 +- patches/chrome-installer-linux-BUILD.gn.patch | 14 +- ...aller-linux-common-installer.include.patch | 6 +- ...rome-installer-linux-debian-build.sh.patch | 14 +- .../chrome-installer-linux-rpm-build.sh.patch | 2 +- ...hrome-installer-mac-signing-model.py.patch | 4 +- ...me-installer-mac-signing-pipeline.py.patch | 4 +- ...me-installer-mini_installer-BUILD.gn.patch | 4 +- ...ller-mini_installer-configuration.cc.patch | 2 +- patches/chrome-installer-util-BUILD.gn.patch | 6 +- .../chrome-installer-util-shell_util.cc.patch | 2 +- patches/chrome-renderer-BUILD.gn.patch | 2 +- ...er-chrome_content_renderer_client.cc.patch | 6 +- patches/chrome-test-BUILD.gn.patch | 4 +- ...-build-mac-infoplist_strings_util.cc.patch | 4 +- patches/chrome-utility-BUILD.gn.patch | 4 +- ...settings-SingleCategorySettings.java.patch | 4 +- ...t-android-java-res-values-dimens.xml.patch | 4 +- ..._updater-component_updater_service.h.patch | 10 +- ...er-page_specific_content_settings.cc.patch | 6 +- ...ntent_settings-core-browser-BUILD.gn.patch | 2 +- ...browser-content_settings_registry.cc.patch | 4 +- ...browser-content_settings_uma_util.cc.patch | 4 +- ...re-browser-content_settings_utils.cc.patch | 2 +- ...-core-common-cookie_settings_base.cc.patch | 4 +- ...s-core-common-cookie_settings_base.h.patch | 2 +- ...omponents-crash-core-app-crashpad.cc.patch | 2 +- ...embedder_support-user_agent_utils.cc.patch | 2 +- ...error_page-common-localized_error.cc.patch | 4 +- ...ts-external_intents-android-BUILD.gn.patch | 4 +- ...onents-history-core-browser-BUILD.gn.patch | 4 +- ...history-core-browser-history_types.h.patch | 2 +- patches/components-metrics-BUILD.gn.patch | 4 +- .../components-omnibox-browser-BUILD.gn.patch | 6 +- ...x-browser-autocomplete_controller.cc.patch | 6 +- ...mnibox-browser-omnibox_edit_model.cc.patch | 2 +- .../components-page_info-page_info.cc.patch | 4 +- ...ser-password_store-login_database.cc.patch | 4 +- patches/components-permissions-BUILD.gn.patch | 8 +- ...prompt-permission_dialog_delegate.cc.patch | 6 +- ...ermissions-permission_context_base.h.patch | 4 +- ...ts-permissions-permission_manager.cc.patch | 6 +- ...s-permissions-permission_uma_util.cc.patch | 12 +- ...nents-permissions-permission_util.cc.patch | 4 +- ...mponents-permissions-request_type.cc.patch | 4 +- ...licy-tools-generate_policy_source.py.patch | 4 +- ...g-core-common-safe_browsing_prefs.cc.patch | 2 +- .../components-search_engines-BUILD.gn.patch | 4 +- ...ch_engines-prepopulated_engines.json.patch | 2 +- ...n-internal-identity_manager-BUILD.gn.patch | 2 +- patches/components-strings-BUILD.gn.patch | 4 +- ...ents-sync-engine-model_type_worker.h.patch | 4 +- ...s-sync-engine-sync_scheduler_impl.cc.patch | 4 +- ...protocol-device_info_specifics.proto.patch | 2 +- ...nents-sync-protocol-proto_visitors.h.patch | 6 +- ...s-sync-protocol-protocol_sources.gni.patch | 4 +- .../components-sync-service-BUILD.gn.patch | 4 +- ...nts-sync-service-sync_service_impl.h.patch | 2 +- ...nents-sync_device_info-device_info.h.patch | 2 +- ...-content-renderer-translate_agent.cc.patch | 2 +- ...-variations-variations_seed_store.cc.patch | 2 +- ...coa-render_widget_host_view_cocoa.mm.patch | 4 +- ...browsing_data_filter_builder_impl.cc.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 2 +- ...derer_host-render_frame_host_impl.cc.patch | 8 +- ...er-web_contents-web_contents_impl.cc.patch | 4 +- patches/content-common-BUILD.gn.patch | 2 +- patches/content-common-frame.mojom.patch | 2 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- .../crypto-unexportable_key_metrics.cc.patch | 2 +- ...xtension_web_request_event_router.cc.patch | 4 +- ...ensions-browser-extension_creator.cc.patch | 2 +- .../google_apis-google_api_keys-inc.cc.patch | 4 +- patches/ios-chrome-app-BUILD.gn.patch | 4 +- ...-chrome-browser-flags-about_flags.mm.patch | 4 +- ...-shared-model-prefs-browser_prefs.mm.patch | 10 +- ...r-sync-model-sync_service_factory.mm.patch | 6 +- ...ngs-checks-mojom_attributes_check.py.patch | 2 +- ...o-public-tools-mojom-mojom_parser.py.patch | 2 +- patches/net-BUILD.gn.patch | 2 +- patches/net-base-proxy_server.cc.patch | 6 +- patches/net-cookies-canonical_cookie.cc.patch | 4 +- .../net-cookies-cookie_deletion_info.h.patch | 2 +- patches/net-dns-BUILD.gn.patch | 2 +- ...net-dns-host_resolver_manager_job.cc.patch | 2 +- ...nfigured_proxy_resolution_service.cc.patch | 2 +- .../sandbox-policy-win-sandbox_win.cc.patch | 4 +- .../services-network-cookie_manager.cc.patch | 2 +- ...ices-network-cors-cors_url_loader.cc.patch | 4 +- ...services-network-public-cpp-BUILD.gn.patch | 2 +- .../third_party-android_deps-BUILD.gn.patch | 2 +- ...mmon-permissions-permission_utils.cc.patch | 2 +- ...bindings-core-v8-v8_script_runner.cc.patch | 2 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...renderer-bindings-idl_in_modules.gni.patch | 4 +- ...ndings-scripts-bind_gen-interface.py.patch | 4 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 4 +- ...erer-core-dom-events-event_target.cc.patch | 4 +- ...derer-core-frame-local_dom_window.cc.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...r-core-html-media-autoplay_policy.cc.patch | 6 +- ...r-core-loader-frame_fetch_context.cc.patch | 4 +- ...r-modulescript-module_tree_linker.cc.patch | 18 +- ...cy-permissions_policy_features.json5.patch | 6 +- ...re-script-dynamic_module_resolver.cc.patch | 8 +- ...enderer-core-script-script_loader.cc.patch | 2 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 4 +- ...anvas2d-base_rendering_context_2d.cc.patch | 8 +- ...as2d-canvas_rendering_context_2d.idl.patch | 2 +- ...reen_canvas_rendering_context_2d.idl.patch | 2 +- ...paint-paint_rendering_context_2d.idl.patch | 2 +- ...modules-mediastream-media_devices.cc.patch | 4 +- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +- ...rty-blink-renderer-platform-BUILD.gn.patch | 4 +- ...tform-runtime_enabled_features.json5.patch | 10 +- patches/third_party-lit-v3_0-BUILD.gn.patch | 20 + .../third_party-polymer-v3_0-BUILD.gn.patch | 16 +- .../third_party-rust-serde-v1-BUILD.gn.patch | 4 +- ...rd_party-rust-serde_json-v1-BUILD.gn.patch | 6 +- .../third_party-rust-syn-v2-BUILD.gn.patch | 6 +- ...plication-ApplicationPanelSidebar.ts.patch | 4 +- ...-binary_size-libsupersize-archive.py.patch | 2 +- ...ools-clang-pylib-clang-compile_db.py.patch | 4 +- patches/tools-crates-gnrt-gen.rs.patch | 4 +- ...tools-gritsettings-resource_ids.spec.patch | 4 +- ...json_schema_compiler-cc_generator.py.patch | 2 +- ...s-json_schema_compiler-idl_schema.py.patch | 4 +- ...metadata-histogram_suffixes_list.xml.patch | 4 +- ...tograms-metadata-page-histograms.xml.patch | 2 +- ...ols-perf-benchmarks-system_health.py.patch | 4 +- ...tools-perf-core-results_dashboard.py.patch | 2 +- ...f-core-services-dashboard_service.py.patch | 2 +- .../tools-perf-process_perf_results.py.patch | 2 +- ...y-platform-ax_platform_node_cocoa.mm.patch | 4 +- patches/ui-base-BUILD.gn.patch | 4 +- .../ui-base-accelerators-accelerator.cc.patch | 4 +- .../ui-native_theme-native_theme_win.cc.patch | 2 +- ...bility-accessibility_paint_checks.cc.patch | 2 +- ...iews-controls-menu-menu_separator.cc.patch | 2 +- .../ui-views-layout-layout_provider.cc.patch | 13 + patches/ui-webui-resources-BUILD.gn.patch | 4 +- ...or_picker-theme_color_picker.html.ts.patch | 2 +- ...e_color_picker-theme_color_picker.ts.patch | 2 +- ...webui-resources-cr_elements-BUILD.gn.patch | 4 +- ...rces-cr_elements-cr_shared_style.css.patch | 2 +- ...urces-cr_elements-cr_shared_vars.css.patch | 4 +- ...cr_elements-cr_toolbar-cr_toolbar.ts.patch | 4 +- ...ebui-resources-tools-build_webui.gni.patch | 2 +- patches/v8/BUILD.gn.patch | 6 +- patches/v8/src-codegen-compiler.cc.patch | 4 +- .../brave_wallet_render_frame_observer.cc | 6 +- script/brave_license_helper.py | 2 + test/BUILD.gn | 1 + .../static/js/frames/ephemeral-storage.js | 6 +- test/filters/browser_tests-windows.filter | 4 + test/filters/browser_tests.filter | 70 +- test/filters/unit_tests-linux.filter | 1 + test/filters/unit_tests.filter | 39 +- .../core/brave_page_graph/libxml_utils.cc | 2 +- third_party/lit/v3_0/sources.gni | 9 + third_party/polymer/v3_0/sources.gni | 6 + .../rust/chromium_crates_io/Cargo.lock | 30 +- .../rust/chromium_crates_io/Cargo.toml | 18 +- third_party/rust/cxx/v1/README.chromium | 2 +- .../rust/cxxbridge_flags/v1/README.chromium | 2 +- .../rust/cxxbridge_macro/v1/README.chromium | 2 +- third_party/rust/proc_macro2/v1/BUILD.gn | 22 +- .../rust/proc_macro2/v1/README.chromium | 2 +- third_party/rust/quote/v1/BUILD.gn | 18 +- third_party/rust/quote/v1/README.chromium | 2 +- third_party/rust/serde/v1/README.chromium | 2 +- .../rust/serde_derive/v1/README.chromium | 2 +- .../rust/serde_json/v1/README.chromium | 2 +- third_party/rust/syn/v2/README.chromium | 2 +- ui/views/menu_config_unittest.cc | 6 +- ui/webui/resources/BUILD.gn | 10 +- ui/webui/resources/lit_overriding.ts | 23 + ...ave_group.icon => save_group_refresh.icon} | 0 .../vector_icons/product_chrome_refresh.icon | 109 +++ vendor/brave_base/random.cc | 4 +- 603 files changed, 4557 insertions(+), 2317 deletions(-) delete mode 100644 android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java create mode 100644 android/java/org/chromium/chrome/browser/notifications/channels/BraveSiteChannelsManagerBridge.java create mode 100644 browser/mac/keystone_infobar_delegate.mm create mode 100644 browser/resources/settings/brave_overrides/cr_icon.ts create mode 100644 browser/ui/startup/brave_startup_tab_provider_impl.cc create mode 100644 browser/ui/startup/brave_startup_tab_provider_impl.h create mode 100644 build/commands/lib/updateUnsafeBuffersPaths.js delete mode 100644 chromium_src/chrome/browser/signin/signin_features.cc create mode 100644 chromium_src/chrome/browser/ui/cocoa/keystone_infobar_delegate.cc delete mode 100644 chromium_src/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm create mode 100644 chromium_src/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc rename chromium_src/chrome/browser/ui/startup/{ => default_browser_prompt}/default_browser_infobar_delegate.cc (68%) create mode 100644 chromium_src/chrome/browser/ui/views/location_bar/location_bar_util.cc create mode 100644 chromium_src/chrome/browser/ui/views/omnibox/omnibox_result_view.cc create mode 100644 chromium_src/chrome/browser/ui/views/omnibox/omnibox_row_view.h create mode 100644 chromium_src/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc create mode 100644 chromium_src/chrome/browser/ui/views/tabs/tab_strip_control_button.cc create mode 100644 chromium_src/components/signin/public/base/signin_switches.cc create mode 100644 chromium_src/content/browser/web_package/signed_exchange_utils.cc rename chromium_src/google_apis/{google_api_keys.cc => google_api_keys-inc.cc} (71%) delete mode 100644 chromium_src/ui/color/color_mixers.cc create mode 100644 components/vector_icons/brave/product_refresh.icon create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch delete mode 100644 patches/chrome-browser-resources-side_panel-bookmarks-power_bookmark_row.html.patch delete mode 100644 patches/chrome-browser-resources-side_panel-bookmarks-power_bookmark_row.ts.patch create mode 100644 patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch delete mode 100644 patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch delete mode 100644 patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch create mode 100644 patches/third_party-lit-v3_0-BUILD.gn.patch create mode 100644 patches/ui-views-layout-layout_provider.cc.patch create mode 100644 third_party/lit/v3_0/sources.gni create mode 100644 third_party/polymer/v3_0/sources.gni create mode 100644 ui/webui/resources/lit_overriding.ts rename vector_icons/chrome/app/vector_icons/{save_group.icon => save_group_refresh.icon} (100%) create mode 100644 vector_icons/components/omnibox/browser/vector_icons/product_chrome_refresh.icon diff --git a/.gitignore b/.gitignore index 18948035fd3e4..a525cd64da8ad 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,6 @@ test_get_pkgs build/config/gclient_args.gni third_party/rust/target xcuserdata + +# buffer exclusion file generated locally during sync +build/config/unsafe_buffers_paths.txt diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 9551ec6d20dbe..e576d3df0263f 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -242,10 +242,10 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java", "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java", - "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationWarningDialog.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BravePermissionUtils.java", + "../../brave/android/java/org/chromium/chrome/browser/notifications/channels/BraveSiteChannelsManagerBridge.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialog.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialogController.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotification.java", diff --git a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java index b0308c3dbba5a..7f361f8206b72 100644 --- a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java +++ b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java @@ -29,6 +29,7 @@ import org.chromium.chrome.tab_ui.R; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; +import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; import org.chromium.ui.widget.ChromeImageView; @@ -56,7 +57,8 @@ public BraveTabGroupUiCoordinator( @NonNull Supplier dynamicResourceLoaderSupplier, @NonNull TabCreatorManager tabCreatorManager, @NonNull OneshotSupplier layoutStateProviderSupplier, - @NonNull SnackbarManager snackbarManager) { + @NonNull SnackbarManager snackbarManager, + @NonNull ModalDialogManager modalDialogManager) { super( activity, parentView, @@ -73,7 +75,8 @@ public BraveTabGroupUiCoordinator( dynamicResourceLoaderSupplier, tabCreatorManager, layoutStateProviderSupplier, - snackbarManager); + snackbarManager, + modalDialogManager); mIncognitoStateProvider = incognitoStateProvider; diff --git a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd index b0c11326da53a..07e49ee2b272d 100644 --- a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd +++ b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd @@ -219,9 +219,6 @@ - - Create group - Tab Switcher @@ -609,7 +606,7 @@ New tab group - + Title required @@ -678,7 +675,7 @@ } - + Tab groups @@ -721,6 +718,116 @@ other {Created %d2 years ago} } + + +%1$s3 + + + Delete tab group? + + + This will delete the group from all devices signed into %1$stest@gmail.com + + + This will permanently delete the group from your device + + + Don't ask again + + + Delete group + + + Delete + + + Ungroup tab group? + + + The tabs will remain open on this device but the group will be deleted from all devices signed into %1$stest@gmail.com + + + The tabs will remain open on this device but the group will be permanently deleted + + + Ungroup + + + Ungroup + + + Rename tab group + + + Continue + + + Cancel + + + Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. + + + Close all tabs and groups + + + Remove tab(s) and delete group? + + + This will delete the group from all devices signed into %1$stest@gmail.com + + + Close tab and delete group? + + + Close + + + Rename + + + Open the tab group action menu for tab group %1$sShopping cart + + + This will delete the group from all devices signed into %1$stest@gmail.com + + + Remove tab and delete group + + + Your tab groups automatically save and update across all your signed-in devices + + + Tab groups + + + %1$s3 groups saved (will close tabs and delete groups) + + + You'll find your tab groups here + + + Tab groups automatically save and update across all your devices + + + Your tab groups are saved here and get updated across all your signed-in devices + + + Your tab groups are saved here + + + New group from your other device + + + Open + + + + + Tabs + + + Automatically open tab groups from other devices + diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 491f1b43ef093..61ee9ffa1be25 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -42,6 +42,9 @@ *** mLogoCoordinator; *** insertSiteSectionView(...); *** isScrollableMvtEnabled(...); + *** setSearchProviderTopMargin(...); + *** setSearchProviderBottomMargin(...); + *** getLogoMargin(...); } -keep class org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesMediator { @@ -139,6 +142,7 @@ *** mTabContentManager; *** mTabCreatorManager; *** mSnackbarManager; + *** mModalDialogManagerSupplier; *** mTabObscuringHandler; *** mReadAloudControllerSupplier; *** onOrientationChange(...); diff --git a/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java index 11d7cd02a991b..cce044f330749 100644 --- a/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java +++ b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java @@ -8,8 +8,9 @@ import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager; // see org.brave.bytecode.BraveHomepageManagerClassAdapter -public class BraveHomepageManager { - public static boolean shouldCloseAppWithZeroTabs() { +public class BraveHomepageManager extends HomepageManager { + @Override + public boolean shouldCloseAppWithZeroTabs() { return CloseBraveManager.shouldCloseAppWithZeroTabs(); } } diff --git a/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java index 31662a95ddec8..521cc1c3fd7d4 100644 --- a/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java +++ b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java @@ -26,11 +26,12 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { if (homepageSwitch.isVisible()) return; // Show homepage switch if it is hidden. homepageSwitch.setVisible(true); - boolean isHomepageEnabled = HomepageManager.isHomepageEnabled(); + boolean isHomepageEnabled = mHomepageManager.isHomepageEnabled(); homepageSwitch.setChecked(isHomepageEnabled); - homepageSwitch.setOnPreferenceChangeListener((preference, newValue) -> { - mHomepageManager.setPrefHomepageEnabled((boolean) newValue); - return true; - }); + homepageSwitch.setOnPreferenceChangeListener( + (preference, newValue) -> { + mHomepageManager.setPrefHomepageEnabled((boolean) newValue); + return true; + }); } } diff --git a/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java b/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java index bba91559d7b17..642d58910e60b 100644 --- a/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java +++ b/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java @@ -8,12 +8,14 @@ import android.app.Activity; import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator; import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tabmodel.TabModelSelector; +import org.chromium.chrome.browser.ui.desktop_windowing.DesktopWindowStateProvider; import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController; @@ -34,7 +36,7 @@ class BraveMultiInstanceManagerApi31 extends MultiInstanceManagerApi31 { ActivityLifecycleDispatcher activityLifecycleDispatcher, ObservableSupplier modalDialogManagerSupplier, MenuOrKeyboardActionController menuOrKeyboardActionController, - ObservableSupplier desktopWindowModeSupplier) { + Supplier desktopWindowStateProviderSupplier) { super( activity, tabModelOrchestratorSupplier, @@ -42,7 +44,7 @@ class BraveMultiInstanceManagerApi31 extends MultiInstanceManagerApi31 { activityLifecycleDispatcher, modalDialogManagerSupplier, menuOrKeyboardActionController, - desktopWindowModeSupplier); + desktopWindowStateProviderSupplier); } @Override diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java b/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java deleted file mode 100644 index ab045ab5562ec..0000000000000 --- a/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java +++ /dev/null @@ -1,25 +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 https://mozilla.org/MPL/2.0/. - */ - -package org.chromium.chrome.browser.notifications; - -import android.annotation.TargetApi; -import android.os.Build; - -import org.jni_zero.CalledByNative; - -/** - * This class provides our native code to access NotificationSettingsBridge - * without patching notification_channels_provider_android.cc/h. - */ -public class BraveNotificationSettingsBridge { - @TargetApi(Build.VERSION_CODES.O) - @CalledByNative - static @NotificationChannelStatus int getChannelStatus(String channelId) { - return NotificationSettingsBridge.getChannelStatus(channelId); - } -} diff --git a/android/java/org/chromium/chrome/browser/notifications/channels/BraveSiteChannelsManagerBridge.java b/android/java/org/chromium/chrome/browser/notifications/channels/BraveSiteChannelsManagerBridge.java new file mode 100644 index 0000000000000..3e9a1f3d09afd --- /dev/null +++ b/android/java/org/chromium/chrome/browser/notifications/channels/BraveSiteChannelsManagerBridge.java @@ -0,0 +1,21 @@ +/* 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 https://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.notifications.channels; + +import org.jni_zero.CalledByNative; + +import org.chromium.chrome.browser.notifications.NotificationChannelStatus; + +/** + * This class provides our native code to access SiteChannelsManager without patching + * notification_channels_provider_android.cc/h. + */ +public class BraveSiteChannelsManagerBridge { + @CalledByNative + static @NotificationChannelStatus int getChannelStatus(String channelId) { + return SiteChannelsManager.getInstance().getChannelStatus(channelId); + } +} diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index 1938d87383547..572cf895651da 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -1174,8 +1174,6 @@ public void initialize( Profile profile, WindowAndroid windowAndroid, boolean isSurfacePolishEnabled, - boolean isSurfacePolishOmniboxColorEnabled, - boolean isSurfacePolishLessBrandSpaceEnabled, boolean isTablet, ObservableSupplier tabStripHeightSupplier) { super.initialize( @@ -1192,8 +1190,6 @@ public void initialize( profile, windowAndroid, isSurfacePolishEnabled, - isSurfacePolishOmniboxColorEnabled, - isSurfacePolishLessBrandSpaceEnabled, isTablet, tabStripHeightSupplier); diff --git a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java index c3b9f8b7beeae..9ca75be739f42 100644 --- a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java +++ b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java @@ -54,9 +54,6 @@ interface IncognitoNewTabPageManager { /** Tells the caller whether a new snapshot is required or not. */ boolean shouldCaptureThumbnail(); - /** Whether the new version of the Incognito NTP should be shown. */ - boolean shouldShowRevampedIncognitoNtp(); - /** Whether to show the tracking protection UI on the NTP. */ boolean shouldShowTrackingProtectionNtp(); diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java index 06535e498cf1c..1c7c769cd1279 100644 --- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java @@ -68,7 +68,7 @@ public BraveTabbedRootUiCoordinator( @NonNull ObservableSupplier profileSupplier, @NonNull ObservableSupplier bookmarkModelSupplier, @NonNull ObservableSupplier tabBookmarkerSupplier, - @NonNull Supplier contextualSearchManagerSupplier, + @NonNull ObservableSupplier contextualSearchManagerSupplier, @NonNull ObservableSupplier tabModelSelectorSupplier, @NonNull OneshotSupplier startSurfaceSupplier, @NonNull OneshotSupplier tabSwitcherSupplier, @@ -110,8 +110,7 @@ public BraveTabbedRootUiCoordinator( @Nullable Bundle savedInstanceState, @Nullable MultiInstanceManager multiInstanceManager, @Nullable ObservableSupplier overviewColorSupplier, - @Nullable View baseChromeLayout, - @NonNull ObservableSupplierImpl desktopWindowModeSupplier) { + @Nullable View baseChromeLayout) { super( activity, onOmniboxFocusChangedListener, @@ -161,8 +160,7 @@ public BraveTabbedRootUiCoordinator( savedInstanceState, multiInstanceManager, overviewColorSupplier, - baseChromeLayout, - desktopWindowModeSupplier); + baseChromeLayout); mActivity = activity; } diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index d78d9fa071500..688f5027f86c8 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -33,7 +33,6 @@ import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl; import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperManager; -import org.chromium.chrome.browser.desktop_windowing.AppHeaderCoordinator; import org.chromium.chrome.browser.findinpage.FindToolbarManager; import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.homepage.HomepageManager; @@ -68,6 +67,7 @@ import org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator; import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; +import org.chromium.chrome.browser.ui.desktop_windowing.DesktopWindowStateProvider; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.system.StatusBarColorController; @@ -111,6 +111,7 @@ public class BraveToolbarManager extends ToolbarManager { private TabContentManager mTabContentManager; private TabCreatorManager mTabCreatorManager; private SnackbarManager mSnackbarManager; + private Supplier mModalDialogManagerSupplier; private TabObscuringHandler mTabObscuringHandler; private LayoutStateProvider.LayoutStateObserver mLayoutStateObserver; private LayoutStateProvider mLayoutStateProvider; @@ -179,7 +180,7 @@ public BraveToolbarManager( @Nullable ObservableSupplier overviewColorSupplier, @Nullable View baseChromeLayout, ObservableSupplier readAloudControllerSupplier, - OneshotSupplier appHeaderCoordinatorSupplier) { + @Nullable DesktopWindowStateProvider desktopWindowStateProvider) { super( activity, controlsSizer, @@ -228,7 +229,7 @@ public BraveToolbarManager( overviewColorSupplier, baseChromeLayout, readAloudControllerSupplier, - appHeaderCoordinatorSupplier); + desktopWindowStateProvider); mOmniboxFocusStateSupplier = omniboxFocusStateSupplier; mLayoutStateProviderSupplier = layoutStateProviderSupplier; @@ -287,7 +288,8 @@ public void enableBottomControls() { mCompositorViewHolder::getDynamicResourceLoader, mTabCreatorManager, mLayoutStateProviderSupplier, - mSnackbarManager); + mSnackbarManager, + mModalDialogManagerSupplier.get()); mBottomControlsCoordinatorSupplier.set( new BraveBottomControlsCoordinator( mLayoutStateProviderSupplier, 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 21ad4f497a100..117da8b1ff2bd 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -84,6 +84,7 @@ class BottomToolbarCoordinator implements View.OnLongClickListener { private boolean mBookmarkButtonFilled; private ObservableSupplier mBookmarkModelSupplier; private LocationBarModel mLocationBarModel; + private HomepageManager mHomepageManager; private final Context mContext = ContextUtils.getApplicationContext(); @@ -99,17 +100,26 @@ class BottomToolbarCoordinator implements View.OnLongClickListener { layoutStateProviderSupplier.onAvailable( mCallbackController.makeCancelable(this::setLayoutStateProvider)); - final OnClickListener homeButtonListener = v -> { - openHomepageAction.run(); - }; + final OnClickListener homeButtonListener = + v -> { + openHomepageAction.run(); + }; + + final OnClickListener searchAcceleratorListener = + v -> { + setUrlBarFocusAction.onResult(OmniboxFocusReason.ACCELERATOR_TAP); + }; - final OnClickListener searchAcceleratorListener = v -> { - setUrlBarFocusAction.onResult(OmniboxFocusReason.ACCELERATOR_TAP); - }; + mHomepageManager = HomepageManager.getInstance(); - mBrowsingModeCoordinator = new BrowsingModeBottomToolbarCoordinator(root, tabProvider, - homeButtonListener, searchAcceleratorListener, mShareButtonListenerSupplier, - tabsSwitcherLongClickListner); + mBrowsingModeCoordinator = + new BrowsingModeBottomToolbarCoordinator( + root, + tabProvider, + homeButtonListener, + searchAcceleratorListener, + mShareButtonListenerSupplier, + tabsSwitcherLongClickListner); mTabSwitcherModeStub = root.findViewById(R.id.bottom_toolbar_tab_switcher_mode_stub); @@ -269,7 +279,7 @@ public void onStartedHiding(@LayoutType int layoutType) { final OnClickListener homeButtonListener = v -> { - if (HomepageManager.isHomepageEnabled()) { + if (mHomepageManager.isHomepageEnabled()) { try { BraveActivity.getBraveActivity().setComesFromNewTab(true); } catch (BraveActivity.BraveActivityNotFoundException e) { @@ -352,7 +362,7 @@ public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { public boolean onLongClick(View v) { if (v == mHomeButton) { // It is currently a new tab button when homepage is disabled. - if (!HomepageManager.isHomepageEnabled()) { + if (!mHomepageManager.isHomepageEnabled()) { TabUtils.showTabPopupMenu(mContext, v); return true; } @@ -371,7 +381,7 @@ public boolean onLongClick(View v) { public void updateHomeButtonState() { assert (mHomeButton != null); - if (!HomepageManager.isHomepageEnabled()) { + if (!mHomepageManager.isHomepageEnabled()) { mHomeButton.setImageDrawable( ContextCompat.getDrawable(mContext, R.drawable.new_tab_icon)); mHomeButton.setEnabled(true); diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java index ea6a75088dcbc..d50157d0a1604 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java @@ -56,6 +56,7 @@ import org.chromium.base.Log; import org.chromium.base.MathUtils; import org.chromium.base.ThreadUtils; +import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.task.AsyncTask; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsHelper; @@ -107,12 +108,14 @@ import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader; +import org.chromium.chrome.browser.user_education.UserEducationHelper; import org.chromium.chrome.browser.util.BraveConstants; import org.chromium.chrome.browser.util.BraveTouchUtils; import org.chromium.chrome.browser.util.ConfigurationUtils; import org.chromium.chrome.browser.util.PackageUtils; import org.chromium.chrome.browser.widget.quickactionsearchandbookmark.promo.SearchWidgetPromoPanel; import org.chromium.components.embedder_support.util.UrlUtilities; +import org.chromium.components.feature_engagement.Tracker; import org.chromium.content_public.browser.NavigationHandle; import org.chromium.mojo.bindings.ConnectionErrorHandler; import org.chromium.mojo.system.MojoException; @@ -1566,12 +1569,24 @@ private boolean isMenuButtonOnBottom() { } @Override - public void initialize(ToolbarDataProvider toolbarDataProvider, - ToolbarTabController tabController, MenuButtonCoordinator menuButtonCoordinator, - HistoryDelegate historyDelegate, BooleanSupplier partnerHomepageEnabledSupplier, - OfflineDownloader offlineDownloader) { - super.initialize(toolbarDataProvider, tabController, menuButtonCoordinator, historyDelegate, - partnerHomepageEnabledSupplier, offlineDownloader); + public void initialize( + ToolbarDataProvider toolbarDataProvider, + ToolbarTabController tabController, + MenuButtonCoordinator menuButtonCoordinator, + HistoryDelegate historyDelegate, + BooleanSupplier partnerHomepageEnabledSupplier, + OfflineDownloader offlineDownloader, + UserEducationHelper userEducationHelper, + ObservableSupplier trackerSupplier) { + super.initialize( + toolbarDataProvider, + tabController, + menuButtonCoordinator, + historyDelegate, + partnerHomepageEnabledSupplier, + offlineDownloader, + userEducationHelper, + trackerSupplier); BraveMenuButtonCoordinator.setMenuFromBottom(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 b314817f8e1d6..86ce85483611a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -9,6 +9,8 @@ import android.view.View.OnClickListener; import android.view.ViewStub; +import androidx.annotation.Nullable; + import org.chromium.base.Callback; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; @@ -19,6 +21,7 @@ import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.layouts.LayoutManager; import org.chromium.chrome.browser.layouts.LayoutStateProvider; +import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabObscuringHandler; import org.chromium.chrome.browser.tabmodel.TabModelSelector; @@ -34,6 +37,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; +import org.chromium.chrome.browser.ui.desktop_windowing.DesktopWindowStateProvider; import org.chromium.chrome.browser.user_education.UserEducationHelper; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.ui.resources.ResourceManager; @@ -87,9 +91,9 @@ public BraveTopToolbarCoordinator( ObservableSupplier compositorInMotionSupplier, BrowserStateBrowserControlsVisibilityDelegate browserStateBrowserControlsVisibilityDelegate, - boolean shouldCreateLogoInStartToolbar, FullscreenManager fullscreenManager, - TabObscuringHandler tabObscuringHandler) { + TabObscuringHandler tabObscuringHandler, + @Nullable DesktopWindowStateProvider desktopWindowStateProvider) { super( controlContainer, toolbarStub, @@ -120,9 +124,9 @@ public BraveTopToolbarCoordinator( constraintsSupplier, compositorInMotionSupplier, browserStateBrowserControlsVisibilityDelegate, - shouldCreateLogoInStartToolbar, fullscreenManager, - tabObscuringHandler); + tabObscuringHandler, + desktopWindowStateProvider); mBraveToolbarLayout = toolbarLayout; mBraveMenuButtonCoordinator = browsingModeMenuButtonCoordinator; @@ -174,6 +178,7 @@ public ObservableSupplier getConstraintsProxy() { @Override public void initializeWithNative( + Profile profile, Runnable layoutUpdater, OnClickListener tabSwitcherClickHandler, OnClickListener newTabClickHandler, @@ -185,6 +190,7 @@ public void initializeWithNative( BrowserControlsVisibilityManager browserControlsVisibilityManager, TopUiThemeColorProvider topUiThemeColorProvider) { super.initializeWithNative( + profile, layoutUpdater, tabSwitcherClickHandler, newTabClickHandler, diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 20fcb10fd9294..8c2c886bf5113 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -113,6 +113,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader; import org.chromium.chrome.browser.ui.appmenu.AppMenuBlocker; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; +import org.chromium.chrome.browser.ui.desktop_windowing.DesktopWindowStateProvider; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.native_page.NativePageHost; import org.chromium.chrome.browser.ui.system.StatusBarColorController; @@ -409,20 +410,80 @@ public void testClassesExist() throws Exception { @Test @SmallTest public void testMethodsExist() throws Exception { - Assert.assertTrue(methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", - "extensiveBookmarkChangesBeginning", false, null)); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", - "extensiveBookmarkChangesEnded", false, null)); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", - "createBookmarkItem", false, null)); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/LaunchIntentDispatcher", - "isCustomTabIntent", false, null)); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/homepage/HomepageManager", - "shouldCloseAppWithZeroTabs", false, null)); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/ntp/NewTabPageLayout", - "insertSiteSectionView", false, null)); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/ntp/NewTabPageLayout", - "isScrollableMvtEnabled", true, boolean.class)); + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/bookmarks/BookmarkBridge", + "extensiveBookmarkChangesBeginning", + MethodModifier.REGULAR, + false, + null)); + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/bookmarks/BookmarkBridge", + "extensiveBookmarkChangesEnded", + MethodModifier.REGULAR, + false, + null)); + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/bookmarks/BookmarkBridge", + "createBookmarkItem", + MethodModifier.STATIC, + false, + null)); + + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/LaunchIntentDispatcher", + "isCustomTabIntent", + MethodModifier.STATIC, + false, + null)); + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/homepage/HomepageManager", + "shouldCloseAppWithZeroTabs", + MethodModifier.REGULAR, + false, + null)); + + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/ntp/NewTabPageLayout", + "insertSiteSectionView", + MethodModifier.REGULAR, + false, + null)); + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/ntp/NewTabPageLayout", + "isScrollableMvtEnabled", + MethodModifier.REGULAR, + true, + boolean.class)); + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/ntp/NewTabPageLayout", + "setSearchProviderTopMargin", + MethodModifier.REGULAR, + false, + null)); + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/ntp/NewTabPageLayout", + "setSearchProviderBottomMargin", + MethodModifier.REGULAR, + false, + null)); + Assert.assertTrue( + methodExists( + "org/chromium/chrome/browser/ntp/NewTabPageLayout", + "getLogoMargin", + MethodModifier.REGULAR, + true, + int.class, + boolean.class)); + Assert.assertTrue( methodExists( "org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter", @@ -690,7 +751,8 @@ public void testMethodsExist() throws Exception { + "send_tab_to_self/ManageAccountDevicesLinkView", "getSharingAccountInfo", true, - AccountInfo.class)); + AccountInfo.class, + Profile.class)); Assert.assertTrue( methodExists( "org/chromium/chrome/browser/multiwindow/MultiInstanceManagerApi31", @@ -748,7 +810,8 @@ public void testMethodsForInvocationExist() throws Exception { true, ViewProvider.class, Context.class, - MVCListAdapter.ModelList.class)); + MVCListAdapter.ModelList.class, + boolean.class)); Assert.assertTrue( methodExists( "org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator", @@ -949,7 +1012,7 @@ public void testConstructorsExistAndMatch() throws Exception { ObservableSupplier.class, View.class, ObservableSupplier.class, - OneshotSupplier.class)); + DesktopWindowStateProvider.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator", @@ -1000,7 +1063,8 @@ public void testConstructorsExistAndMatch() throws Exception { Supplier.class, TabCreatorManager.class, OneshotSupplier.class, - SnackbarManager.class)); + SnackbarManager.class, + ModalDialogManager.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate", @@ -1086,21 +1150,35 @@ public void testConstructorsExistAndMatch() throws Exception { ObservableSupplier.class, ObservableSupplier.class, BrowserStateBrowserControlsVisibilityDelegate.class, - boolean.class, FullscreenManager.class, - TabObscuringHandler.class)); - Assert.assertTrue(constructorsMatch( - "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator", - "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator", - OneshotSupplier.class, BrowserStateBrowserControlsVisibilityDelegate.class, - WindowAndroid.class, MenuButtonCoordinator.SetFocusFunction.class, Runnable.class, - boolean.class, Supplier.class, ThemeColorProvider.class, Supplier.class, - Runnable.class, int.class)); - Assert.assertTrue(constructorsMatch("org/chromium/chrome/browser/share/ShareDelegateImpl", - "org/chromium/chrome/browser/share/BraveShareDelegateImpl", - BottomSheetController.class, ActivityLifecycleDispatcher.class, Supplier.class, - Supplier.class, Supplier.class, ShareDelegateImpl.ShareSheetDelegate.class, - boolean.class)); + TabObscuringHandler.class, + DesktopWindowStateProvider.class)); + Assert.assertTrue( + constructorsMatch( + "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator", + "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator", // presubmit: ignore-long-line + OneshotSupplier.class, + BrowserStateBrowserControlsVisibilityDelegate.class, + WindowAndroid.class, + MenuButtonCoordinator.SetFocusFunction.class, + Runnable.class, + boolean.class, + Supplier.class, + ThemeColorProvider.class, + Supplier.class, + Runnable.class, + int.class)); + Assert.assertTrue( + constructorsMatch( + "org/chromium/chrome/browser/share/ShareDelegateImpl", + "org/chromium/chrome/browser/share/BraveShareDelegateImpl", + BottomSheetController.class, + ActivityLifecycleDispatcher.class, + Supplier.class, + Supplier.class, + Supplier.class, + ShareDelegateImpl.ShareSheetDelegate.class, + boolean.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator", @@ -1131,7 +1209,7 @@ public void testConstructorsExistAndMatch() throws Exception { ActivityLifecycleDispatcher.class, ObservableSupplier.class, MenuOrKeyboardActionController.class, - ObservableSupplier.class)); + Supplier.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/multiwindow/MultiWindowUtils", @@ -1263,6 +1341,14 @@ public void testConstructorsExistAndMatch() throws Exception { FeatureMap.class, String.class, boolean.class)); + Assert.assertTrue( + constructorsMatch( + "org/chromium/base/cached_flags/CachedFlag", + "org/chromium/base/cached_flags/BraveCachedFlag", + FeatureMap.class, + String.class, + boolean.class, + boolean.class)); Assert.assertTrue( constructorsMatch( @@ -1279,7 +1365,6 @@ public void testConstructorsExistAndMatch() throws Exception { PropertyModel.class, boolean.class, Callback.class, - boolean.class, LogoCoordinator.VisibilityObserver.class, CachedTintedBitmap.class)); Assert.assertTrue( @@ -1304,7 +1389,7 @@ public void testConstructorsExistAndMatch() throws Exception { ObservableSupplier.class, ObservableSupplier.class, ObservableSupplier.class, - Supplier.class, + ObservableSupplier.class, ObservableSupplier.class, OneshotSupplier.class, OneshotSupplier.class, @@ -1345,8 +1430,7 @@ public void testConstructorsExistAndMatch() throws Exception { Bundle.class, MultiInstanceManager.class, ObservableSupplier.class, - View.class, - ObservableSupplierImpl.class)); + View.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/bookmarks/BookmarkToolbar", @@ -1656,6 +1740,10 @@ public void testFieldsExist() throws Exception { Assert.assertTrue( fieldExists( "org/chromium/chrome/browser/toolbar/ToolbarManager", "mSnackbarManager")); + Assert.assertTrue( + fieldExists( + "org/chromium/chrome/browser/toolbar/ToolbarManager", + "mModalDialogManagerSupplier")); Assert.assertTrue( fieldExists( "org/chromium/chrome/browser/toolbar/ToolbarManager", diff --git a/app/app_management_strings.grdp b/app/app_management_strings.grdp index b813c4cfcdb51..7da73249d614d 100644 --- a/app/app_management_strings.grdp +++ b/app/app_management_strings.grdp @@ -177,6 +177,24 @@ Denied + + Allowed. Turn on <a href="#">system camera access</a>. + + + Allowed. Turn on <a href="#">system microphone access</a>. + + + Allowed. Turn on <a href="#">system location access</a>. + + + Allowed – $1While in use. Turn on <a href="#">system camera access</a>. + + + Allowed – $1While in use. Turn on <a href="#">system microphone access</a>. + + + Allowed – $1While in use. Turn on <a href="#">system location access</a>. + diff --git a/app/brave_strings.grd b/app/brave_strings.grd index 65e29715f2f22..98346a8eb9e2a 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -558,6 +558,13 @@ If you want to use this account one-time only, you can use <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. + + + + Open $1https://www.example-url.com/ in a new tab in Brave. + + + Brave @@ -821,8 +828,11 @@ Permissions you've already given to websites and apps may apply to this account. Off • Brave can't verify where this extension comes from + + This extension hasn't published privacy practices, such as how it collects and uses data. Brave recommends that you remove it. + - + {NUM_EXTENSIONS, plural, =1 {Brave recommends that you remove it} @@ -834,7 +844,7 @@ Permissions you've already given to websites and apps may apply to this account. Warning: Brave cannot prevent extensions from recording your browsing history. To disable this extension in Private mode, unselect this option. - + Remove from Brave @@ -910,12 +920,6 @@ Permissions you've already given to websites and apps may apply to this account. - - - Not used in Brave. Placeholder to keep resource maps in sync. - - - Brave @@ -1023,42 +1027,73 @@ Permissions you've already given to websites and apps may apply to this account. Continue in a new Brave profile? + + Sign in to Brave in a new profile? + Switch to existing Brave profile? A Brave profile with this account already exists + + You're already signed in as $1foo@gmail.com in another Brave profile + $1Elisa is already signed in to this Brave profile. To keep your browsing separate, Brave can create your own profile for you. - + + $1Elisa is already signed in. To keep your browsing separate, sign in to Brave in your own profile as $2foo@gmail.com. + + $1Elisa is already signed in to this Brave profile. This will create a new Brave profile for $2foo@gmail.com This will create a new Brave profile for $1foo@gmail.com - - Another account is already signed in. To keep your browsing separate, Brave can create your own profile for you. - - - Make Brave your own - - Sign in to get the most out of Brave - - - Use Brave without an account + To save and use your passwords and more on all your devices, sign in to Brave - - Sign in to Brave? + + You can use your passwords from your Brave sync chain in Brave while you're signed in - + Brave needs to verify it’s you before some data can be saved in your Brave sync chain and used on all your devices. If you sign out, this data will stay on this device. - + Some of your Brave data hasn't been saved in your Brave sync chain yet. Try waiting a few minutes before signing out. + + You’ll be signed out of most sites when you close all Brave windows, except your Brave sync chain if you’re signed in to Brave. To let sites remember you, $1go to settings. + + + + + Sign in to Brave? + + + Make Brave your own + + + Use Brave without an account + + + + + Sign In to Brave? + + + Make Brave Your Own + + + Use Brave Without an Account + + + + + + To save and use passwords and more on all your devices, sign in to Brave. This password will be saved in your Brave sync chain after you sign in. + @@ -1092,26 +1127,26 @@ Permissions you've already given to websites and apps may apply to this account. Sign in to Brave - - Customize your Brave - Other Brave profiles Manage Brave profiles + + Sign out of Brave + - - Customize Your Brave - Other Brave Profiles Manage Brave Profiles + + Sign Out of Brave + @@ -1233,6 +1268,16 @@ Permissions you've already given to websites and apps may apply to this account. + + + + You can open bookmarks, reading mode, and more from the Brave menu + + + You can open bookmarks, reading mode, and more from the Brave menu at the top right + + + ''' It also controls what page is shown when you start Brave. ''' @@ -1421,7 +1466,7 @@ Permissions you've already given to websites and apps may apply to this account. Brave needs camera permission to create a 3D map of your surroundings - Brave needs scene understanding and hand tracking permission to start an immersive session + Brave needs permission to map your surroundings and track your hands Brave needs camera permission for this site @@ -1652,12 +1697,6 @@ Permissions you've already given to websites and apps may apply to this account. Sign in to Brave - - Make Brave your own - - - Do more with Brave - @@ -1690,6 +1729,14 @@ Permissions you've already given to websites and apps may apply to this account. You can switch to see passwords from another Brave profile + + + + To remove your Brave sync chain from Brave, sign out + + + To remove your Brave sync chain from Brave, sign out of Brave in the Settings page + @@ -1862,9 +1909,6 @@ Permissions you've already given to websites and apps may apply to this account. Cancel Installation - - On your marks... - Installation complete. @@ -1976,10 +2020,22 @@ Permissions you've already given to websites and apps may apply to this account. - - - To clear browsing data from this device only, while keeping it in your Brave sync chain, <a href="#" target="_blank">sign out of Brave</a>. + + + To delete browsing data from this device only, while keeping it in your Brave sync chain, <a href="#" target="_blank">sign out of Brave</a>. + + + + + Shortcuts open in Brave + + + + + Brave Shortcut + + Google Chrome Beta diff --git a/app/brave_strings_override.grd b/app/brave_strings_override.grd index e29303343b1a1..87a31631dc6a9 100644 --- a/app/brave_strings_override.grd +++ b/app/brave_strings_override.grd @@ -174,6 +174,10 @@ If you want to use this account one-time only, you can use <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. + + + + @@ -233,9 +237,6 @@ Permissions you've already given to websites and apps may apply to this account. - - - @@ -259,6 +260,11 @@ Permissions you've already given to websites and apps may apply to this account. + + + + + @@ -300,6 +306,9 @@ Permissions you've already given to websites and apps may apply to this account. + + + @@ -410,6 +419,10 @@ Permissions you've already given to websites and apps may apply to this account. - + + + + + diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp index f1886c4254044..f51c5fb1c06b5 100644 --- a/app/extensions_strings.grdp +++ b/app/extensions_strings.grdp @@ -551,6 +551,9 @@ Subpage button + + All Extensions + Off • This extension contains malware @@ -567,6 +570,12 @@ On • This extension was unpublished by its developer + + On • This extension hasn't published privacy practices, such as how it collects and uses data + + + Off • This extension hasn't published privacy practices, such as how it collects and uses data + {NUM_EXTENSIONS, plural, =1 {Review 1 extension that may be unsafe} @@ -584,15 +593,34 @@ =1 {1 extension reviewed} other {{NUM_EXTENSIONS} extensions reviewed}} - - All Extensions - Remove $1Voice Over extension More actions for $1Voice Over extension + + + {NUM_EXTENSIONS, plural, + =1 {This extension may soon no longer be suported} + other {These extensions may soon no longer be supported} + } + + + {NUM_EXTENSIONS, plural, + =1 {Remove or replace it with similar extensions from the <a href='https://chromewebstore.google.com/category/extensions'>Web Store</a>.} + other {Remove or replace them with similar extensions from the <a href='https://chromewebstore.google.com/category/extensions'>Web Store</a>} + } + + + Got it + + + Find alternative + + + Keep for now + Include Ctrl, Alt, or ⌘ diff --git a/app/extensions_strings_override.grdp b/app/extensions_strings_override.grdp index 9041189fdb87f..af266bf1cb2d7 100644 --- a/app/extensions_strings_override.grdp +++ b/app/extensions_strings_override.grdp @@ -28,6 +28,12 @@ On • This extension violates the Web Store policy + + {NUM_EXTENSIONS, plural, + =1 {Remove or replace it with similar extensions from the <a href='https://chromewebstore.google.com/category/extensions'>Web Store</a>.} + other {Remove or replace them with similar extensions from the <a href='https://chromewebstore.google.com/category/extensions'>Web Store</a>} + } + diff --git a/app/feature_defaults_unittest.cc b/app/feature_defaults_unittest.cc index 7298efd441894..fe3fd6720d9ba 100644 --- a/app/feature_defaults_unittest.cc +++ b/app/feature_defaults_unittest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/browser_features.h" #include "chrome/browser/companion/core/features.h" #include "chrome/browser/preloading/preloading_features.h" -#include "chrome/browser/signin/signin_features.h" #include "chrome/browser/ui/ui_features.h" #include "chrome/common/chrome_features.h" #include "chrome/common/companion/visual_query/features.h" @@ -42,6 +41,7 @@ #include "components/segmentation_platform/public/features.h" #include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "components/signin/public/base/signin_buildflags.h" +#include "components/signin/public/base/signin_switches.h" #include "components/subresource_filter/core/common/common_features.h" #include "content/common/features.h" #include "content/public/common/content_features.h" @@ -56,6 +56,7 @@ #if BUILDFLAG(IS_ANDROID) #include "android_webview/common/aw_features.h" +#include "chrome/browser/flags/android/chrome_feature_list.h" #include "components/password_manager/core/common/password_manager_features.h" #else #include "chrome/browser/apps/link_capturing/link_capturing_features.h" @@ -112,6 +113,9 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { &blink::features::kSharedStorageSelectURLLimit, &blink::features::kSpeculationRulesPrefetchFuture, &blink::features::kTextFragmentAnchor, +#if BUILDFLAG(IS_ANDROID) + &chrome::android::kAdaptiveButtonInTopToolbarCustomizationV2, +#endif &commerce::kCommerceAllowOnDemandBookmarkUpdates, &commerce::kCommerceDeveloper, &commerce::kCommerceMerchantViewer, @@ -138,9 +142,7 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { &features::kBookmarkTriggerForPrerender2, &features::kChromeLabs, &features::kChromeRefresh2023, - &features::kChromeRefresh2023NTB, &features::kChromeStructuredMetrics, - &features::kChromeWebuiRefresh2023, &features::kControlledFrame, &features::kCookieDeprecationFacilitatedTesting, #if !BUILDFLAG(IS_ANDROID) @@ -157,10 +159,8 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { &features::kIdleDetection, &features::kKAnonymityService, &features::kKAnonymityServiceOHTTPRequests, - &features::kLegacyTechReportEnableCookieIssueReports, &features::kNewTabPageTriggerForPrerender2, &features::kNotificationTriggers, - &features::kOmniboxTriggerForNoStatePrefetch, &features::kOmniboxTriggerForPrerender2, #if BUILDFLAG(IS_ANDROID) &features::kPrivacyGuidePreloadAndroid, @@ -175,7 +175,6 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { #if !BUILDFLAG(IS_ANDROID) &features::kSidePanelPinning, #endif - &features::kSignedExchangeReportingForDistributors, &features::kSignedHTTPExchange, &features::kSupportSearchSuggestionForPrerender2, &features::kTabHoverCardImages, @@ -204,12 +203,6 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { &history_clusters::internal::kOmniboxAction, &history_clusters::internal::kOmniboxHistoryClusterProvider, &history_clusters::internal::kPersistContextAnnotationsInHistoryDb, -#if !BUILDFLAG(IS_ANDROID) - &kForYouFre, -#endif -#if BUILDFLAG(ENABLE_DICE_SUPPORT) - &kPreconnectAccountCapabilitiesBeforeSignIn, -#endif #if BUILDFLAG(ENABLE_MIRROR) &kVerifyRequestInitiatorForMirrorHeaders, #endif @@ -219,7 +212,6 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { #endif &media::kLiveCaption, &metrics::structured::kEnabledStructuredMetricsService, - &metrics::structured::kNearbyShareMetrics, &metrics::structured::kPhoneHubStructuredMetrics, &net::features::kEnableWebTransportDraft07, &net::features::kTpcdMetadataGrants, @@ -260,7 +252,6 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { #endif &permissions::features::kPermissionOnDeviceNotificationPredictions, &permissions::features::kShowRelatedWebsiteSetsPermissionGrants, - &privacy_sandbox::kCookieSettingsUiAlignment, &privacy_sandbox::kEnforcePrivacySandboxAttestations, &privacy_sandbox::kOverridePrivacySandboxSettingsLocalTesting, &privacy_sandbox::kPrivacySandboxFirstPartySetsUI, diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 9dd090bc35c11..60fca626fe1eb 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -567,6 +567,10 @@ are declared in tools/grit/grit_rule.gni. Payment methods + + + Passwords + &Back @@ -846,6 +850,9 @@ are declared in tools/grit/grit_rule.gni. Translate text in image with $1Brave + + Search with Google Lens + Search page with $1Google Lens @@ -867,6 +874,18 @@ are declared in tools/grit/grit_rule.gni. Help improve autofill + + + Select password + + + + Import passwords + + + + Suggest password... + @@ -1155,6 +1174,9 @@ are declared in tools/grit/grit_rule.gni. Search Image with $1Google Lens + + Search with Google Lens + Translate Text in Image with $1Brave @@ -1173,6 +1195,18 @@ are declared in tools/grit/grit_rule.gni. Help Improve Autofill + + + Select Password + + + + Import Passwords + + + + Suggest Password... + @@ -1231,6 +1265,14 @@ are declared in tools/grit/grit_rule.gni. Passwords and &autofill + + + Relaunch to update + + + Your tabs will reopen + + New &tab @@ -1374,6 +1416,14 @@ are declared in tools/grit/grit_rule.gni. Passwords and &Autofill + + + Relaunch to Update + + + Your tabs will reopen + + New &Tab @@ -1694,8 +1744,8 @@ are declared in tools/grit/grit_rule.gni. &Full screen - - &Clear browsing data... + + &Delete browsing data... &Downloads @@ -1715,6 +1765,9 @@ are declared in tools/grit/grit_rule.gni. Performance + + Search with Google Lens + Sear&ch this page with Brave... @@ -1750,8 +1803,8 @@ are declared in tools/grit/grit_rule.gni. &Full Screen - - &Clear Browsing Data... + + &Delete Browsing Data... &Downloads @@ -1771,6 +1824,9 @@ are declared in tools/grit/grit_rule.gni. Performance + + Search with Google Lens + Sear&ch This Page with Brave... @@ -2136,6 +2192,9 @@ are declared in tools/grit/grit_rule.gni. Your organization's policies aren't met + + Scan failed. This file is blocked by your administrator + This file is dangerous @@ -2881,6 +2940,9 @@ are declared in tools/grit/grit_rule.gni. Sensitive content + + Scan failed + Your organization recommends deleting this file because it has sensitive content @@ -2908,6 +2970,9 @@ are declared in tools/grit/grit_rule.gni. Cancel + + Your organization blocked this file because the scan failed. + Try again @@ -3016,12 +3081,14 @@ are declared in tools/grit/grit_rule.gni. {COUNT, plural, =1 {1 download in progress} other {# downloads in progress}} - - Discover enhanced protection to get Brave's highest level of security for downloads - - - Opens security settings page in a new tab - + + + Discover enhanced protection to get Brave's highest level of security for downloads + + + Opens security settings page in a new tab + + @@ -3140,6 +3207,13 @@ are declared in tools/grit/grit_rule.gni. + + Create a shortcut to this page + + + Site name + + Install app? @@ -3743,15 +3817,6 @@ are declared in tools/grit/grit_rule.gni. See how - - Reminder: Tracking Protection is on - - - If a site you visit isn't working as expected, try temporarily allowing third-party cookies for that site. That will mean less protection but site features are more likely to work as expected. - - - If a site isn't working as expected, you can enable third-party cookies for it through the Tracking Protection option in the address bar. - @@ -3769,6 +3834,9 @@ are declared in tools/grit/grit_rule.gni. + + Base64-encoded ASCII, multiple certificates + Base64-encoded ASCII, single certificate @@ -6137,7 +6205,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Extensions can request access to this site - Reload this page to apply your updated settings on this site + To apply your updated settings to this site, reload this page Reload @@ -7183,19 +7251,21 @@ Keep your key file in a safe place. You will need it to create new versions of y - + An error occurred while checking for updates: $1Unable to contact Brave Update + + $1An error message from Brave Update. (error code $27: 0x80000005). + + + Update check failed to start (error code $10x80000005). The updater is currently running. Refresh in a minute to check again. - - $1An error message from Brave Update. (error code $27: 0x80000005). - @@ -7272,15 +7342,15 @@ Keep your key file in a safe place. You will need it to create new versions of y - - Search Brave or type URL - Search Brave or type a URL Search Brave + + Add to your search + Add shortcut @@ -7434,9 +7504,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Default Brave - - Brave Colors - Change theme @@ -7636,7 +7703,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Device - Customize your browser even more with extensions from the <a href="#" id="chromeWebstoreLink" on-click="onBraveWebStoreLinkClick_">Web Store</a> + Customize your browser even more with extensions from the <a href="#" id="chromeWebstoreLink">Web Store</a> Find coupons @@ -7955,9 +8022,24 @@ Keep your key file in a safe place. You will need it to create new versions of y <br> You can manage settings from the card menu or see more options in Customize Brave. + + Today's Calendar + + + Don't show Today's Calendar + Brave Calendar + + Don't show Brave Calendar + + + Outlook Calendar + + + Don't show Outlook Calendar + From your Google Photos @@ -8376,6 +8458,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Customize Brave + + Search with Google Lens + Unpin @@ -8397,18 +8482,24 @@ Keep your key file in a safe place. You will need it to create new versions of y $1Bookmarks - pinned - - You can open bookmarks, reading mode, and more from the Brave menu - - - You can open bookmarks, reading mode, and more from the Brave menu at the top right - You can pin this side panel for easy access To easily get back to the side panel, click Pin at the top right + + You can pin this feature for easy access + + + You can pin this feature for easy access; click the Pin button at the top of the side panel + + + Pinned! Use this feature again from the toolbar + + + Pinned! You can access this feature again from the new button on the toolbar + @@ -8625,6 +8716,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Text formatting + + Read Aloud and Text formatting + Font size @@ -8685,49 +8779,112 @@ Keep your key file in a safe place. You will need it to create new versions of y Getting ready - + Reset - + Turn off highlight - + Turn on highlight - + Listen to the text with natural voice - + + Play keyboard shortcut k + + + Pause keyboard shortcut k + + + Play (k) + + Play - - Pause + + Pause (k) + + + Stop - + Previous sentence - + Next sentence - + More options - + Voice speed - + Voice selection + + Languages... + + + Languages + + + Close + + + No results found + + + Search + + + Clear search + + + Downloading voices... + + + Downloading $1English voices... + + + There are no $1English voices on your device. You can install voices in settings. + + + Learn more. + + + Some Brave voices may not be available right now + + + No internet + + + To install this language, clear space on your device + + + preview voice for $1English + + + For higher quality voices, clear space on your device + + + High-quality $1English voice files downloaded + + + Voice files are shared among users to save disk space + To show a simplified view of this page, open the side panel and select Reading mode To see a simplified view of this page, go to More Tools > Reading Mode - + Hi. This is a preview - + (loading) @@ -9040,6 +9197,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + @@ -9083,6 +9241,40 @@ Keep your key file in a safe place. You will need it to create new versions of y + + + + + + Your Password Is Saved + + + Use This Password On Your iPhone + + + No Thanks + + + + + Your password is saved + + + Use this password on your iPhone + + + No thanks + + + + You can access it on Brave Password Manager. + + + Download Brave with this QR code, and sign in to your Brave sync chain. + + + + $1 (Private) @@ -9123,6 +9315,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Hidden saved tab groups + + Your tab groups now automatically save. + + + Your tab groups automatically save and update across all your signed-in devices. + Tab groups @@ -9381,6 +9579,25 @@ Keep your key file in a safe place. You will need it to create new versions of y Turn on + + + Inactive Tabs Get a New Look + + + + + Inactive tabs get a new look + + + + See when tabs are inactive at a glance. You can turn off this new look in settings anytime. + + + Settings + + + Manage the look of inactive tabs here + @@ -10039,20 +10256,20 @@ Check your passwords anytime in $1Brave P - + - Clear browsing data + Delete browsing data The selected data has been removed from Brave and synced devices. Your Brave sync chain may have other forms of browsing history like searches and activity from other Brave services at <a target="_blank" href="$1">myactivity.google.com</a>. - Cleared Brave data + Deleted Brave data Ok, got it - + We were not able to delete all passwords stored in your Brave sync chain. Try again or visit <a target="_blank" href="$1">passwords.google.com</a>. @@ -10337,12 +10554,6 @@ Check your passwords anytime in $1Brave P Show specifications - - Follow site - - - Unfollow site - $1Brave News belongs to desk $2School @@ -10441,13 +10652,6 @@ Check your passwords anytime in $1Brave P Show specifications - - - Follow Site - - - Unfollow Site - @@ -10559,7 +10763,7 @@ Check your passwords anytime in $1Brave P Dismiss - NEW TABS + New Tabs Check if tabs can be organized @@ -10619,7 +10823,7 @@ Check your passwords anytime in $1Brave P Sign in to let Brave suggest tab groups - Organizing into a tab group… + Grouping your tabs… Tab group suggestion @@ -10636,23 +10840,11 @@ Check your passwords anytime in $1Brave P No groups found - - Tab group suggestions are currently unavailable. You can - - - refresh now - - - or try again later - - - You can + + Tab group suggestions are currently unavailable. You can <a href="#">refresh now</a> or try again later - - refresh now - - - or try again later after you open new similar tabs + + You can <a href="#">refresh now</a> or try again later after you open new similar tabs Tip: @@ -10722,6 +10914,9 @@ Check your passwords anytime in $1Brave P + + Tabs + {NUM_TABS, plural, =1 {1 tab} other {# tabs}} @@ -10729,6 +10924,9 @@ Check your passwords anytime in $1Brave P Create new tab group + + Tab groups + @@ -10737,6 +10935,71 @@ Check your passwords anytime in $1Brave P Create New Tab Group + + Tab Groups + + + + + + This will delete the group from all devices signed into Brave with this Brave sync chain. + + + + The tabs will remain open on this device but the group will be deleted from all devices signed into Brave with this Brave sync chain. + + + + + + Don't Ask Again + + + + Delete Tab Group? + + + Ungroup Tab Group? + + + Close Tab(s) and Delete Group? + + + Remove Tab(s) and Delete Group? + + + + Delete Group + + + Ungroup + + + + + + Don't ask again + + + + Delete tab group? + + + Ungroup tab group? + + + Close tab(s) and delete group? + + + Remove tab(s) and delete group? + + + + Delete group + + + Ungroup + @@ -11356,12 +11619,6 @@ Check your passwords anytime in $1Brave P Share link to - - Follow - - - Following - @@ -12200,9 +12457,38 @@ This can include information about installed software, files, your browser, and Ok - - Let's go - + + + + + Separate Browsing? + + + Switch Profile? + + + Create Profile + + + Stay Here + + + + + Separate browsing? + + + Switch profile? + + + Create profile + + + Stay here + + + + No thanks @@ -12212,7 +12498,7 @@ This can include information about installed software, files, your browser, and Ok - + Continue @@ -12224,35 +12510,57 @@ This can include information about installed software, files, your browser, and You just signed in a managed account, creating a new managed profile will allow you to access some resources linked to that account. - - $2Bob's profile is linked to $1bob@gmail.com - - - Separate your browsing? - This new profile will be managed by your organization. <a href="$1" target="_blank">https://help.google.com/articleLinkLearn more</a> This new profile will be managed by $1example.com. <a href="$2" target="_blank">https://help.google.com/articleLinkLearn more</a> - - Separate Browsing? + + Welcome, $1Elisa + + + Welcome back, $2Elisa + + + When you sign in on this device, you get your passwords and more from your Brave sync chain - - Switch Profile? + + + Got It + + + + + Got it + + + + Settings - - Some data isn’t saved yet - - - Verify it’s you + + Some data isn’t saved in your account yet - + Sign out anyway + + + go to settings + + + + + Close Window + + + + + Close window + + @@ -12593,6 +12901,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Open settings + + To keep using the passwords and more in your Brave sync chain, verify it's you + @@ -13424,7 +13735,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - Location is turned off in OS Preferences + Location access is turned off in ChromeOS Settings @@ -13979,15 +14290,6 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Brave Hangouts wants to share the contents of your screen with $2https://google.com. - - Share system audio - - - Share window audio - - - Share tab audio - Also share system audio. This device will be muted to prevent feedback. @@ -15379,7 +15681,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - Choose a passkey for $1example.com + Use a saved passkey for $1example.com On this device @@ -15393,19 +15695,108 @@ Please help our engineers fix this problem. Tell us what happened right before y From your Brave profile + + Your Brave profile + From iCloud Keychain + + iCloud Keychain + From "$1Dashlane" From Windows Hello + + Windows Hello + + + Brave Password Manager + From "$1Pixel 7" + + + Create + + + Create passkey + + + Create a passkey to sign in to $1example.com? + + + You can use this passkey to sign in faster across your devices. It will be saved to Brave Password Manager for $1example@gmail.com. + + + Save another way + + + Start saving passkeys with Brave Password Manager + + + This passkey will be saved to Brave Password Manager for $1example@gmail.com + + + Available across your devices + + + Faster, encrypted sign-in + + + Safer than a password + + + To create this passkey with Brave Password Manager, verify it's you + + + Your passkey will be saved to Brave Password Manager for $1example@gmail.com. You’ll only have to do this once. + + + To use your passkeys on this device, verify it's you + + + You can use all of your passkeys saved to Brave Password Manager on this device. You'll only have to do this once. + + + Use a different device + + + $1example.com wants to verify it’s you + + + Touch ID to continue + + + Touch ID is locked. To continue, enter your password. + + + Enter password + + + Can't reach Brave Password Manager + + + Can’t reach Brave Password Manager. Try again in a few minutes + + + Sign in again + + + To sync and use passkeys from Brave + + + Save this passkey outside Private? + + + This passkey will be saved to your password manager. Anyone with access to it will be able to use this passkey. + + Side Search @@ -15463,9 +15854,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Close Private - - - To clear data, close all Private windows + + + To delete data, close all Private windows This only affects Private windows @@ -15474,12 +15865,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Close windows - - + + Sites you visit aren’t saved in Private - - To clear Private browsing history from your device, close all Private tabs + + To delete Private browsing history from your device, close all Private tabs Close Private @@ -15731,18 +16122,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Enhanced Safe Browsing is on - You’re on Brave’s strongest security - - You have Brave’s strongest security against harmful websites Enhanced Safe Browsing is off - You’re getting standard protection - - You’re getting standard security protection on this device @@ -15756,12 +16141,12 @@ Please help our engineers fix this problem. Tell us what happened right before y - Also clear browsing data ($1pinterest.com) which will sign you out of $2Pinterest.com. $3Learn more + Also delete browsing data ($1pinterest.com) which will sign you out of $2Pinterest.com.$3Learn more - Also clear browsing data ($1www.google.com) which may sign you out of Brave.com. $2Learn more + Also delete browsing data ($1www.google.com) which may sign you out of Brave.com. $2Learn more @@ -15944,6 +16329,46 @@ Please help our engineers fix this problem. Tell us what happened right before y Google Lens Search Bubble + + Copy + + + Text copied + + + Dismiss + + + Translate + + + Learn more + + + Click or drag anywhere to search with Lens + + + Send feedback + + + Send feedback for search with Lens + + + + Close + + + Continue + + + When you use Google Lens, a screenshot of the page is sent to Brave. $1Learn more + + + Learn more + + + Search anything on this page with Google Lens + Thumbnail tab strip for tablet mode @@ -15962,9 +16387,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - Enhanced protection does more to block phishing and malware - - Enhanced Safe Browsing does more to protect you against dangerous websites, downloads, and extensions @@ -16000,7 +16422,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Choose an account to continue - + Choose an account @@ -16027,7 +16449,7 @@ Please help our engineers fix this problem. Tell us what happened right before y You can use your $1idp.example account on this site. To continue, sign in to $1idp.example. - + Sign in to $1idp.example @@ -16084,7 +16506,7 @@ Please help our engineers fix this problem. Tell us what happened right before y If this issue keeps happening, you can try other ways to continue on $1rp.example. - + Sign in to $1rp.example diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 8074449dad573..a5fe4b5d70fa9 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -208,6 +208,8 @@ are declared in tools/grit/grit_rule.gni. + + New Private &tab @@ -216,6 +218,8 @@ are declared in tools/grit/grit_rule.gni. + + New Private &Tab @@ -341,6 +345,9 @@ are declared in tools/grit/grit_rule.gni. + + + @@ -587,6 +594,8 @@ are declared in tools/grit/grit_rule.gni. + + @@ -600,7 +609,7 @@ are declared in tools/grit/grit_rule.gni. - Customize your browser even more with extensions from the <a href="#" id="chromeWebstoreLink" on-click="onBraveWebStoreLinkClick_">Web Store</a> + Customize your browser even more with extensions from the <a href="#" id="chromeWebstoreLink">Web Store</a> You can find older colors in the Web Store @@ -655,6 +664,15 @@ are declared in tools/grit/grit_rule.gni. + + + + + + + + + $1 (Private) @@ -686,7 +704,10 @@ are declared in tools/grit/grit_rule.gni. - + + + + @@ -806,6 +827,11 @@ are declared in tools/grit/grit_rule.gni. + + + + + Pin group to bookmarks @@ -950,8 +976,23 @@ are declared in tools/grit/grit_rule.gni. + + + + + + + + + + + + + + + @@ -1183,6 +1224,9 @@ are declared in tools/grit/grit_rule.gni. This passkey will be saved only in Windows Hello. It will remain on this device after you close all Private windows. + + Save this passkey outside Private? + @@ -1195,8 +1239,8 @@ are declared in tools/grit/grit_rule.gni. Close Private - - To clear data, close all Private windows + + To delete data, close all Private windows This only affects Private windows @@ -1204,8 +1248,8 @@ are declared in tools/grit/grit_rule.gni. Sites you visit aren’t saved in Private - - To clear Private browsing history from your device, close all Private tabs + + To delete Private browsing history from your device, close all Private tabs Close Private diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index 14602665d87d1..9518da8bd153b 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -129,28 +129,46 @@ Rename eSIM profile - + Mobile networks - + Instant hotspot - + + Turn off Instant hotspot + + + Disable Instant hotspot + + Turn off Instant Tethering - + Disable Instant Tethering - + + Turn on Instant hotspot + + + Enable Instant hotspot + + Turn on Instant Tethering - + Enable Instant Tethering - + + Instant hotspot + + Instant Tethering - + + Disconnect Instant hotspot network + + Disconnect Instant Tethering network @@ -1355,6 +1373,9 @@ Magnifier follows keyboard focus + + Magnifier follows the word being read by select-to-speak + Docked magnifier @@ -1491,6 +1512,12 @@ Switch access keyboard auto-scan + + Swipe to navigate between pages + + + Overscroll to navigate between pages + Get image descriptions from Brave diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index a51ea6b0e657b..3a2e44acf1885 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -296,15 +296,14 @@ Keep updates - - + Set up - - Opt into extended updates to keep your device up to date + + Extended security updates available - - Automatic security and software updates have been paused. You can extend updates for 2 more years, but some functionality will be limited. <a target="_blank" href="$1https://google.com/">Learn more</a> + + This device is no longer receiving automatic software updates. Turn on extended security updates for continued security, stability, and performance. Some functionality will be limited. <a target="_blank" href="$1https://google.com/">Learn more</a> @@ -1240,6 +1239,16 @@ Ask before copying or moving Microsoft files to Microsoft OneDrive + + + File Sync + + + Backup your local files to Drive + + + Backup all your files under My files to Google Drive. + @@ -1409,23 +1418,13 @@ Limit movement on the screen - - - Text caret blink rate - - - Change the blink rate of the text caret in most text fields. + + Text cursor blink rate - - Do not blink + + Don't blink - - Normal - - - Slow - - + Fast @@ -1643,7 +1642,10 @@ Move screen when mouse touches edges of screen - Zoomed in screen follows keyboard focus + Magnifier follows keyboard focus + + + Magnifier follows the word being read by select-to-speak Zoom level @@ -1748,6 +1750,9 @@ Use Ctrl + Alt + Brightness down to zoom out. Extra large + + Use a swipe gesture to navigate between pages + Mouse Keys @@ -1755,9 +1760,6 @@ Use Ctrl + Alt + Brightness down to zoom out. Use your Chromebook keyboard or a numeric keypad to control the cursor - - Press ctrl key 5 times to pause mouse keys - Temporarily disable mouse keys when you are in a text field. Press esc to resume. @@ -4126,7 +4128,10 @@ Press an assigned switch or key to remove assignment. This device can only connect to a specific mobile network. <a target="_blank" href="$1">Learn more</a> - + + Instant hotspot details + + Instant Tethering details @@ -6024,7 +6029,7 @@ Press an assigned switch or key to remove assignment. right alt - function + fn $1Internal Keyboard has been connected @@ -6176,6 +6181,9 @@ Press & hold keyboard keys to see accent marks and special characters. This Notifications, Google Play + + Notifications + Manage your apps @@ -6297,6 +6305,9 @@ Press & hold keyboard keys to see accent marks and special characters. This Manage access and block apps on this Chromebook. + + Set up + @@ -6407,6 +6418,15 @@ Press & hold keyboard keys to see accent marks and special characters. This System + + Encrypted using + + + AES-128 + + + AES-256 + @@ -6596,8 +6616,14 @@ Press & hold keyboard keys to see accent marks and special characters. This Location access - - Manage location access for apps, websites and system services. Location may use sources like Wi-Fi, mobile networks, and sensors to help estimate your device's location. <a>Learn more</a> + + Apps and websites with the location permission, as well as system services, can use your location + + + Only system services can use your location + + + Location access is blocked Allowed @@ -6697,6 +6723,9 @@ Press & hold keyboard keys to see accent marks and special characters. This System services + + Manually set, not using location + Allowed @@ -6745,6 +6774,30 @@ Press & hold keyboard keys to see accent marks and special characters. This No microphone connected + + Turn on camera access? + + + Turn on location access? + + + Turn on microphone access? + + + This allows camera access for apps, websites with the camera permission, and system services + + + This allows location access for apps, websites with the location permission, and system services + + + This allows microphone access for apps, websites with the microphone permission, and system services + + + Allow + + + Cancel + diff --git a/app/password_manager_ui_strings.grdp b/app/password_manager_ui_strings.grdp index 803b92c69da70..816eedfbc34c7 100644 --- a/app/password_manager_ui_strings.grdp +++ b/app/password_manager_ui_strings.grdp @@ -651,8 +651,8 @@ - - Manage passkeys + + Manage passkeys in Windows Hello @@ -676,8 +676,20 @@ Your $1<a href="https://google.ca" target="_blank">google.ca</a> account won't be deleted - - You created a passkey for this site. You need your mobile device to sign in. + + You created this passkey on $12024-02-01 + + + Remove access to your passkeys on this device + + + To give this device access to your passkeys again, sign in to a site or app with a saved passkey + + + Remove access + + + Passkeys access removed Copy display name @@ -853,7 +865,10 @@ Recommendation - + Dismiss recommendation + + PIN changed successfully + diff --git a/app/profiles_strings.grdp b/app/profiles_strings.grdp index 2cf6f850c7863..2ea0b76dd1c05 100644 --- a/app/profiles_strings.grdp +++ b/app/profiles_strings.grdp @@ -10,7 +10,7 @@ } - To clear Guest mode history, close all Guest windows. + To delete Guest mode history, close all Guest windows. {0, plural, @@ -51,6 +51,9 @@ School + + Hi, $1User + @@ -84,9 +87,6 @@ Syncing to - - Sync is on - Turn on sync... @@ -117,6 +117,16 @@ Sign in to get your bookmarks, history, passwords, and other settings on all your devices. + + + Verify It’s You + + + + + Verify it’s you + + Payment methods @@ -148,6 +158,12 @@ Add new profile + + Sync is on + + + Customize profile + @@ -171,6 +187,12 @@ Add New Profile + + Sync Is On + + + Customize Profile + managed by $11 @@ -181,7 +203,7 @@ Your administrator has disabled other profiles - + Customize profile @@ -683,7 +705,7 @@ Continue without an account - @@ -733,6 +755,8 @@ This will permanently delete your browsing data from this device. To recover the data, turn on sync as + Sign in to get your passwords and more on all your devices + @@ -797,6 +821,9 @@ Save your bookmarks, passwords and more with sync + + Save your bookmarks and more with sync + Don't sign in diff --git a/app/profiles_strings_override.grdp b/app/profiles_strings_override.grdp index 35a280bf770c1..3f76164abe24c 100644 --- a/app/profiles_strings_override.grdp +++ b/app/profiles_strings_override.grdp @@ -23,6 +23,10 @@ + + + + diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp index 50260645b2621..2b0bc93676f2c 100644 --- a/app/settings_brave_strings.grdp +++ b/app/settings_brave_strings.grdp @@ -298,17 +298,17 @@ You can manage your signed-in Brave sync chains. Your Brave sync chains are used for Brave browser, Play Store, Gmail, and more. If you want to add an account for someone else, like a family member, add a new profile to your $1Chromebook instead. <a>Learn more</a> - + Sign in to Brave when you sign in to other Brave services - + When signing into Brave services like Gmail or Youtube with $1foo@example.com, you can sign in to Brave with the same account - - Sign in to Brave + + Automatically sign me in to Brave - - Don’t sign in to Brave + + Don’t sign me in to Brave diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index fdb0ade675efa..6d4cb53417902 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -91,7 +91,7 @@ <ul> <li><em>The best of Brave</em>, for those who want it. For example, you can choose Brave Search as Brave’s default search engine and use Brave Password Manager to get all your passwords on any device. </li> <li><em>Meaningful choice</em>: Brave offers you choice and control with settings, and information to help you make meaningful decisions.</li> - <li><em>Extensions</em>: You can extend Brave functionality with over 100,000 extensions in the Web Store.</li> + <li><em>Extensions</em>: You can extend Brave functionality with over 100,000 extensions in the <a target="_blank" href="$1">Web Store</a>.</li> </ul> @@ -108,6 +108,72 @@ Ads revenue also supports Brave’s many free products and services, like Brave, Gmail, Maps, and YouTube. + + When you browse the web you generate data - for example, the words you search for, the sites you visit, and the browser and device you use. + + + This information can be useful. For example, it can help Brave improve by understanding how quickly pages load in different conditions. And based on your settings, it can also: + <ul> + <li>Help you browse faster. For example, your past Brave searches can help Brave prompt you with predictions for your future ones.</li> + <li>Allow sites to optimize your experience for your device. For example, a site can streamline its content for your mobile phone and remember your preferences, like your preferred language. </li> + <li>Help advertisers, including Brave, show more relevant ads.</li> + </ul> + + + What’s the difference between your browsing history in Brave and your search history? + + + Your Brave browsing history is all the sites you’ve visited in Brave over a period of time. + + + Visit <a target="_blank" href="$1">$1chrome://history</a> to review and manage your browsing history. Learn more about <a target="_blank" href="$2">your browsing data in Brave and how to manage it</a>. + + + When you search for something in Brave’s address bar, your default search engine receives your request and responds by showing relevant results. Your search history includes things you’ve searched for over a period of time. + + + You can review your search history and settings in <a target="_blank" href="$1">My Activity</a>, if: + <ul> + <li>You use Brave Search</li> + <li>You’re signed in to your Brave account</li> + <li>You have Web & App Activity turned on</li> + </ul> + + + Once you find a site you want to explore, you decide (using site permissions) if a site can use certain features, for example: + <ul> + <li>Use your device’s Camera, Location, and Microphone</li> + <li>Store data on your device</li> + <li>Provide site features, like Notifications</li> + </ul> + + + Depending on site permissions, cookies are one way that allow sites to store information about your online activity. + + + Review site permissions at <a target="_blank" href="$1">$1chrome://settings/content</a> + + + Cookies can enrich your online experience, allowing sites to offer you useful features + + + Imagine you have a favorite cafe you visit for your morning coffee. Maybe you’re such a frequent customer that the shop owner knows you by name and can bring you your order, a double espresso with a single sugar, right when you walk in the door. + + + Cookies allow for this same level of preference customization on the web. When you visit a site, the site can save a cookie in your device’s browser storage to remember your site preferences, such as the language you speak or items that you want saved in a shopping cart. Later, if you visit the site again using the same browser, that site can read the cookie it set and you can start up where you left off. These types of cookies are often referred to as first-party cookies, because they’re set by the site you visit. + + + Sometimes sites use cookies in ways they weren’t initially intended + + + That’s why Brave is planning to phase out the use of “third-party” cookies once we’ve addressed any remaining competition concerns of the <a target="_blank" href="$1">UK’s Competition and Markets Authority (CMA)</a>. + + + What are third-party cookies? A site you visit can embed content from other sites or services, for example images, ads, social media content, and text. When any of these other sites use cookies to save info about you, we call that a third-party cookie. If you visit several sites that embed content from the same source, like an ad network, third-party cookies can be used for advertising purposes and to track you as you browse. + + + Brave is part of a <a target="_blank" href="$1">collaborative effort</a> to reduce cross-site tracking and phase out the use of third-party cookies. But we’re trying to do it responsibly because many sites rely on third-party cookies to work as designed. For example, many sites use third-party cookies to simplify signing in, to support embedded chat and comment systems, and for payment services. And advertisers often use third-party cookies to better personalize ads. That matters because sites often count on ads to help pay expenses and keep their online content free of charge. + @@ -295,6 +361,9 @@ Show bookmarks + + Show tab groups in bookmarks + Tab hover preview card @@ -375,8 +444,8 @@ $1Adblocker plusplus is controlling this setting - - Clear + + Delete Custom @@ -977,21 +1046,21 @@ - + 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 delete 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 all of your synced devices and your Brave sync chain, <a href="#" target="_blank">visit sync settings</a>. + + To delete 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">enter your passphrase</a>. + + To delete 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">sign in</a>. + + To delete browsing data from all of your synced devices and your Brave sync chain, <a href="#" target="_blank">sign in</a>. Browsing history @@ -999,8 +1068,8 @@ Signs you out of most sites - - Signs you out of most sites. You'll stay signed in to your Brave sync chain so your synced data can be cleared. + + Signs you out of most sites. You'll stay signed in to your Brave sync chain so your synced data can be deleted. Signs you out of most sites. You won't be signed out of your Brave sync chain. @@ -1012,10 +1081,10 @@ Signs you out of most sites. You'll stay signed in to your Brave sync chain. - Clears history, including in the search box + Deletes history, including in the search box - - Clears history from all synced devices + + Deletes history from all synced devices <a target="_blank" href="$1">Search history</a> and <a target="_blank" href="$2">other forms of activity</a> may be saved in your Brave sync chain when you're signed in. You can delete them anytime. @@ -1038,16 +1107,9 @@ Cookies and other site data - - - Passwords and other sign-in data - - - - - Passwords and passkeys - - + + Passwords and other sign-in data + Autofill form data @@ -1168,6 +1230,24 @@ Choose time range + + Moderate + + + Balanced (recommended) + + + Maximum + + + Get moderate memory savings. Your tabs become inactive after a longer period of time. + + + Get balanced memory savings. Your tabs become inactive after an optimal period of time. + + + Get maximum memory savings. Your tabs become inactive after a shorter period of time. + Add to the "always keep these sites active" list @@ -1205,10 +1285,10 @@ Energy Saver - Turn on when my computer is unplugged + Turn on when your computer is unplugged - Turn on only when my battery is at $120% or lower + Turn on only when your battery is at $120% or lower Energy saver options @@ -1216,6 +1296,12 @@ Turn on Energy Saver to extend battery life + + Inactive tabs appearance + + + A dotted circle appears around site icons. + @@ -1440,6 +1526,15 @@ Don't allow "Help me write" to automatically open + + Never offer writing help on these sites + + + No sites added + + + Remove $1https://www.google.com from disabled sites + @@ -1904,6 +1999,14 @@ =1 {To protect your data, permissions were removed from a site you haven't visited recently} other {To protect your data, permissions were removed from sites you haven't visited recently}} + + {NUM_SITES, plural, + =1 {To protect your data, permissions were removed from a site} + other {To protect your data, permissions were removed from some sites}} + + + Dangerous site. Brave removed Notifications. + {NUM_SITES, plural, =1 {Review complete for 1 site} @@ -2279,20 +2382,20 @@ Control what information websites can use and what content they can show you - - Clear data + + Delete data - - Clearing data... + + Deleting data... - - Data cleared. + + Data deleted. - - Clear browsing data + + Delete browsing data - - Clear history, cookies, cache, and more + + Delete history, cookies, cache, and more $1Block - $242 @@ -3242,14 +3345,17 @@ Advanced - + Hide your IP address - - When you’re signed in to Brave, this setting can limit what suspected trackers can see as you browse. When a page loads, some requests for content get sent through privacy servers. Learn more about <a href="#" aria-label="$1" aria-description="$2" target="_blank">how IP protection works</a> + + When you’re signed in to Brave, some of your traffic may be sent through privacy servers if Brave suspects a site may be tracking you + + + Limit digital fingerprinting - - Learn more about hiding your IP address + + This setting makes it harder for sites to identify you using data about your device and browser, such as your device model or browser version Block all third-party cookies @@ -3269,6 +3375,9 @@ Affects the sites listed here. Inserting “[*.]” before a domain name creates an exception for the entire domain. For example, adding “[*.]google.com” means that third-party cookies can also be active for mail.google.com, because it’s part of google.com. + + Only applies to third-party cookie blocking + Tracking Protection is temporarily unavailable. While Brave is updating this feature, sites can temporarily use third-party cookies unless you block them. <a target="_blank" href="$1" aria-label="$2">Learn more</a></a> @@ -3383,7 +3492,7 @@ Mute (default) - + Allow @@ -3512,8 +3621,8 @@ All data stored by $1www.example.com will be deleted. - - All data and cookies stored by $1www.example.com will be cleared. + + All data and cookies stored by $1www.example.com will be deleted. You’ll be signed out of this site, including in open tabs @@ -3776,6 +3885,9 @@ Sign in + + Verify it's you + 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>. @@ -3837,9 +3949,6 @@ Sync will start once you leave sync settings - - Manage your Brave sync chain - Activity and interactions @@ -3873,10 +3982,21 @@ Linked Brave services - + Ask me every time + + + Manage your Brave sync chain + + + + + Manage Your Brave sync chain + + + diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp index 300048184b05e..fca909b1544ec 100644 --- a/app/settings_strings_override.grdp +++ b/app/settings_strings_override.grdp @@ -17,7 +17,7 @@ <ul> <li><em>The best of Brave</em>, for those who want it. For example, you can choose Brave Search as Brave’s default search engine and use Brave Password Manager to get all your passwords on any device. </li> <li><em>Meaningful choice</em>: Brave offers you choice and control with settings, and information to help you make meaningful decisions.</li> - <li><em>Extensions</em>: You can extend Brave functionality with over 100,000 extensions in the Web Store.</li> + <li><em>Extensions</em>: You can extend Brave functionality with over 100,000 extensions in the <a target="_blank" href="$1">Web Store</a>.</li> </ul> @@ -55,6 +55,9 @@ Show bookmarks + + Show tab groups in bookmarks + Open Web Store @@ -86,10 +89,6 @@ - - - - @@ -183,6 +182,11 @@ + + + + + diff --git a/base/android/java/src/org/chromium/base/cached_flags/BraveCachedFlag.java b/base/android/java/src/org/chromium/base/cached_flags/BraveCachedFlag.java index edbecc751f9a5..9d034ad038f14 100644 --- a/base/android/java/src/org/chromium/base/cached_flags/BraveCachedFlag.java +++ b/base/android/java/src/org/chromium/base/cached_flags/BraveCachedFlag.java @@ -11,6 +11,7 @@ /** Class to override default cached values. */ public class BraveCachedFlag extends CachedFlag { + private static final String ANDROID_HUB = "AndroidHub"; private static final String START_SURFACE_ANDROID = "StartSurfaceAndroid"; private static final String INCOGNITO_REAUTHENTICATION_FOR_ANDROID = "IncognitoReauthenticationForAndroid"; @@ -21,6 +22,7 @@ public class BraveCachedFlag extends CachedFlag { static { sFlags = new HashMap(); + sFlags.put(ANDROID_HUB, false); sFlags.put(START_SURFACE_ANDROID, false); sFlags.put(SURFACE_POLISH, false); sFlags.put(INCOGNITO_REAUTHENTICATION_FOR_ANDROID, true); @@ -29,6 +31,16 @@ public class BraveCachedFlag extends CachedFlag { // Will be deleted in bytecode. Variable from the parent class will be used instead. private boolean mDefaultValue; + public BraveCachedFlag( + FeatureMap featureMap, + String featureName, + boolean defaultValue, + boolean defaultValueInTests) { + super(featureMap, featureName, defaultValue, defaultValueInTests); + + maybeOverrideDefaultValue(featureName, defaultValue); + } + public BraveCachedFlag(FeatureMap featureMap, String featureName, boolean defaultValue) { super(featureMap, featureName, defaultValue); diff --git a/browser/brave_ads/application_state/notification_helper/notification_helper_impl_android.cc b/browser/brave_ads/application_state/notification_helper/notification_helper_impl_android.cc index 6cea74b07ff62..5d8d939828662 100644 --- a/browser/brave_ads/application_state/notification_helper/notification_helper_impl_android.cc +++ b/browser/brave_ads/application_state/notification_helper/notification_helper_impl_android.cc @@ -10,7 +10,7 @@ #include "brave/browser/brave_ads/android/jni_headers/BraveAdsSignupDialog_jni.h" #include "brave/browser/brave_ads/android/jni_headers/BraveAds_jni.h" #include "brave/browser/brave_ads/application_state/background_helper/background_helper.h" -#include "brave/build/android/jni_headers/BraveNotificationSettingsBridge_jni.h" +#include "brave/build/android/jni_headers/BraveSiteChannelsManagerBridge_jni.h" #include "brave/components/brave_ads/browser/ad_units/notification_ad/custom_notification_ad_feature.h" #include "chrome/browser/notifications/jni_headers/NotificationSystemStatusUtil_jni.h" #include "chrome/browser/notifications/notification_channels_provider_android.h" @@ -48,7 +48,7 @@ bool IsBraveAdsNotificationChannelEnabled(const bool is_foreground) { : Java_BraveAds_getBraveAdsBackgroundChannelId(env); const auto status = static_cast( - Java_BraveNotificationSettingsBridge_getChannelStatus(env, j_channel_id)); + Java_BraveSiteChannelsManagerBridge_getChannelStatus(env, j_channel_id)); return (status == NotificationChannelStatus::ENABLED || status == NotificationChannelStatus::UNAVAILABLE); diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 146d509f736f9..1ffb3db9510ef 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -286,9 +286,19 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->SetDefaultPrefValue(ntp_tiles::prefs::kPopularSitesJsonPref, base::Value(base::Value::Type::LIST)); // Disable NTP suggestions - feed::RegisterProfilePrefs(registry); - registry->RegisterBooleanPref(feed::prefs::kEnableSnippets, false); - registry->RegisterBooleanPref(feed::prefs::kArticlesListVisible, false); + // On Android we want to have enable_feed_v2 parameter enabled to + // provide linking with feed::FetchRssLinks at + // BraveNewsTabHelper::DOMContentLoaded, but kEnableSnippets and + // kArticlesListVisible must be defaulted to false to avoid failed assertion + // at BraveNewTabPage.initializeMainView. So override + // feed::prefs::RegisterFeedSharedProfilePrefs for Android only. Related + // Chromium's commit: d3500b942cde04737bc13021173b6ffa11aaf1b9. + registry->SetDefaultPrefValue(feed::prefs::kEnableSnippets, + base::Value(false)); + registry->SetDefaultPrefValue(feed::prefs::kArticlesListVisible, + base::Value(false)); + registry->SetDefaultPrefValue(feed::prefs::kEnableSnippetsByDse, + base::Value(false)); // Explicitly disable safe browsing extended reporting by default in case they // change it in upstream. diff --git a/browser/debounce/debounce_browsertest.cc b/browser/debounce/debounce_browsertest.cc index 79f60fe1862f1..5a8f7f3587b58 100644 --- a/browser/debounce/debounce_browsertest.cc +++ b/browser/debounce/debounce_browsertest.cc @@ -171,8 +171,7 @@ class DebounceBrowserTest : public BaseLocalDataFilesBrowserTest { void NavigateToURLAndWaitForRedirects(const GURL& original_url, const GURL& landing_url) { - ui_test_utils::UrlLoadObserver load_complete( - landing_url, content::NotificationService::AllSources()); + ui_test_utils::UrlLoadObserver load_complete(landing_url); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), original_url)); load_complete.Wait(); EXPECT_EQ(web_contents()->GetLastCommittedURL(), landing_url); diff --git a/browser/ethereum_remote_client/ethereum_remote_client_service.cc b/browser/ethereum_remote_client/ethereum_remote_client_service.cc index d30d8b9e7186e..c1e3d896d12af 100644 --- a/browser/ethereum_remote_client/ethereum_remote_client_service.cc +++ b/browser/ethereum_remote_client/ethereum_remote_client_service.cc @@ -99,7 +99,7 @@ bool EthereumRemoteClientService::OpenSeed(const std::string& cipher_seed, std::string EthereumRemoteClientService::GetRandomNonce() { // crypto::RandBytes is fail safe. uint8_t nonceBytes[kNonceByteLength]; - crypto::RandBytes(nonceBytes, kNonceByteLength); + crypto::RandBytes(nonceBytes); return std::string(reinterpret_cast(nonceBytes), kNonceByteLength); } @@ -107,7 +107,7 @@ std::string EthereumRemoteClientService::GetRandomNonce() { std::string EthereumRemoteClientService::GetRandomSeed() { // crypto::RandBytes is fail safe. uint8_t random_seed_bytes[kSeedByteLength]; - crypto::RandBytes(random_seed_bytes, kSeedByteLength); + crypto::RandBytes(random_seed_bytes); return std::string(reinterpret_cast(random_seed_bytes), kSeedByteLength); } diff --git a/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc b/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc index a39616f51953f..829e35bf253a9 100644 --- a/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc +++ b/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc @@ -63,7 +63,6 @@ class BraveDarkModeFingerprintProtectionTest : public InProcessBrowserTest { explicit MockColorProviderSource(bool is_dark) { key_.color_mode = is_dark ? ui::ColorProviderKey::ColorMode::kDark : ui::ColorProviderKey::ColorMode::kLight; - provider_.GenerateColorMap(); } MockColorProviderSource(const MockColorProviderSource&) = delete; MockColorProviderSource& operator=(const MockColorProviderSource&) = delete; diff --git a/browser/importer/brave_external_process_importer_host.cc b/browser/importer/brave_external_process_importer_host.cc index 20239d529b20b..da004601db01c 100644 --- a/browser/importer/brave_external_process_importer_host.cc +++ b/browser/importer/brave_external_process_importer_host.cc @@ -106,7 +106,7 @@ void BraveExternalProcessImporterHost::InstallExtension(const std::string& id) { scoped_refptr installer = new WebstoreInstallerForImporting( - id, profile_, + id, profile_, /*parent_window=*/nullptr, base::BindOnce( &BraveExternalProcessImporterHost::OnExtensionInstalled, weak_ptr_factory_.GetWeakPtr(), id)); diff --git a/browser/mac/keystone_infobar_delegate.mm b/browser/mac/keystone_infobar_delegate.mm new file mode 100644 index 0000000000000..104a2f92c529c --- /dev/null +++ b/browser/mac/keystone_infobar_delegate.mm @@ -0,0 +1,196 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" + +#import + +#include + +#include "base/command_line.h" +#include "base/feature_list.h" +#include "base/functional/bind.h" +#import "base/task/single_thread_task_runner.h" +#include "base/task/single_thread_task_runner.h" +#include "brave/browser/mac/keystone_glue.h" +#include "build/branding_buildflags.h" +#include "chrome/browser/buildflags.h" +#include "chrome/browser/first_run/first_run.h" +#include "chrome/browser/infobars/confirm_infobar_creator.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/browser/updater/browser_updater_client_util.h" +#include "chrome/common/chrome_features.h" +#include "chrome/common/chrome_switches.h" +#include "chrome/common/pref_names.h" +#include "chrome/grit/branded_strings.h" +#include "chrome/grit/generated_resources.h" +#include "chrome/grit/theme_resources.h" +#include "components/infobars/content/content_infobar_manager.h" +#include "components/infobars/core/infobar.h" +#include "components/prefs/pref_service.h" +#include "content/public/browser/web_contents.h" +#include "ui/base/l10n/l10n_util.h" + +// KeystonePromotionInfoBar --------------------------------------------------- + +@interface KeystonePromotionInfoBar : NSObject +- (void)checkAndShowInfoBarForProfile:(Profile*)profile; +- (void)updateStatus:(NSNotification*)notification; +- (void)removeObserver; +@end // @interface KeystonePromotionInfoBar + +KeystonePromotionInfoBar* g_currentPromotionInfoBar; + +@implementation KeystonePromotionInfoBar + +- (void)dealloc { + [self removeObserver]; +} + +- (void)checkAndShowInfoBarForProfile:(Profile*)profile { + // If this is the first run, the user clicked the "don't ask again" button + // at some point in the past, or if the "don't ask about the default + // browser" command-line switch is present, bail out. That command-line + // switch is recycled here because it's likely that the set of users that + // don't want to be nagged about the default browser also don't want to be + // nagged about the update check. (Automated testers, I'm thinking of + // you...) + base::CommandLine* commandLine = base::CommandLine::ForCurrentProcess(); + if (first_run::IsChromeFirstRun() || + !profile->GetPrefs()->GetBoolean(prefs::kShowUpdatePromotionInfoBar) || + commandLine->HasSwitch(switches::kNoDefaultBrowserCheck)) { + return; + } + + // If there is no Keystone glue (maybe because this application isn't + // Keystone-enabled) or the application is on a read-only filesystem, + // doing anything related to auto-update is pointless. Bail out. + KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; + if (!keystoneGlue || [keystoneGlue isOnReadOnlyFilesystem]) { + return; + } + + // Stay alive as long as needed. This is balanced in -updateStatus:. + g_currentPromotionInfoBar = self; + + AutoupdateStatus recentStatus = [keystoneGlue recentStatus]; + if (recentStatus == kAutoupdateNone || + recentStatus == kAutoupdateRegistering) { + [NSNotificationCenter.defaultCenter + addObserver:self + selector:@selector(updateStatus:) + name:kAutoupdateStatusNotification + object:nil]; + } else { + [self updateStatus:[keystoneGlue recentNotification]]; + } +} + +- (void)updateStatus:(NSNotification*)notification { + NSDictionary* dictionary = [notification userInfo]; + AutoupdateStatus status = static_cast( + [dictionary[kAutoupdateStatusStatus] intValue]); + + if (status == kAutoupdateNone || status == kAutoupdateRegistering) { + return; + } + + [self removeObserver]; + + if (status != kAutoupdateRegisterFailed && + [[KeystoneGlue defaultKeystoneGlue] needsPromotion]) { + Browser* browser = chrome::FindLastActive(); + if (browser) { + content::WebContents* webContents = + browser->tab_strip_model()->GetActiveWebContents(); + if (webContents) { + KeystonePromotionInfoBarDelegate::Create(webContents); + } + } + } + + g_currentPromotionInfoBar = nil; +} + +- (void)removeObserver { + [NSNotificationCenter.defaultCenter removeObserver:self]; +} + +@end // @implementation KeystonePromotionInfoBar + +// KeystonePromotionInfoBarDelegate ------------------------------------------- + +// static +void KeystonePromotionInfoBarDelegate::Create( + content::WebContents* webContents) { + infobars::ContentInfoBarManager* infobar_manager = + infobars::ContentInfoBarManager::FromWebContents(webContents); + infobar_manager->AddInfoBar( + CreateConfirmInfoBar(std::unique_ptr( + new KeystonePromotionInfoBarDelegate( + Profile::FromBrowserContext(webContents->GetBrowserContext()) + ->GetPrefs())))); +} + +KeystonePromotionInfoBarDelegate::KeystonePromotionInfoBarDelegate( + PrefService* prefs) + : prefs_(prefs), can_expire_(false), weak_ptr_factory_(this) { + const base::TimeDelta kCanExpireOnNavigationAfterDelay = base::Seconds(8); + base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( + FROM_HERE, + base::BindOnce(&KeystonePromotionInfoBarDelegate::SetCanExpire, + weak_ptr_factory_.GetWeakPtr()), + kCanExpireOnNavigationAfterDelay); +} + +KeystonePromotionInfoBarDelegate::~KeystonePromotionInfoBarDelegate() = default; + +infobars::InfoBarDelegate::InfoBarIdentifier +KeystonePromotionInfoBarDelegate::GetIdentifier() const { + return KEYSTONE_PROMOTION_INFOBAR_DELEGATE_MAC; +} + +int KeystonePromotionInfoBarDelegate::GetIconId() const { + return IDR_PRODUCT_LOGO_32; +} + +bool KeystonePromotionInfoBarDelegate::ShouldExpire( + const NavigationDetails& details) const { + return can_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details); +} + +std::u16string KeystonePromotionInfoBarDelegate::GetMessageText() const { + return l10n_util::GetStringFUTF16( + IDS_PROMOTE_INFOBAR_TEXT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); +} + +std::u16string KeystonePromotionInfoBarDelegate::GetButtonLabel( + InfoBarButton button) const { + return l10n_util::GetStringUTF16((button == BUTTON_OK) + ? IDS_PROMOTE_INFOBAR_PROMOTE_BUTTON + : IDS_PROMOTE_INFOBAR_DONT_ASK_BUTTON); +} + +bool KeystonePromotionInfoBarDelegate::Accept() { + [[KeystoneGlue defaultKeystoneGlue] promoteTicket]; + return true; +} + +bool KeystonePromotionInfoBarDelegate::Cancel() { + prefs_->SetBoolean(prefs::kShowUpdatePromotionInfoBar, false); + return true; +} + +void ShowUpdaterPromotionInfoBar() { + Browser* browser = chrome::FindLastActive(); + if (browser && browser->profile()) { + KeystonePromotionInfoBar* promotionInfoBar = + [[KeystonePromotionInfoBar alloc] init]; + [promotionInfoBar checkAndShowInfoBarForProfile:browser->profile()]; + } +} diff --git a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc index 1adc05adb64d5..55bc08ebb4bb9 100644 --- a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc +++ b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc @@ -212,8 +212,7 @@ class BraveSiteHacksNetworkDelegateBrowserTest : public InProcessBrowserTest { void NavigateToURLAndWaitForRedirects(Browser* browser, const GURL& original_url, const GURL& landing_url) { - ui_test_utils::UrlLoadObserver load_complete( - landing_url, content::NotificationService::AllSources()); + ui_test_utils::UrlLoadObserver load_complete(landing_url); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser, original_url)); EXPECT_EQ(contents(browser)->GetPrimaryMainFrame()->GetLastCommittedURL(), original_url); diff --git a/browser/net/brave_torrent_redirect_network_delegate_helper_browsertest.cc b/browser/net/brave_torrent_redirect_network_delegate_helper_browsertest.cc index 38c48c13d5f5c..96870ee1b6450 100644 --- a/browser/net/brave_torrent_redirect_network_delegate_helper_browsertest.cc +++ b/browser/net/brave_torrent_redirect_network_delegate_helper_browsertest.cc @@ -91,8 +91,7 @@ class BraveTorrentRedirectNetworkDelegateHelperTest } void NavigateToURLAndWaitForRedirects(const GURL& original_url) { - ui_test_utils::UrlLoadObserver load_complete( - original_url, content::NotificationService::AllSources()); + ui_test_utils::UrlLoadObserver load_complete(original_url); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), original_url)); EXPECT_EQ(contents()->GetPrimaryMainFrame()->GetLastCommittedURL(), original_url); diff --git a/browser/ntp_background/custom_background_file_manager.cc b/browser/ntp_background/custom_background_file_manager.cc index 8b8ad2f9fa81f..485d172279bfb 100644 --- a/browser/ntp_background/custom_background_file_manager.cc +++ b/browser/ntp_background/custom_background_file_manager.cc @@ -189,9 +189,9 @@ void CustomBackgroundFileManager::SaveImageAsPNG( } auto encode_and_save = base::BindOnce( [](const SkBitmap& bitmap, const base::FilePath& target_path) { - auto encoded = base::MakeRefCounted(); + std::vector encoded; if (!gfx::PNGCodec::EncodeBGRASkBitmap( - bitmap, /*discard_transparency=*/false, &encoded->data())) { + bitmap, /*discard_transparency=*/false, &encoded)) { DVLOG(2) << "Failed to encode image as PNG"; return base::FilePath(); } @@ -202,9 +202,7 @@ void CustomBackgroundFileManager::SaveImageAsPNG( base::StringPrintf("-%d", i)); } - if (!base::WriteFile( - modified_path, - base::span(encoded->front(), encoded->size()))) { + if (!base::WriteFile(modified_path, base::make_span(encoded))) { DVLOG(2) << "Failed to write image to file " << modified_path; return base::FilePath(); } diff --git a/browser/permissions/mock_permission_lifetime_prompt.cc b/browser/permissions/mock_permission_lifetime_prompt.cc index 4f96f3d6285b3..cd852164e51b7 100644 --- a/browser/permissions/mock_permission_lifetime_prompt.cc +++ b/browser/permissions/mock_permission_lifetime_prompt.cc @@ -35,6 +35,10 @@ PermissionPromptDisposition MockPermissionLifetimePrompt::GetPromptDisposition() return PermissionPromptDisposition::ANCHORED_BUBBLE; } +bool MockPermissionLifetimePrompt::IsAskPrompt() const { + return true; +} + void MockPermissionLifetimePrompt::ResetFactory() { factory_ = nullptr; } diff --git a/browser/permissions/mock_permission_lifetime_prompt.h b/browser/permissions/mock_permission_lifetime_prompt.h index afc5ca0f48da4..7e81287d3d0a4 100644 --- a/browser/permissions/mock_permission_lifetime_prompt.h +++ b/browser/permissions/mock_permission_lifetime_prompt.h @@ -25,6 +25,7 @@ class MockPermissionLifetimePrompt : public PermissionPrompt { bool UpdateAnchor() override; TabSwitchingBehavior GetTabSwitchingBehavior() override; PermissionPromptDisposition GetPromptDisposition() const override; + bool IsAskPrompt() const override; std::optional GetViewBoundsInScreen() const override; bool ShouldFinalizeRequestAfterDecided() const override; std::vector GetPromptVariants() diff --git a/browser/playlist/playlist_data_source.cc b/browser/playlist/playlist_data_source.cc index e2e7e9733cabe..be388376b394c 100644 --- a/browser/playlist/playlist_data_source.cc +++ b/browser/playlist/playlist_data_source.cc @@ -57,14 +57,14 @@ class RefCountedMemMap : public base::RefCountedMemory { bool initialized() const { return initialized_; } - const unsigned char* front() const override { - return memory_mapped_file_.data(); - } - size_t size() const override { return memory_mapped_file_.length(); } - private: ~RefCountedMemMap() override = default; + // RefCountedMemory: + base::span AsSpan() const LIFETIME_BOUND override { + return memory_mapped_file_.bytes(); + } + base::MemoryMappedFile memory_mapped_file_; bool initialized_ = false; }; diff --git a/browser/playlist/playlist_service_factory.cc b/browser/playlist/playlist_service_factory.cc index de901b523593e..44cd6905db7aa 100644 --- a/browser/playlist/playlist_service_factory.cc +++ b/browser/playlist/playlist_service_factory.cc @@ -171,8 +171,9 @@ class PlaylistServiceDelegateImpl : public PlaylistService::Delegate { auto encode = base::BindOnce( [](const SkBitmap& bitmap) { auto encoded = base::MakeRefCounted(); - if (!gfx::PNGCodec::EncodeBGRASkBitmap( - bitmap, /*discard_transparency=*/false, &encoded->data())) { + if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, + /*discard_transparency=*/false, + &encoded->as_vector())) { DVLOG(2) << "Failed to encode image as PNG"; } diff --git a/browser/resources/settings/brave_overrides/basic_page.ts b/browser/resources/settings/brave_overrides/basic_page.ts index f8b8a5fa2dbb3..8fca16fb88920 100644 --- a/browser/resources/settings/brave_overrides/basic_page.ts +++ b/browser/resources/settings/brave_overrides/basic_page.ts @@ -139,6 +139,21 @@ RegisterPolymerTemplateModifications({ safetyCheckSettingsSection.remove() } } + const safetyHubTemplate = actualTemplate.content.querySelector( + 'template[is="dom-if"][if="[[showSafetyHubEntryPointPage_(pageVisibility.safetyHub)]]"]') + if (!safetyHubTemplate) { + console.error( + '[Brave Settings Overrides] Could not find safetyHub template') + } else { + const safetyHubEntryPointSection = safetyHubTemplate.content. + querySelector('#safetyHubEntryPointSection') + if (!safetyHubEntryPointSection) { + console.error('[Brave Settings Overrides] Could not find ' + + 'safetyHubEntryPointSection element to hide') + } else { + safetyHubEntryPointSection.remove() + } + } const sectionGetStarted = document.createElement('template') sectionGetStarted.setAttribute('is', 'dom-if') sectionGetStarted.setAttribute('restamp', 'true') diff --git a/browser/resources/settings/brave_overrides/cr_icon.ts b/browser/resources/settings/brave_overrides/cr_icon.ts new file mode 100644 index 0000000000000..4a87a3e622dc7 --- /dev/null +++ b/browser/resources/settings/brave_overrides/cr_icon.ts @@ -0,0 +1,36 @@ +// Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. + +import { CrIconElement } from '//resources/cr_elements/cr_icon/cr_icon.js' +import { iconMap, leoIcons } from './iron_icon.js' +import { css } from '//resources/lit/v3_0/lit.rollup.js' +import { injectStyle } from '//resources/brave/lit_overriding.js' + +injectStyle(CrIconElement, css`:host { + --leo-icon-size: var(--iron-icon-width, 24px); + --leo-icon-color: var(--iron-icon-fill-color, currentColor); +}`) + +const old = CrIconElement.prototype.updateIcon +CrIconElement.prototype.updateIcon = function (...args: any) { + const removeAllOfType = (type: string) => { + for (const node of this.shadowRoot!.querySelectorAll(type)) node.remove() + } + + const name = iconMap[this.icon] + if (name || leoIcons.has(this.icon)) { + removeAllOfType('svg') + + let leoIcon = this.shadowRoot!.querySelector('leo-icon') + if (!leoIcon) { + leoIcon = document.createElement('leo-icon') + this.shadowRoot!.append(leoIcon) + } + leoIcon.setAttribute('name', name ?? this.icon) + } else { + removeAllOfType('leo-icon') + old.apply(this, args) + } +} diff --git a/browser/resources/settings/brave_overrides/index.ts b/browser/resources/settings/brave_overrides/index.ts index 6b247f01f8888..26cc1914896bb 100644 --- a/browser/resources/settings/brave_overrides/index.ts +++ b/browser/resources/settings/brave_overrides/index.ts @@ -16,6 +16,7 @@ import './autofill_page.js' import './appearance_page.js' import './basic_page.js' import './clear_browsing_data_dialog.js' +import './cr_icon.js' import './add_site_dialog.js' import './cookies_page.js' import './default_browser_page.js' diff --git a/browser/resources/settings/brave_overrides/iron_icon.ts b/browser/resources/settings/brave_overrides/iron_icon.ts index 0ae1650bc6bd1..e69a4a606a722 100644 --- a/browser/resources/settings/brave_overrides/iron_icon.ts +++ b/browser/resources/settings/brave_overrides/iron_icon.ts @@ -3,14 +3,20 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. +// Unfortunately, Chromium is midway through migrating from iron-icon to cr-icon +// which means we need to support both. The overrides here and in cr-icon are +// extremely similar, but subtly different (the chromium ==> Nala icon mapping +// is shared). Hopefully in the not too distant future we'll be able to remove +// this, when the settings page is 100% cr-icon. + import { RegisterStyleOverride, RegisterPolymerPrototypeModification } from 'chrome://resources/brave/polymer_overriding.js' import {html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js' import 'chrome://resources/brave/leo.bundle.js' -const leoIcons = (window as any)['leoIcons'] as Set +export const leoIcons = (window as any)['leoIcons'] as Set // Maps Chromium icons to their equivalent Brave icons. -const iconMap: { [key: string]: string } = { +export const iconMap: { [key: string]: string } = { 'cr:security': 'lock', 'cr:search': 'search', 'settings:palette': 'appearance', diff --git a/browser/resources/settings/brave_routes.ts b/browser/resources/settings/brave_routes.ts index 071d6582e44d0..7396c0639e025 100644 --- a/browser/resources/settings/brave_routes.ts +++ b/browser/resources/settings/brave_routes.ts @@ -110,11 +110,21 @@ export default function addBraveRoutes(r: Partial) { if (r.PERFORMANCE) { delete r.PERFORMANCE } - // Safety check route is moved to advanced. - if (r.SAFETY_CHECK && r.ADVANCED) { - r.SAFETY_CHECK.parent = r.ADVANCED - } else if (!isGuest) { - console.error('[Brave Settings Overrides] Could not move safety check route to advanced route', r) + // Delete safety check + if (loadTimeData.getBoolean('enableSafetyHub')) { + if (r.SAFETY_HUB) { + delete r.SAFETY_HUB + } else if (!isGuest) { + console.error( + '[Brave Settings Overrides] Could not delete safety hub route', r) + } + } else { + if (r.SAFETY_CHECK && r.ADVANCED) { + delete r.SAFETY_CHECK + } else if (!isGuest) { + console.error( + '[Brave Settings Overrides] Could not delete safety check route', r) + } } // Delete storage access if (r.SITE_SETTINGS_STORAGE_ACCESS) { diff --git a/browser/resources/settings/sources.gni b/browser/resources/settings/sources.gni index 4a57619f1508a..0d0e9b2776b5c 100644 --- a/browser/resources/settings/sources.gni +++ b/browser/resources/settings/sources.gni @@ -80,6 +80,7 @@ brave_settings_non_web_component_files = [ "brave_overrides/clear_browsing_data_dialog.ts", "brave_overrides/config.ts", "brave_overrides/cookies_page.ts", + "brave_overrides/cr_icon.ts", "brave_overrides/default_browser_page.ts", "brave_overrides/icons.ts", "brave_overrides/import_data_dialog.ts", @@ -166,4 +167,7 @@ brave_settings_mojo_files = [ brave_settings_mojo_files_deps = [ "//brave/components/ai_chat/core/common/mojom:mojom_ts__generator" ] -brave_settings_ts_deps = [ "//ui/webui/resources/mojo:build_ts" ] +brave_settings_ts_deps = [ + "//third_party/lit/v3_0:build_ts", + "//ui/webui/resources/mojo:build_ts", +] diff --git a/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/BraveManageAccountDevicesLinkView.java b/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/BraveManageAccountDevicesLinkView.java index 66d20e65e12d8..2a1d35f460726 100644 --- a/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/BraveManageAccountDevicesLinkView.java +++ b/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/BraveManageAccountDevicesLinkView.java @@ -10,6 +10,7 @@ import android.view.View; import android.widget.LinearLayout; +import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.signin.base.AccountCapabilities; import org.chromium.components.signin.base.AccountInfo; import org.chromium.components.signin.base.CoreAccountId; @@ -21,7 +22,7 @@ public BraveManageAccountDevicesLinkView(Context context, AttributeSet attrs) { setVisibility(View.GONE); } - public static AccountInfo getSharingAccountInfo() { + public static AccountInfo getSharingAccountInfo(Profile profile) { return new AccountInfo( new CoreAccountId(""), "", diff --git a/browser/sources.gni b/browser/sources.gni index 290a9755c9788..34f03c82b2747 100644 --- a/browser/sources.gni +++ b/browser/sources.gni @@ -282,6 +282,7 @@ if (is_mac) { if (enable_sparkle) { brave_chrome_browser_sources += [ + "//brave/browser/mac/keystone_infobar_delegate.mm", "//brave/browser/mac/sparkle_glue.h", "//brave/browser/mac/sparkle_glue.mm", "//brave/browser/mac/su_updater.h", diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index 525a53f31a5de..1ac2137cfc7ff 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -171,6 +171,8 @@ source_set("ui") { "sidebar/sidebar_tab_helper.h", "sidebar/sidebar_utils.cc", "sidebar/sidebar_utils.h", + "startup/brave_startup_tab_provider_impl.cc", + "startup/brave_startup_tab_provider_impl.h", "tabs/brave_tab_color_mixer.cc", "tabs/brave_tab_color_mixer.h", "tabs/brave_tab_layout_constants.h", @@ -739,6 +741,8 @@ source_set("ui") { "//chrome/browser/profiles:profile", "//chrome/browser/ui/color:color_headers", "//chrome/browser/ui/color:mixers", + "//chrome/browser/ui/webui", + "//chrome/browser/ui/webui/top_chrome", "//chrome/common", "//components/bookmarks/common", "//components/content_settings/browser", diff --git a/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoMediator.java b/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoMediator.java index 2f1de01b9bfd6..82195963b37a4 100644 --- a/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoMediator.java +++ b/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoMediator.java @@ -22,7 +22,6 @@ public BraveLogoMediator( PropertyModel logoModel, boolean shouldFetchDoodle, Callback onLogoAvailableCallback, - boolean isParentSurfaceShown, LogoCoordinator.VisibilityObserver visibilityObserver, CachedTintedBitmap defaultGoogleLogo) { super( @@ -31,7 +30,6 @@ public BraveLogoMediator( logoModel, shouldFetchDoodle, onLogoAvailableCallback, - isParentSurfaceShown, visibilityObserver, defaultGoogleLogo); } diff --git a/browser/ui/android/omnibox/BUILD.gn b/browser/ui/android/omnibox/BUILD.gn index b667b3c3808a0..f99ee67f5ed1c 100644 --- a/browser/ui/android/omnibox/BUILD.gn +++ b/browser/ui/android/omnibox/BUILD.gn @@ -43,6 +43,7 @@ android_library("java") { "//chrome/browser/ui/android/omnibox:java_resources", "//components/favicon/android:java", "//components/omnibox/browser:browser_java", + "//components/omnibox/common:features_java", "//components/permissions/android:java", "//components/prefs/android:java", "//components/search_engines/android:java", diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java index cae33fb7adb18..a9cb216211858 100644 --- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java +++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java @@ -27,11 +27,19 @@ public class BraveAutocompleteCoordinator { public ViewProvider createViewProvider( - Context context, MVCListAdapter.ModelList modelList) { + Context context, MVCListAdapter.ModelList modelList, boolean forcePhoneStyleOmnibox) { ViewProvider provider = - (ViewProvider) BraveReflectionUtil.InvokeMethod( - AutocompleteCoordinator.class, this, "createViewProvider", Context.class, - context, MVCListAdapter.ModelList.class, modelList); + (ViewProvider) + BraveReflectionUtil.InvokeMethod( + AutocompleteCoordinator.class, + this, + "createViewProvider", + Context.class, + context, + MVCListAdapter.ModelList.class, + modelList, + boolean.class, + forcePhoneStyleOmnibox); return new ViewProvider() { private List> mCallbacks = new ArrayList<>(); diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java index a4502a95b841c..1ae3e9062d56c 100644 --- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java +++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java @@ -17,7 +17,6 @@ import org.chromium.base.BravePreferenceKeys; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.flags.ChromeFeatureList; -import org.chromium.chrome.browser.omnibox.OmniboxFeatures; import org.chromium.chrome.browser.omnibox.OmniboxPrefManager; import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; import org.chromium.chrome.browser.omnibox.styles.OmniboxImageSupplier; @@ -30,6 +29,7 @@ import org.chromium.chrome.browser.tab.Tab; import org.chromium.components.omnibox.AutocompleteResult; import org.chromium.components.omnibox.GroupsProto.GroupConfig; +import org.chromium.components.omnibox.OmniboxFeatures; import org.chromium.components.omnibox.suggestions.OmniboxSuggestionUiType; import org.chromium.ui.modelutil.PropertyModel; diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index d599386c4ca1f..20522e91dcbe7 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -207,9 +207,6 @@ CHAR_LIMIT guidelines: Site not working? Third-party cookies are blocked - - Site not working? Try temporarily allowing third-party cookies - @@ -220,8 +217,8 @@ CHAR_LIMIT guidelines: - - Control your data & accounts + + Control your data & account @@ -589,6 +586,14 @@ CHAR_LIMIT guidelines: Autofill Options + + + Restart now + + + + Undo setting change + Delete saved security codes? @@ -636,7 +641,7 @@ CHAR_LIMIT guidelines: Passwords - Password Manager + Brave Password Manager Password saving is turned on by your administrator @@ -1203,14 +1208,14 @@ For example, some websites may respond to this request by showing you ads that a Please verify that this is a valid provider or try again later - - Clear browsing data + + Delete browsing data - - Clear history, cookies, site data, cache… + + Delete history, cookies, site data, cache… - Cleared Brave data + Deleted Brave data The selected data has been removed from Brave and your synced devices. @@ -1233,10 +1238,10 @@ Your Brave account may have other forms of browsing history like searches and ac Signs you out of most sites. You won't be signed out of your Brave sync chain. - Clears history, including in the search box + Deletes history, including in the search box - Clears history from all synced devices + Deletes history from all synced devices <link1>Search history</link1> and <link2>other forms of activity</link2> may be saved in your Brave sync chain when you’re signed in. You can delete them anytime. @@ -1247,8 +1252,8 @@ Your Brave account may have other forms of browsing history like searches and ac To sign out of your Brave sync chain on all websites, <link1>sign out of Brave</link1>. - - Clearing your browsing data doesn't sign you out of your Brave sync chain. To do so, <link1>sign out of Brave</link1>. + + Deleting your browsing data doesn't sign you out of your Brave sync chain. To do so, <link1>sign out of Brave</link1>. Your search engine is %1$sBing. See their instructions for deleting your search history, if applicable. @@ -1263,13 +1268,16 @@ Your Brave account may have other forms of browsing history like searches and ac Autofill form data - Tabs on this device + Tabs - - Clearing browsing data + + Can’t be closed across multiple windows - - Clear data + + Deleting browsing data + + + Delete data Please wait… @@ -1308,10 +1316,10 @@ Your Brave account may have other forms of browsing history like searches and ac These sites and apps seem important to you: - Clear + Delete - - Clear browsing data… + + Delete browsing data… Open full Brave history @@ -1320,14 +1328,20 @@ Your Brave account may have other forms of browsing history like searches and ac Basic - Some of your web history might not show up here. To see a full web history, tap Open full Brave history. + Some of your history might not show up here. To see all your Brave history, open full Brave history. - Some of your web history might not show up here. If needed, tap Open full Brave history. Also, Your Brave sync chain may have other forms of browsing history at <link>myactivity.google.com</link>. + Some of your history might not show up here. To see all your Brave history, open full Brave history. Also, your Brave sync chain may have other forms of browsing history at <link>myactivity.google.com</link>. Your Brave sync chain may have other forms of browsing history at <link>myactivity.google.com</link>. + + You may see the history from other apps that open links in Brave. + + + You may see the history from other apps that open links in Brave. Your Brave sync chain may have other forms of browsing history at <link>myactivity.google.com</link>. + Blocked site @@ -1715,6 +1729,23 @@ Your Brave account may have other forms of browsing history like searches and ac Learn more about <link>how Brave keeps your data private</link> + + + Filter by app + + + Search by app, date, and more. + + + App filter sheet + + + App filter sheet is opened. + + + App filter sheet is closed. + + Standard protection: @@ -2128,7 +2159,7 @@ Your Brave account may have other forms of browsing history like searches and ac Turn off sync? - Clear your Brave data from this device? + Delete your Brave data from this device? Some Brave features won\u2019t be available anymore @@ -2140,7 +2171,7 @@ Your Brave account may have other forms of browsing history like searches and ac Your bookmarks, history, and other Brave data will no longer be synced to your Brave sync chain - Also clear your Brave data from this device + Also delete your Brave data from this device Because you're signing out of an account managed by %1$sgoogle.com, your Brave data will be deleted from this device. It will remain in your Brave sync chain. @@ -2149,6 +2180,18 @@ Your Brave account may have other forms of browsing history like searches and ac Signed out. Sign back in to use the bookmarks, passwords and more in your account. + + + Unsaved data + + + + Some of your Brave data hasn\u2019t been saved in your Brave sync chain yet.\nTry waiting a few minutes before signing out. If you sign out now, this data will be deleted. + + + + Delete and sign out + Contacting Brave. This may take a minute… @@ -2231,8 +2274,8 @@ Your Brave account may have other forms of browsing history like searches and ac Apps - - When on, data is saved in your Brave sync chain. When off, data is saved only to this device. + + When on, use and save data in your Brave sync chain. When off, data is saved only to this device. Payment methods, offers, and addresses using Google Pay @@ -2251,6 +2294,10 @@ Your Brave account may have other forms of browsing history like searches and ac Review your account data + + + Manage accounts on this device + Encryption @@ -2268,7 +2315,7 @@ Your Brave account may have other forms of browsing history like searches and ac Payment methods and addresses from Google Pay won’t be encrypted. Browsing history from Brave won’t sync. -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, BEGIN_LINKclear the Brave data in your accountEND_LINK. +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, BEGIN_LINKdelete the Brave data in your accountEND_LINK. Passphrase @@ -2286,7 +2333,7 @@ Only someone with your passphrase can read your encrypted data. The passphrase i This field cannot be blank - If you forgot your passphrase or want to change this setting, BEGIN_LINKclear the Brave data in your accountEND_LINK. + If you forgot your passphrase or want to change this setting, BEGIN_LINKdelete the Brave data in your accountEND_LINK. Passphrases do not match @@ -2294,7 +2341,7 @@ Only someone with your passphrase can read your encrypted data. The passphrase i Passphrase encryption doesn’t include payment methods and addresses from Google Pay. -To change this setting, BEGIN_LINKclear the Brave data in your accountEND_LINK. +To change this setting, BEGIN_LINKdelete the Brave data in your accountEND_LINK. Incorrect passphrase @@ -2399,7 +2446,7 @@ To change this setting, BEGIN_LINKclear the Brave dat The service is not available; try again later. - Clearing account data + Deleting account data Please wait… @@ -3070,8 +3117,8 @@ To change this setting, BEGIN_LINKclear the Brave dat You’ll find your history here - - You can see the pages you’ve visited or clear them from your history + + You can see the pages you’ve visited or delete them from your history Can’t find that page. Check your spelling or try a search on %1$sBrave. @@ -3079,14 +3126,31 @@ To change this setting, BEGIN_LINKclear the Brave dat Can’t find that page. Check your spelling or try a web search. + + + Nothing to show yet + + + The pages you've opened in Brave while using %1$sYouTube will show up here. + + + + No search results found + + + Try searching for something else or open full Brave history to see more results. + Search your history + + From %1$sYouTube + Sites you visit aren’t saved in Private - - To clear Private browsing history from your device, close all Private tabs. + + To delete Private browsing history from your device, close all Private tabs. @@ -3096,6 +3160,12 @@ To change this setting, BEGIN_LINKclear the Brave dat Close all Private tabs + + Open in new Brave tab + + + Open in Private Brave tab + @@ -3234,7 +3304,7 @@ To change this setting, BEGIN_LINKclear the Brave dat Opening Brave without a profile lock will remove your saved passwords and payment methods from the car. Using a profile lock keeps this data secure. - Also clear bookmarks, history, and more from this car + Also delete bookmarks, history, and more from this car Delete & continue @@ -3394,6 +3464,12 @@ To change this setting, BEGIN_LINKclear the Brave dat Turn on + + Sign in + + + Get your bookmarks, passwords and more on all your devices + Brave does not have access to the requested resource. @@ -3667,7 +3743,7 @@ To change this setting, BEGIN_LINKclear the Brave dat Collapse to side view - View your web history here + View your Brave history here Minimize tab @@ -3788,14 +3864,14 @@ To change this setting, BEGIN_LINKclear the Brave dat Recent tabs - - Web history + + Brave history History - Clear browsing data + Delete browsing data Downloads @@ -3915,9 +3991,6 @@ To change this setting, BEGIN_LINKclear the Brave dat Show in folder - - New folder… - Choose folder @@ -3942,9 +4015,6 @@ To change this setting, BEGIN_LINKclear the Brave dat Edit bookmark - - Add folder - Edit folder @@ -4007,9 +4077,6 @@ To change this setting, BEGIN_LINKclear the Brave dat Tracked products - - You’ll find your tracked products here - Stopped tracking price @@ -4479,6 +4546,12 @@ To change this setting, BEGIN_LINKclear the Brave dat %1$s3 tabs closed + + %1$s3 tabs deleted + + + %1$s1 tab deleted + Do you want to delete %1$sexample.pdf? @@ -4584,9 +4657,6 @@ To change this setting, BEGIN_LINKclear the Brave dat Page insights Loading Indicator - Your activity in Page Insights is saved in your <link>Brave sync chain</link>. - - Your activity in Page Insights is saved in your Brave sync chain. <link>Learn how to manage this</link> @@ -4596,6 +4666,20 @@ To change this setting, BEGIN_LINKclear the Brave dat Close button to close privacy notice of page insights hub. + + + Sign in to save this page + + + Disabled save button + + + Share button + + + Page insights button + + Following... @@ -4737,8 +4821,8 @@ To change this setting, BEGIN_LINKclear the Brave dat %1$sYouTube also has data in Brave - - You can clear the data in Brave Settings + + You can delete the data in Brave Settings Keep Data @@ -5833,11 +5917,14 @@ To change this setting, BEGIN_LINKclear the Brave dat - Clear browsing data + Delete browsing data {NUM_TABS, plural, =1 {1 tab on this device} other {# tabs on this device}} + + Tabs on this device + No tabs on this device @@ -5867,8 +5954,8 @@ To change this setting, BEGIN_LINKclear the Brave dat More options - - More options to clear browsing data + + More options to delete browsing data Calculating... @@ -5961,7 +6048,7 @@ To change this setting, BEGIN_LINKclear the Brave dat Use another device - + Lorem Ipsum @@ -6101,6 +6188,11 @@ To change this setting, BEGIN_LINKclear the Brave dat Do Not Share + + + + Loading PDF… + diff --git a/browser/ui/android/strings/android_chrome_strings_override.grd b/browser/ui/android/strings/android_chrome_strings_override.grd index dfcfb8af7e28c..322d85d69bf93 100644 --- a/browser/ui/android/strings/android_chrome_strings_override.grd +++ b/browser/ui/android/strings/android_chrome_strings_override.grd @@ -153,8 +153,8 @@ CHAR_LIMIT guidelines: Sites you visit aren’t saved in Private - - To clear Private browsing history from your device, close all Private tabs. + + To delete Private browsing history from your device, close all Private tabs. @@ -163,6 +163,9 @@ CHAR_LIMIT guidelines: Close all Private tabs + + Open in Private Brave tab + Unlock Private diff --git a/browser/ui/brave_layout_constants.cc b/browser/ui/brave_layout_constants.cc index 748cbce2cb364..272ef00fff9a5 100644 --- a/browser/ui/brave_layout_constants.cc +++ b/browser/ui/brave_layout_constants.cc @@ -5,8 +5,6 @@ #include "brave/browser/ui/brave_layout_constants.h" -#include - #include "brave/browser/ui/tabs/brave_tab_layout_constants.h" #include "brave/browser/ui/tabs/features.h" #include "chrome/browser/ui/layout_constants.h" @@ -14,6 +12,19 @@ using tabs::features::HorizontalTabsUpdateEnabled; +std::optional GetBraveLayoutInsets(LayoutInset inset) { + switch (inset) { + case LOCATION_BAR_PAGE_INFO_ICON_PADDING: + return gfx::Insets::VH(6, 6); + + case LOCATION_BAR_PAGE_ACTION_ICON_PADDING: + return gfx::Insets::VH(4, 4); + default: + break; + } + return std::nullopt; +} + // Returns a |nullopt| if the UI color is not handled by Brave. std::optional GetBraveLayoutConstant(LayoutConstant constant) { const bool touch = ui::TouchUiController::Get()->touch_ui(); @@ -50,12 +61,18 @@ std::optional GetBraveLayoutConstant(LayoutConstant constant) { case TAB_SEPARATOR_HEIGHT: { return 24; } + case TOOLBAR_CORNER_RADIUS: { + return 0; + } case LOCATION_BAR_HEIGHT: // Consider adjust below element padding also when this height is changed. return 32; case LOCATION_BAR_TRAILING_ICON_SIZE: return 18; + case LOCATION_BAR_ICON_SIZE: + return 16; case LOCATION_BAR_ELEMENT_PADDING: + case LOCATION_BAR_PAGE_INFO_ICON_VERTICAL_PADDING: return 2; default: break; diff --git a/browser/ui/brave_layout_constants.h b/browser/ui/brave_layout_constants.h index 6044127844e1e..4f1a72e3e4167 100644 --- a/browser/ui/brave_layout_constants.h +++ b/browser/ui/brave_layout_constants.h @@ -10,6 +10,7 @@ #include "chrome/browser/ui/layout_constants.h" +std::optional GetBraveLayoutInsets(LayoutInset inset); std::optional GetBraveLayoutConstant(LayoutConstant constant); #endif // BRAVE_BROWSER_UI_BRAVE_LAYOUT_CONSTANTS_H_ diff --git a/browser/ui/color/brave_color_mixer.cc b/browser/ui/color/brave_color_mixer.cc index c6961f3019e7d..7cce9430bfd5a 100644 --- a/browser/ui/color/brave_color_mixer.cc +++ b/browser/ui/color/brave_color_mixer.cc @@ -16,6 +16,7 @@ #include "brave/components/playlist/common/buildflags/buildflags.h" #include "brave/components/speedreader/common/buildflags/buildflags.h" #include "chrome/browser/ui/color/chrome_color_id.h" +#include "chrome/browser/ui/color/material_chrome_color_mixer.h" #include "chrome/browser/ui/color/material_side_panel_color_mixer.h" #include "ui/base/ui_base_features.h" #include "ui/color/color_id.h" @@ -310,6 +311,17 @@ void AddChromeColorMixerForAllThemes(ui::ColorProvider* provider, base::BindRepeating(get_toolbar_ink_drop_color, 0.25f, 0.05f)}; mixer[kColorToolbarInkDropRipple] = { base::BindRepeating(get_toolbar_ink_drop_color, 0.4f, 0.1f)}; + + if (key.custom_theme) { + return; + } + + mixer[kColorLocationBarBackground] = {kColorToolbarBackgroundSubtleEmphasis}; + mixer[kColorLocationBarBackgroundHovered] = {kColorLocationBarBackground}; + + // We don't show border when omnibox doesn't have focus but still + // contains in-progress user input. + mixer[kColorLocationBarBorderOnMismatch] = {SK_ColorTRANSPARENT}; } void AddBraveColorMixerForAllThemes(ui::ColorProvider* provider, @@ -371,16 +383,20 @@ void AddBravifiedChromeThemeColorMixer(ui::ColorProvider* provider, const ui::ColorProviderKey& key) { AddChromeColorMixerForAllThemes(provider, key); - if (key.custom_theme) { - return; - } - // This is behind features::IsChromeRefresh2023 upstream, but without it the // colors are not set correctly. + // These mixers should be called always as upstream does. Otherwise, + // some colors are missed for private windows because we use custom theme + // for private/tor window. if (!features::IsChromeRefresh2023()) { + AddMaterialChromeColorMixer(provider, key); AddMaterialSidePanelColorMixer(provider, key); } + if (key.custom_theme) { + return; + } + key.color_mode == ui::ColorProviderKey::ColorMode::kDark ? AddChromeDarkThemeColorMixer(provider, key) : AddChromeLightThemeColorMixer(provider, key); @@ -789,6 +805,7 @@ void AddBraveOmniboxLightThemeColorMixer(ui::ColorProvider* provider, mixer[kColorOmniboxResultsUrl] = { leo::GetColor(leo::Color::kColorTextInteractive, leo::Theme::kLight)}; mixer[kColorOmniboxResultsUrlSelected] = {kColorOmniboxResultsUrl}; + mixer[kColorPageInfoBackground] = {kColorLocationBarBackground}; } void AddBraveOmniboxDarkThemeColorMixer(ui::ColorProvider* provider, @@ -833,6 +850,7 @@ void AddBraveOmniboxDarkThemeColorMixer(ui::ColorProvider* provider, mixer[kColorOmniboxResultsUrl] = { leo::GetColor(leo::Color::kColorTextInteractive, leo::Theme::kDark)}; mixer[kColorOmniboxResultsUrlSelected] = {kColorOmniboxResultsUrl}; + mixer[kColorPageInfoBackground] = {kColorLocationBarBackground}; } void AddBraveOmniboxPrivateThemeColorMixer(ui::ColorProvider* provider, @@ -853,6 +871,7 @@ void AddBraveOmniboxPrivateThemeColorMixer(ui::ColorProvider* provider, mixer[kColorOmniboxResultsBackgroundSelected] = { GetOmniboxResultBackground(kColorOmniboxResultsBackgroundSelected, /*dark*/ false, /*incognito*/ true)}; + mixer[kColorPageInfoBackground] = {kColorLocationBarBackground}; } void AddBravifiedTabStripColorMixer(ui::ColorProvider* provider, diff --git a/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.cc b/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.cc index caa6690fc351c..1966e6606000b 100644 --- a/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.cc +++ b/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.cc @@ -25,8 +25,8 @@ using content_settings::SettingInfo; using content_settings::SettingSource; -using content_settings::SETTING_SOURCE_USER; -using content_settings::SETTING_SOURCE_NONE; +using SettingSource::kNone; +using SettingSource::kUser; BraveAutoplayContentSettingBubbleModel::BraveAutoplayContentSettingBubbleModel( Delegate* delegate, @@ -84,7 +84,7 @@ void BraveAutoplayContentSettingBubbleModel::SetRadioGroup() { radio_group.radio_items.push_back(radio_block_label); ContentSetting setting; - SettingSource setting_source = SETTING_SOURCE_NONE; + SettingSource setting_source = SettingSource::kNone; SettingInfo info; HostContentSettingsMap* map = @@ -103,7 +103,7 @@ void BraveAutoplayContentSettingBubbleModel::SetRadioGroup() { // Prevent creation of content settings for illegal urls like about:blank bool is_valid = map->CanSetNarrowestContentSetting(url, url, content_type()); - set_is_user_modifiable(is_valid && setting_source == SETTING_SOURCE_USER); + set_is_user_modifiable(is_valid && setting_source == SettingSource::kUser); set_radio_group(radio_group); } diff --git a/browser/ui/startup/brave_startup_tab_provider_impl.cc b/browser/ui/startup/brave_startup_tab_provider_impl.cc new file mode 100644 index 0000000000000..5401f7349f8e6 --- /dev/null +++ b/browser/ui/startup/brave_startup_tab_provider_impl.cc @@ -0,0 +1,20 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#include "brave/browser/ui/startup/brave_startup_tab_provider_impl.h" + +#include "chrome/browser/first_run/first_run.h" +#include "chrome/browser/ui/startup/startup_tab.h" +#include "chrome/common/webui_url_constants.h" + +StartupTabs BraveStartupTabProviderImpl::GetDistributionFirstRunTabs( + StartupBrowserCreator* browser_creator) const { + StartupTabs tabs = + StartupTabProviderImpl::GetDistributionFirstRunTabs(browser_creator); + if (first_run::IsChromeFirstRun()) { + tabs.emplace_back(GURL(chrome::kChromeUIWelcomeURL)); + } + return tabs; +} diff --git a/browser/ui/startup/brave_startup_tab_provider_impl.h b/browser/ui/startup/brave_startup_tab_provider_impl.h new file mode 100644 index 0000000000000..9b911745ba864 --- /dev/null +++ b/browser/ui/startup/brave_startup_tab_provider_impl.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_BROWSER_UI_STARTUP_BRAVE_STARTUP_TAB_PROVIDER_IMPL_H_ +#define BRAVE_BROWSER_UI_STARTUP_BRAVE_STARTUP_TAB_PROVIDER_IMPL_H_ + +#include "chrome/browser/ui/startup/startup_tab_provider.h" + +class StartupBrowserCreator; + +class BraveStartupTabProviderImpl : public StartupTabProviderImpl { + public: + BraveStartupTabProviderImpl() = default; + BraveStartupTabProviderImpl(const BraveStartupTabProviderImpl&) = delete; + BraveStartupTabProviderImpl& operator=(const BraveStartupTabProviderImpl&) = + delete; + + // StartupTabProvider: + StartupTabs GetDistributionFirstRunTabs( + StartupBrowserCreator* browser_creator) const override; +}; + +#endif // BRAVE_BROWSER_UI_STARTUP_BRAVE_STARTUP_TAB_PROVIDER_IMPL_H_ diff --git a/browser/ui/tabs/brave_tab_menu_model.cc b/browser/ui/tabs/brave_tab_menu_model.cc index de4185c58dc74..d21baee24fdba 100644 --- a/browser/ui/tabs/brave_tab_menu_model.cc +++ b/browser/ui/tabs/brave_tab_menu_model.cc @@ -67,7 +67,7 @@ int BraveTabMenuModel::GetRestoreTabCommandStringId() const { } if (restore_service_->entries().front()->type == - sessions::TabRestoreService::WINDOW) { + sessions::tab_restore::WINDOW) { id = IDS_RESTORE_WINDOW; } diff --git a/browser/ui/tabs/shared_pinned_tab_service.cc b/browser/ui/tabs/shared_pinned_tab_service.cc index dc156ae73af13..54eaa831f71cd 100644 --- a/browser/ui/tabs/shared_pinned_tab_service.cc +++ b/browser/ui/tabs/shared_pinned_tab_service.cc @@ -546,11 +546,11 @@ void SharedPinnedTabService::OnTabUnpinned( DCHECK_NE(iter->contents_owner_model, tab_strip_model); auto unique_shared_contents = - iter->contents_owner_model->ReplaceWebContentsAt( + iter->contents_owner_model->DiscardWebContentsAt( previous_index, CreateDummyWebContents(shared_contents)); SharedContentsData::RemoveFromWebContents(unique_shared_contents.get()); - tab_strip_model->ReplaceWebContentsAt(index, + tab_strip_model->DiscardWebContentsAt(index, std::move(unique_shared_contents)); } else { SharedContentsData::RemoveFromWebContents(contents.get()); @@ -697,9 +697,9 @@ void SharedPinnedTabService::MoveSharedWebContentsToBrowser( auto& pinned_tab_data = pinned_tab_data_.at(index); if (pinned_tab_data.contents_owner_model) { - std::unique_ptr unique_shared_contents; - unique_shared_contents = - pinned_tab_data.contents_owner_model->ReplaceWebContentsAt( + // Detach shared pinned tab from the current owner model. + std::unique_ptr unique_shared_contents = + pinned_tab_data.contents_owner_model->DiscardWebContentsAt( index, CreateDummyWebContents(pinned_tab_data.shared_contents)); DCHECK_EQ(pinned_tab_data.shared_contents, unique_shared_contents.get()); pinned_tab_data.contents_owner_model = tab_strip_model; @@ -711,7 +711,7 @@ void SharedPinnedTabService::MoveSharedWebContentsToBrowser( DCHECK(dummy_contents_data); dummy_contents_data->stop_propagation(); - pinned_tab_data.contents_owner_model->ReplaceWebContentsAt( + pinned_tab_data.contents_owner_model->DiscardWebContentsAt( index, std::move(unique_shared_contents)); } else { // Restore a shared pinned tab from a closed browser. diff --git a/browser/ui/tabs/test/split_view_browser_data_unittest.cc b/browser/ui/tabs/test/split_view_browser_data_unittest.cc index 0bcbba5b5c66d..ee63b2c2d46e8 100644 --- a/browser/ui/tabs/test/split_view_browser_data_unittest.cc +++ b/browser/ui/tabs/test/split_view_browser_data_unittest.cc @@ -16,6 +16,7 @@ #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gtest/include/gtest/gtest.h" class SplitViewBrowserDataUnitTest : public ::testing::Test { @@ -27,7 +28,10 @@ class SplitViewBrowserDataUnitTest : public ::testing::Test { SplitViewBrowserData& data() { return *data_; } tabs::TabModel CreateTabModel() { - return tabs::TabModel(nullptr, tab_strip_model_.get()); + auto web_contents = + content::WebContentsTester::CreateTestWebContents(&profile_, nullptr); + CHECK(web_contents); + return tabs::TabModel(std::move(web_contents), tab_strip_model_.get()); } // ::testing::Test: diff --git a/browser/ui/toolbar/brave_app_menu_model.cc b/browser/ui/toolbar/brave_app_menu_model.cc index 29a752bf06daa..498462f29ef60 100644 --- a/browser/ui/toolbar/brave_app_menu_model.cc +++ b/browser/ui/toolbar/brave_app_menu_model.cc @@ -424,21 +424,19 @@ void BraveAppMenuModel::RemoveUpstreamMenus() { // Remove upstream's cast item. It'll be added into more tools sub menu. if (media_router::MediaRouterEnabled(browser()->profile())) { SimpleMenuModel* parent_model_for_cast = this; - if (features::IsChromeRefresh2023()) { - DCHECK(GetIndexOfCommandId(IDC_SAVE_AND_SHARE_MENU).has_value()); - parent_model_for_cast = static_cast(GetSubmenuModelAt( - GetIndexOfCommandId(IDC_SAVE_AND_SHARE_MENU).value())); - } + DCHECK(GetIndexOfCommandId(IDC_SAVE_AND_SHARE_MENU).has_value()); + parent_model_for_cast = static_cast(GetSubmenuModelAt( + GetIndexOfCommandId(IDC_SAVE_AND_SHARE_MENU).value())); DCHECK(parent_model_for_cast->GetIndexOfCommandId(IDC_ROUTE_MEDIA) .has_value()); parent_model_for_cast->RemoveItemAt( - GetIndexOfCommandId(IDC_ROUTE_MEDIA).value()); + parent_model_for_cast->GetIndexOfCommandId(IDC_ROUTE_MEDIA).value()); } - // Remove upstream's clear browsing data. It'll be added into history sub - // menu at RecentTabsSubMenuModel::Build(). - if (features::IsChromeRefresh2023()) { + { + // Remove upstream's clear browsing data. It'll be added into history sub + // menu at RecentTabsSubMenuModel::Build(). auto index = GetIndexOfCommandId(IDC_CLEAR_BROWSING_DATA); CHECK(index); RemoveItemAt(*index); @@ -448,10 +446,12 @@ void BraveAppMenuModel::RemoveUpstreamMenus() { index = GetIndexOfCommandId(IDC_PROFILE_MENU_IN_APP_MENU); CHECK(index); RemoveItemAt(*index); - } else { - const auto index = - more_tools_model->GetIndexOfCommandId(IDC_CLEAR_BROWSING_DATA); - more_tools_model->RemoveItemAt(*index); + + // Upstream uses spacing separator after profile menu but we don't use + // profile menu here. Spacing separator just adds unnecessary space. + if (GetSeparatorTypeAt(*index) == ui::SPACING_SEPARATOR) { + RemoveItemAt(*index); + } } // Remove upstream's dev tools menu and associated separator. diff --git a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc index 8d53ff853ae07..d50212a1f0985 100644 --- a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc +++ b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc @@ -207,27 +207,27 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuModelBrowserTest, CommandsExecutionTest) { // Instead, BraveBrowserCommandControllerTest will do that. IN_PROC_BROWSER_TEST_F(BraveAppMenuModelBrowserTest, MenuOrderTest) { std::vector commands_in_order_for_normal_profile = { - IDC_NEW_TAB, - IDC_NEW_WINDOW, - IDC_NEW_INCOGNITO_WINDOW, + IDC_NEW_TAB, + IDC_NEW_WINDOW, + IDC_NEW_INCOGNITO_WINDOW, #if BUILDFLAG(ENABLE_TOR) - IDC_NEW_OFFTHERECORD_WINDOW_TOR, + IDC_NEW_OFFTHERECORD_WINDOW_TOR, #endif - IDC_SHOW_BRAVE_WALLET, + IDC_SHOW_BRAVE_WALLET, #if BUILDFLAG(ENABLE_BRAVE_VPN) - IDC_SHOW_BRAVE_VPN_PANEL, + IDC_SHOW_BRAVE_VPN_PANEL, #endif - IDC_RECENT_TABS_MENU, - IDC_BOOKMARKS_MENU, - IDC_SHOW_DOWNLOADS, - IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS, - IDC_ZOOM_MENU, - IDC_PRINT, - IDC_FIND, - IDC_MORE_TOOLS_MENU, - IDC_EDIT_MENU, - IDC_HELP_MENU, - IDC_OPTIONS, + IDC_RECENT_TABS_MENU, + IDC_BOOKMARKS_MENU, + IDC_SHOW_DOWNLOADS, + IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS, + IDC_ZOOM_MENU, + IDC_PRINT, + IDC_FIND_AND_EDIT_MENU, + IDC_SAVE_AND_SHARE_MENU, + IDC_MORE_TOOLS_MENU, + IDC_HELP_MENU, + IDC_OPTIONS, }; std::vector commands_disabled_for_normal_profile = { @@ -265,23 +265,23 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuModelBrowserTest, MenuOrderTest) { auto* private_browser = CreateIncognitoBrowser(); std::vector commands_in_order_for_private_profile = { - IDC_NEW_TAB, - IDC_NEW_WINDOW, - IDC_NEW_INCOGNITO_WINDOW, + IDC_NEW_TAB, + IDC_NEW_WINDOW, + IDC_NEW_INCOGNITO_WINDOW, #if BUILDFLAG(ENABLE_TOR) - IDC_NEW_OFFTHERECORD_WINDOW_TOR, + IDC_NEW_OFFTHERECORD_WINDOW_TOR, #endif - IDC_SHOW_BRAVE_WALLET, - IDC_BOOKMARKS_MENU, - IDC_SHOW_DOWNLOADS, - IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS, - IDC_ZOOM_MENU, - IDC_PRINT, - IDC_FIND, - IDC_MORE_TOOLS_MENU, - IDC_EDIT_MENU, - IDC_HELP_MENU, - IDC_OPTIONS, + IDC_SHOW_BRAVE_WALLET, + IDC_BOOKMARKS_MENU, + IDC_SHOW_DOWNLOADS, + IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS, + IDC_ZOOM_MENU, + IDC_PRINT, + IDC_FIND_AND_EDIT_MENU, + IDC_SAVE_AND_SHARE_MENU, + IDC_MORE_TOOLS_MENU, + IDC_HELP_MENU, + IDC_OPTIONS, }; std::vector commands_disabled_for_private_profile = { @@ -309,9 +309,16 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuModelBrowserTest, MenuOrderTest) { DCHECK(guest_browser); EXPECT_TRUE(guest_browser->profile()->IsGuestSession()); std::vector commands_in_order_for_guest_profile = { - IDC_NEW_TAB, IDC_NEW_WINDOW, IDC_SHOW_DOWNLOADS, IDC_ZOOM_MENU, - IDC_PRINT, IDC_FIND, IDC_MORE_TOOLS_MENU, IDC_EDIT_MENU, - IDC_HELP_MENU, IDC_OPTIONS, + IDC_NEW_TAB, + IDC_NEW_WINDOW, + IDC_SHOW_DOWNLOADS, + IDC_ZOOM_MENU, + IDC_PRINT, + IDC_FIND_AND_EDIT_MENU, + IDC_SAVE_AND_SHARE_MENU, + IDC_MORE_TOOLS_MENU, + IDC_HELP_MENU, + IDC_OPTIONS, }; CheckCommandsAreInOrderInMenuModel(guest_browser, @@ -369,9 +376,9 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuModelBrowserTest, MenuOrderTest) { IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS, IDC_ZOOM_MENU, IDC_PRINT, - IDC_FIND, + IDC_FIND_AND_EDIT_MENU, + IDC_SAVE_AND_SHARE_MENU, IDC_MORE_TOOLS_MENU, - IDC_EDIT_MENU, IDC_HELP_MENU, IDC_OPTIONS, }; diff --git a/browser/ui/views/bookmarks/bookmark_bar_browsertest.cc b/browser/ui/views/bookmarks/bookmark_bar_browsertest.cc index 04383a241e5a5..4005a88aa740a 100644 --- a/browser/ui/views/bookmarks/bookmark_bar_browsertest.cc +++ b/browser/ui/views/bookmarks/bookmark_bar_browsertest.cc @@ -129,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBarTest, AllBookmarksButtonVisibility) { EXPECT_TRUE(is_all_bookmarks_button_visible()); // When all node is removed, all bookmarks button should be hidden - bookmarks::RemoveAllBookmarks(model, node->url()); + bookmarks::RemoveAllBookmarks(model, node->url(), FROM_HERE); EXPECT_FALSE(is_all_bookmarks_button_visible()); // Turning on the visibility pref doesn't show "All bookmarks button" when diff --git a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc index c89a2ce7e3034..0ad289527a79e 100644 --- a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc +++ b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc @@ -69,7 +69,8 @@ BookmarkBarInstructionsView::BookmarkBarInstructionsView(Browser* browser) } } -gfx::Size BookmarkBarInstructionsView::CalculatePreferredSize() const { +gfx::Size BookmarkBarInstructionsView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { int height = 0, width = 0; for (views::View* view : children()) { gfx::Size pref = view->GetPreferredSize(); diff --git a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h index 331b8733bf307..7e996385b53f6 100644 --- a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h +++ b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h @@ -35,7 +35,8 @@ class BookmarkBarInstructionsView : public views::View, private: // views::View: - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void Layout(PassKey) override; void OnThemeChanged() override; void GetAccessibleNodeData(ui::AXNodeData* node_data) override; diff --git a/browser/ui/views/bookmarks/saved_tab_groups/brave_saved_tab_group_button.cc b/browser/ui/views/bookmarks/saved_tab_groups/brave_saved_tab_group_button.cc index e084e003380f5..097abd501f52b 100644 --- a/browser/ui/views/bookmarks/saved_tab_groups/brave_saved_tab_group_button.cc +++ b/browser/ui/views/bookmarks/saved_tab_groups/brave_saved_tab_group_button.cc @@ -81,7 +81,7 @@ void BraveSavedTabGroupButton::UpdateButtonLayout() { if (GetText().empty()) { SetPreferredSize(gfx::Size(kButtonSize, kButtonSize)); } else { - SetPreferredSize(CalculatePreferredSize()); + SetPreferredSize(CalculatePreferredSize({})); } } diff --git a/browser/ui/views/brave_actions/brave_rewards_action_view.cc b/browser/ui/views/brave_actions/brave_rewards_action_view.cc index 54e66141c7160..d1d7d658e3f14 100644 --- a/browser/ui/views/brave_actions/brave_rewards_action_view.cc +++ b/browser/ui/views/brave_actions/brave_rewards_action_view.cc @@ -293,6 +293,11 @@ void BraveRewardsActionView::OnThemeChanged() { // Apply same ink drop effect with location bar's other icon views. auto* ink_drop = views::InkDrop::Get(this); + + // It's based on Toolbar so need to clear toolbar's inkdrop config. + ink_drop->SetCreateRippleCallback(base::NullCallback()); + ink_drop->SetCreateHighlightCallback(base::NullCallback()); + ink_drop->SetMode(views::InkDropHost::InkDropMode::ON); ink_drop->SetVisibleOpacity(kOmniboxOpacitySelected); ink_drop->SetHighlightOpacity(kOmniboxOpacityHovered); diff --git a/browser/ui/views/brave_ads/notification_ad_popup.cc b/browser/ui/views/brave_ads/notification_ad_popup.cc index f7e689dd4ba5b..bfb67134648c2 100644 --- a/browser/ui/views/brave_ads/notification_ad_popup.cc +++ b/browser/ui/views/brave_ads/notification_ad_popup.cc @@ -136,8 +136,7 @@ void NotificationAdPopup::OnDisplayAdded(const display::Display& new_display) { RecomputeAlignment(); } -void NotificationAdPopup::OnDisplayRemoved( - const display::Display& old_display) { +void NotificationAdPopup::OnDisplaysRemoved(const display::Displays& displays) { // Called when `old_display` has been removed RecomputeAlignment(); } diff --git a/browser/ui/views/brave_ads/notification_ad_popup.h b/browser/ui/views/brave_ads/notification_ad_popup.h index 6675e0836f921..38c245ea10111 100644 --- a/browser/ui/views/brave_ads/notification_ad_popup.h +++ b/browser/ui/views/brave_ads/notification_ad_popup.h @@ -70,7 +70,7 @@ class NotificationAdPopup : public views::WidgetDelegateView, // display::DisplayObserver: void OnDisplayAdded(const display::Display& new_display) override; - void OnDisplayRemoved(const display::Display& old_display) override; + void OnDisplaysRemoved(const display::Displays& displays) override; void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/browser/ui/views/brave_news/brave_news_bubble_view.cc b/browser/ui/views/brave_news/brave_news_bubble_view.cc index 58e47065af83b..643ca0e58e20c 100644 --- a/browser/ui/views/brave_news/brave_news_bubble_view.cc +++ b/browser/ui/views/brave_news/brave_news_bubble_view.cc @@ -119,7 +119,9 @@ BraveNewsBubbleView::BraveNewsBubbleView(views::View* action_view, base::BindRepeating(&BraveNewsBubbleView::OpenManageFeeds, base::Unretained(this)), l10n_util::GetStringUTF16(IDS_BRAVE_NEWS_BUBBLE_MANAGE_FEEDS))); - manage_feeds_button->SetKind(views::MdTextButton::Kind::kTertiary); + // Use tonal style here. + manage_feeds_button->set_use_default_for_tonal(false); + manage_feeds_button->SetStyle(ui::ButtonStyle::kTonal); manage_feeds_button->SetProperty(views::kMarginsKey, gfx::Insets::TLBR(10, 0, 0, 0)); manage_feeds_button->SetProperty( diff --git a/browser/ui/views/brave_news/brave_news_feed_item_view.cc b/browser/ui/views/brave_news/brave_news_feed_item_view.cc index 2d137746c0151..2b8df5205c190 100644 --- a/browser/ui/views/brave_news/brave_news_feed_item_view.cc +++ b/browser/ui/views/brave_news/brave_news_feed_item_view.cc @@ -89,8 +89,8 @@ void BraveNewsFeedItemView::Update() { : IDS_BRAVE_NEWS_BUBBLE_FEED_ITEM_SUBSCRIBE)); subscribe_button_->SetLoading(loading_); - subscribe_button_->SetKind(is_subscribed ? views::MdTextButton::kSecondary - : views::MdTextButton::kPrimary); + subscribe_button_->SetStyle(is_subscribed ? ui::ButtonStyle::kDefault + : ui::ButtonStyle::kProminent); subscribe_button_->SetIcon( is_subscribed ? &kLeoHeartFilledIcon : &kLeoHeartOutlineIcon, kFollowButtonIconSize); diff --git a/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc b/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc index 54f85f5a6d9b5..f2bcceca216d8 100644 --- a/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc +++ b/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc @@ -145,7 +145,8 @@ void BraveTooltipPopup::set_display_work_area_insets(int x, int y) { display_work_area_inset_y_ = y; } -void BraveTooltipPopup::OnDisplayRemoved(const display::Display& old_display) { +void BraveTooltipPopup::OnDisplaysRemoved( + const display::Displays& old_displays) { // Called when |old_display| has been removed RecomputeAlignment(); } diff --git a/browser/ui/views/brave_tooltips/brave_tooltip_popup.h b/browser/ui/views/brave_tooltips/brave_tooltip_popup.h index 3d343c2365d07..4f743d49c57bf 100644 --- a/browser/ui/views/brave_tooltips/brave_tooltip_popup.h +++ b/browser/ui/views/brave_tooltips/brave_tooltip_popup.h @@ -100,7 +100,7 @@ class BraveTooltipPopup : public views::WidgetDelegateView, } // display::DisplayObserver: - void OnDisplayRemoved(const display::Display& old_display) override; + void OnDisplaysRemoved(const display::Displays& old_displays) override; void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/browser/ui/views/download/brave_download_item_view.cc b/browser/ui/views/download/brave_download_item_view.cc index d528756b28866..717e4105d7d97 100644 --- a/browser/ui/views/download/brave_download_item_view.cc +++ b/browser/ui/views/download/brave_download_item_view.cc @@ -76,9 +76,10 @@ BraveDownloadItemView::~BraveDownloadItemView() = default; // View overrides. -gfx::Size BraveDownloadItemView::CalculatePreferredSize() const { +gfx::Size BraveDownloadItemView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { // Call base class to get the width. - gfx::Size size = DownloadItemView::CalculatePreferredSize(); + gfx::Size size = DownloadItemView::CalculatePreferredSize(available_size); // Calculate the height accounting for the extra line. int child_height = file_name_label_->GetLineHeight() + kBraveVerticalTextPadding + diff --git a/browser/ui/views/download/brave_download_item_view.h b/browser/ui/views/download/brave_download_item_view.h index c36cc34332085..2956fccb6216f 100644 --- a/browser/ui/views/download/brave_download_item_view.h +++ b/browser/ui/views/download/brave_download_item_view.h @@ -24,7 +24,8 @@ class BraveDownloadItemView : public DownloadItemView { ~BraveDownloadItemView() override; // views::View: - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; // download::DownloadItem::Observer: void OnDownloadUpdated() override; diff --git a/browser/ui/views/frame/brave_tab_strip_region_view.cc b/browser/ui/views/frame/brave_tab_strip_region_view.cc index 259c4ea23da5e..0e00c539e42af 100644 --- a/browser/ui/views/frame/brave_tab_strip_region_view.cc +++ b/browser/ui/views/frame/brave_tab_strip_region_view.cc @@ -10,25 +10,62 @@ #include "brave/browser/ui/tabs/brave_tab_layout_constants.h" #include "brave/browser/ui/tabs/features.h" #include "brave/browser/ui/views/tabs/vertical_tab_utils.h" +#include "brave/components/vector_icons/vector_icons.h" +#include "chrome/browser/ui/layout_constants.h" +#include "chrome/browser/ui/views/tabs/tab_strip_control_button.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/views/view_class_properties.h" +#include "ui/views/view_utils.h" BraveTabStripRegionView::~BraveTabStripRegionView() = default; void BraveTabStripRegionView::Layout(PassKey) { - UpdateBraveTabStripMargins(); + UpdateTabStripMargin(); LayoutSuperclass(this); + + // Ensure that the new tab button is positioned after the last tab, with the + // correct amount of padding. + if (new_tab_button_) { + new_tab_button_->SetX(tab_strip_container_->bounds().right() + + GetLayoutConstant(TAB_STRIP_PADDING)); + } } -void BraveTabStripRegionView::UpdateBraveTabStripMargins() { +void BraveTabStripRegionView::UpdateTabStripMargin() { + TabStripRegionView::UpdateTabStripMargin(); + + gfx::Insets margins; + bool vertical_tabs = + tabs::utils::ShouldShowVerticalTabs(tab_strip_->GetBrowser()); + + // In horizontal mode, take the current right margin. It is required so that + // the new tab button will not be covered by the frame grab handle. + if (!vertical_tabs) { + if (auto* current = tab_strip_container_->GetProperty(views::kMarginsKey)) { + margins.set_right(current->right()); + } + } + + // Ensure that the correct amount of left margin is applied to the tabstrip. + // When we are in a fullscreen/condensed mode, we want the tabstrip to meet + // the frame edge so that the leftmost tab can be selected at the edge of the + // screen. if (tabs::features::HorizontalTabsUpdateEnabled()) { - gfx::Insets margins; - if (!tab_strip_->controller()->IsFrameCondensed() && - !tabs::utils::ShouldShowVerticalTabs(tab_strip_->GetBrowser())) { + if (!tab_strip_->controller()->IsFrameCondensed() && !vertical_tabs) { margins.set_left(brave_tabs::kHorizontalTabStripLeftMargin); + } else { + margins.set_left(0); } - tab_strip_container_->SetProperty(views::kMarginsKey, margins); + } + + tab_strip_container_->SetProperty(views::kMarginsKey, margins); +} + +void BraveTabStripRegionView::Initialize() { + // Use our own icon for the new tab button. + if (auto* ntb = views::AsViewClass(new_tab_button_)) { + ntb->SetVectorIcon(kLeoPlusAddIcon); } } diff --git a/browser/ui/views/frame/brave_tab_strip_region_view.h b/browser/ui/views/frame/brave_tab_strip_region_view.h index 7347c03c7d16a..7eaa99ea29d56 100644 --- a/browser/ui/views/frame/brave_tab_strip_region_view.h +++ b/browser/ui/views/frame/brave_tab_strip_region_view.h @@ -15,15 +15,19 @@ class BraveTabStripRegionView : public TabStripRegionView { METADATA_HEADER(BraveTabStripRegionView, TabStripRegionView) public: - using TabStripRegionView::TabStripRegionView; - BraveTabStripRegionView(const BraveTabStripRegionView&) = delete; - BraveTabStripRegionView& operator=(const BraveTabStripRegionView&) = delete; + template + explicit BraveTabStripRegionView(Args&&... args) + : TabStripRegionView(std::forward(args)...) { + Initialize(); + } + ~BraveTabStripRegionView() override; void Layout(PassKey) override; private: - void UpdateBraveTabStripMargins(); + void UpdateTabStripMargin() override; + void Initialize(); }; #endif // BRAVE_BROWSER_UI_VIEWS_FRAME_BRAVE_TAB_STRIP_REGION_VIEW_H_ diff --git a/browser/ui/views/frame/vertical_tab_strip_region_view.cc b/browser/ui/views/frame/vertical_tab_strip_region_view.cc index eb8d79c5cde85..161cef092ad23 100644 --- a/browser/ui/views/frame/vertical_tab_strip_region_view.cc +++ b/browser/ui/views/frame/vertical_tab_strip_region_view.cc @@ -356,8 +356,9 @@ class VerticalTabNewTabButton : public BraveNewTabButton { } } - gfx::Size CalculatePreferredSize() const override { - auto size = BraveNewTabButton::CalculatePreferredSize(); + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override { + auto size = BraveNewTabButton::CalculatePreferredSize(available_size); if (tabs::utils::ShouldShowVerticalTabs(tab_strip()->GetBrowser())) { size.set_height(kHeight); } @@ -848,7 +849,8 @@ int VerticalTabStripRegionView::GetAvailableWidthForTabContainer() { /*ignore_animation=*/false); } -gfx::Size VerticalTabStripRegionView::CalculatePreferredSize() const { +gfx::Size VerticalTabStripRegionView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { return GetPreferredSizeForState(state_, /*include_border=*/true, /*ignore_animation=*/false); } @@ -1240,11 +1242,11 @@ gfx::Size VerticalTabStripRegionView::GetPreferredSizeForState( if (IsFloatingEnabledForBrowserFullscreen() && state_ == State::kCollapsed) { // In this case, vertical tab strip should be invisible but show up when // mouse hovers. - return {2, View::CalculatePreferredSize().height()}; + return {2, View::CalculatePreferredSize({}).height()}; } return {GetPreferredWidthForState(state, include_border, ignore_animation), - View::CalculatePreferredSize().height()}; + View::CalculatePreferredSize({}).height()}; } int VerticalTabStripRegionView::GetPreferredWidthForState( diff --git a/browser/ui/views/frame/vertical_tab_strip_region_view.h b/browser/ui/views/frame/vertical_tab_strip_region_view.h index f8d097a2893de..0b65f58a42fc2 100644 --- a/browser/ui/views/frame/vertical_tab_strip_region_view.h +++ b/browser/ui/views/frame/vertical_tab_strip_region_view.h @@ -94,7 +94,8 @@ class VerticalTabStripRegionView : public views::View, void ResetExpandedWidth(); // views::View: - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; gfx::Size GetMinimumSize() const override; void Layout(PassKey) override; void OnThemeChanged() override; diff --git a/browser/ui/views/location_bar/brave_location_bar_view.cc b/browser/ui/views/location_bar/brave_location_bar_view.cc index 5e80620da553c..5b057c1dbdf7d 100644 --- a/browser/ui/views/location_bar/brave_location_bar_view.cc +++ b/browser/ui/views/location_bar/brave_location_bar_view.cc @@ -303,8 +303,9 @@ void BraveLocationBarView::RefreshBackground() { } } -gfx::Size BraveLocationBarView::CalculatePreferredSize() const { - gfx::Size min_size = LocationBarView::CalculatePreferredSize(); +gfx::Size BraveLocationBarView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { + gfx::Size min_size = LocationBarView::CalculatePreferredSize(available_size); if (brave_actions_ && brave_actions_->GetVisible()) { const int brave_actions_min = brave_actions_->GetMinimumSize().width(); const int extra_width = diff --git a/browser/ui/views/location_bar/brave_location_bar_view.h b/browser/ui/views/location_bar/brave_location_bar_view.h index 436a285afbf8a..be86442004a92 100644 --- a/browser/ui/views/location_bar/brave_location_bar_view.h +++ b/browser/ui/views/location_bar/brave_location_bar_view.h @@ -80,7 +80,8 @@ class BraveLocationBarView : public LocationBarView { void OnOmniboxBlurred() override; // views::View: - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void OnThemeChanged() override; void ChildVisibilityChanged(views::View* child) override; void AddedToWidget() override; diff --git a/browser/ui/views/omnibox/brave_search_conversion_promotion_view.cc b/browser/ui/views/omnibox/brave_search_conversion_promotion_view.cc index 8db971842af25..bf7920abbec32 100644 --- a/browser/ui/views/omnibox/brave_search_conversion_promotion_view.cc +++ b/browser/ui/views/omnibox/brave_search_conversion_promotion_view.cc @@ -408,7 +408,7 @@ void BraveSearchConversionPromotionView::ConfigureForBannerType() { std::make_unique(views::Button::PressedCallback( base::BindRepeating(&BraveSearchConversionPromotionView::OpenMatch, base::Unretained(this))))); - try_button->SetKind(views::MdTextButton::Kind::kPrimary); + try_button->SetStyle(ui::ButtonStyle::kProminent); try_button->SetProperty( views::kFlexBehaviorKey, views::FlexSpecification(views::MinimumFlexSizeRule::kScaleToZero, @@ -421,7 +421,7 @@ void BraveSearchConversionPromotionView::ConfigureForBannerType() { std::make_unique(views::Button::PressedCallback( base::BindRepeating(&BraveSearchConversionPromotionView::MaybeLater, base::Unretained(this))))); - maybe_later_button->SetKind(views::MdTextButton::Kind::kQuaternary); + maybe_later_button->SetStyle(ui::ButtonStyle::kText); maybe_later_button->SetProperty( views::kFlexBehaviorKey, views::FlexSpecification(views::MinimumFlexSizeRule::kScaleToZero, @@ -459,7 +459,8 @@ SkColor BraveSearchConversionPromotionView::GetCloseButtonColor() const { return button_color; } -gfx::Size BraveSearchConversionPromotionView::CalculatePreferredSize() const { +gfx::Size BraveSearchConversionPromotionView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { // Ask preferred size + margin for banner. auto size = banner_type_container_->GetPreferredSize(); const auto margin = GetInsets(); diff --git a/browser/ui/views/omnibox/brave_search_conversion_promotion_view.h b/browser/ui/views/omnibox/brave_search_conversion_promotion_view.h index 16925000d8cbd..e6308be649b15 100644 --- a/browser/ui/views/omnibox/brave_search_conversion_promotion_view.h +++ b/browser/ui/views/omnibox/brave_search_conversion_promotion_view.h @@ -41,7 +41,8 @@ class BraveSearchConversionPromotionView : public views::View { void OnSelectionStateChanged(bool selected); // views::View overrides: - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void OnThemeChanged() override; private: diff --git a/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.cc b/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.cc index 1a574d97af530..c3592a654845a 100644 --- a/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.cc +++ b/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.cc @@ -49,6 +49,10 @@ BraveWalletPermissionPromptImpl::GetPromptDisposition() const { return permissions::PermissionPromptDisposition::ANCHORED_BUBBLE; } +bool BraveWalletPermissionPromptImpl::IsAskPrompt() const { + return true; +} + std::optional BraveWalletPermissionPromptImpl::GetViewBoundsInScreen() const { return std::nullopt; diff --git a/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h b/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h index 0bc7e10c8df2b..60816b080307c 100644 --- a/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h +++ b/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h @@ -32,6 +32,7 @@ class BraveWalletPermissionPromptImpl : public permissions::PermissionPrompt { TabSwitchingBehavior GetTabSwitchingBehavior() override; permissions::PermissionPromptDisposition GetPromptDisposition() const override; + bool IsAskPrompt() const override; std::optional GetViewBoundsInScreen() const override; bool ShouldFinalizeRequestAfterDecided() const override; std::vector GetPromptVariants() diff --git a/browser/ui/views/rounded_separator.cc b/browser/ui/views/rounded_separator.cc index 42e18764175f9..4f76d8bc76f4d 100644 --- a/browser/ui/views/rounded_separator.cc +++ b/browser/ui/views/rounded_separator.cc @@ -38,7 +38,8 @@ void RoundedSeparator::SetPreferredHeight(int height) { //////////////////////////////////////////////////////////////////////////////// // Separator, View overrides: -gfx::Size RoundedSeparator::CalculatePreferredSize() const { +gfx::Size RoundedSeparator::CalculatePreferredSize( + const views::SizeBounds& available_size) const { gfx::Size size(kThickness, preferred_height_); gfx::Insets insets = GetInsets(); size.Enlarge(insets.width(), insets.height()); diff --git a/browser/ui/views/rounded_separator.h b/browser/ui/views/rounded_separator.h index ba31710db091e..bea5011e86e44 100644 --- a/browser/ui/views/rounded_separator.h +++ b/browser/ui/views/rounded_separator.h @@ -31,7 +31,8 @@ class RoundedSeparator : public views::View { void SetPreferredHeight(int height); // Overridden from View: - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void GetAccessibleNodeData(ui::AXNodeData* node_data) override; void OnPaint(gfx::Canvas* canvas) override; diff --git a/browser/ui/views/side_panel/playlist/playlist_contents_wrapper.cc b/browser/ui/views/side_panel/playlist/playlist_contents_wrapper.cc index 40f3ad334dcd7..1d6aceeffedcd 100644 --- a/browser/ui/views/side_panel/playlist/playlist_contents_wrapper.cc +++ b/browser/ui/views/side_panel/playlist/playlist_contents_wrapper.cc @@ -36,8 +36,7 @@ PlaylistContentsWrapper::PlaylistContentsWrapper( PlaylistContentsWrapper::~PlaylistContentsWrapper() = default; bool PlaylistContentsWrapper::CanEnterFullscreenModeForTab( - content::RenderFrameHost* requesting_frame, - const blink::mojom::FullscreenOptions& options) { + content::RenderFrameHost* requesting_frame) { return true; } diff --git a/browser/ui/views/side_panel/playlist/playlist_contents_wrapper.h b/browser/ui/views/side_panel/playlist/playlist_contents_wrapper.h index 8d486979cbe39..1fd90464c7064 100644 --- a/browser/ui/views/side_panel/playlist/playlist_contents_wrapper.h +++ b/browser/ui/views/side_panel/playlist/playlist_contents_wrapper.h @@ -34,8 +34,7 @@ class PlaylistContentsWrapper // WebUIContentsWrapperT: bool CanEnterFullscreenModeForTab( - content::RenderFrameHost* requesting_frame, - const blink::mojom::FullscreenOptions& options) override; + content::RenderFrameHost* requesting_frame) override; void EnterFullscreenModeForTab( content::RenderFrameHost* requesting_frame, const blink::mojom::FullscreenOptions& options) override; diff --git a/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc b/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc index 93cce016acc51..1169d5a50598d 100644 --- a/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc +++ b/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc @@ -70,7 +70,8 @@ class SidebarAddItemButton : public views::LabelButton { : gfx::Font::Weight::NORMAL)); } - gfx::Size CalculatePreferredSize() const override { + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override { return kAddItemBubbleEntrySize; } diff --git a/browser/ui/views/sidebar/sidebar_button_view.cc b/browser/ui/views/sidebar/sidebar_button_view.cc index a21d297c07c9e..b94a2b689a7e4 100644 --- a/browser/ui/views/sidebar/sidebar_button_view.cc +++ b/browser/ui/views/sidebar/sidebar_button_view.cc @@ -47,7 +47,8 @@ void SidebarButtonView::OnThemeChanged() { this, gfx::Insets::VH(0, kMargin), radii); } -gfx::Size SidebarButtonView::CalculatePreferredSize() const { +gfx::Size SidebarButtonView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { return {kSidebarButtonSize + kMargin * 2, kSidebarButtonSize}; } diff --git a/browser/ui/views/sidebar/sidebar_button_view.h b/browser/ui/views/sidebar/sidebar_button_view.h index b4936e949d5cc..c95508816adef 100644 --- a/browser/ui/views/sidebar/sidebar_button_view.h +++ b/browser/ui/views/sidebar/sidebar_button_view.h @@ -26,7 +26,8 @@ class SidebarButtonView : public views::ImageButton { // views::ImageButton overrides: void OnThemeChanged() override; - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; std::u16string GetTooltipText(const gfx::Point& p) const override; }; diff --git a/browser/ui/views/sidebar/sidebar_container_view.cc b/browser/ui/views/sidebar/sidebar_container_view.cc index c742b8fcff035..3b676ba401a02 100644 --- a/browser/ui/views/sidebar/sidebar_container_view.cc +++ b/browser/ui/views/sidebar/sidebar_container_view.cc @@ -315,10 +315,11 @@ void SidebarContainerView::Layout(PassKey) { } } -gfx::Size SidebarContainerView::CalculatePreferredSize() const { +gfx::Size SidebarContainerView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { if (!initialized_ || !sidebar_control_view_->GetVisible() || IsFullscreenByTab()) { - return View::CalculatePreferredSize(); + return View::CalculatePreferredSize(available_size); } if (IsFullscreenForCurrentEntry()) { diff --git a/browser/ui/views/sidebar/sidebar_container_view.h b/browser/ui/views/sidebar/sidebar_container_view.h index c60285dc1e42e..fd2c509cb1ac3 100644 --- a/browser/ui/views/sidebar/sidebar_container_view.h +++ b/browser/ui/views/sidebar/sidebar_container_view.h @@ -94,7 +94,8 @@ class SidebarContainerView // views::View overrides: void Layout(PassKey) override; - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void OnThemeChanged() override; void OnMouseEntered(const ui::MouseEvent& event) override; void OnMouseExited(const ui::MouseEvent& event) override; diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc index a9e6a91e18e55..7c36fabfe592e 100644 --- a/browser/ui/views/sidebar/sidebar_items_contents_view.cc +++ b/browser/ui/views/sidebar/sidebar_items_contents_view.cc @@ -103,12 +103,13 @@ SidebarItemsContentsView::SidebarItemsContentsView( SidebarItemsContentsView::~SidebarItemsContentsView() = default; -gfx::Size SidebarItemsContentsView::CalculatePreferredSize() const { +gfx::Size SidebarItemsContentsView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { if (children().empty()) { return {0, 0}; } - return views::View::CalculatePreferredSize(); + return views::View::CalculatePreferredSize(available_size); } void SidebarItemsContentsView::OnThemeChanged() { diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.h b/browser/ui/views/sidebar/sidebar_items_contents_view.h index e5eab7ff8d1e8..63eb649925810 100644 --- a/browser/ui/views/sidebar/sidebar_items_contents_view.h +++ b/browser/ui/views/sidebar/sidebar_items_contents_view.h @@ -47,7 +47,8 @@ class SidebarItemsContentsView : public views::View, SidebarItemsContentsView operator=(const SidebarItemsContentsView&) = delete; // views::View overrides: - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void OnThemeChanged() override; // views::ContextMenuController overrides: diff --git a/browser/ui/views/sidebar/sidebar_items_scroll_view.cc b/browser/ui/views/sidebar/sidebar_items_scroll_view.cc index 05d52102df257..fe10645b292ef 100644 --- a/browser/ui/views/sidebar/sidebar_items_scroll_view.cc +++ b/browser/ui/views/sidebar/sidebar_items_scroll_view.cc @@ -61,7 +61,8 @@ class SidebarItemsArrowView : public views::ImageButton { SidebarItemsArrowView(const SidebarItemsArrowView&) = delete; SidebarItemsArrowView& operator=(const SidebarItemsArrowView&) = delete; - gfx::Size CalculatePreferredSize() const override { + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override { return { SidebarButtonView::kSidebarButtonSize + SidebarButtonView::kMargin * 2, kArrowHeight}; @@ -186,7 +187,8 @@ void SidebarItemsScrollView::OnMouseEvent(ui::MouseEvent* event) { UpdateArrowViewsEnabledState(); } -gfx::Size SidebarItemsScrollView::CalculatePreferredSize() const { +gfx::Size SidebarItemsScrollView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { DCHECK(contents_view_); return contents_view_->GetPreferredSize() + GetInsets().size(); } diff --git a/browser/ui/views/sidebar/sidebar_items_scroll_view.h b/browser/ui/views/sidebar/sidebar_items_scroll_view.h index cf3db184622d6..75eea33a5a57e 100644 --- a/browser/ui/views/sidebar/sidebar_items_scroll_view.h +++ b/browser/ui/views/sidebar/sidebar_items_scroll_view.h @@ -53,7 +53,8 @@ class SidebarItemsScrollView : public views::View, // views::View overrides: void Layout(PassKey) override; void OnMouseEvent(ui::MouseEvent* event) override; - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void OnThemeChanged() override; bool GetDropFormats(int* formats, std::set* format_types) override; diff --git a/browser/ui/views/speedreader/reader_mode_bubble.cc b/browser/ui/views/speedreader/reader_mode_bubble.cc index dd4742fca3bc5..b2d18766f951a 100644 --- a/browser/ui/views/speedreader/reader_mode_bubble.cc +++ b/browser/ui/views/speedreader/reader_mode_bubble.cc @@ -63,10 +63,12 @@ void ReaderModeBubble::Hide() { CloseBubble(); } -gfx::Size ReaderModeBubble::CalculatePreferredSize() const { +gfx::Size ReaderModeBubble::CalculatePreferredSize( + const views::SizeBounds& available_size) const { return gfx::Size( kBubbleWidth, - LocationBarBubbleDelegateView::CalculatePreferredSize().height()); + LocationBarBubbleDelegateView::CalculatePreferredSize(available_size) + .height()); } bool ReaderModeBubble::ShouldShowCloseButton() const { diff --git a/browser/ui/views/speedreader/reader_mode_bubble.h b/browser/ui/views/speedreader/reader_mode_bubble.h index 258ea31a552ca..ad04edf490b81 100644 --- a/browser/ui/views/speedreader/reader_mode_bubble.h +++ b/browser/ui/views/speedreader/reader_mode_bubble.h @@ -54,7 +54,8 @@ class ReaderModeBubble : public SpeedreaderBubbleView, void Init() override; // views::View - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; SpeedreaderService* GetSpeedreaderService(); void OnSiteToggled(const ui::Event& event); diff --git a/browser/ui/views/speedreader/reader_mode_toolbar_view.cc b/browser/ui/views/speedreader/reader_mode_toolbar_view.cc index 7575353261f2e..0c0b92865f795 100644 --- a/browser/ui/views/speedreader/reader_mode_toolbar_view.cc +++ b/browser/ui/views/speedreader/reader_mode_toolbar_view.cc @@ -55,7 +55,8 @@ content::WebContents* ReaderModeToolbarView::GetWebContentsForTesting() { return toolbar_->web_contents(); } -gfx::Size ReaderModeToolbarView::CalculatePreferredSize() const { +gfx::Size ReaderModeToolbarView::CalculatePreferredSize( + const views::SizeBounds& available_size) const { return kToolbarSize; } diff --git a/browser/ui/views/speedreader/reader_mode_toolbar_view.h b/browser/ui/views/speedreader/reader_mode_toolbar_view.h index 6f511e1ea03f4..40c638d4923fd 100644 --- a/browser/ui/views/speedreader/reader_mode_toolbar_view.h +++ b/browser/ui/views/speedreader/reader_mode_toolbar_view.h @@ -31,7 +31,8 @@ class ReaderModeToolbarView : public views::View { views::View* toolbar() const { return toolbar_.get(); } private: - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void OnBoundsChanged(const gfx::Rect& previous_bounds) override; std::unique_ptr toolbar_; diff --git a/browser/ui/views/tabs/brave_compound_tab_container.cc b/browser/ui/views/tabs/brave_compound_tab_container.cc index 074aa39b06ec2..5e2602e08e2fd 100644 --- a/browser/ui/views/tabs/brave_compound_tab_container.cc +++ b/browser/ui/views/tabs/brave_compound_tab_container.cc @@ -263,12 +263,14 @@ void BraveCompoundTabContainer::Layout(PassKey) { } } -gfx::Size BraveCompoundTabContainer::CalculatePreferredSize() const { +gfx::Size BraveCompoundTabContainer::CalculatePreferredSize( + const views::SizeBounds& available_size) const { if (!ShouldShowVerticalTabs()) { - return CompoundTabContainer::CalculatePreferredSize(); + return CompoundTabContainer::CalculatePreferredSize(available_size); } - auto preferred_size = CompoundTabContainer::CalculatePreferredSize(); + auto preferred_size = + CompoundTabContainer::CalculatePreferredSize(available_size); // Check if we can expand height to fill the entire scroll area's viewport. for (auto* parent_view = parent(); parent_view; diff --git a/browser/ui/views/tabs/brave_compound_tab_container.h b/browser/ui/views/tabs/brave_compound_tab_container.h index 401842fa13ba1..e3abfb9cd006a 100644 --- a/browser/ui/views/tabs/brave_compound_tab_container.h +++ b/browser/ui/views/tabs/brave_compound_tab_container.h @@ -38,7 +38,8 @@ class BraveCompoundTabContainer : public CompoundTabContainer { void TransferTabBetweenContainers(int from_model_index, int to_model_index) override; void Layout(PassKey) override; - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; gfx::Size GetMinimumSize() const override; views::SizeBounds GetAvailableSize(const views::View* child) const override; Tab* AddTab(std::unique_ptr tab, diff --git a/browser/ui/views/tabs/brave_new_tab_button.cc b/browser/ui/views/tabs/brave_new_tab_button.cc index c9de5cc12d7e5..9c4816f1e4a05 100644 --- a/browser/ui/views/tabs/brave_new_tab_button.cc +++ b/browser/ui/views/tabs/brave_new_tab_button.cc @@ -47,7 +47,8 @@ gfx::Size BraveNewTabButton::GetButtonSize() { return {28, 28}; } -gfx::Size BraveNewTabButton::CalculatePreferredSize() const { +gfx::Size BraveNewTabButton::CalculatePreferredSize( + const views::SizeBounds& available_size) const { // Overridden so that we use Brave's custom button size gfx::Size size = GetButtonSize(); const auto insets = GetInsets(); diff --git a/browser/ui/views/tabs/brave_new_tab_button.h b/browser/ui/views/tabs/brave_new_tab_button.h index 2eb0209017cab..a46f2fd2b2e94 100644 --- a/browser/ui/views/tabs/brave_new_tab_button.h +++ b/browser/ui/views/tabs/brave_new_tab_button.h @@ -45,7 +45,8 @@ class BraveNewTabButton : public NewTabButton { // NewTabButton: void PaintIcon(gfx::Canvas* canvas) override; void PaintFill(gfx::Canvas* canvas) const override; - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; SkPath GetBorderPath(const gfx::Point& origin, bool extend_to_top) const override; gfx::Insets GetInsets() const override; diff --git a/browser/ui/views/tabs/brave_tab_container.cc b/browser/ui/views/tabs/brave_tab_container.cc index b7db00c81011e..67e1c3c73a9bf 100644 --- a/browser/ui/views/tabs/brave_tab_container.cc +++ b/browser/ui/views/tabs/brave_tab_container.cc @@ -122,7 +122,8 @@ void BraveTabContainer::AddedToWidget() { } } -gfx::Size BraveTabContainer::CalculatePreferredSize() const { +gfx::Size BraveTabContainer::CalculatePreferredSize( + const views::SizeBounds& available_size) const { // Note that we check this before checking currently we're in vertical tab // strip mode. We might be in the middle of changing orientation. if (layout_locked_) { @@ -131,7 +132,7 @@ gfx::Size BraveTabContainer::CalculatePreferredSize() const { if (!tabs::utils::ShouldShowVerticalTabs( tab_slot_controller_->GetBrowser())) { - return TabContainerImpl::CalculatePreferredSize(); + return TabContainerImpl::CalculatePreferredSize(available_size); } const int tab_count = tabs_view_model_.view_size(); diff --git a/browser/ui/views/tabs/brave_tab_container.h b/browser/ui/views/tabs/brave_tab_container.h index 46ca42d5c233c..2b5a0cd795fc7 100644 --- a/browser/ui/views/tabs/brave_tab_container.h +++ b/browser/ui/views/tabs/brave_tab_container.h @@ -36,7 +36,8 @@ class BraveTabContainer : public TabContainerImpl, // TabContainerImpl: void AddedToWidget() override; - gfx::Size CalculatePreferredSize() const override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; void UpdateClosingModeOnRemovedTab(int model_index, bool was_active) override; gfx::Rect GetTargetBoundsForClosingTab(Tab* tab, int former_model_index) const override; diff --git a/browser/ui/views/tabs/brave_tab_hover_card_controller.cc b/browser/ui/views/tabs/brave_tab_hover_card_controller.cc index 2c11da5f43933..18e14aaac0cde 100644 --- a/browser/ui/views/tabs/brave_tab_hover_card_controller.cc +++ b/browser/ui/views/tabs/brave_tab_hover_card_controller.cc @@ -15,6 +15,7 @@ #include "chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h" #include "chrome/browser/ui/views/tabs/tab_hover_card_controller.h" #include "chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" #include "ui/views/bubble/bubble_border.h" BraveTabHoverCardController::~BraveTabHoverCardController() = default; @@ -35,16 +36,23 @@ void BraveTabHoverCardController::UpdateHoverCardArrow() { } void BraveTabHoverCardController::CreateHoverCard(Tab* tab) { + hover_card_image_previews_enabled_ = + AreHoverCardImagesEnabled() || + brave_tabs::AreCardPreviewsEnabled( + tab->controller()->GetBrowser()->profile()->GetPrefs()); + TabHoverCardController::CreateHoverCard(tab); - if (!thumbnail_observer_ && + UpdateHoverCardArrow(); +} + +void BraveTabHoverCardController::OnHovercardImagesEnabledChanged() { + hover_card_image_previews_enabled_ = + AreHoverCardImagesEnabled() || brave_tabs::AreCardPreviewsEnabled( - tab->controller()->GetBrowser()->profile()->GetPrefs())) { - thumbnail_observer_ = std::make_unique(); - thumbnail_subscription_ = thumbnail_observer_->AddCallback( - base::BindRepeating(&TabHoverCardController::OnPreviewImageAvailable, - weak_ptr_factory_.GetWeakPtr())); + tab_strip_->GetBrowser()->profile()->GetPrefs()); + if (!hover_card_image_previews_enabled_) { + thumbnail_subscription_ = base::CallbackListSubscription(); + thumbnail_observer_.reset(); } - - UpdateHoverCardArrow(); } diff --git a/browser/ui/views/tabs/brave_tab_hover_card_controller.h b/browser/ui/views/tabs/brave_tab_hover_card_controller.h index 0e6a7b9dc82ef..4cf7342fac763 100644 --- a/browser/ui/views/tabs/brave_tab_hover_card_controller.h +++ b/browser/ui/views/tabs/brave_tab_hover_card_controller.h @@ -20,6 +20,8 @@ class BraveTabHoverCardController : public TabHoverCardController { protected: void UpdateHoverCardArrow(); + void OnHovercardImagesEnabledChanged() override; + // TabHoverCardController: void CreateHoverCard(Tab* tab) override; diff --git a/browser/ui/views/tabs/brave_tab_search_button.cc b/browser/ui/views/tabs/brave_tab_search_button.cc index a864e5fbd64eb..cecd4c4ec5b69 100644 --- a/browser/ui/views/tabs/brave_tab_search_button.cc +++ b/browser/ui/views/tabs/brave_tab_search_button.cc @@ -9,18 +9,11 @@ #include "brave/browser/ui/tabs/features.h" #include "brave/browser/ui/views/brave_tab_search_bubble_host.h" -#include "brave/browser/ui/views/tabs/brave_new_tab_button.h" #include "brave/components/vector_icons/vector_icons.h" -#include "chrome/browser/ui/views/chrome_layout_provider.h" -#include "chrome/browser/ui/views/tabs/new_tab_button.h" +#include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "components/vector_icons/vector_icons.h" #include "ui/base/metadata/metadata_impl_macros.h" -#include "ui/gfx/geometry/point_f.h" -#include "ui/gfx/geometry/rect.h" -#include "ui/gfx/geometry/size.h" -#include "ui/gfx/geometry/skia_conversions.h" -#include "ui/views/layout/layout_provider.h" BraveTabSearchButton::BraveTabSearchButton( TabStripController* tab_strip_controller, @@ -36,15 +29,6 @@ BraveTabSearchButton::BraveTabSearchButton( BraveTabSearchButton::~BraveTabSearchButton() = default; -gfx::Size BraveTabSearchButton::CalculatePreferredSize() const { - auto size = BraveNewTabButton::GetButtonSize(); - if (tabs::features::HorizontalTabsUpdateEnabled()) { - auto insets = GetInsets(); - size.Enlarge(insets.width(), insets.height()); - } - return size; -} - void BraveTabSearchButton::SetBubbleArrow(views::BubbleBorder::Arrow arrow) { static_cast(tab_search_bubble_host_.get()) ->SetBubbleArrow(arrow); @@ -71,8 +55,7 @@ void BraveTabSearchButton::UpdateColors() { } int BraveTabSearchButton::GetCornerRadius() const { - return ChromeLayoutProvider::Get()->GetCornerRadiusMetric( - views::Emphasis::kMaximum, GetContentsBounds().size()); + return TabStripControlButton::GetCornerRadius(); } BEGIN_METADATA(BraveTabSearchButton) diff --git a/browser/ui/views/tabs/brave_tab_search_button.h b/browser/ui/views/tabs/brave_tab_search_button.h index 49b1e2756a5a2..2da029ee3b1bd 100644 --- a/browser/ui/views/tabs/brave_tab_search_button.h +++ b/browser/ui/views/tabs/brave_tab_search_button.h @@ -24,7 +24,6 @@ class BraveTabSearchButton : public TabSearchButton { // TabSearchButton: void UpdateColors() override; - gfx::Size CalculatePreferredSize() const override; int GetCornerRadius() const override; }; diff --git a/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc b/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc index c0abe9a7c66c9..d544f8fd5c50b 100644 --- a/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc +++ b/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc @@ -431,10 +431,9 @@ void AIChatUIPageHandler::GetFaviconImageData( return; } - scoped_refptr bytes = result.bitmap_data; - std::vector buffer(bytes->front_as(), - bytes->front_as() + bytes->size()); - std::move(callback).Run(std::move(buffer)); + std::vector bytes(result.bitmap_data->begin(), + result.bitmap_data->end()); + std::move(callback).Run(std::move(bytes)); }; favicon_service_->GetRawFaviconForPageURL( diff --git a/browser/ui/webui/brave_rewards_source.cc b/browser/ui/webui/brave_rewards_source.cc index 685e17f6457a4..e443a3a9623f4 100644 --- a/browser/ui/webui/brave_rewards_source.cc +++ b/browser/ui/webui/brave_rewards_source.cc @@ -17,9 +17,9 @@ namespace { -scoped_refptr BitmapToMemory(const SkBitmap* image) { - base::RefCountedBytes* image_bytes = new base::RefCountedBytes; - gfx::PNGCodec::EncodeBGRASkBitmap(*image, false, &image_bytes->data()); +scoped_refptr BitmapToMemory(const SkBitmap& image) { + scoped_refptr image_bytes(new base::RefCountedBytes()); + gfx::PNGCodec::EncodeBGRASkBitmap(image, false, &image_bytes->as_vector()); return image_bytes; } @@ -121,7 +121,7 @@ void BraveRewardsSource::OnBitmapFetched( return; } - std::move(got_data_callback).Run(BitmapToMemory(&bitmap).get()); + std::move(got_data_callback).Run(BitmapToMemory(bitmap).get()); auto it_url = find(resource_fetchers_.begin(), resource_fetchers_.end(), url); diff --git a/browser/ui/webui/settings/brave_extensions_manifest_v2_handler.cc b/browser/ui/webui/settings/brave_extensions_manifest_v2_handler.cc index e9863b86da9cf..87382bb0efc0d 100644 --- a/browser/ui/webui/settings/brave_extensions_manifest_v2_handler.cc +++ b/browser/ui/webui/settings/brave_extensions_manifest_v2_handler.cc @@ -40,9 +40,11 @@ class ExtensionWebstoreInstaller final Profile* profile, content::WebContents* web_contents, extensions::WebstoreInstallWithPrompt::Callback callback) - : extensions::WebstoreInstallWithPrompt(webstore_item_id, - profile, - std::move(callback)), + : extensions::WebstoreInstallWithPrompt( + webstore_item_id, + profile, + web_contents->GetTopLevelNativeWindow(), + std::move(callback)), web_contents_(web_contents) {} private: diff --git a/browser/ui/webui/settings/brave_tor_handler.cc b/browser/ui/webui/settings/brave_tor_handler.cc index 12ab6e1fc953c..0d40fa636352f 100644 --- a/browser/ui/webui/settings/brave_tor_handler.cc +++ b/browser/ui/webui/settings/brave_tor_handler.cc @@ -203,16 +203,16 @@ class BridgeRequest { void OnCaptchaDecoded(const gfx::Image& image) { // Re-encode image as PNG and send. - auto encoded = base::MakeRefCounted(); + std::vector encoded; if (!gfx::PNGCodec::EncodeBGRASkBitmap(image.AsBitmap(), /*discard_transparency=*/false, - &encoded->data())) { + &encoded)) { return std::move(captcha_callback_).Run(base::Value()); } base::Value::Dict result; result.Set("captcha", - "data:image/png;base64," + base::Base64Encode(encoded->data())); + "data:image/png;base64," + base::Base64Encode(encoded)); std::move(captcha_callback_).Run(base::Value(std::move(result))); state_ = State::kProvideCaptcha; } diff --git a/browser/ui/webui/settings/brave_tor_snowflake_extension_handler.cc b/browser/ui/webui/settings/brave_tor_snowflake_extension_handler.cc index fe58b1c22ae29..695aafb536f42 100644 --- a/browser/ui/webui/settings/brave_tor_snowflake_extension_handler.cc +++ b/browser/ui/webui/settings/brave_tor_snowflake_extension_handler.cc @@ -166,7 +166,7 @@ void BraveTorSnowflakeExtensionHandler::EnableSnowflakeExtension( if (enable) { if (!installed) { installer_ = base::MakeRefCounted( - kSnowflakeExtensionId, profile, + kSnowflakeExtensionId, profile, /*parent_window=*/nullptr, base::BindOnce( &BraveTorSnowflakeExtensionHandler::OnSnowflakeExtensionInstalled, weak_factory_.GetWeakPtr(), args[0].Clone())); diff --git a/browser/ui/webui/welcome_page/brave_welcome_ui_browsertest.cc b/browser/ui/webui/welcome_page/brave_welcome_ui_browsertest.cc index 6966279a7c56f..ebf8093ee5cdc 100644 --- a/browser/ui/webui/welcome_page/brave_welcome_ui_browsertest.cc +++ b/browser/ui/webui/welcome_page/brave_welcome_ui_browsertest.cc @@ -13,6 +13,7 @@ #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" +#include "chrome/common/chrome_switches.h" #include "chrome/common/webui_url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/navigation_entry.h" @@ -24,7 +25,8 @@ namespace { Browser* OpenNewBrowser(Profile* profile) { base::CommandLine dummy(base::CommandLine::NO_PROGRAM); - StartupBrowserCreatorImpl creator(base::FilePath(), dummy, + StartupBrowserCreator browser_creator; + StartupBrowserCreatorImpl creator(base::FilePath(), dummy, &browser_creator, chrome::startup::IsFirstRun::kYes); creator.Launch(profile, chrome::startup::IsProcessStartup::kNo, nullptr, /*restore_tabbed_browser=*/true); @@ -32,7 +34,18 @@ Browser* OpenNewBrowser(Profile* profile) { } } // namespace -using BraveWelcomeUIBrowserTest = InProcessBrowserTest; +class BraveWelcomeUIBrowserTest : public InProcessBrowserTest { + public: + BraveWelcomeUIBrowserTest() = default; + ~BraveWelcomeUIBrowserTest() override = default; + + void SetUpDefaultCommandLine(base::CommandLine* command_line) override { + InProcessBrowserTest::SetUpDefaultCommandLine(command_line); + if (GetTestPreCount() > 0) { + command_line->RemoveSwitch(switches::kNoFirstRun); + } + } +}; // Check whether startup url at first run is our welcome page. IN_PROC_BROWSER_TEST_F(BraveWelcomeUIBrowserTest, PRE_StartupURLTest) { diff --git a/browser/ui/whats_new/whats_new_browsertest.cc b/browser/ui/whats_new/whats_new_browsertest.cc index 5a034402c0f42..1971e0c5e9683 100644 --- a/browser/ui/whats_new/whats_new_browsertest.cc +++ b/browser/ui/whats_new/whats_new_browsertest.cc @@ -14,6 +14,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" @@ -37,6 +38,13 @@ class BraveWhatsNewBrowserTest : public InProcessBrowserTest { ~BraveWhatsNewBrowserTest() override = default; + void SetUpDefaultCommandLine(base::CommandLine* command_line) override { + InProcessBrowserTest::SetUpDefaultCommandLine(command_line); + if (GetTestPreCount() > 0) { + command_line->RemoveSwitch(switches::kNoFirstRun); + } + } + void PrepareValidFieldTrialParams() { constexpr char kWhatsNewTrial[] = "WhatsNewStudy"; std::map params; diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn index 849e42eceedcf..4f360fffc18d6 100644 --- a/build/android/BUILD.gn +++ b/build/android/BUILD.gn @@ -231,7 +231,7 @@ generate_jni("jni_headers") { "//brave/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java", "//brave/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsFactory.java", "//brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java", - "//brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java", + "//brave/android/java/org/chromium/chrome/browser/notifications/channels/BraveSiteChannelsManagerBridge.java", "//brave/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java", "//brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java", "//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java index 2ae9c6d280bfb..38f129f77cbf7 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java @@ -8,11 +8,14 @@ import org.objectweb.asm.ClassVisitor; public class BraveHomepageManagerClassAdapter extends BraveClassVisitor { - static String sHomepageManagerClassName = "org/chromium/chrome/browser/homepage/HomepageManager"; - static String sBraveHomepageManagerClassName = "org/chromium/chrome/browser/homepage/BraveHomepageManager"; + static String sHomepageManagerClassName = + "org/chromium/chrome/browser/homepage/HomepageManager"; + static String sBraveHomepageManagerClassName = + "org/chromium/chrome/browser/homepage/BraveHomepageManager"; public BraveHomepageManagerClassAdapter(ClassVisitor visitor) { super(visitor); - changeMethodOwner(sHomepageManagerClassName, "shouldCloseAppWithZeroTabs", sBraveHomepageManagerClassName); + + redirectConstructor(sHomepageManagerClassName, sBraveHomepageManagerClassName); } } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java index 17382ffaa2595..b29d14720ea86 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java @@ -30,6 +30,21 @@ public BraveNewTabPageLayoutClassAdapter(ClassVisitor visitor) { addMethodAnnotation( sBraveNewTabPageLayoutClassName, "isScrollableMvtEnabled", "Ljava/lang/Override;"); + makePublicMethod(sNewTabPageLayoutClassName, "setSearchProviderTopMargin"); + addMethodAnnotation( + sBraveNewTabPageLayoutClassName, + "setSearchProviderTopMargin", + "Ljava/lang/Override;"); + + makePublicMethod(sNewTabPageLayoutClassName, "setSearchProviderBottomMargin"); + addMethodAnnotation( + sBraveNewTabPageLayoutClassName, + "setSearchProviderBottomMargin", + "Ljava/lang/Override;"); + + deleteMethod(sBraveNewTabPageLayoutClassName, "getLogoMargin"); + makePublicMethod(sNewTabPageLayoutClassName, "getLogoMargin"); + changeSuperName(sNewTabPageLayoutClassName, sNewTabPageLayoutSuperClassName); } } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java index 1fc63beb2f9e3..bc12d85c611d7 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java @@ -95,6 +95,9 @@ public BraveToolbarManagerClassAdapter(ClassVisitor visitor) { deleteField(sBraveToolbarManagerClassName, "mSnackbarManager"); makeProtectedField(sToolbarManagerClassName, "mSnackbarManager"); + deleteField(sBraveToolbarManagerClassName, "mModalDialogManagerSupplier"); + makeProtectedField(sToolbarManagerClassName, "mModalDialogManagerSupplier"); + deleteField(sBraveToolbarManagerClassName, "mTabObscuringHandler"); makeProtectedField(sToolbarManagerClassName, "mTabObscuringHandler"); diff --git a/build/android/config.gni b/build/android/config.gni index 2e07e5752a512..15d59e9e5d701 100644 --- a/build/android/config.gni +++ b/build/android/config.gni @@ -117,7 +117,7 @@ brave_jni_headers_sources = [ "//brave/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java", "//brave/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsFactory.java", "//brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java", - "//brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java", + "//brave/android/java/org/chromium/chrome/browser/notifications/channels/BraveSiteChannelsManagerBridge.java", "//brave/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java", "//brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java", "//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java", diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index 395ae754ed024..71963e5badf44 100644 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -340,6 +340,7 @@ Config.prototype.buildArgs = function () { safe_browsing_mode: 1, brave_services_key: this.braveServicesKey, root_extra_deps: ["//brave"], + clang_unsafe_buffers_paths: "//brave/build/config/unsafe_buffers_paths.txt", // TODO: Re-enable when chromium_src overrides work for files in relative // paths like widevine_cmdm_compoennt_installer.cc // use_jumbo_build: !this.officialBuild, @@ -595,8 +596,8 @@ Config.prototype.buildArgs = function () { args.brave_safebrowsing_api_key = this.braveAndroidSafeBrowsingApiKey args.safe_browsing_mode = 2 - // Feed is not used in Brave - args.enable_feed_v2 = false + // Required since cr126 to use Chrome password store + args.use_login_database_as_backend = true // TODO(fixme) args.enable_tor = false diff --git a/build/commands/lib/updateUnsafeBuffersPaths.js b/build/commands/lib/updateUnsafeBuffersPaths.js new file mode 100644 index 0000000000000..ade9f6e258d39 --- /dev/null +++ b/build/commands/lib/updateUnsafeBuffersPaths.js @@ -0,0 +1,61 @@ +// Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. + + +const config = require('./config') +const fs = require('fs/promises'); +const path = require('path') + +// This function is used to modify build/config/unsafe_buffers_paths.txt, to +// address the issue that the Brave build uses the `-I../../..` flag, which +// allows `src/` files to be included. This alters how `clang` calculates the +// root of the source tree. With this function, all entries in +// unsafe_buffers_paths.txt are duplicated at the end with `src/` prepended to +// them. +async function updateUnsafeBuffersPaths() { + const relativeBuffersPath = ['build', 'config', 'unsafe_buffers_paths.txt']; + const chromiumRepoConfigPath = + path.join(config.srcDir, ...relativeBuffersPath); + const braveGenConfigPath = + path.join(config.srcDir, ...['brave', ...relativeBuffersPath]); + + const repoContent = + await fs.readFile(chromiumRepoConfigPath, {encoding: 'utf8'}) + + // Adding exlusion paths for brave as well, which are also to be corrected + // for src prefix + const bufferPathLines = [ + '# File generated by updateUnsafeBuffersPaths.js. DO NOT edit manually.', + '#', + ...repoContent.split('\n'), + '# Appended path correction for redirect_cc by update_patches.', + '# File patched by brave/build/commands/lib/updateUnsafeBuffersPaths.js.', + '-brave/' + ]; + + updatedPathLines = bufferPathLines.filter( + (line) => line.startsWith('-') || line.startsWith('+')); + updatedPathLines = updatedPathLines.map( + (line) => {return line.slice(0, 1) + 'src/' + line.slice(1)}); + + const updatedContents = + [...bufferPathLines, ...updatedPathLines, ''].join('\n'); + + // To avoid invalidating a lot of objects that might already have been built, + // the file is only updated if there are any changes between the proposed and + // current contents. + try { + currentFileContents = + await fs.readFile(braveGenConfigPath, {encoding: 'utf8'}); + } catch (err) { + // File doesn't exist + currentFileContents = '' + } + if (currentFileContents !== updatedContents) { + await fs.writeFile(braveGenConfigPath, updatedContents) + } +} + +module.exports = updateUnsafeBuffersPaths diff --git a/build/commands/lib/util.js b/build/commands/lib/util.js index 34679be127e35..c1ddaab1955ae 100644 --- a/build/commands/lib/util.js +++ b/build/commands/lib/util.js @@ -12,6 +12,7 @@ const l10nUtil = require('./l10nUtil') const Log = require('./logging') const assert = require('assert') const updateChromeVersion = require('./updateChromeVersion') +const updateUnsafeBuffersPaths = require('./updateUnsafeBuffersPaths.js') const ActionGuard = require('./actionGuard') const mergeWithDefault = (options) => { @@ -65,6 +66,8 @@ async function applyPatches() { process.exit(1) } + await updateUnsafeBuffersPaths() + updateChromeVersion() Log.progressFinish('apply patches') } diff --git a/chromium_presubmit_config.json5 b/chromium_presubmit_config.json5 index 4f6daf184852f..7fea0b8ee5ab8 100644 --- a/chromium_presubmit_config.json5 +++ b/chromium_presubmit_config.json5 @@ -162,7 +162,6 @@ // Maps BanRule.pattern -> BanRule.excluded_paths. "ban_rule_excluded_paths": { "import android.annotation.TargetApi;": [ - "android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge\\.java", "android/java/org/chromium/chrome/browser/qrreader/CameraSource\\.java", "browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/BraveNotificationManagerProxyImpl\\.java", ], diff --git a/chromium_src/chrome/browser/browser_features.cc b/chromium_src/chrome/browser/browser_features.cc index 8c6e1dd39eb27..1842088143201 100644 --- a/chromium_src/chrome/browser/browser_features.cc +++ b/chromium_src/chrome/browser/browser_features.cc @@ -24,7 +24,6 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kKeyPinningComponentUpdater, base::FEATURE_DISABLED_BY_DEFAULT}, {kNewTabPageTriggerForPrerender2, base::FEATURE_DISABLED_BY_DEFAULT}, {kOmniboxTriggerForPrerender2, base::FEATURE_DISABLED_BY_DEFAULT}, - {kOmniboxTriggerForNoStatePrefetch, base::FEATURE_DISABLED_BY_DEFAULT}, {kSupportSearchSuggestionForPrerender2, base::FEATURE_DISABLED_BY_DEFAULT}, }}); diff --git a/chromium_src/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chromium_src/chrome/browser/content_settings/page_specific_content_settings_delegate.cc index 36c57e6fcd1b5..a5e404404bd65 100644 --- a/chromium_src/chrome/browser/content_settings/page_specific_content_settings_delegate.cc +++ b/chromium_src/chrome/browser/content_settings/page_specific_content_settings_delegate.cc @@ -7,11 +7,11 @@ rules->fingerprinting_rules.push_back(ContentSettingPatternSource( \ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), \ content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW), \ - std::string(), incognito)); \ + content_settings::ProviderType::kNone, incognito)); \ rules->brave_shields_rules.push_back(ContentSettingPatternSource( \ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), \ content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW), \ - std::string(), incognito)); + content_settings::ProviderType::kNone, incognito)); #include "src/chrome/browser/content_settings/page_specific_content_settings_delegate.cc" diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc index 3b5d56ea33f9f..bd5f72844ae5a 100644 --- a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc @@ -59,10 +59,13 @@ namespace android { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kAddToHomescreenIPH, base::FEATURE_DISABLED_BY_DEFAULT}, + {kAndroidHub, base::FEATURE_DISABLED_BY_DEFAULT}, {kIncognitoReauthenticationForAndroid, base::FEATURE_ENABLED_BY_DEFAULT}, {kShowScrollableMVTOnNTPAndroid, base::FEATURE_ENABLED_BY_DEFAULT}, {kStartSurfaceAndroid, base::FEATURE_DISABLED_BY_DEFAULT}, {kSurfacePolish, base::FEATURE_DISABLED_BY_DEFAULT}, + {kAdaptiveButtonInTopToolbarCustomizationV2, + base::FEATURE_DISABLED_BY_DEFAULT}, }}); } // namespace android diff --git a/chromium_src/chrome/browser/importer/profile_writer.cc b/chromium_src/chrome/browser/importer/profile_writer.cc index 1b3de818fb1dc..32d4991d6bbad 100644 --- a/chromium_src/chrome/browser/importer/profile_writer.cc +++ b/chromium_src/chrome/browser/importer/profile_writer.cc @@ -40,7 +40,7 @@ void ProfileWriter::AddCreditCard(const std::u16string& name_on_card, expiration_year); } - personal_data->AddCreditCard(credit_card); + personal_data->payments_data_manager().AddCreditCard(credit_card); } #if BUILDFLAG(IS_ANDROID) diff --git a/chromium_src/chrome/browser/signin/signin_features.cc b/chromium_src/chrome/browser/signin/signin_features.cc deleted file mode 100644 index e21d94b6771f4..0000000000000 --- a/chromium_src/chrome/browser/signin/signin_features.cc +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2023 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 https://mozilla.org/MPL/2.0/. */ - -#include "chrome/browser/signin/signin_features.h" - -#include "src/chrome/browser/signin/signin_features.cc" - -#include "base/feature_override.h" - -OVERRIDE_FEATURE_DEFAULT_STATES({{ -#if !BUILDFLAG(IS_ANDROID) - {kForYouFre, base::FEATURE_DISABLED_BY_DEFAULT}, -#endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(ENABLE_DICE_SUPPORT) - {kPreconnectAccountCapabilitiesBeforeSignIn, - base::FEATURE_DISABLED_BY_DEFAULT}, -#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) -#if BUILDFLAG(ENABLE_MIRROR) - {kVerifyRequestInitiatorForMirrorHeaders, - base::FEATURE_DISABLED_BY_DEFAULT}, -#endif // BUILDFLAG(ENABLE_MIRROR) -}}); diff --git a/chromium_src/chrome/browser/ui/cocoa/keystone_infobar_delegate.cc b/chromium_src/chrome/browser/ui/cocoa/keystone_infobar_delegate.cc new file mode 100644 index 0000000000000..757f2b692e706 --- /dev/null +++ b/chromium_src/chrome/browser/ui/cocoa/keystone_infobar_delegate.cc @@ -0,0 +1,7 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +// This override is intentionally empty as we already implement all of the +// required functionality in //brave/browser/mac/keystone_infobar_delegate.mm diff --git a/chromium_src/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chromium_src/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm deleted file mode 100644 index b75a197968453..0000000000000 --- a/chromium_src/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm +++ /dev/null @@ -1,115 +0,0 @@ -/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ - -#include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" - -#include "brave/browser/mac/keystone_glue.h" -#include "chrome/browser/mac/dock.h" -#include "chrome/browser/updater/browser_updater_client_util.h" - -#define PromotionInfoBar PromotionInfoBar_Unused -#define SetupSystemUpdater \ - [[KeystoneGlue defaultKeystoneGlue] promoteTicket]; \ - dock::ChromeIsInTheDock - -#include "src/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm" - -#undef SetupSystemUpdater -#undef PromotionInfoBar - -// KeystonePromotionInfoBar --------------------------------------------------- - -@interface KeystonePromotionInfoBar : NSObject -- (void)checkAndShowInfoBarForProfile:(Profile*)profile; -- (void)updateStatus:(NSNotification*)notification; -- (void)removeObserver; -@end // @interface KeystonePromotionInfoBar - -KeystonePromotionInfoBar* g_currentPromotionInfoBar; - -@implementation KeystonePromotionInfoBar - -- (void)dealloc { - [self removeObserver]; -} - -- (void)checkAndShowInfoBarForProfile:(Profile*)profile { - // If this is the first run, the user clicked the "don't ask again" button - // at some point in the past, or if the "don't ask about the default - // browser" command-line switch is present, bail out. That command-line - // switch is recycled here because it's likely that the set of users that - // don't want to be nagged about the default browser also don't want to be - // nagged about the update check. (Automated testers, I'm thinking of - // you...) - base::CommandLine* commandLine = base::CommandLine::ForCurrentProcess(); - if (first_run::IsChromeFirstRun() || - !profile->GetPrefs()->GetBoolean(prefs::kShowUpdatePromotionInfoBar) || - commandLine->HasSwitch(switches::kNoDefaultBrowserCheck)) { - return; - } - - // If there is no Keystone glue (maybe because this application isn't - // Keystone-enabled) or the application is on a read-only filesystem, - // doing anything related to auto-update is pointless. Bail out. - KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; - if (!keystoneGlue || [keystoneGlue isOnReadOnlyFilesystem]) { - return; - } - - // Stay alive as long as needed. This is balanced in -updateStatus:. - g_currentPromotionInfoBar = self; - - AutoupdateStatus recentStatus = [keystoneGlue recentStatus]; - if (recentStatus == kAutoupdateNone || - recentStatus == kAutoupdateRegistering) { - [NSNotificationCenter.defaultCenter - addObserver:self - selector:@selector(updateStatus:) - name:kAutoupdateStatusNotification - object:nil]; - } else { - [self updateStatus:[keystoneGlue recentNotification]]; - } -} - -- (void)updateStatus:(NSNotification*)notification { - NSDictionary* dictionary = [notification userInfo]; - AutoupdateStatus status = static_cast( - [dictionary[kAutoupdateStatusStatus] intValue]); - - if (status == kAutoupdateNone || status == kAutoupdateRegistering) { - return; - } - - [self removeObserver]; - - if (status != kAutoupdateRegisterFailed && - [[KeystoneGlue defaultKeystoneGlue] needsPromotion]) { - Browser* browser = chrome::FindLastActive(); - if (browser) { - content::WebContents* webContents = - browser->tab_strip_model()->GetActiveWebContents(); - if (webContents) { - KeystonePromotionInfoBarDelegate::Create(webContents); - } - } - } - - g_currentPromotionInfoBar = nil; -} - -- (void)removeObserver { - [NSNotificationCenter.defaultCenter removeObserver:self]; -} - -@end // @implementation KeystonePromotionInfoBar - -// static -void KeystoneInfoBar::PromotionInfoBar(Profile* profile) { - KeystonePromotionInfoBar* promotionInfoBar = - [[KeystonePromotionInfoBar alloc] init]; - - [promotionInfoBar checkAndShowInfoBarForProfile:profile]; -} diff --git a/chromium_src/chrome/browser/ui/layout_constants.cc b/chromium_src/chrome/browser/ui/layout_constants.cc index f4bfc9b26785e..0d18af061b36c 100644 --- a/chromium_src/chrome/browser/ui/layout_constants.cc +++ b/chromium_src/chrome/browser/ui/layout_constants.cc @@ -9,6 +9,7 @@ // Forward declaration int GetLayoutConstant_ChromiumImpl(LayoutConstant constant); +gfx::Insets GetLayoutInsets_ChromiumImpl(LayoutInset inset); #define LayoutConstant LayoutConstant constant) { \ const std::optional braveOption = GetBraveLayoutConstant(constant); \ @@ -21,5 +22,18 @@ int GetLayoutConstant_ChromiumImpl(LayoutConstant constant); \ int GetLayoutConstant_ChromiumImpl(LayoutConstant +#define LayoutInset LayoutInset inset) { \ + const std::optional braveOption = \ + GetBraveLayoutInsets(inset); \ + if (braveOption) { \ + return braveOption.value(); \ + } \ + \ + return GetLayoutInsets_ChromiumImpl(inset); \ + } \ + \ + gfx::Insets GetLayoutInsets_ChromiumImpl(LayoutInset + #include "src/chrome/browser/ui/layout_constants.cc" +#undef LayoutInset #undef LayoutConstant diff --git a/chromium_src/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc b/chromium_src/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc new file mode 100644 index 0000000000000..16f0446e0c254 --- /dev/null +++ b/chromium_src/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc @@ -0,0 +1,13 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#include "brave/browser/ui/views/side_panel/brave_side_panel.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/side_panel/side_panel.h" +#include "chrome/browser/ui/views/side_panel/side_panel_coordinator.h" + +#define SidePanel BraveSidePanel +#include "src/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc" +#undef SidePanel diff --git a/chromium_src/chrome/browser/ui/startup/default_browser_infobar_delegate.cc b/chromium_src/chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.cc similarity index 68% rename from chromium_src/chrome/browser/ui/startup/default_browser_infobar_delegate.cc rename to chromium_src/chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.cc index 5ddcb51e06917..a534b1ffa6ffb 100644 --- a/chromium_src/chrome/browser/ui/startup/default_browser_infobar_delegate.cc +++ b/chromium_src/chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.cc @@ -1,10 +1,10 @@ /* Copyright (c) 2022 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/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/browser/brave_shell_integration.h" #define DefaultBrowserWorker BraveDefaultBrowserWorker -#include "src/chrome/browser/ui/startup/default_browser_infobar_delegate.cc" +#include "src/chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.cc" #undef DefaultBrowserWorker diff --git a/chromium_src/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chromium_src/chrome/browser/ui/startup/startup_browser_creator_impl.cc index b7a82a699572d..4875fc23787e1 100644 --- a/chromium_src/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chromium_src/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -3,8 +3,44 @@ * 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 BRAVE_STARTUPBROWSERCREATORIMPL_DETERMINEURLSANDLAUNCH \ - welcome_enabled = true; +#include "brave/browser/ui/startup/brave_startup_tab_provider_impl.h" +#include "build/build_config.h" +#include "chrome/browser/buildflags.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/startup/startup_browser_creator.h" +#include "chrome/browser/ui/startup/startup_tab_provider.h" +#include "components/signin/public/base/signin_buildflags.h" + +#if BUILDFLAG(ENABLE_UPDATER) +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" +#include "chrome/browser/ui/startup/startup_types.h" +#endif + +#if BUILDFLAG(IS_MAC) && BUILDFLAG(ENABLE_UPDATER) +namespace { +void MaybeShowPromotionInfoBar( + chrome::startup::IsProcessStartup process_startup) { + if (process_startup == chrome::startup::IsProcessStartup::kYes) { + // Check whether the auto-update system needs to be promoted from user + // to system. + ShowUpdaterPromotionInfoBar(); + } +} +} // namespace + +#define GetLastActive \ + GetLastActive(); \ + MaybeShowPromotionInfoBar(process_startup); \ + BrowserList::GetInstance()->GetLastActive +#endif + +#define StartupTabProviderImpl BraveStartupTabProviderImpl #include "src/chrome/browser/ui/startup/startup_browser_creator_impl.cc" -#undef BRAVE_STARTUPBROWSERCREATORIMPL_DETERMINEURLSANDLAUNCH + +#if BUILDFLAG(IS_MAC) && BUILDFLAG(ENABLE_UPDATER) +#undef GetLastActive +#endif + +#undef StartupTabProviderImpl diff --git a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 7d6bfb5977824..87e798966c214 100644 --- a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -6,9 +6,5 @@ #define BRAVE_BOOKMARK_BUBBLE_VIEW_SHOW_BUBBLE_SET_ARROW \ bubble->SetArrow(views::BubbleBorder::TOP_LEFT); -#define BRAVE_BOOKMARK_BUBBLE_VIEW_SHOW_BUBBLE_SHOW_SIMPLIFIED \ - show_simplified_flow = false; - #include "src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc" -#undef BRAVE_BOOKMARK_BUBBLE_VIEW_SHOW_BUBBLE_SHOW_SIMPLIFIED #undef BRAVE_BOOKMARK_BUBBLE_VIEW_SHOW_BUBBLE_SET_ARROW diff --git a/chromium_src/chrome/browser/ui/views/frame/tab_strip_region_view.h b/chromium_src/chrome/browser/ui/views/frame/tab_strip_region_view.h index 46a9cab5358ca..ed9ee09eeaf8c 100644 --- a/chromium_src/chrome/browser/ui/views/frame/tab_strip_region_view.h +++ b/chromium_src/chrome/browser/ui/views/frame/tab_strip_region_view.h @@ -18,8 +18,11 @@ FRIEND_TEST_ALL_PREFIXES(VerticalTabStripBrowserTest, MinHeight); \ bool IsPositionInWindowCaption +#define UpdateTabStripMargin virtual UpdateTabStripMargin + #include "src/chrome/browser/ui/views/frame/tab_strip_region_view.h" // IWYU pragma: export +#undef UpdateTabStripMargin #undef IsPositionInWindowCaption #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_FRAME_TAB_STRIP_REGION_VIEW_H_ diff --git a/chromium_src/chrome/browser/ui/views/location_bar/location_bar_util.cc b/chromium_src/chrome/browser/ui/views/location_bar/location_bar_util.cc new file mode 100644 index 0000000000000..af18e8f9a3461 --- /dev/null +++ b/chromium_src/chrome/browser/ui/views/location_bar/location_bar_util.cc @@ -0,0 +1,22 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#include "chrome/browser/ui/views/location_bar/location_bar_util.h" + +#define ConfigureInkDropForRefresh2023 \ + ConfigureInkDropForRefresh2023_ChromiumImpl + +#include "src/chrome/browser/ui/views/location_bar/location_bar_util.cc" + +#undef ConfigureInkDropForRefresh2023 + +void ConfigureInkDropForRefresh2023(views::View* const view, + const ChromeColorIds hover_color_id, + const ChromeColorIds ripple_color_id) { + if (features::IsChromeRefresh2023()) { + ConfigureInkDropForRefresh2023_ChromiumImpl(view, hover_color_id, + ripple_color_id); + } +} diff --git a/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view.cc index 65c08048d9b2a..ebaca48b6537a 100644 --- a/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -7,6 +7,7 @@ #include "brave/browser/ui/omnibox/brave_omnibox_client_impl.h" #include "brave/browser/ui/views/omnibox/brave_omnibox_view_views.h" #include "brave/browser/ui/views/page_action/brave_page_action_icon_container_view.h" +#include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" // |icon_left| - Padding between left border of location bar and first @@ -15,6 +16,7 @@ // If last decoration has label, it has sufficient padding inside. // If custom padding is provided(text_left is not null), respect // it. Otherwise, set our design value - 5px. +// Both value could be updated when |should_indent| is true. #define BRAVE_LAYOUT_LEADING_DECORATIONS \ icon_left = GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING); \ if (text_left == 0 && !location_icon_view_->ShouldShowLabel()) { \ @@ -33,7 +35,12 @@ #define OmniboxViewViews BraveOmniboxViewViews #define ChromeOmniboxClient BraveOmniboxClientImpl #define PageActionIconContainerView BravePageActionIconContainerView + +// We don't use different hover color when omnibox doesn't have focus but still +// contains in-progress user input. +#define kColorOmniboxResultsBackgroundHovered kColorLocationBarBackground #include "src/chrome/browser/ui/views/location_bar/location_bar_view.cc" +#undef kColorOmniboxResultsBackgroundHovered #undef PageActionIconContainerView #undef ChromeOmniboxClient #undef OmniboxViewViews diff --git a/chromium_src/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chromium_src/chrome/browser/ui/views/omnibox/omnibox_result_view.cc new file mode 100644 index 0000000000000..f77711c50ff73 --- /dev/null +++ b/chromium_src/chrome/browser/ui/views/omnibox/omnibox_result_view.cc @@ -0,0 +1,15 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" + +#include "ui/views/background.h" + +#define CreateThemedRoundedRectBackground(...) \ + CreateThemedRoundedRectBackground(GetOmniboxBackgroundColorId(part_state), 0) + +#include "src/chrome/browser/ui/views/omnibox/omnibox_result_view.cc" + +#undef CreateThemedRoundedRectBackground diff --git a/chromium_src/chrome/browser/ui/views/omnibox/omnibox_row_view.cc b/chromium_src/chrome/browser/ui/views/omnibox/omnibox_row_view.cc index d71c90c6da3be..c1d31e1a6ae9b 100644 --- a/chromium_src/chrome/browser/ui/views/omnibox/omnibox_row_view.cc +++ b/chromium_src/chrome/browser/ui/views/omnibox/omnibox_row_view.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "chrome/browser/ui/views/omnibox/omnibox_row_view.h" + #include "brave/browser/ui/views/omnibox/brave_omnibox_result_view.h" #include "chrome/browser/ui/views/omnibox/omnibox_header_view.h" #include "chrome/browser/ui/views/omnibox/omnibox_popup_view_views.h" @@ -15,5 +17,11 @@ // This substitution is being added to have OmniboxRowView adding a // BraveOmniboxResultView instance as a child view, in the constructor code. #define OmniboxResultView BraveOmniboxResultView +#define GetInsets GetInsets_UnUsed #include "src/chrome/browser/ui/views/omnibox/omnibox_row_view.cc" +#undef GetInsets #undef OmniboxResultView + +gfx::Insets OmniboxRowView::GetInsets() const { + return gfx::Insets(); +} diff --git a/chromium_src/chrome/browser/ui/views/omnibox/omnibox_row_view.h b/chromium_src/chrome/browser/ui/views/omnibox/omnibox_row_view.h new file mode 100644 index 0000000000000..26af2d7b6b264 --- /dev/null +++ b/chromium_src/chrome/browser/ui/views/omnibox/omnibox_row_view.h @@ -0,0 +1,19 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_ROW_VIEW_H_ +#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_ROW_VIEW_H_ + +#include "ui/views/view.h" + +#define GetInsets \ + GetInsets_UnUsed() const; \ + gfx::Insets GetInsets + +#include "src/chrome/browser/ui/views/omnibox/omnibox_row_view.h" // IWYU pragma: export + +#undef GetInsets + +#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_ diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc new file mode 100644 index 0000000000000..cc8b3f3bb13fb --- /dev/null +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc @@ -0,0 +1,40 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#include "chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.h" + +#include "chrome/browser/user_education/user_education_service.h" +#include "ui/views/layout/flex_layout.h" + +namespace { + +// If a "learn more" footer has been added to the bubble view, remove it and +// ensure that the view's interior margins are correct. +void MaybeRemoveFooter(TabGroupEditorBubbleView* bubble_view, + views::View* footer) { + if (!footer) { + return; + } + + auto footer_holder = bubble_view->RemoveChildViewT(footer); + + auto* layout = + static_cast(bubble_view->GetLayoutManager()); + CHECK(layout); + gfx::Insets margin = layout->interior_margin(); + margin.set_bottom(margin.top()); + layout->SetInteriorMargin(margin); +} + +} // namespace + +#define CreateBubble(bubble_view) \ + CreateBubble(bubble_view); \ + MaybeRemoveFooter(bubble_view, bubble_view->footer_); \ + bubble_view->footer_ = nullptr + +#include "src/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc" + +#undef CreateBubble diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc index 21f376d3bf0cd..55faf765eed84 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc @@ -18,17 +18,9 @@ #include "content/public/common/url_constants.h" #include "ui/views/controls/label.h" -// In addition to the feature flag, we also enable hover card previews when -// the tab hover mode is CARD_WITH_PREVIEW. -#define AreHoverCardImagesEnabled() \ - AreHoverCardImagesEnabled() || \ - brave_tabs::AreCardPreviewsEnabled( \ - tab->controller()->GetBrowser()->profile()->GetPrefs()) - #define TabHoverCardBubbleView TabHoverCardBubbleView_ChromiumImpl #include "src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc" #undef TabHoverCardBubbleView -#undef AreHoverCardImagesEnabled void TabHoverCardBubbleView_ChromiumImpl::BraveUpdateCardContent( const Tab* tab) { diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller.h b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller.h index eef3ccb1ecb87..606e15c0de91b 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller.h +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller.h @@ -12,8 +12,13 @@ friend class BraveTabHoverCardController; \ virtual void CreateHoverCard +#define OnHovercardImagesEnabledChanged \ + OnHovercardImagesEnabledChanged_Unused(); \ + virtual void OnHovercardImagesEnabledChanged + #include "src/chrome/browser/ui/views/tabs/tab_hover_card_controller.h" // IWYU pragma: export +#undef OnHovercardImagesEnabledChanged #undef CreateHoverCard #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_HOVER_CARD_CONTROLLER_H_ diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_strip_control_button.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_strip_control_button.cc new file mode 100644 index 0000000000000..22fb7959c71f7 --- /dev/null +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_strip_control_button.cc @@ -0,0 +1,26 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#include "chrome/browser/ui/views/tabs/tab_strip_control_button.h" + +#include "chrome/browser/ui/views/chrome_layout_provider.h" + +#define TabStripControlButton TabStripControlButton_ChromiumImpl + +#include "src/chrome/browser/ui/views/tabs/tab_strip_control_button.cc" + +#undef TabStripControlButton + +TabStripControlButton::~TabStripControlButton() = default; + +int TabStripControlButton::GetCornerRadius() const { + // Ensure that tabstrip buttons have the correct rounded rect shape, and not + // a circular shape. + return ChromeLayoutProvider::Get()->GetCornerRadiusMetric( + views::Emphasis::kMaximum, GetContentsBounds().size()); +} + +BEGIN_METADATA(TabStripControlButton) +END_METADATA diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_strip_control_button.h b/chromium_src/chrome/browser/ui/views/tabs/tab_strip_control_button.h index 42a0a79665676..731b4299ef9b8 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_strip_control_button.h +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_strip_control_button.h @@ -6,6 +6,7 @@ #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_CONTROL_BUTTON_H_ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_CONTROL_BUTTON_H_ +#define TabStripControlButton TabStripControlButton_ChromiumImpl #define UpdateInkDrop virtual UpdateInkDrop #define GetForegroundColor virtual GetForegroundColor @@ -13,5 +14,14 @@ #undef GetForegroundColor #undef UpdateInkDrop +#undef TabStripControlButton + +class TabStripControlButton : public TabStripControlButton_ChromiumImpl { + METADATA_HEADER(TabStripControlButton, TabStripControlButton_ChromiumImpl) + public: + using TabStripControlButton_ChromiumImpl::TabStripControlButton_ChromiumImpl; + ~TabStripControlButton() override; + int GetCornerRadius() const override; +}; #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_CONTROL_BUTTON_H_ diff --git a/chromium_src/chrome/browser/ui/views/translate/translate_icon_view.cc b/chromium_src/chrome/browser/ui/views/translate/translate_icon_view.cc index aa8dbbc77c949..ef8531ac4bc33 100644 --- a/chromium_src/chrome/browser/ui/views/translate/translate_icon_view.cc +++ b/chromium_src/chrome/browser/ui/views/translate/translate_icon_view.cc @@ -5,10 +5,15 @@ #include "brave/app/vector_icons/vector_icons.h" #include "chrome/app/vector_icons/vector_icons.h" +#include "components/vector_icons/vector_icons.h" + +#define vector_icons +#define kTranslateChromeRefreshIcon_ChromiumImpl kTranslateChromeRefreshIcon +#define kTranslateChromeRefreshIcon kBraveTranslateIcon -#define kTranslateIcon_ChromiumImpl kTranslateIcon -#define kTranslateIcon kBraveTranslateIcon #include "src/chrome/browser/ui/views/translate/translate_icon_view.cc" -#undef kTranslateIcon -#define kTranslateIcon kTranslateIcon_ChromiumImpl -#undef kTranslateIcon_ChromiumImpl + +#undef vector_icons +#undef kTranslateChromeRefreshIcon +#define kTranslateChromeRefreshIcon kTranslateChromeRefreshIcon_ChromiumImpl +#undef kTranslateChromeRefreshIcon_ChromiumImpl diff --git a/chromium_src/chrome/browser/ui/webui/favicon_source.cc b/chromium_src/chrome/browser/ui/webui/favicon_source.cc index 9a8bcceedb64a..ad4fb2ca39ae3 100644 --- a/chromium_src/chrome/browser/ui/webui/favicon_source.cc +++ b/chromium_src/chrome/browser/ui/webui/favicon_source.cc @@ -71,7 +71,7 @@ class InstantService { // before the change. #if !defined(TOOLKIT_VIEWS) namespace webui { -ui::NativeTheme* GetNativeTheme(content::WebContents* web_contents) { +ui::NativeTheme* GetNativeThemeDeprecated(content::WebContents* web_contents) { return ui::NativeTheme::BraveGetInstanceForNativeUi(); } } // namespace webui diff --git a/chromium_src/chrome/browser/ui/webui/password_manager/password_manager_ui.cc b/chromium_src/chrome/browser/ui/webui/password_manager/password_manager_ui.cc index f3ab2bed985d7..e262107597955 100644 --- a/chromium_src/chrome/browser/ui/webui/password_manager/password_manager_ui.cc +++ b/chromium_src/chrome/browser/ui/webui/password_manager/password_manager_ui.cc @@ -20,16 +20,12 @@ void BraveAddPasswordManagerResources(content::WebUIDataSource* source, } // namespace -#define SetupChromeRefresh2023(SOURCE) \ - SetupChromeRefresh2023(SOURCE); \ - BraveAddPasswordManagerResources(source, profile); - #define SetupWebUIDataSource(...) \ SetupWebUIDataSource(__VA_ARGS__); \ source->AddResourcePath("images/password_manager_logo.svg", \ - IDR_BRAVE_PASSWORD_MANAGER_LOGO) + IDR_BRAVE_PASSWORD_MANAGER_LOGO); \ + BraveAddPasswordManagerResources(source, profile); #include "src/chrome/browser/ui/webui/password_manager/password_manager_ui.cc" #undef SetupWebUIDataSource -#undef SetupChromeRefresh2023 diff --git a/chromium_src/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h b/chromium_src/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h index b1ea2ca77f39b..91393af6ee2ca 100644 --- a/chromium_src/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h +++ b/chromium_src/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h @@ -7,9 +7,11 @@ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_WEBUI_SIDE_PANEL_BOOKMARKS_BOOKMARKS_SIDE_PANEL_UI_H_ #define BookmarksSidePanelUI BookmarksSidePanelUI_ChromiumImpl +#define BookmarksSidePanelUIConfig BookmarksSidePanelUIConfig_Unused #include "src/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h" // IWYU pragma: export +#undef BookmarksSidePanelUIConfig #undef BookmarksSidePanelUI class BookmarksSidePanelUI : public BookmarksSidePanelUI_ChromiumImpl { @@ -18,4 +20,12 @@ class BookmarksSidePanelUI : public BookmarksSidePanelUI_ChromiumImpl { ~BookmarksSidePanelUI() override; }; +class BookmarksSidePanelUIConfig + : public content::DefaultWebUIConfig { + public: + BookmarksSidePanelUIConfig() + : DefaultWebUIConfig(content::kChromeUIScheme, + chrome::kChromeUIBookmarksSidePanelHost) {} +}; + #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_WEBUI_SIDE_PANEL_BOOKMARKS_BOOKMARKS_SIDE_PANEL_UI_H_ diff --git a/chromium_src/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.cc b/chromium_src/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.cc index ea9cf7fbf2409..8eedcb9c443b1 100644 --- a/chromium_src/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.cc +++ b/chromium_src/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.cc @@ -3,10 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.h" + #include -#include "chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.h" #include "components/sessions/content/session_tab_helper.h" +#include "components/site_engagement/content/site_engagement_helper.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chromium_src/chrome/browser/unexpire_flags.cc b/chromium_src/chrome/browser/unexpire_flags.cc index 4d3278de2fc71..e7e26c59fd9ac 100644 --- a/chromium_src/chrome/browser/unexpire_flags.cc +++ b/chromium_src/chrome/browser/unexpire_flags.cc @@ -46,11 +46,6 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage, return true; } - if (base::EqualsCaseInsensitiveASCII(flag_descriptions::kChromeRefresh2023Id, - internal_name)) { - return true; - } - return IsFlagExpired_ChromiumImpl(storage, internal_name); } diff --git a/chromium_src/components/metrics/structured/structured_metrics_features.cc b/chromium_src/components/metrics/structured/structured_metrics_features.cc index 64b434bdb9b93..e86d708b0b3b6 100644 --- a/chromium_src/components/metrics/structured/structured_metrics_features.cc +++ b/chromium_src/components/metrics/structured/structured_metrics_features.cc @@ -11,7 +11,6 @@ namespace metrics::structured { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kEnabledStructuredMetricsService, base::FEATURE_DISABLED_BY_DEFAULT}, - {kNearbyShareMetrics, base::FEATURE_DISABLED_BY_DEFAULT}, {kPhoneHubStructuredMetrics, base::FEATURE_DISABLED_BY_DEFAULT}, }}); diff --git a/chromium_src/components/permissions/permission_uma_util.cc b/chromium_src/components/permissions/permission_uma_util.cc index 2fb57a36e2f6d..27259dd668b4e 100644 --- a/chromium_src/components/permissions/permission_uma_util.cc +++ b/chromium_src/components/permissions/permission_uma_util.cc @@ -16,6 +16,15 @@ case RequestType::kBraveLocalhostAccessPermission: \ return RequestTypeForUma::PERMISSION_VR; +// These requests may be batched together, so we must handle them explicitly as +// GetUmaValueForRequests expects only a few specific request types to be +// batched +#define BRAVE_GET_UMA_VALUE_FOR_REQUESTS \ + if (request_type >= RequestType::kWidevine && \ + request_type <= RequestType::kBraveLocalhostAccessPermission) { \ + return GetUmaValueForRequestType(request_type); \ + } + // We do not record permissions UKM and this can save us from patching // in RecordPermissionAction for unhandling switch cases for Brave's content // settings type. @@ -26,5 +35,6 @@ PermissionsClient::Get()->GetUkmSourceId #include "src/components/permissions/permission_uma_util.cc" +#undef BRAVE_GET_UMA_VALUE_FOR_REQUESTS #undef BRAVE_GET_UMA_VALUE_FOR_REQUEST_TYPE #undef GetUkmSourceId diff --git a/chromium_src/components/permissions/request_type.cc b/chromium_src/components/permissions/request_type.cc index 6ad0429b3429c..53371229d8040 100644 --- a/chromium_src/components/permissions/request_type.cc +++ b/chromium_src/components/permissions/request_type.cc @@ -19,10 +19,6 @@ namespace { constexpr auto kAndroidStorageAccess = IDR_ANDROID_STORAGE_ACCESS; } // namespace -#else -namespace vector_icons { -constexpr auto& kMicIconValue = vector_icons::kMicIcon; -} // namespace vector_icons #endif // Add Brave cases into GetIconIdAndroid. @@ -38,8 +34,8 @@ constexpr auto& kMicIconValue = vector_icons::kMicIcon; return IDR_ANDROID_INFOBAR_PERMISSION_COOKIE // Add Brave cases into GetIconIdDesktop. -#define kMicIcon \ - kMicIconValue; \ +#define kStorageAccessIcon \ + kStorageAccessIcon; \ case RequestType::kWidevine: \ case RequestType::kBraveEthereum: \ case RequestType::kBraveSolana: \ @@ -73,7 +69,7 @@ constexpr auto& kMicIconValue = vector_icons::kMicIcon; #undef RequestTypeToContentSettingsType #undef ContentSettingsTypeToRequestType #undef BRAVE_PERMISSION_KEY_FOR_REQUEST_TYPE -#undef kMicIcon +#undef kStorageAccessIcon #undef IDR_ANDROID_STORAGE_ACCESS namespace permissions { diff --git a/chromium_src/components/privacy_sandbox/privacy_sandbox_features.cc b/chromium_src/components/privacy_sandbox/privacy_sandbox_features.cc index 2c02a28aae844..744df4e566abc 100644 --- a/chromium_src/components/privacy_sandbox/privacy_sandbox_features.cc +++ b/chromium_src/components/privacy_sandbox/privacy_sandbox_features.cc @@ -10,7 +10,6 @@ namespace privacy_sandbox { OVERRIDE_FEATURE_DEFAULT_STATES({{ - {kCookieSettingsUiAlignment, base::FEATURE_DISABLED_BY_DEFAULT}, {kEnforcePrivacySandboxAttestations, base::FEATURE_DISABLED_BY_DEFAULT}, {kOverridePrivacySandboxSettingsLocalTesting, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc index dd2878440bc03..e58c7fa6f1c91 100644 --- a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc +++ b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc @@ -83,10 +83,11 @@ void SetupTestState( } content_settings::TestUtils::OverrideProvider( - map, std::move(user_provider), HostContentSettingsMap::DEFAULT_PROVIDER); + map, std::move(user_provider), + content_settings::ProviderType::kDefaultProvider); content_settings::TestUtils::OverrideProvider( map, std::move(managed_provider), - HostContentSettingsMap::POLICY_PROVIDER); + content_settings::ProviderType::kPolicyProvider); } } // namespace @@ -104,6 +105,7 @@ class MockPrivacySandboxDelegate : public PrivacySandboxSettings::Delegate { MOCK_METHOD(bool, IsIncognitoProfile, (), (const, override)); MOCK_METHOD(bool, HasAppropriateTopicsConsent, (), (const, override)); MOCK_METHOD(bool, IsSubjectToM1NoticeRestricted, (), (const, override)); + MOCK_METHOD(bool, IsRestrictedNoticeEnabled, (), (const, override)); MOCK_METHOD(bool, IsPrivacySandboxCurrentlyUnrestricted, (), @@ -142,7 +144,8 @@ class PrivacySandboxSettingsTest : public testing::Test { /*tpcd_metadata_manager=*/nullptr, "chrome-extension"); tracking_protection_settings_ = std::make_unique( - &prefs_, nullptr, /*is_incognito=*/false); + &prefs_, host_content_settings_map_.get(), + /*onboarding_service=*/nullptr, /*is_incognito=*/false); } ~PrivacySandboxSettingsTest() override { host_content_settings_map()->ShutdownOnUIThread(); diff --git a/chromium_src/components/signin/public/base/signin_switches.cc b/chromium_src/components/signin/public/base/signin_switches.cc new file mode 100644 index 0000000000000..bce8557132c8e --- /dev/null +++ b/chromium_src/components/signin/public/base/signin_switches.cc @@ -0,0 +1,15 @@ +/* Copyright (c) 2023 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 https://mozilla.org/MPL/2.0/. */ + +#include "src/components/signin/public/base/signin_switches.cc" + +#include "base/feature_override.h" + +OVERRIDE_FEATURE_DEFAULT_STATES({{ +#if BUILDFLAG(ENABLE_MIRROR) && !BUILDFLAG(IS_IOS) + {kVerifyRequestInitiatorForMirrorHeaders, + base::FEATURE_DISABLED_BY_DEFAULT}, +#endif // BUILDFLAG(ENABLE_MIRROR) && !BUILDFLAG(IS_IOS) +}}); diff --git a/chromium_src/components/signin/public/identity_manager/identity_manager.cc b/chromium_src/components/signin/public/identity_manager/identity_manager.cc index caaf3cfd5084f..29e2365361565 100644 --- a/chromium_src/components/signin/public/identity_manager/identity_manager.cc +++ b/chromium_src/components/signin/public/identity_manager/identity_manager.cc @@ -9,7 +9,9 @@ #include #define GetAccountsInCookieJar GetAccountsInCookieJar_Unused +#define PrepareForAddingNewAccount PrepareForAddingNewAccount_Unused #include "src/components/signin/public/identity_manager/identity_manager.cc" +#undef PrepareForAddingNewAccount #undef GetAccountsInCookieJar namespace signin { @@ -21,4 +23,6 @@ AccountsInCookieJarInfo IdentityManager::GetAccountsInCookieJar() const { std::vector()); } +void IdentityManager::PrepareForAddingNewAccount() {} + } // namespace signin diff --git a/chromium_src/components/signin/public/identity_manager/identity_manager.h b/chromium_src/components/signin/public/identity_manager/identity_manager.h index 8c60d1d440657..b70e4dd2bfb3e 100644 --- a/chromium_src/components/signin/public/identity_manager/identity_manager.h +++ b/chromium_src/components/signin/public/identity_manager/identity_manager.h @@ -10,8 +10,13 @@ GetAccountsInCookieJar_Unused() const; \ AccountsInCookieJarInfo GetAccountsInCookieJar +#define PrepareForAddingNewAccount \ + PrepareForAddingNewAccount_Unused(); \ + void PrepareForAddingNewAccount + #include "src/components/signin/public/identity_manager/identity_manager.h" // IWYU pragma: export +#undef PrepareForAddingNewAccount #undef GetAccountsInCookieJar #endif // BRAVE_CHROMIUM_SRC_COMPONENTS_SIGNIN_PUBLIC_IDENTITY_MANAGER_IDENTITY_MANAGER_H_ diff --git a/chromium_src/components/sync/base/model_type_unittest.cc b/chromium_src/components/sync/base/model_type_unittest.cc index 17cb76e797a65..8deb43c10f4a8 100644 --- a/chromium_src/components/sync/base/model_type_unittest.cc +++ b/chromium_src/components/sync/base/model_type_unittest.cc @@ -21,7 +21,7 @@ TEST(ModelTypeTest, LowPriorityUserTypes) { // This test is supposed to fail when sync types are increased/decreased TEST(ModelTypeTest, ModelTypeCounts) { - EXPECT_EQ(static_cast(ModelTypeForHistograms::kMaxValue), 66); + EXPECT_EQ(static_cast(ModelTypeForHistograms::kMaxValue), 67); } } // namespace diff --git a/chromium_src/components/sync_device_info/device_info_sync_bridge.cc b/chromium_src/components/sync_device_info/device_info_sync_bridge.cc index d2e6b4b487a1d..5d1137bcc1fd0 100644 --- a/chromium_src/components/sync_device_info/device_info_sync_bridge.cc +++ b/chromium_src/components/sync_device_info/device_info_sync_bridge.cc @@ -6,6 +6,7 @@ #include "components/sync_device_info/device_info_sync_bridge.h" #include "brave/components/sync_device_info/brave_device_info.h" +#include "components/sync/base/deletion_origin.h" #define BRAVE_MAKE_LOCAL_DEVICE_SPECIFICS \ specifics->mutable_brave_fields()->set_is_self_delete_supported(true); @@ -80,7 +81,8 @@ std::unique_ptr BraveSpecificsToModel( void DeviceInfoSyncBridge::DeleteDeviceInfo(const std::string& client_id, base::OnceClosure callback) { std::unique_ptr batch = store_->CreateWriteBatch(); - change_processor()->Delete(client_id, batch->GetMetadataChangeList()); + change_processor()->Delete(client_id, DeletionOrigin::Unspecified(), + batch->GetMetadataChangeList()); DeleteSpecifics(client_id, batch.get()); batch->GetMetadataChangeList()->ClearMetadata(client_id); CommitAndNotify(std::move(batch), /*should_notify=*/true); diff --git a/chromium_src/components/sync_device_info/device_info_sync_bridge_unittest.cc b/chromium_src/components/sync_device_info/device_info_sync_bridge_unittest.cc index 126da1aefb563..9688a77ddd743 100644 --- a/chromium_src/components/sync_device_info/device_info_sync_bridge_unittest.cc +++ b/chromium_src/components/sync_device_info/device_info_sync_bridge_unittest.cc @@ -63,7 +63,7 @@ TEST_F(DeviceInfoSyncBridgeTest, LocalDelete) { const std::string kLocalGuid = CacheGuidForSuffix(kLocalSuffix); ON_CALL(*processor(), IsEntityUnsynced(kLocalGuid)) .WillByDefault(Return(false)); - EXPECT_CALL(*processor(), Delete(kLocalGuid, _)).Times(1); + EXPECT_CALL(*processor(), Delete(kLocalGuid, _, _)).Times(1); bool deleted_device_info_sent = false; base::RunLoop loop; @@ -100,7 +100,7 @@ TEST_F(DeviceInfoSyncBridgeTest, RemoteDelete) { const std::string kLocalGuid = CacheGuidForSuffix(kLocalSuffix); ON_CALL(*processor(), IsEntityUnsynced(specifics.cache_guid())) .WillByDefault(Return(false)); - EXPECT_CALL(*processor(), Delete(specifics.cache_guid(), _)).Times(1); + EXPECT_CALL(*processor(), Delete(specifics.cache_guid(), _, _)).Times(1); bool deleted_device_info_sent = false; base::RunLoop loop; @@ -140,7 +140,7 @@ TEST_F(DeviceInfoSyncBridgeTest, LocalDeleteWhenOffline) { // The statement below means that DeviceInfoSyncBridge::OnDeviceInfoDeleted // 5 times did check of IsEntityUnsynced for the entity being deleted EXPECT_CALL(*processor(), IsEntityUnsynced).Times(5); - EXPECT_CALL(*processor(), Delete(kLocalGuid, _)).Times(1); + EXPECT_CALL(*processor(), Delete(kLocalGuid, _, _)).Times(1); bool deleted_device_info_sent = false; base::RunLoop loop; diff --git a/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc b/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc index 360964af58742..c0041d75c2d73 100644 --- a/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc +++ b/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc @@ -10,7 +10,9 @@ namespace content { OVERRIDE_FEATURE_DEFAULT_STATES({{ - {kPrivateAggregationApiBundledEnhancements, + {kPrivateAggregationApiDebugModeRequires3pcEligibility, + base::FEATURE_DISABLED_BY_DEFAULT}, + {kPrivateAggregationApiContextIdEnhancements, base::FEATURE_DISABLED_BY_DEFAULT}, }}); diff --git a/chromium_src/content/browser/web_package/signed_exchange_utils.cc b/chromium_src/content/browser/web_package/signed_exchange_utils.cc new file mode 100644 index 0000000000000..7bd51b3915b7b --- /dev/null +++ b/chromium_src/content/browser/web_package/signed_exchange_utils.cc @@ -0,0 +1,21 @@ +/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ + +#include "content/browser/web_package/signed_exchange_utils.h" + +namespace content { +namespace signed_exchange_utils { + +bool IsSignedExchangeReportingForDistributorsEnabled() { + return false; +} + +} // namespace signed_exchange_utils +} // namespace content + +#define IsSignedExchangeReportingForDistributorsEnabled \ + IsSignedExchangeReportingForDistributorsEnabled_Chromium +#include "src/content/browser/web_package/signed_exchange_utils.cc" +#undef IsSignedExchangeReportingForDistributorsEnabled diff --git a/chromium_src/content/common/features.cc b/chromium_src/content/common/features.cc index 7569525802bce..50c5703b1cd48 100644 --- a/chromium_src/content/common/features.cc +++ b/chromium_src/content/common/features.cc @@ -15,8 +15,6 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ base::FEATURE_DISABLED_BY_DEFAULT}, {kResourceTimingForCancelledNavigationInFrame, base::FEATURE_DISABLED_BY_DEFAULT}, - {kSignedExchangeReportingForDistributors, - base::FEATURE_DISABLED_BY_DEFAULT}, {kServiceWorkerAutoPreload, base::FEATURE_DISABLED_BY_DEFAULT}, }}); diff --git a/chromium_src/content/public/common/content_features.cc b/chromium_src/content/public/common/content_features.cc index bc04820ba6b21..01c197e147588 100644 --- a/chromium_src/content/public/common/content_features.cc +++ b/chromium_src/content/public/common/content_features.cc @@ -22,8 +22,6 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kDigitalGoodsApi, base::FEATURE_DISABLED_BY_DEFAULT}, {kDIPS, base::FEATURE_DISABLED_BY_DEFAULT}, {kFedCm, base::FEATURE_DISABLED_BY_DEFAULT}, - {kLegacyTechReportEnableCookieIssueReports, - base::FEATURE_DISABLED_BY_DEFAULT}, {kNotificationTriggers, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrivacySandboxAdsAPIsOverride, base::FEATURE_DISABLED_BY_DEFAULT}, {kSignedHTTPExchange, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/chromium_src/google_apis/google_api_keys.cc b/chromium_src/google_apis/google_api_keys-inc.cc similarity index 71% rename from chromium_src/google_apis/google_api_keys.cc rename to chromium_src/google_apis/google_api_keys-inc.cc index 48534fbba141f..6ddd148567e09 100644 --- a/chromium_src/google_apis/google_api_keys.cc +++ b/chromium_src/google_apis/google_api_keys-inc.cc @@ -1,10 +1,9 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. +/* Copyright (c) 2024 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/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/chromium_src/google_apis/google_api_keys.h" -#include "src/google_apis/google_api_keys.cc" +#include "src/google_apis/google_api_keys-inc.cc" namespace google_apis { diff --git a/chromium_src/third_party/blink/public/web/web_document.h b/chromium_src/third_party/blink/public/web/web_document.h index 55ce87806eadf..e8c4befdfb49e 100644 --- a/chromium_src/third_party/blink/public/web/web_document.h +++ b/chromium_src/third_party/blink/public/web/web_document.h @@ -7,7 +7,8 @@ #define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_DOCUMENT_H_ #define IsPluginDocument \ - IsDOMFeaturePolicyEnabled(v8::Local context, \ + IsDOMFeaturePolicyEnabled(v8::Isolate* isolate, \ + v8::Local context, \ const WebString& feature); \ bool IsPluginDocument diff --git a/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py index a62a622cef3e6..683a421a6e55c 100644 --- a/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py @@ -186,8 +186,6 @@ def _append_report_page_graph_api_call_event(cg_context, expr): if not _should_track_in_page_graph(cg_context): return expr - if cg_context.no_alloc_direct_call_for_testing: - return expr # `expr`` is a C++ code (a simple string) that contains the call and the # return value assignment. Make sure it's a single-lined expression as it's # originally implemented in upstream `_make_blink_api_call` function. diff --git a/chromium_src/third_party/blink/renderer/core/exported/web_document.cc b/chromium_src/third_party/blink/renderer/core/exported/web_document.cc index 5b32e04b4fc6e..2740205af723e 100644 --- a/chromium_src/third_party/blink/renderer/core/exported/web_document.cc +++ b/chromium_src/third_party/blink/renderer/core/exported/web_document.cc @@ -9,9 +9,10 @@ namespace blink { -bool WebDocument::IsDOMFeaturePolicyEnabled(v8::Local context, +bool WebDocument::IsDOMFeaturePolicyEnabled(v8::Isolate* isolate, + v8::Local context, const WebString& feature) { - blink::ScriptState* script_state = blink::ScriptState::From(context); + blink::ScriptState* script_state = blink::ScriptState::From(isolate, context); Document* document = Unwrap(); return document->featurePolicy()->allowsFeature(script_state, feature); } diff --git a/chromium_src/ui/base/ui_base_features.cc b/chromium_src/ui/base/ui_base_features.cc index 4e61715ed258b..97173dbcdd90e 100644 --- a/chromium_src/ui/base/ui_base_features.cc +++ b/chromium_src/ui/base/ui_base_features.cc @@ -11,9 +11,7 @@ namespace features { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kChromeRefresh2023, base::FEATURE_DISABLED_BY_DEFAULT}, - {kChromeRefresh2023NTB, base::FEATURE_DISABLED_BY_DEFAULT}, {kChromeRefreshSecondary2023, base::FEATURE_DISABLED_BY_DEFAULT}, - {kChromeWebuiRefresh2023, base::FEATURE_DISABLED_BY_DEFAULT}, }}); } // namespace features diff --git a/chromium_src/ui/color/color_mixers.cc b/chromium_src/ui/color/color_mixers.cc deleted file mode 100644 index a7494888309d4..0000000000000 --- a/chromium_src/ui/color/color_mixers.cc +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. - -#include "ui/color/color_mixers.h" - -#include "ui/base/ui_base_features.h" - -namespace { - -bool GiveTrue() { - return true; -} - -} // namespace - -// AddMaterialUiColorMixer() should be called to get some colors(ex, -// kColorToastBackground) at specific order in the AddColorMixers(). -// See the comments at ui::AddColorMixers(). -#define IsChromeRefresh2023 IsChromeRefresh2023() || GiveTrue - -#include "src/ui/color/color_mixers.cc" - -#undef IsChromeRefresh2023 diff --git a/chromium_src/ui/color/material_ui_color_mixer.cc b/chromium_src/ui/color/material_ui_color_mixer.cc index f4d9b78db260c..bbf33ae502bfe 100644 --- a/chromium_src/ui/color/material_ui_color_mixer.cc +++ b/chromium_src/ui/color/material_ui_color_mixer.cc @@ -38,7 +38,18 @@ void AddMaterialUiColorMixer(ColorProvider* provider, mixer[ui::kColorComboboxInkDropHovered] = {ui::kColorSysStateHoverOnSubtle}; mixer[ui::kColorComboboxInkDropRipple] = { ui::kColorSysStateRippleNeutralOnSubtle}; - mixer[ui::kColorToastBackground] = {ui::kColorSysInverseSurface}; + mixer[ui::kColorToolbarSearchFieldBackground] = { + ui::kColorSysBaseContainerElevated}; + mixer[ui::kColorToolbarSearchFieldBackgroundHover] = { + ui::kColorSysStateHoverCutout}; + mixer[ui::kColorToolbarSearchFieldBackgroundPressed] = { + ui::kColorSysStateRippleNeutralOnSubtle}; + mixer[ui::kColorToolbarSearchFieldForeground] = {ui::kColorSysOnSurface}; + mixer[ui::kColorToolbarSearchFieldForegroundPlaceholder] = { + ui::kColorSysOnSurfaceSubtle}; + mixer[ui::kColorToolbarSearchFieldIcon] = {ui::kColorSysOnSurfaceSubtle}; + mixer[ui::kColorToastBackground] = {is_dark ? gfx::kGoogleGrey800 + : gfx::kGoogleGrey100}; mixer[ui::kColorToastButton] = {ui::kColorSysInversePrimary}; mixer[ui::kColorToastForeground] = {ui::kColorSysInverseOnSurface}; mixer[ui::kColorToggleButtonHover] = {ui::kColorSysStateHover}; diff --git a/chromium_src/ui/color/ui_color_mixer.cc b/chromium_src/ui/color/ui_color_mixer.cc index 919cdf345a3f9..5f7f9c4a7545c 100644 --- a/chromium_src/ui/color/ui_color_mixer.cc +++ b/chromium_src/ui/color/ui_color_mixer.cc @@ -21,18 +21,18 @@ void AddBraveUiColorMixer(ColorProvider* provider, // -------------------------------------------------------------------------- // For deprecated kColorId_FocusedBorderColor mixer[kColorFocusableBorderFocused] = { - dark_mode ? SkColorSetA(gfx::kBraveColorBrand, 0x66) - : SkColorSetA(gfx::kBraveColorBrand, 0x99)}; + dark_mode ? SkColorSetA(gfx::kColorButtonBackground, 0x66) + : SkColorSetA(gfx::kColorButtonBackground, 0x99)}; // -------------------------------------------------------------------------- // Button colors // -------------------------------------------------------------------------- // For deprecated kColorId_ProminentButtonColor - mixer[kColorButtonBackgroundProminent] = {gfx::kBraveColorBrand}; + mixer[kColorButtonBackgroundProminent] = {gfx::kColorButtonBackground}; // For deprecated kColorId_ProminentButtonDisabledColor - mixer[kColorButtonBackgroundProminentDisabled] = {gfx::kGoogleGrey800}; + mixer[kColorButtonBackgroundProminentDisabled] = {gfx::kColorButtonDisabled}; // For deprecated kColorId_ProminentButtonFocusedColor - mixer[kColorButtonBackgroundProminentFocused] = {gfx::kBraveColorBrand}; + mixer[kColorButtonBackgroundProminentFocused] = {gfx::kColorButtonBackground}; // For deprecated kColorId_ButtonBorderColor // TODO(simonhong): Add this color to palette. mixer[kColorButtonBorder] = {SkColorSetRGB(0xc3, 0xc4, 0xcf)}; @@ -53,8 +53,8 @@ void AddBraveUiColorMixer(ColorProvider* provider, // Link colors // -------------------------------------------------------------------------- // For deprecated kColorId_LinkEnabled & kColorId_LinkPressed - mixer[kColorLinkForeground] = {dark_mode ? gfx::kBraveColorBrandDark - : gfx::kBraveColorBrand}; + mixer[kColorLinkForeground] = {dark_mode ? gfx::kColorTextInteractiveDark + : gfx::kColorTextInteractive}; mixer[kColorLinkForegroundPressed] = {kColorLinkForeground}; // -------------------------------------------------------------------------- @@ -70,12 +70,12 @@ void AddBraveUiColorMixer(ColorProvider* provider, // AlphaBlend(kColorId_ProminentButtonColor, kColorId_WindowBackground, // SkAlpha{0x3C})) mixer[kColorTableBackgroundSelectedFocused] = - AlphaBlend(gfx::kBraveColorBrand, kColorPrimaryBackground, 0x3C); + AlphaBlend(gfx::kColorButtonBackground, kColorPrimaryBackground, 0x3C); mixer[kColorTableBackgroundSelectedUnfocused] = { kColorTableBackgroundSelectedFocused}; // For deprecated kColorId_TableGroupingIndicatorColor (which was the same as // kColorId_FocusedBorderColor) - mixer[kColorTableGroupingIndicator] = {gfx::kBraveColorBrand}; + mixer[kColorTableGroupingIndicator] = {gfx::kColorButtonBackground}; // -------------------------------------------------------------------------- // Text colors diff --git a/chromium_src/ui/gfx/color_palette.h b/chromium_src/ui/gfx/color_palette.h index a7d23b0aa810f..22e3b2d45b455 100644 --- a/chromium_src/ui/gfx/color_palette.h +++ b/chromium_src/ui/gfx/color_palette.h @@ -10,11 +10,29 @@ namespace gfx { -// TODO(simonhong): Remove this. kBraveBlurple300 is used incorrectly. +// TODO(simonhong): Delete this file when nala color is available in ui layer. +// TODO(simonhong): Remove kBraveBlurple300. It is used incorrectly. inline constexpr SkColor kBraveBlurple300 = SkColorSetRGB(0xA0, 0xA5, 0xEB); +inline constexpr SkColor kColorGray20 = SkColorSetRGB(0xDA, 0xDF, 0xE1); +inline constexpr SkColor kColorGray60 = SkColorSetRGB(0x3F, 0x4E, 0x55); inline constexpr SkColor kBraveGrey800 = SkColorSetRGB(0x3b, 0x3e, 0x4f); -inline constexpr SkColor kBraveColorBrand = SkColorSetRGB(0x3F, 0x39, 0xE8); -inline constexpr SkColor kBraveColorBrandDark = SkColorSetRGB(0x7C, 0x91, 0xFF); +inline constexpr SkColor kColorButtonBackground = + SkColorSetRGB(0x3F, 0x39, 0xE8); +inline constexpr SkColor kColorButtonDisabled = + SkColorSetARGB(0x4D, 0x68, 0x7B, 0x85); +inline constexpr SkColor kColorTextInteractive = + SkColorSetRGB(0x3F, 0x39, 0xE8); +inline constexpr SkColor kColorTextInteractiveDark = + SkColorSetRGB(0x7C, 0x91, 0xFF); +inline constexpr SkColor kColorTextDisabled = + SkColorSetARGB(0x80, 0x21, 0x27, 0x2A); +inline constexpr SkColor kColorTextDisabledDark = + SkColorSetARGB(0x80, 0xEB, 0xEE, 0xF0); +inline constexpr SkColor kColorTextSecondary = SkColorSetRGB(0x3F, 0x4E, 0x55); +inline constexpr SkColor kColorTextSecondaryDark = + SkColorSetRGB(0xDA, 0xDF, 0xE1); +inline constexpr SkColor kColorDividerInteractive = + SkColorSetARGB(0x66, 0x54, 0x5F, 0xF8); } // namespace gfx diff --git a/chromium_src/ui/native_theme/native_theme.cc b/chromium_src/ui/native_theme/native_theme.cc index 5123f267539f6..a82c1db69032a 100644 --- a/chromium_src/ui/native_theme/native_theme.cc +++ b/chromium_src/ui/native_theme/native_theme.cc @@ -17,7 +17,8 @@ namespace ui { SkColor NativeTheme::GetSystemButtonPressedColor(SkColor base_color) const { bool is_dark = (GetPreferredColorScheme() == PreferredColorScheme::kDark); return color_utils::GetResultingPaintColor( - SkColorSetA(gfx::kBraveColorBrand, is_dark ? 0x2b : 0x23), base_color); + SkColorSetA(gfx::kColorButtonBackground, is_dark ? 0x2b : 0x23), + base_color); } } // namespace ui 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 f773ee1d01fb6..4eebeb08652ac 100644 --- a/chromium_src/ui/views/controls/button/md_text_button.cc +++ b/chromium_src/ui/views/controls/button/md_text_button.cc @@ -3,6 +3,8 @@ // 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 "ui/views/controls/button/md_text_button.h" + #include #include @@ -15,13 +17,13 @@ #include "ui/color/color_id.h" #include "ui/color/color_provider.h" #include "ui/gfx/color_palette.h" +#include "ui/gfx/color_utils.h" #include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/vector_icon_types.h" #include "ui/native_theme/native_theme.h" #include "ui/views/background.h" #include "ui/views/controls/button/button.h" -#include "ui/views/controls/button/md_text_button.h" #include "ui/views/controls/highlight_path_generator.h" #include "ui/views/view_class_properties.h" @@ -37,7 +39,6 @@ SkColor AddOpacity(SkColor color, float opacity) { return SkColorSetA(color, current_alpha * opacity); } -using Kind = views::MdTextButton::Kind; using ColorScheme = ui::NativeTheme::PreferredColorScheme; using ButtonState = views::Button::ButtonState; @@ -48,90 +49,163 @@ struct ButtonStyle { }; struct MdTextButtonStyleKey { - Kind kind; + ui::ButtonStyle style; ColorScheme color_scheme; ButtonState state; bool operator<(const MdTextButtonStyleKey& other) const { - return std::tie(kind, color_scheme, state) < - std::tie(other.kind, other.color_scheme, other.state); + return std::tie(style, color_scheme, state) < + std::tie(other.style, other.color_scheme, other.state); } }; -constexpr float kDisabledOpacity = 0.5f; -constexpr float kLoadingOpacity = 0.8f; +constexpr float kLoadingOpacity = 0.75f; +// We map our button styles to upstream style. +// Prominent, Default, Tonal, Text styles are mapped +// sequentially to our Filled, Outline, Plain and Plain-Faint. const base::flat_map& GetButtonThemes() { static base::NoDestructor> button_themes( - {{{Kind::kPrimary, ColorScheme::kLight, ButtonState::STATE_NORMAL}, - {.background_color = gfx::kBraveColorBrand, + {{{ui::ButtonStyle::kProminent, ColorScheme::kLight, + ButtonState::STATE_NORMAL}, + {.background_color = gfx::kColorButtonBackground, .border_color = std::nullopt, .text_color = SK_ColorWHITE}}, - {{Kind::kPrimary, ColorScheme::kDark, ButtonState::STATE_NORMAL}, - {.background_color = gfx::kBraveColorBrand, + {{ui::ButtonStyle::kProminent, ColorScheme::kDark, + ButtonState::STATE_NORMAL}, + {.background_color = gfx::kColorButtonBackground, .border_color = std::nullopt, .text_color = SK_ColorWHITE}}, - {{Kind::kPrimary, ColorScheme::kLight, ButtonState::STATE_HOVERED}, - {.background_color = SkColorSetRGB(24, 56, 172), + {{ui::ButtonStyle::kProminent, ColorScheme::kLight, + ButtonState::STATE_HOVERED}, + {.background_color = color_utils::AlphaBlend( + SK_ColorBLACK, gfx::kColorButtonBackground, 0.2f), .border_color = std::nullopt, .text_color = SK_ColorWHITE}}, - {{Kind::kPrimary, ColorScheme::kDark, ButtonState::STATE_HOVERED}, - {.background_color = SkColorSetRGB(77, 92, 253), + {{ui::ButtonStyle::kProminent, ColorScheme::kDark, + ButtonState::STATE_HOVERED}, + {.background_color = color_utils::AlphaBlend( + SK_ColorWHITE, gfx::kColorButtonBackground, 0.2f), .border_color = std::nullopt, .text_color = SK_ColorWHITE}}, + {{ui::ButtonStyle::kProminent, ColorScheme::kLight, + ButtonState::STATE_DISABLED}, + {.background_color = gfx::kColorButtonDisabled, + .border_color = std::nullopt, + .text_color = gfx::kColorTextDisabled}}, + {{ui::ButtonStyle::kProminent, ColorScheme::kDark, + ButtonState::STATE_DISABLED}, + {.background_color = gfx::kColorButtonDisabled, + .border_color = std::nullopt, + .text_color = gfx::kColorTextDisabledDark}}, - {{Kind::kSecondary, ColorScheme::kLight, ButtonState::STATE_NORMAL}, + {{ui::ButtonStyle::kDefault, ColorScheme::kLight, + ButtonState::STATE_NORMAL}, {.background_color = std::nullopt, - .border_color = SK_ColorBLACK, - .text_color = SK_ColorBLACK}}, - {{Kind::kSecondary, ColorScheme::kDark, ButtonState::STATE_NORMAL}, + .border_color = gfx::kColorDividerInteractive, + .text_color = gfx::kColorTextInteractive}}, + {{ui::ButtonStyle::kDefault, ColorScheme::kDark, + ButtonState::STATE_NORMAL}, {.background_color = std::nullopt, - .border_color = SK_ColorWHITE, - .text_color = SK_ColorWHITE}}, - {{Kind::kSecondary, ColorScheme::kLight, ButtonState::STATE_HOVERED}, + .border_color = gfx::kColorDividerInteractive, + .text_color = gfx::kColorTextInteractiveDark}}, + {{ui::ButtonStyle::kDefault, ColorScheme::kLight, + ButtonState::STATE_HOVERED}, + { + .background_color = std::nullopt, + .border_color = color_utils::AlphaBlend( + SK_ColorBLACK, gfx::kColorDividerInteractive, 0.2f), + .text_color = color_utils::AlphaBlend( + SK_ColorBLACK, gfx::kColorTextInteractive, 0.2f), + }}, + {{ui::ButtonStyle::kDefault, ColorScheme::kDark, + ButtonState::STATE_HOVERED}, + { + .background_color = std::nullopt, + .border_color = color_utils::AlphaBlend( + SK_ColorWHITE, gfx::kColorDividerInteractive, 0.2f), + .text_color = color_utils::AlphaBlend( + SK_ColorWHITE, gfx::kColorTextInteractiveDark, 0.2f), + }}, + {{ui::ButtonStyle::kDefault, ColorScheme::kLight, + ButtonState::STATE_DISABLED}, {.background_color = std::nullopt, - .border_color = gfx::kBraveColorBrand, - .text_color = gfx::kBraveColorBrand}}, - {{Kind::kSecondary, ColorScheme::kDark, ButtonState::STATE_HOVERED}, + .border_color = gfx::kColorButtonDisabled, + .text_color = gfx::kColorTextDisabled}}, + {{ui::ButtonStyle::kDefault, ColorScheme::kDark, + ButtonState::STATE_DISABLED}, {.background_color = std::nullopt, - .border_color = gfx::kBraveColorBrand, - .text_color = gfx::kBraveColorBrand}}, + .border_color = gfx::kColorButtonDisabled, + .text_color = gfx::kColorTextDisabled}}, - {{Kind::kTertiary, ColorScheme::kLight, ButtonState::STATE_NORMAL}, + {{ui::ButtonStyle::kTonal, ColorScheme::kLight, + ButtonState::STATE_NORMAL}, {.background_color = std::nullopt, .border_color = std::nullopt, - .text_color = SkColorSetRGB(32, 74, 227)}}, - {{Kind::kTertiary, ColorScheme::kDark, ButtonState::STATE_NORMAL}, + .text_color = gfx::kColorTextInteractive}}, + {{ui::ButtonStyle::kTonal, ColorScheme::kDark, + ButtonState::STATE_NORMAL}, {.background_color = std::nullopt, .border_color = std::nullopt, - .text_color = SkColorSetRGB(153, 173, 243)}}, - {{Kind::kTertiary, ColorScheme::kLight, ButtonState::STATE_HOVERED}, + .text_color = gfx::kColorTextInteractiveDark}}, + {{ui::ButtonStyle::kTonal, ColorScheme::kLight, + ButtonState::STATE_HOVERED}, + {.background_color = + SkColorSetA(gfx::kColorButtonBackground, 0xFF * 0.05), + .border_color = std::nullopt, + .text_color = color_utils::AlphaBlend( + SK_ColorBLACK, gfx::kColorTextInteractive, 0.2f)}}, + {{ui::ButtonStyle::kTonal, ColorScheme::kDark, + ButtonState::STATE_HOVERED}, + {.background_color = + SkColorSetA(gfx::kColorTextInteractiveDark, 0xFF * 0.1), + .border_color = std::nullopt, + .text_color = color_utils::AlphaBlend( + SK_ColorWHITE, gfx::kColorTextInteractiveDark, 0.2f)}}, + {{ui::ButtonStyle::kTonal, ColorScheme::kLight, + ButtonState::STATE_DISABLED}, {.background_color = std::nullopt, .border_color = std::nullopt, - .text_color = SkColorSetRGB(24, 56, 172)}}, - {{Kind::kTertiary, ColorScheme::kDark, ButtonState::STATE_HOVERED}, + .text_color = gfx::kColorTextDisabled}}, + {{ui::ButtonStyle::kTonal, ColorScheme::kDark, + ButtonState::STATE_DISABLED}, {.background_color = std::nullopt, .border_color = std::nullopt, - .text_color = SkColorSetRGB(186, 199, 247)}}, + .text_color = gfx::kColorTextDisabledDark}}, - {{Kind::kQuaternary, ColorScheme::kLight, ButtonState::STATE_NORMAL}, + {{ui::ButtonStyle::kText, ColorScheme::kLight, + ButtonState::STATE_NORMAL}, {.background_color = std::nullopt, .border_color = std::nullopt, - .text_color = SkColorSetRGB(84, 96, 113)}}, - {{Kind::kQuaternary, ColorScheme::kDark, ButtonState::STATE_NORMAL}, + .text_color = gfx::kColorTextSecondary}}, + {{ui::ButtonStyle::kText, ColorScheme::kDark, + ButtonState::STATE_NORMAL}, {.background_color = std::nullopt, .border_color = std::nullopt, - .text_color = SkColorSetRGB(195, 201, 211)}}, - {{Kind::kQuaternary, ColorScheme::kLight, + .text_color = gfx::kColorTextSecondaryDark}}, + {{ui::ButtonStyle::kText, ColorScheme::kLight, + ButtonState::STATE_HOVERED}, + {.background_color = SkColorSetA(gfx::kColorGray60, 0xFF * 0.05), + .border_color = std::nullopt, + .text_color = color_utils::AlphaBlend( + SK_ColorBLACK, gfx::kColorTextSecondary, 0.2f)}}, + {{ui::ButtonStyle::kText, ColorScheme::kDark, ButtonState::STATE_HOVERED}, + {.background_color = SkColorSetA(gfx::kColorGray20, 0xFF * 0.1), + .border_color = std::nullopt, + .text_color = color_utils::AlphaBlend( + SK_ColorWHITE, gfx::kColorTextSecondaryDark, 0.2f)}}, + {{ui::ButtonStyle::kText, ColorScheme::kLight, + ButtonState::STATE_DISABLED}, {.background_color = std::nullopt, .border_color = std::nullopt, - .text_color = SkColorSetRGB(63, 72, 85)}}, - {{Kind::kQuaternary, ColorScheme::kDark, ButtonState::STATE_HOVERED}, + .text_color = gfx::kColorTextDisabled}}, + {{ui::ButtonStyle::kText, ColorScheme::kDark, + ButtonState::STATE_DISABLED}, {.background_color = std::nullopt, .border_color = std::nullopt, - .text_color = SkColorSetRGB(195, 201, 211)}}}); + .text_color = gfx::kColorTextDisabled}}}); return *button_themes; } @@ -164,23 +238,15 @@ MdTextButton::MdTextButton( button_context, use_text_color_for_icon, std::move(image_container)) { - SetCornerRadius(100); + // TODO(simonhong): Use --leo-radius-l when it's available in ui layer. + constexpr int kLeoRadiusL = 12; + SetCornerRadius(kLeoRadiusL); views::HighlightPathGenerator::Install( this, std::make_unique()); - auto* ink_drop = views::InkDrop::Get(this); - views::InkDrop::UseInkDropForFloodFillRipple(ink_drop, - /*highlight_on_hover=*/false, - /*highlight_on_focus=*/true); - ink_drop->SetCreateHighlightCallback(base::BindRepeating( - [](Button* host) { - const SkColor fill_color = SK_ColorTRANSPARENT; - gfx::RectF boundsF(host->GetLocalBounds()); - return std::make_unique( - boundsF.size(), - static_cast(host)->GetCornerRadiusValue(), - boundsF.CenterPoint(), fill_color); - }, - this)); + + // Disabled upstream's ink-drop as we have specific color for hover state. + InkDrop::Get(this)->SetMode(views::InkDropHost::InkDropMode::OFF); + SetImageLabelSpacing(6); } MdTextButton::~MdTextButton() = default; @@ -193,27 +259,6 @@ SkPath MdTextButton::GetHighlightPath() const { return path; } -MdTextButton::Kind MdTextButton::GetKind() const { - return kind_; -} - -void MdTextButton::SetKind(Kind kind) { - if (kind == kind_) { - return; - } - - kind_ = kind; - - // We don't want to affect the OLD style buttons, and we want them to be the - // default (for now), so don't change the image-label spacing unless we set - // the button kind to something that isn't OLD. - if (kind != Kind::kOld) { - SetImageLabelSpacing(6); - } - - UpdateColors(); -} - void MdTextButton::SetIcon(const gfx::VectorIcon* icon, int icon_size) { icon_ = icon; icon_size_ = icon_size; @@ -232,60 +277,11 @@ void MdTextButton::SetLoading(bool loading) { void MdTextButton::UpdateTextColor() { MdTextButtonBase::UpdateTextColor(); - // Once we update the buttons across Brave to use the new style, we can remove - // this branch. - if (kind_ == kOld) { - if (GetStyle() == ui::ButtonStyle::kProminent) { - return; - } - const ui::NativeTheme* theme = GetNativeTheme(); - // Override different text hover color - if (theme->GetPlatformHighContrastColorScheme() != - ui::NativeTheme::PlatformHighContrastColorScheme::kDark) { - SetTextColor(ButtonState::STATE_HOVERED, gfx::kBraveColorBrand); - SetTextColor(ButtonState::STATE_PRESSED, gfx::kBraveColorBrand); - } - return; - } - auto colors = GetButtonColors(); SetTextColor(GetVisualState(), colors.text_color); } void MdTextButton::UpdateBackgroundColor() { - // Once we update the buttons across Brave to use the new style, we can remove - // this branch. - if (kind_ == kOld) { - MdTextButtonBase::UpdateBackgroundColor(); - - // We don't modify the Prominent button at all. - if (GetStyle() == ui::ButtonStyle::kProminent) { - return; - } - - // Override border color for hover on non-prominent - if (GetState() == ButtonState::STATE_PRESSED || - GetState() == ButtonState::STATE_HOVERED) { - // First, get the same background fill color that MdTextButtonBase does. - // It is unfortunate to copy these lines almost as-is. Consider otherwise - // patching it in via a #define. - SkColor bg_color = - GetColorProvider()->GetColor(ui::kColorDialogBackground); - if (GetBgColorOverride()) { - bg_color = *GetBgColorOverride(); - } - if (GetState() == STATE_PRESSED) { - bg_color = GetNativeTheme()->GetSystemButtonPressedColor(bg_color); - } - // The only thing that differs for Brave is the stroke color - SkColor stroke_color = gfx::kBraveColorBrand; - SetBackground(CreateBackgroundFromPainter( - Painter::CreateRoundRectWith1PxBorderPainter( - bg_color, stroke_color, GetCornerRadiusValue()))); - } - return; - } - auto colors = GetButtonColors(); // SubPixelRendering doesn't work if we have any background opacity. @@ -308,26 +304,6 @@ void MdTextButton::UpdateColors() { } } -void MdTextButton::OnPaintBackground(gfx::Canvas* canvas) { - // Set brave-style hover colors - MdTextButtonBase::OnPaintBackground(canvas); - if (GetStyle() == ui::ButtonStyle::kProminent && - (hover_animation().is_animating() || GetState() == STATE_HOVERED)) { - constexpr SkColor normal_color = gfx::kBraveColorBrand; - constexpr SkColor hover_color = SkColorSetA(normal_color, 0xFF * 0.2); - const SkAlpha alpha = - static_cast(hover_animation().CurrentValueBetween(0x00, 0xff)); - const SkColor current_color = - color_utils::AlphaBlend(hover_color, normal_color, alpha); - cc::PaintFlags flags; - flags.setColor(current_color); - flags.setStyle(cc::PaintFlags::kFill_Style); - flags.setAntiAlias(true); - canvas->DrawRoundRect(gfx::RectF(GetLocalBounds()), GetCornerRadiusValue(), - flags); - } -} - MdTextButton::ButtonColors MdTextButton::GetButtonColors() { // Leo buttons only have a light and dark mode. auto color_scheme = @@ -337,9 +313,9 @@ MdTextButton::ButtonColors MdTextButton::GetButtonColors() { auto state = GetVisualState(); float opacity = 1; - // Leo buttons don't have a pressed state, so use the hover state instead. + // Leo buttons don't have a pressed state, so use the normal state instead. if (state == ButtonState::STATE_PRESSED) { - state = ButtonState::STATE_HOVERED; + state = ButtonState::STATE_NORMAL; } // The loading style is the normal button style, with some opacity. @@ -348,23 +324,17 @@ MdTextButton::ButtonColors MdTextButton::GetButtonColors() { opacity = kLoadingOpacity; } - // The enabled style is the normal button style with more opacity. - if (!GetEnabled() || state == STATE_DISABLED) { - state = ButtonState::STATE_NORMAL; - opacity = kDisabledOpacity; - } - - MdTextButtonStyleKey style_lookup{GetKind(), color_scheme, state}; + MdTextButtonStyleKey style_lookup{GetBraveStyle(), color_scheme, state}; auto it = GetButtonThemes().find(style_lookup); if (it == GetButtonThemes().end()) { - NOTREACHED() << "No style found for ButtonKind: " << kind_ - << ", ColorScheme: " + NOTREACHED() << "No button theme found for : " + << static_cast(GetBraveStyle()) << ", ColorScheme: " << (color_scheme == ColorScheme::kDark ? "dark" : "light") << ", ButtonState: " << state; } const auto& style = it->second; return {.background_color = AddOpacity( - GetBgColorOverride().value_or( + GetBgColorOverrideDeprecated().value_or( style.background_color.value_or(SK_ColorTRANSPARENT)), opacity), .stroke_color = AddOpacity( @@ -372,6 +342,14 @@ MdTextButton::ButtonColors MdTextButton::GetButtonColors() { .text_color = AddOpacity(style.text_color, opacity)}; } +ui::ButtonStyle MdTextButton::GetBraveStyle() const { + const auto style = GetStyle(); + if (style == ui::ButtonStyle::kTonal && use_default_for_tonal_) { + return ui::ButtonStyle::kDefault; + } + return style; +} + BEGIN_METADATA(MdTextButton) END_METADATA diff --git a/chromium_src/ui/views/controls/button/md_text_button.h b/chromium_src/ui/views/controls/button/md_text_button.h index 603b9e5a448c0..4b291bbaef37a 100644 --- a/chromium_src/ui/views/controls/button/md_text_button.h +++ b/chromium_src/ui/views/controls/button/md_text_button.h @@ -44,8 +44,6 @@ class VIEWS_EXPORT MdTextButton : public MdTextButtonBase { SkColor text_color; }; - enum Kind { kOld, kPrimary, kSecondary, kTertiary, kQuaternary }; - explicit MdTextButton( PressedCallback callback = PressedCallback(), const std::u16string& text = std::u16string(), @@ -59,29 +57,29 @@ class VIEWS_EXPORT MdTextButton : public MdTextButtonBase { SkPath GetHighlightPath() const; - Kind GetKind() const; - void SetKind(Kind kind); - void SetIcon(const gfx::VectorIcon* icon, int icon_size = 0); bool GetLoading() const; void SetLoading(bool loading); + void set_use_default_for_tonal(bool use_default) { + use_default_for_tonal_ = use_default; + } // MdTextButtonBase: void UpdateTextColor() override; void UpdateBackgroundColor() override; void UpdateColors() override; - protected: - // views::Views - void OnPaintBackground(gfx::Canvas* canvas) override; - private: ButtonColors GetButtonColors(); + ui::ButtonStyle GetBraveStyle() const; - Kind kind_ = kOld; bool loading_ = false; + // By default, use kDefault style for kTonal because + // it's not suitable to our style. Use default style instead. + bool use_default_for_tonal_ = true; + int icon_size_ = 0; raw_ptr icon_ = nullptr; }; diff --git a/chromium_src/ui/views/controls/menu/menu_config.cc b/chromium_src/ui/views/controls/menu/menu_config.cc index 3890780c3c852..f5d5ecd393614 100644 --- a/chromium_src/ui/views/controls/menu/menu_config.cc +++ b/chromium_src/ui/views/controls/menu/menu_config.cc @@ -25,7 +25,10 @@ const MenuConfig& MenuConfig::instance() { // Each platform sets its own config in its Init(). // Apply our config globally at once after Init() is done. mutable_config.item_vertical_margin = 4; - mutable_config.item_horizontal_padding = 16; + mutable_config.item_horizontal_padding = + 16 - config.item_horizontal_border_padding; + mutable_config.corner_radius = 8; + mutable_config.use_bubble_border = true; } } const run_once(config); diff --git a/common/brave_content_client.cc b/common/brave_content_client.cc index e380ddeaa4ee7..c04e49a1a66f6 100644 --- a/common/brave_content_client.cc +++ b/common/brave_content_client.cc @@ -76,7 +76,7 @@ base::RefCountedMemory* BraveContentClient::GetDataResourceBytes( resource_bundle.LoadDataResourceString( IDR_FLAGS_UI_BRAVE_FLAGS_OVERRIDES_JS); base::RefCountedString* bytes = new base::RefCountedString(); - bytes->data().assign(flags_js.data(), flags_js.length()); + bytes->as_string().assign(flags_js.data(), flags_js.length()); return bytes; } return ChromeContentClient::GetDataResourceBytes(resource_id); diff --git a/components/ai_chat/content/browser/BUILD.gn b/components/ai_chat/content/browser/BUILD.gn index b39f33b1f8386..3a5d244cdee2c 100644 --- a/components/ai_chat/content/browser/BUILD.gn +++ b/components/ai_chat/content/browser/BUILD.gn @@ -41,6 +41,7 @@ static_library("browser") { "//services/data_decoder/public/cpp", "//services/network/public/cpp", "//services/service_manager/public/cpp", + "//ui/accessibility:ax_base", "//ui/base", "//url", ] diff --git a/components/ai_chat/content/browser/ai_chat_tab_helper.cc b/components/ai_chat/content/browser/ai_chat_tab_helper.cc index e4c765c8c76dd..2b00626563f13 100644 --- a/components/ai_chat/content/browser/ai_chat_tab_helper.cc +++ b/components/ai_chat/content/browser/ai_chat_tab_helper.cc @@ -28,7 +28,6 @@ #include "components/prefs/pref_service.h" #include "components/strings/grit/components_strings.h" #include "components/user_prefs/user_prefs.h" -#include "content/public/browser/ax_event_notification_details.h" #include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/navigation_entry.h" @@ -38,6 +37,7 @@ #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "pdf/buildflags.h" #include "ui/accessibility/ax_mode.h" +#include "ui/accessibility/ax_updates_and_events.h" #include "ui/base/l10n/l10n_util.h" namespace ai_chat { @@ -56,7 +56,7 @@ AIChatTabHelper::PDFA11yInfoLoadObserver::PDFA11yInfoLoadObserver( : content::WebContentsObserver(web_contents), helper_(helper) {} void AIChatTabHelper::PDFA11yInfoLoadObserver::AccessibilityEventReceived( - const content::AXEventNotificationDetails& details) { + const ui::AXUpdatesAndEvents& details) { #if BUILDFLAG(ENABLE_PDF) for (const auto& update : details.updates) { for (const auto& node : update.nodes) { diff --git a/components/ai_chat/content/browser/ai_chat_tab_helper.h b/components/ai_chat/content/browser/ai_chat_tab_helper.h index 18c06ec9ff637..88268c53e43db 100644 --- a/components/ai_chat/content/browser/ai_chat_tab_helper.h +++ b/components/ai_chat/content/browser/ai_chat_tab_helper.h @@ -84,7 +84,7 @@ class AIChatTabHelper : public content::WebContentsObserver, private: void AccessibilityEventReceived( - const content::AXEventNotificationDetails& details) override; + const ui::AXUpdatesAndEvents& details) override; raw_ptr helper_; }; diff --git a/components/ai_chat/renderer/ai_chat_resource_sniffer_throttle_unittest.cc b/components/ai_chat/renderer/ai_chat_resource_sniffer_throttle_unittest.cc index b8acadf2bc645..ffb3d9cdab2ab 100644 --- a/components/ai_chat/renderer/ai_chat_resource_sniffer_throttle_unittest.cc +++ b/components/ai_chat/renderer/ai_chat_resource_sniffer_throttle_unittest.cc @@ -48,7 +48,7 @@ class MojoDataPipeSender { } void OnWritable(MojoResult) { - uint32_t sending_bytes = data_.size() - sent_bytes_; + size_t sending_bytes = data_.size() - sent_bytes_; MojoResult result = handle_->WriteData( data_.c_str() + sent_bytes_, &sending_bytes, MOJO_WRITE_DATA_FLAG_NONE); switch (result) { @@ -170,7 +170,7 @@ class MockDelegate : public blink::URLLoaderThrottle::Delegate { source_body_handle_.reset(); } - uint32_t ReadResponseBody(uint32_t size) { + size_t ReadResponseBody(size_t size) { std::vector buffer(size); MojoResult result = destination_loader_client_.response_body().ReadData( buffer.data(), &size, MOJO_READ_DATA_FLAG_NONE); diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index d9f428b393f9d..78fc79900bbc5 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -690,7 +690,7 @@ Save IBAN to Brave sync chain? - To pay faster next time, save your IBAN to your Brave sync chain + To autofill this IBAN next time, save it in your Brave account @@ -742,22 +742,6 @@ Add virtual card - - {NUM_CARDS, plural, - =1 {Use a virtual number for this card} - other {Select a card}} - - - {NUM_CARDS, plural, - =1 {This card will be charged when you pay, but its real number won't be shared with this site. For extra security, a temporary CVC will be generated.} - other {The card you select will be charged when you pay, but its real number won't be shared with this site. For extra security, a temporary CVC will be generated.}} - - - Continue - - - Cancel - Virtual card details @@ -1039,6 +1023,9 @@ Delete card + + Delete IBAN + This payment method will be deleted from this device @@ -1127,7 +1114,7 @@ Card benefits - See info that helps you choose which card to pay with. <a href="#" aria-description="$1">Learn about card benefits</a> + Show which rewards and benefits are available for your cards at checkout <a href="#" aria-description="$1">Learn about card benefits</a> Delete saved security codes? @@ -1138,11 +1125,8 @@ CVC saved - - Card benefits available - - See terms here + See card benefit terms See terms here for $1 diff --git a/components/autofill_strings.grdp b/components/autofill_strings.grdp index d560d0735d206..c1f5aae643152 100644 --- a/components/autofill_strings.grdp +++ b/components/autofill_strings.grdp @@ -2,16 +2,10 @@ - - - Clear form - - - - - Clear Form - - + + + Clear Form + @@ -94,6 +88,9 @@ China UnionPay + + Verve + Visa @@ -131,6 +128,7 @@ The delete address option was selected + The autofilled info was cleared from the form @@ -365,12 +363,6 @@ - - Screen lock - - - Use screen lock to confirm cards faster - Enter $1ZIP code @@ -400,19 +392,19 @@ - + Default - + Use other providers - + Use Brave Password Manager and Brave Autofill to save and fill passwords, passkeys, payment methods, and addresses - + Use password managers and autofill services that are turned on in Android Settings @@ -620,6 +612,12 @@ Submenu available, use $1right key to navigate to additional options. + + Password saved to this device + + + To save and use this password on all your devices, verify it's you + diff --git a/components/body_sniffer/body_sniffer_url_loader.cc b/components/body_sniffer/body_sniffer_url_loader.cc index 7258d2d6098f6..625271bc989c4 100644 --- a/components/body_sniffer/body_sniffer_url_loader.cc +++ b/components/body_sniffer/body_sniffer_url_loader.cc @@ -219,7 +219,7 @@ void BodySnifferURLLoader::OnBodyReadable(MojoResult) { DCHECK_EQ(State::kSniffing, state_); size_t start_size = buffered_body_.size(); - uint32_t read_bytes = kReadBufferSize; + size_t read_bytes = kReadBufferSize; buffered_body_.resize(start_size + read_bytes); MojoResult result = body_consumer_handle_->ReadData(buffered_body_.data() + start_size, @@ -386,7 +386,7 @@ void BodySnifferURLLoader::SendReceivedBodyToClient() { // Send the buffered data first. DCHECK_GT(bytes_remaining_in_buffer_, 0u); size_t start_position = buffered_body_.size() - bytes_remaining_in_buffer_; - uint32_t bytes_sent = bytes_remaining_in_buffer_; + size_t bytes_sent = bytes_remaining_in_buffer_; MojoResult result = body_producer_handle_->WriteData(buffered_body_.data() + start_position, &bytes_sent, MOJO_WRITE_DATA_FLAG_NONE); @@ -413,7 +413,7 @@ void BodySnifferURLLoader::ForwardBodyToClient() { DCHECK_EQ(0u, bytes_remaining_in_buffer_); // Send the body from the consumer to the producer. const void* buffer; - uint32_t buffer_size = 0; + size_t buffer_size = 0; MojoResult result = body_consumer_handle_ ? body_consumer_handle_->BeginReadData(&buffer, &buffer_size, diff --git a/components/brave_news/browser/brave_news_controller.cc b/components/brave_news/browser/brave_news_controller.cc index 694720f1febef..56c53b04a1448 100644 --- a/components/brave_news/browser/brave_news_controller.cc +++ b/components/brave_news/browser/brave_news_controller.cc @@ -510,10 +510,8 @@ void BraveNewsController::GetFavIconData(const std::string& publisher_id, return; } - auto bytes = result.bitmap_data; - std::vector bytes_vec( - bytes->front_as(), - bytes->front_as() + bytes->size()); + std::vector bytes_vec(result.bitmap_data->begin(), + result.bitmap_data->end()); std::move(callback).Run(std::move(bytes_vec)); }, std::move(callback)), diff --git a/components/brave_rewards/core/common/random_util.cc b/components/brave_rewards/core/common/random_util.cc index 13df6ac12beb1..97c72248c1af9 100644 --- a/components/brave_rewards/core/common/random_util.cc +++ b/components/brave_rewards/core/common/random_util.cc @@ -33,7 +33,7 @@ namespace util { std::string GenerateRandomHexString() { const size_t kLength = 32; uint8_t bytes[kLength]; - crypto::RandBytes(bytes, sizeof(bytes)); + crypto::RandBytes(bytes); return base::HexEncode(bytes, sizeof(bytes)); } diff --git a/components/brave_rewards/core/common/signer.cc b/components/brave_rewards/core/common/signer.cc index 1d7ec0ff934cf..5198c505e8447 100644 --- a/components/brave_rewards/core/common/signer.cc +++ b/components/brave_rewards/core/common/signer.cc @@ -66,7 +66,7 @@ std::optional Signer::FromRecoverySeed( std::vector Signer::GenerateRecoverySeed() { std::vector seed(kSeedLength); - crypto::RandBytes(seed.data(), kSeedLength); + crypto::RandBytes(seed); return seed; } diff --git a/components/brave_shields/content/browser/brave_shields_util.cc b/components/brave_shields/content/browser/brave_shields_util.cc index 8d72c1b652b10..3e64123ac3892 100644 --- a/components/brave_shields/content/browser/brave_shields_util.cc +++ b/components/brave_shields/content/browser/brave_shields_util.cc @@ -630,7 +630,7 @@ bool IsBraveShieldsManaged(PrefService* prefs, DCHECK(map); content_settings::SettingInfo info; map->GetWebsiteSetting(url, url, ContentSettingsType::BRAVE_SHIELDS, &info); - return info.source == content_settings::SettingSource::SETTING_SOURCE_POLICY; + return info.source == content_settings::SettingSource::kPolicy; } bool IsHttpsByDefaultFeatureEnabled() { diff --git a/components/brave_shields/core/browser/ad_block_list_p3a.h b/components/brave_shields/core/browser/ad_block_list_p3a.h index 9784b816831f5..d91d5ed3aa442 100644 --- a/components/brave_shields/core/browser/ad_block_list_p3a.h +++ b/components/brave_shields/core/browser/ad_block_list_p3a.h @@ -10,6 +10,7 @@ #include #include "base/containers/flat_set.h" +#include "base/memory/raw_ptr.h" class PrefService; diff --git a/components/brave_sync/crypto/crypto.cc b/components/brave_sync/crypto/crypto.cc index 3fec576059bcd..09d42803b79af 100644 --- a/components/brave_sync/crypto/crypto.cc +++ b/components/brave_sync/crypto/crypto.cc @@ -23,7 +23,7 @@ std::vector GetSeed(size_t size) { size = DEFAULT_SEED_SIZE; } std::vector bytes(size); - ::crypto::RandBytes(&bytes[0], bytes.size()); + ::crypto::RandBytes(bytes); return bytes; } diff --git a/components/brave_sync/crypto/crypto_unittest.cc b/components/brave_sync/crypto/crypto_unittest.cc index 99a56b3340d70..2a796c29ff043 100644 --- a/components/brave_sync/crypto/crypto_unittest.cc +++ b/components/brave_sync/crypto/crypto_unittest.cc @@ -148,7 +148,7 @@ TEST(CryptoTest, Ed25519KeyDerivation) { base::HexEncode(private_key.data(), private_key.size()))); std::vector message(128); - ::crypto::RandBytes(&message[0], message.size()); + ::crypto::RandBytes(message); std::vector signature; EXPECT_TRUE(Sign(message, private_key, &signature)); EXPECT_TRUE(Verify(message, signature, public_key)); @@ -157,7 +157,7 @@ TEST(CryptoTest, Ed25519KeyDerivation) { TEST(CryptoTest, GetNonce) { std::set previous_nonces; std::vector nonce_bytes(20); - ::crypto::RandBytes(&nonce_bytes[0], nonce_bytes.size()); + ::crypto::RandBytes(nonce_bytes); std::vector nonce; // gets a nonce with counter 0 @@ -171,7 +171,7 @@ TEST(CryptoTest, GetNonce) { base::ToLowerASCII(base::HexEncode(nonce.data(), nonce.size()))); // gets a nonce with counter 1000 - ::crypto::RandBytes(&nonce_bytes[0], nonce_bytes.size()); + ::crypto::RandBytes(nonce_bytes); nonce = GetNonce(1000, nonce_bytes); EXPECT_EQ(nonce.size(), (size_t)24); EXPECT_EQ(nonce[0], 3); @@ -183,7 +183,7 @@ TEST(CryptoTest, GetNonce) { // no duplicate nonces for (size_t i = 0; i < 100; ++i) { - ::crypto::RandBytes(&nonce_bytes[0], nonce_bytes.size()); + ::crypto::RandBytes(nonce_bytes); nonce = GetNonce(1, nonce_bytes); EXPECT_EQ(nonce.size(), (size_t)24); EXPECT_EQ(nonce[0], 0); @@ -199,7 +199,7 @@ TEST(CryptoTest, GetNonce) { TEST(CryptoTest, EncryptAndDecrypt) { std::vector nonce_bytes(20); - ::crypto::RandBytes(&nonce_bytes[0], nonce_bytes.size()); + ::crypto::RandBytes(nonce_bytes); std::vector nonce = GetNonce(0, nonce_bytes); const std::vector key = {149, 180, 182, 164, 238, 114, 52, 28, 87, 253, 230, 254, 239, 174, 160, 156, @@ -215,7 +215,7 @@ TEST(CryptoTest, EncryptAndDecrypt) { // encrypt and decrypt std::vector message(64); std::vector out_message; - ::crypto::RandBytes(message.data(), message.size()); + ::crypto::RandBytes(message); EXPECT_TRUE(Encrypt(message, nonce, key, &ciphertext)); EXPECT_TRUE(Decrypt(ciphertext, nonce, key, &out_message)); EXPECT_EQ(base::HexEncode(message.data(), message.size()), @@ -225,7 +225,7 @@ TEST(CryptoTest, EncryptAndDecrypt) { TEST(CryptoTest, Passphrase) { // original seed can be recovered std::vector bytes(32); - ::crypto::RandBytes(bytes.data(), bytes.size()); + ::crypto::RandBytes(bytes); std::string passphrase = PassphraseFromBytes32(bytes); EXPECT_TRUE(!passphrase.empty()); std::vector to_bytes; diff --git a/components/brave_wallet/browser/android_page_appearing_browsertest.cc b/components/brave_wallet/browser/android_page_appearing_browsertest.cc index 55a0d22b35cf8..6c79406d202a2 100644 --- a/components/brave_wallet/browser/android_page_appearing_browsertest.cc +++ b/components/brave_wallet/browser/android_page_appearing_browsertest.cc @@ -33,7 +33,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/android/tab_model/tab_model.h" #include "chrome/browser/ui/android/tab_model/tab_model_list.h" -#include "chrome/browser/ui/webui/webui_util.h" #include "chrome/test/base/android/android_browser_test.h" #include "chrome/test/base/chrome_test_utils.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/components/brave_wallet/browser/brave_wallet_utils.cc b/components/brave_wallet/browser/brave_wallet_utils.cc index 38bb6ada673bf..d810ad768af01 100644 --- a/components/brave_wallet/browser/brave_wallet_utils.cc +++ b/components/brave_wallet/browser/brave_wallet_utils.cc @@ -1100,7 +1100,7 @@ std::string GenerateMnemonic(size_t entropy_size) { } std::vector entropy(entropy_size); - crypto::RandBytes(&entropy[0], entropy.size()); + crypto::RandBytes(entropy); return GenerateMnemonicInternal(entropy.data(), entropy.size()); } diff --git a/components/brave_wallet/browser/ethereum_provider_impl.cc b/components/brave_wallet/browser/ethereum_provider_impl.cc index 1b726089030e0..dcce9fac83c91 100644 --- a/components/brave_wallet/browser/ethereum_provider_impl.cc +++ b/components/brave_wallet/browser/ethereum_provider_impl.cc @@ -497,7 +497,7 @@ void EthereumProviderImpl::EthSubscribe(const std::string& event_type, base::Value id) { const auto generateHexBytes = [](std::vector& subscriptions) { std::vector bytes(16); - crypto::RandBytes(&bytes.front(), bytes.size()); + crypto::RandBytes(bytes); std::string hex_bytes = ToHex(bytes); subscriptions.push_back(hex_bytes); return std::tuple{subscriptions.size() == 1, hex_bytes}; diff --git a/components/brave_wallet/browser/internal/hd_key.cc b/components/brave_wallet/browser/internal/hd_key.cc index 414a56e5219e3..e672f8df3a47a 100644 --- a/components/brave_wallet/browser/internal/hd_key.cc +++ b/components/brave_wallet/browser/internal/hd_key.cc @@ -50,7 +50,7 @@ const secp256k1_context* GetSecp256k1Ctx() { SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); SecureVector bytes(kContextRandomizeSize); - crypto::RandBytes(bytes.data(), bytes.size()); + crypto::RandBytes(bytes); [[maybe_unused]] int result = secp256k1_context_randomize(context, bytes.data()); diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveWebsite.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveWebsite.java index 41d3805222b7b..ace6f5da8c365 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveWebsite.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveWebsite.java @@ -9,6 +9,7 @@ import org.chromium.build.annotations.UsedByReflection; import org.chromium.components.content_settings.ContentSettingValues; import org.chromium.components.content_settings.ContentSettingsType; +import org.chromium.components.content_settings.ProviderType; import org.chromium.content_public.browser.BrowserContextHandle; @UsedByReflection("Website") @@ -40,7 +41,7 @@ public void setContentSetting( Website.class, this, "getAddress")) .getHost(), value, - "", + ProviderType.NONE, false); BraveReflectionUtil.InvokeMethod( Website.class, @@ -61,7 +62,7 @@ public void setContentSetting( Website.class, this, "getAddress")) .getHost(), value, - "", + ProviderType.NONE, false); BraveReflectionUtil.InvokeMethod( Website.class, @@ -82,7 +83,7 @@ public void setContentSetting( Website.class, this, "getAddress")) .getHost(), value, - "", + ProviderType.NONE, false); BraveReflectionUtil.InvokeMethod( Website.class, diff --git a/components/browsing_data_strings.grdp b/components/browsing_data_strings.grdp index 4881f63b19623..56c9a7ee0a5a2 100644 --- a/components/browsing_data_strings.grdp +++ b/components/browsing_data_strings.grdp @@ -73,22 +73,12 @@ =1 {and 1 more} other {and # more}} - - - {COUNT, plural, - =0 {None} - =1 {sign-in data for 1 account} - other {sign-in data for # accounts}} - - - - - {COUNT, plural, - =0 {None} - =1 {1 passkey} - other {# passkeys}} - - + + {COUNT, plural, + =0 {None} + =1 {sign-in data for 1 account} + other {sign-in data for # accounts}} + None @@ -183,4 +173,23 @@ =1 {and 1 more} other {and # more}} + + {COUNT, plural, + =0 {None} + =1 {1 tab on this device} + other {# tabs on this device}} + + + {COUNT, plural, + =1 {1 tab} + other {# tabs}} + + + {COUNT, plural, + =1 {1 window} + other {# windows}} + + + $15 tabs from $22 windows on this device + diff --git a/components/commerce_strings.grdp b/components/commerce_strings.grdp index d3576ed0a6db8..342d4f1ac273d 100644 --- a/components/commerce_strings.grdp +++ b/components/commerce_strings.grdp @@ -36,7 +36,7 @@ Let Brave help you find discounts for your carts - + Let Brave use your carts to search for personalized discounts. When available, discounts will automatically show up on your carts. @@ -237,9 +237,6 @@ Price History Across the Web for this Option - - Price History Across the Web - Low Priced Option @@ -252,12 +249,6 @@ Save and Track Price - - Price is Low - - - Price is High - Shopping Insights @@ -272,9 +263,6 @@ Price history across the web for this option - - Price history across the web - Low priced option @@ -287,12 +275,6 @@ Save and track price - - Price is low - - - Price is high - Shopping insights @@ -456,19 +438,96 @@ From other stores across the web + + Track + + + Tracking + + + Good Deal Now + + + Wait to Buy + + + See Price History + + + + Price History Across the Web + + + Price is Low + + + Price is High + + + Price Range for All Options + + + + + Price history across the web + + + Price is low + + + Price is high + + + Price range for all options + + Shopping list + + Something will show here once you select something from the dropdown under this + + + Missing some info + Analyze pages? Analyze $1pages? + + Product specifications lists + + + Open Tabs + + + Recently Viewed + Dismiss suggestion + + Add a tab + + + First, read this then add tabs. + + + Add to analysis? + + + Added to analysis + + + Add to $1analysis? + + + Added to $1analysis + + diff --git a/components/compose_strings.grdp b/components/compose_strings.grdp index 10705c219f576..0e393aceb7c65 100644 --- a/components/compose_strings.grdp +++ b/components/compose_strings.grdp @@ -24,16 +24,19 @@ Open to continue - + + Help me write. Tab and press enter to open + + Resume Help me write. Tab and press enter to open - - Never show on this site + + Don't show on this site - - Disable + + Never show - + Go to Settings @@ -186,7 +189,7 @@ <a href="#" role="button">Learn more</a> - <a href="#" id="signInLink" role="button">Sign in</a> + <a href="#" id="signInLink" role="button">Sign in</a> again, then come back to this tab to get writing help diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc b/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc index 1aee66d004108..cc10c9e766355 100644 --- a/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc +++ b/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc @@ -121,7 +121,7 @@ TEST_F(BraveContentSettingsAgentImplAutoplayBrowserTest, autoplay_setting_rules.push_back(ContentSettingPatternSource( ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK), - std::string(), false)); + content_settings::ProviderType::kNone, false)); MockContentSettingsAgentImpl agent(GetMainRenderFrame()); agent.SetRendererContentSettingRulesForTest(content_setting_rules); @@ -137,7 +137,7 @@ TEST_F(BraveContentSettingsAgentImplAutoplayBrowserTest, ContentSettingsPattern::Wildcard(), ContentSettingsPattern::FromString("https://example.com"), content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW), - std::string(), false)); + content_settings::ProviderType::kNone, false)); agent.SetRendererContentSettingRulesForTest(content_setting_rules); EXPECT_TRUE(agent.AllowAutoplay(true)); } @@ -153,7 +153,7 @@ TEST_F(BraveContentSettingsAgentImplAutoplayBrowserTest, autoplay_setting_rules.push_back(ContentSettingPatternSource( ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW), - std::string(), false)); + content_settings::ProviderType::kNone, false)); MockContentSettingsAgentImpl agent(GetMainRenderFrame()); agent.SetRendererContentSettingRulesForTest(content_setting_rules); @@ -166,7 +166,7 @@ TEST_F(BraveContentSettingsAgentImplAutoplayBrowserTest, ContentSettingsPattern::Wildcard(), ContentSettingsPattern::FromString("https://example.com"), content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK), - std::string(), false)); + content_settings::ProviderType::kNone, false)); agent.SetRendererContentSettingRulesForTest(content_setting_rules); EXPECT_FALSE(agent.AllowAutoplay(true)); base::RunLoop().RunUntilIdle(); diff --git a/components/ephemeral_storage/ephemeral_storage_service.cc b/components/ephemeral_storage/ephemeral_storage_service.cc index ec28772a6a668..5711652feba17 100644 --- a/components/ephemeral_storage/ephemeral_storage_service.cc +++ b/components/ephemeral_storage/ephemeral_storage_service.cc @@ -159,7 +159,7 @@ bool EphemeralStorageService::IsDefaultCookieSetting(const GURL& url) const { for (const auto& setting : settings) { if (setting.primary_pattern.Matches(url) && setting.secondary_pattern.Matches(url)) { - return setting.source == "default"; + return setting.source == content_settings::ProviderType::kDefaultProvider; } } diff --git a/components/error_page_strings.grdp b/components/error_page_strings.grdp index 8333d4cfd3302..2e1beee178655 100644 --- a/components/error_page_strings.grdp +++ b/components/error_page_strings.grdp @@ -93,7 +93,7 @@ - <a href="#buttons" onclick="javascript:portalSignin()">Signing in</a> to the WiFi network + <a href="javascript:portalSignin()">Signing in</a> to the WiFi network diff --git a/components/facilitated_payments_strings.grdp b/components/facilitated_payments_strings.grdp index 5bbaa5fafbcd1..3b5713ca72769 100644 --- a/components/facilitated_payments_strings.grdp +++ b/components/facilitated_payments_strings.grdp @@ -33,6 +33,13 @@ Transacting account + + + Pay with Pix without copy and paste + + + Account info is encrypted and kept private + diff --git a/components/history_strings.grdp b/components/history_strings.grdp index eb98111d2fb88..ff8e10152b2f0 100644 --- a/components/history_strings.grdp +++ b/components/history_strings.grdp @@ -55,13 +55,13 @@ No search results found - - Clear browsing data... + + Delete browsing data... - - Clear Browsing Data... + + Delete Browsing Data... @@ -132,6 +132,12 @@ Enter a search query to search through history. Here is some more placeholder text about how to search History and what data is available. Here is some more text to make this placeholder longer. View more in <a target="_blank" href="$1">Settings</a>. + + Show by date + + + Show by group + Yesterday diff --git a/components/management_strings.grdp b/components/management_strings.grdp index 0bcc28f67e43a..f75a40577d270 100644 --- a/components/management_strings.grdp +++ b/components/management_strings.grdp @@ -63,7 +63,7 @@ - Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + Your administrator can make changes to your profile and browser remotely, analyze information about the browser through reporting, and perform other necessary tasks. Activity on this device may also be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> @@ -71,12 +71,15 @@ - Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + Your administrator can make changes to your profile and browser remotely, analyze information about the browser through reporting, and perform other necessary tasks. Activity on this device may also be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + + The profile you’re signed in to is a managed profile. Your administrator can make changes to your profile settings remotely, analyze information about the browser through reporting, and perform other necessary tasks. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + Learn more about how your browser is managed @@ -342,7 +345,7 @@ Applications authorized by your administrator can capture all screens attached to your device. This information can be processed locally or uploaded to your organization’s servers. - When security events are flagged by Brave, relevant data about the events is sent to your administrator. This can include URLs of pages you visit in Brave, file names or metadata, browser or tab crashes, and the username that you use to sign in to web based applications, your device and Brave. + When security events are flagged by Brave, relevant data about the events is sent to your administrator. This can include URLs of pages you visit in Brave, URLs of pages you copied data from, file names or metadata, browser or tab crashes, and the username that you use to sign in to web based applications, your device and Brave. URLs of pages you visit are sent to Google Cloud or third parties for analysis. For example, they might be scanned to detect unsafe websites or filter websites based on rules set by the administrator. diff --git a/components/new_or_sad_tab_strings.grdp b/components/new_or_sad_tab_strings.grdp index 45d720ab21e03..c6168b0e6e925 100644 --- a/components/new_or_sad_tab_strings.grdp +++ b/components/new_or_sad_tab_strings.grdp @@ -225,67 +225,4 @@ - - - - - Private in Brave - - - - - Private in Brave - - - - What Private does - - - - When you close all Brave Private tabs, your activity in those tabs is removed from this device: - <ul> - <li>Browsing activity</li> - <li>Search history</li> - <li>Information entered in forms</li> - </ul> - - - - - When you close all Brave Private tabs, your activity in those tabs is removed from this device: - <ul> - <li>Browsing activity</li> - <li>Search history</li> - <li>Information entered in forms</li> - </ul> - - - - What Private doesn’t do - - - Private does not make you invisible online: - <ul> - <li>Sites and the services they use can see visits</li> - <li>Employers or schools can track browsing activity</li> - <li>Internet service providers can monitor web traffic</li> - </ul> - - - - <a>Learn more about Private in Brave</a> - - - - - <a>Learn more about Private in Brave</a> - - - - Block third party cookies in Private - - - Sites can't use cookies that track you across the web. Features on some sites may break. - - diff --git a/components/new_or_sad_tab_strings_override.grdp b/components/new_or_sad_tab_strings_override.grdp index 6523801bd5cce..d56fb08d89f7f 100644 --- a/components/new_or_sad_tab_strings_override.grdp +++ b/components/new_or_sad_tab_strings_override.grdp @@ -78,61 +78,4 @@ - - - Private in Brave - - - - - Private in Brave - - - - What Private does - - - - When you close all Brave Private tabs, your activity in those tabs is removed from this device: - <ul> - <li>Browsing activity</li> - <li>Search history</li> - <li>Information entered in forms</li> - </ul> - - - - - When you close all Brave Private tabs, your activity in those tabs is removed from this device: - <ul> - <li>Browsing activity</li> - <li>Search history</li> - <li>Information entered in forms</li> - </ul> - - - - What Private doesn’t do - - - Private does not make you invisible online: - <ul> - <li>Sites and the services they use can see visits</li> - <li>Employers or schools can track browsing activity</li> - <li>Internet service providers can monitor web traffic</li> - </ul> - - - - <a>Learn more about Private in Brave</a> - - - - - <a>Learn more about Private in Brave</a> - - - - Block third party cookies in Private - - + diff --git a/components/ntp_widget_utils/browser/ntp_widget_utils_oauth.cc b/components/ntp_widget_utils/browser/ntp_widget_utils_oauth.cc index 53a17ca53eafd..19dd26794f681 100644 --- a/components/ntp_widget_utils/browser/ntp_widget_utils_oauth.cc +++ b/components/ntp_widget_utils/browser/ntp_widget_utils_oauth.cc @@ -20,7 +20,7 @@ namespace ntp_widget_utils { std::string GetCryptoRandomString(bool hex_encode) { constexpr size_t kSeedByteLength = 32; uint8_t random_seed_bytes[kSeedByteLength]; - crypto::RandBytes(random_seed_bytes, kSeedByteLength); + crypto::RandBytes(random_seed_bytes); if (!hex_encode) { return base::Base64Encode(random_seed_bytes); diff --git a/components/omnibox_pedal_ui_strings.grdp b/components/omnibox_pedal_ui_strings.grdp index 13ea72047f395..7a1f721ac5fe5 100644 --- a/components/omnibox_pedal_ui_strings.grdp +++ b/components/omnibox_pedal_ui_strings.grdp @@ -6,16 +6,16 @@ - Clear browsing data + Delete browsing data - Clear your browsing history, cookies, cache, and more in Brave settings + Delete your browsing history, cookies, cache, and more in Brave settings - $1The Chromium Projects http://www.chromium.org bookmark, press Tab then Enter to Clear your browsing history, cookies, cache, and more in Brave settings + $1The Chromium Projects http://www.chromium.org bookmark, press Tab then Enter to delete your browsing history, cookies, cache, and more in Brave settings - Clear browsing data button, activate to clear your browsing history, cookies, cache, and more in Brave settings + Delete browsing data button, activate to delete your browsing history, cookies, cache, and more in Brave settings @@ -519,7 +519,7 @@ - Clear Browsing Data + Delete Browsing Data diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp index ec41d2f4ab412..4b4f1dda46847 100644 --- a/components/omnibox_strings.grdp +++ b/components/omnibox_strings.grdp @@ -295,6 +295,9 @@ $1@bookmarks - Search $2Bookmarks + + Chat with $1Gemini + diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index f41e6be49f566..53b1e875f6dac 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp @@ -181,9 +181,6 @@ The connection is encrypted and authenticated using $1AES_128_GCM and uses $2RSA as the key exchange mechanism. - - The identity of the server you are connected to cannot be fully validated. You are connected to a server using a name only valid within your network, which an external certificate authority has no way to validate ownership of. As some certificate authorities will issue certificates for these names regardless, there is no way to ensure you are connected to the intended website and not an attacker. - Your connection to $1www.google.com is not encrypted. @@ -746,13 +743,13 @@ Tracking Protection - + Third-party cookies allowed Third-party cookies blocked - + Third-party cookies limited diff --git a/components/password_manager_strings.grdp b/components/password_manager_strings.grdp index 1f8b4d8ed5925..10c6a57ef4bdc 100644 --- a/components/password_manager_strings.grdp +++ b/components/password_manager_strings.grdp @@ -37,7 +37,7 @@ - Suggest Password... + Suggest Strong Password @@ -123,6 +123,9 @@ Passkey from iCloud Keychain + + Passkey from Brave Password Manager + Passkey from "$1Dashlane" diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp index 7ae63c1cd8bef..f2eac6da2b312 100644 --- a/components/payments_strings.grdp +++ b/components/payments_strings.grdp @@ -516,6 +516,12 @@ Total + + Network + + + Issuer + Verify diff --git a/components/pdf_strings.grdp b/components/pdf_strings.grdp index 58002e5aae8a2..368fe3373be5d 100644 --- a/components/pdf_strings.grdp +++ b/components/pdf_strings.grdp @@ -193,7 +193,7 @@ Thumbnail for page 1$1 - + Annotate diff --git a/components/permissions_strings.grdp b/components/permissions_strings.grdp index 93c068ef37d1d..95a2a53b25f62 100644 --- a/components/permissions_strings.grdp +++ b/components/permissions_strings.grdp @@ -71,9 +71,8 @@ Allow camera? - - Allow 2 permissions? + Allow an immersive experience? Allow storage access? @@ -123,6 +122,9 @@ Use & move your camera + + Use & move your cameras ($11) + Respond to Accessibility Events @@ -135,6 +137,12 @@ Create a 3D map of your surroundings and track camera position + + Lock your keyboard + + + Lock your mouse pointer + $1google.com wants to use info they've saved about you @@ -182,6 +190,9 @@ This will otherwise be blocked by your privacy settings. This will allow the con Allow on every visit + + Allow while visiting the site + Don't allow @@ -405,22 +416,22 @@ This will otherwise be blocked by your privacy settings. This will allow the con - Your administrator has blocked $1camera on $2www.google.com + Your administrator blocked your $1camera for this site - Your administrator has allowed $1camera on $2www.google.com + $1Camera allowed You have allowed $1camera on $2www.google.com - You previously didn't allow $1camera on $2www.google.com + You previously chose don’t allow for this site - You've turned $1camera off for Brave. + To use your $1camera on this site, give Brave access - To use your $1camera on this site, you need to give Brave access + Brave needs access to your device's $1camera location @@ -433,6 +444,15 @@ This will otherwise be blocked by your privacy settings. This will allow the con camera and microphone + + + Camera + + + Microphone + + + Camera and microphone macOS diff --git a/components/plus_addresses_strings.grdp b/components/plus_addresses_strings.grdp index d82d043d0df28..987aad1561e62 100644 --- a/components/plus_addresses_strings.grdp +++ b/components/plus_addresses_strings.grdp @@ -61,6 +61,12 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua BEGIN_LINKUt enim ad minim veniamEND_LINK. For + + Refresh + + + Refreshing ... + Lorem Ipsum diff --git a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc index 5c9ff7b582249..4a27886b4ab49 100644 --- a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc +++ b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc @@ -149,20 +149,23 @@ bool BravePrivacySandboxSettings::IsSharedStorageAllowed( const url::Origin& top_frame_origin, const url::Origin& accessing_origin, std::string* out_debug_message, - content::RenderFrameHost* console_frame) const { + content::RenderFrameHost* console_frame, + bool* out_block_is_site_setting_specific) const { return false; } bool BravePrivacySandboxSettings::IsSharedStorageSelectURLAllowed( const url::Origin& top_frame_origin, const url::Origin& accessing_origin, - std::string* out_debug_message) const { + std::string* out_debug_message, + bool* out_block_is_site_setting_specific) const { return false; } bool BravePrivacySandboxSettings::IsPrivateAggregationAllowed( const url::Origin& top_frame_origin, - const url::Origin& reporting_origin) const { + const url::Origin& reporting_origin, + bool* out_block_is_site_setting_specific) const { return false; } diff --git a/components/privacy_sandbox/brave_privacy_sandbox_settings.h b/components/privacy_sandbox/brave_privacy_sandbox_settings.h index 45f08be9aa217..0e053ddadc4f9 100644 --- a/components/privacy_sandbox/brave_privacy_sandbox_settings.h +++ b/components/privacy_sandbox/brave_privacy_sandbox_settings.h @@ -82,15 +82,18 @@ class BravePrivacySandboxSettings bool IsSharedStorageAllowed( const url::Origin& top_frame_origin, const url::Origin& accessing_origin, - std::string* out_debug_message = nullptr, - content::RenderFrameHost* console_frame = nullptr) const override; + std::string* out_debug_message, + content::RenderFrameHost* console_frame, + bool* out_block_is_site_setting_specific) const override; bool IsSharedStorageSelectURLAllowed( const url::Origin& top_frame_origin, const url::Origin& accessing_origin, - std::string* out_debug_message = nullptr) const override; + std::string* out_debug_message, + bool* out_block_is_site_setting_specific) const override; bool IsPrivateAggregationAllowed( const url::Origin& top_frame_origin, - const url::Origin& reporting_origin) const override; + const url::Origin& reporting_origin, + bool* out_block_is_site_setting_specific) const override; bool IsPrivateAggregationDebugModeAllowed( const url::Origin& top_frame_origin, const url::Origin& reporting_origin) const override; diff --git a/components/privacy_sandbox_chrome_strings.grdp b/components/privacy_sandbox_chrome_strings.grdp index 291fa1d97d617..02ccbe117e193 100644 --- a/components/privacy_sandbox_chrome_strings.grdp +++ b/components/privacy_sandbox_chrome_strings.grdp @@ -1,5 +1,11 @@ - + + @@ -2302,6 +2308,14 @@ Learn more about Tracking Protection availability + + + Tracking Protection is on, which means Brave is limiting what sites can learn about you as you browse. + + + Tracking Protection is on, which means Brave is limiting what sites can learn about you as you browse. + + Brave automatically limits third-party cookies @@ -2354,3 +2368,4 @@ Tracking Protection is temporarily unavailable. While Brave is updating this feature, sites can temporarily use third-party cookies unless you block them. <link>Learn more</link> + diff --git a/components/privacy_sandbox_chrome_strings_override.grdp b/components/privacy_sandbox_chrome_strings_override.grdp index c830a3f4d0141..4bdca6f4809af 100644 --- a/components/privacy_sandbox_chrome_strings_override.grdp +++ b/components/privacy_sandbox_chrome_strings_override.grdp @@ -1,7 +1,14 @@ - + + Most sites can’t use third-party cookies to track you as you browse, and sites can’t use third-party cookies in Private mode. + diff --git a/components/site_settings_strings.grdp b/components/site_settings_strings.grdp index 7577d1bff6ca5..d11eebe593979 100644 --- a/components/site_settings_strings.grdp +++ b/components/site_settings_strings.grdp @@ -68,6 +68,9 @@ camera use & movement + + Camera use & movement ($11) + Scrolling & zooming diff --git a/components/ssl_errors_strings.grdp b/components/ssl_errors_strings.grdp index 17ed1feab03e5..e68e7f83e960c 100644 --- a/components/ssl_errors_strings.grdp +++ b/components/ssl_errors_strings.grdp @@ -103,6 +103,13 @@ The server certificate has a validity period that is too long. + + You attempted to reach <strong>$1paypal.com</strong>, but the server presented an invalid certificate issued to that name. The name is a reserved IP address or internal hostname. + + + The server certificate is issued to a non-unique name. + + An unknown error has occurred. diff --git a/components/sync/service/brave_sync_service_impl.cc b/components/sync/service/brave_sync_service_impl.cc index 8a48b9cc74bf3..3902e32aa03a1 100644 --- a/components/sync/service/brave_sync_service_impl.cc +++ b/components/sync/service/brave_sync_service_impl.cc @@ -288,9 +288,10 @@ void BraveSyncServiceImpl::PermanentlyDeleteAccount( } std::unique_ptr BraveSyncServiceImpl::ResetEngine( - ShutdownReason shutdown_reason, ResetEngineReason reset_reason) { - auto result = SyncServiceImpl::ResetEngine(shutdown_reason, reset_reason); + auto result = SyncServiceImpl::ResetEngine(reset_reason); + auto shutdown_reason = + SyncServiceImpl::ShutdownReasonForResetEngineReason(reset_reason); if (initiated_self_device_info_deleted_) { return result; diff --git a/components/sync/service/brave_sync_service_impl.h b/components/sync/service/brave_sync_service_impl.h index ff201bd2452c3..5f738aba05626 100644 --- a/components/sync/service/brave_sync_service_impl.h +++ b/components/sync/service/brave_sync_service_impl.h @@ -95,7 +95,6 @@ class BraveSyncServiceImpl : public SyncServiceImpl { const SyncProtocolError&); std::unique_ptr ResetEngine( - ShutdownReason shutdown_reason, ResetEngineReason reset_reason) override; void LocalDeviceAppeared(); diff --git a/components/sync/service/brave_sync_service_impl_unittest.cc b/components/sync/service/brave_sync_service_impl_unittest.cc index 340acdaa0db35..73afe59b47ffc 100644 --- a/components/sync/service/brave_sync_service_impl_unittest.cc +++ b/components/sync/service/brave_sync_service_impl_unittest.cc @@ -513,7 +513,6 @@ TEST_F(BraveSyncServiceImplTest, JoinDeletedChain) { // directly for test brave_sync_service_impl()->sync_disabled_by_admin_ = true; brave_sync_service_impl()->ResetEngine( - ShutdownReason::DISABLE_SYNC_AND_CLEAR_DATA, SyncServiceImpl::ResetEngineReason::kDisabledAccount); EXPECT_TRUE(join_chain_callback_invoked); diff --git a/components/vector_icons/brave/product_refresh.icon b/components/vector_icons/brave/product_refresh.icon new file mode 100644 index 0000000000000..4c9d628dfcdb2 --- /dev/null +++ b/components/vector_icons/brave/product_refresh.icon @@ -0,0 +1,157 @@ +// 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/. + + +CANVAS_DIMENSIONS, 24, +PATH_COLOR_ARGB, 0xFF, 0xFB, 0x54, 0x2B, +MOVE_TO, 21.07f, 6.29f, +LINE_TO, 21.56f, 5.19f, +CUBIC_TO, 21.61f, 5.08f, 21.59f, 4.96f, 21.51f, 4.87f, +LINE_TO, 20.2f, 3.55f, +CUBIC_TO, 19.64f, 2.97f, 18.79f, 2.78f, 18.03f, 3.04f, +LINE_TO, 17.68f, 3.17f, +LINE_TO, 15.72f, 1.03f, +LINE_TO, 12.38f, 1, +LINE_TO, 12.37f, 1, +LINE_TO, 12.37f, 1, +LINE_TO, 9.02f, 1.03f, +LINE_TO, 7.07f, 3.17f, +LINE_TO, 6.72f, 3.04f, +CUBIC_TO, 5.96f, 2.78f, 5.11f, 2.97f, 4.55f, 3.55f, +LINE_TO, 3.24f, 4.87f, +CUBIC_TO, 3.16f, 4.96f, 3.13f, 5.08f, 3.18f, 5.19f, +LINE_TO, 3.68f, 6.29f, +LINE_TO, 3, 8.13f, +LINE_TO, 3.44f, 9.79f, +LINE_TO, 5.43f, 17.36f, +CUBIC_TO, 5.66f, 18.23f, 6.18f, 18.99f, 6.92f, 19.52f, +CUBIC_TO, 6.92f, 19.52f, 9.33f, 21.22f, 11.72f, 22.77f, +CUBIC_TO, 11.93f, 22.9f, 12.14f, 23, 12.37f, 23, +CUBIC_TO, 12.61f, 23, 12.82f, 22.9f, 13.03f, 22.77f, +CUBIC_TO, 15.41f, 21.22f, 17.83f, 19.52f, 17.83f, 19.52f, +CUBIC_TO, 18.56f, 18.99f, 19.09f, 18.23f, 19.32f, 17.36f, +LINE_TO, 21.31f, 9.79f, +LINE_TO, 21.75f, 8.13f, +LINE_TO, 21.07f, 6.29f, +CLOSE, +NEW_PATH, +PATH_COLOR_ARGB, 0xFF, 0xFF, 0xFF, 0xFF, +MOVE_TO, 19.59f, 8.54f, +CUBIC_TO, 19.54f, 8.71f, 19.53f, 8.72f, 19.53f, 8.72f, +CUBIC_TO, 19.4f, 8.88f, 19.18f, 9.13f, 19.04f, 9.28f, +LINE_TO, 16.88f, 11.58f, +CUBIC_TO, 16.74f, 11.73f, 16.69f, 12, 16.77f, 12.19f, +LINE_TO, 17.13f, 13.02f, +CUBIC_TO, 17.21f, 13.21f, 17.21f, 13.52f, 17.14f, 13.71f, +LINE_TO, 17.07f, 13.91f, +CUBIC_TO, 16.96f, 14.22f, 16.76f, 14.5f, 16.5f, 14.72f, +LINE_TO, 16.16f, 14.99f, +CUBIC_TO, 16, 15.12f, 15.72f, 15.15f, 15.53f, 15.07f, +LINE_TO, 14.33f, 14.49f, +CUBIC_TO, 14.15f, 14.4f, 13.87f, 14.22f, 13.72f, 14.08f, +LINE_TO, 12.75f, 13.21f, +CUBIC_TO, 12.59f, 13.07f, 12.58f, 12.81f, 12.73f, 12.66f, +LINE_TO, 14.91f, 11.19f, +CUBIC_TO, 15.08f, 11.08f, 15.14f, 10.84f, 15.05f, 10.65f, +LINE_TO, 14.2f, 9.07f, +CUBIC_TO, 14.11f, 8.89f, 14.09f, 8.6f, 14.16f, 8.43f, +CUBIC_TO, 14.23f, 8.27f, 14.45f, 8.07f, 14.64f, 8, +LINE_TO, 17.29f, 7, +CUBIC_TO, 17.48f, 6.93f, 17.47f, 6.85f, 17.27f, 6.83f, +LINE_TO, 15.71f, 6.69f, +CUBIC_TO, 15.51f, 6.67f, 15.18f, 6.7f, 14.98f, 6.75f, +LINE_TO, 13.63f, 7.13f, +CUBIC_TO, 13.43f, 7.18f, 13.3f, 7.39f, 13.34f, 7.59f, +LINE_TO, 13.87f, 10.5f, +CUBIC_TO, 13.91f, 10.7f, 13.92f, 10.92f, 13.9f, 10.99f, +CUBIC_TO, 13.88f, 11.06f, 13.69f, 11.15f, 13.49f, 11.19f, +LINE_TO, 12.67f, 11.37f, +CUBIC_TO, 12.59f, 11.38f, 12.49f, 11.39f, 12.39f, 11.4f, +CUBIC_TO, 12.28f, 11.39f, 12.18f, 11.38f, 12.1f, 11.37f, +LINE_TO, 11.28f, 11.19f, +CUBIC_TO, 11.08f, 11.15f, 10.9f, 11.06f, 10.88f, 10.99f, +CUBIC_TO, 10.85f, 10.92f, 10.87f, 10.7f, 10.9f, 10.5f, +LINE_TO, 11.43f, 7.59f, +CUBIC_TO, 11.47f, 7.39f, 11.34f, 7.18f, 11.14f, 7.13f, +LINE_TO, 9.79f, 6.75f, +CUBIC_TO, 9.59f, 6.7f, 9.27f, 6.67f, 9.06f, 6.69f, +LINE_TO, 7.51f, 6.83f, +CUBIC_TO, 7.3f, 6.85f, 7.29f, 6.93f, 7.48f, 7, +LINE_TO, 10.13f, 8, +CUBIC_TO, 10.32f, 8.07f, 10.54f, 8.27f, 10.61f, 8.43f, +CUBIC_TO, 10.69f, 8.6f, 10.67f, 8.89f, 10.57f, 9.07f, +LINE_TO, 9.73f, 10.65f, +CUBIC_TO, 9.63f, 10.84f, 9.69f, 11.08f, 9.86f, 11.19f, +LINE_TO, 12.04f, 12.66f, +CUBIC_TO, 12.19f, 12.81f, 12.18f, 13.07f, 12.02f, 13.21f, +LINE_TO, 11.05f, 14.08f, +CUBIC_TO, 10.9f, 14.22f, 10.63f, 14.4f, 10.44f, 14.49f, +LINE_TO, 9.24f, 15.07f, +CUBIC_TO, 9.05f, 15.15f, 8.77f, 15.12f, 8.62f, 14.99f, +LINE_TO, 8.28f, 14.72f, +CUBIC_TO, 8.02f, 14.5f, 7.82f, 14.22f, 7.7f, 13.91f, +LINE_TO, 7.63f, 13.71f, +CUBIC_TO, 7.56f, 13.52f, 7.57f, 13.21f, 7.65f, 13.02f, +LINE_TO, 8, 12.19f, +CUBIC_TO, 8.08f, 12, 8.03f, 11.73f, 7.89f, 11.58f, +LINE_TO, 5.73f, 9.28f, +CUBIC_TO, 5.59f, 9.13f, 5.37f, 8.88f, 5.24f, 8.72f, +CUBIC_TO, 5.24f, 8.72f, 5.24f, 8.71f, 5.19f, 8.54f, +LINE_TO, 5.16f, 8.44f, +CUBIC_TO, 5.15f, 8.33f, 5.19f, 7.96f, 5.24f, 7.87f, +CUBIC_TO, 5.29f, 7.77f, 5.42f, 7.55f, 5.53f, 7.38f, +LINE_TO, 6.14f, 6.47f, +CUBIC_TO, 6.26f, 6.31f, 6.45f, 6.04f, 6.58f, 5.88f, +LINE_TO, 7.41f, 4.84f, +CUBIC_TO, 7.53f, 4.68f, 7.64f, 4.55f, 7.65f, 4.56f, +CUBIC_TO, 7.66f, 4.56f, 7.67f, 4.56f, 7.67f, 4.56f, +CUBIC_TO, 7.67f, 4.55f, 7.83f, 4.58f, 8.03f, 4.62f, +LINE_TO, 9.3f, 4.87f, +CUBIC_TO, 9.5f, 4.9f, 9.75f, 4.95f, 9.85f, 4.97f, +CUBIC_TO, 9.95f, 4.99f, 10.2f, 4.96f, 10.39f, 4.89f, +LINE_TO, 11.39f, 4.57f, +CUBIC_TO, 11.58f, 4.51f, 11.9f, 4.42f, 12.1f, 4.37f, +CUBIC_TO, 12.1f, 4.37f, 12.18f, 4.35f, 12.39f, 4.35f, +CUBIC_TO, 12.59f, 4.35f, 12.67f, 4.37f, 12.67f, 4.37f, +CUBIC_TO, 12.87f, 4.42f, 13.19f, 4.51f, 13.38f, 4.57f, +LINE_TO, 14.38f, 4.89f, +CUBIC_TO, 14.57f, 4.96f, 14.82f, 4.99f, 14.92f, 4.97f, +CUBIC_TO, 15.03f, 4.95f, 15.27f, 4.9f, 15.48f, 4.87f, +LINE_TO, 16.74f, 4.62f, +CUBIC_TO, 16.94f, 4.58f, 17.1f, 4.55f, 17.11f, 4.56f, +CUBIC_TO, 17.11f, 4.56f, 17.11f, 4.56f, 17.12f, 4.56f, +CUBIC_TO, 17.13f, 4.55f, 17.24f, 4.68f, 17.37f, 4.84f, +LINE_TO, 18.19f, 5.88f, +CUBIC_TO, 18.32f, 6.04f, 18.52f, 6.31f, 18.63f, 6.47f, +LINE_TO, 19.24f, 7.38f, +CUBIC_TO, 19.36f, 7.55f, 19.49f, 7.77f, 19.53f, 7.87f, +CUBIC_TO, 19.58f, 7.96f, 19.62f, 8.33f, 19.62f, 8.44f, +LINE_TO, 19.59f, 8.54f, +CLOSE, +MOVE_TO, 15.23f, 16.35f, +LINE_TO, 14.28f, 17.02f, +CUBIC_TO, 14.11f, 17.14f, 13.85f, 17.34f, 13.7f, 17.48f, +LINE_TO, 13.43f, 17.7f, +CUBIC_TO, 13.28f, 17.84f, 13.02f, 18.06f, 12.87f, 18.19f, +LINE_TO, 12.62f, 18.42f, +CUBIC_TO, 12.55f, 18.48f, 12.46f, 18.51f, 12.37f, 18.52f, +CUBIC_TO, 12.28f, 18.51f, 12.2f, 18.48f, 12.13f, 18.42f, +LINE_TO, 11.88f, 18.19f, +CUBIC_TO, 11.72f, 18.06f, 11.47f, 17.84f, 11.32f, 17.7f, +LINE_TO, 11.05f, 17.48f, +CUBIC_TO, 10.9f, 17.34f, 10.63f, 17.14f, 10.47f, 17.02f, +LINE_TO, 9.52f, 16.35f, +CUBIC_TO, 9.35f, 16.23f, 9.36f, 16.06f, 9.55f, 15.96f, +LINE_TO, 10.64f, 15.39f, +CUBIC_TO, 10.82f, 15.3f, 11.12f, 15.16f, 11.31f, 15.08f, +LINE_TO, 11.9f, 14.83f, +CUBIC_TO, 12.09f, 14.76f, 12.27f, 14.69f, 12.29f, 14.69f, +LINE_TO, 12.37f, 14.69f, +LINE_TO, 12.45f, 14.69f, +CUBIC_TO, 12.48f, 14.69f, 12.66f, 14.76f, 12.84f, 14.83f, +LINE_TO, 13.44f, 15.08f, +CUBIC_TO, 13.63f, 15.16f, 13.93f, 15.3f, 14.11f, 15.39f, +LINE_TO, 15.2f, 15.96f, +CUBIC_TO, 15.38f, 16.06f, 15.39f, 16.23f, 15.23f, 16.35f, +CLOSE \ No newline at end of file diff --git a/ios/app/brave_core_main.mm b/ios/app/brave_core_main.mm index 92ed8c7a8e549..d0dfc9ecae8b0 100644 --- a/ios/app/brave_core_main.mm +++ b/ios/app/brave_core_main.mm @@ -212,7 +212,7 @@ - (instancetype)initWithUserAgent:(NSString*)userAgent ios::ChromeBrowserStateManager* browserStateManager = GetApplicationContext()->GetChromeBrowserStateManager(); ChromeBrowserState* chromeBrowserState = - browserStateManager->GetLastUsedBrowserState(); + browserStateManager->GetLastUsedBrowserStateDeprecatedDoNotUse(); _mainBrowserState = chromeBrowserState; // Disable Safe-Browsing via Prefs diff --git a/ios/brave-ios/App/Client.xcodeproj/project.pbxproj b/ios/brave-ios/App/Client.xcodeproj/project.pbxproj index 097ba2c289cab..772b1c773a09a 100644 --- a/ios/brave-ios/App/Client.xcodeproj/project.pbxproj +++ b/ios/brave-ios/App/Client.xcodeproj/project.pbxproj @@ -1824,7 +1824,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LOCALIZED_STRING_SWIFTUI_SUPPORT = NO; MTL_ENABLE_DEBUG_INFO = YES; @@ -1978,7 +1978,6 @@ "@executable_path/../../../../Frameworks", "@executable_path/../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.5; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; @@ -2038,7 +2037,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)"; LOCALIZED_STRING_SWIFTUI_SUPPORT = NO; @@ -2570,7 +2569,6 @@ GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = BraveWireGuard/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = BraveWireGuard; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2608,7 +2606,6 @@ GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = BraveWireGuard/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = BraveWireGuard; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2644,7 +2641,6 @@ GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = BraveWireGuard/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = BraveWireGuard; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2680,7 +2676,6 @@ GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = BraveWireGuard/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = BraveWireGuard; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2717,7 +2712,6 @@ GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = BraveWireGuard/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = BraveWireGuard; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2753,7 +2747,6 @@ GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = BraveWireGuard/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = BraveWireGuard; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2948,7 +2941,6 @@ "@executable_path/../../../../Frameworks", "@executable_path/../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.5; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; @@ -2984,7 +2976,6 @@ "@executable_path/../../../../Frameworks", "@executable_path/../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.5; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3019,7 +3010,6 @@ "@executable_path/../../../../Frameworks", "@executable_path/../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.5; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3055,7 +3045,6 @@ "@executable_path/../../../../Frameworks", "@executable_path/../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.5; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3090,7 +3079,6 @@ "@executable_path/../../../../Frameworks", "@executable_path/../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.5; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3149,7 +3137,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)"; LOCALIZED_STRING_SWIFTUI_SUPPORT = NO; @@ -3235,7 +3223,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)"; LOCALIZED_STRING_SWIFTUI_SUPPORT = NO; @@ -3318,7 +3306,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)"; LOCALIZED_STRING_SWIFTUI_SUPPORT = NO; @@ -3400,7 +3388,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LOCALIZED_STRING_SWIFTUI_SUPPORT = NO; MTL_ENABLE_DEBUG_INFO = YES; diff --git a/ios/brave-ios/Package.swift b/ios/brave-ios/Package.swift index 78b612ee11573..aa54f66b9f496 100644 --- a/ios/brave-ios/Package.swift +++ b/ios/brave-ios/Package.swift @@ -10,7 +10,7 @@ import PackageDescription var package = Package( name: "Brave", defaultLocalization: "en", - platforms: [.iOS(.v15), .macOS(.v12)], + platforms: [.iOS(.v16), .macOS(.v13)], products: [ .library(name: "Brave", targets: ["Brave"]), .library(name: "Shared", targets: ["Shared"]), diff --git a/ios/brave-ios/Sources/AIChat/Components/Messages/AIChatSuggestionsView.swift b/ios/brave-ios/Sources/AIChat/Components/Messages/AIChatSuggestionsView.swift index a861c4a0296a9..94e133b600545 100644 --- a/ios/brave-ios/Sources/AIChat/Components/Messages/AIChatSuggestionsView.swift +++ b/ios/brave-ios/Sources/AIChat/Components/Messages/AIChatSuggestionsView.swift @@ -76,7 +76,7 @@ struct WrappingHStack: Layout { } } -@available(iOS, introduced: 15.0, obsoleted: 16.0) +@available(iOS, introduced: 15.0, deprecated: 16.0) struct WrappingHStackOld: View where Model: Hashable, V: View { typealias ViewGenerator = (Model) -> V diff --git a/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsLabelDetailView.swift b/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsLabelDetailView.swift index 7fee77d13a43d..381aa81378b4b 100644 --- a/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsLabelDetailView.swift +++ b/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsLabelDetailView.swift @@ -6,7 +6,7 @@ import BraveUI import SwiftUI -@available(iOS, introduced: 15.0, obsoleted: 16.0) +@available(iOS, introduced: 15.0, deprecated: 16.0) public struct AIChatAdvancedSettingsLabelDetailView: View { let title: String var detail: String? // When detail is nil, a Progress View is shown diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+FindInPageDelegate.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+FindInPageDelegate.swift index 6804599baa605..811f9cf6e4414 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+FindInPageDelegate.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+FindInPageDelegate.swift @@ -10,7 +10,7 @@ import os.log /// List of Find Options used by WebKit to `Find-In-Page` /// Typically we use `caseInsensitive`, `wrapAround`, `backwards`, `showHighlight` -@available(iOS, obsoleted: 16.0, message: "Replaced by UIFindInteraction") +@available(iOS, deprecated: 16.0, message: "Replaced by UIFindInteraction") private struct WKFindOptions: OptionSet { let rawValue: UInt @@ -39,7 +39,7 @@ private struct WKFindOptions: OptionSet { /// A Delegate used to invoke `Find-In-Page` internally in WebKit /// This is used to allow WebKit to do Find-In-Page on PDFs and all Web-Content -@available(iOS, obsoleted: 16.0, message: "Replaced by UIFindInteraction") +@available(iOS, deprecated: 16.0, message: "Replaced by UIFindInteraction") @objc class WKWebViewFindStringFindDelegate: NSObject { /// Set to true when the constructor hasn't failed @@ -196,7 +196,7 @@ class WKWebViewFindStringFindDelegate: NSObject { // MARK: FindInPageBarDelegate - FindInPageScriptHandlerDelegate -@available(iOS, obsoleted: 16.0, message: "Replaced by UIFindInteraction") +@available(iOS, deprecated: 16.0, message: "Replaced by UIFindInteraction") extension BrowserViewController: FindInPageBarDelegate, FindInPageScriptHandlerDelegate { enum TextSearchDirection: String { diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/FindInPageBar.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/FindInPageBar.swift index 8a29b3170803e..ed899262acef3 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/FindInPageBar.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/FindInPageBar.swift @@ -5,7 +5,7 @@ import Shared import UIKit -@available(iOS, obsoleted: 16.0, message: "Replaced by UIFindInteraction") +@available(iOS, deprecated: 16.0, message: "Replaced by UIFindInteraction") protocol FindInPageBarDelegate: AnyObject { func findInPage(_ findInPage: FindInPageBar, didTextChange text: String) func findInPage(_ findInPage: FindInPageBar, didFindPreviousWithText text: String) @@ -13,13 +13,13 @@ protocol FindInPageBarDelegate: AnyObject { func findInPageDidPressClose(_ findInPage: FindInPageBar) } -@available(iOS, obsoleted: 16.0, message: "Replaced by UIFindInteraction") +@available(iOS, deprecated: 16.0, message: "Replaced by UIFindInteraction") private struct FindInPageUX { static let matchCountFont = UIConstants.defaultChromeFont static let searchTextFont = UIConstants.defaultChromeFont } -@available(iOS, obsoleted: 16.0, message: "Replaced by UIFindInteraction") +@available(iOS, deprecated: 16.0, message: "Replaced by UIFindInteraction") class FindInPageBar: UIView { weak var delegate: FindInPageBarDelegate? fileprivate let searchText = UITextField() diff --git a/ios/brave-ios/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/ScriptHandlers/Sandboxed/FindInPageScriptHandler.swift b/ios/brave-ios/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/ScriptHandlers/Sandboxed/FindInPageScriptHandler.swift index cd052ecbdb803..d1ae6c231025b 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/ScriptHandlers/Sandboxed/FindInPageScriptHandler.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/ScriptHandlers/Sandboxed/FindInPageScriptHandler.swift @@ -7,7 +7,7 @@ import Shared import WebKit import os.log -@available(iOS, obsoleted: 16.0, message: "Replaced by UIFindInteraction") +@available(iOS, deprecated: 16.0, message: "Replaced by UIFindInteraction") protocol FindInPageScriptHandlerDelegate: AnyObject { func findInPageHelper( _ findInPageScriptHandler: FindInPageScriptHandler, @@ -19,7 +19,7 @@ protocol FindInPageScriptHandlerDelegate: AnyObject { ) } -@available(iOS, obsoleted: 16.0, message: "Replaced by UIFindInteraction") +@available(iOS, deprecated: 16.0, message: "Replaced by UIFindInteraction") class FindInPageScriptHandler: TabContentScript { weak var delegate: FindInPageScriptHandlerDelegate? fileprivate weak var tab: Tab? diff --git a/ios/browser/api/ads/brave_ads.mm b/ios/browser/api/ads/brave_ads.mm index d50643c6f6571..c5571540fedfb 100644 --- a/ios/browser/api/ads/brave_ads.mm +++ b/ios/browser/api/ads/brave_ads.mm @@ -425,7 +425,7 @@ - (void)initProfilePrefService { CHECK(browserStateManager); ChromeBrowserState* chromeBrowserState = - browserStateManager->GetLastUsedBrowserState(); + browserStateManager->GetLastUsedBrowserStateDeprecatedDoNotUse(); CHECK(chromeBrowserState); _profilePrefService = chromeBrowserState->GetPrefs(); diff --git a/ios/browser/api/bookmarks/bookmark_model_listener_ios.h b/ios/browser/api/bookmarks/bookmark_model_listener_ios.h index 186b9047cfeaf..b55d7262f3ad1 100644 --- a/ios/browser/api/bookmarks/bookmark_model_listener_ios.h +++ b/ios/browser/api/bookmarks/bookmark_model_listener_ios.h @@ -41,12 +41,14 @@ class BookmarkModelListener : public bookmarks::BookmarkModelObserver { void BookmarkNodeRemoved(const bookmarks::BookmarkNode* parent, size_t old_index, const bookmarks::BookmarkNode* node, - const std::set& removed_urls) override; + const std::set& removed_urls, + const base::Location& location) override; void BookmarkNodeChanged(const bookmarks::BookmarkNode* node) override; void BookmarkNodeFaviconChanged(const bookmarks::BookmarkNode* node) override; void BookmarkNodeChildrenReordered( const bookmarks::BookmarkNode* node) override; - void BookmarkAllUserNodesRemoved(const std::set& removed_urls) override; + void BookmarkAllUserNodesRemoved(const std::set& removed_urls, + const base::Location& location) override; __strong id observer_; bookmarks::BookmarkModel* model_; // NOT OWNED diff --git a/ios/browser/api/bookmarks/bookmark_model_listener_ios.mm b/ios/browser/api/bookmarks/bookmark_model_listener_ios.mm index b8a19be3b7eb8..81844853261d5 100644 --- a/ios/browser/api/bookmarks/bookmark_model_listener_ios.mm +++ b/ios/browser/api/bookmarks/bookmark_model_listener_ios.mm @@ -89,7 +89,8 @@ - (instancetype)initWithNode:(const bookmarks::BookmarkNode*)node const bookmarks::BookmarkNode* parent, size_t old_index, const bookmarks::BookmarkNode* node, - const std::set& removed_urls) { + const std::set& removed_urls, + const base::Location& location) { IOSBookmarkNode* ios_node = [[IOSBookmarkNode alloc] initWithNode:node model:model_]; IOSBookmarkNode* ios_parent = [[IOSBookmarkNode alloc] initWithNode:parent @@ -133,7 +134,8 @@ - (instancetype)initWithNode:(const bookmarks::BookmarkNode*)node } void BookmarkModelListener::BookmarkAllUserNodesRemoved( - const std::set& removed_urls) { + const std::set& removed_urls, + const base::Location& location) { if ([observer_ respondsToSelector:@selector(bookmarkModelRemovedAllNodes)]) { [observer_ bookmarkModelRemovedAllNodes]; } diff --git a/ios/browser/api/bookmarks/brave_bookmarks_api.mm b/ios/browser/api/bookmarks/brave_bookmarks_api.mm index ebfdfa3c493d8..ffc623f3bbb00 100644 --- a/ios/browser/api/bookmarks/brave_bookmarks_api.mm +++ b/ios/browser/api/bookmarks/brave_bookmarks_api.mm @@ -447,7 +447,8 @@ - (bool)hasAncestor:(IOSBookmarkNode*)parent { - (void)remove { DCHECK(node_); DCHECK(model_); - model_->Remove(node_, bookmarks::metrics::BookmarkEditSource::kOther); + model_->Remove(node_, bookmarks::metrics::BookmarkEditSource::kOther, + FROM_HERE); node_ = nil; model_ = nil; } @@ -542,7 +543,7 @@ - (bool)editingEnabled { ios::ChromeBrowserStateManager* browserStateManager = GetApplicationContext()->GetChromeBrowserStateManager(); ChromeBrowserState* browserState = - browserStateManager->GetLastUsedBrowserState(); + browserStateManager->GetLastUsedBrowserStateDeprecatedDoNotUse(); PrefService* prefs = user_prefs::UserPrefs::Get(browserState); return prefs->GetBoolean(bookmarks::prefs::kEditBookmarksEnabled); @@ -616,7 +617,7 @@ - (void)removeBookmark:(IOSBookmarkNode*)bookmark { - (void)removeAll { DCHECK_CURRENTLY_ON(web::WebThread::UI); - bookmark_model_->RemoveAllUserBookmarks(); + bookmark_model_->RemoveAllUserBookmarks(FROM_HERE); } - (void)searchWithQuery:(NSString*)queryArg diff --git a/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm b/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm index 64a2216a4e5fe..9f307239b3578 100644 --- a/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm +++ b/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm @@ -112,7 +112,7 @@ - (void)exportToFile:(NSString*)filePath DCHECK(browserStateManager); ChromeBrowserState* chromeBrowserState = - browserStateManager->GetLastUsedBrowserState(); + browserStateManager->GetLastUsedBrowserStateDeprecatedDoNotUse(); DCHECK(chromeBrowserState); bookmark_html_writer::WriteBookmarks( diff --git a/ios/browser/api/bookmarks/importer/bookmarks_importer.mm b/ios/browser/api/bookmarks/importer/bookmarks_importer.mm index faccb3cb29cba..748893bd780ec 100644 --- a/ios/browser/api/bookmarks/importer/bookmarks_importer.mm +++ b/ios/browser/api/bookmarks/importer/bookmarks_importer.mm @@ -81,7 +81,7 @@ void ShowBookmarkBar(ChromeBrowserState* browser_state) { ios::ChromeBrowserStateManager* browser_state_manager = GetApplicationContext()->GetChromeBrowserStateManager(); ChromeBrowserState* browser_state = - browser_state_manager->GetLastUsedBrowserState(); + browser_state_manager->GetLastUsedBrowserStateDeprecatedDoNotUse(); bookmarks::BookmarkModel* model = ios::LocalOrSyncableBookmarkModelFactory:: GetDedicatedUnderlyingModelForBrowserStateIfUnificationDisabledOrDie( browser_state); diff --git a/ios/browser/api/favicon/favicon_loader.mm b/ios/browser/api/favicon/favicon_loader.mm index 05961bbb4b10f..d87ee77b87fca 100644 --- a/ios/browser/api/favicon/favicon_loader.mm +++ b/ios/browser/api/favicon/favicon_loader.mm @@ -60,7 +60,7 @@ + (instancetype)getForPrivateMode:(bool)privateMode { CHECK(browser_state_manager); ChromeBrowserState* browser_state = - browser_state_manager->GetLastUsedBrowserState(); + browser_state_manager->GetLastUsedBrowserStateDeprecatedDoNotUse(); CHECK(browser_state); if (privateMode) { diff --git a/ios/browser/api/password/brave_password_api.mm b/ios/browser/api/password/brave_password_api.mm index e232091277274..8f7ac9aeafda6 100644 --- a/ios/browser/api/password/brave_password_api.mm +++ b/ios/browser/api/password/brave_password_api.mm @@ -271,7 +271,8 @@ - (void)addLogin:(IOSPasswordForm*)passwordForm { } - (void)removeLogin:(IOSPasswordForm*)passwordForm { - password_store_->RemoveLogin([self createCredentialForm:passwordForm]); + password_store_->RemoveLogin(FROM_HERE, + [self createCredentialForm:passwordForm]); } - (void)updateLogin:(IOSPasswordForm*)newPasswordForm diff --git a/ios/browser/api/web/ui/BUILD.gn b/ios/browser/api/web/ui/BUILD.gn index 8e7ae86904c7d..5e005d9aca4cc 100644 --- a/ios/browser/api/web/ui/BUILD.gn +++ b/ios/browser/api/web/ui/BUILD.gn @@ -23,6 +23,8 @@ source_set("ui") { "//ios/web/public/webui", "//ios/web/web_state", "//ios/web/web_state:web_state_impl_header", + "//ios/web/web_state/ui:web_controller_header", + "//ios/web/web_state/ui:wk_web_view_configuration_provider_header", "//ios/web/webui", "//ui/base", ] diff --git a/ios/browser/api/web/ui/chrome_webview.mm b/ios/browser/api/web/ui/chrome_webview.mm index 760bdadd12bba..c544b8c5ef245 100644 --- a/ios/browser/api/web/ui/chrome_webview.mm +++ b/ios/browser/api/web/ui/chrome_webview.mm @@ -181,8 +181,9 @@ - (instancetype)initWithPrivateBrowsing:(bool)isPrivateBrowsing { ios::ChromeBrowserStateManager* browser_state_manager = GetApplicationContext()->GetChromeBrowserStateManager(); - browser_state_ = browser_state_manager->GetLastUsedBrowserState() - ->GetOriginalChromeBrowserState(); + browser_state_ = + browser_state_manager->GetLastUsedBrowserStateDeprecatedDoNotUse() + ->GetOriginalChromeBrowserState(); if (isPrivateBrowsing) { browser_state_ = browser_state_->GetOffTheRecordChromeBrowserState(); diff --git a/ios/browser/favicon/brave_ios_favicon_loader.mm b/ios/browser/favicon/brave_ios_favicon_loader.mm index 556f7e34c2512..c4c85d756814f 100644 --- a/ios/browser/favicon/brave_ios_favicon_loader.mm +++ b/ios/browser/favicon/brave_ios_favicon_loader.mm @@ -50,11 +50,12 @@ favicon_base::IconType::kFavicon, favicon_base::IconType::kTouchIcon, favicon_base::IconType::kTouchPrecomposedIcon}); - scoped_refptr worker = - base::MakeRefCounted( - min_source_size_in_pixel, desired_size_in_pixel, - std::move(raw_bitmap_callback), - favicon_base::LargeIconImageCallback(), tracker); + scoped_refptr worker = base::MakeRefCounted< + favicon::LargeIconWorker>( + min_source_size_in_pixel, desired_size_in_pixel, + favicon::LargeIconService::NoBigEnoughIconBehavior::kReturnFallbackColor, + std::move(raw_bitmap_callback), favicon_base::LargeIconImageCallback(), + tracker); return favicon_service->GetRawFaviconForPageURL( page_url, *large_icon_types, max_size_in_pixel, /*fallback_to_host=*/true, diff --git a/ios/browser/keyed_service/keyed_service_factory_wrapper.mm b/ios/browser/keyed_service/keyed_service_factory_wrapper.mm index 328ed9f9c7df9..404a55b664c82 100644 --- a/ios/browser/keyed_service/keyed_service_factory_wrapper.mm +++ b/ios/browser/keyed_service/keyed_service_factory_wrapper.mm @@ -21,7 +21,8 @@ + (nullable id)getForPrivateMode:(bool)isPrivateBrowsing { DCHECK_CURRENTLY_ON(web::WebThread::UI); auto* browserStateManager = GetApplicationContext()->GetChromeBrowserStateManager(); - auto* browserState = browserStateManager->GetLastUsedBrowserState(); + auto* browserState = + browserStateManager->GetLastUsedBrowserStateDeprecatedDoNotUse(); if (isPrivateBrowsing) { browserState = browserState->GetOffTheRecordChromeBrowserState(); } diff --git a/net/proxy_resolution/proxy_config_service_tor.cc b/net/proxy_resolution/proxy_config_service_tor.cc index 7cf837b92be67..3f6e3fb8e6a00 100644 --- a/net/proxy_resolution/proxy_config_service_tor.cc +++ b/net/proxy_resolution/proxy_config_service_tor.cc @@ -274,7 +274,7 @@ TorProxyMap::~TorProxyMap() { // static std::string TorProxyMap::GenerateNewPassword() { std::vector password(kTorPasswordLength); - crypto::RandBytes(password.data(), password.size()); + crypto::RandBytes(password); return base::HexEncode(password.data(), password.size()); } diff --git a/package.json b/package.json index 1ee9f24d32e51..7e2dc35f25251 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "125.0.6422.112", + "tag": "126.0.6478.17", "repository": { "url": "https://github.com/brave/chromium" } @@ -216,4 +216,4 @@ "json5": "2.2.3", "@babel/traverse": "7.23.2" } -} +} \ No newline at end of file diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 65dd5b834fcdb..708549b0cca73 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 5dc15da08eeff408c71bb64e63e26540c660350f..09ee85764202b273fd0461518e85166577f188e0 100644 +index 575149b2f3246c1bcc88b046fb1ae2dbeaa3b2a2..c4e228e22b5d6e6cf12eb117eed6ec156e42e9a3 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4632,6 +4632,7 @@ if (is_android) { +@@ -4631,6 +4631,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java", "android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java", ] @@ -10,7 +10,7 @@ index 5dc15da08eeff408c71bb64e63e26540c660350f..09ee85764202b273fd0461518e851665 if (use_clang_profiling) { sources += [ -@@ -4669,6 +4670,7 @@ if (is_android) { +@@ -4668,6 +4669,7 @@ if (is_android) { "android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java", "android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java", ] @@ -18,7 +18,7 @@ index 5dc15da08eeff408c71bb64e63e26540c660350f..09ee85764202b273fd0461518e851665 } android_library("base_cached_flags_java") { -@@ -4695,6 +4697,7 @@ if (is_android) { +@@ -4694,6 +4696,7 @@ if (is_android) { "android/java/src/org/chromium/base/cached_flags/ValuesOverridden.java", "android/java/src/org/chromium/base/cached_flags/ValuesReturned.java", ] diff --git a/patches/base-test-launcher-test_results_tracker.cc.patch b/patches/base-test-launcher-test_results_tracker.cc.patch index 21059cd3a34c4..928b9bb88fb38 100644 --- a/patches/base-test-launcher-test_results_tracker.cc.patch +++ b/patches/base-test-launcher-test_results_tracker.cc.patch @@ -1,8 +1,8 @@ diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc -index 2b113168a53e25e6e5c1540c268913a5e2e62f8f..75011e6f5e92931eab13106f5863172fbbad5f60 100644 +index 1237a29e5fa1d8c1cbf84d4594f867aa794170a6..1adedda79da7b616d3d14eb99a702fdf02e4d32d 100644 --- a/base/test/launcher/test_results_tracker.cc +++ b/base/test/launcher/test_results_tracker.cc -@@ -144,6 +144,7 @@ TestResultsTracker::~TestResultsTracker() { +@@ -149,6 +149,7 @@ TestResultsTracker::~TestResultsTracker() { : ""), result.GetTestCaseName().c_str()); if (result.status != TestResult::TEST_SUCCESS) { diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index c22311fe17284..263a8613d4d59 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index 998eb457ecb5f80c6842e819ea382c7c927f91c2..1964108447001f25b2f9f978f755f14e3eaf78ab 100644 +index a31e09a5782c866ee3b488c09162af961473e2c6..c168066fb7ed420cac5d14db85b9d5dc2a9abbc7 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -732,6 +732,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBaseSyncPrimitives { +@@ -734,6 +734,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBaseSyncPrimitives { ScopedAllowBaseSyncPrimitives& operator=( const ScopedAllowBaseSyncPrimitives&) = delete; diff --git a/patches/base-trace_event-builtin_categories.h.patch b/patches/base-trace_event-builtin_categories.h.patch index 1214d0f32662f..44e725e6ee16c 100644 --- a/patches/base-trace_event-builtin_categories.h.patch +++ b/patches/base-trace_event-builtin_categories.h.patch @@ -1,8 +1,8 @@ diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index 5f6efb0e93bced90de5f6735e303feaa48c71df2..40671a2839c9b353678fa46905317efe059da15b 100644 +index 4c1a949117a070a74285d043ec89a677952fd2c4..f33210ae5b36916e92eea12cd437f8fcd9fa9159 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -194,6 +194,7 @@ +@@ -198,6 +198,7 @@ X("webrtc") \ X("webrtc_stats") \ X("xr") \ diff --git a/patches/build-android-gyp-lint.py.patch b/patches/build-android-gyp-lint.py.patch index 198370301a644..c249a9a5a7216 100644 --- a/patches/build-android-gyp-lint.py.patch +++ b/patches/build-android-gyp-lint.py.patch @@ -1,5 +1,5 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py -index 691a0e38ebc2816496d478a3f59621767b526366..80b2f9b4a622d712708731fb0b403330a8853fca 100755 +index dc20d135e8033862aad40675553c4c96394f6c43..adbe8cb6fdcdc6a378572a47939a2341e575a47c 100755 --- a/build/android/gyp/lint.py +++ b/build/android/gyp/lint.py @@ -550,5 +550,6 @@ def main(): diff --git a/patches/build-android-gyp-proguard.py.patch b/patches/build-android-gyp-proguard.py.patch index d88b88b60ce74..68b855ac4ef8a 100644 --- a/patches/build-android-gyp-proguard.py.patch +++ b/patches/build-android-gyp-proguard.py.patch @@ -1,8 +1,8 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py -index 2409edcd768726f69b5b91cce1bcdfaae0b18584..0febae3c04e375512d5c110a503bb0aa56461202 100755 +index 4ab052f7f9009b52d107ac0436a8755a35c27988..3d8e5e6ac622083090fec1c828eae85988080230 100755 --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -346,6 +346,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data): +@@ -352,6 +352,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data): '--pg-map-output', tmp_mapping_path, ] diff --git a/patches/build-android-gyp-util-resource_utils.py.patch b/patches/build-android-gyp-util-resource_utils.py.patch index 48e13f3bd468e..b6aec307e9ff6 100644 --- a/patches/build-android-gyp-util-resource_utils.py.patch +++ b/patches/build-android-gyp-util-resource_utils.py.patch @@ -1,5 +1,5 @@ diff --git a/build/android/gyp/util/resource_utils.py b/build/android/gyp/util/resource_utils.py -index 223c747baaba2246e709b3972b1dd5e240efadec..e3681fd760865cb97ddd390351ec25bae560ab0a 100644 +index 927b47545fc6f306a4c6f01abd934e7d8aaa0add..e7d56f727ce8e966d400caa9b4efd9e030de3c0b 100644 --- a/build/android/gyp/util/resource_utils.py +++ b/build/android/gyp/util/resource_utils.py @@ -256,6 +256,7 @@ class ResourceInfoFile: diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index 95aa4c48b0d42..50af82d1c43cc 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 26fad5adf994a028240f690b7c6ae665558071b4..b89695afcf2ae8cd2df2730945bd501f39d16a5b 100644 +index b8cac29305c3cfb5fbc0142ae17a4d802b52d80f..0d7a6f208136a13b644e7d2abf08d0e8ac4478e6 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -335,6 +335,7 @@ is_posix = !is_win && !is_fuchsia diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch index b41cab14cec61..447f0aeb9431b 100644 --- a/patches/build-config-android-BUILD.gn.patch +++ b/patches/build-config-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn -index 810b1dafe94d9c4479afec09e18cf28a173be8a1..0b6c313b86cbd37c99242e320aa76c4cf9f3c266 100644 +index 2124c74e6efd65a55e11ecb7b542e915574f2539..4806c016e2af38f267289d9aa77791b50fa6ad7b 100644 --- a/build/config/android/BUILD.gn +++ b/build/config/android/BUILD.gn @@ -53,6 +53,7 @@ config("compiler") { diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index b21e03fefdb3d..a04a73d5dc291 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 427739d70b4e48026357ef2d844eedcc4aa4a00d..009167f81f23ec656186a51f1383f0502cec3562 100644 +index 502736c4cd70d6177bcac73ad867701facf2bbed..75f494c25525d1d75bee150fbdec5a912ecbf85e 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -25,6 +25,7 @@ robolectric_toolchain = "//build/toolchain/android:robolectric_$host_cpu" diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 77d525538cae7..5e4d023101c0a 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 2dad0a45dcef0a6c02438b6ea2f4288bf22c3d1c..7b0315a8cac02f0a582f510473ff901ff57dcbad 100644 +index 82f30f3c8e89c24dfacbfb73eb683d7c700420b3..1bd5485efdc3d2a5b58eec5d22e903fdbad43e5a 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -4154,6 +4154,7 @@ if (enable_java_templates) { +@@ -4149,6 +4149,7 @@ if (enable_java_templates) { } else { not_needed(invoker, [ "missing_classes_allowlist" ]) } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 0a542573d62fd..d14335b09f3f7 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 a65ed430f2cbeaa21a51b6020f569fff99c56cd9..63c8b93eca6a700da214edef56a6312e129921fd 100644 +index df789fb3cd6a4460ef9233f91e142934e9f447ad..722feec0561cdd24c2370433187d302458092bb4 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -208,6 +208,7 @@ if (is_robolectric) { +@@ -206,6 +206,7 @@ if (!is_robolectric && enable_java_templates) { # ] # } template("java_cpp_enum") { @@ -10,7 +10,7 @@ index a65ed430f2cbeaa21a51b6020f569fff99c56cd9..63c8b93eca6a700da214edef56a6312e action_with_pydeps(target_name) { forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "sources" ]) -@@ -383,6 +384,7 @@ if (is_robolectric) { +@@ -381,6 +382,7 @@ if (!is_robolectric && enable_java_templates) { # output = "$target_gen_dir/AndroidManifest.xml" # } template("jinja_template") { diff --git a/patches/build-config-chrome_build.gni.patch b/patches/build-config-chrome_build.gni.patch index e595ead7f2353..61af3973041f7 100644 --- a/patches/build-config-chrome_build.gni.patch +++ b/patches/build-config-chrome_build.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni -index 4100059fb2373a74c2bb0b7a1b4941d4008a64e1..590a5ccf2ca75a4263157898238e334b26658725 100644 +index cd12d2f976e809f71271e9472b73c08f9cb705ee..6654b0c88a49172f7baf9bb5a68bf15f9ab3f3bd 100644 --- a/build/config/chrome_build.gni +++ b/build/config/chrome_build.gni @@ -1,6 +1,7 @@ diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 2b157940a5c65..cb09955098f45 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 973d8bcbd2f1fa714ecd6f2752efde6e6770f5d8..56284802ddfe359c23bc4bbb0ce366cb9027a60b 100644 +index 6efe967eb0a1cfd71f5d85209bcc9b0d90c5b4c0..54cc7367266867a62ddada0f285581f232b2f08b 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -588,7 +588,6 @@ config("compiler") { +@@ -546,7 +546,6 @@ config("compiler") { } if (is_clang && !is_nacl && current_os != "zos") { @@ -10,7 +10,7 @@ index 973d8bcbd2f1fa714ecd6f2752efde6e6770f5d8..56284802ddfe359c23bc4bbb0ce366cb if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ "-fcrash-diagnostics=all", -@@ -2431,10 +2430,10 @@ config("optimize") { +@@ -2409,10 +2408,10 @@ config("optimize") { if (is_win) { cflags = [ "/O2" ] + common_optimize_on_cflags diff --git a/patches/build-rust-cargo_crate.gni.patch b/patches/build-rust-cargo_crate.gni.patch index ba46c99d11089..f2a29f1717209 100644 --- a/patches/build-rust-cargo_crate.gni.patch +++ b/patches/build-rust-cargo_crate.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni -index 1c86569e45153d9bfad207c65ca728373adb9d84..e523e46a017da8f2efcc858af628080747483033 100644 +index 135e1fa667bbd8ffef3b8dc3daf9c957662f6a99..37c16721afcda89af9a5b7c4ebb68cad92cba71c 100644 --- a/build/rust/cargo_crate.gni +++ b/build/rust/cargo_crate.gni @@ -153,6 +153,7 @@ template("cargo_crate") { diff --git a/patches/build-rust-rust_target.gni.patch b/patches/build-rust-rust_target.gni.patch index 40152337654b6..b0c72bc9a0a83 100644 --- a/patches/build-rust-rust_target.gni.patch +++ b/patches/build-rust-rust_target.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/rust/rust_target.gni b/build/rust/rust_target.gni -index 439a8e98ef864b72a06efba8a5a2d6816172e7bc..ca17dfe50baaea48e054c933051f4d6b944b317b 100644 +index 1ca1af2d9116cc862d4e8c2630c759794c108390..64dfe5c33f68a4fdc20a022c88c2cd3eb1c176f5 100644 --- a/build/rust/rust_target.gni +++ b/build/rust/rust_target.gni @@ -190,7 +190,7 @@ template("rust_target") { diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index d04c2983f9d59..005d80167fb48 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 71a2d896cbd8e356be3964bd78a2b14a3aae1d9b..f2a10f196b8ebd9bdf6fe0457258322562f4bf8e 100644 +index de94c7bcf0bd0d5aea2ff79a3c0ccdb98035d06a..aae1abd5aab305516dd72a0f19b45bf81c69a381 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -188,6 +188,7 @@ if (!is_android && !is_mac) { @@ -68,7 +68,7 @@ index 71a2d896cbd8e356be3964bd78a2b14a3aae1d9b..f2a10f196b8ebd9bdf6fe04572583225 public_deps += [ "//chrome/updater/mac:browser_install_script", -@@ -1238,6 +1246,7 @@ if (is_win) { +@@ -1239,6 +1247,7 @@ if (is_win) { "-current_version", chrome_dylib_version, ] @@ -76,7 +76,7 @@ index 71a2d896cbd8e356be3964bd78a2b14a3aae1d9b..f2a10f196b8ebd9bdf6fe04572583225 if (!is_component_build) { # Specify a sensible install_name for static builds. The library is -@@ -1418,6 +1427,7 @@ if (is_win) { +@@ -1419,6 +1428,7 @@ if (is_win) { group("dependencies") { public_deps = [ @@ -84,7 +84,7 @@ index 71a2d896cbd8e356be3964bd78a2b14a3aae1d9b..f2a10f196b8ebd9bdf6fe04572583225 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1481,7 +1491,7 @@ group("dependencies") { +@@ -1482,7 +1492,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -93,7 +93,7 @@ index 71a2d896cbd8e356be3964bd78a2b14a3aae1d9b..f2a10f196b8ebd9bdf6fe04572583225 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1530,6 +1540,7 @@ group("resources") { +@@ -1531,6 +1541,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", @@ -101,7 +101,7 @@ index 71a2d896cbd8e356be3964bd78a2b14a3aae1d9b..f2a10f196b8ebd9bdf6fe04572583225 ] } -@@ -1583,6 +1594,7 @@ if (!is_android) { +@@ -1584,6 +1595,7 @@ if (!is_android) { if (enable_resource_allowlist_generation) { repack_allowlist = _chrome_resource_allowlist deps = [ ":resource_allowlist" ] diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 25c2aa33ba35c..fe7bc70f7fc97 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 d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660ea405c9c 100644 +index ef0682d1d50c7000f4e2aa74fbdb63afaf75b261..783e0220dd90dbbad28aacce483eef572b77fff6 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -192,6 +192,7 @@ if (current_toolchain == default_toolchain) { @@ -10,7 +10,7 @@ index d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660 } android_resources("chrome_app_java_resources") { -@@ -274,6 +275,7 @@ if (current_toolchain == default_toolchain) { +@@ -275,6 +276,7 @@ if (current_toolchain == default_toolchain) { } else { deps += [ "//components/plus_addresses/android:java_resources" ] } @@ -18,7 +18,7 @@ index d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660 } android_library("app_hooks_java") { -@@ -729,6 +731,7 @@ if (current_toolchain == default_toolchain) { +@@ -733,6 +735,7 @@ if (current_toolchain == default_toolchain) { ] deps += feed_deps @@ -26,7 +26,7 @@ index d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -747,6 +750,7 @@ if (current_toolchain == default_toolchain) { +@@ -751,6 +754,7 @@ if (current_toolchain == default_toolchain) { "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen", "//net:effective_connection_type_java", ] @@ -34,7 +34,7 @@ index d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -888,6 +892,7 @@ if (current_toolchain == default_toolchain) { +@@ -892,6 +896,7 @@ if (current_toolchain == default_toolchain) { "//components/saved_tab_groups:java", "//components/segmentation_platform/internal:internal_java", ] @@ -42,7 +42,7 @@ index d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2231,6 +2236,7 @@ if (current_toolchain == default_toolchain) { +@@ -2243,6 +2248,7 @@ if (current_toolchain == default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -50,7 +50,7 @@ index d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660 # Dep needed to ensure override works properly. deps = [ ":chrome_base_module_resources" ] -@@ -2443,6 +2449,7 @@ if (current_toolchain == default_toolchain) { +@@ -2455,6 +2461,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -58,7 +58,7 @@ index d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] } -@@ -2715,6 +2722,7 @@ if (current_toolchain == default_toolchain) { +@@ -2727,6 +2734,7 @@ if (current_toolchain == default_toolchain) { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -66,7 +66,7 @@ index d2df06252b50e10a8889fedb6ed49e7428dace3c..2b927f03e6a546f824132500c7e37660 # More deps for DFMs. if (dfmify_dev_ui) { -@@ -3799,6 +3807,7 @@ generate_jni("chrome_jni_headers") { +@@ -3819,6 +3827,7 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java", "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 9a56fa26fda59..b74b6ba80db08 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 fcffa30f8cd5e149514a920c08e8d32fb5e27308..e5a48dfb74cfb6f81e56dfff535cd5768fbe9f60 100644 +index cee75417da36c219aef0c2c1a479b570bfa25a7c..45f6c1c2ecdfd9925e71225ec6e78c4c3417dd93 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1237,3 +1237,4 @@ chrome_java_sources = [ +@@ -1231,3 +1231,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.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 876d97fb77312..02055a80615fd 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 fd6e0d5513e5cfc4340b6989abf22108d017d4a3..04fb8cd508dfa786cc7cc4b4fc0a79b3558933fb 100644 +index d1d81d6c47fba719d0690b6b77d9ee67673364d8..cd6ffcf61d94680e5240dbb13f8ec16a8facc0e0 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -318,6 +318,7 @@ template("chrome_common_apk_or_module_tmpl") { @@ -18,7 +18,7 @@ index fd6e0d5513e5cfc4340b6989abf22108d017d4a3..04fb8cd508dfa786cc7cc4b4fc0a79b3 if (_is_monochrome) { proguard_configs += [ "//android_webview/nonembedded/java/proguard.flags" ] -@@ -750,6 +752,7 @@ template("chrome_common_apk_or_module_tmpl") { +@@ -756,6 +758,7 @@ template("chrome_common_apk_or_module_tmpl") { "version_code", "version_name", ]) diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index a647cfefbf529..13efef1fd6a37 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 46e92efd72cb0ffbbc59216e166d8d63f54fc90b..461678d397915e46aff04dda3145d75af7222390 100644 +index 8200ab5b9229e37333b5aaf3de9b51275e67f16b..986899544ef20fdf76e7b5935049861dd3bd9cf0 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml -@@ -280,4 +280,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md +@@ -298,4 +298,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md diff --git a/patches/chrome-android-features-tab_ui-BUILD.gn.patch b/patches/chrome-android-features-tab_ui-BUILD.gn.patch index 0bff1f8e5571d..bacef8339e6b4 100644 --- a/patches/chrome-android-features-tab_ui-BUILD.gn.patch +++ b/patches/chrome-android-features-tab_ui-BUILD.gn.patch @@ -1,10 +1,10 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn -index e1ba50580751c8a7f342ff7acf1b021b7b8a3082..1b071388786c42079e4ff56811c79bb84af4433f 100644 +index a35c77c71ab16b0fa81faf7e56b51c18644ae066..c7f7cacc2b84c56b61c8e80d1860e25d3a6b1258 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn -@@ -99,6 +99,7 @@ android_resources("java_resources") { - "java/res/values/ids.xml", +@@ -101,6 +101,7 @@ android_resources("java_resources") { "java/res/values/styles.xml", + "java/res/xml/tabs_settings.xml", ] + sources += brave_android_features_java_resources deps = [ diff --git a/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch b/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch index a3af31db599b1..fec484c56c463 100644 --- a/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch +++ b/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java -index 7f6a937e71c41afd2e4c4ae7e8664f5c6381f9b2..17d8a9222f5f853be0049de00cecb0a381728eeb 100644 +index 909b1e20c33a87e5b29bf69ce542060fffd4bfb3..ae030ce894d23fe5cefb5a7489bf884f8cd4a5cf 100644 --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java @@ -301,7 +301,7 @@ public class FeedSurfaceMediator diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index caff0345336da..c04548b0233ea 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 632b6fcfa2c68c2de6ac4289d744557a30dfc1f8..ce59bcb97a00310791b52a4745d85053398abdf2 100644 +index f9192285fba43be32ba1bfb1214959ac969186bf..83740dd1568fa8dca7adb677abf8d85b83282936 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -28,6 +28,7 @@ by a child template that "extends" this file. @@ -66,7 +66,7 @@ index 632b6fcfa2c68c2de6ac4289d744557a30dfc1f8..ce59bcb97a00310791b52a4745d85053 -@@ -1222,6 +1236,7 @@ by a child template that "extends" this file. +@@ -1210,6 +1224,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 91565f8ae23a6..267f2be872727 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,8 +1,8 @@ diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml -index 6c7eed1f2c58c5df284859e9a97c55e825f14e79..15ae0175c34a970be3f8b6036c5735bb2eae0548 100644 +index 8fa66af5671a8d6b09c2bb4186645131825f7608..69d6dc0995ad5ec3a3c5663be3f5759235fc0ab5 100644 --- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml +++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml -@@ -118,7 +118,7 @@ found in the LICENSE file. +@@ -133,7 +133,7 @@ found in the LICENSE file. android:gravity="center_vertical" android:orientation="horizontal" /> diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch index 8f382591021c2..7f12e16e32ac2 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -index 8794be9a275be6e335f34904ffebb034618e7d40..57262686f63d92738ec0cc684776ea623d0f69bf 100644 +index 229cd448a170ca46036b1e68f8f24791841503be..80b11649205bb2e56b25da43aeea1bcfcb00860c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java @@ -153,7 +153,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch new file mode 100644 index 0000000000000..790a946c32c30 --- /dev/null +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch @@ -0,0 +1,13 @@ +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java +index de101add328a69dd406b9ce34881f76feb21ae23..c58148164d7f7dc931154cfd55d55ba053a4becd 100644 +--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java +@@ -50,7 +50,7 @@ public class HomepageManager + private final ObserverList mHomepageStateListeners; + private SettingsLauncher mSettingsLauncher; + +- private HomepageManager() { ++ HomepageManager() { + mSharedPreferencesManager = ChromeSharedPreferences.getInstance(); + mHomepageStateListeners = new ObserverList<>(); + HomepagePolicyManager.getInstance().addListener(this); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch index c2d8ef756fc83..7144820cd0606 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch @@ -1,9 +1,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java -index fb0ab433103679bc21e7de4e28d84bf531db34bb..0d4263c56aadffbcb9f1f973484bd651592f8fde 100644 +index 9f3e7a6209b77211a5a621fb817effc1cc134853..c7325c039f4c79d2194c05f351d8c5bac2ea8651 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java @@ -97,7 +97,7 @@ public class NotificationPlatformBridge { - // TODO(crbug.com/1521424): Fine tune this duration, and possibly turn it off for A11Y users. + // TODO(crbug.com/41494393): Fine tune this duration, and possibly turn it off for A11Y users. private static final long PROVISIONAL_UNSUBSCRIBE_DURATION_MS = 10 * 1000; - private static NotificationPlatformBridge sInstance; @@ -29,7 +29,7 @@ index fb0ab433103679bc21e7de4e28d84bf531db34bb..0d4263c56aadffbcb9f1f973484bd651 mNativeNotificationPlatformBridge = nativeNotificationPlatformBridge; Context context = ContextUtils.getApplicationContext(); if (sNotificationManagerOverride != null) { -@@ -814,7 +814,7 @@ public class NotificationPlatformBridge { +@@ -817,7 +817,7 @@ public class NotificationPlatformBridge { .storeNotificationResourcesIfSuspended(notification); } 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 65789fb583010..da9da080a68c3 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,5 +1,5 @@ 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 88c5241c0c93c551dfddf4766eb1ebf201dc2277..3f69f4363178c31c14897fcf3706967bbe678299 100644 +index 041452dd1ed86cc43405bc87b5c31f82974ac639..51ce693b8cde489ea08cc5e902f69441c97d5332 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 @@ -56,7 +56,7 @@ import org.chromium.ui.text.NoUnderlineClickableSpan; @@ -11,7 +11,7 @@ index 88c5241c0c93c551dfddf4766eb1ebf201dc2277..3f69f4363178c31c14897fcf3706967b implements Preference.OnPreferenceChangeListener { private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; -@@ -405,6 +405,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -407,6 +407,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index 88c5241c0c93c551dfddf4766eb1ebf201dc2277..3f69f4363178c31c14897fcf3706967b MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon( -@@ -419,6 +420,6 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -421,6 +422,6 @@ public class PrivacySettings extends ChromeBaseSettingsFragment .show(getActivity(), getString(R.string.help_context_privacy), null); return true; } 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 ca827091ddd2c..daf1bf3e2e71e 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,17 +1,17 @@ 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 135a42e5621f0a3c6554d63facaf2006bfc46695..3474eb807eae9a91faf7200c40eab2a2988a9171 100644 +index 52eada8fc86ca4e66c0b55806d0afa235a5d317a..13fcfe8cbeb34661f01a6db001aef3e7b17cbca2 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 -@@ -52,7 +52,7 @@ import org.chromium.chrome.browser.sync.ui.PassphraseCreationDialogFragment; - import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment; - import org.chromium.chrome.browser.sync.ui.PassphraseTypeDialogFragment; - import org.chromium.chrome.browser.ui.signin.SignOutDialogCoordinator; +@@ -54,7 +54,7 @@ import org.chromium.chrome.browser.sync.ui.PassphraseTypeDialogFragment; + import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; + import org.chromium.chrome.browser.ui.signin.SignOutCoordinator; + import org.chromium.chrome.browser.ui.signin.SigninUtils; -import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference; +import org.chromium.components.browser_ui.settings.brave_tricks.checkbox_to_switch.ChromeBaseCheckBoxPreference; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsLauncher; -@@ -445,7 +445,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment +@@ -478,7 +478,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment ? ConsentLevel.SIGNIN : ConsentLevel.SYNC)); // May happen if account is removed from the device while this screen is shown. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch index 80b2c0c049a1d..b1e44cc922b0c 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -index e505abd4785949f5fccc92886b1c97480b7590d3..4ca732c7dc58d29cb1e7011653b8a7a14e16bc5b 100644 +index 8881c749bfab4e8e5d76f0b0c9d71cccb7a4c1c9..6f9e5aff0703c54847789693dbe8f815670dd81f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -984,7 +984,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -942,7 +942,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { NotificationPermissionController.attach( mWindowAndroid, mNotificationPermissionController); diff --git a/patches/chrome-android-java_sources.gni.patch b/patches/chrome-android-java_sources.gni.patch index bdef37141e69d..f416f36060956 100644 --- a/patches/chrome-android-java_sources.gni.patch +++ b/patches/chrome-android-java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni -index a5f30237c3bfa59b6dc6cf662a0d89e64e7cee36..47ca51223a4eed30a56584cdf951bce9765ecea2 100644 +index a3c21e4d78bb8d313804ae8bde383279559fe223..43fd7ac868c8982408590d2f037a8f7f119a8d0c 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -24,6 +24,7 @@ import("//components/feed/features.gni") +@@ -25,6 +25,7 @@ import("//components/feed/features.gni") import("//components/offline_pages/buildflags/features.gni") import("//device/vr/buildflags/buildflags.gni") diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index bd845358312a4..a9f3b9dd78a8c 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 28b4f8022051e1e4ee4c49d57caed969068adf55..06992a466bb8d78e123071fe7b30fec1dd36a7e5 100644 +index 2bb6d397511b50cf81605b53bceb648273e6546c..2daf0eeebd105ce4a5372cf469656c60f7842f44 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn -@@ -108,6 +108,7 @@ grit("generated_resources") { +@@ -106,6 +106,7 @@ grit("generated_resources") { if (is_android) { outputs += android_generated_java_resources } diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 1c135336129a6..d1e573e665853 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 df3456f3a4b3849eded02933c978b6b38d59cb1d..6bb9f33e2a6aab9c96302c81c5eeaa905f411a83 100644 +index 0aa28eb70fd94dbc7456b24ebbee944f9f533af7..3004e9284f9ed4dd93bf2b784d7ace95d435f169 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2752,6 +2752,7 @@ static_library("browser") { +@@ -2784,6 +2784,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 438b4371e3058..681a44e9226fb 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 322df3814a9e6f234e3ba4cdabfa7f3dbf60fa7a..46622f07ea7d9b6523e012e2b4a5ff5ce6d31768 100644 +index c0c77d613296f2a67d31a57c207e5869f2fcf90f..6074c8d63503735aaf8b294cb02fa289ac158c17 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3916,6 +3916,7 @@ const FeatureEntry::FeatureVariation kDefaultBrowserPromptRefreshVariations[] = +@@ -3852,6 +3852,7 @@ const FeatureEntry::FeatureVariation kComposeProactiveNudgeVariations[] = { // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { @@ -10,7 +10,7 @@ index 322df3814a9e6f234e3ba4cdabfa7f3dbf60fa7a..46622f07ea7d9b6523e012e2b4a5ff5c // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and // //tools/flags/generate_unexpire_flags.py. #include "build/chromeos_buildflags.h" -@@ -11395,6 +11396,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) { +@@ -11428,6 +11429,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) { bool ShouldSkipConditionalFeatureEntry(const flags_ui::FlagsStorage* storage, const FeatureEntry& entry) { 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 5267f00bf41ed..94e29c935805a 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 68b91684048dece7c1761c9a359fd7f4369b8d28..0a34ef22e19179d6c1702231b6f3e55ddb23b606 100644 +index d012b7aa4005fccdae4aead7cce19ecbddfb39fa..3bce34446f3251f8af8e928319eaef29982dd282 100644 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -@@ -132,6 +132,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( +@@ -131,6 +131,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( remove_mask |= chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS; break; case browsing_data::BrowsingDataType::DOWNLOADS: diff --git a/patches/chrome-browser-app_controller_mac.mm.patch b/patches/chrome-browser-app_controller_mac.mm.patch index e523a63bd7d61..1c61686d69a49 100644 --- a/patches/chrome-browser-app_controller_mac.mm.patch +++ b/patches/chrome-browser-app_controller_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm -index 5d590c48e216398490eccb5b03c01ca0b16d1d84..9982f4f4658f9f8c74eb718877a3a1260436da2f 100644 +index 69020090d2cd79935563e6737704953f760c9a7c..de91658cecdcdbfeb806d51ccc358cdbda03152b 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -670,7 +670,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -740,7 +740,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { + (AppController*)sharedController { static AppController* sharedController = [] { @@ -11,7 +11,7 @@ index 5d590c48e216398490eccb5b03c01ca0b16d1d84..9982f4f4658f9f8c74eb718877a3a126 NSApp.delegate = sharedController; return sharedController; }(); -@@ -767,6 +767,22 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -837,6 +837,22 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { // Initialize the Profile menu. [self initProfileMenu]; @@ -34,7 +34,7 @@ index 5d590c48e216398490eccb5b03c01ca0b16d1d84..9982f4f4658f9f8c74eb718877a3a126 } - (void)unregisterEventHandlers { -@@ -1270,7 +1286,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -1335,7 +1351,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { } auto it = _profileBookmarkMenuBridgeMap.find(profilePath); diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 0e671ab1a902a..0aa322bd20f0b 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 e4cfec362d50c2d3ed85e616a65ef3a9e1419a68..397e37d8e6dd7e0c8983af76f316e2dd5d697a72 100644 +index 8091cc691f09385841eeef8b0b6a740e77a6f169..11f2eead5fad6a401348158918597c49c35bd6c3 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -235,6 +235,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -242,6 +242,7 @@ class BrowserProcessImpl : public BrowserProcess, static void RegisterPrefs(PrefRegistrySimple* registry); private: diff --git a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch index 58e8f774f0a5e..18f6a6f87f558 100644 --- a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch +++ b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -index d73dbe00d3e3818e7698413bd9831b8175903199..1c9341e264d655c6411e3f083c4f2518816643bd 100644 +index a036fb791c7c2ac2f97b27650450164cf07ec1c2..84080df4846e3af0a4137f9b3da40ddada0198db 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -1537,6 +1537,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix( +@@ -1559,6 +1559,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix( return "WebrtcVideoPerfHistory"; case TracingDataType::kMediaDeviceSalts: return "MediaDeviceSalts"; diff --git a/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch b/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch index 5db36c30e0744..0ae9e9c789c3e 100644 --- a/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch +++ b/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch @@ -1,11 +1,11 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc -index 59ee0ba8e711133b1e71217d6d2919358508142b..a76ad41bc191d36b30ed4362f48e080dad6e5484 100644 +index ac05c924203d27fa9218a87f84fba502c05e67f5..963544c069c1000e6e894fab2411594a2ebc90ed 100644 --- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc +++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc -@@ -168,6 +168,7 @@ void GetGuestViewDefaultContentSettingRules( +@@ -173,6 +173,7 @@ void GetGuestViewDefaultContentSettingRules( ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK), - std::string(), incognito)); + content_settings::ProviderType::kNone, incognito)); + BRAVE_GET_GUEST_VIEW_DEFAULT_CONTENT_SETTING_RULES } #endif diff --git a/patches/chrome-browser-download-download_target_determiner.cc.patch b/patches/chrome-browser-download-download_target_determiner.cc.patch index c6f771da78d39..fc90818f5b00c 100644 --- a/patches/chrome-browser-download-download_target_determiner.cc.patch +++ b/patches/chrome-browser-download-download_target_determiner.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc -index b68f470add6a6c8399cd197e05a50843863bf8ba..19be8db78bf4ac3557def3f50951faf3bd33b252 100644 +index a2bff43f3a1a4989abb9425e3cc39966c3962f42..3a845c2ba6c31ab4ce9040ae549bbfa4703dd397 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1275,6 +1275,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1274,6 +1274,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP; if (HasPromptedForPath() || confirmation_reason_ != DownloadConfirmationReason::NONE || @@ -10,7 +10,7 @@ index b68f470add6a6c8399cd197e05a50843863bf8ba..19be8db78bf4ac3557def3f50951faf3 user_approved_path) { return DownloadFileType::NOT_DANGEROUS; } -@@ -1314,6 +1315,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1313,6 +1314,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 || (download_->HasUserGesture() && visits == VISITED_REFERRER))) return DownloadFileType::NOT_DANGEROUS; diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index dfd18db82abbb..be9846278ea3a 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 436fef54b1e679fb9e3149963d1b44842ce0f143..cdba8db2f475311d719fbfb081d521ada51253cf 100644 +index c5f86222760c8fc7653f9d6a18be37f93b45a3a4..11d693e0a77a8d645b6441e8ecf878303f994ee6 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1422,6 +1422,7 @@ static_library("extensions") { - } else { - sources += [ "api/braille_display_private/braille_controller_stub.cc" ] +@@ -1444,6 +1444,7 @@ static_library("extensions") { + "//components/enterprise/data_controls", + ] } + deps += brave_extensions_resources } diff --git a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch index 862a9fa341927..0c79df8b7fb1a 100644 --- a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch +++ b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -index 2c503ece2275341bf261cf74359e759e1de2bf34..0af52f2f3d978e047614bf858eed57fab8aa57e1 100644 +index 99ec9cd235c160e8b7ee91d6674281fa85a19f54..2b4413d8f7eb3ee6401cef4bef27c5c17a4dbaef 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -657,6 +657,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( +@@ -809,6 +809,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension); info->incognito_access.is_active = util::IsIncognitoEnabled(extension.id(), browser_context_); diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 08c91a0120016..14d59a167e736 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index 36116b6212786b456509e3329397e0cb689b6694..2a131868a604dcf9c4c78b59fd032f86289c9ada 100644 +index f2d4735613660b36707d0470dc36f7b38f49fce9..ba2c6e3aa522bbaa042de55d429aabe1db18e7e3 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -931,6 +931,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext( +@@ -966,6 +966,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch index 48fd3734bcf4d..4f8756c1de12e 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index e5384635fe117d86c470f781f3f3e20cab07ece9..46fffa9553edb7bf4e8e9773dd71c7916a9a7f40 100644 +index 529a2a537e5271ee89a2b9757da37a5f5ced3772..6e5ba8c9770b5581abddab765a5ed92b5c0319ab 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc -@@ -369,7 +369,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( +@@ -367,7 +367,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( if (scheme == "mailto") { base::UmaHistogramEnumeration(kBlockStateMetric, BlockStateMetric::kAllowedDefaultMail); diff --git a/patches/chrome-browser-importer-importer_list.cc.patch b/patches/chrome-browser-importer-importer_list.cc.patch index 46f2b4fce42ba..52614824f249b 100644 --- a/patches/chrome-browser-importer-importer_list.cc.patch +++ b/patches/chrome-browser-importer-importer_list.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc -index 0919ea2f5abfeff75d485350eb4c7c14f30f1973..7a4a450be6beec9a763da3aeb0a30bbcd7b6f247 100644 +index 5898c273ff4434f1a45f91f6bd7f650dc5a5ced5..cecad2d7919b0b3775d074d0e454dd92c6ba1f37 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -164,20 +164,30 @@ std::vector DetectSourceProfilesWorker( 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 695d5b692c8d3..0515d055bdaf1 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 9c0a71246287ac8f689808ecf7f932c0270bb015..8715f803e9efd9a193d125d4ff22fbb8cee73e2a 100644 +index 1670df56885596e6424e2a7a80a84d88fa8feaa5..505c4f225de2770e99366aabb6ad14f18afbb214 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -263,6 +263,7 @@ bool WebRtcEventLogUploaderImpl::PrepareUploadData(std::string* upload_data) { diff --git a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch index e87b6024ffe15..e22b0f08aed52 100644 --- a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch +++ b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -index c90caa070ce15f2aa9ec99baa1ec42aef3d960ce..e367f180a0a8a26e64eb5b025b8e83de2d77fa75 100644 +index a8202dbd09fade89a4870e71fa98289ee36c4e94..fd9e1c20f5df1ef58ccdf0bc37a1e5f07d014bdf 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -483,6 +483,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) { +@@ -486,6 +486,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) { void WebRtcLogUploader::UploadCompressedLog( WebRtcLogUploader::UploadDoneData upload_done_data, std::unique_ptr post_data) { diff --git a/patches/chrome-browser-net-profile_network_context_service.cc.patch b/patches/chrome-browser-net-profile_network_context_service.cc.patch index fa6f5b916ae5b..9f7317c591e88 100644 --- a/patches/chrome-browser-net-profile_network_context_service.cc.patch +++ b/patches/chrome-browser-net-profile_network_context_service.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc -index 77d18bd28eeafef3ace80a283ebc40d8514c1662..82fecc5ae76f3b13fd234e5ccfeae89140e0e901 100644 +index 627fc56f4f7cffbd15f95c40e7d25119d47bfa27..23435582e5937416b1bde41f062da7fbaa14b073 100644 --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -564,6 +564,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() { +@@ -515,6 +515,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() { std::vector excluded_legacy_spkis( TranslateStringArray(ct_excluded_legacy_spkis)); 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 054b4f026cc8c..0023e724b689d 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 22a62ad698fdb325b834a2fec3914441a30020d3..ba172ba7da580db4d7d680d99fe2e1f13bb59918 100644 +index cd855d8c1a42809115abc3a08b11a4f2cea83285..943e730821f11a019bb377633e68fe70ada91d09 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -399,7 +399,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem +@@ -401,7 +401,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem if (!manager_) return; manager_->GetURLLoaderFactory()->CreateLoaderAndStart( 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 c6fa16617a82c..f9d56440ef08d 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,5 +1,5 @@ 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 ecf1232e7808b0b136af7194615c1a65acbccead..74ef53079bcb47525e1c5f9f301553b0f886ee2b 100644 +index db8a455317571040a4b8fbedd778398bb967c556..37cfa8ffd7c56e8c85908b3cb5d63bedc3f2a5fc 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 @@ -78,6 +78,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { @@ -28,7 +28,7 @@ index ecf1232e7808b0b136af7194615c1a65acbccead..74ef53079bcb47525e1c5f9f301553b0 map.put( ChannelId.BROWSER, PredefinedChannel.create( -@@ -390,6 +393,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -391,6 +394,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { static { Map map = new HashMap<>(); 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 14b955731bc9f..44ecf30a96187 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 f5d155d5cae4c8ef773d656dd38f5f437d443737..7614e6a2071caa45baf357a90d3439ac74120ba1 100644 +index 2689c1b3d1d12ede89245df1d16c687b7e4d2b8f..e5f70850ea00a59a797ef424ccd166c3deb432a0 100644 --- a/chrome/browser/notifications/notification_display_service_impl.cc +++ b/chrome/browser/notifications/notification_display_service_impl.cc @@ -123,6 +123,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 211b580d6b3ff..8471728346aec 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 934683953cd7de68e8695bffbec9fbf0cba82f86..eee0e704d2f5d30d798a44f8eb0c8a659c6f71ad 100644 +index 750d634f641b1695f44f7d52188a8e3ad642fb48..820655af37bc66ff0d862104e60c65eda439348f 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1754,6 +1754,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1832,6 +1832,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -11,10 +11,10 @@ index 934683953cd7de68e8695bffbec9fbf0cba82f86..eee0e704d2f5d30d798a44f8eb0c8a65 #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) screen_ai::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) -@@ -2206,6 +2208,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, - #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) - registry->RegisterIntegerPref(prefs::kChromeDataRegionSetting, 0); - #endif +@@ -2307,6 +2309,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, + false); + registry->RegisterBooleanPref(prefs::kTabGroupsDeletionSkipDialogOnCloseTab, + false); + brave::RegisterProfilePrefs(registry); } 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 a07a52d98f9b4..7126b31b95bcf 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 84b177cea534a5da49e14bbbb23fb8a502ec429b..694f0bb7ea2fbe9c2858fe5ff537f50e16877c2d 100644 +index 994a11a675955b392cd7ba8d3ec0838783c31b5b..8e1e5e93f7de625376e485587545ee43e80fbff3 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -277,7 +277,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; @@ -11,7 +11,7 @@ index 84b177cea534a5da49e14bbbb23fb8a502ec429b..694f0bb7ea2fbe9c2858fe5ff537f50e #endif #if !BUILDFLAG(IS_ANDROID) -@@ -380,6 +380,7 @@ size_t GetPlaceholderAvatarIndex() { +@@ -379,6 +379,7 @@ size_t GetPlaceholderAvatarIndex() { size_t GetModernAvatarIconStartIndex() { #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) @@ -19,7 +19,7 @@ index 84b177cea534a5da49e14bbbb23fb8a502ec429b..694f0bb7ea2fbe9c2858fe5ff537f50e return GetPlaceholderAvatarIndex() + 1; #else // Only use the placeholder avatar on ChromeOS and Android. -@@ -413,6 +414,7 @@ std::string GetPlaceholderAvatarIconUrl() { +@@ -412,6 +413,7 @@ std::string GetPlaceholderAvatarIconUrl() { const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) { CHECK_LT(index, kDefaultAvatarIconsCount); @@ -27,7 +27,7 @@ index 84b177cea534a5da49e14bbbb23fb8a502ec429b..694f0bb7ea2fbe9c2858fe5ff537f50e static const IconResourceInfo resource_info[kDefaultAvatarIconsCount] = { // Old avatar icons: #if !BUILDFLAG(IS_ANDROID) -@@ -677,6 +679,7 @@ base::Value::List GetIconsAndLabelsForProfileAvatarSelector( +@@ -676,6 +678,7 @@ base::Value::List GetIconsAndLabelsForProfileAvatarSelector( selected_avatar_idx == GetPlaceholderAvatarIndex()); avatars.Insert(avatars.begin(), base::Value(std::move(generic_avatar_info))); 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 e2b4b3b56cee6..03f44c3e419ca 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 72a2b681d5b98642daabd2f961c0072f4235aae5..d90b38962c015d21c093ff272b42a65c912383bf 100644 +index e9e957b6bf1afcd2f3b0d2d958885e6e1de9a875..788a3241caa119b7bb6ff03c220dbabfb7fcdace 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2341,6 +2341,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -2338,6 +2338,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 897f83cc1f026..79ea21a92fe54 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 548004a597fa0cd03fe14da99715ed45868dac78..6572e8c0203d2ba6a5c2b593257424fdd524778b 100644 +index d9f97fbdced5389e00272e2b3d15f628663249aa..e4fbbd8cc72b467186c8e76c9f2a229ec79badde 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -200,6 +200,7 @@ class RenderViewContextMenu +@@ -202,6 +202,7 @@ class RenderViewContextMenu // 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-BUILD.gn.patch b/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch index a2d2722720ca0..f80a5dd8063ad 100644 --- a/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch +++ b/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/BUILD.gn b/chrome/browser/resources/bookmarks/BUILD.gn -index 6f74c52de2cc2b73c7a63ee8a93d7e8e893dc01e..b45d31d158a68637171ca0df0bf2db1a4da960d0 100644 +index 2d51e70dcfc1daeca402120dac67b9a9fd966aac..ee0b1b0b86d1225d86badb1b1d2896812f5b8ad2 100644 --- a/chrome/browser/resources/bookmarks/BUILD.gn +++ b/chrome/browser/resources/bookmarks/BUILD.gn @@ -72,4 +72,5 @@ build_webui("build") { diff --git a/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch b/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch index 81c4690acac39..d0b7455b404fb 100644 --- a/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch +++ b/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/bookmarks.html b/chrome/browser/resources/bookmarks/bookmarks.html -index e27f94c5d59cf7e8f27ccf8b3c33162f2ac3469d..4436e95d6d6b824fc320f9b07e56772edd8dcfa4 100644 +index d28056ba63641513b631df9990784870ae71cd13..b1cd9f314bad81b924c99d4e91bd75f8855a0e2f 100644 --- a/chrome/browser/resources/bookmarks/bookmarks.html +++ b/chrome/browser/resources/bookmarks/bookmarks.html -@@ -26,6 +26,7 @@ +@@ -25,6 +25,7 @@ } } diff --git a/patches/chrome-browser-resources-bookmarks-bookmarks.ts.patch b/patches/chrome-browser-resources-bookmarks-bookmarks.ts.patch index 3035d6070f1ca..296f13d6354bc 100644 --- a/patches/chrome-browser-resources-bookmarks-bookmarks.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-bookmarks.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/bookmarks.ts b/chrome/browser/resources/bookmarks/bookmarks.ts -index d41249c919d28e4d0d51182ab470c263759ed7a7..e297ae157825397d95f1794e6c86558289d97f17 100644 +index a16e78de66f60e0781b303efe105145bfbb9a886..83bcb0f14039f8c934c47b1537631d46db03474e 100644 --- a/chrome/browser/resources/bookmarks/bookmarks.ts +++ b/chrome/browser/resources/bookmarks/bookmarks.ts @@ -2,6 +2,7 @@ @@ -9,4 +9,4 @@ index d41249c919d28e4d0d51182ab470c263759ed7a7..e297ae157825397d95f1794e6c865582 +import './brave_overrides/index.js'; import './app.js'; - export {changeFolderOpen, clearSearch, createBookmark, deselectItems, editBookmark, moveBookmark, removeBookmark, reorderChildren, selectFolder, SelectFolderAction, selectItem, SelectItemsAction, setSearchResults, setSearchTerm, StartSearchAction, updateAnchor} from './actions.js'; + export {CrRouter} from '//resources/js/cr_router.js'; diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch index 647e3dddf78e9..dc3324d022a9b 100644 --- a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts -index 46e8b719c14d0ac57209b847425b6866e2520349..fcbbb07b01259ddc98590013cae534c200e67a06 100644 +index bb32532feaa4b9a32f1467091b47205894d27e22..0ab4125fa0cac25217b4923352d1cf3535805b2d 100644 --- a/chrome/browser/resources/bookmarks/command_manager.ts +++ b/chrome/browser/resources/bookmarks/command_manager.ts -@@ -434,7 +434,7 @@ export class BookmarksCommandManagerElement extends +@@ -426,7 +426,7 @@ export class BookmarksCommandManagerElement extends chrome.bookmarkManagerPrivate.export(); break; case Command.HELP_CENTER: diff --git a/patches/chrome-browser-resources-downloads-BUILD.gn.patch b/patches/chrome-browser-resources-downloads-BUILD.gn.patch index 96da757673914..e286687c933de 100644 --- a/patches/chrome-browser-resources-downloads-BUILD.gn.patch +++ b/patches/chrome-browser-resources-downloads-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/downloads/BUILD.gn b/chrome/browser/resources/downloads/BUILD.gn -index a029280a4dd22c96fd862687e8895bc701f62925..5cb5881aabad9ba251445b6f1ff2169e6612c9e2 100644 +index a06029b4842094f38349d784b1adae16863dff83..7fc58b87481abef8273a3145cad8b4d863b3b2e0 100644 --- a/chrome/browser/resources/downloads/BUILD.gn +++ b/chrome/browser/resources/downloads/BUILD.gn -@@ -55,4 +55,5 @@ build_webui("build") { +@@ -59,4 +59,5 @@ build_webui("build") { optimize_webui_host = "downloads" optimize_webui_in_files = [ "downloads.js" ] } diff --git a/patches/chrome-browser-resources-downloads-downloads.html.patch b/patches/chrome-browser-resources-downloads-downloads.html.patch index 625bd1416fd69..45572c2136b81 100644 --- a/patches/chrome-browser-resources-downloads-downloads.html.patch +++ b/patches/chrome-browser-resources-downloads-downloads.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html -index a8f37818129b54aee73aee8865df5bbc4e8b41dc..714ddf2e55b8182fe3b0ace9f1abc05253208464 100644 +index 35e377d76a4a47bb990832edf8dd1b3dd2c48301..2654b4ff65a59629a7f93001df08a659026ce730 100644 --- a/chrome/browser/resources/downloads/downloads.html +++ b/chrome/browser/resources/downloads/downloads.html -@@ -7,6 +7,7 @@ +@@ -6,6 +6,7 @@ $i18n{title} diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index 7f9cf712e2b7c..a4d7e8a572536 100644 --- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn -index ebc79f65b46b12a4f2b0a87118f7336a83b48090..8a200522e1820aba683d6bb06ac8a35cf81b8e54 100644 +index 74be318dee06eb77b19cab941bfb6e1837d90a04..e54958711ff87bbaef9c1e93682dea85d021e141 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn -@@ -106,4 +106,5 @@ build_webui("build") { +@@ -107,4 +107,5 @@ build_webui("build") { optimize_webui_host = "extensions" optimize_webui_in_files = [ "extensions.js" ] } diff --git a/patches/chrome-browser-resources-extensions-extensions.html.patch b/patches/chrome-browser-resources-extensions-extensions.html.patch index 2f45aa5df44b1..afd8d10d2658c 100644 --- a/patches/chrome-browser-resources-extensions-extensions.html.patch +++ b/patches/chrome-browser-resources-extensions-extensions.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html -index 60984148129930dd5f0e383c3e540e0a0c1dcc91..8a7cc1ce5d2342abfb11628487f21e2aac7d7b34 100644 +index 58f56797ee0b424685c0710b4eca282eee223fb9..460db14035927bbde48ebd4626c6cd6bb091baaa 100644 --- a/chrome/browser/resources/extensions/extensions.html +++ b/chrome/browser/resources/extensions/extensions.html @@ -38,6 +38,7 @@ diff --git a/patches/chrome-browser-resources-extensions-extensions.ts.patch b/patches/chrome-browser-resources-extensions-extensions.ts.patch index e437a67f9af4d..78db6906d286d 100644 --- a/patches/chrome-browser-resources-extensions-extensions.ts.patch +++ b/patches/chrome-browser-resources-extensions-extensions.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/extensions.ts b/chrome/browser/resources/extensions/extensions.ts -index 6f05319932f20077763953ede17ff31e97898d36..981eee7e95df6bbcf135d1a3e7581876b5e35317 100644 +index 8f2ed987bdcf95a5680a5b29a28e3312051d5daf..3eae6edeb88d1e8f72ec0b2018109b01911efdce 100644 --- a/chrome/browser/resources/extensions/extensions.ts +++ b/chrome/browser/resources/extensions/extensions.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-extensions-item_list.html.patch b/patches/chrome-browser-resources-extensions-item_list.html.patch index a488091e88214..dd97a4f9ae83f 100644 --- a/patches/chrome-browser-resources-extensions-item_list.html.patch +++ b/patches/chrome-browser-resources-extensions-item_list.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/extensions/item_list.html b/chrome/browser/resources/extensions/item_list.html -index fb27d6f9b685ff137088bfba9333a42a1e3b0d6f..c9a52a6a42dac2fb7275909a26fad5c3f4922146 100644 +index 5145136bd09abdefde6a03610d690b2022097619..46c5e7a4317de0ea1980d0aa025bb5401cad614c 100644 --- a/chrome/browser/resources/extensions/item_list.html +++ b/chrome/browser/resources/extensions/item_list.html -@@ -146,5 +146,6 @@ +@@ -163,5 +163,6 @@ diff --git a/patches/chrome-browser-resources-extensions-item_list.ts.patch b/patches/chrome-browser-resources-extensions-item_list.ts.patch index 6f1ef43c2ada6..5a27c215d45de 100644 --- a/patches/chrome-browser-resources-extensions-item_list.ts.patch +++ b/patches/chrome-browser-resources-extensions-item_list.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/extensions/item_list.ts b/chrome/browser/resources/extensions/item_list.ts -index ebeb7ec522e9e9a1fdf267d76affd9d38f3bcd9c..9f0715281f8e4ba01a811aac16bd8b4c4ab33e6d 100644 +index 64fbab07d5024a74150e32dee654ca797bb1c573..04366dda36c66f72580b1eb012e321f57e5c9de6 100644 --- a/chrome/browser/resources/extensions/item_list.ts +++ b/chrome/browser/resources/extensions/item_list.ts -@@ -14,6 +14,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu +@@ -15,6 +15,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu import type {ExtensionsItemElement, ItemDelegate} from './item.js'; import {getTemplate} from './item_list.html.js'; diff --git a/patches/chrome-browser-resources-history-BUILD.gn.patch b/patches/chrome-browser-resources-history-BUILD.gn.patch index 0a6688e14ddc4..7689a48c4514c 100644 --- a/patches/chrome-browser-resources-history-BUILD.gn.patch +++ b/patches/chrome-browser-resources-history-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/history/BUILD.gn b/chrome/browser/resources/history/BUILD.gn -index 82a5cc89d4be3d5b5d7cf0d2f864942b6a1fba00..02db4a7abf002b293d7136bd00dbe66ddf5a2164 100644 +index ee86459535346b93884e8b02607f80c340a582b1..cba67ce87f4577568b84d9fbcb74a6e786a61860 100644 --- a/chrome/browser/resources/history/BUILD.gn +++ b/chrome/browser/resources/history/BUILD.gn -@@ -72,4 +72,5 @@ build_webui("build") { +@@ -74,4 +74,5 @@ build_webui("build") { "lazy_load.js", ] } diff --git a/patches/chrome-browser-resources-history-history.html.patch b/patches/chrome-browser-resources-history-history.html.patch index 979658a33b304..d7aaf4159d07f 100644 --- a/patches/chrome-browser-resources-history-history.html.patch +++ b/patches/chrome-browser-resources-history-history.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/history/history.html b/chrome/browser/resources/history/history.html -index 7665ec6accc5c46e7467c826b1858b5eb9bbe734..8104fe69d88f9ec212fa392f945af61ddec7d1e1 100644 +index 942f67f870fecd144efc19308ff8148782b10e2e..195188c9b3bdd9720c76b058b6d075ace67b0914 100644 --- a/chrome/browser/resources/history/history.html +++ b/chrome/browser/resources/history/history.html -@@ -52,6 +52,7 @@ +@@ -51,6 +51,7 @@ text-align: center; } diff --git a/patches/chrome-browser-resources-history-history.ts.patch b/patches/chrome-browser-resources-history-history.ts.patch index 626bcab8e4a07..77c0b039d5b2d 100644 --- a/patches/chrome-browser-resources-history-history.ts.patch +++ b/patches/chrome-browser-resources-history-history.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history.ts b/chrome/browser/resources/history/history.ts -index bcab0adec089ab4d4d577e4bc00b4191d6d17a20..ee4534ff04741ed659bd01a9132a5c68a45276ec 100644 +index 969c4cbe93df90f3b15b18c529c4e1306af129ed..6c50f0c196dbc2fc5ae12c17657a066626b37e4a 100644 --- a/chrome/browser/resources/history/history.ts +++ b/chrome/browser/resources/history/history.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-history-history_item.html.patch b/patches/chrome-browser-resources-history-history_item.html.patch index e25b63ff34c30..b4b38fb5cab63 100644 --- a/patches/chrome-browser-resources-history-history_item.html.patch +++ b/patches/chrome-browser-resources-history-history_item.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history_item.html b/chrome/browser/resources/history/history_item.html -index b2aeff13398fcd5dd17e0d7538bae438dc3ed7ba..7657cac1ea3d442ce01d774507e6ac2e931c9ac2 100644 +index 1fd97b3cd7d042f8f55781c0546a5bca1cf5a091..fbec3455c06e8c65db7c2d469ed5638096673c4e 100644 --- a/chrome/browser/resources/history/history_item.html +++ b/chrome/browser/resources/history/history_item.html @@ -1,4 +1,4 @@ diff --git a/patches/chrome-browser-resources-history-history_item.ts.patch b/patches/chrome-browser-resources-history-history_item.ts.patch index 59eb044575b31..385c45f1fc168 100644 --- a/patches/chrome-browser-resources-history-history_item.ts.patch +++ b/patches/chrome-browser-resources-history-history_item.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history_item.ts b/chrome/browser/resources/history/history_item.ts -index f618a269328d4d9bec3762c0231d1aff687042fc..37cec8e8f32529b1adf2ec84cc06f937ee35d74e 100644 +index c1c2c47ea7dc481fd7b1b77ddc2a1605b1cf57d0..2d09d23d5cf7bd83cfe9d65ac8b628e2574d216a 100644 --- a/chrome/browser/resources/history/history_item.ts +++ b/chrome/browser/resources/history/history_item.ts @@ -9,6 +9,7 @@ import 'chrome://resources/cr_elements/cr_icons.css.js'; @@ -8,5 +8,5 @@ index f618a269328d4d9bec3762c0231d1aff687042fc..37cec8e8f32529b1adf2ec84cc06f937 import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js'; +import './brave_history_item.js' + import {HistoryResultType} from 'chrome://resources/cr_components/history/constants.js'; import type {CrCheckboxElement} from 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.js'; - import type {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; diff --git a/patches/chrome-browser-resources-password_manager-password_manager.ts.patch b/patches/chrome-browser-resources-password_manager-password_manager.ts.patch index 85d0f4eb6aa9c..cf6f767770740 100644 --- a/patches/chrome-browser-resources-password_manager-password_manager.ts.patch +++ b/patches/chrome-browser-resources-password_manager-password_manager.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/password_manager/password_manager.ts b/chrome/browser/resources/password_manager/password_manager.ts -index 851c96d19d54ea71c751e64ea0b7b598bd37d86c..ac374839545daaf756ccc4ae91e22236156f5d77 100644 +index 758bdfa2addbf9a06c8e4efd4f930e71a79f01e8..1ecd2d300bcf94e333f23a74489d25ed672d8b12 100644 --- a/chrome/browser/resources/password_manager/password_manager.ts +++ b/chrome/browser/resources/password_manager/password_manager.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-password_manager-shared_style.css.patch b/patches/chrome-browser-resources-password_manager-shared_style.css.patch index 6c2f0f3852cfb..2a4879c6df393 100644 --- a/patches/chrome-browser-resources-password_manager-shared_style.css.patch +++ b/patches/chrome-browser-resources-password_manager-shared_style.css.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/password_manager/shared_style.css b/chrome/browser/resources/password_manager/shared_style.css -index d150fd2b8f713231a4453b9e760ab80b963ebc40..b4817eba5918a5cab874bc95d76b5a9f8ba7163e 100644 +index f10a09040ea79ea31214797a5a92fceacd4b0535..38251be0477bb51b115840f4e1bc6e0ea905e6d9 100644 --- a/chrome/browser/resources/password_manager/shared_style.css +++ b/chrome/browser/resources/password_manager/shared_style.css @@ -6,6 +6,7 @@ diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 55b8bb6c2a519..d1cf7a654ec41 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index c1e7de9b1e1df66277837cbe43b624b36fe60864..45511e749fb9c78dff490f32c92ffd02a11d763a 100644 +index c9bf75334f53426d40cbb58405dd431508c057b7..011b11a6d07cfdf2b2da3976a253ccb07078fc24 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -463,4 +463,5 @@ build_webui("build") { +@@ -459,4 +459,5 @@ build_webui("build") { "$root_gen_dir/chrome/browser/resources/settings_shared/tsc", root_build_dir) ] } diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch index cb28e5bc3f6ca..55ff16dc52cf4 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts -index e1ce3760f5a5929ab3650ca4db1eeccc1950faa9..19f8f7db88b5b9cbf001ca7de76cdc1a3a40f87d 100644 +index 0d678516234f9fd4c27ffce56c996a09a462682f..5805ab388091187505f58c0a3d82208d3a02b1b6 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.ts +++ b/chrome/browser/resources/settings/people_page/sync_controls.ts @@ -117,7 +117,7 @@ export class SettingsSyncControlsElement extends 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 ee45aae6923aa..ebdcfba71ff39 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 50b9ff2d52bd2e6876e544c331c7ac8138c84799..158531f1d2192385f9a4d58882d85ab7dd627d65 100644 +index ed19f421048bc8618c5e0624e290f859d1b79bde..e502d0f0300ee06aedf52da2332756527a9cadb2 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html @@ -20,7 +20,7 @@ @@ -44,7 +44,7 @@ index 50b9ff2d52bd2e6876e544c331c7ac8138c84799..158531f1d2192385f9a4d58882d85ab7 @@ -52,7 +52,7 @@ index 50b9ff2d52bd2e6876e544c331c7ac8138c84799..158531f1d2192385f9a4d58882d85ab7 diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch index 74afcf114db40..70295c42da334 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts -index 5e50ce5b6cfbffa9fd3fe92eaaa09083ed9b1b82..ac602f6fd1e6fb317f1ea091f2d08b361761feb4 100644 +index ca6a2b1814c7cb735e15c161f766caaee34bc4b2..911673f4ba7deed962e40b34240bc8ce2f0a3af9 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts @@ -91,7 +91,7 @@ export class SettingsPersonalizationOptionsElement extends @@ -20,7 +20,7 @@ index 5e50ce5b6cfbffa9fd3fe92eaaa09083ed9b1b82..ac602f6fd1e6fb317f1ea091f2d08b36 private metricsReportingPref_: chrome.settingsPrivate.PrefObject; private showRestart_: boolean; // -@@ -200,7 +200,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -201,7 +201,7 @@ export class SettingsPersonalizationOptionsElement extends override ready() { super.ready(); @@ -29,7 +29,7 @@ index 5e50ce5b6cfbffa9fd3fe92eaaa09083ed9b1b82..ac602f6fd1e6fb317f1ea091f2d08b36 const setMetricsReportingPref = (metricsReporting: MetricsReporting) => this.setMetricsReportingPref_(metricsReporting); this.addWebUiListener('metrics-reporting-change', setMetricsReportingPref); -@@ -215,9 +215,11 @@ export class SettingsPersonalizationOptionsElement extends +@@ -216,9 +216,11 @@ export class SettingsPersonalizationOptionsElement extends this.setChromeSigninUserChoiceInfo_.bind(this)); // @@ -41,7 +41,7 @@ index 5e50ce5b6cfbffa9fd3fe92eaaa09083ed9b1b82..ac602f6fd1e6fb317f1ea091f2d08b36 } // -@@ -246,7 +248,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -247,7 +249,7 @@ export class SettingsPersonalizationOptionsElement extends } // 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 9eb5839047240..b6d69e0d0f79a 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 45a5c64e9659debbc299bfe420402e8f81411e80..9543d8934e98052cc1434169f9f1c9171db48538 100644 +index 5c1b8cabc8b6e59c128daceadd6e241ccf5cd026..a1b902af5305d952d3ebc65beb767ff5e528b092 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -36,6 +36,7 @@ diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch index f8ae6975fc654..cb08d054c7b0b 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -index 4f879a26b1ad97d20f4af20ca8f4380c62a8eadf..4c2e627e705f392c5d618494ac634cfdee737dde 100644 +index 00318322c8147584a629aa2fe356e96bf98d476d..521f80c152b523a47dd3dbadf93b7aad545a2b04 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts @@ -22,6 +22,7 @@ import '../settings_page/settings_subpage.js'; diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index a697e8fd09295..d237d31db7e55 100644 --- a/patches/chrome-browser-resources-settings-route.ts.patch +++ b/patches/chrome-browser-resources-settings-route.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts -index 11eaace3c2bffc797ed7aba639e41167c6e2dbd5..0071122cc219e254d09f576e52862cf3c931d748 100644 +index c801b3c1d1e9985472aba2f1b4cd98491b45e5ed..550d67ad80d6d2a0864de3564fec8ef7ae6be2a5 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts @@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js'; @@ -10,7 +10,7 @@ index 11eaace3c2bffc797ed7aba639e41167c6e2dbd5..0071122cc219e254d09f576e52862cf3 /** * Add all of the child routes that originate from the privacy route, * regardless of whether the privacy section under basic or advanced. -@@ -308,6 +309,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes { +@@ -312,6 +313,7 @@ function createRoutes(): SettingsRoutes { } // } diff --git a/patches/chrome-browser-resources-settings-router.ts.patch b/patches/chrome-browser-resources-settings-router.ts.patch index e235fbb7af55e..bb691e6a3702a 100644 --- a/patches/chrome-browser-resources-settings-router.ts.patch +++ b/patches/chrome-browser-resources-settings-router.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts -index 56068a3bce62654ff31c0902c603997220095c0b..40d170aab2399d6cb776825c92fa260951a89fc7 100644 +index 259e80e8b6c34618bb5d1372c2760dfdf4aee7e4..147b2081d2a74daedb002004c825fc29ed7d61a9 100644 --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts @@ -114,6 +114,7 @@ export interface SettingsRoutes { diff --git a/patches/chrome-browser-resources-settings-settings.html.patch b/patches/chrome-browser-resources-settings-settings.html.patch index 6367cd9eb1e98..bbd15cbbc981e 100644 --- a/patches/chrome-browser-resources-settings-settings.html.patch +++ b/patches/chrome-browser-resources-settings-settings.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/settings.html b/chrome/browser/resources/settings/settings.html -index 5c8aeeb8e3621058bd233499e3b555e991d08c72..c45edab8b9bc6cf703523847e4386eab68ab8bda 100644 +index 6af2c41d1842fca98a5b64f6ebddf17a595b15a0..4c0a2331b13254e311bf23a43d29555c4ecd1219 100644 --- a/chrome/browser/resources/settings/settings.html +++ b/chrome/browser/resources/settings/settings.html -@@ -6,6 +6,7 @@ +@@ -5,6 +5,7 @@ $i18n{settings} diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index d7703a24ca8b4..7297d2d187b36 100644 --- a/patches/chrome-browser-resources-settings-settings.ts.patch +++ b/patches/chrome-browser-resources-settings-settings.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts -index b98ecc56f8abff0c087ca58268b149e763f7afad..ac345d31abc720c1bd048f446827b0f92f6f15ce 100644 +index f0ae67b8bd045da33bca2dbbddcaef36dfa5f34e..7abeaaab02f72b0b58d965d130c0c624bb31f729 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index 5f729520b7e45..868fdb91b55ac 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index dda1df0b506ac898cff0941bf804b40d279f6f3d..a37cd1d80b3fcfccb24d9103a10510e6fd421b93 100644 +index 13e2f6b33b99ad16f7043f0232bb125fa6ae20a5..671aeefc03ad84abfac278ed9634088de2fd2b73 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts -@@ -62,6 +62,7 @@ export enum ContentSettingsTypes { +@@ -63,6 +63,7 @@ export enum ContentSettingsTypes { PDF_DOCUMENTS = 'pdfDocuments', SITE_DATA = 'site-data', OFFER_WRITING_HELP = 'offer-writing-help', diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch index b02d9ec13c06f..feaeaf22dd899 100644 --- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -index 95f76d551cc8cde636f4bb9ef49dcec4c8dba23f..b7f12a3e33be1e1483fa0cd623f99d8d7e0c18a7 100644 +index 9df792f1e3bf3ce9f301afed2fb119cbed1f5d8e..38ab64351fbfe37a0299793996e282cede059eb9 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -8,6 +8,7 @@ diff --git a/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmark_row.html.patch b/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmark_row.html.patch deleted file mode 100644 index 966b91ddc7a30..0000000000000 --- a/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmark_row.html.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.html b/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.html -index 2af05236c1de5295852c9dedfb5b784b48e067dc..80605d42cb9489e65c89a9fb275da27d24d1c210 100644 ---- a/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.html -+++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.html -@@ -37,7 +37,7 @@ - - BuildSyncService( +@@ -169,7 +169,7 @@ std::unique_ptr BuildSyncService( } auto sync_service = diff --git a/patches/chrome-browser-themes-theme_service_factory.cc.patch b/patches/chrome-browser-themes-theme_service_factory.cc.patch index 9f2578ad129b9..7da09889ad8f2 100644 --- a/patches/chrome-browser-themes-theme_service_factory.cc.patch +++ b/patches/chrome-browser-themes-theme_service_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc -index 879bbeef4037b9292e6a563ee9deb3c73dabc247..5c149fce515c27f0177ec1c1bcb36451c950cdb7 100644 +index 49fd0b0f7a21c180a17b1e74ab19bcbb657a6eda..d0c578c300c9c8b09c3a96c71a2a74a12ffa2c73 100644 --- a/chrome/browser/themes/theme_service_factory.cc +++ b/chrome/browser/themes/theme_service_factory.cc @@ -103,6 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 73930e5179043..a6ed25a0015d6 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 aba6af9ae6940a135cb974ee7c69b66e0ea426ea..c0902b88cdd7ea9d13b5d311e294ab6ee885ef90 100644 +index 63f233cba4da5597a6bd397573da42c6937fde05..32b0dc42a7113500ca1f7582b2774a4a73b1dddd 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -740,6 +740,7 @@ static_library("ui") { +@@ -751,6 +751,7 @@ static_library("ui") { "//chrome/browser/permissions", ] @@ -10,7 +10,7 @@ index aba6af9ae6940a135cb974ee7c69b66e0ea426ea..c0902b88cdd7ea9d13b5d311e294ab6e if (enable_vr && is_win) { deps += [ "//chrome/browser/vr:vr_base" ] -@@ -4716,7 +4717,10 @@ static_library("ui") { +@@ -4764,7 +4765,10 @@ static_library("ui") { ] deps += [ "//chrome/updater/app/server/win:updater_legacy_idl" ] } else { diff --git a/patches/chrome-browser-ui-actions-chrome_action_id.h.patch b/patches/chrome-browser-ui-actions-chrome_action_id.h.patch index e20c04db23f0d..e564eaeb5a5fe 100644 --- a/patches/chrome-browser-ui-actions-chrome_action_id.h.patch +++ b/patches/chrome-browser-ui-actions-chrome_action_id.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/actions/chrome_action_id.h b/chrome/browser/ui/actions/chrome_action_id.h -index 24ed7df90f9184f0c8dbcea41efa369e0d1848d9..c5497e9a9cf7f15c9cae7a16a559e50ec6afedc1 100644 +index a986a1eb7ccb1583ff64a619639fd7707e6d3eb2..e32b966675abf2b559176086096ed2783504f1d5 100644 --- a/chrome/browser/ui/actions/chrome_action_id.h +++ b/chrome/browser/ui/actions/chrome_action_id.h -@@ -539,6 +539,8 @@ +@@ -547,6 +547,8 @@ /* Side Panel items */ \ E(kActionSidePanelShowAboutThisSite) \ E(kActionSidePanelShowAssistant) \ diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index 5980bf7ca3c31..ddad39b98691f 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index fd9ed927fb26815e491170b7eec0ba2bdcf3f6ee..5a921b8f734beb9dbb8a21fdf0b7ec65327b00a0 100644 +index 1e23b9e0aad54b7d221fc456e1e8c7ebf8274b4e..792bf51f50bd287730da5b9c7a1140bb3a95fb4d 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn @@ -115,6 +115,7 @@ android_library("java") { diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index 6681dc641aa47..1b9c2a2652927 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index c95c7879372ac20f285d71ed149863168ec4bacc..cab86623cb8111b71b13a8f995c24a4512589d57 100644 +index b6879d6b7717dec155bf50c6ba531bef21c29117..599360363a7a2a21627b56f7867853cdb0ea0a14 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -@@ -435,6 +435,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -446,6 +446,7 @@ public class ToolbarPhone extends ToolbarLayout if (mOptionalButtonCoordinator != null) { mOptionalButtonCoordinator.setBackgroundColorFilter(color); } @@ -10,15 +10,15 @@ index c95c7879372ac20f285d71ed149863168ec4bacc..cab86623cb8111b71b13a8f995c24a45 } private void updateModernLocationBarCorners() { -@@ -598,6 +599,7 @@ public class ToolbarPhone extends ToolbarLayout - .notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); +@@ -607,6 +608,7 @@ public class ToolbarPhone extends ToolbarLayout + mTrackerSupplier.get().notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } + BraveToolbarLayout.class.cast(this).onClickImpl(v); } @Override -@@ -1091,6 +1093,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1100,6 +1102,7 @@ public class ToolbarPhone extends ToolbarLayout * New Tab Page. */ private void updateLocationBarLayoutForExpansionAnimation() { @@ -26,7 +26,7 @@ index c95c7879372ac20f285d71ed149863168ec4bacc..cab86623cb8111b71b13a8f995c24a45 TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); if (isInTabSwitcherMode()) return; -@@ -1513,6 +1516,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1522,6 +1525,7 @@ public class ToolbarPhone extends ToolbarLayout canvas.restore(); } @@ -34,7 +34,7 @@ index c95c7879372ac20f285d71ed149863168ec4bacc..cab86623cb8111b71b13a8f995c24a45 // Draw the tab stack button and associated text if necessary. if (mTabSwitcherAnimationTabStackDrawable != null && mToggleTabStackButton != null -@@ -2315,6 +2319,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2324,6 +2328,7 @@ public class ToolbarPhone extends ToolbarLayout } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index 5eb9858ffa386..75fbb088ca7ab 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index c7c12a9771225e4b09d27ed36fc064fa61b47223..1516fbb3d6c2a556907b24c553f8acaca4408d60 100644 +index fbba4ebbdfc76eb0ad84a74706d25cb975a1f3cf..3864d65cc29df3c6ec79b50bb7ac6d82521d632d 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -@@ -410,10 +410,12 @@ public class ToolbarTablet extends ToolbarLayout +@@ -412,10 +412,12 @@ public class ToolbarTablet extends ToolbarLayout mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab()); RecordUserAction.record("MobileToolbarDownloadPage"); } @@ -15,7 +15,7 @@ index c7c12a9771225e4b09d27ed36fc064fa61b47223..1516fbb3d6c2a556907b24c553f8acac String description = null; Context context = getContext(); Resources resources = context.getResources(); -@@ -550,6 +552,7 @@ public class ToolbarTablet extends ToolbarLayout +@@ -552,6 +554,7 @@ public class ToolbarTablet extends ToolbarLayout mLocationBar.getTabletCoordinator().tintBackground(textBoxColor); mLocationBar.updateVisualsForState(); setToolbarHairlineColor(color); diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 2ffafe6f18ded..917ccc233a9db 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 03620f99e45d9a87f5708ad2842fa14522eaff38..182a4f6e89b8bf88fe1555a61a2667909d158e28 100644 +index a1d50c2e470564578413c79b90d4f0493bd77e4f..6b60e9a861973448ae57c6aa5a454dfa81e05ba9 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -468,6 +468,7 @@ Browser* Browser::Create(const CreateParams& params) { +@@ -507,6 +507,7 @@ Browser* Browser::Create(const CreateParams& params) { // not possible, e.g. using the wrong profile or during shutdown. The caller // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index 03620f99e45d9a87f5708ad2842fa14522eaff38..182a4f6e89b8bf88fe1555a61a266790 return new Browser(params); } -@@ -478,7 +479,7 @@ Browser::Browser(const CreateParams& params) +@@ -517,7 +518,7 @@ Browser::Browser(const CreateParams& params) window_(nullptr), tab_strip_model_delegate_( std::make_unique(this)), diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index a0f16c627b96b..69fc3179c0852 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 cefb9f62051fed87f5636ac6a1ff9c9affd860ee..4d733c48c374d245a152028f49dcb679d0ad5e62 100644 +index 1bf5227d7c25210636f0dca6d4a422f49595a31c..e6d981c0de47cb02546b597a97b1940a5cae1e3b 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -633,6 +633,7 @@ base::WeakPtr Navigate(NavigateParams* params) { diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index dd750be211d4f..0e38cc46e6d42 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 1c61286b7d2bc16a66b84af5b80df68368c8f954..3448483eda0c1c0f4a53be44f5fa9ff4a69db216 100644 +index 91e36f5f3bb0edf9224c4d46ec187b6bdadab152..990f587729b79e496bb0c216f0d722edd97df492 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -399,7 +399,7 @@ void ShowSlow(Browser* browser) { +@@ -400,7 +400,7 @@ void ShowSlow(Browser* browser) { #endif } diff --git a/patches/chrome-browser-ui-color-BUILD.gn.patch b/patches/chrome-browser-ui-color-BUILD.gn.patch index f02e19f91d014..1bcb9cb695a28 100644 --- a/patches/chrome-browser-ui-color-BUILD.gn.patch +++ b/patches/chrome-browser-ui-color-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/color/BUILD.gn b/chrome/browser/ui/color/BUILD.gn -index 88a875ae5dd49685398cd70d2ae89fabd0b602c0..4c072175987b5aa26dd2499f42fcf32385f86f2d 100644 +index 74721cbd34b58aba78911e769e60dfc60b7a8976..888cb5d349c66f31fe56f8066149b427eaf219d7 100644 --- a/chrome/browser/ui/color/BUILD.gn +++ b/chrome/browser/ui/color/BUILD.gn -@@ -61,6 +61,7 @@ source_set("mixers") { +@@ -62,6 +62,7 @@ source_set("mixers") { "//ui/color:color", "//ui/color:mixers", ] diff --git a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch index e3d6b03bad7b3..dd168bda10466 100644 --- a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch +++ b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc -index d538b7a0cf5fbbf3c4841593c875e1c7a12b1e33..20b7e6b7b5c3e165d731414f15733d7a252b1c11 100644 +index bba17d5694d25e2d3f190a302a991e19c2a58e2c..618b88d6197c5829cf4feb63ce7138c41cd5c76f 100644 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc -@@ -191,6 +191,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { +@@ -159,6 +159,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale()); if (rep.scale() != canvas->image_scale()) { skia.AddRepresentation( @@ -10,7 +10,7 @@ index d538b7a0cf5fbbf3c4841593c875e1c7a12b1e33..20b7e6b7b5c3e165d731414f15733d7a ScaleImageSkiaRep(rep, extensions::ExtensionAction::ActionIconSize(), canvas->image_scale())); } -@@ -201,6 +202,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { +@@ -169,6 +170,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { (size().width() - extensions::ExtensionAction::ActionIconSize()) / 2.0); int y_offset = std::floor( (size().height() - extensions::ExtensionAction::ActionIconSize()) / 2.0); 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 deleted file mode 100644 index eec29cba185ee..0000000000000 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index 07dc31daf2d0b7c398b38a6146e275b55a80ebec..230c9e2b25d69696761e7a6eae6394dc16a56fdb 100644 ---- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc -+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -411,6 +411,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( - welcome_enabled = - welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) -+ BRAVE_STARTUPBROWSERCREATORIMPL_DETERMINEURLSANDLAUNCH - - const bool whats_new_enabled = - whats_new::ShouldShowForState(local_state, promotional_tabs_enabled); diff --git a/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch b/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch deleted file mode 100644 index 08388aba66141..0000000000000 --- a/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc -index ba6c7dc010cd36deb6c66159afde2e46dc4e4f8e..03549403288d908902b821ae377f455863e9c2d3 100644 ---- a/chrome/browser/ui/startup/startup_tab_provider.cc -+++ b/chrome/browser/ui/startup/startup_tab_provider.cc -@@ -292,6 +292,7 @@ StartupTabs StartupTabProviderImpl::GetPrivacySandboxTabs( - bool StartupTabProviderImpl::CanShowWelcome(bool is_signin_allowed, - bool is_child_account, - bool is_force_signin_enabled) { -+ if ((true)) return true; - return is_signin_allowed && !is_child_account && !is_force_signin_enabled; - } - diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index f5536f4e80bb9..5b0e23c7708b6 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 bfb35a47c8533f56e40cac7d68630cff76d2722e..e0ebec2eca207fb15ea58e68920415bc96d88217 100644 +index 796441c1061fa071cf037c75b3d1a448b75b2332..c68bfe008175bb9f2949f4f9d100f8cb86548478 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -800,4 +800,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -821,4 +821,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-tabs-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch index 6412ac20416f1..4d66d94872658 100644 --- a/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc -index 5d34407ebef42b5dc32e018bde632ceebbdcef13..f5f492912c4a416fed57d2d72f04b522f75abe11 100644 +index 903dc46ab6e4b96ec985318ae81b50dbd061377c..ae763560596e90cfd041630c597ad3fdd3c512a7 100644 --- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc -@@ -343,6 +343,7 @@ void RecentTabsSubMenuModel::Build() { +@@ -346,6 +346,7 @@ void RecentTabsSubMenuModel::Build() { } AddSeparator(ui::NORMAL_SEPARATOR); history_separator_index_ = GetItemCount() - 1; @@ -10,7 +10,7 @@ index 5d34407ebef42b5dc32e018bde632ceebbdcef13..f5f492912c4a416fed57d2d72f04b522 BuildLocalEntries(); BuildTabsFromOtherDevices(); } -@@ -446,6 +447,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { +@@ -447,6 +448,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { DCHECK(!session->GetSessionName().empty()); std::unique_ptr device_menu_model = CreateOtherDeviceSubMenu(session, tabs_in_session); diff --git a/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model_unittest.cc.patch b/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model_unittest.cc.patch index c05c67b83c174..1d870f7e2469f 100644 --- a/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model_unittest.cc.patch +++ b/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model_unittest.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model_unittest.cc -index 5dac52b43eabc49f7a48b4b3d2d2b67f46af7e06..f48c9b12581ef157689e84766f8a5e6f8ddc0e57 100644 +index 25eccc1dbae2cc46a5232916d0a4bc9faf071548..d39e1a09d40cbfad1de943ba3143b7af63386ac3 100644 --- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model_unittest.cc +++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model_unittest.cc @@ -175,6 +175,7 @@ class RecentTabsSubMenuModelTest : public BrowserWithTestWindowTest, 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 9dabd998630c0..97d0491143917 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 79a335dd0f7ebd8e9cc002043c518d9e038d20a7..a14857915b70ece02819101eedd1d6a6f9b9bfc2 100644 +index 735c379a8cd1dabfb7747114b6a18584e9af7e1c..f455d586704fb5a712e3881d45a1a14d150c4241 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -629,6 +629,7 @@ class TabStripModel : public TabGroupController { +@@ -660,6 +660,7 @@ class TabStripModel : public TabGroupController { // Serialise this object into a trace. void WriteIntoTrace(perfetto::TracedValue context) const; 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 36484f08e8221..b247b9e4ff713 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,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 2d0daab94101056dc30cd0bd94697adc95f6ada8..68dbd15ef4ba2ecd94f2d5dbd16fb5b793088db6 100644 +index da67b388d758305816319ed2651934a4e69acdb3..f7762af312b37f6b50bab3963a8550f8b497ae10 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -825,6 +825,7 @@ void BookmarkBarView::Layout(PassKey) { +@@ -856,6 +856,7 @@ void BookmarkBarView::Layout(PassKey) { x = next_x; } } 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 90d3657be787f..b70a29f36b815 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,18 +1,10 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -index ef54ba3741886e3ed3a87bcabf2cc9c7e20e5a4f..e34215482e3fd784f59653d3eb68bfd2faa60908 100644 +index d8b0572dd0915229ff7acd7750e09c586114473c..8ca5ae2d85d39c8a98588212a6191a89158b9676 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -@@ -374,6 +374,7 @@ void BookmarkBubbleView::ShowBubble( - bookmark_node); - - bool show_simplified_flow = !already_bookmarked; -+ BRAVE_BOOKMARK_BUBBLE_VIEW_SHOW_BUBBLE_SHOW_SIMPLIFIED - - auto bubble_delegate_unique = std::make_unique( - std::move(delegate), browser, url, show_simplified_flow); -@@ -515,6 +516,7 @@ void BookmarkBubbleView::ShowBubble( - auto bubble = std::make_unique( - std::move(dialog_model), anchor_view, views::BubbleBorder::TOP_RIGHT); +@@ -446,6 +446,7 @@ void BookmarkBubbleView::ShowBubble( + dialog_model_builder.Build(), anchor_view, + views::BubbleBorder::TOP_RIGHT); bookmark_bubble_ = bubble.get(); + BRAVE_BOOKMARK_BUBBLE_VIEW_SHOW_BUBBLE_SET_ARROW if (highlighted_button) 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 57ea18c0afe77..da4a4eff6364d 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 928ba94cd16ed0ddd9f86dcc447fb2b1f69a8d95..03c44ab6cc159c2f77d50d24e8f66d9201550edd 100644 +index afcfee5f503084346fa9a0358d97925c09fa72db..56d9c7df3e76da33e18f4fd2f656b4e38e5470c1 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h -@@ -114,6 +114,7 @@ class DownloadItemView : public views::View, +@@ -115,6 +115,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-frame-browser_view_layout.cc.patch b/patches/chrome-browser-ui-views-frame-browser_view_layout.cc.patch index 999fe64c49bf4..748b39f8965a2 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view_layout.cc.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view_layout.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc -index 07bc84fe5ed23356dadda5ee943107d7621037cf..6730c5d74871abe70ed944a4413fa4641ceae38e 100644 +index 96b489221fb3a0e312bde28910ead1e6fe80a2ea..57f40e9c683ce2815f9af31e400c95a32a6f3d84 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -68,6 +68,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) { diff --git a/patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch b/patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch index e59e06f628929..28cb8cf765620 100644 --- a/patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/tab_strip_region_view.h b/chrome/browser/ui/views/frame/tab_strip_region_view.h -index 6951cbfcb4c16a4dd5275da4b00e22adc5e4ecd4..dc17179b695dd285e1ea86f575af82a469c222a1 100644 +index 5be7ce333f96a26dfca1926455757785eb096351..3ee937bd976de7dca0f845d0052472756a7000cc 100644 --- a/chrome/browser/ui/views/frame/tab_strip_region_view.h +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.h -@@ -23,7 +23,7 @@ class TabStripScrollContainer; +@@ -24,7 +24,7 @@ class ProductSpecificationsButton; // Container for the tabstrip and the other views sharing space with it - // with the exception of the caption buttons. diff --git a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch index 6756b1080fbf9..56b0fa2020293 100644 --- a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc -index 84b89efa1783e5e156b0c06caa402e43a923fa98..c8864cc87f610b44369b8148a77906823595d1f3 100644 +index 3531f3ea0f46ee7b8262cc052f77d8ab3ab8ff00..ad2248b5278154f231a6ec4e73213d786f938d9b 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc -@@ -725,6 +725,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { +@@ -720,6 +720,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { const float corner_radius = highlight_bounds.height() / 2.f; const SkRect rect = RectToSkRect(highlight_bounds); 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 b332419368614..949d42d102062 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,16 +1,16 @@ 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 5efb61e19bf3265f1d3e8f46c94b6b259480d724..2e9f57062bb92a67ab95261601c731484b7a1cd7 100644 +index e2da2e75488ad47cb425b67b781785eb7574cd24..0e66077f30ec16a1b7cce6675366aae25024c5c1 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -710,6 +710,7 @@ void LocationBarView::Layout(PassKey) { - if (show_overriding_permission_chip) - text_left += text_overriding_permission_chip_indent; - +@@ -662,6 +662,7 @@ void LocationBarView::Layout(PassKey) { + // Indentation add padding when the permission chip is visible and replacing + // the LHS icon. + int text_overriding_permission_chip_indent = 0; + BRAVE_LAYOUT_LEADING_DECORATIONS - LocationBarLayout leading_decorations(LocationBarLayout::Position::kLeftEdge, - text_left); - LocationBarLayout trailing_decorations( -@@ -789,6 +790,7 @@ void LocationBarView::Layout(PassKey) { + if (should_indent) { + icon_left += icon_indent; + text_left += text_indent; +@@ -748,6 +749,7 @@ void LocationBarView::Layout(PassKey) { } }; 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 b4e5387e77a24..b7722a7d51519 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 8e35a13dd98bb0cca2ed85dab3d85821647efa03..d958d53a3b1b78020f91bbc39f3d21450f0caac5 100644 +index 9a6dcb6898b2e2a447b5960d802a7c47851db6c7..1d035d71bb78f9b543a3080beec4c98deeb45bc3 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -113,6 +113,7 @@ class LocationBarView @@ -18,7 +18,7 @@ index 8e35a13dd98bb0cca2ed85dab3d85821647efa03..d958d53a3b1b78020f91bbc39f3d2145 void Update(content::WebContents* contents); // Clears the location bar's state for |contents|. -@@ -251,6 +253,7 @@ class LocationBarView +@@ -252,6 +254,7 @@ class LocationBarView GetContentSettingViewsForTest() { return content_setting_views_; } diff --git a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch index 333d97d489928..eeb8a85ff2148 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc -index ecb86ad67eaf923e0d1236f0765204ab7ad1ea1e..34bcd32329efc6dd1ce1d5c039cf172ea7cae493 100644 +index f0e1262b72b0c7d46f144df4ed473d575bbece81..9cc17bafec0423fcc47d339cb7bf85a66842b01f 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc -@@ -174,6 +174,7 @@ bool LocationIconView::GetShowText() const { +@@ -171,6 +171,7 @@ bool LocationIconView::GetShowText() const { const auto* location_bar_model = delegate_->GetLocationBarModel(); const GURL& url = location_bar_model->GetURL(); if (url.SchemeIs(content::kChromeUIScheme) || diff --git a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch index 3739670e8048c..8e2334dd59277 100644 --- a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch +++ b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index 8110f1c5909e8996b1d847267f0aab3eff8339fa..8a63289b6683215ec0ba3e585c19d9172c93947a 100644 +index f94dc33f7ffbc13fd9846c5b62f5de3ac80d03ba..d1ed7b078dd7ccb51d739ee5d6e14342695d0bbf 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -@@ -285,7 +285,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( +@@ -286,7 +286,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( // constructor. It's important that the constructor be private, because it // doesn't initialize the object fully. auto overlay_window = @@ -11,7 +11,7 @@ index 8110f1c5909e8996b1d847267f0aab3eff8339fa..8a63289b6683215ec0ba3e585c19d917 overlay_window->CalculateAndUpdateWindowBounds(); overlay_window->SetUpViews(); -@@ -734,6 +734,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { +@@ -735,6 +735,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { max_size_ = new_max_size; diff --git a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch index f75ba823088e5..8e9a55bce67f5 100644 --- a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch +++ b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -index 46b8077bb1f2bba1a1df41b0fd011896562c1bb7..20a7531701a32bcf59b6fc0108faea9e1a27dc32 100644 +index 57ff10b66b6f2f02e683649c3e6879193a2cd0ac..5a7d4c1a6ffa69ae022a2cb79644e4a7b7818833 100644 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -442,6 +442,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -444,6 +444,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( const gfx::VectorIcon* icon = &gfx::kNoneIcon; switch (info.type) { diff --git a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch index ba7f92dc39562..bf3198b68365c 100644 --- a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch +++ b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc -index c62150a0bf26e9dfe38099da0d4df220aebfe3dd..3b7d8de9e05cee4f54612ff9efa7097467caddd3 100644 +index 58ca0d073250577d7cdbf82a7505adf809bb927d..8ae6cc7c4a0512d60267651c052f7482711e1440 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc -@@ -162,6 +162,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons( - SetButtonStyle(ui::DIALOG_BUTTON_CANCEL, ui::ButtonStyle::kTonal); - } +@@ -158,6 +158,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons( + SetButtonStyle(ui::DIALOG_BUTTON_OK, ui::ButtonStyle::kTonal); + SetButtonStyle(ui::DIALOG_BUTTON_CANCEL, ui::ButtonStyle::kTonal); } + BRAVE_PERMISSION_PROMPT_BUBBLE_BASE_VIEW } diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch index 8c253d7c341b9..3986052415f8a 100644 --- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch +++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -index afa6f6dde3c759a3f5bdbc300ca44bf1a4b2eed7..d3f973cb3967e3ccd0208bc4f269fb33696142dd 100644 +index b1860a7027e6e9514e66f9678e7914a97d350494..a8182e661f5b657342db70652309de3e3bff0df2 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -@@ -116,6 +116,7 @@ class AvatarToolbarButton : public ToolbarButton { +@@ -119,6 +119,7 @@ class AvatarToolbarButton : public ToolbarButton { void NotifyShowSigninPausedDelayEnded() const; private: diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch index 2aaa031332713..dcf462d75af70 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h -index 4ee6a4b79c44a4de96d9adcc9ae6368be1f7ad0e..7703f1f8dee1c37f2b55424d832790c7ca60a9ee 100644 +index 264d52e56f7c99184fcdd29866e367e6cecf8dc8..0e1e27a4e4c553aa2dff519cdbe877fb3209adf3 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view.h @@ -45,6 +45,7 @@ class ProfileMenuView : public ProfileMenuViewBase { @@ -8,5 +8,5 @@ index 4ee6a4b79c44a4de96d9adcc9ae6368be1f7ad0e..7703f1f8dee1c37f2b55424d832790c7 private: + BRAVE_PROFILE_MENU_VIEW_H friend class ProfileMenuViewExtensionsTest; + friend class ProfileMenuViewSigninPendingTest; friend class ProfileMenuViewSignoutTest; - friend class ProfileMenuViewSyncErrorButtonTest; 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 1b1312df05a2b..f9c7d6f7c36af 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 e1084f6a2b020e24d30b8bd19017b5329f847116..6f1303b538bda724e31e923f4c067c6f965f3b2c 100644 +index 53b45d642fff0a5cbcca49c2d6fb9433e0c32b26..22b096f86117bc2bc20cd3461ffe9fff08c72bf0 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -@@ -171,6 +171,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, +@@ -172,6 +172,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-side_panel-side_panel_coordinator.h.patch b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch index f2540407804cc..b544881138828 100644 --- a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch +++ b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h -index 2cd4c4bc00448564b269a8a33dc93c3f9f282fb7..e58b706292ab0383db2d6a2595361247d1f240c8 100644 +index d1840006ae1691a129edd8f7088cc599d7324336..cc3eb163955af83e4b35a3f3191da55ce0cae47f 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h -@@ -54,7 +54,7 @@ class View; +@@ -55,7 +55,7 @@ class View; // registry's active_entry() then global registry's. These values are reset when // the side panel is closed and |last_active_global_entry_id_| is used to // determine what entry is seen when the panel is reopened. 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 6a280de7adc0a..679bf1949f8de 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 0aaacd927eeb3da5d6f64fc851aec1943e2b37b4..0a20f9ecbbd8ab93ff01da21bab90bfa2297bc88 100644 +index 82ae931e0c1cb13c244e6dab41800d31433fb3ab..49b34ad99bdbfeccb4c3c1a2901316d94f008e63 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.h +++ b/chrome/browser/ui/views/tabs/new_tab_button.h @@ -50,6 +50,7 @@ class NewTabButton : public views::ImageButton, diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index a4420bcc031bf..28d64f6721e00 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc -index 799f5e145d187f7add49e520ead667c40ce459e8..282eaf967f38f1347898ecfa4d4340ad5bc398b2 100644 +index 660bde873097919889460ae7151f424d95ff0a55..971acbdcd6e7e39c8c9c7e5cb06513fedd4ad867 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -324,6 +324,7 @@ void Tab::Layout(PassKey) { +@@ -322,6 +322,7 @@ void Tab::Layout(PassKey) { // Height should go to the bottom of the tab for the crashed tab animation // to pop out of the bottom. favicon_bounds.set_y(contents_rect.y() + @@ -10,7 +10,7 @@ index 799f5e145d187f7add49e520ead667c40ce459e8..282eaf967f38f1347898ecfa4d4340ad Center(features::IsChromeRefresh2023() ? gfx::kFaviconSize : contents_rect.height(), -@@ -423,6 +424,7 @@ void Tab::Layout(PassKey) { +@@ -431,6 +432,7 @@ void Tab::Layout(PassKey) { int title_right = contents_rect.right(); if (showing_alert_indicator_) { title_right = alert_indicator_button_->x() - after_title_padding; @@ -18,7 +18,7 @@ index 799f5e145d187f7add49e520ead667c40ce459e8..282eaf967f38f1347898ecfa4d4340ad } else if (showing_close_button_) { // Allow the title to overlay the close button's empty border padding. title_right = close_x - after_title_padding; -@@ -1092,6 +1094,7 @@ void Tab::UpdateIconVisibility() { +@@ -1101,6 +1103,7 @@ void Tab::UpdateIconVisibility() { } showing_close_button_ = large_enough_for_close_button; diff --git a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch index d8a7ca58f1d64..e9f939c2c8816 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -index c50e5742c13f29a3df7fbddee7f6bca618b6cea9..b524e06c3a23ad6cb5aa2179ceabafbd651ad694 100644 +index 7018c53b674a083226f2fb426c238e1580bd043b..7a926ea6ee5c15cbb14f7c41ac07cd6e64dd1f0d 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h +++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -@@ -75,6 +75,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { +@@ -87,6 +87,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { // available, or `std::nullopt` to disable crossfades entirely. static std::optional GetPreviewImageCrossfadeStart(); diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch index 16dcfc2384428..755f1cd7501ae 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,16 +1,16 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index 4308001b40dd1c4ceb1d834135e2afff6b4bb0ce..35d2bbdd5db742bc74f354a4e5dd740b1f3e89f4 100644 +index 8d782f7c26a484579904e99a02741836db75c0c9..ec9fc08c67cbce788f83e54197bdfee80807f8a5 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -522,6 +522,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -532,6 +532,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, std::vector CalculateBoundsForDraggedViews( const std::vector>& views) override { + BRAVE_TAB_DRAG_CONTEXT_IMPL_CALCULATE_BOUNDS_FOR_DRAGGED_VIEWS - DCHECK(!views.empty()); + CHECK(!views.empty(), base::NotFatalUntil::M128) + << "The views vector must not be empty."; - std::vector bounds; -@@ -709,6 +710,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -725,6 +726,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, // index. std::stable_sort(orderable_children.begin(), orderable_children.end()); @@ -18,7 +18,7 @@ index 4308001b40dd1c4ceb1d834135e2afff6b4bb0ce..35d2bbdd5db742bc74f354a4e5dd740b for (const ZOrderableTabContainerElement& child : orderable_children) { child.view()->Paint(paint_info); } -@@ -802,6 +804,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -818,6 +820,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, continue; } diff --git a/patches/chrome-browser-ui-views-toolbar-app_menu.h.patch b/patches/chrome-browser-ui-views-toolbar-app_menu.h.patch index 3ff343f1e9a91..120ae8ad7cd86 100644 --- a/patches/chrome-browser-ui-views-toolbar-app_menu.h.patch +++ b/patches/chrome-browser-ui-views-toolbar-app_menu.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/app_menu.h b/chrome/browser/ui/views/toolbar/app_menu.h -index c5dd0878cd5a69edb8c2e612720ee48d2b23e58f..316195f4a62813b9825ff1b568414df2599c64c2 100644 +index 0d8614f19b9737ba49aa173aaca537ab2374eb0e..379d8459f2907a0aa08b1ab6811aae7dfd140131 100644 --- a/chrome/browser/ui/views/toolbar/app_menu.h +++ b/chrome/browser/ui/views/toolbar/app_menu.h -@@ -29,7 +29,7 @@ class MenuRunner; +@@ -31,7 +31,7 @@ class MenuRunner; } // AppMenu adapts the AppMenuModel to view's menu related classes. 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 0c2798b280d28..e53388b71c4aa 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 8c3395ee6d7fdf747dac795a2323e026c4af5715..4748d11cce05f8e7ade8b865eeb8a3d4ca6a4e88 100644 +index e02fe5d5e629071a618cab8d7fbd4dcef0435e31..1b41162056c207d6f2c2f1729c4eca92a50a98f1 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -462,6 +462,7 @@ void ToolbarView::Init() { +@@ -471,6 +471,7 @@ void ToolbarView::Init() { } } diff --git a/patches/chrome-browser-ui-webui-BUILD.gn.patch b/patches/chrome-browser-ui-webui-BUILD.gn.patch index 94ceb08fa9e69..64a8f5b91aa32 100644 --- a/patches/chrome-browser-ui-webui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-webui-BUILD.gn.patch @@ -1,10 +1,12 @@ diff --git a/chrome/browser/ui/webui/BUILD.gn b/chrome/browser/ui/webui/BUILD.gn -index babb595b283df7065a857d09a2c9aab93f7ad982..c509fe3dbd46ba909f5965b683b5e32615bd5ded 100644 +index 61554ef4dceb1c1a278fe446ccdaa2e9aaad64e1..bf9b05381fef9013eda6a6ee97c908870c576913 100644 --- a/chrome/browser/ui/webui/BUILD.gn +++ b/chrome/browser/ui/webui/BUILD.gn -@@ -63,4 +63,5 @@ source_set("configs") { +@@ -64,6 +64,7 @@ source_set("configs") { deps += [ "//ash/webui/sample_system_web_app_ui" ] } } + import("//brave/browser/ui/webui/sources.gni") deps += brave_browser_ui_webui_configs_deps } + + source_set("webui") { 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 64effba0911fa..b8be8eb1aa5c4 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 100e2ee479988319bed1f7dc9a7c37d029f81822..474e8b2f40a8956ee086c8837985409e47f030c9 100644 +index e19fe5feb9162c989a0fd96e9ba72b83f1febd13..74c59d88ce44a7a4cf70e4451b798c989a428d0b 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -@@ -129,6 +129,7 @@ content::WebUIDataSource* CreateAndAddBookmarksUIHTMLSource(Profile* profile) { +@@ -128,6 +128,7 @@ content::WebUIDataSource* CreateAndAddBookmarksUIHTMLSource(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 da9b82d3e4b99..0cbf84316abd0 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,8 +1,8 @@ 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 8aab19a3a613ce3c707a49456f594910d656f88c..2b4442970720d600b0c954530e6b32513228ddfd 100644 +index cfa2b46fb4b173ebf919fa1e707ab0cc17374810..26515549c5b55c6e7e8ca0267114d213d6da3b08 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -909,6 +909,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -879,6 +879,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 61c98530dcda4..88ff7ec3fb184 100644 --- a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc -index ed846d8a08a68fabc1e7a0952cf9ebde480564a2..e1e5683a204a82335c86df5bce7827dbfe7b335b 100644 +index a33d79de092aeefd2b736d02caea4bdf59af9cd4..fc2e23f746d11784b8f8672c955f42da298e2d4a 100644 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc -@@ -64,6 +64,7 @@ namespace { +@@ -66,6 +66,7 @@ namespace { content::WebUIDataSource* CreateAndAddDownloadsUIHTMLSource(Profile* profile) { content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd( profile, chrome::kChromeUIDownloadsHost); 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 afb9beda7e21b..4da3b71939fb1 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 fa224cb49d66d8530fd743b406b9be6a01d659d0..fb0757639b695dc95a40595e934d4f82aba7bc44 100644 +index f18d1fdc9cc6fbf058ed5d4251bafc122f509c1d..63ffc58424243b07571084deb1ac43c1f2fa04cd 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -454,7 +454,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, +@@ -470,7 +470,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, source->AddBoolean("isLacrosEnabled", crosapi::browser_util::IsLacrosEnabled()); #endif diff --git a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch index 1e82ee9c94bc1..1f7d4f89fa555 100644 --- a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc -index 03cc63658815b717b25b96a04c56ead19a9c1db9..9eab7da84c093ff66d98c46130fea94ee9cab779 100644 +index 94f90fd869ce26253f908dcdb62357d5ba25e162..a16f06d0e0f019fdb70a91d6031d64ee7a75896f 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -75,6 +75,7 @@ content::WebUIDataSource* CreateAndAddHistoryUIHTMLSource(Profile* profile) { +@@ -82,6 +82,7 @@ content::WebUIDataSource* CreateAndAddHistoryUIHTMLSource(Profile* profile) { + content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd( profile, chrome::kChromeUIHistoryHost); - webui::SetupChromeRefresh2023(source); + BRAVE_CREATE_HISTORY_UI_HTML_SOURCE static constexpr webui::LocalizedString kStrings[] = { diff --git a/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch b/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch index 1e58819f7ac7e..f9612186e2ba1 100644 --- a/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc -index 449f6f2db551ec81fc272fcc2b5abc6d99b2dfcc..e3d271f158d59fb4ffdef547525b3d184733f6cc 100644 +index 8aea19c0090dcd370eb3de2f89f5d0585b118a64..e06b1dd051c98b4e190b72d7b7549cd353433405 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -156,7 +156,7 @@ PrintPreviewRequestIdMap& GetPrintPreviewRequestIdMap() { 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 78737a9004fc5..bde157b50d30f 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 6e6de945a5b5ee289f3a0786c58a1e5f80fc05cb..925abf7dad9df5443da61eaefc02976b36493d2d 100644 +index a560ab6268c7322ec9169f4ebf4e582e4a6cd99e..e9565e70a91e44c9aeef4cee34ff4e848d3ae45b 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -964,6 +964,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { +@@ -1069,6 +1069,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { void PeopleHandler::BeforeUnloadDialogCancelled() { // The before unload dialog is only shown during the first sync setup. @@ -10,7 +10,7 @@ index 6e6de945a5b5ee289f3a0786c58a1e5f80fc05cb..925abf7dad9df5443da61eaefc02976b DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount( signin::ConsentLevel::kSync)); syncer::SyncService* service = GetSyncService(); -@@ -1013,6 +1014,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const { +@@ -1118,6 +1119,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const { service && !disallowed_by_policy && service->IsSetupInProgress() && !service->GetUserSettings()->IsInitialSyncFeatureSetupComplete() && identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)); @@ -18,7 +18,7 @@ index 6e6de945a5b5ee289f3a0786c58a1e5f80fc05cb..925abf7dad9df5443da61eaefc02976b const SyncStatusLabels status_labels = GetSyncStatusLabels(profile_); // TODO(crbug.com/40660240): Consider unifying some of the fields below to -@@ -1182,6 +1184,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { +@@ -1292,6 +1294,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { } bool PeopleHandler::IsProfileAuthNeededOrHasErrors() { 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 91932232e55bc..d0259a5b26038 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 c870304c625bd30081077ff7098efbe2015196ad..72a09f6f61ff6c495ca7c1590caef7fb2d942487 100644 +index 8fe72571cea77a1d4e00c86f75daba90da5273f7..2aafd65d0bf607ebba0d8258ac443e3655eba3ae 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3578,6 +3578,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3670,6 +3670,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 4813f40f9719f..45e11e390f72b 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 8637b68a9a21ad228a09ca121d4ab32ab398631c..9a0734cdb85bd34526ff2b89c09abc813b239b37 100644 +index fda8d005b3785a91a0d596405cd7cfa7f57e21d5..b948addf8051da9ecbd571b8494a014aaa7e784a 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -222,6 +222,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { +@@ -228,6 +228,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { {ContentSettingsType::DIRECT_SOCKETS, nullptr}, {ContentSettingsType::REVOKED_ABUSIVE_NOTIFICATION_PERMISSIONS, nullptr}, {ContentSettingsType::TOP_LEVEL_TPCD_ORIGIN_TRIAL, nullptr}, @@ -10,10 +10,10 @@ index 8637b68a9a21ad228a09ca121d4ab32ab398631c..9a0734cdb85bd34526ff2b89c09abc81 }; static_assert( -@@ -484,6 +485,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -472,6 +473,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } - ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) { + ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { + BRAVE_SITE_SETTINGS_HELPER_CONTENT_SETTINGS_TYPE_FROM_GROUP_NAME for (const auto& entry : kContentSettingsTypeGroupNames) { // Content setting types that aren't represented in the settings UI diff --git a/patches/chrome-browser-ui-webui-theme_source.cc.patch b/patches/chrome-browser-ui-webui-theme_source.cc.patch index 3877c99029726..d8433fb3d1d52 100644 --- a/patches/chrome-browser-ui-webui-theme_source.cc.patch +++ b/patches/chrome-browser-ui-webui-theme_source.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc -index 04e897913a48d9321b20070cb6cffe3bf9fbfd08..0f9de8a808af1d878b70f18d1c8b6bb848e980dc 100644 +index cf3fe5251f7e014cd67c944642bb9255f693c246..99ce3ceb0624fe5cf26d7a7dd0b7ec2b7e60b806 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc -@@ -135,7 +135,7 @@ void ThemeSource::StartDataRequest( +@@ -138,7 +138,7 @@ void ThemeSource::StartDataRequest( int resource_id = -1; if (parsed_path == "current-channel-logo") { switch (chrome::GetChannel()) { @@ -11,7 +11,7 @@ index 04e897913a48d9321b20070cb6cffe3bf9fbfd08..0f9de8a808af1d878b70f18d1c8b6bb8 case version_info::Channel::CANARY: resource_id = IDR_PRODUCT_LOGO_32_CANARY; break; -@@ -157,7 +157,10 @@ void ThemeSource::StartDataRequest( +@@ -160,7 +160,10 @@ void ThemeSource::StartDataRequest( [[fallthrough]]; #endif case version_info::Channel::UNKNOWN: diff --git a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch index 37958f249aa27..e9ec7e2d48096 100644 --- a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch +++ b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -index e039bd8b60d30d294168b17c10aeacc698c25c61..5fcfd8d7e1727e5c7ec33b37e61b7a5727e9ed79 100644 +index c7ebc8c13af6d90c279c1c688d409863a7835965..14501e6d5b55d13f3d3900bcefbbce71285918db 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -@@ -1172,6 +1172,7 @@ base::FilePath GetChromeAppsFolder() { +@@ -1165,6 +1165,7 @@ base::FilePath GetChromeAppsFolder() { if (path.empty()) return path; diff --git a/patches/chrome-chrome_repack_locales.gni.patch b/patches/chrome-chrome_repack_locales.gni.patch index e93194389f3aa..3fd1a79bd80e7 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 064c39ffe307e19e750f178fe73731b331fb9f69..ee4ec1dc63f7888f7d1787fae258a53257d33ad4 100644 +index 2f5fedb03bc6b2b7ff117d13c4a8000feba124f6..7279bd479f70f68fafa7290839d81edc9defbac9 100644 --- a/chrome/chrome_repack_locales.gni +++ b/chrome/chrome_repack_locales.gni @@ -41,6 +41,7 @@ template("chrome_repack_locales") { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 2accc1dbe8e5c..4e84df1676d7a 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,16 +1,16 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 164c034142dfa4f0ad5dc757c1013ab5eb9018dc..e2165e1b8decf28d23e2577604e5db0d316764b3 100644 +index 2d7c5d7155b02d22a85d09830516d812daab5d92..0a644971f9b8333c7fc84d38cce5413ec7938266 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -104,6 +104,7 @@ source_set("channel_info") { - } else if (is_fuchsia) { - sources += [ "channel_info_fuchsia.cc" ] +@@ -103,6 +103,7 @@ source_set("channel_info") { + } else if (is_posix) { + sources += [ "channel_info_posix.cc" ] } + public_deps += [ "//brave/common:channel_info" ] } source_set("ini_parser") { -@@ -277,6 +278,7 @@ static_library("common_lib") { +@@ -279,6 +280,7 @@ static_library("common_lib") { if (enable_ppapi) { public_deps += [ "//ppapi/shared_impl" ] } @@ -18,7 +18,7 @@ index 164c034142dfa4f0ad5dc757c1013ab5eb9018dc..e2165e1b8decf28d23e2577604e5db0d if (enable_extensions) { sources += [ -@@ -544,6 +546,7 @@ static_library("non_code_constants") { +@@ -542,6 +544,7 @@ static_library("non_code_constants") { if (is_win) { sources += [ "chrome_icon_resources_win.h" ] } diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch index 8b4fb375f8953..d2b0866528c00 100644 --- a/patches/chrome-common-extensions-api-developer_private.idl.patch +++ b/patches/chrome-common-extensions-api-developer_private.idl.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl -index 3e049bbf55ca419e27e37a65e2d65746c98cee1f..42e8ae88209515d03369eac8f37951677704e307 100644 +index bdd4092a0a1595f37c1d8a5223a0c1e7882f0dbc..51eaab7969c65799b3631979b4bff199a00143fe 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl -@@ -244,6 +244,7 @@ namespace developerPrivate { +@@ -253,6 +253,7 @@ namespace developerPrivate { DOMString iconUrl; DOMString id; AccessModifier incognitoAccess; diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index 6f88aaf265036..2156e7589d4c5 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index d42941158c6b25cc529e3d5189d3b9cd5b933811..316698c52ed0c7e3bb609d94925e2379f4f2b1d3 100644 +index acab6006542390bfecfcbe3bb7749c836176587c..594c5ef7d5116f99595605edaf8ead72aa66b357 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn @@ -62,6 +62,7 @@ if (build_with_internal_optimization_guide) { @@ -26,7 +26,7 @@ index d42941158c6b25cc529e3d5189d3b9cd5b933811..316698c52ed0c7e3bb609d94925e2379 } strip_binary("strip_libEGL_shlib") { -@@ -268,6 +271,7 @@ copy("common_packaging_files") { +@@ -269,6 +272,7 @@ copy("common_packaging_files") { } sources += [ "//buildtools/third_party/eu-strip/bin/eu-strip" ] @@ -34,7 +34,7 @@ index d42941158c6b25cc529e3d5189d3b9cd5b933811..316698c52ed0c7e3bb609d94925e2379 outputs = [ "$root_out_dir/installer/common/{{source_file_part}}" ] } -@@ -367,6 +371,7 @@ group("installer_deps") { +@@ -376,6 +380,7 @@ group("installer_deps") { "//components/crash/core/app:chrome_crashpad_handler", "//sandbox/linux:chrome_sandbox", ] @@ -42,7 +42,7 @@ index d42941158c6b25cc529e3d5189d3b9cd5b933811..316698c52ed0c7e3bb609d94925e2379 if (bundle_widevine_cdm) { public_deps += [ "//third_party/widevine/cdm" ] } -@@ -421,6 +426,9 @@ group("installer_deps") { +@@ -430,6 +435,9 @@ group("installer_deps") { template("linux_package") { assert(defined(invoker.channel)) channel = invoker.channel @@ -52,9 +52,9 @@ index d42941158c6b25cc529e3d5189d3b9cd5b933811..316698c52ed0c7e3bb609d94925e2379 if (is_chrome_branded) { package = "google-chrome" -@@ -546,3 +554,6 @@ linux_package("beta") { - linux_package("unstable") { - channel = "unstable" +@@ -558,3 +566,6 @@ linux_package("unstable") { + linux_package("canary") { + channel = "canary" } +linux_package("nightly") { + channel = "nightly" diff --git a/patches/chrome-installer-linux-common-installer.include.patch b/patches/chrome-installer-linux-common-installer.include.patch index 052ab3760bf0d..42f30638af9e2 100644 --- a/patches/chrome-installer-linux-common-installer.include.patch +++ b/patches/chrome-installer-linux-common-installer.include.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include -index 0651084d828b41765097b32ca725c5e27050831a..6314c5aff5aa6b5988c857657c82fb29f0c28b27 100644 +index 52489b3dfcd15d6f1b0522c289a2b420bb29fb6a..e89702266a46965a86af535066ce16d4de62b78f 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -75,6 +75,7 @@ process_template() ( @@ -19,7 +19,7 @@ index 0651084d828b41765097b32ca725c5e27050831a..6314c5aff5aa6b5988c857657c82fb29 # ICU data file; Necessary when the GN icu_use_data_file flag is true. install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" -@@ -295,11 +298,13 @@ stage_install_common() { +@@ -295,13 +298,15 @@ stage_install_common() { # app icons local icon_regex=".*product_logo_[0-9]\+\." @@ -30,6 +30,8 @@ index 0651084d828b41765097b32ca725c5e27050831a..6314c5aff5aa6b5988c857657c82fb29 - elif [ "$CHANNEL" = "unstable" ]; then + elif [ "$CHANNEL" = "unstable" -o "$CHANNEL" = "dev" ]; then icon_regex=".*product_logo_[0-9]\+_dev\." + elif [ "$CHANNEL" = "canary" ]; then + icon_regex=".*product_logo_[0-9]\+_canary\." + elif [ "$CHANNEL" = "nightly" ]; then + icon_regex=".*product_logo_[0-9]\+_nightly\." fi diff --git a/patches/chrome-installer-linux-debian-build.sh.patch b/patches/chrome-installer-linux-debian-build.sh.patch index c0ce2c691e2a6..21cd28b24d9a9 100644 --- a/patches/chrome-installer-linux-debian-build.sh.patch +++ b/patches/chrome-installer-linux-debian-build.sh.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh -index 7cd40b9c37cce8370238c3a1b3850d209ad8d4e2..19b35fdcb96d1a235b7ef2ab42cde14d19b92455 100755 +index 851755cbd219dc477d0d4f8c3fdfd997402f9e72..dc0ae090baf2abb7c688c14711169b1de5139832 100755 --- a/chrome/installer/linux/debian/build.sh +++ b/chrome/installer/linux/debian/build.sh @@ -21,7 +21,7 @@ gen_changelog() { @@ -64,10 +64,10 @@ index 7cd40b9c37cce8370238c3a1b3850d209ad8d4e2..19b35fdcb96d1a235b7ef2ab42cde14d ;; + nightly ) + ;; - * ) - echo - echo "ERROR: '$CHANNEL' is not a valid channel type." -@@ -173,6 +177,7 @@ verify_channel() { + # Canary is released twice a day automatically, so no release notes + # attached. + canary ) +@@ -179,6 +183,7 @@ verify_channel() { exit 1 ;; esac @@ -75,7 +75,7 @@ index 7cd40b9c37cce8370238c3a1b3850d209ad8d4e2..19b35fdcb96d1a235b7ef2ab42cde14d } process_opts() { -@@ -252,6 +257,17 @@ fi +@@ -258,6 +263,17 @@ fi eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \ "${OUTPUTDIR}/installer/theme/BRANDING") @@ -93,7 +93,7 @@ index 7cd40b9c37cce8370238c3a1b3850d209ad8d4e2..19b35fdcb96d1a235b7ef2ab42cde14d verify_channel # Some Debian packaging tools want these set. -@@ -262,6 +278,8 @@ export ARCHITECTURE="${ARCHITECTURE}" +@@ -268,6 +284,8 @@ export ARCHITECTURE="${ARCHITECTURE}" DEB_COMMON_DEPS="${OUTPUTDIR}/deb_common.deps" COMMON_DEPS=$(sed ':a;N;$!ba;s/\n/, /g' "${DEB_COMMON_DEPS}") COMMON_PREDEPS="dpkg (>= 1.14.0)" diff --git a/patches/chrome-installer-linux-rpm-build.sh.patch b/patches/chrome-installer-linux-rpm-build.sh.patch index 0f5eb882ea2e7..ec01f03242ff7 100644 --- a/patches/chrome-installer-linux-rpm-build.sh.patch +++ b/patches/chrome-installer-linux-rpm-build.sh.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh -index 3053be4fbf88872a7ae743eed0b13291cb1862e7..7d22ce1cf6e720e35781d1ac459f483b1ab0788d 100755 +index fdc61e7a98647ddce1a762c61ed731f21ab01526..b7459784114e932b3d39955c53bf4db6725bbaea 100755 --- a/chrome/installer/linux/rpm/build.sh +++ b/chrome/installer/linux/rpm/build.sh @@ -15,8 +15,9 @@ gen_spec() { diff --git a/patches/chrome-installer-mac-signing-model.py.patch b/patches/chrome-installer-mac-signing-model.py.patch index 4d44a832350f2..1ae229b73745e 100644 --- a/patches/chrome-installer-mac-signing-model.py.patch +++ b/patches/chrome-installer-mac-signing-model.py.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/mac/signing/model.py b/chrome/installer/mac/signing/model.py -index 3d5ced94d94073e0c56c7c899f7fa1806b224ed2..95d1606ffb51869392dcc94cc6ddf881b0dbda70 100644 +index 8d3e463f4b40e0d7b1884db6af7657afb29b1191..dbdb00525ff74afcb8d49873663c6cba8abf0de3 100644 --- a/chrome/installer/mac/signing/model.py +++ b/chrome/installer/mac/signing/model.py -@@ -415,7 +415,7 @@ class Paths(object): +@@ -420,7 +420,7 @@ class Paths(object): Returns: Path to the packaging directory. """ diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch index a78ab57e47420..3d923165e9562 100644 --- a/patches/chrome-installer-mac-signing-pipeline.py.patch +++ b/patches/chrome-installer-mac-signing-pipeline.py.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/mac/signing/pipeline.py b/chrome/installer/mac/signing/pipeline.py -index 2f6990cb4baae479d61ecdbc1e5f13d973ed722f..ea529400e293276fabb44b76ec7214f37fb4699f 100644 +index 69c86a2dc1c5bbd70daa4e784723df653dcf57d2..56d4db77ea82f406045d7b2063b2b25a4bcb37c4 100644 --- a/chrome/installer/mac/signing/pipeline.py +++ b/chrome/installer/mac/signing/pipeline.py -@@ -692,6 +692,9 @@ def sign_all(orig_paths, +@@ -737,6 +737,9 @@ def sign_all(orig_paths, if not disable_packaging: _package_and_maybe_notarize_distributions(config, distributions, notary_paths) diff --git a/patches/chrome-installer-mini_installer-BUILD.gn.patch b/patches/chrome-installer-mini_installer-BUILD.gn.patch index 0a03b2f5a90e6..9e0522aff4fd9 100644 --- a/patches/chrome-installer-mini_installer-BUILD.gn.patch +++ b/patches/chrome-installer-mini_installer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn -index b94944f6d55272924a363109bd5507c4628ee399..38dac84718877f8764ac67da34be31542375cdcb 100644 +index 17c3d731e269b4ea8b4d315916dcdd86671760d2..a5d4af6df8f4ebf84987e8b98199cb64ec8c0ac8 100644 --- a/chrome/installer/mini_installer/BUILD.gn +++ b/chrome/installer/mini_installer/BUILD.gn @@ -137,7 +137,7 @@ if (enable_uncompressed_archive) { @@ -11,7 +11,7 @@ index b94944f6d55272924a363109bd5507c4628ee399..38dac84718877f8764ac67da34be3154 script = "//chrome/tools/build/win/create_installer_archive.py" release_file = "chrome.release" -@@ -312,6 +312,7 @@ template("generate_mini_installer") { +@@ -313,6 +313,7 @@ template("generate_mini_installer") { no_default_deps = true ldflags += [ "/ENTRY:MainEntryPoint" ] } diff --git a/patches/chrome-installer-mini_installer-configuration.cc.patch b/patches/chrome-installer-mini_installer-configuration.cc.patch index b4ecc8072e971..da4bfac74c52e 100644 --- a/patches/chrome-installer-mini_installer-configuration.cc.patch +++ b/patches/chrome-installer-mini_installer-configuration.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/configuration.cc b/chrome/installer/mini_installer/configuration.cc -index f80ff1cde0f3da238ad0cdce8aa93d931977407b..c33eb8fde3de8313603670c4bd29d80c0397f622 100644 +index 47a1ffce26512ae884ff4f737bd896682bf34065..bfba520884bb59fe3e8c8880ff80afb9d250a864 100644 --- a/chrome/installer/mini_installer/configuration.cc +++ b/chrome/installer/mini_installer/configuration.cc @@ -25,7 +25,11 @@ namespace { diff --git a/patches/chrome-installer-util-BUILD.gn.patch b/patches/chrome-installer-util-BUILD.gn.patch index a58065e41641f..412eaaa0ab61b 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 70270a09f13d2a56902943d7aff9586545da7e8d..9f75a2d1e4fc22e2e00d8775dda05d1f59beadd4 100644 +index cf8f5dfe90afd837a4527cc2260a3281540dd43a..05dbb3a6134835478ce622883e33689d473f6b59 100644 --- a/chrome/installer/util/BUILD.gn +++ b/chrome/installer/util/BUILD.gn -@@ -196,6 +196,7 @@ static_library("with_no_strings") { +@@ -197,6 +197,7 @@ static_library("with_no_strings") { "initial_preferences.h", ] } @@ -10,7 +10,7 @@ index 70270a09f13d2a56902943d7aff9586545da7e8d..9f75a2d1e4fc22e2e00d8775dda05d1f } # Use this version of installer_util to link to the generated strings in .rc -@@ -228,6 +229,7 @@ generate_embedded_i18n("generate_strings") { +@@ -229,6 +230,7 @@ generate_embedded_i18n("generate_strings") { output_file_name_base = "installer_util_strings" branding = branding_path_product diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch index cd3b41f4ba5be..bb23d6815e807 100644 --- a/patches/chrome-installer-util-shell_util.cc.patch +++ b/patches/chrome-installer-util-shell_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc -index 44aa164a7b903aa5218d529632decb7ffba0b65e..71fb7a20b285696f9f51b0029bd65b0175a71754 100644 +index 3db0ccc05894cf4d0a3feff2bb57072b767f3795..a9886d9231dba4ad0af3bf1c1dbf8490fe51ac47 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -365,6 +365,7 @@ void GetChromeProgIdEntries( diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 9d221e0baf50c..d18e3158e2aa5 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 b17c8a5f9f9c3ebd9dd80c0948a3c24d73ae8602..9ec9a3149c03dcef475de46c3b276fb43db03345 100644 +index 857247dd93f75870018a6ac2058828e935fe9eb9..03e8397393f02bbb4dc1e10b72533609d7d61bac 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -242,6 +242,7 @@ static_library("renderer") { diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index a49ea0f391a8b..79236ddbc88e7 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 620f0ebad27d33315ccb4e73f323f844daa18653..62a57524aaf99b0cf89b0ad5fe2321fff8be881a 100644 +index 60bc3751cb325c8e3b7383f2fa47454885c7dbbf..f74883d41deb8ff219445c9faf43c69fd62fd9ca 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -604,7 +604,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -603,7 +603,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = @@ -11,7 +11,7 @@ index 620f0ebad27d33315ccb4e73f323f844daa18653..62a57524aaf99b0cf89b0ad5fe2321ff render_frame, should_allow_for_content_settings, std::move(content_settings_delegate)); if (chrome_observer_.get()) { -@@ -787,6 +787,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -786,6 +786,7 @@ void ChromeContentRendererClient::RenderFrameCreated( #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) MultilineDetector::InstallIfNecessary(render_frame); #endif diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 3239dc2cbd53c..f332aa2817cf0 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 203f208d113b07269ddcb6645e70477b866d0c8c..21b98eb479dd4779f70e43b0e4311d32356bcad2 100644 +index a51e962815d880b739e500010602c3c6529d6653..924317a31db65e5aea2ca2e09ed155dd439f0a94 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -491,6 +491,7 @@ static_library("test_support") { +@@ -501,6 +501,7 @@ static_library("test_support") { "//ui/gl", ] diff --git a/patches/chrome-tools-build-mac-infoplist_strings_util.cc.patch b/patches/chrome-tools-build-mac-infoplist_strings_util.cc.patch index c969a3f3e4ec6..a443086973cd0 100644 --- a/patches/chrome-tools-build-mac-infoplist_strings_util.cc.patch +++ b/patches/chrome-tools-build-mac-infoplist_strings_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/tools/build/mac/infoplist_strings_util.cc b/chrome/tools/build/mac/infoplist_strings_util.cc -index e1309ba1589bd0a8eb0712c109a42d8820affcf2..d5db7a62242416ee4365119671fc6eb41297160d 100644 +index 509af8ce0e1e4d9a44c724bc63873c8e3c662c32..87caf0c071abb0e430fc39a0420a1606cefdbb18 100644 --- a/chrome/tools/build/mac/infoplist_strings_util.cc +++ b/chrome/tools/build/mac/infoplist_strings_util.cc -@@ -151,6 +151,7 @@ int main(int argc, char* const argv[]) { +@@ -150,6 +150,7 @@ int main(int argc, char* const argv[]) { // Fetch the strings. std::string name = LoadStringFromDataPack(branded_data_pack.get(), cur_lang, name_id, name_id_str); diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index 733b38b9ec7cb..0dd54e6cf13cc 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 f3d4c0128ee3383d683b0e70cfbe9b9285aa33bf..c96c7bbd69efe42a39a89485287ea18183731327 100644 +index d387c0d6d6eba504ae90528a247aa96f93759e5d..47d85c14751f7f7c249e21fc77fd31803101fafd 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn -@@ -72,6 +72,8 @@ static_library("utility") { +@@ -76,6 +76,8 @@ static_library("utility") { "//ui/base:buildflags", ] 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 d0d3a86a29543..ee9ad1a5f3831 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 28a8f980170c5a36d86f74c6e443ab1fd7486b72..458679e972e1413e66a927f7caf5a1d8a3a224bb 100644 +index cd36af7801b56f82957648d9332812b072532377..f102c2bcc83937199ee52e1bce6b981cfd877f59 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 -@@ -554,7 +554,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -560,7 +560,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment if (queryHasChanged) getInfoForOrigins(); return true; } 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 cb9e38b221aaa..05053da5d73c3 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,8 +1,8 @@ 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 c9ebd4aaef5a9b8be73c467e604f715c8badff5f..095f1b61bffabf5a9e5c1c53aa271d1b18652347 100644 +index 207686bf8c566eb270123e157bfa2acfa4b86ed8..83bb7e0f4d20cc67f402c31f222aac4cf48bdcf9 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml -@@ -70,7 +70,7 @@ found in the LICENSE file. +@@ -67,7 +67,7 @@ found in the LICENSE file. 48dp diff --git a/patches/components-component_updater-component_updater_service.h.patch b/patches/components-component_updater-component_updater_service.h.patch index eeb9bb2765bad..51c437cd92155 100644 --- a/patches/components-component_updater-component_updater_service.h.patch +++ b/patches/components-component_updater-component_updater_service.h.patch @@ -1,16 +1,16 @@ diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h -index fbc40276232f303c4e7acccc23705175691b593e..97748b7fa68c3fd6c425571f00c4334c6b121f90 100644 +index f71358e75f4ceec422ad67ced65dd6e982d1247b..18dba00532bec1df19ec023977d8e84cd480916f 100644 --- a/components/component_updater/component_updater_service.h +++ b/components/component_updater/component_updater_service.h -@@ -203,6 +203,7 @@ class ComponentUpdateService { +@@ -205,6 +205,7 @@ class ComponentUpdateService { friend class screen_ai::ScreenAIDownloaderNonChromeOS; friend class speech::SodaInstallerImpl; friend class ::ComponentsHandler; + BRAVE_COMPONENT_UPDATER_SERVICE_H_ FRIEND_TEST_ALL_PREFIXES(ComponentInstallerTest, RegisterComponent); - }; - -@@ -216,6 +217,7 @@ class OnDemandUpdater { + FRIEND_TEST_ALL_PREFIXES(ComponentUpdaterTest, ComponentDetails); + FRIEND_TEST_ALL_PREFIXES(ComponentUpdaterTest, UpdatesDisabled); +@@ -220,6 +221,7 @@ class OnDemandUpdater { enum class Priority { BACKGROUND = 0, FOREGROUND = 1 }; virtual ~OnDemandUpdater() = default; 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 cac302a26179a..a8bf1eada1081 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,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index 1a296b5070d31bc0f6ac6d8962786676ebc5b834..a697a72b3a6d9c4d46e29a44b9647e6255c8da5c 100644 +index 995562a826e576510e252b79f7dd6409f6c49114..98210db0990d47acebe74ee2bec45b23b8e79feb 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -815,6 +815,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -821,6 +821,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index 1a296b5070d31bc0f6ac6d8962786676ebc5b834..a697a72b3a6d9c4d46e29a44b9647e62 content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION || content_type == ContentSettingsType::NOTIFICATIONS) { -@@ -841,6 +842,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -847,6 +848,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::MEDIASTREAM_CAMERA && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/components-content_settings-core-browser-BUILD.gn.patch b/patches/components-content_settings-core-browser-BUILD.gn.patch index cf8d2dc9acd74..e91528f053922 100644 --- a/patches/components-content_settings-core-browser-BUILD.gn.patch +++ b/patches/components-content_settings-core-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn -index 217449c1fa8888f32086dcc53db5a45d871c9655..9e243ec9ec2950d4e4511711c8bf11227132591d 100644 +index 31333abdfe47a904df53190311cdca6fb2319680..ca588f8165798d45d77105ee68b4b9ee32760e58 100644 --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn @@ -85,6 +85,7 @@ static_library("browser") { 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 9275b42f02959..f8e87b2c79245 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 85637641f1231ff4a0c99b956643b3e0df5851e5..e7328aba6d7845123ecce3ba30d38fa8ea016c19 100644 +index 6385481208be786b1c4a59563e2dcfa211c3d19e..4e31088b26707599490963377075286ed4eb5741 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -776,6 +776,7 @@ void ContentSettingsRegistry::Init() { +@@ -779,6 +779,7 @@ void ContentSettingsRegistry::Init() { WebsiteSettingsRegistry::PLATFORM_ANDROID, ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); diff --git a/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch b/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch index 03d442853ae3a..0b43335d0016f 100644 --- a/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc -index 7bdb214ccca5756600c307aedd449180eeffb852..cea7d56cdd91c3009355c56323c9debcfad50429 100644 +index ad6118ed676e31326078fd86d016517a98dcb1d2..cc97115fcdf6211865e0082d013b357bb87edd18 100644 --- a/components/content_settings/core/browser/content_settings_uma_util.cc +++ b/components/content_settings/core/browser/content_settings_uma_util.cc -@@ -139,6 +139,7 @@ constexpr auto kHistogramValue = base::MakeFixedFlatMap& obj) { CHECK(permission_prompt_); @@ -10,7 +10,7 @@ index 5db5ebe93e3cce8166b349c21df3bd8f248f5802..04103d45ffa3a9dfe4cac05912271f75 permission_prompt_->Accept(); } -@@ -191,6 +192,7 @@ void PermissionDialogDelegate::AcceptThisTime( +@@ -198,6 +199,7 @@ void PermissionDialogDelegate::AcceptThisTime( void PermissionDialogDelegate::Cancel(JNIEnv* env, const JavaParamRef& obj) { CHECK(permission_prompt_); diff --git a/patches/components-permissions-permission_context_base.h.patch b/patches/components-permissions-permission_context_base.h.patch index 83281ce3a5c69..e3a3b488d53ff 100644 --- a/patches/components-permissions-permission_context_base.h.patch +++ b/patches/components-permissions-permission_context_base.h.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h -index 48eab4c32f150295fd2cb2e5364e7419de0dc6d6..025c5198eda8c9ae41efdc1410d5c403a9a7bb9f 100644 +index 72a307ee4d213faf8611d06442f8688cd93513bb..aae95c86a89814a6aae4dd54b9dcee4c54e20dc7 100644 --- a/components/permissions/permission_context_base.h +++ b/components/permissions/permission_context_base.h -@@ -140,6 +140,7 @@ class PermissionContextBase : public content_settings::Observer { +@@ -146,6 +146,7 @@ class PermissionContextBase : public content_settings::Observer { return content_settings_type_; } diff --git a/patches/components-permissions-permission_manager.cc.patch b/patches/components-permissions-permission_manager.cc.patch index ecef8e74e085e..5e9c522883e4a 100644 --- a/patches/components-permissions-permission_manager.cc.patch +++ b/patches/components-permissions-permission_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_manager.cc b/components/permissions/permission_manager.cc -index c3b6343f8326b11a0d131d3c2d69cfe4a057271b..0a604cd5e94294335996e069676a86835475b7ed 100644 +index 7893297957fc8fa9b00dfb77f6d5964c8dcbf9b4..2ad4bbbf0b7311cb992867ce83107c2670e6d8d2 100644 --- a/components/permissions/permission_manager.cc +++ b/components/permissions/permission_manager.cc -@@ -309,6 +309,7 @@ void PermissionManager::RequestPermissionsFromCurrentDocument( +@@ -310,6 +310,7 @@ void PermissionManager::RequestPermissionsFromCurrentDocument( base::OnceCallback&)> permission_status_callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -10,7 +10,7 @@ index c3b6343f8326b11a0d131d3c2d69cfe4a057271b..0a604cd5e94294335996e069676a8683 RequestPermissionsInternal(render_frame_host, request_description, std::move(permission_status_callback)); } -@@ -356,6 +357,7 @@ PermissionManager::GetPermissionResultForCurrentDocument( +@@ -358,6 +359,7 @@ PermissionManager::GetPermissionResultForCurrentDocument( PermissionUtil::PermissionTypeToContentSettingType(permission); const GURL requesting_origin = diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index 0e5dbbbfbfe04..c5cabd8d109e5 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index e48bc182ef8fc0a2d728de87b28d0d221ac971ed..5cf79e67682587d35d357de33a7d8986f4be88c0 100644 +index 028a47c6f23892e7fc1e33f742717d379543c3be..3e256e549eb7747113fb8c76cfdbc3cffc3bb558 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc -@@ -142,6 +142,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { +@@ -150,6 +150,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { #endif case RequestType::kIdentityProvider: return RequestTypeForUma::PERMISSION_IDENTITY_PROVIDER; @@ -10,3 +10,11 @@ index e48bc182ef8fc0a2d728de87b28d0d221ac971ed..5cf79e67682587d35d357de33a7d8986 } } +@@ -175,6 +176,7 @@ RequestTypeForUma GetUmaValueForRequests( + return RequestTypeForUma::MULTIPLE_KEYBOARD_AND_POINTER_LOCK; + } + #endif ++ BRAVE_GET_UMA_VALUE_FOR_REQUESTS + return RequestTypeForUma::UNKNOWN; + } + diff --git a/patches/components-permissions-permission_util.cc.patch b/patches/components-permissions-permission_util.cc.patch index f6b93af6f502a..351f889f1301a 100644 --- a/patches/components-permissions-permission_util.cc.patch +++ b/patches/components-permissions-permission_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc -index 04c9404e0c8e6a3cf9caa19e9e3a18150c5c70ca..6444f47c3cba5d857cea6326f356741448536a50 100644 +index 190bc0fea71ffce81a0294e49518e88d2e87c8ad..41c9aa60479bc88c363ec15cdc4f53ac0ffd7f1d 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc -@@ -353,6 +353,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingTypeSafe( +@@ -356,6 +356,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingTypeSafe( return ContentSettingsType::POINTER_LOCK; case PermissionType::NUM: break; diff --git a/patches/components-permissions-request_type.cc.patch b/patches/components-permissions-request_type.cc.patch index f00ce696b83e2..6b34d5b8ebda3 100644 --- a/patches/components-permissions-request_type.cc.patch +++ b/patches/components-permissions-request_type.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc -index 207cef85b776e309aeb7f3dd96aef7b12e98b042..d39912f7b435f232e47293abf709fd6ed7ba7035 100644 +index 0782e4cafa914ea236e53a1647f5232fadc8e325..2a1cebf71a409839fb5b5876316fec6c1f6fc0da 100644 --- a/components/permissions/request_type.cc +++ b/components/permissions/request_type.cc -@@ -447,6 +447,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { +@@ -457,6 +457,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { #endif case permissions::RequestType::kIdentityProvider: return "identity_provider"; diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index 5ca70d45835d0..5896ed64bc535 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,8 +1,8 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index aef54cfd633ebb295f3bab800782ae31e38886bb..ea915593957f20a547fd7cf9494154516e176d6a 100755 +index be1553785d5b53b05e218c18acf980f59c89fa2a..8fdba130d0b047827cd0742185fdf610c4fb2f0c 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py -@@ -1654,5 +1654,6 @@ def _WriteAppRestrictions(policies, policy_atomic_groups, target_platform, f, +@@ -1668,5 +1668,6 @@ def _WriteAppRestrictions(policies, policy_atomic_groups, target_platform, f, f.write('') diff --git a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch index a8abd8c7da0da..d79875bceed79 100644 --- a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch +++ b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc -index 9a3609515b39326cc4ae81d4fb48cb61457f394b..0175e44af03b744a8e3f58fa99bd19e75601427a 100644 +index 13d3adea7c15a48c4b7e37bc1a456803b9dee8ca..79fe00f3e1c57a0f1ee8bcc65c9486906685f64b 100644 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc @@ -101,6 +101,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch index 1e86248fef86b..6fb0fbe123a4e 100644 --- a/patches/components-search_engines-BUILD.gn.patch +++ b/patches/components-search_engines-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn -index 5890767b1dff3c5396e2affafca800a3119023fb..56a027c0a89888930d006b378fb93e546a19ceb7 100644 +index 92423a8178c0faa37716260b9932d70062f21bf0..fed6139423a57565f445652dd10a58d84185f17a 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn -@@ -250,6 +250,7 @@ json_to_struct("prepopulated_engines") { +@@ -248,6 +248,7 @@ json_to_struct("prepopulated_engines") { schema_file = "prepopulated_engines_schema.json" namespace = "TemplateURLPrepopulateData" deps = [ ":search_engine_type" ] diff --git a/patches/components-search_engines-prepopulated_engines.json.patch b/patches/components-search_engines-prepopulated_engines.json.patch index 653b90240c4ef..32f0b5e53afe4 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 90964af3f88bcb9380e843e2bf17f899377f09f4..f101dba303aec256b921870ccf783ed6ab3517c9 100644 +index 91539be7a0e836f19132d6828f52e52cc1c7ada5..729ce638317eb5c2acd5da8abc4b9dba7b2aa014 100644 --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json @@ -102,17 +102,6 @@ diff --git a/patches/components-signin-internal-identity_manager-BUILD.gn.patch b/patches/components-signin-internal-identity_manager-BUILD.gn.patch index be6640478742e..e38f089ce9b8d 100644 --- a/patches/components-signin-internal-identity_manager-BUILD.gn.patch +++ b/patches/components-signin-internal-identity_manager-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/signin/internal/identity_manager/BUILD.gn b/components/signin/internal/identity_manager/BUILD.gn -index 9ba459016f66ae747edd66fb74892186b75462b0..a1402dd601cf474442f04828bf3f4d3bb8c78c5b 100644 +index 405b68bd327d1ceaadac89eca3ecd09e882df60d..3c3e1ffd95878e9ec58e734ba7de9e255cc14f1c 100644 --- a/components/signin/internal/identity_manager/BUILD.gn +++ b/components/signin/internal/identity_manager/BUILD.gn @@ -142,6 +142,7 @@ source_set("identity_manager") { diff --git a/patches/components-strings-BUILD.gn.patch b/patches/components-strings-BUILD.gn.patch index 0011f0e044253..3e3661255278e 100644 --- a/patches/components-strings-BUILD.gn.patch +++ b/patches/components-strings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn -index e889d5a42a3d0142837c1b3b30d9f03adafa937f..b03f0777022837c5dbfa30e3da38b781766cfe82 100644 +index dd16718545aa8c984db8c5178d884f5470948604..3e6c7f2af81f95401c08ce71cd48b2d72b9df026 100644 --- a/components/strings/BUILD.gn +++ b/components/strings/BUILD.gn -@@ -52,6 +52,7 @@ grit("components_strings") { +@@ -53,6 +53,7 @@ grit("components_strings") { if (is_android) { outputs += android_components_strings_java_resources } diff --git a/patches/components-sync-engine-model_type_worker.h.patch b/patches/components-sync-engine-model_type_worker.h.patch index cfe44dd61dfc8..8f2711a0c2b62 100644 --- a/patches/components-sync-engine-model_type_worker.h.patch +++ b/patches/components-sync-engine-model_type_worker.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/model_type_worker.h b/components/sync/engine/model_type_worker.h -index d14aa2e11bddeadf0b5e8a9f513f0fb83a6f0257..eac1e0e21089961d415114aec7ded9beb8310766 100644 +index ca3a753b375b2142808e08cd2f124c9ac77cb58c..a450530ece682a9f72b9ed1fe1bd7bef2ab9b9d7 100644 --- a/components/sync/engine/model_type_worker.h +++ b/components/sync/engine/model_type_worker.h -@@ -203,6 +203,7 @@ class ModelTypeWorker : public UpdateHandler, +@@ -207,6 +207,7 @@ class ModelTypeWorker : public UpdateHandler, static constexpr size_t kMaxPendingInvalidations = 10u; diff --git a/patches/components-sync-engine-sync_scheduler_impl.cc.patch b/patches/components-sync-engine-sync_scheduler_impl.cc.patch index fda38260aff1a..9ae612c4acbf8 100644 --- a/patches/components-sync-engine-sync_scheduler_impl.cc.patch +++ b/patches/components-sync-engine-sync_scheduler_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/sync_scheduler_impl.cc b/components/sync/engine/sync_scheduler_impl.cc -index 6d2efe6e577ff6a40c4587a26077929a1cecf467..2d39b6366582c0327b3f3109d30bc42fe4142181 100644 +index 2533d161a1a210cd27719fdd02e97585493bca13..3d48ac96a9b86355c5ad321af30264f3cdfe76e0 100644 --- a/components/sync/engine/sync_scheduler_impl.cc +++ b/components/sync/engine/sync_scheduler_impl.cc -@@ -506,6 +506,7 @@ void SyncSchedulerImpl::HandleFailure( +@@ -502,6 +502,7 @@ void SyncSchedulerImpl::HandleFailure( SDVLOG(2) << "Sync cycle failed. Will back off for " << wait_interval_->length.InMilliseconds() << "ms."; } diff --git a/patches/components-sync-protocol-device_info_specifics.proto.patch b/patches/components-sync-protocol-device_info_specifics.proto.patch index 11da99e4f9633..a7d982fe6766c 100644 --- a/patches/components-sync-protocol-device_info_specifics.proto.patch +++ b/patches/components-sync-protocol-device_info_specifics.proto.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/device_info_specifics.proto b/components/sync/protocol/device_info_specifics.proto -index 19f5e12ec2155d5d9c24f6f9d0c6ce327c632245..68a09002c0ef8afe863ab9c4f0c5b066582b55be 100644 +index 317cc110f28c4b2d73916e8c035a7a7447427584..5e87249915c83999590ae4c2ef55a59d1205246f 100644 --- a/components/sync/protocol/device_info_specifics.proto +++ b/components/sync/protocol/device_info_specifics.proto @@ -17,6 +17,7 @@ option optimize_for = LITE_RUNTIME; diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 834382ecc53a7..33fbdcd214cf0 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 7ae00ab33d39404b0e2f71a12ed1959834d9b125..51b24408680d08d27427524331ba0b0ff65ba2b3 100644 +index 8a011849f7568098df1c264e8882bf90cd8e97f7..fa5499972ed3e35f1836b35879f0dd103373f075 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -544,6 +544,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -584,6 +584,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index 7ae00ab33d39404b0e2f71a12ed1959834d9b125..51b24408680d08d27427524331ba0b0f VISIT(sharing_fields); VISIT(invalidation_fields); VISIT(paask_fields); -@@ -558,6 +559,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { +@@ -598,6 +599,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(send_tab_to_self_receiving_enabled); } diff --git a/patches/components-sync-protocol-protocol_sources.gni.patch b/patches/components-sync-protocol-protocol_sources.gni.patch index 54301b5f37dcb..0276516adc43e 100644 --- a/patches/components-sync-protocol-protocol_sources.gni.patch +++ b/patches/components-sync-protocol-protocol_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni -index 37991bc5aff7286ce021bdd22bcded4d694fe767..0d9fb371b1ccec0993a77680f07907d239ec68b9 100644 +index 93d20f9cb3773c8174f351e8d71f05580928c431..060ad1cc74be6f039d2e5eb7a6360b2126c90fc9 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni -@@ -79,3 +79,4 @@ sync_protocol_sources = [ +@@ -81,3 +81,4 @@ sync_protocol_sources = [ "wifi_configuration_specifics.proto", "workspace_desk_specifics.proto", ] diff --git a/patches/components-sync-service-BUILD.gn.patch b/patches/components-sync-service-BUILD.gn.patch index 7977b130e76d8..db42e233a7428 100644 --- a/patches/components-sync-service-BUILD.gn.patch +++ b/patches/components-sync-service-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/service/BUILD.gn b/components/sync/service/BUILD.gn -index 5e829920b05223507dc319c4aa6c49ac7c6fa26d..05e5ca6942b5d2b0e0a39f676a417481591e406a 100644 +index 4e0bed5e3ae170ef90cdd185bc4db0b46bd371bf..1c545f7e5f02348494c74f6e623c66b5ed72b8c5 100644 --- a/components/sync/service/BUILD.gn +++ b/components/sync/service/BUILD.gn -@@ -116,4 +116,5 @@ static_library("service") { +@@ -118,4 +118,5 @@ static_library("service") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patches/components-sync-service-sync_service_impl.h.patch b/patches/components-sync-service-sync_service_impl.h.patch index 00c47c14e6428..607ae6fb2f877 100644 --- a/patches/components-sync-service-sync_service_impl.h.patch +++ b/patches/components-sync-service-sync_service_impl.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/service/sync_service_impl.h b/components/sync/service/sync_service_impl.h -index a3b39667cf27b8ba9ac5fd35444570036abd3bbb..d7433958e1de7c85711c9489e3d0747e86f3798a 100644 +index e5527c1d9c33b85726ff8d09ac32d2d76de4a787..8a818b5c107470812dde9e0203ea8b7d02f60620 100644 --- a/components/sync/service/sync_service_impl.h +++ b/components/sync/service/sync_service_impl.h @@ -262,6 +262,7 @@ class SyncServiceImpl : public SyncService, diff --git a/patches/components-sync_device_info-device_info.h.patch b/patches/components-sync_device_info-device_info.h.patch index dcfc3de247bb6..a1ef733cc7bae 100644 --- a/patches/components-sync_device_info-device_info.h.patch +++ b/patches/components-sync_device_info-device_info.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync_device_info/device_info.h b/components/sync_device_info/device_info.h -index f97947a6cb5183af03450db40ae3c56df39c1a3d..2a1ff24a4f9e7ebdee573a861eeddbfb303c2816 100644 +index ac2c44fae3c3054b7bbc23f9e63897c909b412c9..d370b3b1a2c013dfa1d81aa87e54bd3e7e6f5df6 100644 --- a/components/sync_device_info/device_info.h +++ b/components/sync_device_info/device_info.h @@ -145,6 +145,7 @@ class DeviceInfo { diff --git a/patches/components-translate-content-renderer-translate_agent.cc.patch b/patches/components-translate-content-renderer-translate_agent.cc.patch index 8bc3cf6accdef..b3515dd90c5fd 100644 --- a/patches/components-translate-content-renderer-translate_agent.cc.patch +++ b/patches/components-translate-content-renderer-translate_agent.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/translate/content/renderer/translate_agent.cc b/components/translate/content/renderer/translate_agent.cc -index ce926fc76534225f2206b0d6c894e7d2598bb82c..9e6f0a3c658adcc1a10caabfd3279bdd8bbc5b3d 100644 +index 2f398b474556af02791cd54bc841b277b3627ab0..0b14e9a9038a82a2a221534446b869f5b2312b21 100644 --- a/components/translate/content/renderer/translate_agent.cc +++ b/components/translate/content/renderer/translate_agent.cc @@ -57,7 +57,7 @@ const int kTranslateInitCheckDelayMs = 150; diff --git a/patches/components-variations-variations_seed_store.cc.patch b/patches/components-variations-variations_seed_store.cc.patch index dd8392aa26cad..c54ea42b32b32 100644 --- a/patches/components-variations-variations_seed_store.cc.patch +++ b/patches/components-variations-variations_seed_store.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/variations/variations_seed_store.cc b/components/variations/variations_seed_store.cc -index e74821e80af91b1c01bcee49f2f7d575745f37e3..12afe509850676ccd430cf154da71ba1b39bb546 100644 +index 76888dffe4f2b0a3baa1a1700a818a79c0aecdc2..227e2743d812c8a74d44499a3749f863dff8859a 100644 --- a/components/variations/variations_seed_store.cc +++ b/components/variations/variations_seed_store.cc @@ -52,6 +52,7 @@ namespace { diff --git a/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch b/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch index c092e7aa72f42..453181e1cd377 100644 --- a/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch +++ b/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -index 0c9e9a86a024232891ce477b07af60643f247fff..0c640d56e6fa0d0649a8031e3d6c9497824d9935 100644 +index 1cb6eb60ef419ff7c2ff104049a3a80e3854c4e9..8039159dbad3dfc7c10b9accff73a48303d2ebbd 100644 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -@@ -1944,6 +1944,7 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -1965,6 +1965,7 @@ void ExtractUnderlines(NSAttributedString* string, } - (id)accessibilityParent { diff --git a/patches/content-browser-browsing_data-browsing_data_filter_builder_impl.cc.patch b/patches/content-browser-browsing_data-browsing_data_filter_builder_impl.cc.patch index b991671781870..a4d6db330c255 100644 --- a/patches/content-browser-browsing_data-browsing_data_filter_builder_impl.cc.patch +++ b/patches/content-browser-browsing_data-browsing_data_filter_builder_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/browsing_data/browsing_data_filter_builder_impl.cc b/content/browser/browsing_data/browsing_data_filter_builder_impl.cc -index e20ab2696365617b30803eb54f563c068f8abe35..01f38bafc638fd3d05d783d24ee69f85fb2cd128 100644 +index 7ae661a76153b6ef306e0006f38259e1d9417087..b2e3248fe23dd2929ac93dbbfac707f2dfd2394b 100644 --- a/content/browser/browsing_data/browsing_data_filter_builder_impl.cc +++ b/content/browser/browsing_data/browsing_data_filter_builder_impl.cc @@ -58,6 +58,7 @@ bool MatchesStorageKey(const std::set& origins, 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 3833bbf9f4cbe..6168f0776d758 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 fad24f08bb02aa102f574bd0344c859cf506a48c..07533c3bdbf9a3fef72ef2018d21e37d3970bef7 100644 +index a420a2b522e12406962307d352bb7507ca7a0268..1555bf945dd2a23668252c5554f501f756466f2d 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3629,16 +3629,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3627,16 +3627,17 @@ base::WeakPtr 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 0189e2f7aa821..156144cbc3798 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 5b2a0a561b948e3e1b87fac9887a9cd034492cb0..55dfcd5d6c77a93370d3ea11ef82668f22284028 100644 +index e3dd21898b85eb92b063725aef0578359e2f91ab..3ad7181b3840db032c02cccb609147bb41fcc2fb 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -3397,6 +3397,7 @@ void NavigationRequest::OnRequestRedirected( diff --git a/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch b/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch index 12869c735f9bb..7595d84e5e1ed 100644 --- a/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch +++ b/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 3a2e1ab68fa5f7fd6de4aa2697c90cd2aaf4accd..35c21ad886899645f026cdaabd3c1b1780aae6ab 100644 +index 3821695f6561ff8e00d861ce49ea7ff27f5fcd7e..35130de6db112608fc4d88f2ff51565bfa8728ce 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -4231,6 +4231,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -4341,6 +4341,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( candidate_site_for_cookies = net::SiteForCookies(top_frame_site); } @@ -10,7 +10,7 @@ index 3a2e1ab68fa5f7fd6de4aa2697c90cd2aaf4accd..35c21ad886899645f026cdaabd3c1b17 std::optional nonce = ComputeNonce(is_credentialless, fenced_frame_nonce_for_navigation); return net::IsolationInfo::Create(request_type, top_frame_origin, -@@ -4241,6 +4242,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -4351,6 +4352,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( std::optional RenderFrameHostImpl::ComputeNonce( bool is_credentialless, std::optional fenced_frame_nonce_for_navigation) { @@ -18,7 +18,7 @@ index 3a2e1ab68fa5f7fd6de4aa2697c90cd2aaf4accd..35c21ad886899645f026cdaabd3c1b17 // If it's a credentialless frame tree, use its nonce even if it's within a // fenced frame tree to maintain the guarantee that a credentialless frame // tree has a unique nonce. -@@ -8453,6 +8455,8 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -8604,6 +8606,8 @@ void RenderFrameHostImpl::CreateNewWindow( dom_storage_context, params->session_storage_namespace_id); } diff --git a/patches/content-browser-web_contents-web_contents_impl.cc.patch b/patches/content-browser-web_contents-web_contents_impl.cc.patch index 9a865ff6b4a1b..8a596fb254ad1 100644 --- a/patches/content-browser-web_contents-web_contents_impl.cc.patch +++ b/patches/content-browser-web_contents-web_contents_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index f1a5a2e1f4d66c3c212e864370db7c60adad0bb2..d2766452dc24f5d62493c5c9239b2b3fa94a7774 100644 +index d08ad3ae25ab39a7c3a455271f26e339a0a15721..0333205051f47ba73ca5603173ce2d491199fd07 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4631,7 +4631,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4679,7 +4679,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( // Save the window for later if we're not suppressing the opener (since it // will be shown immediately). diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 3e6cc97d545be..7538c22d101ca 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 f50b1f7c18ef9802b6bdfac09c30a0a42cfbcd4c..b4541676d5abaf2b78a6e6cc6390b47a762e4ae0 100644 +index 066bea940f2889351e6cc151cfc10da3a7e86f6a..bf8142ae29f3a5aad7f56cfc872534bf0b6336f5 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -69,6 +69,7 @@ source_set("common") { diff --git a/patches/content-common-frame.mojom.patch b/patches/content-common-frame.mojom.patch index 5c223a85f03de..ba9ad3706ddd3 100644 --- a/patches/content-common-frame.mojom.patch +++ b/patches/content-common-frame.mojom.patch @@ -1,5 +1,5 @@ diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index 268f150c1cc987ea020192a86ab886ed206a0064..1a3c8fcfec655efbd90103aababf641d7a53a9a0 100644 +index d72ce84100f584832b22058648e7f21ae8325236..ba0ae4eeddf51048ad301a59a90cb2b672046fad 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom @@ -566,6 +566,7 @@ struct CreateNewWindowParams { diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 214d92a2edea1..1c940ded4f9fd 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 0f373870e71628e0b655763c91a0fdd4cf5ff8e0..67ac1fc6d998e2bd69760239ac04bc4fa4bdbaaf 100644 +index c8113196eeb34e2067b83297577eed4464e8059c..b8407ed11019ba883679c4a247d3be0a865c1117 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4744,6 +4744,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4749,6 +4749,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 7e02d081dabe0..16cfc85caf2e0 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 d38d1cbd515bec8e427340f7f42df32b1c17381b..24a21e55de5ba6e9ff51ded98706b9fe67a8d500 100644 +index da4a8410a6c5d2eb7e35eb10b1629dca8d4011e1..0c8fbbb55d3b9562960aa926f0782293a118de88 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -886,6 +886,7 @@ void RenderThreadImpl::InitializeRenderer( +@@ -887,6 +887,7 @@ void RenderThreadImpl::InitializeRenderer( } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/crypto-unexportable_key_metrics.cc.patch b/patches/crypto-unexportable_key_metrics.cc.patch index aff15fdad7778..8a6375f3f1497 100644 --- a/patches/crypto-unexportable_key_metrics.cc.patch +++ b/patches/crypto-unexportable_key_metrics.cc.patch @@ -1,5 +1,5 @@ diff --git a/crypto/unexportable_key_metrics.cc b/crypto/unexportable_key_metrics.cc -index e3161335a9764c8a8bbc4c16e4eff3426d899250..64634b8af62af7f59fe40c0db2af681f2d0feb10 100644 +index c7a37d4a2f159a61c06e2be00f8908beb3de1b83..772a825f4d3025d127212d916eb01a0e816a92e8 100644 --- a/crypto/unexportable_key_metrics.cc +++ b/crypto/unexportable_key_metrics.cc @@ -30,6 +30,7 @@ enum class KeyType { diff --git a/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch b/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch index 3639b2e1b29f7..21eb45af0081c 100644 --- a/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch +++ b/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/extension_web_request_event_router.cc b/extensions/browser/api/web_request/extension_web_request_event_router.cc -index a7b4bb8a0e8affd0c1219bf3223c248841f9b4de..8a7e791008c20d710d2dc059b9e167e21ef607dd 100644 +index 7e124531a4046307770d73330ea7a407ec10c3cc..6ca83b42585f9c96a9d4fd7eb4148ce4dc1102f7 100644 --- a/extensions/browser/api/web_request/extension_web_request_event_router.cc +++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc -@@ -1251,6 +1251,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, +@@ -1291,6 +1291,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, *request)) { return AuthRequiredResponse::AUTH_REQUIRED_RESPONSE_NO_ACTION; } diff --git a/patches/extensions-browser-extension_creator.cc.patch b/patches/extensions-browser-extension_creator.cc.patch index 5d266278c450e..4877712ed7b0c 100644 --- a/patches/extensions-browser-extension_creator.cc.patch +++ b/patches/extensions-browser-extension_creator.cc.patch @@ -1,5 +1,5 @@ diff --git a/extensions/browser/extension_creator.cc b/extensions/browser/extension_creator.cc -index ee770dc8d589a9ce95e032a47cfbd3e4b03a7cd7..257076d225e30014f3b035803efd8610bf3ffb9a 100644 +index d6664dd7fa06505ee1ee936dd99ccd0210d53637..af22b6306565a631d6672198dd591c0c9e0e6590 100644 --- a/extensions/browser/extension_creator.cc +++ b/extensions/browser/extension_creator.cc @@ -211,7 +211,7 @@ bool ExtensionCreator::CreateCrx( diff --git a/patches/google_apis-google_api_keys-inc.cc.patch b/patches/google_apis-google_api_keys-inc.cc.patch index acda081bf6621..76c42576c08a6 100644 --- a/patches/google_apis-google_api_keys-inc.cc.patch +++ b/patches/google_apis-google_api_keys-inc.cc.patch @@ -1,8 +1,8 @@ diff --git a/google_apis/google_api_keys-inc.cc b/google_apis/google_api_keys-inc.cc -index 49c396d69d17236560751307e01dc79ea9693b3a..686ec82034a7cef46ce9faa07ea0df40663d3be2 100644 +index 4d13e697a54d1cf70d215ac1cd71f8f306397258..777453c343e9639686c045d076dc4ca8a0e69832 100644 --- a/google_apis/google_api_keys-inc.cc +++ b/google_apis/google_api_keys-inc.cc -@@ -228,6 +228,7 @@ class APIKeyCache { +@@ -242,6 +242,7 @@ class APIKeyCache { #if BUILDFLAG(SUPPORT_EXTERNAL_GOOGLE_API_KEY) void set_api_key(const std::string& api_key) { api_key_ = api_key; } #endif diff --git a/patches/ios-chrome-app-BUILD.gn.patch b/patches/ios-chrome-app-BUILD.gn.patch index 910f5ff200290..75157bede115a 100644 --- a/patches/ios-chrome-app-BUILD.gn.patch +++ b/patches/ios-chrome-app-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/app/BUILD.gn b/ios/chrome/app/BUILD.gn -index a02f01a59ebfdb0afc03cdb701a7e696da8d7ed7..d7c5db072eb38cb1937917c081845f7d916c74ba 100644 +index 101c2fb7e83aaeaa8e34097ae18ab7827470dfd0..470628cb92d5108eb1407ce2dec1b413f8619c0a 100644 --- a/ios/chrome/app/BUILD.gn +++ b/ios/chrome/app/BUILD.gn -@@ -842,8 +842,7 @@ chrome_app("chrome") { +@@ -862,8 +862,7 @@ chrome_app("chrome") { # (see https://crbug.com/1394553 for details of the build failure). This # is a stop-gap solution. if (target_environment == "catalyst" || diff --git a/patches/ios-chrome-browser-flags-about_flags.mm.patch b/patches/ios-chrome-browser-flags-about_flags.mm.patch index 0fc1214aac7ab..4a90116e1e13a 100644 --- a/patches/ios-chrome-browser-flags-about_flags.mm.patch +++ b/patches/ios-chrome-browser-flags-about_flags.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm -index 22c7abe8ca616c6f24a596d802b3fd49e6df369a..0706db5ba66fb732371de97772166d967a9c8146 100644 +index 3381f3bf9e7d651405790f08d1a9841033650a26..39e7c5425616d8c297ef7189afcfc404d4980822 100644 --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm -@@ -687,6 +687,7 @@ const FeatureEntry::FeatureVariation kModernTabStripVariations[] = { +@@ -691,6 +691,7 @@ const FeatureEntry::FeatureVariation kModernTabStripVariations[] = { // // When adding a new choice, add it to the end of the list. const flags_ui::FeatureEntry kFeatureEntries[] = { diff --git a/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch index 4804c256e7478..c6a520f512cd6 100644 --- a/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm -index d7a594fea8bcce4da8032d006f7d147a5a96c569..7ab8c92fde8da6f2039ca473f51ae40637f86dc3 100644 +index 172035fee0f31ea3fec011cef9a96ab51d5039fd..7832b675dfc68ea35bc106530ed848f7cf3b2ccf 100644 --- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm +++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm -@@ -517,6 +517,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { +@@ -521,6 +521,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { registry->RegisterStringPref(kIOSChromeNextVersionKey, std::string()); registry->RegisterStringPref(kIOSChromeUpgradeURLKey, std::string()); registry->RegisterTimePref(kLastInfobarDisplayTimeKey, base::Time()); @@ -10,10 +10,10 @@ index d7a594fea8bcce4da8032d006f7d147a5a96c569..7ab8c92fde8da6f2039ca473f51ae406 } void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -785,6 +786,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -796,6 +797,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterTimePref(prefs::kLastApplicationStorageMetricsLogTime, - base::Time()); + registry->RegisterDictionaryPref( + prefs::kContentNotificationsEnrollmentEligibility); + BRAVE_REGISTER_BROWSER_STATE_PREFS } diff --git a/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch b/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch index b772cf4c0c4ba..e2710e92bc698 100644 --- a/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch +++ b/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/sync/model/sync_service_factory.mm b/ios/chrome/browser/sync/model/sync_service_factory.mm -index 4e81035575fb2f1fb2e0a589ebd7621081b1aa90..caa6aabfb708b44a17f05d84b86950461eeb2f66 100644 +index 818bc1e15df6acaddceac2ef9e9d75dff71a4593..58d0229c409bd2a3653d0518e978d089c9069750 100644 --- a/ios/chrome/browser/sync/model/sync_service_factory.mm +++ b/ios/chrome/browser/sync/model/sync_service_factory.mm -@@ -92,7 +92,7 @@ std::unique_ptr BuildSyncService(web::BrowserState* context) { +@@ -93,7 +93,7 @@ std::unique_ptr BuildSyncService(web::BrowserState* context) { init_params.debug_identifier = browser_state->GetDebugName(); auto sync_service = @@ -10,4 +10,4 @@ index 4e81035575fb2f1fb2e0a589ebd7621081b1aa90..caa6aabfb708b44a17f05d84b8695046 + BRAVE_BUILD_SERVICE_INSTANCE_FOR sync_service->Initialize(); - // TODO(crbug.com/1400663): Remove the workaround below once + // TODO(crbug.com/40250371): Remove the workaround below once diff --git a/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch b/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch index eac940fb8e12d..9c9bb282b02f4 100644 --- a/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch +++ b/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch @@ -1,5 +1,5 @@ diff --git a/mojo/public/tools/bindings/checks/mojom_attributes_check.py b/mojo/public/tools/bindings/checks/mojom_attributes_check.py -index 91f259358575485bcc7d143b9e37cf07f7efd1c4..313b9d05dbfdb24169db32f5a6ff423124da0796 100644 +index 401d9c93cd7ecf347921923f36b655d5c458694b..51086623c86cdd5b770e259e88b2d0d9215e81eb 100644 --- a/mojo/public/tools/bindings/checks/mojom_attributes_check.py +++ b/mojo/public/tools/bindings/checks/mojom_attributes_check.py @@ -7,6 +7,7 @@ import mojom.generate.check as check diff --git a/patches/mojo-public-tools-mojom-mojom_parser.py.patch b/patches/mojo-public-tools-mojom-mojom_parser.py.patch index 844a697e69f59..4ae5c1c48ff7e 100644 --- a/patches/mojo-public-tools-mojom-mojom_parser.py.patch +++ b/patches/mojo-public-tools-mojom-mojom_parser.py.patch @@ -1,5 +1,5 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/mojom_parser.py -index 9693090e44ea4bff0c8d0259a4bdf7c1b0ba0b77..8785606744dad5dbc49410b9f96d9c2b3a2068ae 100755 +index 039c7464268f00dce650e5b9bbe310e685f83e6d..8e98da5b990c3305cd0ff7475ab0f59b68eb6a66 100755 --- a/mojo/public/tools/mojom/mojom_parser.py +++ b/mojo/public/tools/mojom/mojom_parser.py @@ -492,6 +492,7 @@ already present in the provided output root.""") diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 72b04f8a19144..c4f8cdbfad919 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 069215334d0c8e668a65a3e68a7e771e850a0db5..a8a6a2568d8a23d9206a35413eb9e58fbe98f38a 100644 +index 32643c0b16969e68ef09d263f36a039af927af1b..3de4c51c22cb421795421a043c0a363eae1a4da1 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1109,6 +1109,7 @@ component("net") { diff --git a/patches/net-base-proxy_server.cc.patch b/patches/net-base-proxy_server.cc.patch index 1d1f87b4bc2a4..6d834c5d1e310 100644 --- a/patches/net-base-proxy_server.cc.patch +++ b/patches/net-base-proxy_server.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/base/proxy_server.cc b/net/base/proxy_server.cc -index ed883e77438917f866531e7693684d542c834949..69bf97330c06f55f681d304e7b2cc2f38a08ce1b 100644 +index 7c2f64aab85aacfd6ad89760949f89f18d345724..318f0ef940d545e50932c3f51d18b8c88f18e107 100644 --- a/net/base/proxy_server.cc +++ b/net/base/proxy_server.cc -@@ -57,6 +57,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, +@@ -58,6 +58,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, std::string_view host, std::optional port) { @@ -10,7 +10,7 @@ index ed883e77438917f866531e7693684d542c834949..69bf97330c06f55f681d304e7b2cc2f3 // Create INVALID proxies directly using `ProxyServer()`. DCHECK_NE(scheme, SCHEME_INVALID); -@@ -90,6 +91,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, +@@ -96,6 +97,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, // A uint16_t port is always valid and canonicalized. uint16_t fixed_port = port.value_or(GetDefaultPortForScheme(scheme)); diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index cb87a40521a16..3c10cf7658c39 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index 8ec6baaa49f19c1a419afeef774c35629f48a333..4b533dccbcbd91bde099a893391724fcbf44abbf 100644 +index 42d58730642db2c2fbbdbb50a019eddbbc1abad8..1307145415bf7ccad5c90cc808caf578a6499018 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc -@@ -324,6 +324,7 @@ base::Time CanonicalCookie::ValidateAndAdjustExpiryDate( +@@ -287,6 +287,7 @@ base::Time CanonicalCookie::ValidateAndAdjustExpiryDate( // * network_handler.cc::MakeCookieFromProtocolValues fixed_creation_date = base::Time::Now(); } diff --git a/patches/net-cookies-cookie_deletion_info.h.patch b/patches/net-cookies-cookie_deletion_info.h.patch index 1c2333d24d38d..c40c7b1e9ea23 100644 --- a/patches/net-cookies-cookie_deletion_info.h.patch +++ b/patches/net-cookies-cookie_deletion_info.h.patch @@ -1,5 +1,5 @@ diff --git a/net/cookies/cookie_deletion_info.h b/net/cookies/cookie_deletion_info.h -index c1d82f996dc6620e828aba1e70d217dbab181ba1..9ecf6598372e88ea364009b37085c0de3f9dd45a 100644 +index 1d824985f66a7ca15e056e48b658f9b256641076..e4bc9290674be27d41611696d9254696ea476a00 100644 --- a/net/cookies/cookie_deletion_info.h +++ b/net/cookies/cookie_deletion_info.h @@ -150,6 +150,7 @@ struct NET_EXPORT CookieDeletionInfo { diff --git a/patches/net-dns-BUILD.gn.patch b/patches/net-dns-BUILD.gn.patch index 9ef1c341ab85c..fecbf42f691cd 100644 --- a/patches/net-dns-BUILD.gn.patch +++ b/patches/net-dns-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn -index 19a205a32f146c8536fa7646af7f2f7c9b3b62ee..8f527366cbd4b80f9251d2e321cb04a1f26932fa 100644 +index 63414d8db326c0fdd44ed59f99400d5c16cfc93c..4bf973f2766f224d74aa96f11eec2e106cd67d3c 100644 --- a/net/dns/BUILD.gn +++ b/net/dns/BUILD.gn @@ -108,6 +108,7 @@ source_set("dns") { diff --git a/patches/net-dns-host_resolver_manager_job.cc.patch b/patches/net-dns-host_resolver_manager_job.cc.patch index d76082ee0affd..e28fb211a26cb 100644 --- a/patches/net-dns-host_resolver_manager_job.cc.patch +++ b/patches/net-dns-host_resolver_manager_job.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/host_resolver_manager_job.cc b/net/dns/host_resolver_manager_job.cc -index 8498ccc3aec23879e5a660f5594947a4a8cb4b27..f91af42e6498d4a0c0aa8b76c70589a503b06102 100644 +index a370e65f53f81d30b10f08fc272a36bb14322670..c9c8b763c4f4fb1a5587a7a93a1f07168c83b4d6 100644 --- a/net/dns/host_resolver_manager_job.cc +++ b/net/dns/host_resolver_manager_job.cc @@ -1034,6 +1034,7 @@ void HostResolverManager::Job::CompleteRequests( diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch index e4eb395abffc7..7cdaa1fa51abc 100644 --- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch +++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc -index 7d7ece287734a8c99539e34e5b3b4c86cc96d57c..4398bd0c01e27784f976b903a26a3c31e11e2e99 100644 +index 6c4f0f8c3440b43bf46a7bf4b9e86b6a8d8648e5..39355266fa93a0afd4d80d4c7bb8faa35562c63e 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc @@ -988,6 +988,7 @@ int ConfiguredProxyResolutionService::ResolveProxy( diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index 07383cefd003f..8cc125b1cff04 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 8b41e05f29fdb22f06845560632e8d4afb341ac0..811c14c8f8366fcead0cb9401bb3687e3d63c77f 100644 +index 05a9bd7063f7800f608a3b77d5d48f76cf93ed7d..1068f98b0dcd775633f5b6d425114a66d186b6f8 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -767,6 +767,7 @@ ResultCode LaunchWithoutSandbox( +@@ -770,6 +770,7 @@ ResultCode LaunchWithoutSandbox( base::Process* process) { base::LaunchOptions options; options.handles_to_inherit = handles_to_inherit; diff --git a/patches/services-network-cookie_manager.cc.patch b/patches/services-network-cookie_manager.cc.patch index 76eac3fa1f703..31f81fff5c587 100644 --- a/patches/services-network-cookie_manager.cc.patch +++ b/patches/services-network-cookie_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/cookie_manager.cc b/services/network/cookie_manager.cc -index c251939593cd2bd5ba861acb96336af1e1a0ce5f..0bed25ef2a59d7a5efc20a86d7950be63a79dda0 100644 +index 60cd3989fe135fc06a878c612e3d1964968ac2ea..e8c2286c9920689f1c65bc412d1d9eb665e9181f 100644 --- a/services/network/cookie_manager.cc +++ b/services/network/cookie_manager.cc @@ -392,6 +392,7 @@ CookieDeletionInfo DeletionFilterToInfo(mojom::CookieDeletionFilterPtr filter) { diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch index c54feac363daf..80f5d04b2c83a 100644 --- a/patches/services-network-cors-cors_url_loader.cc.patch +++ b/patches/services-network-cors-cors_url_loader.cc.patch @@ -1,8 +1,8 @@ diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc -index 097ed0dd790df54d51fd4b0c71d599969ef207f9..544bac3100a840f6234b879a770cedc7a98891c4 100644 +index 7a26a4b80e3a6996497c93bc0b67b74091a55ae0..8ddf86525e64ce9215f22acfe73a0580a285f127 100644 --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc -@@ -846,6 +846,7 @@ void CorsURLLoader::StartRequest() { +@@ -868,6 +868,7 @@ void CorsURLLoader::StartRequest() { (fetch_cors_flag_ || (request_.method != net::HttpRequestHeaders::kGetMethod && request_.method != net::HttpRequestHeaders::kHeadMethod))) { diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 3bf8374744b86..57de362b7b639 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 90b7bf0ac68bd419f77b9a072747d8c4ba757d93..f351f0e2acf9ade2a23f53787219c5c877157a68 100644 +index 10474ea79281b14c505fd054ba9f1c2a07f90e5e..1d2cb647a6a8731dda31644bf997b9a77759edb8 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn @@ -191,6 +191,7 @@ component("cpp") { diff --git a/patches/third_party-android_deps-BUILD.gn.patch b/patches/third_party-android_deps-BUILD.gn.patch index 240f056fa9943..52dcb3794122c 100644 --- a/patches/third_party-android_deps-BUILD.gn.patch +++ b/patches/third_party-android_deps-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn -index 158b0dbc47c9a153c1444cf8e8b122c91564962f..c2bdd3696627fee630f5d5a5f804e1b7bac65bfe 100644 +index 66998181e74f8ccb295761a86f5be4fdde47d308..cdf2a2b12b17792029beee1bb9cc29a090d8bf2b 100644 --- a/third_party/android_deps/BUILD.gn +++ b/third_party/android_deps/BUILD.gn @@ -465,6 +465,7 @@ java_prebuilt("com_google_auto_value_auto_value_annotations_java") { diff --git a/patches/third_party-blink-common-permissions-permission_utils.cc.patch b/patches/third_party-blink-common-permissions-permission_utils.cc.patch index 3d80cb80ca41c..67318f38b42b0 100644 --- a/patches/third_party-blink-common-permissions-permission_utils.cc.patch +++ b/patches/third_party-blink-common-permissions-permission_utils.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/permissions/permission_utils.cc b/third_party/blink/common/permissions/permission_utils.cc -index 9b7c4524480fc54c6cf86027e69ac8784f1e310f..4e2722ad001540352d4cf71e0def8d2ae8c3f057 100644 +index a380c9b2cbeaea1c74fad55d81bd6eee4b5836a4..2388aa75979e1517ff1c5e11793b96ad3b24d48f 100644 --- a/third_party/blink/common/permissions/permission_utils.cc +++ b/third_party/blink/common/permissions/permission_utils.cc @@ -28,6 +28,7 @@ mojom::PermissionStatus ToPermissionStatus(const std::string& status) { diff --git a/patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch b/patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch index 105439f24b223..269aaa8d259c3 100644 --- a/patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch +++ b/patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc b/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc -index 729f1f0e67f061b3031978e89908864c5f05442e..ab09c7211a22205a55a4bb174ffa4843eb126ca0 100644 +index 9f2d95bf4c94aff446f7ae23547672e3124f6ffb..8ed1152732bc0a2a9b48dc4dda5f0cd002c4b459 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc @@ -302,7 +302,7 @@ int GetMicrotasksScopeDepth(v8::Isolate* isolate, 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 e023e7e78253b..1d891b0e088d6 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 f6c2319a73fa6bf9fa8726c6b2fc021590e95752..912ef68685e48448fec490021249aa39eb554bc0 100644 +index cbaa75c11e61812f19930ee791cceb2443008e83..add022a3798aaebe54b6e3276c8717018eb9f76e 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2969,6 +2969,7 @@ generated_interface_sources_in_modules = [ +@@ -2977,6 +2977,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.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 a843cba3fdec0..823719213a3d5 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 e2f4560ec7f887818d929f2953c022a48d74c3d2..8d90bc80adc0a97dcbc603d452935452a30619d4 100644 +index bb899da428917268848c37a14c3f3be6906b3fff..97694ccbd6eb3cebb5f3f15579207f33b68c9a7e 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1256,6 +1256,7 @@ static_idl_files_in_modules = [ +@@ -1261,6 +1261,7 @@ static_idl_files_in_modules = [ "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl", "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl", ] diff --git a/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch b/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch index 412a9ece72802..296432190113c 100644 --- a/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch +++ b/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -index 795a2954cda7fad2ba12d000d3e5f8a576aa8aee..eb0ac0bb5ad6a4b6356b2b8f2db88f756102d905 100644 +index 1bd2fbca00956b9e50a53f00a7b1f9d3c7a06f3b..3d3158bd053293449c74dd8f54e6664e4d23fbfc 100644 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -@@ -7686,3 +7686,4 @@ def generate_interfaces(task_queue): +@@ -7519,3 +7519,4 @@ def generate_interfaces(task_queue): "InitIDLInterfacesForTesting", "init_idl_interfaces_for_testing", for_testing=True) diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index 30ddceee0ecf0..560197b54c61c 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index d0e0ed9987b8f42f2c3947b39b6f0d8631f68634..4f033bc245534860a6688568581026145cb118b3 100644 +index 4feaed1ede9739cb92860c995c1f9730ff0abe84..cb030a011d807e87ee10897c5d0896b087fedf63 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -412,6 +412,7 @@ component("core") { +@@ -414,6 +414,7 @@ component("core") { "Carbon.framework", ] } diff --git a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch index b683fb403ca40..b77f7136f9dcb 100644 --- a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc -index e4edc9fb68c52cd50a99ffc61f9ac9eb4bdde774..aee6e15f394cccfbc1fd72ce805cd08ba127d566 100644 +index e1b85d9f9eff52595afa02e6620205b6effb707b..25c5bb98aa9c4f55c103236d53e03b585f423914 100644 --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc @@ -650,6 +650,7 @@ bool EventTarget::AddEventListenerInternal( @@ -10,7 +10,7 @@ index e4edc9fb68c52cd50a99ffc61f9ac9eb4bdde774..aee6e15f394cccfbc1fd72ce805cd08b if (options->hasSignal()) { // Instead of passing the entire |options| here, which could create a // circular reference due to |options| holding a Member, just -@@ -832,6 +833,7 @@ bool EventTarget::RemoveEventListenerInternal( +@@ -834,6 +835,7 @@ bool EventTarget::RemoveEventListenerInternal( ®istered_listener)) { return false; } diff --git a/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch b/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch index d77310b3ee71d..77c6013ea57c3 100644 --- a/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch +++ b/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 7466cdeb03ed2946ea0225936810928831f90e81..c0534cbcb0916657bde4379f61200d4fdb535838 100644 +index 22ad72f457bcd70d6448b9313d21c9cad0a4df11..d51dcaf2c43ca5441ddef6cc21659b6152ccf12e 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc @@ -477,6 +477,7 @@ bool LocalDOMWindow::CanExecuteScripts( 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 50916058621c1..3f518cbcbe2f2 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 07b09f058eca919cb6375d4743dd6bbe8d863e21..d9b2027e1770fb4d084ef93a7279ec8a3258eff1 100644 +index d28de5cda3fbb2c992ae708f82bba0113c81d7b9..64681439ef0f4cbf8f782c78397f522d61245403 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 -@@ -1160,6 +1160,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1159,6 +1159,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); 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 901bb7ff7b474..e76821821a905 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,8 +1,8 @@ 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 4b9d837913c359c334334bacb12ea81bb76e1a12..8af6384ee7523f02cfafedd8795857f014a2c75c 100644 +index 3094e21c7cea10a98cf4bcb4d075092681b78205..35af6548cd8564bd367caf160f11f2c4ded10faa 100644 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc -@@ -64,6 +64,7 @@ bool ComputeLockPendingUserGestureRequired(const Document& document) { +@@ -65,6 +65,7 @@ bool ComputeLockPendingUserGestureRequired(const Document& document) { // static AutoplayPolicy::Type AutoplayPolicy::GetAutoplayPolicyForDocument( const Document& document) { @@ -10,7 +10,7 @@ index 4b9d837913c359c334334bacb12ea81bb76e1a12..8af6384ee7523f02cfafedd8795857f0 if (!document.GetSettings()) return Type::kNoUserGestureRequired; -@@ -332,6 +333,7 @@ void AutoplayPolicy::TryUnlockingUserGesture() { +@@ -333,6 +334,7 @@ void AutoplayPolicy::TryUnlockingUserGesture() { bool AutoplayPolicy::IsGestureNeededForPlayback() const { if (!IsLockedPendingUserGesture()) return false; diff --git a/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch b/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch index 45ce2bdd0ea24..ace73e9ff05c7 100644 --- a/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch +++ b/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -index 6b37b2bc44ece8ffce12e35677f89bb1e7da5a2f..fa9ddd59db1b5282acbc954b35def37caff019be 100644 +index 38373826db117ac11e99cab7f8ac69c8e0c5e347..7e1058f511a93d6dd431ed395e2ea47c162a49cd 100644 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -436,6 +436,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -453,6 +453,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( // Check if |url| is allowed to run JavaScript. If not, client hints are not // attached to the requests that initiate on the render side. diff --git a/patches/third_party-blink-renderer-core-loader-modulescript-module_tree_linker.cc.patch b/patches/third_party-blink-renderer-core-loader-modulescript-module_tree_linker.cc.patch index d8b1d13aa07e3..59fff8745f1d1 100644 --- a/patches/third_party-blink-renderer-core-loader-modulescript-module_tree_linker.cc.patch +++ b/patches/third_party-blink-renderer-core-loader-modulescript-module_tree_linker.cc.patch @@ -1,12 +1,12 @@ diff --git a/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.cc b/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.cc -index 75d4407e3ef566c03505a78de33994598f8888c6..14f05fc23b24bb8d5272daa0a33a352c3d6104c4 100644 +index a9cb36eff7946e63b11265442d6a0e265915bf24..811234b2dbf4eff5206baaf48de1120a92b7df10 100644 --- a/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.cc +++ b/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.cc -@@ -443,6 +443,7 @@ void ModuleTreeLinker::FetchDescendants(const ModuleScript* module_script) { - module_script->FetchOptions().GetReferrerPolicy(), - mojom::blink::FetchPriorityHint::kAuto, - RenderBlockingBehavior::kNonBlocking); -+ BRAVE_MODULE_TREE_LINKER_FETCH_DESCENDANTS - - // For each moduleRequest in moduleRequests, ... - // +@@ -449,6 +449,7 @@ void ModuleTreeLinker::FetchDescendants(const ModuleScript* module_script) { + module_script->FetchOptions().GetReferrerPolicy(), + mojom::blink::FetchPriorityHint::kAuto, + RenderBlockingBehavior::kNonBlocking); ++ BRAVE_MODULE_TREE_LINKER_FETCH_DESCENDANTS + // ... perform the internal module script graph fetching + // procedure given moduleRequest, fetch client settings object, destination, + // options, module script's settings object, visited set, and module diff --git a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch index 0bb58d7fcb75c..36271b1d6a989 100644 --- a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch +++ b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch @@ -1,9 +1,9 @@ diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -index 427c10cb4bde95d951eb54983dff1f3e773ed695..dac68b9d7a7f7caa98c05909dcbaecf93c7b73b8 100644 +index e808f502fb0cdcbd823698e97d3657f1357f2d0e..c06ba6c07e169a917a8814f45b8a08784473ba9b 100644 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -@@ -454,5 +454,13 @@ - // Parser also accepts "window-placement" alias (crbug.com/1328581). +@@ -453,5 +453,13 @@ + name: "WindowManagement", permissions_policy_name: "window-management", }, + { diff --git a/patches/third_party-blink-renderer-core-script-dynamic_module_resolver.cc.patch b/patches/third_party-blink-renderer-core-script-dynamic_module_resolver.cc.patch index 6998ca48221dc..42eddd0120a91 100644 --- a/patches/third_party-blink-renderer-core-script-dynamic_module_resolver.cc.patch +++ b/patches/third_party-blink-renderer-core-script-dynamic_module_resolver.cc.patch @@ -1,10 +1,10 @@ diff --git a/third_party/blink/renderer/core/script/dynamic_module_resolver.cc b/third_party/blink/renderer/core/script/dynamic_module_resolver.cc -index 15df37215a2d533787e3e668779bfb0c98697096..a7de5c5102f8edc07679152787fadbab9afa0c4e 100644 +index 8422194a98113822d160b134e53bdca7c634ab03..bb1534afc87f8656a9212c29ff5da8c724d18086 100644 --- a/third_party/blink/renderer/core/script/dynamic_module_resolver.cc +++ b/third_party/blink/renderer/core/script/dynamic_module_resolver.cc -@@ -286,6 +286,7 @@ void DynamicModuleResolver::ResolveDynamically( - referrer_info.ParserState(), referrer_info.CredentialsMode(), - referrer_info.GetReferrerPolicy(), mojom::blink::FetchPriorityHint::kAuto, +@@ -288,6 +288,7 @@ void DynamicModuleResolver::ResolveDynamically( + referrer_info.CredentialsMode(), referrer_info.GetReferrerPolicy(), + mojom::blink::FetchPriorityHint::kAuto, RenderBlockingBehavior::kNonBlocking); + BRAVE_DYNAMIC_MODULE_RESOLVER_RESOLVE_DYNAMICALLY diff --git a/patches/third_party-blink-renderer-core-script-script_loader.cc.patch b/patches/third_party-blink-renderer-core-script-script_loader.cc.patch index 099c07716579a..ac463ca001a70 100644 --- a/patches/third_party-blink-renderer-core-script-script_loader.cc.patch +++ b/patches/third_party-blink-renderer-core-script-script_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/script/script_loader.cc b/third_party/blink/renderer/core/script/script_loader.cc -index efb964d0e1a5390bbea8a75906127ec15dade0dc..e7b6d47bcebfa26b019f7e38f75e3d721b3f3712 100644 +index 30245f9afeee2b7302ff01a9dbce23d75ca49219..0cb65ad4116e09f2a7f769147c50c1bbb10aa061 100644 --- a/third_party/blink/renderer/core/script/script_loader.cc +++ b/third_party/blink/renderer/core/script/script_loader.cc @@ -768,6 +768,7 @@ PendingScript* ScriptLoader::PrepareScript( diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 2d28c7fbe4457..f31dc4186116a 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 5e508b913974f7dfd7d1556c968f0fb7e5c7e117..b55586957531bdd0e151edee0f9c634e79591b0a 100644 +index 07f21c925497a179c7ec6aad25ee28da26874bbf..d9f780e2cffa059c12a25aac84817c0235652f0a 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -19,6 +19,7 @@ if (is_ios) { @@ -10,7 +10,7 @@ index 5e508b913974f7dfd7d1556c968f0fb7e5c7e117..b55586957531bdd0e151edee0f9c634e config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -178,6 +179,7 @@ component("modules") { +@@ -179,6 +180,7 @@ component("modules") { # generating the snapshot for android, blink is compiled with # current_os="linux" and target_os="android". Using target_os is necessary as # we need to compile in the same way as would happen when current_os="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 4f973179e072a..31da7cbc8a847 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 46bf928961c60ae28693d7b307dbf84f021ac266..97b548d1b57b97bef30dc79052985cb097cdb709 100644 +index 0f3f8474071432f0b5737b07bfe73bf2ced8b36a..c1d20cbaf3f73b56a2f4a673b52996d5d381c423 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 -@@ -2363,6 +2363,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -2437,6 +2437,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index 46bf928961c60ae28693d7b307dbf84f021ac266..97b548d1b57b97bef30dc79052985cb0 int sx, int sy, int sw, -@@ -2528,6 +2529,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2602,6 +2603,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } @@ -18,7 +18,7 @@ index 46bf928961c60ae28693d7b307dbf84f021ac266..97b548d1b57b97bef30dc79052985cb0 return image_data; } -@@ -3196,6 +3198,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { +@@ -3270,6 +3272,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { 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 35bb5e4376459..52237657546b7 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 60cfac0add46e55509e30a0fc48785c44a82f24c..4a3f53cd17c571057c6fd22b3d95228ce7321445 100644 +index ee02d822ff8c1ba9ed5cf38d7230589d5413bd5f..e571b2e24466828a26a9a0bff42754522a713286 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 @@ -118,10 +118,10 @@ 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 80f7592007300..529d3d45050f6 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 5025e6bc2c67bd6029b019cea22e96a16e166007..fe337264926021f65bf5e737b7262a9b7a78b317 100644 +index aeb999eaac842a9ac37b8d1771286b550200df10..644f7f3703cfeeb53901ecffdeac1a30f6236ce6 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 @@ -68,10 +68,10 @@ diff --git a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch index c92a18570d4a2..e7371a37c4bb4 100644 --- a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl -index 99ba9d7abb103f194db899b6fdf76111c17a2ab9..43ecd70d7237d5ffaf14a9ff0f2847160d4865b4 100644 +index 73f5cec21b5e154dc2c70cea1b7e8ae2c35dfc04..300a77bd9fc23cf43df32d56183e453648ce5f5b 100644 --- a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl @@ -63,10 +63,10 @@ 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 cb9259f9a76e0..39011db14d4bf 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 b54b0b2050ce73016325bd985521815e193abc8e..4484f5d5bcf00a377e2605182050549857952c47 100644 +index 0d7fbcb6c1339100ff69caa3ceea481c9ffd3b21..21c36450ef42d687168451729f1eb8e640fefc8b 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -1199,6 +1199,7 @@ void MediaDevices::DevicesEnumerated( +@@ -1142,6 +1142,7 @@ 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 cee5d809ffb26..5fa1c3a826145 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 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6a33d83ad 100644 +index 118c8a892272124c4a74aab5615e6e1fea5f0deb..31472339015963b14a5fbe582dd74d19eabaf1a6 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 -@@ -3213,6 +3213,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -3209,6 +3209,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -3244,6 +3245,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -3240,6 +3241,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3273,6 +3275,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -3269,6 +3271,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( std::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) @@ -26,7 +26,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 return std::nullopt; HeapVector> shader_objects; -@@ -3288,6 +3291,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3284,6 +3287,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3321,6 +3325,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3317,6 +3321,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3458,6 +3463,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3454,6 +3459,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( return ScriptValue::CreateNull(script_state->GetIsolate()); } @@ -50,7 +50,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, kFunctionName, "no framebuffer bound"); -@@ -3862,6 +3868,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3858,6 +3864,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 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3877,6 +3884,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3873,6 +3880,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 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -4012,6 +4020,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -4008,6 +4016,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -4067,6 +4076,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -4063,6 +4072,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -4077,6 +4087,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -4073,6 +4083,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -4128,6 +4139,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -4124,6 +4135,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -4159,6 +4171,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -4155,6 +4167,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -4189,6 +4202,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -4185,6 +4198,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSampleType( -@@ -4201,6 +4215,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -4197,6 +4211,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 return EnsureNotNull(shader->Source()); } -@@ -4226,6 +4241,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -4222,6 +4237,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -4260,6 +4276,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -4256,6 +4272,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 DCHECK(uniform_location); if (!ValidateUniformLocation("getUniform", uniform_location, program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); -@@ -4507,6 +4524,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4503,6 +4520,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4531,6 +4549,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4527,6 +4545,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4608,6 +4627,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4604,6 +4623,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 9aab2ce4deeacb064d1b6048eb930b24354f9858..df329d23c618e8e6060664d3a37c85b6 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4967,6 +4987,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4963,6 +4983,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index b492765bd0f51..d1d1499ed4cbc 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 88771f5da4c956f7f0fcfe69938fd3b359b6590f..f3e6e6751f0e33fed9272ab216f08f5bfeb4cf8f 100644 +index 5f304abbb561e1bc368c50eef329e949855b89b0..2d54626aa0e758a7657e8eb11bf148bf9ed4c2d1 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1891,6 +1891,7 @@ component("platform") { +@@ -1899,6 +1899,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config 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 d7cb9509bf47a..d23c95aef604e 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,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index bed4f9bcc005416df005de7e78e08f495e5769da..6466ad90bd0065c03f108939596ffb9c2ecff387 100644 +index eb9f297e1a48df6992f907dfda98c1b6a85b2017..4f03c4f245117392c7f6fc31125e388bd569c18e 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1713,6 +1713,7 @@ +@@ -1683,6 +1683,7 @@ // In-development features for the File System Access API. name: "FileSystemAccessAPIExperimental", status: "experimental", @@ -10,7 +10,7 @@ index bed4f9bcc005416df005de7e78e08f495e5769da..6466ad90bd0065c03f108939596ffb9c }, { // The FileSystemHandle.getCloudIdentifiers() method (see -@@ -1728,6 +1729,7 @@ +@@ -1698,6 +1699,7 @@ // Non-OPFS File System Access API. name: "FileSystemAccessLocal", status: {"Android": "test", "default": "stable"}, @@ -18,7 +18,7 @@ index bed4f9bcc005416df005de7e78e08f495e5769da..6466ad90bd0065c03f108939596ffb9c }, { name: "FileSystemAccessLockingScheme", -@@ -2451,6 +2453,7 @@ +@@ -2484,6 +2486,7 @@ { name: "MiddleClickAutoscroll", status: "test", @@ -26,7 +26,7 @@ index bed4f9bcc005416df005de7e78e08f495e5769da..6466ad90bd0065c03f108939596ffb9c }, { name: "MobileLayoutTheme", -@@ -3448,6 +3451,7 @@ +@@ -3536,6 +3539,7 @@ { name: "Serial", status: {"Android": "", "default": "stable"}, diff --git a/patches/third_party-lit-v3_0-BUILD.gn.patch b/patches/third_party-lit-v3_0-BUILD.gn.patch new file mode 100644 index 0000000000000..0fb521c35c459 --- /dev/null +++ b/patches/third_party-lit-v3_0-BUILD.gn.patch @@ -0,0 +1,20 @@ +diff --git a/third_party/lit/v3_0/BUILD.gn b/third_party/lit/v3_0/BUILD.gn +index 850660bc45180953e32b0b1d38ace3c5263d56dc..16055ce3cb4db7b176f0781c7b401b8ddfec9e48 100644 +--- a/third_party/lit/v3_0/BUILD.gn ++++ b/third_party/lit/v3_0/BUILD.gn +@@ -37,6 +37,7 @@ ts_library("build_ts") { + "//ui/webui/resources/cr_components/most_visited:build_ts", + "//ui/webui/resources/cr_components/theme_color_picker:build_ts", + "//ui/webui/resources/cr_elements:build_ts", ++ "//chrome/browser/resources/settings:build_ts", "//brave/ui/webui/resources:build_ts" + ] + composite = true + in_files = [ +@@ -115,6 +116,7 @@ ts_library("build_ts") { + "${node_modules}/@lit/reactive-element/reactive-element.d.ts", + target_gen_dir), + ] ++ import("//brave/third_party/lit/v3_0/sources.gni") visibility += brave_lit_build_ts_visibility + } + + bundle_js("build_bundle") { diff --git a/patches/third_party-polymer-v3_0-BUILD.gn.patch b/patches/third_party-polymer-v3_0-BUILD.gn.patch index 18c876ca81393..39a6ac15b6d38 100644 --- a/patches/third_party-polymer-v3_0-BUILD.gn.patch +++ b/patches/third_party-polymer-v3_0-BUILD.gn.patch @@ -1,20 +1,26 @@ diff --git a/third_party/polymer/v3_0/BUILD.gn b/third_party/polymer/v3_0/BUILD.gn -index fbece51ef5c77767e968c7fcc56e5a537f0a1a8b..9289cf0a7f6085cb0e3da847ace4b5ab045bee8f 100644 +index b3360d53fde11c1629c515a38f443efcb1df5c82..203c8c769d9d225596ce025b82ef84488423b4bf 100644 --- a/third_party/polymer/v3_0/BUILD.gn +++ b/third_party/polymer/v3_0/BUILD.gn -@@ -44,6 +44,7 @@ js_files = [ +@@ -43,6 +43,7 @@ js_files = [ ] if (is_chromeos_ash) { +} if (!is_android) { js_files += [ + "iron-a11y-announcer/iron-a11y-announcer.js", "iron-dropdown/iron-dropdown.js", - "iron-dropdown/iron-dropdown-scroll-manager.js", -@@ -171,6 +172,7 @@ ts_library("library") { +@@ -286,6 +287,7 @@ ts_library("library") { ] if (is_chromeos_ash) { + } if (!is_android) { definitions += [ + "components-chromium/iron-a11y-announcer/iron-a11y-announcer.d.ts", "components-chromium/iron-dropdown/iron-dropdown.d.ts", - "components-chromium/iron-dropdown/iron-dropdown-scroll-manager.d.ts", +@@ -306,4 +308,5 @@ ts_library("library") { + "components-chromium/paper-tooltip/paper-tooltip.d.ts", + ] + } ++ import("//brave/third_party/polymer/v3_0/sources.gni") visibility += brave_polymer_library_visibility + } diff --git a/patches/third_party-rust-serde-v1-BUILD.gn.patch b/patches/third_party-rust-serde-v1-BUILD.gn.patch index bfa368a6af045..6bcd9ceb56046 100644 --- a/patches/third_party-rust-serde-v1-BUILD.gn.patch +++ b/patches/third_party-rust-serde-v1-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/rust/serde/v1/BUILD.gn b/third_party/rust/serde/v1/BUILD.gn -index 1598d8655d5b934aabc3a2e3d71c8709f9e07428..3ce4df34c6452c9f20db96208afda4e69c10ab01 100644 +index e7b3157eb91fd24074a869e02f3fba0c9e074f96..d77b3b993053344360c9d09287c5c18f01b6673a 100644 --- a/third_party/rust/serde/v1/BUILD.gn +++ b/third_party/rust/serde/v1/BUILD.gn @@ -55,6 +55,7 @@ cargo_crate("lib") { @@ -8,5 +8,5 @@ index 1598d8655d5b934aabc3a2e3d71c8709f9e07428..3ce4df34c6452c9f20db96208afda4e6 ] + features += [ "alloc", "rc" ] build_root = - "//third_party/rust/chromium_crates_io/vendor/serde-1.0.197/build.rs" + "//third_party/rust/chromium_crates_io/vendor/serde-1.0.198/build.rs" build_sources = diff --git a/patches/third_party-rust-serde_json-v1-BUILD.gn.patch b/patches/third_party-rust-serde_json-v1-BUILD.gn.patch index e0c0d5ae4848e..8ae2fe73de138 100644 --- a/patches/third_party-rust-serde_json-v1-BUILD.gn.patch +++ b/patches/third_party-rust-serde_json-v1-BUILD.gn.patch @@ -1,10 +1,10 @@ diff --git a/third_party/rust/serde_json/v1/BUILD.gn b/third_party/rust/serde_json/v1/BUILD.gn -index 602a4e111234455778a684d87e3ead312963e0a6..b9f7ce5cda6b4c575c978d31455ad5613706a15b 100644 +index 84d14bdcb336656db1be3d81fc69397a1c7ca949..2ac2802999dfa559822d2b962ef3c5764863dc76 100644 --- a/third_party/rust/serde_json/v1/BUILD.gn +++ b/third_party/rust/serde_json/v1/BUILD.gn -@@ -79,5 +79,4 @@ cargo_crate("lib") { +@@ -77,5 +77,4 @@ cargo_crate("lib") { build_sources = [ - "//third_party/rust/chromium_crates_io/vendor/serde_json-1.0.115/build.rs", + "//third_party/rust/chromium_crates_io/vendor/serde_json-1.0.116/build.rs", ] - testonly = true } diff --git a/patches/third_party-rust-syn-v2-BUILD.gn.patch b/patches/third_party-rust-syn-v2-BUILD.gn.patch index 6b3832a93f9fc..21d626ddf4307 100644 --- a/patches/third_party-rust-syn-v2-BUILD.gn.patch +++ b/patches/third_party-rust-syn-v2-BUILD.gn.patch @@ -1,10 +1,10 @@ diff --git a/third_party/rust/syn/v2/BUILD.gn b/third_party/rust/syn/v2/BUILD.gn -index bbc9e1d34b2f1d7608eedd71526a11e89dac97e1..f75fa0c1795847f13dde59b264b7ab221e0a45e9 100644 +index 043ad02c064a0e878a516c72b5786e360df6088c..8cf4c192de137a22125936e468345b7320505dd9 100644 --- a/third_party/rust/syn/v2/BUILD.gn +++ b/third_party/rust/syn/v2/BUILD.gn -@@ -97,4 +97,5 @@ cargo_crate("lib") { +@@ -96,4 +96,5 @@ cargo_crate("lib") { + "printing", "proc-macro", - "quote", ] + features += [ "extra-traits", "visit", "visit-mut" ] } diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch b/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch index 907e333fd3ed7..101416de04312 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch @@ -1,8 +1,8 @@ diff --git a/front_end/panels/application/ApplicationPanelSidebar.ts b/front_end/panels/application/ApplicationPanelSidebar.ts -index ba715b1b6b82afe9b65ded0d9aa548485f1e4061..c713707925d40a0daa981fc8956741f3476a528a 100644 +index 809af49a61559f31db2507d4639d46166c0ad93c..87e5324168b427835b1303e535e17dd2828cfad5 100644 --- a/front_end/panels/application/ApplicationPanelSidebar.ts +++ b/front_end/panels/application/ApplicationPanelSidebar.ts -@@ -447,6 +447,7 @@ export class ApplicationPanelSidebar extends UI.Widget.VBox implements SDK.Targe +@@ -445,6 +445,7 @@ export class ApplicationPanelSidebar extends UI.Widget.VBox implements SDK.Targe // Work-around for crbug.com/1152713: Something is wrong with custom scrollbars and size containment. // @ts-ignore this.contentElement.style.contain = 'layout style'; diff --git a/patches/tools-binary_size-libsupersize-archive.py.patch b/patches/tools-binary_size-libsupersize-archive.py.patch index d38adea0cb17f..935a7f2a158ae 100644 --- a/patches/tools-binary_size-libsupersize-archive.py.patch +++ b/patches/tools-binary_size-libsupersize-archive.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/binary_size/libsupersize/archive.py b/tools/binary_size/libsupersize/archive.py -index 1c715cd486e367c32dffc1b9874cfe5cf8dfe222..610cb1851665e4d82c515452c1eb3b5d74ac4af1 100644 +index 4a39f59f479eb7948abe7ac3738a7619184d9cbb..21b9ecba1c40c2a0e378c36b128d019fb3aae108 100644 --- a/tools/binary_size/libsupersize/archive.py +++ b/tools/binary_size/libsupersize/archive.py @@ -1050,6 +1050,7 @@ def _FilterContainerSpecs(container_specs, container_re=None): diff --git a/patches/tools-clang-pylib-clang-compile_db.py.patch b/patches/tools-clang-pylib-clang-compile_db.py.patch index 20319ab841878..9eb12db0f7795 100644 --- a/patches/tools-clang-pylib-clang-compile_db.py.patch +++ b/patches/tools-clang-pylib-clang-compile_db.py.patch @@ -1,8 +1,8 @@ diff --git a/tools/clang/pylib/clang/compile_db.py b/tools/clang/pylib/clang/compile_db.py -index 06bb1da03ffa5243c3cde9ef7b2f1a36b5eccb5d..aa58f572ecdb56d10ef89a97f02c766bb5e9d911 100755 +index c34c27ff3f95a23d6ce1d5aa7c248ec5b364828e..9a810db218e9f23949b6cc0ae61a5d5746d62b55 100755 --- a/tools/clang/pylib/clang/compile_db.py +++ b/tools/clang/pylib/clang/compile_db.py -@@ -224,3 +224,4 @@ def Read(path): +@@ -227,3 +227,4 @@ def Read(path): """ with open(os.path.join(path, 'compile_commands.json'), 'rb') as db: return json.load(db) diff --git a/patches/tools-crates-gnrt-gen.rs.patch b/patches/tools-crates-gnrt-gen.rs.patch index bb697515704aa..f0d69df52cf6c 100644 --- a/patches/tools-crates-gnrt-gen.rs.patch +++ b/patches/tools-crates-gnrt-gen.rs.patch @@ -1,8 +1,8 @@ diff --git a/tools/crates/gnrt/gen.rs b/tools/crates/gnrt/gen.rs -index c056a69e03a96a762718f4dd5cd8e23accf5e455..8229e46a96c8581e35e9b5e44c699f73031c94e9 100644 +index c1c4b1b73e50ccd306f7c7e9773aa2bbbfff8eb3..0b1593d17d1ee223b365d0bf5f227061a811a680 100644 --- a/tools/crates/gnrt/gen.rs +++ b/tools/crates/gnrt/gen.rs -@@ -266,6 +266,7 @@ fn generate_for_third_party(args: GenCommandArgs, paths: &paths::ChromiumPaths) +@@ -278,6 +278,7 @@ fn generate_for_third_party(args: GenCommandArgs, paths: &paths::ChromiumPaths) // Remove any excluded dep entries. dependencies .retain(|dep| !config.resolve.remove_crates.iter().any(|r| **r == dep.package_name)); diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index c0991161d4f74..9438aa3a35e1c 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 8ee4bb1061fe7f05c992d4e65c3a269ff27dd42b..fa1f473b63ac45d9cb396b42c5c8fb724d96d9cc 100644 +index f3ca54d7277ac55ad1f6f26df5ced4e2ce1166c6..515ed81778a98534e3e02704aa4b7ced2e3dfb5e 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -38,6 +38,9 @@ @@ -30,7 +30,7 @@ index 8ee4bb1061fe7f05c992d4e65c3a269ff27dd42b..fa1f473b63ac45d9cb396b42c5c8fb72 "includes": [4040], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings_shared/resources.grd": { -@@ -962,6 +965,9 @@ +@@ -966,6 +969,9 @@ "components/components_chromium_strings.grd": { "messages": [7020], }, diff --git a/patches/tools-json_schema_compiler-cc_generator.py.patch b/patches/tools-json_schema_compiler-cc_generator.py.patch index 099965dcbb5d5..d263994391c98 100644 --- a/patches/tools-json_schema_compiler-cc_generator.py.patch +++ b/patches/tools-json_schema_compiler-cc_generator.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py -index 195dd4629308583d2bb899a430f09e8949902025..15885c2d5acd161ead357c185b197c9eebb566d7 100644 +index 3bc5dca067e921863f8af0af86b7aecf94c1e6bb..e8fcc40806818e175e40dbb85d97c031c5d3a8fb 100644 --- a/tools/json_schema_compiler/cc_generator.py +++ b/tools/json_schema_compiler/cc_generator.py @@ -28,6 +28,7 @@ class _Generator(object): diff --git a/patches/tools-json_schema_compiler-idl_schema.py.patch b/patches/tools-json_schema_compiler-idl_schema.py.patch index bbb0a9d69b5cb..66df9093fef60 100644 --- a/patches/tools-json_schema_compiler-idl_schema.py.patch +++ b/patches/tools-json_schema_compiler-idl_schema.py.patch @@ -1,8 +1,8 @@ diff --git a/tools/json_schema_compiler/idl_schema.py b/tools/json_schema_compiler/idl_schema.py -index 75977162b625e80c5abfa00a94dfce9655ebbdfd..60aaac47e220debdb07fa2fc0d6f44ee5ae06e16 100755 +index d4394b6929c5b811955c84b6b383428f6a28a129..9e67ad7a0e5f267ed3383bb811fdaf6b9aebe133 100755 --- a/tools/json_schema_compiler/idl_schema.py +++ b/tools/json_schema_compiler/idl_schema.py -@@ -591,6 +591,8 @@ class IDLSchema(object): +@@ -590,6 +590,8 @@ class IDLSchema(object): documentation_options['namespace'] = node.value elif node.name == 'documented_in': documentation_options['documented_in'] = node.value diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch index ce62564da7b68..dd83cb55c6223 100644 --- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -index f0f0d417b29c0c4b580f56decdd8cae19f9fa587..6ebfce5fd6153e836b4c605aa4df213863d476c3 100644 +index 28f9d8d6e0934f95eb109920bd48d6096dc93982..3e3e4a166ef6dd41b4d1db6b2e631731d64750fb 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -@@ -2706,6 +2706,7 @@ chromium-metrics-reviews@google.com. +@@ -2722,6 +2722,7 @@ chromium-metrics-reviews@google.com. diff --git a/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch b/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch index 125dbde561ecd..843107b1c93dc 100644 --- a/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch +++ b/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch @@ -1,5 +1,5 @@ diff --git a/tools/metrics/histograms/metadata/page/histograms.xml b/tools/metrics/histograms/metadata/page/histograms.xml -index 149c94301e742ed1060af4b8caf38a42fe96ac20..71d7db18dad25609aedbe782b78b21698b8ae0ad 100644 +index f30866199d29ada73e47365f228ab155ffb210d3..be177f2993eb4277e8943c5f5f73ad934a8870c6 100644 --- a/tools/metrics/histograms/metadata/page/histograms.xml +++ b/tools/metrics/histograms/metadata/page/histograms.xml @@ -102,6 +102,17 @@ chromium-metrics-reviews@google.com. diff --git a/patches/tools-perf-benchmarks-system_health.py.patch b/patches/tools-perf-benchmarks-system_health.py.patch index 52dee1caef3dc..684959f758b4e 100644 --- a/patches/tools-perf-benchmarks-system_health.py.patch +++ b/patches/tools-perf-benchmarks-system_health.py.patch @@ -1,8 +1,8 @@ diff --git a/tools/perf/benchmarks/system_health.py b/tools/perf/benchmarks/system_health.py -index 420b8e1337714fc56470fff6f91a65a5b9d0b969..fa22d9bcd0bea2c0fe0c26dd3ca9f78da1e6bc94 100644 +index d041c6f74213c8ff9060edaaadfaec1a4bbab0ac..246ca9f0925d044a5ccca6482dd247218ca3cfd0 100644 --- a/tools/perf/benchmarks/system_health.py +++ b/tools/perf/benchmarks/system_health.py -@@ -263,3 +263,4 @@ class WebviewStartupSystemHealthBenchmark(perf_benchmark.PerfBenchmark): +@@ -261,3 +261,4 @@ class WebviewStartupSystemHealthBenchmark(perf_benchmark.PerfBenchmark): @classmethod def Name(cls): return 'system_health.webview_startup' diff --git a/patches/tools-perf-core-results_dashboard.py.patch b/patches/tools-perf-core-results_dashboard.py.patch index 8164bea783078..179ab1d2017e3 100644 --- a/patches/tools-perf-core-results_dashboard.py.patch +++ b/patches/tools-perf-core-results_dashboard.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/perf/core/results_dashboard.py b/tools/perf/core/results_dashboard.py -index d9d262b836877a4e39c9c3481c68aa08f1eb5796..9034695561a275e3703b0f922376aeb3ee2bf2a4 100755 +index 90c7292dfedd240cb5f06c63e18f3078c9fda343..ecf9bd1b6e2abae74c42d4241275d47535b01278 100755 --- a/tools/perf/core/results_dashboard.py +++ b/tools/perf/core/results_dashboard.py @@ -507,3 +507,4 @@ def _SendHistogramJson(url, histogramset_json, token_generator_callback): diff --git a/patches/tools-perf-core-services-dashboard_service.py.patch b/patches/tools-perf-core-services-dashboard_service.py.patch index 52a6e263fcb64..5fc3be2110814 100644 --- a/patches/tools-perf-core-services-dashboard_service.py.patch +++ b/patches/tools-perf-core-services-dashboard_service.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/perf/core/services/dashboard_service.py b/tools/perf/core/services/dashboard_service.py -index 7f2c5f15be222f2976955cf3c1ebfa26b7c480d8..057a5173ff6b3dc41ada7a7e001191d14f59b523 100644 +index bde5630a6ea555b265a47991d21bc4c140bd0cba..34ddb9736b2a0fb5a85acfd92b0fd756954ddd5a 100644 --- a/tools/perf/core/services/dashboard_service.py +++ b/tools/perf/core/services/dashboard_service.py @@ -12,7 +12,7 @@ import six.moves.urllib.parse # pylint: disable=import-error diff --git a/patches/tools-perf-process_perf_results.py.patch b/patches/tools-perf-process_perf_results.py.patch index c605e764b0ff3..38e32756510f2 100644 --- a/patches/tools-perf-process_perf_results.py.patch +++ b/patches/tools-perf-process_perf_results.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/perf/process_perf_results.py b/tools/perf/process_perf_results.py -index a04e192602461a4a1c2a63479fbff6cf7359bdb8..1d4cc09324f8a0a40a9300967e7ca18ca16498ad 100755 +index 95b4e8996f749d277b9b06fb492777c7e768f24a..e874266f1e4308c1d3b4fc01c3604dec213342e2 100755 --- a/tools/perf/process_perf_results.py +++ b/tools/perf/process_perf_results.py @@ -41,7 +41,7 @@ except ImportError: diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch index 1b3355905fca7..fa7608a99311b 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm -index 8b5753dfe97bff0186d1b6644a362c719b3c52f4..55ed4269b805c0da950cdc126718efcec57b8d8d 100644 +index 7af663f2d69495d3d46a2d1411287d1514445ed3..f4efb2586186842d5b2a9a44d5b26c4dc9730483 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm -@@ -2581,6 +2581,7 @@ void CollectAncestorRoles( +@@ -2564,6 +2564,7 @@ void CollectAncestorRoles( if (!_node) return nil; diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index bfe1ead16dda1..8bb495eb08172 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 52dc158f4ac032a1b00b8d31567180ac945b289d..50408209688ffe9502a1bcccde3768ec705d9ba3 100644 +index 3b28b01cebedfbc66539e3516a69643198b15fd1..a5a69005e1d4a37f9ba89577413f6e8d42688f9e 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -552,6 +552,7 @@ component("base") { +@@ -561,6 +561,7 @@ component("base") { "//ui/events", "//ui/events/devices", ] diff --git a/patches/ui-base-accelerators-accelerator.cc.patch b/patches/ui-base-accelerators-accelerator.cc.patch index 76f6b8a3be546..da10a49eb8a79 100644 --- a/patches/ui-base-accelerators-accelerator.cc.patch +++ b/patches/ui-base-accelerators-accelerator.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc -index c33829d85745e595e3da8d9913f6e75b05e6c4a9..8c5c93f773597e350dba008eb60c1fc4a90e7908 100644 +index 3094f8f1b445b639f43573af6f6b5ae5eddf7227..64eb26a2f5897857f23987d23797c1a6cd02384a 100644 --- a/ui/base/accelerators/accelerator.cc +++ b/ui/base/accelerators/accelerator.cc -@@ -380,6 +380,7 @@ std::u16string Accelerator::KeyCodeToName() const { +@@ -388,6 +388,7 @@ std::u16string Accelerator::KeyCodeToName() const { std::u16string Accelerator::ApplyLongFormModifiers( const std::u16string& shortcut) const { diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch index 6b374c7db7059..d94bc2a7e9576 100644 --- a/patches/ui-native_theme-native_theme_win.cc.patch +++ b/patches/ui-native_theme-native_theme_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc -index 4c922cce6fe89ca6d009d85a7963d0e0a4a0f5e3..ef22326b4a47c1786ca079924a10396d43970db7 100644 +index 547872076d126fe963650a74c0b8a72420c725a8..870a6ae11bf5dfc194cd0e841d89d91158338fec 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc @@ -1678,6 +1678,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { diff --git a/patches/ui-views-accessibility-accessibility_paint_checks.cc.patch b/patches/ui-views-accessibility-accessibility_paint_checks.cc.patch index 3f7f6c546a6e3..8962263cef23f 100644 --- a/patches/ui-views-accessibility-accessibility_paint_checks.cc.patch +++ b/patches/ui-views-accessibility-accessibility_paint_checks.cc.patch @@ -1,5 +1,5 @@ diff --git a/ui/views/accessibility/accessibility_paint_checks.cc b/ui/views/accessibility/accessibility_paint_checks.cc -index 9ef51ccbec639c2ed35d10a9007889562467965c..53115b0c8a362e920b82d165ceb01f515d482089 100644 +index 97f92310782792e22592ff8d76b58df5fe90e651..76418cee28053fec05b43218e7b93e239f6229cf 100644 --- a/ui/views/accessibility/accessibility_paint_checks.cc +++ b/ui/views/accessibility/accessibility_paint_checks.cc @@ -33,6 +33,7 @@ void RunAccessibilityPaintChecks(View* view) { diff --git a/patches/ui-views-controls-menu-menu_separator.cc.patch b/patches/ui-views-controls-menu-menu_separator.cc.patch index 047ec9995ceb5..1b3f22d52a513 100644 --- a/patches/ui-views-controls-menu-menu_separator.cc.patch +++ b/patches/ui-views-controls-menu-menu_separator.cc.patch @@ -1,5 +1,5 @@ diff --git a/ui/views/controls/menu/menu_separator.cc b/ui/views/controls/menu/menu_separator.cc -index 717293bf5ee8f3e27bb80480a27a3cbc263b082e..1a1c9b03ff50b9cfa5749e5bc168ab964fd224d7 100644 +index beec32eeff12ac6f377bf2052057b61a26cbf56f..588ee278ce225febda882bac2ecc1101204aec4b 100644 --- a/ui/views/controls/menu/menu_separator.cc +++ b/ui/views/controls/menu/menu_separator.cc @@ -49,6 +49,7 @@ void MenuSeparator::OnPaint(gfx::Canvas* canvas) { diff --git a/patches/ui-views-layout-layout_provider.cc.patch b/patches/ui-views-layout-layout_provider.cc.patch new file mode 100644 index 0000000000000..b78e898f6dd7c --- /dev/null +++ b/patches/ui-views-layout-layout_provider.cc.patch @@ -0,0 +1,13 @@ +diff --git a/ui/views/layout/layout_provider.cc b/ui/views/layout/layout_provider.cc +index 3684e277668347e8d4d6d08097bd8db429dcc26c..088ce543138d3e0b3a89886dacc55e59b07d328a 100644 +--- a/ui/views/layout/layout_provider.cc ++++ b/ui/views/layout/layout_provider.cc +@@ -224,7 +224,7 @@ int LayoutProvider::GetCornerRadiusMetric(ShapeContextTokens id, + case ShapeContextTokens::kMenuTouchRadius: + return GetCornerRadiusMetric(Emphasis::kHigh); + case ShapeContextTokens::kOmniboxExpandedRadius: +- return 16; ++ return 4; + case ShapeContextTokens::kTextfieldRadius: + return FocusRing::kDefaultCornerRadiusDp; + case ShapeContextTokens::kSidePanelContentRadius: diff --git a/patches/ui-webui-resources-BUILD.gn.patch b/patches/ui-webui-resources-BUILD.gn.patch index dd83ea1c6b508..82df75a9d1f0a 100644 --- a/patches/ui-webui-resources-BUILD.gn.patch +++ b/patches/ui-webui-resources-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn -index d529df2195d6ea7c095e3399980a8aed55372545..d96a3cd0dc825d9cc1348e4f9bf795489e3fea4e 100644 +index 0694d559203292afc9a1b52778be295083264306..4538861065edabf6bbd9811151cbb04cfd932026 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn -@@ -131,6 +131,7 @@ generate_grd("build_grd") { +@@ -133,6 +133,7 @@ generate_grd("build_grd") { "$root_gen_dir/ui/webui/resources/cr_components/page_image_service/resources.grdp", ] } diff --git a/patches/ui-webui-resources-cr_components-theme_color_picker-theme_color_picker.html.ts.patch b/patches/ui-webui-resources-cr_components-theme_color_picker-theme_color_picker.html.ts.patch index 0aa64c73e7723..abd4621f50e24 100644 --- a/patches/ui-webui-resources-cr_components-theme_color_picker-theme_color_picker.html.ts.patch +++ b/patches/ui-webui-resources-cr_components-theme_color_picker-theme_color_picker.html.ts.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/cr_components/theme_color_picker/theme_color_picker.html.ts b/ui/webui/resources/cr_components/theme_color_picker/theme_color_picker.html.ts -index c041589e048eba5c3dc2595ddf9a076a52822f5d..ac2e97c82ccc0903c93130a40a04af21b30357f5 100644 +index ca3a7a919ad7b67e615d85daea47354a12aeb69f..3cef0b74c170adb37503bf675e6b39c15b9fd5f6 100644 --- a/ui/webui/resources/cr_components/theme_color_picker/theme_color_picker.html.ts +++ b/ui/webui/resources/cr_components/theme_color_picker/theme_color_picker.html.ts @@ -27,21 +27,6 @@ export function getHtml(this: ThemeColorPickerElement) { diff --git a/patches/ui-webui-resources-cr_components-theme_color_picker-theme_color_picker.ts.patch b/patches/ui-webui-resources-cr_components-theme_color_picker-theme_color_picker.ts.patch index e8697bdd65f1e..9e9d74791d4ae 100644 --- a/patches/ui-webui-resources-cr_components-theme_color_picker-theme_color_picker.ts.patch +++ b/patches/ui-webui-resources-cr_components-theme_color_picker-theme_color_picker.ts.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/cr_components/theme_color_picker/theme_color_picker.ts b/ui/webui/resources/cr_components/theme_color_picker/theme_color_picker.ts -index 61d40205af66ca441f0a37e6826581ba36e43eae..6025b190cac9083a44990fc1a5f7b68e3a3bf83b 100644 +index 4556adac0404d7358d020cdff744b39c43fc5bb5..fcdb17d5503c1310915b73ff8189d19448623fa9 100644 --- a/ui/webui/resources/cr_components/theme_color_picker/theme_color_picker.ts +++ b/ui/webui/resources/cr_components/theme_color_picker/theme_color_picker.ts @@ -18,7 +18,7 @@ import type {BrowserColorVariant} from '//resources/mojo/ui/base/mojom/themes.mo diff --git a/patches/ui-webui-resources-cr_elements-BUILD.gn.patch b/patches/ui-webui-resources-cr_elements-BUILD.gn.patch index 19be809f4e550..65adadf177f16 100644 --- a/patches/ui-webui-resources-cr_elements-BUILD.gn.patch +++ b/patches/ui-webui-resources-cr_elements-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/cr_elements/BUILD.gn b/ui/webui/resources/cr_elements/BUILD.gn -index 156d3be29f8464b235854c8cb04cc080452cd9c6..6cc113feb8a6d3061ee11e093188c1b3b7da7439 100644 +index 9dea844c33bfc8df3d10eec8f2b13b110a412219..450a482439160e763f9ea50c11f224ace8deedc1 100644 --- a/ui/webui/resources/cr_elements/BUILD.gn +++ b/ui/webui/resources/cr_elements/BUILD.gn -@@ -188,6 +188,7 @@ build_webui("build") { +@@ -209,6 +209,7 @@ build_webui("build") { ts_composite = true ts_deps = [ "../js:build_ts" ] if (include_polymer) { diff --git a/patches/ui-webui-resources-cr_elements-cr_shared_style.css.patch b/patches/ui-webui-resources-cr_elements-cr_shared_style.css.patch index d0aed5d5b8d4f..c17273d5d7343 100644 --- a/patches/ui-webui-resources-cr_elements-cr_shared_style.css.patch +++ b/patches/ui-webui-resources-cr_elements-cr_shared_style.css.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/cr_elements/cr_shared_style.css b/ui/webui/resources/cr_elements/cr_shared_style.css -index 29c0e7ac13cdd91ede4b84ad97eb69e3112230b4..318469776c355f2484a147c78c5caa7c1787e156 100644 +index 89870c0ee9fcdc9a7b9a33fba0231ab5ee8403fb..b86edad614eaaac83a46786a003fcb44d12c6123 100644 --- a/ui/webui/resources/cr_elements/cr_shared_style.css +++ b/ui/webui/resources/cr_elements/cr_shared_style.css @@ -8,7 +8,8 @@ diff --git a/patches/ui-webui-resources-cr_elements-cr_shared_vars.css.patch b/patches/ui-webui-resources-cr_elements-cr_shared_vars.css.patch index e3a4c115fd1db..8fd92f2f93fc5 100644 --- a/patches/ui-webui-resources-cr_elements-cr_shared_vars.css.patch +++ b/patches/ui-webui-resources-cr_elements-cr_shared_vars.css.patch @@ -1,11 +1,11 @@ diff --git a/ui/webui/resources/cr_elements/cr_shared_vars.css b/ui/webui/resources/cr_elements/cr_shared_vars.css -index c54af3a1b4b874e2c4c6c69557eda15dea60a8c4..20f0ad6f91f955d77659a1859d37e9d05aff0a3d 100644 +index 8a46bf30e78a3422c9a0e3e75b04a83243181e62..2fb34eb033aeb9f0a90be184ca56f05bfbd310b5 100644 --- a/ui/webui/resources/cr_elements/cr_shared_vars.css +++ b/ui/webui/resources/cr_elements/cr_shared_vars.css @@ -4,6 +4,7 @@ /* #css_wrapper_metadata_start - * #type=vars + * #type=vars-lit + * #import=//resources/brave/br_elements/br_shared_vars.css.js * #scheme=relative * #css_wrapper_metadata_end */ diff --git a/patches/ui-webui-resources-cr_elements-cr_toolbar-cr_toolbar.ts.patch b/patches/ui-webui-resources-cr_elements-cr_toolbar-cr_toolbar.ts.patch index 465ae88cde238..b387e95084152 100644 --- a/patches/ui-webui-resources-cr_elements-cr_toolbar-cr_toolbar.ts.patch +++ b/patches/ui-webui-resources-cr_elements-cr_toolbar-cr_toolbar.ts.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.ts b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.ts -index b365acb97762c8f377936a27e9025a5b87050b8f..d1fcc501187462cbecfbbe8a06f20235856cf700 100644 +index 373d40085893060668d7a9de4dc97892cb25a0be..88ba654c61e665b1509e78d1da67b67baa85bfc2 100644 --- a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.ts +++ b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.ts -@@ -144,4 +144,4 @@ declare global { +@@ -156,4 +156,4 @@ declare global { } } diff --git a/patches/ui-webui-resources-tools-build_webui.gni.patch b/patches/ui-webui-resources-tools-build_webui.gni.patch index 788950a86e500..5b3e9ec23cdb0 100644 --- a/patches/ui-webui-resources-tools-build_webui.gni.patch +++ b/patches/ui-webui-resources-tools-build_webui.gni.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/tools/build_webui.gni b/ui/webui/resources/tools/build_webui.gni -index 21ab3cc2a5988fa2a4b7d4c02e3ff48e6b93fe77..7bdcdae9bc6e9f90bef7429345f6885a1ba0e789 100644 +index 5fc0b72dab5b80d217baf35d50bd863b56858059..e1ef37250a4aed9adac3480b93f26fc2022b1a86 100644 --- a/ui/webui/resources/tools/build_webui.gni +++ b/ui/webui/resources/tools/build_webui.gni @@ -186,6 +186,7 @@ template("build_webui") { diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index 0fd67d403e2b3..228b425fd1a75 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index 79b95fb517e05978d3d72a2a8b1e7b795dd8769d..325065686cb3ddce7ffbba9f38aa8e2b8c101a67 100644 +index c2c11c24ace1b2c54f47ce9a1587102f9682f22d..ee168abbc47ebc935dce9d7e3c906665114a7bae 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -747,6 +747,7 @@ config("internal_config_base") { +@@ -754,6 +754,7 @@ config("internal_config_base") { "include", "$target_gen_dir", ] @@ -10,7 +10,7 @@ index 79b95fb517e05978d3d72a2a8b1e7b795dd8769d..325065686cb3ddce7ffbba9f38aa8e2b } config("internal_config") { -@@ -3122,6 +3123,7 @@ v8_header_set("v8_headers") { +@@ -3125,6 +3126,7 @@ v8_header_set("v8_headers") { ":cppgc_headers", ":v8_version", ] diff --git a/patches/v8/src-codegen-compiler.cc.patch b/patches/v8/src-codegen-compiler.cc.patch index 60e112ff31e77..051f9dd2c6a90 100644 --- a/patches/v8/src-codegen-compiler.cc.patch +++ b/patches/v8/src-codegen-compiler.cc.patch @@ -1,8 +1,8 @@ diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc -index afb74deec375824e5d64830879ef7e09b021a3bc..e1a49e3342c317807d969e71bd45aee6fda8c1c6 100644 +index ff33cd15b19622d35d417d9407864bf50fb04b9d..7e7a8b005f246e0bf4a537819a6f77904ed7f495 100644 --- a/src/codegen/compiler.cc +++ b/src/codegen/compiler.cc -@@ -3013,6 +3013,7 @@ MaybeHandle Compiler::GetFunctionFromEval( +@@ -3015,6 +3015,7 @@ MaybeHandle Compiler::GetFunctionFromEval( } } DCHECK(is_compiled_scope.is_compiled()); diff --git a/renderer/brave_wallet/brave_wallet_render_frame_observer.cc b/renderer/brave_wallet/brave_wallet_render_frame_observer.cc index d8d02a4c15b01..ad168a26f5ecc 100644 --- a/renderer/brave_wallet/brave_wallet_render_frame_observer.cc +++ b/renderer/brave_wallet/brave_wallet_render_frame_observer.cc @@ -105,14 +105,16 @@ void BraveWalletRenderFrameObserver::DidClearWindowObject() { } if (dynamic_params.install_window_brave_ethereum_provider && - web_frame->GetDocument().IsDOMFeaturePolicyEnabled(context, "ethereum")) { + web_frame->GetDocument().IsDOMFeaturePolicyEnabled(isolate, context, + "ethereum")) { JSEthereumProvider::Install( dynamic_params.install_window_ethereum_provider, dynamic_params.allow_overwrite_window_ethereum_provider, render_frame()); } - if (web_frame->GetDocument().IsDOMFeaturePolicyEnabled(context, "solana") && + if (web_frame->GetDocument().IsDOMFeaturePolicyEnabled(isolate, context, + "solana") && dynamic_params.brave_use_native_solana_wallet) { JSSolanaProvider::Install( dynamic_params.allow_overwrite_window_solana_provider, render_frame()); diff --git a/script/brave_license_helper.py b/script/brave_license_helper.py index 2831f6b65d8b2..9de5a7dc738a7 100644 --- a/script/brave_license_helper.py +++ b/script/brave_license_helper.py @@ -47,6 +47,8 @@ def AddBraveCredits(root, prune_paths, special_cases, prune_dirs, os.path.join('brave', 'third_party', 'blink'), os.path.join('brave', 'third_party', 'libaddressinput'), os.path.join('brave', 'patches', 'third_party'), + os.path.join('brave', 'third_party', 'polymer'), + os.path.join('brave', 'third_party', 'lit'), # Dependencies that are already in brave-core, and whose notices # therefore do not need to be repeated. diff --git a/test/BUILD.gn b/test/BUILD.gn index f619ecc3bc210..e2eb5ce86c04f 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1265,6 +1265,7 @@ if (is_android) { "//chrome/browser/tab_ui/android:java", "//chrome/browser/tabmodel:java", "//chrome/browser/ui/android/appmenu:java", + "//chrome/browser/ui/android/desktop_windowing:java", "//chrome/browser/ui/android/layouts:java", "//chrome/browser/ui/android/logo:java", "//chrome/browser/ui/android/native_page:java", diff --git a/test/data/ephemeral-storage/static/js/frames/ephemeral-storage.js b/test/data/ephemeral-storage/static/js/frames/ephemeral-storage.js index f188c1342e39e..ad6c680e74cda 100644 --- a/test/data/ephemeral-storage/static/js/frames/ephemeral-storage.js +++ b/test/data/ephemeral-storage/static/js/frames/ephemeral-storage.js @@ -29,7 +29,7 @@ const clearStorage = async key => { const result = Object.create(null) try { - if (W.navigator.cookieEnabled === false) { + if (W.navigator.cookieEnabled === false || !await W.document.hasStorageAccess()) { result.cookies = exceptionEncoding } else { C.remove(key) @@ -66,7 +66,7 @@ const readStorageAction = async key => { const result = Object.create(null) try { - if (W.navigator.cookieEnabled === false) { + if (W.navigator.cookieEnabled === false || !await W.document.hasStorageAccess()) { result.cookies = exceptionEncoding } else { const readCookieValue = C.get(key) @@ -100,7 +100,7 @@ const writeStorageAction = async (key, value) => { const result = Object.create(null) try { - if (W.navigator.cookieEnabled === false) { + if (W.navigator.cookieEnabled === false || !await W.document.hasStorageAccess()) { result.cookies = false } else { C.set(key, value, { diff --git a/test/filters/browser_tests-windows.filter b/test/filters/browser_tests-windows.filter index d39a1fa446f0a..c27b5256084b2 100644 --- a/test/filters/browser_tests-windows.filter +++ b/test/filters/browser_tests-windows.filter @@ -25,6 +25,7 @@ -CmdLineURLIncognitoBasicTestFeatureEnabled/LaunchNavigationBrowserBasicTest.CmdLineLaunch/0 -PersistentBackground/ExtensionWebRequestApiTestWithContextType.WebRequestRedirectsWorkers/BackgroundResourceFetchDisabled -PersistentBackground/ExtensionWebRequestApiTestWithContextType.WebRequestRedirectsWorkers/BackgroundResourceFetchEnabled +-ServiceWorker/AutomationApiTestWithContextType.ForceLayout/* -ServiceWorker/ExtensionWebRequestApiTestWithContextType.WebRequestRedirectsWorkers/BackgroundResourceFetchDisabled -ServiceWorker/ExtensionWebRequestApiTestWithContextType.WebRequestRedirectsWorkers/BackgroundResourceFetchEnabled @@ -53,6 +54,9 @@ # These tests fail upstream when DCHECKs are enabled. -PenIdBrowserTest.* +# This test is disabled because we override the default handling of the welcome page +-StartupBrowserCreatorTriggeredResetFirstRunTest.TestTriggeredResetDoesNotShowWithFirstRunURLs + -All/MediaEngagementAutoplayBrowserTest.* -All/ExternallyManagedBrowserTestWithPrefMigrationRead.ReinstallPolicyAppWithLocallyInstalledApp/1 -All/PDFPluginDisabledTest.* diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter index 231ce1a7e3c53..94e3b8da90e90 100644 --- a/test/filters/browser_tests.filter +++ b/test/filters/browser_tests.filter @@ -34,9 +34,6 @@ -ContextMenuFencedFrameTest.AutomaticBeaconSentAfterContextMenuNavigation -CookiesTreeModelBrowserTest.NonDefaultStoragePartition -CredentialManagerAvatarTest.AvatarFetchIsolatedPerOrigin --CrossOriginRedirectReduceAcceptLanguageOTBrowserTest.* --DisableFeatureReduceAcceptLanguageBrowserTest.* --DisableReduceAcceptLanguageOTBrowserTest.* -IsolatedOriginNTPBrowserTest.IsolatedOriginDoesNotInterfereWithNTP -LensDesktopNTPSearchEnabledPolicyTest.LensSearchButtonHidden -NewTabPageNavigationThrottleFencedFrameTest.FencedFrameDoesNotResetNewTabStartTime @@ -49,11 +46,8 @@ -PasswordDialogViewTest.PopupAccountChooserWithMultipleCredentialsReturnEmpty -ProfilePickerViewBrowserTest.ShowScreen_* -RuntimeGetContextsApiTest.GetOffscreenDocumentContext --SameOriginRedirectReduceAcceptLanguageOTBrowserTest.* --SameOriginReduceAcceptLanguageOTBrowserTest.* -SerialBlocklistTest.* -SerialTest.* --ThirdPartyReduceAcceptLanguageOTBrowserTest.* -WebAppFileHandlingBrowserTest.* -WebBluetoothPolicyTest.* -WebBluetoothTest.* @@ -211,6 +205,7 @@ -ServiceWorkerAndFalse/ExtensionBackForwardCacheWithPrerenderBrowserTest.PortIsStillOpenAfterPrerenderAndActivate/0 -ServiceWorkerAndTrue/ExtensionBackForwardCacheWithPrerenderBrowserTest.PortIsStillOpenAfterPrerenderAndActivate/0 -WebAppLinkCapturingBrowserTest.NoLinkCapturePrerenderNavigation/* +-WebNavigationApiPrerenderTestWithServiceWorker.Prerendering # These tests fail because of the following failed expectation in prerender_test_util.cc: # Expected: (host_id) != (RenderFrameHost::kNoFrameTreeNodeId), actual: -1 vs -1 @@ -230,6 +225,7 @@ -All/PrerenderNewTabPageBrowserTest.DestroyedOnNavigatedAway/* -All/PrerenderNewTabPageBrowserTest.NewTabPagePrerenderNonHttps/* -All/PrerenderNewTabPageBrowserTest.PrerenderTriggeredByNewTabPageAndActivate/* +-All/PrerenderNewTabPageBrowserTest.PrerenderTriggeredCancelAndRetrigger/* -All/PrerenderNewTabPageBrowserTest.PrerenderTriggeredCanceled/* -All/PrerenderOmniboxSearchSuggestionReloadBrowserTest.* -All/PrintPrerenderBrowserTest.* @@ -238,6 +234,7 @@ -All/SafeBrowsingThreatDetailsPrerenderBrowserTest.* -All/SearchEngineTabHelperPrerenderingBrowserTest.* -All/TranslateManagerPrerenderBrowserTest.* +-All/WebUIContentsPreloadManagerBrowserTest.TriggerPreloadedUI/* -AppBannerManagerPrerenderBrowserTest.* -AutofillTestPrerendering.DeferWhilePrerendering -BookmarkBarPageLoadMetricsBrowserTest.NonBookmarkPrerenderTriggeredByEmbedderAndActivate @@ -378,6 +375,7 @@ -PrivacySandboxSettingsEventReportingBrowserTest.ReportEventDestinationNotEnrolled # These tests fail because we disable privacy_sandbox::kPrivacySandboxSettings4 +-PrivacySandboxRestrictedNoticeConfirmationTest.RestrictedNoticeTest/* -PrivacySandboxSettingsEventReportingBrowserTest/PrivacySandboxSettingsEventReportingBrowserTest.AutomaticBeaconDestinationEnrollment/* -PrivacySandboxSettingsEventReportingBrowserTest/PrivacySandboxSettingsEventReportingBrowserTest.ReportEventCustomURLDestinationEnrollment/* -PrivacySandboxSettingsEventReportingBrowserTest/PrivacySandboxSettingsEventReportingBrowserTest.ReportEventDestinationEnrollment/* @@ -438,10 +436,13 @@ # These tests fail because we've already implemented similar changes to prevent # language fingerprinting, regardless of the feature flag state --DisableFeatureReduceAcceptLanguageBrowserTest.NoAcceptLanguageHeader --SameOriginReduceAcceptLanguageOTBrowserTest.IframeRequestOriginTrial --SameOriginReduceAcceptLanguageOTBrowserTest.ImgSubresourceRequestOriginTrial --SameOriginReduceAcceptLanguageOTBrowserTest.SubresourceRequestNoRestart +-CrossOriginRedirectReduceAcceptLanguageOTBrowserTest.* +-DisableFeatureReduceAcceptLanguageBrowserTest.* +-DisableReduceAcceptLanguageOTBrowserTest.* +-SameOriginRedirectReduceAcceptLanguageOTBrowserTest.* +-SameOriginReduceAcceptLanguageBrowserTest.EmptyUserAcceptLanguage +-SameOriginReduceAcceptLanguageOTBrowserTest.* +-ThirdPartyReduceAcceptLanguageOTBrowserTest.* # These tests fail because the primary account consent level is null instead of # signin::ConsentLevel::kSignin @@ -452,12 +453,18 @@ -ContextMenuForSupervisedUsersBrowserTest.SaveLinkAsEntryIsDisabledForUrlsBlockedByAsyncCheckerForChild -ContextMenuForSupervisedUsersBrowserTest.SaveLinkAsEntryIsDisabledForUrlsNotAccessibleForChild -ContextMenuForSupervisedUsersBrowserTest.SaveLinkAsEntryIsEnabledForUrlsAllowedByAsyncCheckerForChild +-CookieClearOnExitMigrationNoticeBrowserTest.* +-CookieClearOnExitMigrationNoticePixelTest.* -DiceBrowserTextWithExplicitSignin.SigninWithChoiceRemembered_* +-EnclaveAuthenticatorBrowserTest.GpmPinRegistrationPersistAcrossRestart -EnclaveAuthenticatorBrowserTest.MakeCredential_RecoverWithGPMPIN_Success -EnclaveAuthenticatorBrowserTest.MakeCredential_RecoverWithLSKF_Success -EnclaveAuthenticatorBrowserTest.RecoverWithLSKF_GetAssertion_Success -EnclaveAuthenticatorBrowserTest.RegisterDeviceWithGpmPin_MakeCredentialWithUV_Success -EnclaveAuthenticatorBrowserTest.RegisterDeviceWithGpmPin_MakeCredential_Success +-EnclaveAuthenticatorBrowserTest.RegisterDeviceWithGpmPin_UVRequestsWithWrongPIN +-EnclaveAuthenticatorWithoutPinBrowserTest.* +-EnclaveAuthenticatorWithPinBrowserTest.* -LocalWebApprovalsEnabled/SupervisedUserIframeFilterTest.*/* -PasswordStatusCheckServiceBaseTest.CheckTimeUpdatedAfterRunScheduledInThePast -PowerBookmarkBubbleViewBrowserTest.InvokeUi_bookmark_details_on_trackable_product @@ -552,6 +559,8 @@ -RequestStorageAccessForOriginWithFirstPartySetsDisabledBrowserTest.* -RequestStorageAccessForWithFirstPartySetsBrowserTest.PermissionQueryCrossSiteFrame -RequestStorageAccessForWithFirstPartySetsBrowserTest.Permission_AutodeniedForServiceDomain +-StorageAccessAPIAutograntsWithFedCMBrowserTest.* +-StorageAccessAPIAutograntsWithFedCMOriginTrialBrowserTest.* -StorageAccessAPIBrowserTest.Permission_Denied_WithoutInteraction/* -StorageAccessAPIForOriginBrowserTest.* -StorageAccessAPIForOriginWithFirstPartySetsBrowserTest.* @@ -581,6 +590,7 @@ -BackgroundPage/ExtensionPreferenceApiTest.ThirdPartyCookiesAllowed/0 -EventPage/ExtensionPreferenceApiEventPageTest.ThirdPartyCookiesAllowed/0 -HTTPErrProcBrowserTest.* +-ManagerBrowserTest.TpcdDtGracePeriodEnforced_InValidDtToken -PageLoadMetricsPre3pcdBrowserTest.NoStatePrefetchMetrics -PageSpecificSiteDataDialogPre3pcdBrowserTest.PartitionedCookiesAndAllowedThirdParty -ProfileNetworkContextServiceResourceBlocklistBrowsertest.ThirdPartyCookiesAllowed @@ -622,6 +632,10 @@ -PermissionManagerBrowserTest.ServiceWorkerPermissionAfterRendererCrash -PermissionManagerBrowserTest.ServiceWorkerPermissionQueryIncognitoClose +# This test fails because it doesn't expect to see the shields extension when +# looking for the built-in PDF extension +-DebuggerExtensionApiOopifPdfTest.GetTargets + # Tests crash due to a vector allocation failure. This seems to be happening # because the lambda to which the vector is passed is being called after the # test's scope has already been left. @@ -813,6 +827,8 @@ # These tests fail because of the following CHECK in identity_test_utils.cc: # identity_manager->AreRefreshTokensLoaded() +-All/AvatarToolbarButtonBrowserTestWithExplicitBrowserSignin.*/* +-All/ProfileMenuViewSignoutTestWithExplicitBrowserSigninFeature.*/* -AvatarToolbarButtonEnterpriseBadgingBrowserTest.WorkBadgeNonTransientModeAndSyncPause -AvatarToolbarButtonEnterpriseBadgingBrowserTest.WorkBadgeTransientModeAndSyncPause -AvatarToolbarButtonWithExplicitBrowserSigninBrowserTest.SigninPaused* @@ -843,6 +859,10 @@ -PasswordRevampedManagementBubbleBrowserTest.InvokeUi_ManagePasswordBubbleWithRevampedDesign/* -PlusAddressServiceBrowserTest.VerifySupportsPlusAddresses -PrivacyBudgetMetaExperimentBrowserTestWithUkmRecording.ReportsEncounteredSurfacesAndDocumentCreatedMetrics +-ProfileMenuClickTest_WithPendingAccount_UnoEnabled.ProfileMenuClickTest_WithPendingAccount_UnoEnabled/* +-ProfileMenuViewSigninPendingTest.OpenReauthTab +-SaveCardBubbleViewsFullFormBrowserTestWithAutofillUpstream/SaveCardBubbleViewsFullFormBrowserTestWithAutofillUpstreamParameterized.Upload_CardholderNameRequested_SubmittingChangedValueLogsEditedMetric/* +-SaveCardBubbleViewsFullFormBrowserTestWithAutofillUpstream/SaveCardBubbleViewsFullFormBrowserTestWithAutofillUpstreamParameterized.Upload_CardholderNameRequested_SubmittingPrefilledValueLogsUneditedMetric/* -SaveCardBubbleViewsFullFormBrowserTestWithAutofillUpstream/SaveCardBubbleViewsFullFormBrowserTestWithAutofillUpstreamParameterized.Upload_EnteringCardholderNameAndClickingSaveAcceptsBubbleIfCardholderNameRequested/* -SaveCardBubbleViewsSyncTransportFullFormBrowserTest/SaveCardBubbleViewsSyncTransportFullFormBrowserTestParameterized.Upload_TransportMode_ClickingSaveAcceptsBubble/* -SyncConfirmationUIDialogPixelTest.InvokeUi_default/* @@ -856,7 +876,9 @@ -All/SupervisedUserRegionalURLFilterTest.RegionIsAdded/* -All/SupervisedUserServiceBrowserTest.LocalPolicies/* -All/SupervisedUserServiceBrowserTest.ProfileName/* +-All/SupervisedUserSkipParentalApprovalModeReleaseTest.OnFeatureReleaseForSupervisedUserWithExtensions/WithParentalControlsOnExtensionsManagedByExtensions -All/SupervisionRemovalExtensionTest.RemoveCustodianApprovalRequirement/* +-All/UserGellerizationExtensionTest.*/* -IpProtectionAuthTokenProviderBrowserTest.NetworkServiceCanRequestTokens -IpProtectionConfigProviderBrowserTest.BackoffTimeResetAfterProfileAvailabilityChange -IpProtectionConfigProviderBrowserTest.ExpectedReceiverSetStateAfterNetworkServiceCrash @@ -897,13 +919,14 @@ -DisallowManagedProfileSignoutFeature/UserPolicySigninServiceTest.* # These tests fail because we disable DIPS via features::kDIPS +-All/DIPSDataDeletionBrowserTest.* +-All/DIPSPrivacySandboxDataPreservationTest.* -All/DIPSPrivacySandboxDataTest.DontClearAttributionReportingApiData/* -All/DIPSSiteDataAccessDetectorTest.AttributeSameSiteIframesSiteDataAccessTo1P/* -All/DIPSSiteDataAccessDetectorTest.AttributeSameSiteNestedIframesSiteDataAccessTo1P/* -All/DIPSSiteDataAccessDetectorTest.DetectSiteDataAccess_Storages/* -All/DIPSSiteDataAccessDetectorTest.DiscardFencedFrameCookieClientAccess/* -All/DIPSSiteDataAccessDetectorTest.DiscardPrerenderedPageCookieClientAccess/* --All/DIPSDataDeletionBrowserTest.* -All/DIPSTabHelperBrowserTest.*/* -All/OpenerHeuristicBackfillGrantBrowserTest.TrackingProtectionOnboardingCreatesBackfillGrants/* -All/OpenerHeuristicCurrentInteractionGrantBrowserTest.AdTaggedPopupInteractionWithStorageAccessGrant/* @@ -919,6 +942,7 @@ -AllSitesFollowingFirstPartyTest.SiteNotFollowingFirstPartyNotIncluded -DIPSBounceDetectorBrowserTest.* -DIPSBounceTrackingDevToolsIssueTest.BounceTrackingDevToolsIssue +-DIPSPrivacySandboxApiInteractionTest.* -DIPSThrottlingBrowserTest.* -DIPSWebAuthnBrowserTest.ReportRedirectorsInChain_OmitSitesWithWebAuthnAssertions -DIPSWebAuthnBrowserTest.WebAuthnAssertion_ConfirmWCOCallback @@ -970,6 +994,7 @@ -LoadingPredictorExtensionBrowserTest.PrefetchObservedByExtension -ModelExecutionDisabledBrowserTest.* -ModelExecutionEnabledBrowserTestWithExplicitBrowserSignin.EnableFeatureViaPref +-ModelExecutionEnabledOnDeviceDisabledBrowserTest.* -ModelExecutionEnterprisePolicyBrowserTest.DisableThenEnable -ModelExecutionEnterprisePolicyBrowserTest.DisableThenEnableCompose -ModelExecutionEnterprisePolicyBrowserTest.DisableThenEnableWallpaperSearch @@ -1092,6 +1117,7 @@ # (BraveIsAllowedThirdParty) -ChromeSharedDictionaryBrowserTest.BlockReadingCrossOrigin -ChromeSharedDictionaryBrowserTest.BlockWritingCrossOrigin +-SharedDictionaryDevToolsBrowserTest.WriteErrorDisallowedBySettings # These fail because we disable kFirstPartySets -RequestStorageAccessForBrowserTest.ThirdPartyGrantsExpireOverIPC @@ -1147,8 +1173,12 @@ -CompanionPage* -SidePanelCompanion2BrowserEnabledTest.FeatureEnabled -# These tests fail because they enable the kChromeRefresh2023 feature, which our -# code is not expecting. +# This test fails because we provide our own override of the side panel which +# does not enable this feature +-LensOverlayControllerBrowserTest.OverlaySidePanelEdgeCaseInteractions + +# These tests fail because they enable (or require) the kChromeRefresh2023 +# feature, which our code is not expecting. -All/BrowserFrameColorProviderTest.BaselineThemeIgnoresNativeThemeColor/1 -All/BrowserFrameColorProviderTest.BrowserFrameTracksBrowserColorVariant/1 -All/BrowserFrameColorProviderTest.BrowserFrameTracksIsGrayscale/1 @@ -1179,6 +1209,7 @@ -PinnedToolbarActionsModelBrowserTest.* -ProfileMenuViewPixelTest.InvokeUi_default/* -ProfilePickerUIPixelTest.InvokeUi_default/CR2023 +-ProductSpecificationsButtonBrowserTest.* -RealboxHandlerIconTest/BrowserTestWithParam.ActionVectorIcons/0 -RealboxHandlerIconTest/BrowserTestWithParam.ActionVectorIcons/2 -RealboxHandlerIconTest/BrowserTestWithParam.AnswerVectorIcons/0 @@ -1393,6 +1424,7 @@ -ControlledFrameDisabledTest.* -ControlledFrameNotAvailableChannels/ControlledFrameNotAvailableChannelTest.* -ExtensionWindowCreateIwaTest.* +-IsolatedWebAppApiAccessBrowserTest.* -IsolatedWebAppApplyUpdateCommandBrowserTest.* -IsolatedWebAppExtensionBrowserTest.* -IsolatedWebAppInstallerBrowserTest.* @@ -1445,6 +1477,13 @@ -All/SearchEnginePreconnectorEnabledOnlyBrowserTest.AllowedSearch/* -All/SearchEnginePreconnectorNoDelaysBrowserTest.PreconnectOnlyInForeground/* +# Marked as consistently failing upstream, see crbug.com/336983096 +-BrowserUserEducationServiceBrowserTest.FeatureConfigurationConsistencyCheck + +# This test fails because we rename profile names from (for example) "Person 1" +# to "Profile 1" +-CreateDesktopShortcutDialogViewBrowserTest.InvokeUi_TitleHasProfileNameInfoMultiProfile + # Tests below this point have not been diagnosed or had issues created yet. -_/WebrtcLoggingPrivateApiStartEventLoggingTestFeatureAndPolicyEnabled.* -AccessCodeCastHandlerBrowserTest.* @@ -1460,6 +1499,7 @@ -All/AmpPageLoadMetricsBrowserTest.* -All/BFCachePolicyBrowserTest.* -All/BrowsingDataRemoverBrowserTestP.* +-All/ChromeBackForwardCacheBrowserWithEmbedPdfTest.*/* -All/ChromeBackForwardCacheBrowserWithEmbedTest.*/* -All/ChromeBrowsingDataLifetimeManagerScheduledRemovalTest.* -All/ChromeBrowsingDataLifetimeManagerShutdownTest.*/* @@ -1736,6 +1776,7 @@ -GuestStartupBrowserCreatorPickerTest.* -HangoutServicesBrowserTest.* -HeadlessModeCommandBrowserTest_DumpDomWithBeforeUnloadPreventDefault.DumpDomWithBeforeUnloadPreventDefault +-HeadlessModeCommandBrowserTest_PrintToPdfWithLazyLoading.PrintToPdfWithLazyLoading -HeadlessModeDumpDomCommandBrowserTest.HeadlessDumpDom* -HeadlessModeDumpDomCommandBrowserTestWithTimeout.HeadlessDumpDomWithTimeout -HeadlessModeLazyLoadingPrintToPdfCommandBrowserTest.HeadlessLazyLoadingPrintToPdf @@ -1968,7 +2009,6 @@ -ProfileMenuClickTest_WithUnconsentedPrimaryAccount.* -ProfileMenuViewExtensionsTest.* -ProfileMenuViewSignoutTest.* --ProfileMenuViewSignoutTestWithExplicitBrowserSigninFeature.* -ProfileMenuViewSignoutTestWithNetwork.Signout/* -ProfileMenuViewSyncErrorButtonTest.* -ProfileNetworkContextServiceBrowsertest.* @@ -2030,6 +2070,7 @@ -SaveCardBubbleViewsFullFormBrowserTestWithAutofillUpstream.* -SaveCardBubbleViewsFullFormBrowserTestWithLoadingAndConfirmation.* -SaveCardBubbleViewsSyncTransportFullFormBrowserTest.* +-SaveCardBubbleViewsSyncTransportFullFormBrowserTest/* -SavePageBrowserTest.* -SCTReportingServiceBrowserTest.ReportsSentAfterNetworkServiceRestart -SearchApiTest.* @@ -2076,6 +2117,7 @@ -SharedClipboardBrowserTest.* -SharedClipboardUIFeatureDisabledBrowserTest.* -SharedHighlightingBrowserTest.* +-ShortcutLaunchTestFoundProfile.SpecifiedProfileUsed -SignedExchangePolicyBrowserTest.BlockList -SignedExchangePolicyTest.* -SignedExchangeSecurityStateTest.SecurityLevelIsSecure diff --git a/test/filters/unit_tests-linux.filter b/test/filters/unit_tests-linux.filter index 1a730626db5b6..64e9a5fb9ffcc 100644 --- a/test/filters/unit_tests-linux.filter +++ b/test/filters/unit_tests-linux.filter @@ -21,6 +21,7 @@ # OsIntegrationTestOverride::IsRunOnOsLoginEnabled on Linux hard-codes "chrome-" # into the shortcut name but our shortcut starts with "brave-". -RunOnOsLoginSubManagerExecuteTest.* +-ShortcutCreatorLinuxTest.ShortcutCreatedWithCorrectFile -ShortcutSubManagerExecuteTest.* -InstallAppLocallyCommandTest.BasicBehavior -WebAppPolicyForceUnregistrationTest.* diff --git a/test/filters/unit_tests.filter b/test/filters/unit_tests.filter index 67f961210a07d..e69bac345023c 100644 --- a/test/filters/unit_tests.filter +++ b/test/filters/unit_tests.filter @@ -42,6 +42,7 @@ -All/PriceTrackingViewFeatureFlagTest.PriceTrackingViewCreation/* -All/PrintContentAnalysisUtilsTest.*/* -All/SyncConfirmationHandlerTest.* +-All/TabStripModelTest.NavigationForgettingDoesntAffectNewTab/* -ApcScrimManagerImplTest.DisabledScrimCannotBeShown -ApcScrimManagerImplTest.HideDoesNotImmediatelySetOriginalAxMode -ApcScrimManagerImplTest.HideFocusOnTheWebContent @@ -64,6 +65,7 @@ -BrowserCommandControllerWithBookmarksTest.BookmarkAllTabsUpdatesOnTabStripChanges -BrowserFeaturePromoControllerPolicyTest.* -BrowserFeaturePromoControllerPriorityTest.* +-BrowserFeaturePromoControllerRotatingPromoTest.* -BrowserFeaturePromoControllerViewsTest.* -BrowserFinderTest.ScheduledForDeletion -BrowserViewPipTest.CanFullscreenPolicyDoesNotEnableFullscreen @@ -88,10 +90,13 @@ -CookieControlsIconViewUnitTest.* -CookieControlsUserBypassTest.SiteCounts -CoreTabHelperWindowUnitTest.SearchWithLens_LensPingEnabled_TriggersLensPing +-CpuHealthTrackerBrowserTest.* -CustomCursorSuppressorTest.* -CustomizeChromeFeaturePromoHelperTest.* -DefaultBrowserPromptManagerTest.* -DeleteAddressProfileDialogControllerImplTest.* +-DesktopTabModelURLVisitDataFetcherTest.FetchURLVisitData +-DesktopTabModelURLVisitDataFetcherTest.FetchURLVisitData_AggregateValues -DiceWebSigninInterceptorTestWithUnoDisabled.InterceptShouldLogChromeSigninBubbleOfferedForControlGroup -DiceWebSigninInterceptorTestWithUnoEnabled.* -DoesFirstPartyPrecedeThirdPartyTest.* @@ -154,9 +159,7 @@ -PageInfoCookiesContentView3pcdCookieToggleTest.* -PageInfoCookiesContentView3pcdTitleAndDescriptionTest.* -PageInfoCookiesContentViewPre3pcdTest.* --PageInfoPermissionContentViewTestMediaPreview.MediaPreviewCamera --PageInfoPermissionContentViewTestMediaPreview.MediaPreviewMic --PageInfoPermissionContentViewTestMediaPreview.MediaPreviewNoCameraOrMic +-PageInfoPermissionContentViewTestMediaPreview.MediaPreview* -PageInfoPreviewsCoordinatorDeathTest.NeitherCameraNorMic -PageInfoPreviewsCoordinatorTest.MediaStreamCamera -PageInfoPreviewsCoordinatorTest.MediaStreamMic @@ -168,10 +171,7 @@ -PeopleHandlerSignoutTest.SignoutWithSyncOff -PeopleHandlerSignoutTest.SignoutWithSyncOn -PermissionDashboardUnitTest.DisplayLHSIndicatorForCamera* --PermissionPromptBubbleOneOriginViewTestMediaPreview.MediaPreviewCameraAndMic --PermissionPromptBubbleOneOriginViewTestMediaPreview.MediaPreviewCameraOnly --PermissionPromptBubbleOneOriginViewTestMediaPreview.MediaPreviewMicOnly --PermissionPromptBubbleOneOriginViewTestMediaPreview.MediaPreviewNoCameraOrMic +-PermissionPromptBubbleOneOriginViewTestMediaPreview.MediaPreview* -PermissionPromptPreviewsCoordinatorDeathTest.NoEligibleDevices -PermissionPromptPreviewsCoordinatorTest.EligibleCameras -PermissionPromptPreviewsCoordinatorTest.EligibleCamerasandMics @@ -190,6 +190,8 @@ -ReadAnythingCoordinatorScreen2xDataCollectionModeTest.OnBrowserSetLastActive_SidePanelIsVisible -ReadAnythingCoordinatorWebUIToolbarTest.WithWebUIFlagEnabled_ShowsWebUIToolbar -RecentSessionObserverImplTest.OnRecentSessionsUpdated +-RecentSessionObserverImplTest.SessionCallback +-RecentSessionObserverImplTest.SessionCallbackOnObserve -SaveCardBubbleControllerImplTestWithCvCStorageAndFilling.* -SaveCardBubbleControllerImplTestWithLoadingAndConfirmation.Metrics_* -SaveCardBubbleControllerImplTestWithLoadingAndConfirmation.Upload_OnSave_HideIconAndBubbleAfterUpload @@ -202,6 +204,7 @@ -SidePanelPinningCoordinatorTest.SidePanelPinButtonsHideInGuestMode -SidePanelPinningCoordinatorTest.SidePanelTitleUpdates -SidePanelToolbarContainerTest.* +-SiteAccessRequestsHelperUnittest.* -TabHelperUnitTest.ClearsExtensionOnUnload -TabHelperUnitTest.ReloadRequired_BlockAllExtensions -TabHelperUnitTest.ReloadRequired_CustomizeByExtension @@ -331,6 +334,11 @@ -DiceWebSigninInterceptorTest.* -GAIAInfoUpdateServiceTest.* +# This test fails because we intentionally stub out +# IdentityManager::PrepareForAddingNewAccount +-DiceTabHelperTest.Initialization +-PreconnectEnabled/SigninDiceResponseHandlerTestPreconnect.Signin/1 + # This test fails because we disable the privacy sandbox -PrivacySandboxServiceTest.MetricsLoggingOccursCorrectly @@ -388,9 +396,12 @@ -ExtensionsHatsHandlerTest.ExtensionsPageLoad -ExtensionsHatsHandlerTest.OnSurveyInteraction -LocalTabHandlerTest.* +-PermissionPromptBaseViewTest.IncludedInTrackedPictureInPictureWidgets -PermissionPromptBubbleTwoOriginsViewTest.DiesIfPermissionNotAllowed -PermissionPromptBubbleTwoOriginsViewTest.LinkIsPresent -PermissionPromptBubbleTwoOriginsViewTest.TitleMentionsTwoOriginsAndPermission +-ProductSpecificationsButtonTest.AnimatesToExpanded +-ProductSpecificationsButtonTest.AppliesWidthFactor -SavedTabGroupBar/SavedTabGroupBarUnitTest.* -SavedTabGroupEverythingMenu/STGEverythingMenuUnitTest.TabGroupItemsSortedByCreationTime/* -SavedTabGroupKeyedServiceUnitTest.* @@ -426,6 +437,7 @@ -ShowPromoTest.ShowPromoWithSignedInAccount -SigninManagerSupervisedUserTest.SignoutOnCookiesDeletedAllowed -SigninManagerSupervisedUserTest.SignoutOnCookiesDeletedNotAllowed/* +-SignInPromoVersionTest.SignInPromoVersions -SignoutAllowed/SigninManagerTest.* -TestAppMenuModelCR2023.ProfileSyncOnTest @@ -476,6 +488,7 @@ -ClientSideDetectionHostTest.* -DownloadBubblePrefsTest.EnhancedProtectionEnabled -DownloadBubbleRowViewInfoTest.ShouldShowNoticeForEnhancedProtectionScan +-DownloadWarningDesktopHatsUtilsTest.ProductSpecificData_EnhancedSafeBrowsing -EnhancedProtectionDownloadTest.* -ImmediateDeepScanTest.ESBRequestScan -ImmediateDeepScanTest.EncryptedArchive @@ -561,8 +574,8 @@ -BrowserPrefsTest.MigrateObsoleteProfilePrefSyncRequestedSetToFalse -BrowserPrefsTest.MigrateObsoleteProfilePrefSyncRequestedSetToTrue -# This test fails a CalledOnValidSequence check in brave_sync::Prefs::GetSeed --PeopleHandlerWithExplicitBrowserSigninTest.ChromeSigninUserInfoUpdateOnSync +# These tests fail a CalledOnValidSequence check in brave_sync::Prefs::GetSeed +-PeopleHandlerWithExplicitBrowserSigninTest.* # These tests fail because of disabled kCookieDeprecationFacilitatedTesting and/ # or TrackingProtectionOnboardingFactory. @@ -652,6 +665,13 @@ -StorageAccessAPIServiceImplTest.RenewPermissionGrant -StorageAccessGrantPermissionContextAPIWithFedCMConnectionTest.AutoResolveWithConnection +# This test fails because our badge doesn't match the upstream badge +-IconBadgingTest.VerifyFromDisk + +# This test fails because it no longer modifies its expectations now that the +# kForYouFre feature flag was removed +-StartupBrowserCreatorImplTest.DetermineStartupTabs_NewFeaturesPage + # Tests below this point have not been diagnosed or had issues created yet. -AboutFlagsHistogramTest.* -AboutFlagsTest.* @@ -1016,6 +1036,7 @@ -TabStripModelTestWithReadLaterEnabled.* -TabStripPageHandlerTest.* -TabTest.* +-TabTestWithDiscardRingImprovements.* -TCPSocketUnitTest.* -TemplateURLServiceSyncTest.* -TemplateURLServiceTest.* diff --git a/third_party/blink/renderer/core/brave_page_graph/libxml_utils.cc b/third_party/blink/renderer/core/brave_page_graph/libxml_utils.cc index 8e53fd20e9522..24bb19b621938 100644 --- a/third_party/blink/renderer/core/brave_page_graph/libxml_utils.cc +++ b/third_party/blink/renderer/core/brave_page_graph/libxml_utils.cc @@ -50,7 +50,7 @@ XmlUtf8String::XmlUtf8String(const String& str) StringUTF8Adaptor( str, WTF::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD) - .AsStringPiece()) {} + .AsStringView()) {} XmlUtf8String::XmlUtf8String(int value) : XmlUtf8String(base::NumberToString(value)) {} diff --git a/third_party/lit/v3_0/sources.gni b/third_party/lit/v3_0/sources.gni new file mode 100644 index 0000000000000..d7b669b29406d --- /dev/null +++ b/third_party/lit/v3_0/sources.gni @@ -0,0 +1,9 @@ +# Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. + +brave_lit_build_ts_visibility = [ + "//chrome/browser/resources/settings:build_ts", + "//brave/ui/webui/resources:build_ts", +] diff --git a/third_party/polymer/v3_0/sources.gni b/third_party/polymer/v3_0/sources.gni new file mode 100644 index 0000000000000..bc9050d400d22 --- /dev/null +++ b/third_party/polymer/v3_0/sources.gni @@ -0,0 +1,6 @@ +# Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. + +brave_polymer_library_visibility = [ "//brave/ui/webui/resources:build_ts" ] diff --git a/third_party/rust/chromium_crates_io/Cargo.lock b/third_party/rust/chromium_crates_io/Cargo.lock index fe2f70fda5643..73e8aa9598f07 100644 --- a/third_party/rust/chromium_crates_io/Cargo.lock +++ b/third_party/rust/chromium_crates_io/Cargo.lock @@ -576,12 +576,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.60", ] [[package]] name = "cxx" -version = "1.0.120" +version = "1.0.121" dependencies = [ "cc", "cxxbridge-flags", @@ -591,15 +591,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.120" +version = "1.0.121" [[package]] name = "cxxbridge-macro" -version = "1.0.120" +version = "1.0.121" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.60", ] [[package]] @@ -1841,7 +1841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.81" dependencies = [ "unicode-ident", ] @@ -1857,7 +1857,7 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" dependencies = [ "proc-macro2", ] @@ -2096,7 +2096,7 @@ version = "1.0.22" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" dependencies = [ "serde_derive", ] @@ -2119,11 +2119,11 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.60", ] [[package]] @@ -2139,7 +2139,7 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" dependencies = [ "itoa 1.0.11", "ryu", @@ -2412,7 +2412,7 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.60" dependencies = [ "proc-macro2", "quote", @@ -2539,7 +2539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.60", ] [[package]] @@ -2681,7 +2681,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -2701,7 +2701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/third_party/rust/chromium_crates_io/Cargo.toml b/third_party/rust/chromium_crates_io/Cargo.toml index 64603b8c45977..0e1685d2347e2 100644 --- a/third_party/rust/chromium_crates_io/Cargo.toml +++ b/third_party/rust/chromium_crates_io/Cargo.toml @@ -96,15 +96,15 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/cfg-if-1.0.0" package = "cfg-if" [patch.crates-io.cxx_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/cxx-1.0.120" +path = "../../../../third_party/rust/chromium_crates_io/vendor/cxx-1.0.121" package = "cxx" [patch.crates-io.cxxbridge-flags_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/cxxbridge-flags-1.0.120" +path = "../../../../third_party/rust/chromium_crates_io/vendor/cxxbridge-flags-1.0.121" package = "cxxbridge-flags" [patch.crates-io.cxxbridge-macro_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/cxxbridge-macro-1.0.120" +path = "../../../../third_party/rust/chromium_crates_io/vendor/cxxbridge-macro-1.0.121" package = "cxxbridge-macro" [patch.crates-io.getrandom_v0_2] @@ -140,11 +140,11 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/ppv-lite86-0.2.17 package = "ppv-lite86" [patch.crates-io.proc_macro2_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80" +path = "../../../../third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81" package = "proc-macro2" [patch.crates-io.quote_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/quote-1.0.35" +path = "../../../../third_party/rust/chromium_crates_io/vendor/quote-1.0.36" package = "quote" [patch.crates-io.rand_chacha_v0_3] @@ -184,15 +184,15 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/semver-1.0.22" package = "semver" [patch.crates-io.serde_derive_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/serde_derive-1.0.197" +path = "../../../../third_party/rust/chromium_crates_io/vendor/serde_derive-1.0.198" package = "serde_derive" [patch.crates-io.serde_json_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/serde_json-1.0.115" +path = "../../../../third_party/rust/chromium_crates_io/vendor/serde_json-1.0.116" package = "serde_json" [patch.crates-io.serde_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/serde-1.0.197" +path = "../../../../third_party/rust/chromium_crates_io/vendor/serde-1.0.198" package = "serde" [patch.crates-io.static_assertions_v0_1] @@ -204,7 +204,7 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/syn-1.0.109" package = "syn" [patch.crates-io.syn_v2] -path = "../../../../third_party/rust/chromium_crates_io/vendor/syn-2.0.55" +path = "../../../../third_party/rust/chromium_crates_io/vendor/syn-2.0.60" package = "syn" [patch.crates-io.unicode-ident_v1] diff --git a/third_party/rust/cxx/v1/README.chromium b/third_party/rust/cxx/v1/README.chromium index 77b1e01686498..a0695d85f7568 100644 --- a/third_party/rust/cxx/v1/README.chromium +++ b/third_party/rust/cxx/v1/README.chromium @@ -1,7 +1,7 @@ Name: cxx URL: https://crates.io/crates/cxx Description: Safe interop between Rust and C++ -Version: 1.0.120 +Version: 1.0.121 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/third_party/rust/cxxbridge_flags/v1/README.chromium b/third_party/rust/cxxbridge_flags/v1/README.chromium index ef0ca42511c67..f8645ebae8909 100644 --- a/third_party/rust/cxxbridge_flags/v1/README.chromium +++ b/third_party/rust/cxxbridge_flags/v1/README.chromium @@ -1,7 +1,7 @@ Name: cxxbridge-flags URL: https://crates.io/crates/cxxbridge-flags Description: Compiler configuration of the `cxx` crate (implementation detail) -Version: 1.0.120 +Version: 1.0.121 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/third_party/rust/cxxbridge_macro/v1/README.chromium b/third_party/rust/cxxbridge_macro/v1/README.chromium index 9b1b3c55bac71..084f12733ca46 100644 --- a/third_party/rust/cxxbridge_macro/v1/README.chromium +++ b/third_party/rust/cxxbridge_macro/v1/README.chromium @@ -1,7 +1,7 @@ Name: cxxbridge-macro URL: https://crates.io/crates/cxxbridge-macro Description: Implementation detail of the `cxx` crate. -Version: 1.0.120 +Version: 1.0.121 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/third_party/rust/proc_macro2/v1/BUILD.gn b/third_party/rust/proc_macro2/v1/BUILD.gn index 9a0767b769b8d..2a11ae53e00f3 100644 --- a/third_party/rust/proc_macro2/v1/BUILD.gn +++ b/third_party/rust/proc_macro2/v1/BUILD.gn @@ -15,23 +15,23 @@ cargo_crate("buildrs_support") { crate_name = "proc_macro2" epoch = "1" crate_type = "rlib" - crate_root = "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/lib.rs" + crate_root = "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/lib.rs" sources = [ - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/detection.rs", - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/extra.rs", - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/fallback.rs", - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/lib.rs", - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/location.rs", - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/marker.rs", - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/parse.rs", - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/rcvec.rs", - "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/wrapper.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/detection.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/extra.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/fallback.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/lib.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/location.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/marker.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/parse.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/rcvec.rs", + "//third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.81/src/wrapper.rs", ] inputs = [] build_native_rust_unit_tests = false edition = "2021" - cargo_pkg_version = "1.0.80" + cargo_pkg_version = "1.0.81" cargo_pkg_authors = "David Tolnay , Alex Crichton " cargo_pkg_name = "proc-macro2" diff --git a/third_party/rust/proc_macro2/v1/README.chromium b/third_party/rust/proc_macro2/v1/README.chromium index 4f349fbf8a77b..cbcc1547f5af5 100644 --- a/third_party/rust/proc_macro2/v1/README.chromium +++ b/third_party/rust/proc_macro2/v1/README.chromium @@ -1,7 +1,7 @@ Name: proc-macro2 URL: https://crates.io/crates/proc-macro2 Description: A substitute implementation of the compiler's `proc_macro` API to decouple token-based libraries from the procedural macro use case. -Version: 1.0.80 +Version: 1.0.81 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/third_party/rust/quote/v1/BUILD.gn b/third_party/rust/quote/v1/BUILD.gn index 1c6bd01db8c31..a2267e62f0071 100644 --- a/third_party/rust/quote/v1/BUILD.gn +++ b/third_party/rust/quote/v1/BUILD.gn @@ -16,21 +16,21 @@ cargo_crate("buildrs_support") { epoch = "1" crate_type = "rlib" crate_root = - "//third_party/rust/chromium_crates_io/vendor/quote-1.0.35/src/lib.rs" + "//third_party/rust/chromium_crates_io/vendor/quote-1.0.36/src/lib.rs" sources = [ - "//third_party/rust/chromium_crates_io/vendor/quote-1.0.35/src/ext.rs", - "//third_party/rust/chromium_crates_io/vendor/quote-1.0.35/src/format.rs", - "//third_party/rust/chromium_crates_io/vendor/quote-1.0.35/src/ident_fragment.rs", - "//third_party/rust/chromium_crates_io/vendor/quote-1.0.35/src/lib.rs", - "//third_party/rust/chromium_crates_io/vendor/quote-1.0.35/src/runtime.rs", - "//third_party/rust/chromium_crates_io/vendor/quote-1.0.35/src/spanned.rs", - "//third_party/rust/chromium_crates_io/vendor/quote-1.0.35/src/to_tokens.rs", + "//third_party/rust/chromium_crates_io/vendor/quote-1.0.36/src/ext.rs", + "//third_party/rust/chromium_crates_io/vendor/quote-1.0.36/src/format.rs", + "//third_party/rust/chromium_crates_io/vendor/quote-1.0.36/src/ident_fragment.rs", + "//third_party/rust/chromium_crates_io/vendor/quote-1.0.36/src/lib.rs", + "//third_party/rust/chromium_crates_io/vendor/quote-1.0.36/src/runtime.rs", + "//third_party/rust/chromium_crates_io/vendor/quote-1.0.36/src/spanned.rs", + "//third_party/rust/chromium_crates_io/vendor/quote-1.0.36/src/to_tokens.rs", ] inputs = [] build_native_rust_unit_tests = false edition = "2018" - cargo_pkg_version = "1.0.35" + cargo_pkg_version = "1.0.36" cargo_pkg_authors = "David Tolnay " cargo_pkg_name = "quote" cargo_pkg_description = "Quasi-quoting macro quote!(...)" diff --git a/third_party/rust/quote/v1/README.chromium b/third_party/rust/quote/v1/README.chromium index 4f75ad92ffa4e..5078b65fd5119 100644 --- a/third_party/rust/quote/v1/README.chromium +++ b/third_party/rust/quote/v1/README.chromium @@ -1,7 +1,7 @@ Name: quote URL: https://crates.io/crates/quote Description: Quasi-quoting macro quote!(...) -Version: 1.0.35 +Version: 1.0.36 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/third_party/rust/serde/v1/README.chromium b/third_party/rust/serde/v1/README.chromium index 69a4df64dc433..34b42f71f7891 100644 --- a/third_party/rust/serde/v1/README.chromium +++ b/third_party/rust/serde/v1/README.chromium @@ -1,7 +1,7 @@ Name: serde URL: https://crates.io/crates/serde Description: A generic serialization/deserialization framework -Version: 1.0.197 +Version: 1.0.198 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/third_party/rust/serde_derive/v1/README.chromium b/third_party/rust/serde_derive/v1/README.chromium index d6db475ce3a38..c5b23fe76457e 100644 --- a/third_party/rust/serde_derive/v1/README.chromium +++ b/third_party/rust/serde_derive/v1/README.chromium @@ -1,7 +1,7 @@ Name: serde_derive URL: https://crates.io/crates/serde_derive Description: Macros 1.1 implementation of #[derive(Serialize, Deserialize)] -Version: 1.0.197 +Version: 1.0.198 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/third_party/rust/serde_json/v1/README.chromium b/third_party/rust/serde_json/v1/README.chromium index d1d37bdcea598..a6a7586b6b480 100644 --- a/third_party/rust/serde_json/v1/README.chromium +++ b/third_party/rust/serde_json/v1/README.chromium @@ -1,7 +1,7 @@ Name: serde_json URL: https://crates.io/crates/serde_json Description: A JSON serialization file format -Version: 1.0.115 +Version: 1.0.116 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/third_party/rust/syn/v2/README.chromium b/third_party/rust/syn/v2/README.chromium index 0bfb67e109e6d..ffdee3ad38762 100644 --- a/third_party/rust/syn/v2/README.chromium +++ b/third_party/rust/syn/v2/README.chromium @@ -1,7 +1,7 @@ Name: syn URL: https://crates.io/crates/syn Description: Parser for Rust source code -Version: 2.0.55 +Version: 2.0.60 Security Critical: yes Shipped: yes License: Apache 2.0 diff --git a/ui/views/menu_config_unittest.cc b/ui/views/menu_config_unittest.cc index 98fb1a460fd77..aafbf38775d90 100644 --- a/ui/views/menu_config_unittest.cc +++ b/ui/views/menu_config_unittest.cc @@ -12,8 +12,10 @@ namespace views { using MenuConfigTest = ViewsTestBase; TEST_F(MenuConfigTest, ChangedValueTest) { - EXPECT_EQ(4, views::MenuConfig::instance().item_vertical_margin); - EXPECT_EQ(16, views::MenuConfig::instance().item_horizontal_padding); + const auto& menu_config = views::MenuConfig::instance(); + EXPECT_EQ(4, menu_config.item_vertical_margin); + EXPECT_EQ(16, menu_config.item_horizontal_padding + + menu_config.item_horizontal_border_padding); } } // namespace views diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn index 52895a7de1808..e03050eee9345 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn @@ -52,7 +52,10 @@ if (include_polymer) { web_component_files += [ "cr_elements/$cr_override/$cr_override.ts" ] } - non_web_component_files = [ "polymer_overriding.ts" ] + non_web_component_files = [ + "polymer_overriding.ts", + "lit_overriding.ts", + ] } if (include_polymer) { @@ -72,7 +75,10 @@ if (include_polymer) { ts_deps = [ "//ui/webui/resources/js:build_ts" ] if (include_polymer) { - ts_deps += [ "//third_party/polymer/v3_0:library" ] + ts_deps += [ + "//third_party/lit/v3_0:build_ts", + "//third_party/polymer/v3_0:library", + ] webui_context_type = "trusted" } } diff --git a/ui/webui/resources/lit_overriding.ts b/ui/webui/resources/lit_overriding.ts new file mode 100644 index 0000000000000..009c152e44e34 --- /dev/null +++ b/ui/webui/resources/lit_overriding.ts @@ -0,0 +1,23 @@ +// Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. + +import { CrLitElement, CSSResultGroup } from "//resources/lit/v3_0/lit.rollup.js"; + +export function injectStyle( + element: T, + css: CSSResultGroup) +{ + const originalStyles = element.styles + Object.defineProperty(element, 'styles', { + get() { + return [ + ...originalStyles as any, + css + ] + } + }) + + element.elementStyles = (element as any).finalizeStyles(element.styles) +} diff --git a/vector_icons/chrome/app/vector_icons/save_group.icon b/vector_icons/chrome/app/vector_icons/save_group_refresh.icon similarity index 100% rename from vector_icons/chrome/app/vector_icons/save_group.icon rename to vector_icons/chrome/app/vector_icons/save_group_refresh.icon diff --git a/vector_icons/components/omnibox/browser/vector_icons/product_chrome_refresh.icon b/vector_icons/components/omnibox/browser/vector_icons/product_chrome_refresh.icon new file mode 100644 index 0000000000000..e47740dfa3a3f --- /dev/null +++ b/vector_icons/components/omnibox/browser/vector_icons/product_chrome_refresh.icon @@ -0,0 +1,109 @@ +// Copyright (c) 2022 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/. + +CANVAS_DIMENSIONS, 32, +// BRAVE ORANGE +PATH_COLOR_ARGB, 0xFF, 0xFB, 0x54, 0x2B, +MOVE_TO, 27.14f, 8.73f, +R_LINE_TO, 0.63f, -1.4f, +R_ARC_TO, 0.35f, 0.35f, 0, 0, 0, -0.08f, -0.4f, +LINE_TO, 26, 5.24f, +R_ARC_TO, 2.67f, 2.67f, 0, 0, 0, -2.78f, -0.64f, +R_LINE_TO, -0.45f, 0.16f, +LINE_TO, 20.29f, 2, +R_H_LINE_TO, -8.58f, +R_LINE_TO, -2.5f, 2.76f, +R_LINE_TO, -0.45f, -0.16f, +ARC_TO, 2.67f, 2.67f, 0, 0, 0, 6, 5.24f, +LINE_TO, 4.31f, 6.93f, +R_ARC_TO, 0.35f, 0.35f, 0, 0, 0, -0.08f, 0.4f, +R_LINE_TO, 0.63f, 1.4f, +LINE_TO, 4, 11.08f, +R_LINE_TO, 0.56f, 2.11f, +R_LINE_TO, 2.55f, 9.63f, +ARC_TO, 4.91f, 4.91f, 0, 0, 0, 9, 25.57f, +R_CUBIC_TO, 0, 0, 3.09f, 2.17f, 6.14f, 4.14f, +R_ARC_TO, 1.36f, 1.36f, 0, 0, 0, 1.68f, 0, +R_CUBIC_TO, 3.05f, -2, 6.14f, -4.14f, 6.14f, -4.14f, +R_ARC_TO, 4.91f, 4.91f, 0, 0, 0, 1.91f, -2.75f, +R_LINE_TO, 2.55f, -9.63f, +R_LINE_TO, 0.58f, -2.11f, +CLOSE, +NEW_PATH, +// BRAVE WHITE +PATH_COLOR_ARGB, 0xFF, 0xFF, 0xFF, 0xFF, +MOVE_TO, 22.08f, 6.52f, +R_LINE_TO, -2.8f, 0.53f, +R_CUBIC_TO, -0.13f, 0, -3, -0.78f, -3.24f, -0.78f, +CUBIC_TO_SHORTHAND, 13.46f, 7, 13.46f, 7, +CUBIC_TO, 13.21f, 7, 10, 6.52f, 10, 6.52f, +R_LINE_TO, -2.71f, 3.6f, +R_ARC_TO, 5.49f, 5.49f, 0, 0, 0, -0.37f, 0.62f, +R_ARC_TO, 2.86f, 2.86f, 0, 0, 0, -0.11f, 0.73f, +R_LINE_TO, 3.5f, 4, +R_ARC_TO, 0.79f, 0.79f, 0, 0, 1, 0.14f, 0.78f, +LINE_TO, 10, 17.3f, +R_ARC_TO, 1.4f, 1.4f, 0, 0, 0, 0, 0.88f, +R_ARC_TO, 5.4f, 5.4f, 0, 0, 0, 0.83f, 1.28f, +R_LINE_TO, 0.43f, 0.35f, +R_ARC_TO, 0.84f, 0.84f, 0, 0, 0, 0.8f, 0.09f, +R_CUBIC_TO, 0, 0, 2.13f, -1.07f, 2.32f, -1.25f, +R_LINE_TO, 1.24f, -1.11f, +R_ARC_TO, 0.48f, 0.48f, 0, 0, 0, 0, -0.7f, +LINE_TO, 12.78f, 15, +R_ARC_TO, 0.55f, 0.55f, 0, 0, 1, -0.17f, -0.68f, +R_LINE_TO, 1.08f, -2, +R_ARC_TO, 1, 1, 0, 0, 0, 0.06f, -0.81f, +R_ARC_TO, 43.11f, 43.11f, 0, 0, 0, -4, -1.82f, +R_CUBIC_TO, -0.24f, -0.1f, -0.23f, -0.19f, 0, -0.22f, +R_LINE_TO, 2, -0.18f, +R_ARC_TO, 2.91f, 2.91f, 0, 0, 1, 0.93f, 0.08f, +R_LINE_TO, 1.74f, 0.48f, +R_ARC_TO, 0.54f, 0.54f, 0, 0, 1, 0.37f, 0.59f, +R_LINE_TO, -0.68f, 3.7f, +R_ARC_TO, 1.79f, 1.79f, 0, 0, 0, 0, 0.62f, +R_CUBIC_TO, 0, 0.09f, 0.26f, 0.21f, 0.52f, 0.26f, +R_LINE_TO, 1.05f, 0.22f, +R_ARC_TO, 2, 2, 0, 0, 0, 0.37f, 0, +R_ARC_TO, 1.88f, 1.88f, 0, 0, 0, 0.36f, 0, +R_LINE_TO, 1.03f, -0.24f, +R_CUBIC_TO, 0.25f, -0.05f, 0.48f, -0.17f, 0.51f, -0.26f, +R_ARC_TO, 2, 2, 0, 0, 0, 0, -0.62f, +R_LINE_TO, -0.68f, -3.7f, +R_ARC_TO, 0.53f, 0.53f, 0, 0, 1, 0.37f, -0.59f, +R_LINE_TO, 1.73f, -0.48f, +R_ARC_TO, 2.91f, 2.91f, 0, 0, 1, 0.93f, -0.08f, +R_LINE_TO, 2, 0.18f, +R_CUBIC_TO, 0.26f, 0, 0.28f, 0.12f, 0, 0.22f, +R_ARC_TO, 41.83f, 41.83f, 0, 0, 0, -4, 1.82f, +R_ARC_TO, 1, 1, 0, 0, 0, 0.05f, 0.81f, +R_LINE_TO, 1.08f, 2, +R_ARC_TO, 0.53f, 0.53f, 0, 0, 1, -0.17f, 0.68f, +R_LINE_TO, -2.79f, 1.87f, +R_ARC_TO, 0.48f, 0.48f, 0, 0, 0, 0, 0.7f, +R_LINE_TO, 1.23f, 1.11f, +R_CUBIC_TO, 0.2f, 0.18f, 2.33f, 1.25f, 2.33f, 1.25f, +R_ARC_TO, 0.83f, 0.83f, 0, 0, 0, 0.79f, -0.09f, +R_LINE_TO, 0.44f, -0.35f, +R_ARC_TO, 5.76f, 5.76f, 0, 0, 0, 0.83f, -1.28f, +R_ARC_TO, 1.4f, 1.4f, 0, 0, 0, 0, -0.88f, +R_LINE_TO, -0.46f, -1.06f, +R_ARC_TO, 0.79f, 0.79f, 0, 0, 1, 0.14f, -0.78f, +R_LINE_TO, 3.5f, -4, +R_ARC_TO, 2.48f, 2.48f, 0, 0, 0, -0.1f, -0.73f, +R_CUBIC_TO, -0.06f, -0.13f, -3.08f, -4.22f, -3.09f, -4.22f, +CLOSE, +NEW_PATH, +// BRAVE WHITE +PATH_COLOR_ARGB, 0xFF, 0xFF, 0xFF, 0xFF, +MOVE_TO, 19.62f, 21, +LINE_TO, 16, 19.42f, +LINE_TO, 12.38f, 21, +R_ARC_TO, 0.26f, 0.26f, 0, 0, 0, 0, 0.49f, +R_LINE_TO, 3.34f, 2.64f, +R_ARC_TO, 0.46f, 0.46f, 0, 0, 0, 0.62f, 0, +R_LINE_TO, 3.34f, -2.64f, +R_ARC_TO, 0.26f, 0.26f, 0, 0, 0, -0.06f, -0.49f, +CLOSE diff --git a/vendor/brave_base/random.cc b/vendor/brave_base/random.cc index cab9764720c56..3c17891426871 100644 --- a/vendor/brave_base/random.cc +++ b/vendor/brave_base/random.cc @@ -16,9 +16,7 @@ namespace random { uint64_t Uniform64() { uint64_t x; - - crypto::RandBytes(&x, sizeof x); - + crypto::RandBytes(base::byte_span_from_ref(x)); return x; }