From 87b5c375c3b7ac83522e32515ef475293d122459 Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Tue, 26 May 2020 14:20:30 -0700 Subject: [PATCH] Merge pull request #5102 from brave/cr83 Upgrade from Chromium 81 to Chromium 83 --- android/brave_java_resources.gni | 722 ++++ android/brave_java_sources.gni | 18 +- android/java/apk_for_test.flags | 6 +- .../chrome/browser/BraveActivity.java | 6 +- .../chromium/chrome/browser/BraveHelper.java | 2 +- .../BraveRewardsDonationSentActivity.java | 4 +- .../chrome/browser/BraveRewardsHelper.java | 14 +- .../browser/BraveRewardsNativeWorker.java | 4 +- .../browser/BraveRewardsPanelPopup.java | 4 +- .../BraveRewardsSiteBannerActivity.java | 4 +- .../chrome/browser/BraveSyncWorker.java | 2 +- .../chromium/chrome/browser/BraveUphold.java | 2 +- .../BraveTabbedAppMenuPropertiesDelegate.java | 4 +- .../document/BraveLauncherActivity.java | 4 +- .../BraveExternalNavigationHandler.java | 9 +- .../homepage/BraveHomepageManager.java | 15 + .../settings}/BraveHomepageSettings.java | 8 +- .../BraveRadioButtonGroupThemePreference.java | 4 +- .../settings}/BraveThemePreferences.java | 8 +- ...eSetDefaultBrowserNotificationService.java | 2 +- .../browser/ntp/BraveNewTabPageView.java | 2 +- .../browser/ntp/IncognitoNewTabPageView.java | 49 +- .../RewardsBottomSheetDialogFragment.java | 8 +- .../SuperReferralShareDialogFragment.java | 2 +- .../BraveRewardsOnboardingFragment.java | 2 +- .../BraveShieldsOnboardingFragment.java | 2 +- .../onboarding/NonSwipeableViewPager.java | 2 +- .../onboarding/OnboardingActivity.java | 4 +- .../OnboardingViewPagerAdapter.java | 6 +- .../SearchEngineOnboardingFragment.java | 2 +- .../TroubleshootingOnboardingFragment.java | 2 +- .../BravePartnerBrowserCustomizations.java | 5 +- .../settings}/BravePrivacySettings.java | 18 +- .../browser/qrreader/BarcodeTracker.java | 2 +- .../qrreader/BarcodeTrackerFactory.java | 2 +- .../settings/AppearancePreferences.java | 13 +- .../settings/BackgroundImagesPreferences.java | 6 +- .../BackgroundVideoPlaybackPreference.java | 5 +- .../settings/BraveCustomTabsPreference.java | 4 +- .../settings/BraveLicensePreferences.java | 3 +- .../settings/BraveMainPreferencesBase.java | 13 +- .../settings/BravePreferenceFragment.java | 2 +- .../settings/BraveRewardsPreferences.java | 6 +- .../settings/BraveRewardsResetPreference.java | 2 +- .../BraveRewardsResetPreferenceDialog.java | 2 +- .../settings/BraveSearchEngineAdapter.java | 2 +- .../settings/BraveSearchEnginePreference.java | 2 +- .../ClosingAllTabsClosesBravePreference.java | 5 +- .../SearchEngineTabModelSelectorObserver.java | 3 +- .../developer/BraveQAPreferences.java | 8 +- .../BraveRewardsDebugPreferences.java | 4 +- ...eClearBrowsingDataPreferencesAdvanced.java | 67 - ...tonGroupCustomHomepageThemePreference.java | 3 +- .../BraveSiteSettingsPreferencesBase.java | 8 +- .../DesktopModePreferences.java | 8 +- .../PlayYTVideoInBrowserPreferences.java | 8 +- .../browser/tabmodel/BraveTabCreator.java | 11 +- .../browser/toolbar/BraveHomeButton.java | 2 +- .../BraveBottomToolbarConfiguration.java} | 7 +- .../bottom/BraveBottomToolbarCoordinator.java | 34 +- .../BraveBottomToolbarVariationManager.java | 6 +- ...eBrowsingModeBottomToolbarCoordinator.java | 21 +- .../toolbar/top/BraveToolbarLayout.java | 15 +- .../upgrade/BraveUpgradeJobIntentService.java | 2 +- android/java/proguard.flags | 2 +- .../res/layout/brave_bookmark_toolbar.xml | 2 +- .../layout/brave_bottom_new_tab_button.xml | 2 +- ...lds_3rd_party_cookies_blocked_switcher.xml | 2 +- .../brave_shields_ads_tracking_switcher.xml | 2 +- ..._shields_fingerprints_blocked_switcher.xml | 2 +- .../brave_shields_https_upgrade_switcher.xml | 2 +- .../res/layout/brave_shields_menu_item.xml | 2 +- ...brave_shields_scripts_blocked_switcher.xml | 2 +- .../res/layout/brave_shields_switcher.xml | 2 +- .../res/layout/brave_shields_text_item.xml | 2 +- android/java/res/layout/brave_sync_device.xml | 2 +- android/java/res/layout/brave_sync_layout.xml | 2 +- .../layout/fragment_super_referral_share.xml | 2 +- .../res/layout/new_tab_page_incognito.xml | 2 +- .../java/res/layout/new_tab_page_layout.xml | 8 + android/java/res/menu/exit_settings_menu.xml | 2 +- .../values-night/brave_colors.xml | 0 .../java/res/xml/appearance_preferences.xml | 6 +- .../res/xml/background_images_preferences.xml | 4 +- .../background_video_playback_preference.xml | 2 +- .../res/xml/brave_license_preferences.xml | 2 +- .../java/res/xml/brave_main_preferences.xml | 18 +- .../res/xml/brave_privacy_preferences.xml | 14 +- .../xml/brave_rewards_debug_preferences.xml | 2 +- .../res/xml/brave_rewards_preferences.xml | 2 +- .../xml/brave_site_settings_preferences.xml | 8 +- .../java/res/xml/brave_theme_preferences.xml | 4 +- .../clear_browsing_data_preferences_tab.xml | 16 +- ...osing_all_tabs_closes_brave_preference.xml | 2 +- .../java/res/xml/desktop_mode_preferences.xml | 2 +- .../java/res/xml/developer_preferences.xml | 4 +- .../res/xml/legal_information_preferences.xml | 2 +- .../play_yt_video_in_browser_preferences.xml | 2 +- android/java/res/xml/qa_preferences.xml | 10 +- .../xml/use_custom_tabs_brave_preference.xml | 2 +- android/javatests/AndroidManifest.xml | 13 + .../chromium/chrome/browser/BytecodeTest.java | 5 +- app/brave_generated_resources.grd | 3 - app/brave_main_delegate.cc | 36 +- app/brave_main_delegate_browsertest.cc | 3 +- app/brave_strings.grd | 31 + app/extensions_strings.grdp | 6 - app/generated_resources.grd | 661 ++-- app/os_settings_search_tag_strings.grdp | 39 + app/os_settings_strings.grdp | 2499 ++++++++++++- app/printing_strings.grdp | 5 +- app/settings_brave_strings.grdp | 25 +- app/settings_strings.grdp | 3172 +++-------------- app/shared_settings_strings.grdp | 254 ++ app/vector_icons/BUILD.gn | 1 - app/web_time_limit_error_page_strings.grdp | 4 +- browser/BUILD.gn | 10 +- browser/autoplay/BUILD.gn | 1 + .../autoplay/autoplay_permission_context.cc | 12 +- .../autoplay/autoplay_permission_context.h | 8 +- ...autoplay_permission_context_browsertest.cc | 55 +- .../autoplay_permission_context_unittest.cc | 6 +- .../BraveAdsOnboardingFragment.java | 2 +- browser/brave_content_browser_client.cc | 4 +- browser/brave_rewards/rewards_tab_helper.cc | 30 +- browser/brave_rewards/rewards_tab_helper.h | 2 +- browser/brave_stats_updater.cc | 7 +- browser/brave_stats_updater.h | 4 +- browser/brave_stats_updater_browsertest.cc | 2 +- ...browsing_data_remover_delegate_unittest.cc | 11 +- .../brave_site_settings_counter_unittest.cc | 11 +- .../api/brave_shields_api_browsertest.cc | 22 +- browser/extensions/brave_extension_service.cc | 2 +- ...webtorrent_navigation_throttle_unittest.cc | 29 +- .../brave_geolocation_permission_context.cc | 37 - .../brave_geolocation_permission_context.h | 27 - ...geolocation_permission_context_delegate.cc | 40 + ..._geolocation_permission_context_delegate.h | 33 + browser/net/BUILD.gn | 1 + ...ave_ad_block_tp_network_delegate_helper.cc | 2 - ...elegate_hsts_fingerprinting_browsertest.cc | 1 + browser/net/brave_proxying_web_socket.cc | 5 +- browser/net/brave_proxying_web_socket.h | 3 +- browser/net/url_context.cc | 2 +- browser/net/url_context.h | 8 +- browser/permissions/BUILD.gn | 14 - .../permissions/brave_permission_manager.cc | 17 - .../permissions/brave_permission_manager.h | 18 - .../brave_permission_manager_factory.cc | 34 - .../brave_permission_manager_factory.h | 28 - browser/profiles/brave_profile_manager.cc | 36 +- browser/profiles/brave_profile_manager.h | 10 + .../brave_profile_manager_unittest.cc | 1 - .../profiles/tor_unittest_profile_manager.h | 6 +- ...rave_spelling_menu_observer_browsertest.cc | 7 +- ...ng_options_submenu_observer_browsertest.cc | 2 +- browser/resources/extensions/BUILD.gn | 2 +- browser/resources/settings/BUILD.gn | 21 +- .../settings/brave_appearance_page/BUILD.gn | 181 + .../brave_appearance_browser_proxy.js | 1 + .../brave_appearance_page/brave_theme.html | 33 + .../brave_appearance_page/brave_theme.js | 75 + ...pearance_page.html => super_referral.html} | 66 +- ...e_appearance_page.js => super_referral.js} | 86 +- .../brave_appearance_page/toolbar.html | 37 + .../settings/brave_appearance_page/toolbar.js | 16 + .../settings/brave_privacy_page/BUILD.gn | 35 + .../brave_privacy_page_browser_proxy.js | 1 + .../settings/brave_settings_overrides.html | 2 + .../settings/brave_settings_overrides.js | 56 +- .../default_brave_shields_page/BUILD.gn | 101 + .../default_brave_shields_browser_proxy.js | 1 + .../resources/settings/settings_resources.grd | 13 +- .../settings/settings_resources_v3.grdp | 54 + .../settings/social_blocking_page/BUILD.gn | 36 + .../social_blocking_browser_proxy.js | 1 + .../themes/brave_theme_service_browsertest.cc | 12 +- browser/themes/theme_properties.cc | 37 +- browser/tor/tor_profile_service_factory.cc | 4 - browser/tor/tor_profile_service_factory.h | 1 - browser/ui/BUILD.gn | 9 +- .../strings/android_chrome_strings.grd | 246 +- browser/ui/brave_layout_constants.cc | 4 +- .../brave_autoplay_blocked_image_model.cc | 7 +- .../brave_actions/brave_actions_container.cc | 5 + browser/ui/views/frame/brave_browser_frame.cc | 3 +- ...e_wayback_machine_infobar_contents_view.cc | 12 +- .../profiles/brave_avatar_toolbar_button.cc | 12 +- .../profiles/brave_avatar_toolbar_button.h | 4 +- .../profiles/brave_incognito_menu_view.cc | 12 +- .../views/profiles/brave_profile_menu_view.cc | 3 +- .../views/profiles/brave_profile_menu_view.h | 2 +- .../brave_browser_tab_strip_controller.cc | 10 +- .../tabs/brave_browser_tab_strip_controller.h | 4 +- .../toolbar/brave_toolbar_view_browsertest.cc | 1 + browser/ui/webui/basic_ui.cc | 1 + browser/widevine/BUILD.gn | 2 +- .../widevine/widevine_permission_request.cc | 4 +- ...widevine_permission_request_browsertest.cc | 23 +- browser/widevine/widevine_utils.cc | 6 +- .../org/brave/bytecode/BraveClassAdapter.java | 1 + ...ExternalNavigationHandlerClassAdapter.java | 2 +- .../BraveHomepageManagerClassAdapter.java | 18 + build/android/bytecode/java_sources.gni | 1 + build/android/config.gni | 10 +- build/config/brave_build.gni | 1 + build/config/compiler.gni | 10 + .../android_webview/browser/cookie_manager.cc | 9 - .../chrome/browser/active_use_util.cc | 17 + .../autocomplete_controller_android.cc | 12 - .../autocomplete_classifier_factory.cc | 3 - .../mock_browsing_data_cookie_helper.cc | 9 - .../extensions/extension_install_prompt.h | 21 + .../browser/net/proxy_config_monitor.cc | 1 + .../notifier_state_tracker_factory.cc | 2 - .../browser/permissions/permission_manager.cc | 31 - .../permissions/permission_manager_factory.cc | 44 + .../permissions/permission_manager_factory.h | 19 + .../profiles/off_the_record_profile_impl.cc | 2 - .../chrome/browser/profiles/profile_impl.cc | 2 - .../chrome/browser/profiles/profile_manager.h | 28 + .../push_messaging_service_factory.cc | 2 - .../account_consistency_disabled_unittest.cc | 8 +- .../ui/app_list/search/omnibox_provider.cc | 10 - .../ui/page_info/chrome_page_info_delegate.cc | 18 + .../ui/page_info/chrome_page_info_delegate.h | 18 + .../chrome/browser/ui/page_info/page_info.cc | 28 - chromium_src/chrome/browser/ui/tab_helpers.cc | 6 +- .../location_bar_view_browsertest.cc | 7 +- .../ui/views/profiles/avatar_toolbar_button.h | 17 - .../ui/views/profiles/profile_menu_view.h | 2 - .../tab_hover_card_bubble_view_browsertest.cc | 19 +- .../chrome/browser/ui/webui/favicon_source.cc | 48 +- .../ui/webui/omnibox/omnibox_page_handler.cc | 11 - .../settings/settings_import_data_handler.cc | 22 - .../chrome/common/chrome_constants.cc | 6 +- chromium_src/chrome/common/url_constants.cc | 28 +- .../brave_install_details_unittest.cc | 22 +- .../brave_install_modes_unittest.cc | 55 +- .../brave_install_util_unittest.cc | 17 +- .../brave_product_install_details_unittest.cc | 14 +- .../install_static/chromium_install_modes.h | 17 +- .../chrome/install_static/install_modes.cc | 35 + .../chrome/install_static/install_util.cc | 17 + .../brave-browser/chromium-browser.info | 2 +- .../chrome/installer/setup/install_worker.cc | 17 + .../chrome/installer/setup/user_experiment.cc | 17 + ...e_content_settings_registry_browsertest.cc | 15 +- .../core/browser/content_settings_registry.cc | 190 +- .../{content => core}/app/crashpad_android.cc | 3 +- .../{content => core}/app/crashpad_win.cc | 3 +- .../browser/autocomplete_controller.cc | 15 + .../omnibox/browser/omnibox_controller.cc | 12 - .../components/page_info/page_info.cc | 14 + .../components/page_info/page_info_delegate.h | 16 + .../components/page_info/page_info_ui.cc | 14 + .../permissions/permission_manager.cc | 11 + .../permissions/permission_request_impl.cc | 12 +- .../permissions/permission_request_impl.h | 23 + .../permissions/permission_uma_util.cc | 22 +- .../components/sync/engine_impl/commit.cc | 4 +- .../sync/engine_impl/get_updates_processor.cc | 5 +- .../devtools_url_loader_interceptor.cc | 9 - .../content/browser/webui/web_ui_impl.cc | 8 + .../content/public/test/browser_test_utils.cc | 9 - .../brave_canonical_cookie_unittest.cc | 112 +- chromium_src/net/cookies/canonical_cookie.cc | 36 +- chromium_src/net/cookies/canonical_cookie.h | 15 - ...=> configured_proxy_resolution_service.cc} | 4 +- .../net/url_request/url_request_http_job.cc | 10 - .../net/url_request/url_request_test_job.cc | 18 + .../network/restricted_cookie_manager.cc | 10 - .../platform/web_content_settings_client.h | 19 +- .../html/canvas/canvas_async_blob_creator.cc | 2 +- .../modules/battery/battery_manager.cc | 120 +- .../modules/cookie_store/cookie_store.cc | 24 + .../peerconnection/rtc_peer_connection.cc | 13 + .../modules/webaudio/analyser_node.cc | 6 +- .../platform/cookie/canonical_cookie.cc | 9 - .../views/controls/button/md_text_button.cc | 5 +- .../renderer/content_renderer_client_impl.cc | 28 + common/brave_content_client_unittest.cc | 2 + common/render_messages.h | 3 +- common/shield_exceptions.cc | 4 +- components/autofill_strings.grdp | 4 +- components/binance/browser/binance_service.cc | 2 +- components/brave_ads/test/BUILD.gn | 69 + .../brave_perf_predictor/browser/BUILD.gn | 2 +- .../browser/bandwidth_savings_predictor.cc | 28 +- .../browser/bandwidth_savings_predictor.h | 6 +- .../bandwidth_savings_predictor_unittest.cc | 25 +- .../browser/perf_predictor_tab_helper.cc | 2 +- .../browser/perf_predictor_tab_helper.h | 6 +- .../ui/components/rewardsButton/style.ts | 1 + components/brave_rewards/test/BUILD.gn | 107 + components/brave_shields/browser/BUILD.gn | 1 + .../browser/ad_block_base_service.cc | 51 +- .../browser/ad_block_base_service.h | 11 +- .../browser/ad_block_regional_service.h | 1 - .../ad_block_regional_service_manager.cc | 2 +- .../ad_block_regional_service_manager.h | 4 +- .../browser/base_brave_shields_service.cc | 5 +- .../browser/base_brave_shields_service.h | 12 +- .../browser/brave_shields_util.cc | 1 + .../browser/tracking_protection_service.cc | 2 +- .../browser/tracking_protection_service.h | 4 +- .../brave_profile_sync_service_impl.cc | 1 + .../brave_webtorrent/browser/net/BUILD.gn | 1 + ...orrent_redirect_network_delegate_helper.cc | 4 +- ...direct_network_delegate_helper_unittest.cc | 22 +- components/common/typescript.gni | 2 +- components/components_brave_strings.grd | 1 + components/components_settings_strings.grdp | 3 + components/components_strings.grd | 4 +- components/crash_strings.grdp | 46 +- components/dom_distiller_strings.grdp | 27 +- components/flags_strings.grdp | 4 +- .../push_client_channel_unittest.cc | 61 - ...s.grdp => javascript_dialogs_strings.grdp} | 0 components/management_strings.grdp | 23 +- components/new_or_sad_tab_strings.grdp | 6 +- components/omnibox/browser/BUILD.gn | 2 - .../browser/brave_autocomplete_controller.cc | 26 - .../browser/brave_autocomplete_controller.h | 24 - .../browser/suggested_sites_provider.cc | 3 +- .../browser/suggested_sites_provider.h | 2 +- .../browser/suggested_sites_provider_data.cc | 10 +- components/omnibox_strings.grdp | 9 + components/page_info/BUILD.gn | 8 + components/page_info_strings.grdp | 89 +- components/password_manager_strings.grdp | 9 + components/payments_strings.grdp | 6 + components/pdf_strings.grdp | 17 +- components/permissions_strings.grdp | 137 + components/policy_strings.grdp | 20 +- .../resources/brave_components_strings.grd | 5 +- .../security_interstitials_strings.grdp | 25 +- components/services/bat_ads/BUILD.gn | 2 +- components/services/bat_ledger/BUILD.gn | 2 +- components/vector_icons/BUILD.gn | 25 + .../vector_icons/autoplay_status.icon | 0 .../vector_icons/vector_icons.cc.template | 17 + .../vector_icons/vector_icons.h.template | 26 + content/common/frame_messages.h | 3 +- ...ured_proxy_resolution_service_unittest.cc} | 25 +- .../proxy_config_service_tor_unittest.cc | 9 +- ...iew-browser-aw_permission_manager.cc.patch | 10 +- ...id_webview-browser-cookie_manager.cc.patch | 13 - ...dded_i18n-generate_embedded_i18n.gni.patch | 2 +- patches/build-android-bytecode-BUILD.gn.patch | 6 +- ...mium-bytecode-ByteCodeProcessor.java.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 +- patches/build-config-android-rules.gni.patch | 6 +- patches/build-config-compiler-BUILD.gn.patch | 12 + ...ild-toolchain-win-setup_toolchain.py.patch | 12 + ...build-util-android_chrome_version.py.patch | 2 +- patches/chrome-BUILD.gn.patch | 24 +- patches/chrome-VERSION.patch | 8 +- patches/chrome-android-BUILD.gn.patch | 29 +- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 4 +- ...ome-android-java-AndroidManifest.xml.patch | 13 +- ...s-layout-bottom_toolbar_browsing.xml.patch | 4 +- ...a-res-layout-custom_tabs_toolbar.xml.patch | 2 +- ...id-java-res-layout-toolbar_phone.xml.patch | 4 +- ...d-java-res-layout-toolbar_tablet.xml.patch | 2 +- ...word_preferences_action_bar_menu.xml.patch | 2 +- ...es-menu-website_preferences_menu.xml.patch | 6 +- ...hromium-chrome-browser-AppHooks.java.patch | 4 +- ...m-chrome-browser-ChromeActivity.java.patch | 4 +- ...me-browser-ChromeTabbedActivity.java.patch | 26 +- ...er-TabbedModeTabDelegateFactory.java.patch | 8 +- ...t_settings-AboutChromeSettings.java.patch} | 10 +- ...tings-LegalInformationSettings.java.patch} | 10 +- ...settings-AccessibilitySettings.java.patch} | 10 +- ...ngs-AndroidPaymentAppsFragment.java.patch} | 10 +- ...-AutofillPaymentMethodsFragment.java.patch | 13 + ...tings-AutofillProfilesFragment.java.patch} | 10 +- ...-AutofillServerProfileFragment.java.patch} | 10 +- ...s-BookmarkAddEditFolderActivity.java.patch | 4 +- ...-bookmarks-BookmarkEditActivity.java.patch | 14 +- ...browser-bookmarks-BookmarkModel.java.patch | 2 +- ...textualSearchPreferenceFragment.java.patch | 13 + ...DataReductionPreferenceFragment.java.patch | 13 + ...load-settings-DownloadSettings.java.patch} | 10 +- ...-browser-flags-FeatureUtilities.java.patch | 13 - ...epage-settings-HomepageSettings.java.patch | 13 + ...uage-settings-LanguageSettings.java.patch} | 10 +- ...-settings-ThemeSettingsFragment.java.patch | 13 + ...ions-NotificationPlatformBridge.java.patch | 2 +- ...ations-channels-ChannelsUpdater.java.patch | 16 +- ...s-settings-NotificationSettings.java.patch | 13 + ...me-browser-ntp-NewTabPageLayout.java.patch | 10 +- ...rome-browser-ntp-NewTabPageView.java.patch | 4 +- ...rcustomizations-HomepageManager.java.patch | 16 - ...ager-settings-PasswordSettings.java.patch} | 10 +- ...acy-settings-DoNotTrackSettings.java.patch | 13 + ...ivacy-settings-PrivacySettings.java.patch} | 16 +- ...e-browser-settings-MainSettings.java.patch | 4 +- ...-AutofillPaymentMethodsFragment.java.patch | 13 - ...DataReductionPreferenceFragment.java.patch | 13 - ...ngs-developer-DeveloperSettings.java.patch | 13 - ...loper-TracingCategoriesSettings.java.patch | 13 - ...tings-homepage-HomepageSettings.java.patch | 13 - ...fications-NotificationsSettings.java.patch | 13 - ...y-ClearBrowsingDataTabsFragment.java.patch | 13 - ...textualSearchPreferenceFragment.java.patch | 13 - ...ings-privacy-DoNotTrackSettings.java.patch | 13 - ...gs-themes-ThemeSettingsFragment.java.patch | 13 - ...gs-website-ChosenObjectSettings.java.patch | 22 - ...-website-SingleCategorySettings.java.patch | 22 - ...s-website-SingleWebsiteSettings.java.patch | 13 - ...r-settings-website-SiteSettings.java.patch | 13 - ...e_settings-ChosenObjectSettings.java.patch | 13 + ...settings-SingleCategorySettings.java.patch | 13 + ...wser-site_settings-SiteSettings.java.patch | 13 + ...-SiteSettingsPreferenceFragment.java.patch | 13 + ...ings-AccountManagementFragment.java.patch} | 10 +- ...nc-settings-ManageSyncSettings.java.patch} | 12 +- ...ttings-SyncAndServicesSettings.java.patch} | 8 +- ...e-browser-toolbar-ToolbarColors.java.patch | 4 +- ...-browser-toolbar-ToolbarManager.java.patch | 22 +- ...ottom-BottomControlsCoordinator.java.patch | 12 +- ...ttom-BottomToolbarConfiguration.java.patch | 13 + ...bottom-BottomToolbarCoordinator.java.patch | 20 +- ...m-BottomToolbarVariationManager.java.patch | 22 +- ...er-toolbar-top-CustomTabToolbar.java.patch | 4 +- ...lbar-top-TabSwitcherModeTTPhone.java.patch | 6 +- ...rowser-toolbar-top-ToolbarPhone.java.patch | 16 +- ...owser-toolbar-top-ToolbarTablet.java.patch | 8 +- ...cing-settings-DeveloperSettings.java.patch | 13 + ...tings-TracingCategoriesSettings.java.patch | 13 + ...acing-settings-TracingSettings.java.patch} | 8 +- patches/chrome-android-java_sources.gni.patch | 4 +- patches/chrome-app-BUILD.gn.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 8 +- ...e-autocomplete_classifier_factory.cc.patch | 2 +- ...hrome-browser-browser_process_impl.h.patch | 4 +- ...-mock_browsing_data_cookie_helper.cc.patch | 12 - ...wser-chrome_content_browser_client.h.patch | 4 +- ...host_content_settings_map_factory.cc.patch | 6 +- ...ngs-tab_specific_content_settings.cc.patch | 2 +- ...wser-devtools-devtools_ui_bindings.h.patch | 4 +- ...owser-download-download_item_model.h.patch | 2 +- ...rivate-webrtc_logging_private_api.cc.patch | 8 +- ...rowser-extensions-component_loader.h.patch | 6 +- ...tensions-extension_install_prompt.cc.patch | 6 +- ...xtensions-extension_install_prompt.h.patch | 19 +- ...r-extensions-extension_management.cc.patch | 4 +- ...er-extensions-extension_management.h.patch | 2 +- ...owser-extensions-extension_service.h.patch | 4 +- ...ser-extensions-extension_tab_util.cc.patch | 4 +- ...rotocol-external_protocol_handler.cc.patch | 2 +- ...flags-android-chrome_feature_list.cc.patch | 10 +- ...me-browser-importer-importer_list.cc.patch | 4 +- ...-media-webrtc-webrtc_log_uploader.cc.patch | 2 +- ...e_metrics_services_manager_client.cc.patch | 2 +- ...et-system_network_context_manager.cc.patch | 4 +- ...notification_display_service_impl.cc.patch | 4 +- ...-notification_platform_bridge_mac.mm.patch | 6 +- ...er-permissions-permission_manager.cc.patch | 21 - ...ser-permissions-permission_manager.h.patch | 12 - ...issions-permission_manager_factory.h.patch | 12 - ...ermissions-permission_request_impl.h.patch | 20 - ...r-permissions-permission_uma_util.cc.patch | 21 - ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +- .../chrome-browser-profiles-profile.cc.patch | 4 +- ...profiles-profile_avatar_icon_util.cc.patch | 8 +- ...ome-browser-profiles-profile_impl.cc.patch | 4 +- ...rome-browser-profiles-profile_impl.h.patch | 4 +- ...-browser-profiles-profile_io_data.cc.patch | 4 +- ...e-browser-profiles-profile_manager.h.patch | 45 +- ...iles-profile_shortcut_manager_win.cc.patch | 4 +- ...me-browser-profiles-profile_window.h.patch | 6 +- ...browser-profiles-renderer_updater.cc.patch | 2 +- ...text_menu-render_view_context_menu.h.patch | 4 +- ...rowser-resources-extensions-BUILD.gn.patch | 2 +- ...-resources-history-history_item.html.patch | 2 +- ...-browser-resources-optimize_webui.py.patch | 2 +- ...-browser-resources-settings-BUILD.gn.patch | 14 +- ...-settings-about_page-about_page.html.patch | 4 +- ...ance_page-appearance_fonts_page.html.patch | 18 - ...appearance_page-appearance_page.html.patch | 13 +- ...autofill_page-passwords_section.html.patch | 18 +- ...s-settings-lifetime_browser_proxy.js.patch | 6 +- ...ources-settings-page_visibility.html.patch | 6 +- ...ettings-people_page-people_page.html.patch | 6 +- ...cy_page-personalization_options.html.patch | 20 +- ...vacy_page-personalization_options.js.patch | 10 +- ...tings-privacy_page-privacy_page.html.patch | 104 +- ...y_page-privacy_page_browser_proxy.js.patch | 14 +- ...-browser-resources-settings-route.js.patch | 6 +- ...ettings-settings_ui-settings_ui.html.patch | 4 +- ...settings-category_default_setting.js.patch | 2 +- ...-settings-site_settings-constants.js.patch | 12 - ...ings-site_settings-site_details.html.patch | 4 +- ...ettings_page-site_settings_page.html.patch | 42 - ..._settings_page-site_settings_page.js.patch | 14 - ...browsing-client_side_model_loader.cc.patch | 4 +- ...e-browser-shell_integration_linux.cc.patch | 4 +- ...-account_consistency_mode_manager.cc.patch | 4 +- ...er-spellcheck_hunspell_dictionary.cc.patch | 4 +- ...sync-profile_sync_service_factory.cc.patch | 4 +- ...chrome-browser-themes-theme_helper.h.patch | 2 +- ...er-tracing-crash_service_uploader.cc.patch | 4 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +- ...-save_card_bubble_controller_impl.cc.patch | 4 +- patches/chrome-browser-ui-browser.h.patch | 4 +- ...rome-browser-ui-browser_navigator.cc.patch | 6 +- ...rowser-ui-cocoa-main_menu_builder.mm.patch | 6 +- ...ings-content_setting_bubble_model.cc.patch | 4 +- ...tings-content_setting_image_model.cc.patch | 4 +- ...-extension_action_view_controller.cc.patch | 4 +- ...s-extension_action_view_controller.h.patch | 8 +- ...me-browser-ui-page_info-page_info.cc.patch | 12 - ...browser-ui-page_info-page_info_ui.cc.patch | 22 - ...rtup-startup_browser_creator_impl.cc.patch | 4 +- .../chrome-browser-ui-tab_helpers.cc.patch | 12 +- .../chrome-browser-ui-tabs-tab_style.cc.patch | 6 +- ...chrome_location_bar_model_delegate.h.patch | 4 +- ...ws-bookmarks-bookmark_bubble_view.cc.patch | 2 +- ...-views-download-download_item_view.h.patch | 2 +- ...-views-extensions-extension_popup.cc.patch | 2 +- ...ws-location_bar-location_bar_view.cc.patch | 6 +- ...ews-location_bar-location_bar_view.h.patch | 10 +- ...iews-outdated_upgrade_bubble_view.cc.patch | 4 +- ...ble-permission_prompt_bubble_view.cc.patch | 8 +- ...ws-profiles-avatar_toolbar_button.cc.patch | 4 +- ...ews-profiles-avatar_toolbar_button.h.patch | 4 +- ...i-views-profiles-profile_menu_view.h.patch | 6 +- ...ws-profiles-profile_menu_view_base.h.patch | 4 +- ...me-browser-ui-views-tabs-tab_icon.cc.patch | 4 +- ...ser-ui-views-tabs-tab_style_views.cc.patch | 4 +- ...s-toolbar-browser_app_menu_button.cc.patch | 4 +- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 +- ...wser-ui-views-toolbar-toolbar_view.h.patch | 10 +- ...s-translate-translate_bubble_view.cc.patch | 2 +- ...ews-update_recommended_message_box.h.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...r-ui-webui-downloads-downloads_ui.cc.patch | 2 +- ...ui-webui-extensions-extensions_ui.cc.patch | 4 +- ...ebui-settings-import_data_handler.cc.patch | 4 +- ...ttings_localized_strings_provider.cc.patch | 4 +- ...s-announcement_notification-BUILD.gn.patch | 12 - ...de_detector-upgrade_detector_impl.cc.patch | 20 +- ...s-components-web_app_shortcut_mac.mm.patch | 4 +- .../chrome-chrome_repack_locales.gni.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 8 +- ...ommon-importer-importer_data_types.h.patch | 4 +- ...rome-install_static-install_modes.cc.patch | 30 +- ...hrome-install_static-install_util.cc.patch | 6 +- patches/chrome-installer-linux-BUILD.gn.patch | 20 +- ...aller-linux-common-installer.include.patch | 26 +- ...rome-installer-linux-debian-build.sh.patch | 12 +- .../chrome-installer-linux-rpm-build.sh.patch | 6 +- patches/chrome-installer-mac-BUILD.gn.patch | 2 +- .../chrome-installer-mac-sign_chrome.py.patch | 29 - ...taller-mac-signing-config_factory.py.patch | 13 + ...hrome-installer-mac-signing-model.py.patch | 4 +- ...hrome-installer-mac-signing-parts.py.patch | 28 + ...me-installer-mac-signing-pipeline.py.patch | 4 +- ...ome-installer-mac-signing-signing.py.patch | 28 +- ...me-installer-mini_installer-BUILD.gn.patch | 2 +- ...taller-mini_installer-chrome.release.patch | 4 +- patches/chrome-installer-util-BUILD.gn.patch | 4 +- ...aller-util-google_update_settings.cc.patch | 6 +- patches/chrome-renderer-BUILD.gn.patch | 2 +- ...er-chrome_content_renderer_client.cc.patch | 4 +- ...rer-chrome_content_renderer_client.h.patch | 4 +- patches/chrome-test-BUILD.gn.patch | 4 +- .../chrome-test-base-testing_profile.cc.patch | 4 +- patches/chrome-utility-BUILD.gn.patch | 4 +- ...s-bookmarks-browser-bookmark_model.h.patch | 4 +- ...t-android-java-res-values-dimens.xml.patch | 4 +- ..._updater-component_updater_service.h.patch | 4 +- ...ntent_settings-core-browser-BUILD.gn.patch | 4 +- ...browser-content_settings_registry.cc.patch | 8 +- ...re-browser-content_settings_utils.cc.patch | 4 +- ...ings-core-common-content_settings.cc.patch | 4 +- ...tings-core-common-content_settings.h.patch | 2 +- ...ts-crash-core-app-breakpad_linux.cc.patch} | 8 +- ...ents-crash-core-app-crashpad_mac.mm.patch} | 8 +- ...sh-core-browser-resources-crashes.js.patch | 20 +- ...owser-distiller_page_web_contents.cc.patch | 2 +- ...nternal-common-download_item_impl.cc.patch | 4 +- ...lidation-impl-fcm_network_handler.cc.patch | 4 +- ...lidation-impl-push_client_channel.cc.patch | 20 - ...network_time-network_time_tracker.cc.patch | 2 +- .../components-omnibox-browser-BUILD.gn.patch | 4 +- ...x-browser-autocomplete_controller.cc.patch | 12 + ...ox-browser-autocomplete_controller.h.patch | 12 - ...mnibox-browser-omnibox_edit_model.cc.patch | 4 +- patches/components-page_info-BUILD.gn.patch | 12 + .../components-page_info-page_info.cc.patch | 12 + ...components-page_info-page_info_ui.cc.patch | 12 + ...ts-permissions-permission_manager.cc.patch | 12 + ...nts-permissions-permission_request.h.patch | 6 +- ...s-permissions-permission_uma_util.cc.patch | 21 + ...licy-tools-generate_policy_source.py.patch | 2 +- ...-core-db-v4_protocol_manager_util.cc.patch | 2 +- patches/components-strings-BUILD.gn.patch | 12 +- ...onents-sync-AndroidSyncSettings.java.patch | 2 +- ...c-driver-glue-sync_engine_backend.cc.patch | 6 +- ...-sync-driver-glue-sync_engine_impl.h.patch | 4 +- ...-sync-driver-profile_sync_service.cc.patch | 8 +- ...s-sync-driver-profile_sync_service.h.patch | 4 +- ...components-sync-engine-sync_engine.h.patch | 2 +- ...omponents-sync-engine-sync_manager.h.patch | 8 +- ...ync-engine_impl-sync_manager_impl.cc.patch | 4 +- ...c-engine_impl-sync_scheduler_impl.cc.patch | 4 +- ...nc-engine_impl-sync_scheduler_impl.h.patch | 2 +- ...s-bookmark_remote_updates_handler.cc.patch | 12 +- .../content-browser-browser_main_loop.h.patch | 4 +- ...hild_process_security_policy_impl.cc.patch | 14 - ...s-devtools_url_loader_interceptor.cc.patch | 12 - ...e_host-navigation_controller_impl.cc.patch | 4 +- ...ser-frame_host-navigation_request.cc.patch | 4 +- ...ssions-permission_controller_impl.cc.patch | 4 +- ...content-browser-webui-web_ui_impl.cc.patch | 12 + .../content-child-child_thread_impl.cc.patch | 2 +- patches/content-common-BUILD.gn.patch | 2 +- ...lic-browser-content_browser_client.h.patch | 4 +- ...nt-public-browser-permission_type.cc.patch | 8 +- ...ent-public-browser-permission_type.h.patch | 6 +- ...nt-public-browser-url_data_source.cc.patch | 2 +- ...nt-public-test-browser_test_utils.cc.patch | 12 - ...ntent-renderer-render_thread_impl.cc.patch | 5 +- .../tsconfig.base.json.patch | 12 + .../devtools-frontend-src/tsconfig.json.patch | 12 - patches/extensions-browser-BUILD.gn.patch | 4 +- ...r-api-web_request-web_request_api.cc.patch | 4 +- ...er-extension_event_histogram_value.h.patch | 10 +- ...nsions-browser-sandboxed_unpacker.cc.patch | 4 +- ...ns-browser-updater-update_service.cc.patch | 4 +- ...r-native_extension_bindings_system.h.patch | 2 +- patches/google_apis-gaia-gaia_urls.cc.patch | 2 +- ...-blink-key_system_config_selector.cc.patch | 6 +- ...media-gpu-vaapi-vaapi_picture_tfp.cc.patch | 13 - ...jo-services-gpu_mojo_media_client.cc.patch | 13 - ...ojo-services-gpu_mojo_media_client.h.patch | 22 - ...-chromium_bindings_configuration.gni.patch | 6 +- patches/net-BUILD.gn.patch | 4 +- patches/net-cookies-canonical_cookie.cc.patch | 26 +- patches/net-cookies-canonical_cookie.h.patch | 12 - ...nfigured_proxy_resolution_service.cc.patch | 12 + ...solution-proxy_resolution_service.cc.patch | 12 - ...-url_request-url_request_http_job.cc.patch | 12 - ...services-network-public-cpp-BUILD.gn.patch | 4 +- ...ices-network-public-cpp-cors-cors.cc.patch | 6 +- ...network-restricted_cookie_manager.cc.patch | 14 - ...e_manager-sandbox-win-sandbox_win.cc.patch | 4 +- ...ygote-host-zygote_host_impl_linux.cc.patch | 2 +- ...c-mojom-permissions-permission.mojom.patch | 6 +- ...atform-web_content_settings_client.h.patch | 24 - ...d_party-blink-renderer-core-BUILD.gn.patch | 8 +- ...nk-renderer-core-frame-navigator.idl.patch | 2 +- ...-canvas-canvas_async_blob_creator.cc.patch | 4 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...r-core-html-media-autoplay_policy.cc.patch | 4 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 4 +- ...anvas2d-base_rendering_context_2d.cc.patch | 6 +- ...canvas2d-base_rendering_context_2d.h.patch | 2 +- ...vas2d-canvas_rendering_context_2d.cc.patch | 4 +- ...modules-cookie_store-cookie_store.cc.patch | 12 + ...r_request_media_key_system_access.cc.patch | 2 +- ...modules-mediastream-media_devices.cc.patch | 4 +- ...nderer-modules-modules_idl_files.gni.patch | 22 +- ...eerconnection-rtc_peer_connection.cc.patch | 53 +- ...er-modules-webaudio-analyser_node.cc.patch | 2 +- ...rer-modules-webaudio-audio_buffer.cc.patch | 10 +- ...erer-modules-webaudio-audio_buffer.h.patch | 2 +- ...er-modules-webaudio-audio_buffer.idl.patch | 18 +- ...bgl-webgl2_rendering_context_base.cc.patch | 8 +- ...ebgl-webgl_rendering_context_base.cc.patch | 48 +- ...-platform-cookie-canonical_cookie.cc.patch | 12 - ...tools-gritsettings-resource_ids.spec.patch | 4 +- ..._schema_compiler-feature_compiler.py.patch | 4 +- patches/tools-licenses.py.patch | 6 +- ...ls-metrics-histograms-histograms.xml.patch | 4 +- patches/ui-base-BUILD.gn.patch | 4 +- patches/ui-native_theme-native_theme.h.patch | 4 +- .../ui-native_theme-native_theme_mac.mm.patch | 4 +- .../ui-native_theme-native_theme_win.cc.patch | 4 +- .../ui-native_theme-native_theme_win.h.patch | 4 +- ...ews-controls-button-md_text_button.h.patch | 2 +- ...es-cr_elements-shared_style_css.html.patch | 2 +- ...ces-cr_elements-shared_vars_css.html.patch | 2 +- ...ettings_agent_impl_autoplay_browsertest.cc | 15 +- ...content_settings_agent_impl_browsertest.cc | 1 + ...t_settings_agent_impl_flash_browsertest.cc | 12 +- script/redirect-cc.cmd | 5 +- script/signing_helper.py | 22 +- test/BUILD.gn | 164 +- test/base/brave_test_launcher_delegate.cc | 5 +- third_party/blink/renderer/includes.gni | 8 +- .../blink/renderer/modules/brave/idls.gni | 8 + ui/webui/resources/BUILD.gn | 2 +- vendor/bat-native-ads/BUILD.gn | 2 + vendor/bat-native-confirmations/BUILD.gn | 2 + vendor/bat-native-ledger/BUILD.gn | 1 + .../internal/contribution/contribution.cc | 2 +- vendor/brave-ios/BUILD.gn | 6 +- .../scripts/mojo/gen_model_wrappers.py | 42 +- .../scripts/mojo/mojom_objc_generator.py | 1 + .../mojo/objc_templates/module+private.h.tmpl | 4 +- .../mojo/objc_templates/module.mm.tmpl | 2 +- 710 files changed, 8959 insertions(+), 6857 deletions(-) create mode 100644 android/brave_java_resources.gni create mode 100644 android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java rename android/java/org/chromium/chrome/browser/{settings/homepage => homepage/settings}/BraveHomepageSettings.java (82%) rename android/java/org/chromium/chrome/browser/{settings/themes => night_mode/settings}/BraveRadioButtonGroupThemePreference.java (88%) rename android/java/org/chromium/chrome/browser/{settings/themes => night_mode/settings}/BraveThemePreferences.java (93%) rename android/java/org/chromium/chrome/browser/{settings/privacy => privacy/settings}/BravePrivacySettings.java (91%) delete mode 100644 android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java rename android/java/org/chromium/chrome/browser/{settings/website => site_settings}/BraveSiteSettingsPreferencesBase.java (93%) rename android/java/org/chromium/chrome/browser/{settings/website => site_settings}/DesktopModePreferences.java (85%) rename android/java/org/chromium/chrome/browser/{settings/website => site_settings}/PlayYTVideoInBrowserPreferences.java (86%) rename android/java/org/chromium/chrome/browser/{flags/BraveFeatureUtilities.java => toolbar/bottom/BraveBottomToolbarConfiguration.java} (93%) rename android/java/{res_night => res}/values-night/brave_colors.xml (100%) create mode 100644 android/javatests/AndroidManifest.xml create mode 100644 app/os_settings_search_tag_strings.grdp create mode 100644 app/shared_settings_strings.grdp delete mode 100644 browser/geolocation/brave_geolocation_permission_context.cc delete mode 100644 browser/geolocation/brave_geolocation_permission_context.h create mode 100644 browser/geolocation/brave_geolocation_permission_context_delegate.cc create mode 100644 browser/geolocation/brave_geolocation_permission_context_delegate.h delete mode 100644 browser/permissions/BUILD.gn delete mode 100644 browser/permissions/brave_permission_manager.cc delete mode 100644 browser/permissions/brave_permission_manager.h delete mode 100644 browser/permissions/brave_permission_manager_factory.cc delete mode 100644 browser/permissions/brave_permission_manager_factory.h create mode 100644 browser/resources/settings/brave_appearance_page/BUILD.gn create mode 100644 browser/resources/settings/brave_appearance_page/brave_theme.html create mode 100644 browser/resources/settings/brave_appearance_page/brave_theme.js rename browser/resources/settings/brave_appearance_page/{brave_appearance_page.html => super_referral.html} (51%) rename browser/resources/settings/brave_appearance_page/{brave_appearance_page.js => super_referral.js} (75%) create mode 100644 browser/resources/settings/brave_appearance_page/toolbar.html create mode 100644 browser/resources/settings/brave_appearance_page/toolbar.js create mode 100644 browser/resources/settings/brave_privacy_page/BUILD.gn create mode 100644 browser/resources/settings/default_brave_shields_page/BUILD.gn create mode 100644 browser/resources/settings/settings_resources_v3.grdp create mode 100644 browser/resources/settings/social_blocking_page/BUILD.gn create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java create mode 100644 build/config/compiler.gni delete mode 100644 chromium_src/android_webview/browser/cookie_manager.cc create mode 100644 chromium_src/chrome/browser/active_use_util.cc delete mode 100644 chromium_src/chrome/browser/android/omnibox/autocomplete_controller_android.cc delete mode 100644 chromium_src/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc create mode 100644 chromium_src/chrome/browser/extensions/extension_install_prompt.h delete mode 100644 chromium_src/chrome/browser/notifications/notifier_state_tracker_factory.cc delete mode 100644 chromium_src/chrome/browser/permissions/permission_manager.cc create mode 100644 chromium_src/chrome/browser/permissions/permission_manager_factory.cc create mode 100644 chromium_src/chrome/browser/permissions/permission_manager_factory.h delete mode 100644 chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc create mode 100644 chromium_src/chrome/browser/profiles/profile_manager.h delete mode 100644 chromium_src/chrome/browser/push_messaging/push_messaging_service_factory.cc delete mode 100644 chromium_src/chrome/browser/ui/app_list/search/omnibox_provider.cc create mode 100644 chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.cc create mode 100644 chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.h delete mode 100644 chromium_src/chrome/browser/ui/page_info/page_info.cc delete mode 100644 chromium_src/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc delete mode 100644 chromium_src/chrome/browser/ui/webui/settings/settings_import_data_handler.cc create mode 100644 chromium_src/chrome/install_static/install_modes.cc create mode 100644 chromium_src/chrome/install_static/install_util.cc create mode 100644 chromium_src/chrome/installer/setup/install_worker.cc create mode 100644 chromium_src/chrome/installer/setup/user_experiment.cc rename chromium_src/components/crash/{content => core}/app/crashpad_android.cc (98%) rename chromium_src/components/crash/{content => core}/app/crashpad_win.cc (94%) create mode 100644 chromium_src/components/omnibox/browser/autocomplete_controller.cc delete mode 100644 chromium_src/components/omnibox/browser/omnibox_controller.cc create mode 100644 chromium_src/components/page_info/page_info.cc create mode 100644 chromium_src/components/page_info/page_info_delegate.h create mode 100644 chromium_src/components/page_info/page_info_ui.cc create mode 100644 chromium_src/components/permissions/permission_manager.cc rename chromium_src/{chrome/browser => components}/permissions/permission_request_impl.cc (76%) create mode 100644 chromium_src/components/permissions/permission_request_impl.h rename chromium_src/{chrome/browser => components}/permissions/permission_uma_util.cc (70%) delete mode 100644 chromium_src/content/browser/devtools/devtools_url_loader_interceptor.cc create mode 100644 chromium_src/content/browser/webui/web_ui_impl.cc delete mode 100644 chromium_src/content/public/test/browser_test_utils.cc delete mode 100644 chromium_src/net/cookies/canonical_cookie.h rename chromium_src/net/proxy_resolution/{proxy_resolution_service.cc => configured_proxy_resolution_service.cc} (84%) delete mode 100644 chromium_src/net/url_request/url_request_http_job.cc create mode 100644 chromium_src/net/url_request/url_request_test_job.cc delete mode 100644 chromium_src/services/network/restricted_cookie_manager.cc create mode 100644 chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc create mode 100644 chromium_src/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc delete mode 100644 chromium_src/third_party/blink/renderer/platform/cookie/canonical_cookie.cc create mode 100644 chromium_src/weblayer/renderer/content_renderer_client_impl.cc create mode 100644 components/brave_ads/test/BUILD.gn create mode 100644 components/brave_rewards/test/BUILD.gn delete mode 100644 components/invalidation/push_client_channel_unittest.cc rename components/{app_modal_strings.grdp => javascript_dialogs_strings.grdp} (100%) delete mode 100644 components/omnibox/browser/brave_autocomplete_controller.cc delete mode 100644 components/omnibox/browser/brave_autocomplete_controller.h create mode 100644 components/page_info/BUILD.gn create mode 100644 components/permissions_strings.grdp create mode 100644 components/vector_icons/BUILD.gn rename {app => components}/vector_icons/autoplay_status.icon (100%) create mode 100644 components/vector_icons/vector_icons.cc.template create mode 100644 components/vector_icons/vector_icons.h.template rename net/proxy_resolution/{proxy_resolution_service_unittest.cc => configured_proxy_resolution_service_unittest.cc} (68%) delete mode 100644 patches/android_webview-browser-cookie_manager.cc.patch create mode 100644 patches/build-config-compiler-BUILD.gn.patch create mode 100644 patches/build-toolchain-win-setup_toolchain.py.patch rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-about-AboutChromeSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch} (53%) rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-about-LegalInformationSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch} (50%) rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-accessibility-AccessibilitySettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch} (54%) rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AndroidPaymentAppsFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch} (52%) create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillProfilesFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch} (50%) rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillServerProfileFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch} (52%) create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-download-DownloadSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch} (55%) delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-flags-FeatureUtilities.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-languages-LanguageSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch} (50%) create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-password-PasswordSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch} (55%) create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-PrivacySettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch} (61%) delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillPaymentMethodsFragment.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-datareduction-DataReductionPreferenceFragment.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-DeveloperSettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingCategoriesSettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-notifications-NotificationsSettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ClearBrowsingDataTabsFragment.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ContextualSearchPreferenceFragment.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-DoNotTrackSettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-themes-ThemeSettingsFragment.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-ChosenObjectSettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleCategorySettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleWebsiteSettings.java.patch delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SiteSettings.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettingsPreferenceFragment.java.patch rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-sync-AccountManagementFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch} (51%) rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-sync-ManageSyncSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch} (52%) rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-sync-SyncAndServicesSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch} (59%) create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarConfiguration.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch} (54%) delete mode 100644 patches/chrome-browser-browsing_data-mock_browsing_data_cookie_helper.cc.patch delete mode 100644 patches/chrome-browser-permissions-permission_manager.cc.patch delete mode 100644 patches/chrome-browser-permissions-permission_manager.h.patch delete mode 100644 patches/chrome-browser-permissions-permission_manager_factory.h.patch delete mode 100644 patches/chrome-browser-permissions-permission_request_impl.h.patch delete mode 100644 patches/chrome-browser-permissions-permission_uma_util.cc.patch delete mode 100644 patches/chrome-browser-resources-settings-appearance_page-appearance_fonts_page.html.patch delete mode 100644 patches/chrome-browser-resources-settings-site_settings-constants.js.patch delete mode 100644 patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.html.patch delete mode 100644 patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch delete mode 100644 patches/chrome-browser-ui-page_info-page_info.cc.patch delete mode 100644 patches/chrome-browser-ui-page_info-page_info_ui.cc.patch delete mode 100644 patches/chrome-browser-updates-announcement_notification-BUILD.gn.patch delete mode 100644 patches/chrome-installer-mac-sign_chrome.py.patch create mode 100644 patches/chrome-installer-mac-signing-config_factory.py.patch create mode 100644 patches/chrome-installer-mac-signing-parts.py.patch rename patches/{components-crash-content-app-breakpad_linux.cc.patch => components-crash-core-app-breakpad_linux.cc.patch} (55%) rename patches/{components-crash-content-app-crashpad_mac.mm.patch => components-crash-core-app-crashpad_mac.mm.patch} (57%) delete mode 100644 patches/components-invalidation-impl-push_client_channel.cc.patch create mode 100644 patches/components-omnibox-browser-autocomplete_controller.cc.patch delete mode 100644 patches/components-omnibox-browser-autocomplete_controller.h.patch create mode 100644 patches/components-page_info-BUILD.gn.patch create mode 100644 patches/components-page_info-page_info.cc.patch create mode 100644 patches/components-page_info-page_info_ui.cc.patch create mode 100644 patches/components-permissions-permission_manager.cc.patch create mode 100644 patches/components-permissions-permission_uma_util.cc.patch delete mode 100644 patches/content-browser-child_process_security_policy_impl.cc.patch delete mode 100644 patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch create mode 100644 patches/content-browser-webui-web_ui_impl.cc.patch delete mode 100644 patches/content-public-test-browser_test_utils.cc.patch create mode 100644 patches/devtools-frontend-src/tsconfig.base.json.patch delete mode 100644 patches/devtools-frontend-src/tsconfig.json.patch delete mode 100644 patches/media-gpu-vaapi-vaapi_picture_tfp.cc.patch delete mode 100644 patches/media-mojo-services-gpu_mojo_media_client.cc.patch delete mode 100644 patches/media-mojo-services-gpu_mojo_media_client.h.patch delete mode 100644 patches/net-cookies-canonical_cookie.h.patch create mode 100644 patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch delete mode 100644 patches/net-proxy_resolution-proxy_resolution_service.cc.patch delete mode 100644 patches/net-url_request-url_request_http_job.cc.patch delete mode 100644 patches/services-network-restricted_cookie_manager.cc.patch delete mode 100644 patches/third_party-blink-public-platform-web_content_settings_client.h.patch create mode 100644 patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch delete mode 100644 patches/third_party-blink-renderer-platform-cookie-canonical_cookie.cc.patch create mode 100644 third_party/blink/renderer/modules/brave/idls.gni diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni new file mode 100644 index 000000000000..4af28eb8056c --- /dev/null +++ b/android/brave_java_resources.gni @@ -0,0 +1,722 @@ +# Copyright 2020 The Brave Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# See 'chrome/android/chrome_java_resources.gni' on how to generate this list +brave_java_resources = [ + "java/res/anim/activity_fade_in.xml", + "java/res/anim/cycle.xml", + "java/res/anim/activity_fade_out.xml", + "java/res/anim/shake.xml", + "java/res/drawable/radio_button_selected_bg.xml", + "java/res/drawable/bat_panel_gradient.xml", + "java/res/drawable/brave_sync_btn.xml", + "java/res/drawable/brave_sync_cover_general.xml", + "java/res/drawable/rewards_button_summary.xml", + "java/res/drawable/brave_rewards_not_verified_rectangle.xml", + "java/res/drawable/blue_rounded_button.xml", + "java/res/drawable/rewards_button.xml", + "java/res/drawable/brave_sync_qr_rounded.xml", + "java/res/drawable/brave_sync_image_btn.xml", + "java/res/drawable/brave_sync_toggle_off_btn_right.xml", + "java/res/drawable/rewards_image_button.xml", + "java/res/drawable/rewards_button_purple_border.xml", + "java/res/drawable/ic_toggle_up.xml", + "java/res/drawable/rounded_filled.xml", + "java/res/drawable/rounded_shape.xml", + "java/res/drawable/brave_badge_rewards_background_large.xml", + "java/res/drawable/rewards_button_orange.xml", + "java/res/drawable/progress_indeterminate_orange.xml", + "java/res/drawable/radiobutton_background.xml", + "java/res/drawable/transparent_bg_bordered.xml", + "java/res/drawable/ic_back.xml", + "java/res/drawable/brave_badge_shields_background_large.xml", + "java/res/drawable/brave_sync_toggle_off_btn_left.xml", + "java/res/drawable/brave_gradient_shadow.xml", + "java/res/drawable/ic_toggle_down.xml", + "java/res/drawable/brave_modern_toolbar_text_box_background.xml", + "java/res/drawable/ic_thank_you.xml", + "java/res/drawable/brave_rewards_circle.xml", + "java/res/drawable/tip_amount.xml", + "java/res/drawable/brave_sync_toggle_on_btn_right.xml", + "java/res/drawable/brave_rewards_rectangle.xml", + "java/res/drawable/brave_rewards_loader.xml", + "java/res/drawable/brave_badge_shields_background_small.xml", + "java/res/drawable/modern_toolbar_background_grey_end_segment.xml", + "java/res/drawable/orange_rounded_button.xml", + "java/res/drawable/wallet_disconnected_button.xml", + "java/res/drawable/publisher_favicon_background.xml", + "java/res/drawable/brave_sync_toggle_on_btn_left.xml", + "java/res/drawable/brave_sync_top_rounded.xml", + "java/res/drawable/rate_feedback_background.xml", + "java/res/drawable/brave_badge_rewards_background_small.xml", + "java/res/drawable/circular_progress.xml", + "java/res/drawable/rounded_corners.xml", + "java/res/drawable/bat_rewards_summary_gradient.xml", + "java/res/drawable/ic_chevron_right.xml", + "java/res/drawable/rounded_holo.xml", + "java/res/drawable/wallet_verify_button.xml", + "java/res/drawable/ic_help.xml", + "java/res/drawable/plain_checkbox.xml", + "java/res/drawable/rect_round_corners_12.xml", + "java/res/drawable/progress_indeterminate.xml", + "java/res/drawable/image_credit_rounded_shape.xml", + "java/res/drawable/rect_up_round_corners_12.xml", + "java/res/drawable/enable_rewards_button.xml", + "java/res/drawable-hdpi/check.png", + "java/res/drawable-hdpi/btn_bookmark.png", + "java/res/drawable-hdpi/arrow_forward.png", + "java/res/drawable-hdpi/camera.png", + "java/res/drawable-hdpi/slide_up.png", + "java/res/drawable-hdpi/brave_ads_launch_graphic.png", + "java/res/drawable-hdpi/shortcut_incognito.png", + "java/res/drawable-hdpi/smiley_sad.png", + "java/res/drawable-hdpi/header.png", + "java/res/drawable-hdpi/changetip_icon.png", + "java/res/drawable-hdpi/uphold_white.png", + "java/res/drawable-hdpi/down_icon.png", + "java/res/drawable-hdpi/btn_toolbar_reload.png", + "java/res/drawable-hdpi/plus.png", + "java/res/drawable-hdpi/cover_photo.png", + "java/res/drawable-hdpi/icn_unverified_alert.png", + "java/res/drawable-hdpi/slide_down.png", + "java/res/drawable-hdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-hdpi/chromelogo16.png", + "java/res/drawable-hdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-hdpi/disclosure.png", + "java/res/drawable-hdpi/plane_small.png", + "java/res/drawable-hdpi/location_bar_incognito_badge.png", + "java/res/drawable-hdpi/up_icon.png", + "java/res/drawable-hdpi/checkbox.png", + "java/res/drawable-hdpi/android_onboarding_4.png", + "java/res/drawable-hdpi/icon_error_notification.png", + "java/res/drawable-hdpi/ic_delete_white_24dp.png", + "java/res/drawable-hdpi/checkbox_checked.png", + "java/res/drawable-hdpi/btn_info.png", + "java/res/drawable-hdpi/bat_logo.png", + "java/res/drawable-hdpi/chevron_right.png", + "java/res/drawable-hdpi/search_engine_duckduckgo_lite.png", + "java/res/drawable-hdpi/brave_sync.png", + "java/res/drawable-hdpi/wallet_add.png", + "java/res/drawable-hdpi/btn_suggestion_refine.png", + "java/res/drawable-hdpi/notification_icon.png", + "java/res/drawable-hdpi/icon_warning_notification.png", + "java/res/drawable-hdpi/verified_disclosure.png", + "java/res/drawable-hdpi/search_engine_qwant.png", + "java/res/drawable-hdpi/notification_header_error.png", + "java/res/drawable-hdpi/notification_header.png", + "java/res/drawable-hdpi/grant_icon.png", + "java/res/drawable-hdpi/settings_desktop_mode.png", + "java/res/drawable-hdpi/verified_creator_large.png", + "java/res/drawable-hdpi/btn_star.png", + "java/res/drawable-hdpi/copy_paste.png", + "java/res/drawable-hdpi/omnibox_https_invalid_red.png", + "java/res/drawable-hdpi/group.png", + "java/res/drawable-hdpi/icn_twitter.png", + "java/res/drawable-hdpi/brave_sync_btn_laptop.png", + "java/res/drawable-hdpi/icon_validated_notification.png", + "java/res/drawable-hdpi/ic_file_download_white_24dp.png", + "java/res/drawable-hdpi/icon_close_notification.png", + "java/res/drawable-hdpi/icn_frowning_face.png", + "java/res/drawable-hdpi/contribute_icon.png", + "java/res/drawable-hdpi/bat_outline.png", + "java/res/drawable-hdpi/btn_bookmark_fill.png", + "java/res/drawable-hdpi/btn_delete_24dp.png", + "java/res/drawable-hdpi/incognito_splash.png", + "java/res/drawable-hdpi/btn_left.png", + "java/res/drawable-hdpi/brave_sync_btn_mobile.png", + "java/res/drawable-hdpi/android_onboarding_2.png", + "java/res/drawable-hdpi/wallet_withdraw.png", + "java/res/drawable-hdpi/btn_bat.png", + "java/res/drawable-hdpi/duckduckgo.png", + "java/res/drawable-hdpi/btn_toolbar_home.png", + "java/res/drawable-hdpi/notification_header_normal.png", + "java/res/drawable-hdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-hdpi/rewards_settings.png", + "java/res/drawable-hdpi/add_funds.png", + "java/res/drawable-hdpi/incognito_simple.png", + "java/res/drawable-hdpi/search_engine_google.png", + "java/res/drawable-hdpi/uphold_green.png", + "java/res/drawable-hdpi/btn_mic.png", + "java/res/drawable-hdpi/btn_star_filled.png", + "java/res/drawable-hdpi/ic_chrome.png", + "java/res/drawable-hdpi/smiley_neutral.png", + "java/res/drawable-hdpi/modern_location_bar.9.png", + "java/res/drawable-hdpi/btn_brave.png", + "java/res/drawable-hdpi/search_engine_startpage.png", + "java/res/drawable-hdpi/btn_brave_off.png", + "java/res/drawable-hdpi/qrcode_dark.png", + "java/res/drawable-hdpi/android_br_on.png", + "java/res/drawable-hdpi/coin_stack.png", + "java/res/drawable-hdpi/android_onboarding_3.png", + "java/res/drawable-hdpi/btn_tabswitcher_modern.png", + "java/res/drawable-hdpi/qrcode_light.png", + "java/res/drawable-hdpi/down_arrow.png", + "java/res/drawable-hdpi/icn_youtube.png", + "java/res/drawable-hdpi/android_onboarding_1.png", + "java/res/drawable-hdpi/bat_verified.png", + "java/res/drawable-hdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-hdpi/omnibox_info_red.png", + "java/res/drawable-hdpi/icn_twitch.png", + "java/res/drawable-hdpi/btn_right_tablet.png", + "java/res/drawable-hdpi/brave_onboarding.png", + "java/res/drawable-hdpi/smiley_happy.png", + "java/res/drawable-hdpi/notification_header_warning.png", + "java/res/drawable-hdpi/search_engine_bing.png", + "java/res/drawable-hdpi/coins.png", + "java/res/drawable-hdpi/btn_right.png", + "java/res/drawable-hdpi/bat_icon.png", + "java/res/drawable-hdpi/search_engine_duckduckgo.png", + "java/res/drawable-hdpi/bat_unverified.png", + "java/res/drawable-hdpi/share_icon.png", + "java/res/drawable-hdpi/omnibox_https_valid.png", + "java/res/drawable-mdpi/check.png", + "java/res/drawable-mdpi/btn_bookmark.png", + "java/res/drawable-mdpi/arrow_forward.png", + "java/res/drawable-mdpi/camera.png", + "java/res/drawable-mdpi/slide_up.png", + "java/res/drawable-mdpi/brave_ads_launch_graphic.png", + "java/res/drawable-mdpi/shortcut_incognito.png", + "java/res/drawable-mdpi/smiley_sad.png", + "java/res/drawable-mdpi/header.png", + "java/res/drawable-mdpi/changetip_icon.png", + "java/res/drawable-mdpi/uphold_white.png", + "java/res/drawable-mdpi/down_icon.png", + "java/res/drawable-mdpi/btn_toolbar_reload.png", + "java/res/drawable-mdpi/plus.png", + "java/res/drawable-mdpi/cover_photo.png", + "java/res/drawable-mdpi/icn_unverified_alert.png", + "java/res/drawable-mdpi/slide_down.png", + "java/res/drawable-mdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-mdpi/chromelogo16.png", + "java/res/drawable-mdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-mdpi/disclosure.png", + "java/res/drawable-mdpi/plane_small.png", + "java/res/drawable-mdpi/location_bar_incognito_badge.png", + "java/res/drawable-mdpi/up_icon.png", + "java/res/drawable-mdpi/checkbox.png", + "java/res/drawable-mdpi/android_onboarding_4.png", + "java/res/drawable-mdpi/icon_error_notification.png", + "java/res/drawable-mdpi/ic_delete_white_24dp.png", + "java/res/drawable-mdpi/checkbox_checked.png", + "java/res/drawable-mdpi/btn_info.png", + "java/res/drawable-mdpi/bat_logo.png", + "java/res/drawable-mdpi/chevron_right.png", + "java/res/drawable-mdpi/search_engine_duckduckgo_lite.png", + "java/res/drawable-mdpi/brave_sync.png", + "java/res/drawable-mdpi/wallet_add.png", + "java/res/drawable-mdpi/btn_suggestion_refine.png", + "java/res/drawable-mdpi/notification_icon.png", + "java/res/drawable-mdpi/icon_warning_notification.png", + "java/res/drawable-mdpi/verified_disclosure.png", + "java/res/drawable-mdpi/search_engine_qwant.png", + "java/res/drawable-mdpi/notification_header_error.png", + "java/res/drawable-mdpi/notification_header.png", + "java/res/drawable-mdpi/grant_icon.png", + "java/res/drawable-mdpi/settings_desktop_mode.png", + "java/res/drawable-mdpi/verified_creator_large.png", + "java/res/drawable-mdpi/btn_star.png", + "java/res/drawable-mdpi/copy_paste.png", + "java/res/drawable-mdpi/omnibox_https_invalid_red.png", + "java/res/drawable-mdpi/group.png", + "java/res/drawable-mdpi/icn_twitter.png", + "java/res/drawable-mdpi/brave_sync_btn_laptop.png", + "java/res/drawable-mdpi/icon_validated_notification.png", + "java/res/drawable-mdpi/ic_file_download_white_24dp.png", + "java/res/drawable-mdpi/icon_close_notification.png", + "java/res/drawable-mdpi/icn_frowning_face.png", + "java/res/drawable-mdpi/contribute_icon.png", + "java/res/drawable-mdpi/bat_outline.png", + "java/res/drawable-mdpi/btn_bookmark_fill.png", + "java/res/drawable-mdpi/btn_delete_24dp.png", + "java/res/drawable-mdpi/incognito_splash.png", + "java/res/drawable-mdpi/btn_left.png", + "java/res/drawable-mdpi/brave_sync_btn_mobile.png", + "java/res/drawable-mdpi/android_onboarding_2.png", + "java/res/drawable-mdpi/wallet_withdraw.png", + "java/res/drawable-mdpi/btn_bat.png", + "java/res/drawable-mdpi/duckduckgo.png", + "java/res/drawable-mdpi/btn_toolbar_home.png", + "java/res/drawable-mdpi/notification_header_normal.png", + "java/res/drawable-mdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-mdpi/rewards_settings.png", + "java/res/drawable-mdpi/add_funds.png", + "java/res/drawable-mdpi/incognito_simple.png", + "java/res/drawable-mdpi/search_engine_google.png", + "java/res/drawable-mdpi/uphold_green.png", + "java/res/drawable-mdpi/btn_mic.png", + "java/res/drawable-mdpi/btn_star_filled.png", + "java/res/drawable-mdpi/ic_chrome.png", + "java/res/drawable-mdpi/smiley_neutral.png", + "java/res/drawable-mdpi/modern_location_bar.9.png", + "java/res/drawable-mdpi/btn_brave.png", + "java/res/drawable-mdpi/search_engine_startpage.png", + "java/res/drawable-mdpi/btn_brave_off.png", + "java/res/drawable-mdpi/android_br_on.png", + "java/res/drawable-mdpi/coin_stack.png", + "java/res/drawable-mdpi/android_onboarding_3.png", + "java/res/drawable-mdpi/btn_tabswitcher_modern.png", + "java/res/drawable-mdpi/down_arrow.png", + "java/res/drawable-mdpi/icn_youtube.png", + "java/res/drawable-mdpi/android_onboarding_1.png", + "java/res/drawable-mdpi/bat_verified.png", + "java/res/drawable-mdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-mdpi/omnibox_info_red.png", + "java/res/drawable-mdpi/icn_twitch.png", + "java/res/drawable-mdpi/btn_right_tablet.png", + "java/res/drawable-mdpi/brave_onboarding.png", + "java/res/drawable-mdpi/smiley_happy.png", + "java/res/drawable-mdpi/notification_header_warning.png", + "java/res/drawable-mdpi/search_engine_bing.png", + "java/res/drawable-mdpi/coins.png", + "java/res/drawable-mdpi/btn_right.png", + "java/res/drawable-mdpi/bat_icon.png", + "java/res/drawable-mdpi/search_engine_duckduckgo.png", + "java/res/drawable-mdpi/bat_unverified.png", + "java/res/drawable-mdpi/share_icon.png", + "java/res/drawable-mdpi/omnibox_https_valid.png", + "java/res/drawable-nodpi/will_christiansen_glacier_peak.jpg", + "java/res/drawable-nodpi/loader16.png", + "java/res/drawable-nodpi/loader11.png", + "java/res/drawable-nodpi/annie_spratt.jpg", + "java/res/drawable-nodpi/loader28.png", + "java/res/drawable-nodpi/oliwier_gesla.jpg", + "java/res/drawable-nodpi/xavier_balderas_cejudo.jpg", + "java/res/drawable-nodpi/joe_gardner.jpg", + "java/res/drawable-nodpi/dc_cavalleri.jpg", + "java/res/drawable-nodpi/loader10.png", + "java/res/drawable-nodpi/anton_repponen.jpg", + "java/res/drawable-nodpi/loader27.png", + "java/res/drawable-nodpi/loader15.png", + "java/res/drawable-nodpi/loader26.png", + "java/res/drawable-nodpi/loader9.png", + "java/res/drawable-nodpi/andreas_gucklhorn.jpg", + "java/res/drawable-nodpi/loader19.png", + "java/res/drawable-nodpi/ben_karpinski.jpg", + "java/res/drawable-nodpi/loader24.png", + "java/res/drawable-nodpi/loader25.png", + "java/res/drawable-nodpi/loader13.png", + "java/res/drawable-nodpi/loader8.png", + "java/res/drawable-nodpi/loader12.png", + "java/res/drawable-nodpi/loader5.png", + "java/res/drawable-nodpi/loader22.png", + "java/res/drawable-nodpi/loader14.png", + "java/res/drawable-nodpi/matt_palmer.jpg", + "java/res/drawable-nodpi/andy_mai.jpg", + "java/res/drawable-nodpi/loader4.png", + "java/res/drawable-nodpi/loader0_orange.png", + "java/res/drawable-nodpi/loader7.png", + "java/res/drawable-nodpi/loader1.png", + "java/res/drawable-nodpi/loader20.png", + "java/res/drawable-nodpi/loader23.png", + "java/res/drawable-nodpi/anders_jilden.jpg", + "java/res/drawable-nodpi/loader0.png", + "java/res/drawable-nodpi/loader18.png", + "java/res/drawable-nodpi/loader2.png", + "java/res/drawable-nodpi/will_christiansen_ice.jpg", + "java/res/drawable-nodpi/loader21.png", + "java/res/drawable-nodpi/svalbard_jerol_soibam.jpeg", + "java/res/drawable-nodpi/louis_kim.jpg", + "java/res/drawable-nodpi/loader3.png", + "java/res/drawable-nodpi/loader17.png", + "java/res/drawable-nodpi/loader6.png", + "java/res/drawable-xhdpi/check.png", + "java/res/drawable-xhdpi/btn_bookmark.png", + "java/res/drawable-xhdpi/arrow_forward.png", + "java/res/drawable-xhdpi/camera.png", + "java/res/drawable-xhdpi/slide_up.png", + "java/res/drawable-xhdpi/brave_ads_launch_graphic.png", + "java/res/drawable-xhdpi/shortcut_incognito.png", + "java/res/drawable-xhdpi/smiley_sad.png", + "java/res/drawable-xhdpi/header.png", + "java/res/drawable-xhdpi/changetip_icon.png", + "java/res/drawable-xhdpi/uphold_white.png", + "java/res/drawable-xhdpi/down_icon.png", + "java/res/drawable-xhdpi/btn_toolbar_reload.png", + "java/res/drawable-xhdpi/plus.png", + "java/res/drawable-xhdpi/cover_photo.png", + "java/res/drawable-xhdpi/icn_unverified_alert.png", + "java/res/drawable-xhdpi/slide_down.png", + "java/res/drawable-xhdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-xhdpi/chromelogo16.png", + "java/res/drawable-xhdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-xhdpi/disclosure.png", + "java/res/drawable-xhdpi/plane_small.png", + "java/res/drawable-xhdpi/location_bar_incognito_badge.png", + "java/res/drawable-xhdpi/up_icon.png", + "java/res/drawable-xhdpi/checkbox.png", + "java/res/drawable-xhdpi/android_onboarding_4.png", + "java/res/drawable-xhdpi/icon_error_notification.png", + "java/res/drawable-xhdpi/ic_delete_white_24dp.png", + "java/res/drawable-xhdpi/checkbox_checked.png", + "java/res/drawable-xhdpi/btn_info.png", + "java/res/drawable-xhdpi/bat_logo.png", + "java/res/drawable-xhdpi/chevron_right.png", + "java/res/drawable-xhdpi/search_engine_duckduckgo_lite.png", + "java/res/drawable-xhdpi/brave_sync.png", + "java/res/drawable-xhdpi/wallet_add.png", + "java/res/drawable-xhdpi/btn_suggestion_refine.png", + "java/res/drawable-xhdpi/notification_icon.png", + "java/res/drawable-xhdpi/icon_warning_notification.png", + "java/res/drawable-xhdpi/verified_disclosure.png", + "java/res/drawable-xhdpi/search_engine_qwant.png", + "java/res/drawable-xhdpi/notification_header_error.png", + "java/res/drawable-xhdpi/notification_header.png", + "java/res/drawable-xhdpi/grant_icon.png", + "java/res/drawable-xhdpi/settings_desktop_mode.png", + "java/res/drawable-xhdpi/verified_creator_large.png", + "java/res/drawable-xhdpi/btn_star.png", + "java/res/drawable-xhdpi/copy_paste.png", + "java/res/drawable-xhdpi/omnibox_https_invalid_red.png", + "java/res/drawable-xhdpi/group.png", + "java/res/drawable-xhdpi/icn_twitter.png", + "java/res/drawable-xhdpi/brave_sync_btn_laptop.png", + "java/res/drawable-xhdpi/icon_validated_notification.png", + "java/res/drawable-xhdpi/ic_file_download_white_24dp.png", + "java/res/drawable-xhdpi/icon_close_notification.png", + "java/res/drawable-xhdpi/icn_frowning_face.png", + "java/res/drawable-xhdpi/contribute_icon.png", + "java/res/drawable-xhdpi/bat_outline.png", + "java/res/drawable-xhdpi/btn_bookmark_fill.png", + "java/res/drawable-xhdpi/btn_delete_24dp.png", + "java/res/drawable-xhdpi/incognito_splash.png", + "java/res/drawable-xhdpi/btn_left.png", + "java/res/drawable-xhdpi/brave_sync_btn_mobile.png", + "java/res/drawable-xhdpi/android_onboarding_2.png", + "java/res/drawable-xhdpi/wallet_withdraw.png", + "java/res/drawable-xhdpi/btn_bat.png", + "java/res/drawable-xhdpi/duckduckgo.png", + "java/res/drawable-xhdpi/btn_toolbar_home.png", + "java/res/drawable-xhdpi/notification_header_normal.png", + "java/res/drawable-xhdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-xhdpi/rewards_settings.png", + "java/res/drawable-xhdpi/add_funds.png", + "java/res/drawable-xhdpi/incognito_simple.png", + "java/res/drawable-xhdpi/search_engine_google.png", + "java/res/drawable-xhdpi/uphold_green.png", + "java/res/drawable-xhdpi/btn_mic.png", + "java/res/drawable-xhdpi/btn_star_filled.png", + "java/res/drawable-xhdpi/ic_chrome.png", + "java/res/drawable-xhdpi/smiley_neutral.png", + "java/res/drawable-xhdpi/modern_location_bar.9.png", + "java/res/drawable-xhdpi/btn_brave.png", + "java/res/drawable-xhdpi/search_engine_startpage.png", + "java/res/drawable-xhdpi/btn_brave_off.png", + "java/res/drawable-xhdpi/android_br_on.png", + "java/res/drawable-xhdpi/coin_stack.png", + "java/res/drawable-xhdpi/android_onboarding_3.png", + "java/res/drawable-xhdpi/btn_tabswitcher_modern.png", + "java/res/drawable-xhdpi/down_arrow.png", + "java/res/drawable-xhdpi/icn_youtube.png", + "java/res/drawable-xhdpi/android_onboarding_1.png", + "java/res/drawable-xhdpi/bat_verified.png", + "java/res/drawable-xhdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-xhdpi/omnibox_info_red.png", + "java/res/drawable-xhdpi/icn_twitch.png", + "java/res/drawable-xhdpi/btn_right_tablet.png", + "java/res/drawable-xhdpi/brave_onboarding.png", + "java/res/drawable-xhdpi/smiley_happy.png", + "java/res/drawable-xhdpi/notification_header_warning.png", + "java/res/drawable-xhdpi/search_engine_bing.png", + "java/res/drawable-xhdpi/coins.png", + "java/res/drawable-xhdpi/btn_right.png", + "java/res/drawable-xhdpi/bat_icon.png", + "java/res/drawable-xhdpi/search_engine_duckduckgo.png", + "java/res/drawable-xhdpi/bat_unverified.png", + "java/res/drawable-xhdpi/share_icon.png", + "java/res/drawable-xhdpi/omnibox_https_valid.png", + "java/res/drawable-xxhdpi/check.png", + "java/res/drawable-xxhdpi/btn_bookmark.png", + "java/res/drawable-xxhdpi/arrow_forward.png", + "java/res/drawable-xxhdpi/camera.png", + "java/res/drawable-xxhdpi/slide_up.png", + "java/res/drawable-xxhdpi/brave_ads_launch_graphic.png", + "java/res/drawable-xxhdpi/shortcut_incognito.png", + "java/res/drawable-xxhdpi/smiley_sad.png", + "java/res/drawable-xxhdpi/header.png", + "java/res/drawable-xxhdpi/changetip_icon.png", + "java/res/drawable-xxhdpi/uphold_white.png", + "java/res/drawable-xxhdpi/down_icon.png", + "java/res/drawable-xxhdpi/btn_toolbar_reload.png", + "java/res/drawable-xxhdpi/plus.png", + "java/res/drawable-xxhdpi/cover_photo.png", + "java/res/drawable-xxhdpi/icn_unverified_alert.png", + "java/res/drawable-xxhdpi/slide_down.png", + "java/res/drawable-xxhdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-xxhdpi/chromelogo16.png", + "java/res/drawable-xxhdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-xxhdpi/disclosure.png", + "java/res/drawable-xxhdpi/plane_small.png", + "java/res/drawable-xxhdpi/location_bar_incognito_badge.png", + "java/res/drawable-xxhdpi/up_icon.png", + "java/res/drawable-xxhdpi/checkbox.png", + "java/res/drawable-xxhdpi/android_onboarding_4.png", + "java/res/drawable-xxhdpi/icon_error_notification.png", + "java/res/drawable-xxhdpi/ic_delete_white_24dp.png", + "java/res/drawable-xxhdpi/checkbox_checked.png", + "java/res/drawable-xxhdpi/btn_info.png", + "java/res/drawable-xxhdpi/bat_logo.png", + "java/res/drawable-xxhdpi/chevron_right.png", + "java/res/drawable-xxhdpi/search_engine_duckduckgo_lite.png", + "java/res/drawable-xxhdpi/brave_sync.png", + "java/res/drawable-xxhdpi/wallet_add.png", + "java/res/drawable-xxhdpi/btn_suggestion_refine.png", + "java/res/drawable-xxhdpi/notification_icon.png", + "java/res/drawable-xxhdpi/icon_warning_notification.png", + "java/res/drawable-xxhdpi/verified_disclosure.png", + "java/res/drawable-xxhdpi/search_engine_qwant.png", + "java/res/drawable-xxhdpi/notification_header_error.png", + "java/res/drawable-xxhdpi/notification_header.png", + "java/res/drawable-xxhdpi/grant_icon.png", + "java/res/drawable-xxhdpi/settings_desktop_mode.png", + "java/res/drawable-xxhdpi/verified_creator_large.png", + "java/res/drawable-xxhdpi/btn_star.png", + "java/res/drawable-xxhdpi/copy_paste.png", + "java/res/drawable-xxhdpi/omnibox_https_invalid_red.png", + "java/res/drawable-xxhdpi/group.png", + "java/res/drawable-xxhdpi/icn_twitter.png", + "java/res/drawable-xxhdpi/brave_sync_btn_laptop.png", + "java/res/drawable-xxhdpi/icon_validated_notification.png", + "java/res/drawable-xxhdpi/ic_file_download_white_24dp.png", + "java/res/drawable-xxhdpi/icon_close_notification.png", + "java/res/drawable-xxhdpi/icn_frowning_face.png", + "java/res/drawable-xxhdpi/contribute_icon.png", + "java/res/drawable-xxhdpi/bat_outline.png", + "java/res/drawable-xxhdpi/btn_bookmark_fill.png", + "java/res/drawable-xxhdpi/btn_delete_24dp.png", + "java/res/drawable-xxhdpi/incognito_splash.png", + "java/res/drawable-xxhdpi/btn_left.png", + "java/res/drawable-xxhdpi/brave_sync_btn_mobile.png", + "java/res/drawable-xxhdpi/android_onboarding_2.png", + "java/res/drawable-xxhdpi/wallet_withdraw.png", + "java/res/drawable-xxhdpi/btn_bat.png", + "java/res/drawable-xxhdpi/duckduckgo.png", + "java/res/drawable-xxhdpi/btn_toolbar_home.png", + "java/res/drawable-xxhdpi/notification_header_normal.png", + "java/res/drawable-xxhdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-xxhdpi/rewards_settings.png", + "java/res/drawable-xxhdpi/add_funds.png", + "java/res/drawable-xxhdpi/incognito_simple.png", + "java/res/drawable-xxhdpi/search_engine_google.png", + "java/res/drawable-xxhdpi/uphold_green.png", + "java/res/drawable-xxhdpi/btn_mic.png", + "java/res/drawable-xxhdpi/btn_star_filled.png", + "java/res/drawable-xxhdpi/ic_chrome.png", + "java/res/drawable-xxhdpi/smiley_neutral.png", + "java/res/drawable-xxhdpi/modern_location_bar.9.png", + "java/res/drawable-xxhdpi/btn_brave.png", + "java/res/drawable-xxhdpi/search_engine_startpage.png", + "java/res/drawable-xxhdpi/btn_brave_off.png", + "java/res/drawable-xxhdpi/qrcode_dark.png", + "java/res/drawable-xxhdpi/android_br_on.png", + "java/res/drawable-xxhdpi/coin_stack.png", + "java/res/drawable-xxhdpi/android_onboarding_3.png", + "java/res/drawable-xxhdpi/btn_tabswitcher_modern.png", + "java/res/drawable-xxhdpi/qrcode_light.png", + "java/res/drawable-xxhdpi/icn_youtube.png", + "java/res/drawable-xxhdpi/android_onboarding_1.png", + "java/res/drawable-xxhdpi/bat_verified.png", + "java/res/drawable-xxhdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-xxhdpi/omnibox_info_red.png", + "java/res/drawable-xxhdpi/icn_twitch.png", + "java/res/drawable-xxhdpi/btn_right_tablet.png", + "java/res/drawable-xxhdpi/brave_onboarding.png", + "java/res/drawable-xxhdpi/smiley_happy.png", + "java/res/drawable-xxhdpi/notification_header_warning.png", + "java/res/drawable-xxhdpi/search_engine_bing.png", + "java/res/drawable-xxhdpi/coins.png", + "java/res/drawable-xxhdpi/btn_right.png", + "java/res/drawable-xxhdpi/bat_icon.png", + "java/res/drawable-xxhdpi/search_engine_duckduckgo.png", + "java/res/drawable-xxhdpi/bat_unverified.png", + "java/res/drawable-xxhdpi/share_icon.png", + "java/res/drawable-xxhdpi/omnibox_https_valid.png", + "java/res/drawable-xxxhdpi/check.png", + "java/res/drawable-xxxhdpi/btn_bookmark.png", + "java/res/drawable-xxxhdpi/arrow_forward.png", + "java/res/drawable-xxxhdpi/camera.png", + "java/res/drawable-xxxhdpi/slide_up.png", + "java/res/drawable-xxxhdpi/brave_ads_launch_graphic.png", + "java/res/drawable-xxxhdpi/shortcut_incognito.png", + "java/res/drawable-xxxhdpi/smiley_sad.png", + "java/res/drawable-xxxhdpi/header.png", + "java/res/drawable-xxxhdpi/changetip_icon.png", + "java/res/drawable-xxxhdpi/uphold_white.png", + "java/res/drawable-xxxhdpi/down_icon.png", + "java/res/drawable-xxxhdpi/btn_toolbar_reload.png", + "java/res/drawable-xxxhdpi/plus.png", + "java/res/drawable-xxxhdpi/cover_photo.png", + "java/res/drawable-xxxhdpi/icn_unverified_alert.png", + "java/res/drawable-xxxhdpi/slide_down.png", + "java/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-xxxhdpi/chromelogo16.png", + "java/res/drawable-xxxhdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-xxxhdpi/disclosure.png", + "java/res/drawable-xxxhdpi/plane_small.png", + "java/res/drawable-xxxhdpi/location_bar_incognito_badge.png", + "java/res/drawable-xxxhdpi/up_icon.png", + "java/res/drawable-xxxhdpi/checkbox.png", + "java/res/drawable-xxxhdpi/icon_error_notification.png", + "java/res/drawable-xxxhdpi/ic_delete_white_24dp.png", + "java/res/drawable-xxxhdpi/checkbox_checked.png", + "java/res/drawable-xxxhdpi/btn_info.png", + "java/res/drawable-xxxhdpi/bat_logo.png", + "java/res/drawable-xxxhdpi/brave_sync.png", + "java/res/drawable-xxxhdpi/wallet_add.png", + "java/res/drawable-xxxhdpi/btn_suggestion_refine.png", + "java/res/drawable-xxxhdpi/notification_icon.png", + "java/res/drawable-xxxhdpi/icon_warning_notification.png", + "java/res/drawable-xxxhdpi/verified_disclosure.png", + "java/res/drawable-xxxhdpi/notification_header_error.png", + "java/res/drawable-xxxhdpi/notification_header.png", + "java/res/drawable-xxxhdpi/grant_icon.png", + "java/res/drawable-xxxhdpi/settings_desktop_mode.png", + "java/res/drawable-xxxhdpi/verified_creator_large.png", + "java/res/drawable-xxxhdpi/btn_star.png", + "java/res/drawable-xxxhdpi/copy_paste.png", + "java/res/drawable-xxxhdpi/omnibox_https_invalid_red.png", + "java/res/drawable-xxxhdpi/group.png", + "java/res/drawable-xxxhdpi/icn_twitter.png", + "java/res/drawable-xxxhdpi/brave_sync_btn_laptop.png", + "java/res/drawable-xxxhdpi/icon_validated_notification.png", + "java/res/drawable-xxxhdpi/ic_file_download_white_24dp.png", + "java/res/drawable-xxxhdpi/icon_close_notification.png", + "java/res/drawable-xxxhdpi/icn_frowning_face.png", + "java/res/drawable-xxxhdpi/contribute_icon.png", + "java/res/drawable-xxxhdpi/bat_outline.png", + "java/res/drawable-xxxhdpi/btn_bookmark_fill.png", + "java/res/drawable-xxxhdpi/btn_delete_24dp.png", + "java/res/drawable-xxxhdpi/incognito_splash.png", + "java/res/drawable-xxxhdpi/btn_left.png", + "java/res/drawable-xxxhdpi/brave_sync_btn_mobile.png", + "java/res/drawable-xxxhdpi/wallet_withdraw.png", + "java/res/drawable-xxxhdpi/btn_bat.png", + "java/res/drawable-xxxhdpi/duckduckgo.png", + "java/res/drawable-xxxhdpi/btn_toolbar_home.png", + "java/res/drawable-xxxhdpi/notification_header_normal.png", + "java/res/drawable-xxxhdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-xxxhdpi/rewards_settings.png", + "java/res/drawable-xxxhdpi/add_funds.png", + "java/res/drawable-xxxhdpi/incognito_simple.png", + "java/res/drawable-xxxhdpi/uphold_green.png", + "java/res/drawable-xxxhdpi/btn_mic.png", + "java/res/drawable-xxxhdpi/btn_star_filled.png", + "java/res/drawable-xxxhdpi/ic_chrome.png", + "java/res/drawable-xxxhdpi/smiley_neutral.png", + "java/res/drawable-xxxhdpi/btn_brave.png", + "java/res/drawable-xxxhdpi/btn_brave_off.png", + "java/res/drawable-xxxhdpi/qrcode_dark.png", + "java/res/drawable-xxxhdpi/coin_stack.png", + "java/res/drawable-xxxhdpi/btn_tabswitcher_modern.png", + "java/res/drawable-xxxhdpi/qrcode_light.png", + "java/res/drawable-xxxhdpi/icn_youtube.png", + "java/res/drawable-xxxhdpi/bat_verified.png", + "java/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-xxxhdpi/omnibox_info_red.png", + "java/res/drawable-xxxhdpi/icn_twitch.png", + "java/res/drawable-xxxhdpi/btn_right_tablet.png", + "java/res/drawable-xxxhdpi/smiley_happy.png", + "java/res/drawable-xxxhdpi/notification_header_warning.png", + "java/res/drawable-xxxhdpi/coins.png", + "java/res/drawable-xxxhdpi/btn_right.png", + "java/res/drawable-xxxhdpi/bat_icon.png", + "java/res/drawable-xxxhdpi/bat_unverified.png", + "java/res/drawable-xxxhdpi/share_icon.png", + "java/res/drawable-xxxhdpi/omnibox_https_valid.png", + "java/res/layout/brave_shields_ads_tracking_switcher.xml", + "java/res/layout/web_notification_icon_frame_brave.xml", + "java/res/layout/brave_sync_layout.xml", + "java/res/layout/location_status_incognito_badge.xml", + "java/res/layout/fragment_troubleshooting_onboarding.xml", + "java/res/layout/user_wallet_activity.xml", + "java/res/layout/brave_shields_option_layout.xml", + "java/res/layout/brave_shields_thank_you_layout.xml", + "java/res/layout/new_tab_page_incognito.xml", + "java/res/layout/fragment_super_referral_share.xml", + "java/res/layout/activity_onboarding.xml", + "java/res/layout/brave_stats_layout.xml", + "java/res/layout/brave_shields_secondary_layout.xml", + "java/res/layout/report_broken_site_layout.xml", + "java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml", + "java/res/layout/brave_set_default_browser_dialog.xml", + "java/res/layout/brave_rewards_spinnner_item.xml", + "java/res/layout/fragment_brave_shields_onboarding.xml", + "java/res/layout/brave_ads_existing_user_dialog_layout.xml", + "java/res/layout/brave_rewards_panel.xml", + "java/res/layout/brave_rewards_site_banner.xml", + "java/res/layout/brave_shields_switcher.xml", + "java/res/layout/verify_wallet_activity.xml", + "java/res/layout/brave_shields_menu_item.xml", + "java/res/layout/brave_shields_fingerprints_blocked_switcher.xml", + "java/res/layout/fragment_search_engine_onboarding.xml", + "java/res/layout/brave_rewards_spinnner_item_dropdown.xml", + "java/res/layout/brave_rewards_grants_list_item.xml", + "java/res/layout/add_sync_device_name_dialog.xml", + "java/res/layout/brave_rewards_donation_sent.xml", + "java/res/layout/ntp_bottom_sheet.xml", + "java/res/layout/brave_shields_scripts_blocked_switcher.xml", + "java/res/layout/brave_sync_device.xml", + "java/res/layout/brave_ddg_offer_link.xml", + "java/res/layout/ntp_non_distruptive_banner.xml", + "java/res/layout/brave_shields_https_upgrade_switcher.xml", + "java/res/layout/brave_toolbar.xml", + "java/res/layout/web_notification_big_brave_ads.xml", + "java/res/layout/brave_sync_done.xml", + "java/res/layout/brave_shields_main_layout.xml", + "java/res/layout/fragment_brave_rewards_onboarding.xml", + "java/res/layout/brave_shields_toggle_layout.xml", + "java/res/layout/new_tab_page_layout.xml", + "java/res/layout/fragment_rate_dialog.xml", + "java/res/layout/brave_ads_new_user_dialog_layout.xml", + "java/res/layout/brave_shields_text_item.xml", + "java/res/layout/new_tab_page_view.xml", + "java/res/layout/fragment_brave_ads_onboarding.xml", + "java/res/layout/brave_rewards_reset_tab_content.xml", + "java/res/layout/brave_bookmark_toolbar.xml", + "java/res/layout/qa_code_check.xml", + "java/res/layout/web_notification_brave_ads.xml", + "java/res/layout/brave_custom_tabs_toolbar.xml", + "java/res/layout/brave_sync_add_mobile.xml", + "java/res/layout/brave_rewards_panel_header.xml", + "java/res/layout/brave_rewards_auto_contrib.xml", + "java/res/layout/brave_bottom_new_tab_button.xml", + "java/res/layout/ddg_offer_layout.xml", + "java/res/layout/menu_separator.xml", + "java/res/layout/brave_rewards_panel_grant.xml", + "java/res/layout/brave_sync_add_laptop.xml", + "java/res/layout-land/brave_rewards_site_banner.xml", + "java/res/layout-land/verify_wallet_activity.xml", + "java/res/menu/new_tab_menu.xml", + "java/res/menu/exit_settings_menu.xml", + "java/res/values/brave_ids.xml", + "java/res/values/brave_styles.xml", + "java/res/values/brave_colors.xml", + "java/res/values/brave_dimens.xml", + "java/res/values-h380dp/dimens.xml", + "java/res/values-h500dp/dimens.xml", + "java/res/values-h568dp/dimens.xml", + "java/res/values-h730dp/dimens.xml", + "java/res/values-h748dp/dimens.xml", + "java/res/values-h765dp/dimens.xml", + "java/res/values-h820dp/dimens.xml", + "java/res/values-night/brave_colors.xml", + "java/res/values-v21/brave_styles.xml", + "java/res/xml/brave_main_preferences.xml", + "java/res/xml/background_video_playback_preference.xml", + "java/res/xml/brave_rewards_debug_preferences.xml", + "java/res/xml/background_images_preferences.xml", + "java/res/xml/developer_preferences.xml", + "java/res/xml/use_custom_tabs_brave_preference.xml", + "java/res/xml/play_yt_video_in_browser_preferences.xml", + "java/res/xml/brave_theme_preferences.xml", + "java/res/xml/brave_license_preferences.xml", + "java/res/xml/desktop_mode_preferences.xml", + "java/res/xml/legal_information_preferences.xml", + "java/res/xml/qa_preferences.xml", + "java/res/xml/brave_rewards_preferences.xml", + "java/res/xml/closing_all_tabs_closes_brave_preference.xml", + "java/res/xml/clear_browsing_data_preferences_tab.xml", + "java/res/xml/brave_site_settings_preferences.xml", + "java/res/xml/brave_privacy_preferences.xml", + "java/res/xml/appearance_preferences.xml", +] diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 48589b271c83..291c208f03bc 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -38,8 +38,11 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkWorker.java", "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java", "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java", - "../../brave/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java", "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java", + "../../brave/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java", + "../../brave/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java", + "../../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/BraveNotificationManagerProxyImpl.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java", @@ -83,6 +86,7 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSyncScreensObserver.java", "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java", "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettingsObserver.java", + "../../brave/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java", "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java", "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java", "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java", @@ -106,21 +110,17 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java", "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java", "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java", "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java", "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java", "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java", + "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java", + "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java", + "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java", "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncService.java", "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncServiceObserver.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java", diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 117da464fb16..07e284cc5016 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -23,10 +23,14 @@ *** createBookmarkItem(...); } --keep class org.chromium.chrome.browser.externalnav.ExternalNavigationHandler { +-keep class org.chromium.components.external_intents.ExternalNavigationHandler { *** clobberCurrentTabWithFallbackUrl(...); } -keep class org.chromium.chrome.browser.LaunchIntentDispatcher { *** isCustomTabIntent(...); } + +-keep class org.chromium.chrome.browser.homepage.HomepageManager { + *** shouldCloseAppWithZeroTabs(...); +} diff --git a/android/java/org/chromium/chrome/browser/BraveActivity.java b/android/java/org/chromium/chrome/browser/BraveActivity.java index f54c0505e33d..559cb0b40dfd 100644 --- a/android/java/org/chromium/chrome/browser/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveActivity.java @@ -34,6 +34,8 @@ import org.chromium.chrome.browser.BraveSyncWorker; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkModel; +import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent; +import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService; import org.chromium.chrome.browser.onboarding.OnboardingActivity; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; @@ -51,7 +53,7 @@ import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout; import org.chromium.chrome.browser.util.BraveDbUtil; import org.chromium.chrome.browser.util.BraveReferrer; -import org.chromium.chrome.browser.util.UrlConstants; +import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.chrome.browser.settings.BackgroundImagesPreferences; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkType; @@ -61,7 +63,7 @@ * Brave's extension for ChromeActivity */ @JNINamespace("chrome::android") -public abstract class BraveActivity extends ChromeActivity { +public abstract class BraveActivity extends ChromeActivity { public static final int SITE_BANNER_REQUEST_CODE = 33; public static final int VERIFY_WALLET_ACTIVITY_REQUEST_CODE = 34; public static final int USER_WALLET_ACTIVITY_REQUEST_CODE = 35; diff --git a/android/java/org/chromium/chrome/browser/BraveHelper.java b/android/java/org/chromium/chrome/browser/BraveHelper.java index bcaf0d77f2f6..75cbabc41b66 100644 --- a/android/java/org/chromium/chrome/browser/BraveHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveHelper.java @@ -7,7 +7,7 @@ import org.chromium.base.CommandLine; import org.chromium.base.ContextUtils; -import org.chromium.chrome.browser.ChromeSwitches; +import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.firstrun.FirstRunStatus; public class BraveHelper { diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java index 1972d772591e..e08e9d4554f2 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java @@ -18,7 +18,7 @@ import android.widget.ImageView; import android.widget.TextView; -import org.chromium.chrome.browser.util.IntentUtils; +import org.chromium.base.IntentUtils; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.BraveRewardsNativeWorker; @@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) { String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher = new org.chromium.chrome.browser.BraveRewardsHelper(); mIconFetcher.retrieveLargeIcon(favicon_url, this); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java index 3745ec241179..2296ec3f96d4 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java @@ -25,12 +25,14 @@ import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.BraveActivity; import org.chromium.chrome.browser.ChromeTabbedActivity; -import org.chromium.chrome.browser.favicon.IconType; -import org.chromium.chrome.browser.favicon.LargeIconBridge; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.ui.favicon.IconType; +import org.chromium.chrome.browser.ui.favicon.LargeIconBridge; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabImpl; -import org.chromium.chrome.browser.favicon.RoundedIconGenerator; +import org.chromium.chrome.browser.ui.favicon.RoundedIconGenerator; import org.chromium.chrome.R; +import org.chromium.url.GURL; import java.math.BigDecimal; import java.util.Calendar; @@ -61,7 +63,7 @@ public interface LargeIconReadyCallback { public BraveRewardsHelper () { if (mLargeIconBridge == null) { - mLargeIconBridge = new LargeIconBridge(((TabImpl)currentActiveTab()).getProfile()); + mLargeIconBridge = new LargeIconBridge(Profile.fromWebContents(((TabImpl)currentActiveTab()).getWebContents())); } } @@ -94,7 +96,7 @@ private void retrieveLargeIconInternal() { if (mFaviconUrl == null || mFaviconUrl.isEmpty() || mFaviconUrl.equals("clear")) { Tab tab = currentActiveTab(); if (tab != null) { - mFaviconUrl = tab.getUrl(); + mFaviconUrl = tab.getUrlString(); } mHandler.postDelayed(new Runnable() { @@ -109,7 +111,7 @@ public void run() { //get the icon if (mLargeIconBridge!= null && mCallback != null && !mFaviconUrl.isEmpty()) { - mLargeIconBridge.getLargeIconForUrl(mFaviconUrl,FAVICON_DESIRED_SIZE, this); + mLargeIconBridge.getLargeIconForUrl(new GURL(mFaviconUrl),FAVICON_DESIRED_SIZE, this); } } diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index 5cefe6ce1933..21e57bcbd0ab 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -16,7 +16,7 @@ import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.BraveRewardsPublisher.PublisherStatus; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.util.UrlConstants; +import org.chromium.components.embedder_support.util.UrlConstants; import org.json.JSONException; import java.util.ArrayList; @@ -154,7 +154,7 @@ private void TriggerOnNotifyFrontTabUrlChanged() { public void run() { Tab tab = BraveRewardsHelper.currentActiveTab(); if (tab != null && !tab.isIncognito()) { - OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl()); + OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString()); } } }); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java index 478ff2184da2..871c3be2e921 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java @@ -650,7 +650,7 @@ public void ShowWebSiteView(boolean returning_to_rewards) { ShowRewardsSummary(); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); if (currentActiveTab != null && !currentActiveTab.isIncognito()) { - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); if (URLUtil.isValidUrl(url)) { mBraveRewardsNativeWorker.GetPublisherInfo(currentActiveTab.getId(), url); mPublisherFetcher = new Timer(); @@ -1241,7 +1241,7 @@ public void OnPublisherInfo(int tabId) { String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); final String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher.retrieveLargeIcon(favicon_url,this); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java index f5051021d7cb..6f406681dcdb 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java @@ -23,7 +23,7 @@ import android.widget.ToggleButton; import android.text.Spanned; import android.view.MotionEvent; -import org.chromium.chrome.browser.util.IntentUtils; +import org.chromium.base.IntentUtils; import org.chromium.chrome.browser.BraveRewardsBalance; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.BraveRewardsNativeWorker; @@ -129,7 +129,7 @@ public void onClick(View view) { String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher = new BraveRewardsHelper(); mIconFetcher.retrieveLargeIcon(favicon_url, this); diff --git a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java index 96ce4136710a..baa7a7fb1b42 100755 --- a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java @@ -2567,7 +2567,7 @@ public void run() { mNewBookmarkModel.setBookmarkTitle(bookmarkId, mTitle); } if (!mUrl.isEmpty() && bookmarkItem.isUrlEditable()) { - String fixedUrl = UrlFormatter.fixupUrl(mUrl); + String fixedUrl = UrlFormatter.fixupUrl(mUrl).getSpec(); if (null != fixedUrl && !fixedUrl.equals(bookmarkItem.getTitle())) { mNewBookmarkModel.setBookmarkUrl(bookmarkId, fixedUrl); } diff --git a/android/java/org/chromium/chrome/browser/BraveUphold.java b/android/java/org/chromium/chrome/browser/BraveUphold.java index b70fdd26585e..292e1ad2f115 100644 --- a/android/java/org/chromium/chrome/browser/BraveUphold.java +++ b/android/java/org/chromium/chrome/browser/BraveUphold.java @@ -19,7 +19,7 @@ import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.externalnav.BraveExternalNavigationHandler; -import org.chromium.chrome.browser.externalnav.ExternalNavigationParams; +import org.chromium.components.external_intents.ExternalNavigationParams; import org.chromium.chrome.R; import org.json.JSONException; import org.json.JSONObject; diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index dc439460eabe..26d4ce80caa2 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -20,12 +20,12 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; -import org.chromium.chrome.browser.flags.FeatureUtilities; import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher; import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.tabbed_mode.TabbedAppMenuPropertiesDelegate; import org.chromium.chrome.browser.tabmodel.TabModelSelector; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.toolbar.ToolbarManager; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler; @@ -96,7 +96,7 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) { // Hide bookmark button if bottom toolbar is enabled ImageButton bookmarkButton = view.findViewById(R.id.bookmark_this_page_id); - if (bookmarkButton != null && FeatureUtilities.isBottomToolbarEnabled()) { + if (bookmarkButton != null && BottomToolbarConfiguration.isBottomToolbarEnabled()) { bookmarkButton.setVisibility(View.GONE); } diff --git a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java index 2f519ad0392f..da8467977467 100644 --- a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java +++ b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java @@ -9,8 +9,8 @@ import android.os.Bundle; import org.chromium.chrome.browser.BraveHelper; -import org.chromium.chrome.browser.flags.FeatureUtilities; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; /** * Base class for ChromeLauncherActivity @@ -22,7 +22,7 @@ public void onCreate(Bundle savedInstanceState) { SharedPreferencesManager.getInstance().disableKeyCheckerForTesting(); - FeatureUtilities.isBottomToolbarEnabled(); + BottomToolbarConfiguration.isBottomToolbarEnabled(); BraveHelper.DisableFREDRP(); } } diff --git a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java index 18ab767affd0..d7783537b591 100644 --- a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java +++ b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java @@ -5,16 +5,15 @@ package org.chromium.chrome.browser.externalnav; -import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler; -import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult; +import org.chromium.components.external_intents.ExternalNavigationDelegate; +import org.chromium.components.external_intents.ExternalNavigationHandler; +import org.chromium.components.external_intents.ExternalNavigationParams; +import org.chromium.components.external_intents.ExternalNavigationHandler.OverrideUrlLoadingResult; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.BraveUphold; public class BraveExternalNavigationHandler extends ExternalNavigationHandler { private BraveUphold mBraveUphold; - public BraveExternalNavigationHandler(Tab tab) { - super(tab); - } public BraveExternalNavigationHandler(ExternalNavigationDelegate delegate) { super(delegate); diff --git a/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java new file mode 100644 index 000000000000..78186664cfb7 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java @@ -0,0 +1,15 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.homepage; + +import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager; + +// see org.brave.bytecode.BraveHomepageManagerClassAdapter +public class BraveHomepageManager { + public static boolean shouldCloseAppWithZeroTabs() { + return CloseBraveManager.shouldCloseAppWithZeroTabs(); + } +} diff --git a/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java similarity index 82% rename from android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java rename to android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java index e6a81c124ac3..a4fcfea6caef 100644 --- a/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java +++ b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.homepage; +package org.chromium.chrome.browser.homepage.settings; import android.os.Bundle; -import org.chromium.chrome.browser.partnercustomizations.HomepageManager; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.homepage.HomepageSettings; +import org.chromium.chrome.browser.homepage.HomepageManager; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.chrome.browser.homepage.settings.HomepageSettings; public class BraveHomepageSettings extends HomepageSettings { private HomepageManager mHomepageManager; diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java similarity index 88% rename from android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java rename to android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java index 5cb8687e9746..17205dff168f 100644 --- a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java +++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.themes; +package org.chromium.chrome.browser.night_mode.settings; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java similarity index 93% rename from android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java rename to android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java index 8d5e63d4c338..6e25573e9550 100644 --- a/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java +++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java @@ -3,22 +3,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.themes; +package org.chromium.chrome.browser.night_mode.settings; import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_DARKEN_WEBSITES_ENABLED; import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_SETTING; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.base.BuildInfo; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder; +import org.chromium.chrome.browser.night_mode.ThemeType; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.settings.SettingsUtils; -import org.chromium.chrome.browser.settings.themes.ThemeType; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java index 460ae4b17edf..ab1ab1648b65 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java @@ -25,7 +25,7 @@ import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; import org.chromium.chrome.browser.BraveActivity; -import org.chromium.chrome.browser.util.UrlConstants; +import org.chromium.components.embedder_support.util.UrlConstants; import java.util.Calendar; diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java index 2395103f07e0..cf97b0b4de9f 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java @@ -22,7 +22,7 @@ import android.os.Build; import android.text.Spannable; import android.text.SpannableStringBuilder; -import android.support.design.widget.FloatingActionButton; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.util.List; import android.view.MenuItem; diff --git a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java index 4a247aa6146b..dc43ed499e43 100644 --- a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java +++ b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java @@ -13,11 +13,13 @@ import android.text.SpannableString; import android.util.AttributeSet; import android.view.View; +import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.ImageView; import android.widget.FrameLayout; import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; +import org.chromium.components.content_settings.CookieControlsEnforcement; import org.chromium.ui.base.ViewUtils; import org.chromium.ui.text.NoUnderlineClickableSpan; @@ -46,18 +48,19 @@ interface IncognitoNewTabPageManager { void loadIncognitoLearnMore(); /** - * Enables/disables cookie controls mode as set from incognito NTP. By default - * nothing happens. - * @param enable A boolean specifying the state of third party cookie blocking in - * incognito. True will enable third-party cookie blocking in incognito and false - * will disable this feature. + * Initializes the cookie controls manager for interaction with the cookie controls toggle. * */ - void setThirdPartyCookieBlocking(boolean enable); + void initCookieControlsManager(); /** - * Returns whether third-party cookies are currently being blocked. + * Tells the caller whether a new snapshot is required or not. * */ - boolean shouldBlockThirdPartyCookies(); + boolean shouldCaptureThumbnail(); + + /** + * Cleans up the manager after it is finished being used. + * */ + void destroy(); /** * Called when the NTP has completely finished loading (all views will be inflated @@ -135,6 +138,36 @@ void captureThumbnail(Canvas canvas) { mSnapshotScrollY = mScrollView.getScrollY(); } + /** + * Set the visibility of the cookie controls card on the incognito description. + * @param isVisible Whether it's visible or not. + */ + void setIncognitoCookieControlsCardVisibility(boolean isVisible) {} + + /** + * Set the toggle on the cookie controls card. + * @param isChecked Whether it's checked or not. + */ + void setIncognitoCookieControlsToggleChecked(boolean isChecked) {} + + /** + * Set the incognito cookie controls toggle checked change listener. + * @param listener The given checked change listener. + */ + void setIncognitoCookieControlsToggleCheckedListener(OnCheckedChangeListener listener) {} + + /** + * Set the enforcement rule for the incognito cookie controls toggle. + * @param enforcement The enforcement enum to set. + */ + void setIncognitoCookieControlsToggleEnforcement(@CookieControlsEnforcement int enforcement) {} + + /** + * Set the incognito cookie controls icon click listener. + * @param listener The given onclick listener. + */ + void setIncognitoCookieControlsIconOnclickListener(OnClickListener listener) {} + @Override public void onAttachedToWindow() { super.onAttachedToWindow(); diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java index c69e503ec4b0..a3a25a65c8f6 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java @@ -24,9 +24,9 @@ import android.text.TextPaint; import android.content.res.Configuration; -import android.support.design.widget.BottomSheetDialogFragment; -import android.support.design.widget.BottomSheetDialog; -import android.support.design.widget.BottomSheetBehavior; +import com.google.android.material.bottomsheet.BottomSheetDialogFragment; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import com.google.android.material.bottomsheet.BottomSheetBehavior; import android.view.ViewTreeObserver; import org.chromium.chrome.R; @@ -117,7 +117,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat @Override public void onGlobalLayout() { BottomSheetDialog dialog = (BottomSheetDialog) getDialog(); - FrameLayout bottomSheet = (FrameLayout) dialog.findViewById(android.support.design.R.id.design_bottom_sheet); + FrameLayout bottomSheet = (FrameLayout) dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet); BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet); behavior.setState(BottomSheetBehavior.STATE_EXPANDED); } diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java b/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java index 4414f6e2c647..bdee9fa6cc62 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java @@ -12,7 +12,7 @@ import android.graphics.Bitmap; import android.widget.ImageView; import android.widget.Button; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import com.google.zxing.BarcodeFormat; import com.google.zxing.MultiFormatWriter; diff --git a/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java index 0e1b82a2d20a..fb3bb6201c44 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; diff --git a/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java index 09be32807b3c..d4f2e0be5db4 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.text.Spanned; import android.text.method.ScrollingMovementMethod; diff --git a/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java b/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java index 8feb3e535640..8b3f83ca0ac9 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java +++ b/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java @@ -8,7 +8,7 @@ package org.chromium.chrome.browser.onboarding; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.animation.DecelerateInterpolator; diff --git a/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java b/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java index 2b73302929c9..64e46e0fc50d 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java +++ b/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java @@ -9,7 +9,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeTabbedActivity; @@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { } OnboardingViewPagerAdapter onboardingViewPagerAdapter = new OnboardingViewPagerAdapter( - this, getFragmentManager(), this, onboardingType, fromSettings); + this, getSupportFragmentManager(), this, onboardingType, fromSettings); viewPager = findViewById(R.id.view_pager); viewPager.setAdapter(onboardingViewPagerAdapter); } diff --git a/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java b/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java index 8f6588506add..1e276e53bc10 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java +++ b/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java @@ -7,10 +7,10 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; -import android.app.FragmentManager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import android.content.Context; -import android.support.v13.app.FragmentPagerAdapter; +import androidx.fragment.app.FragmentPagerAdapter; import org.chromium.chrome.browser.onboarding.OnViewPagerAction; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; diff --git a/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java index 497608740fec..779c0c73d2d1 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java @@ -9,7 +9,7 @@ import static org.chromium.ui.base.ViewUtils.dpToPx; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java index 18aef2fa8d67..7f4b5aa40e53 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java b/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java index 8050bfc82de7..2b1893523429 100644 --- a/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java +++ b/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java @@ -5,9 +5,8 @@ package org.chromium.chrome.browser.partnercustomizations; -public class BravePartnerBrowserCustomizations - extends PartnerBrowserCustomizations { - public static class ProviderPackage implements Provider { +public class BravePartnerBrowserCustomizations { + public static class ProviderPackage implements PartnerBrowserCustomizations.Provider { @Override public String getHomepage() { return null; diff --git a/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java similarity index 91% rename from android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java rename to android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java index 4a5da76c933b..6c08f197e745 100644 --- a/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java +++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.privacy; +package org.chromium.chrome.browser.privacy.settings; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; @@ -15,11 +15,11 @@ import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.preferences.PrefServiceBridge; -import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate; -import org.chromium.chrome.browser.settings.privacy.PrivacySettings; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; +import org.chromium.chrome.browser.privacy.settings.PrivacySettings; +import org.chromium.components.browser_ui.settings.SettingsUtils; public class BravePrivacySettings extends PrivacySettings { private static final String PREF_HTTPSE = "httpse"; @@ -33,7 +33,7 @@ public class BravePrivacySettings extends PrivacySettings { private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private final PrefServiceBridge mPrefServiceBridge = PrefServiceBridge.getInstance(); - private final ManagedPreferenceDelegate mManagedPreferenceDelegate = + private final ChromeManagedPreferenceDelegate mManagedPreferenceDelegate = createManagedPreferenceDelegate(); private ChromeSwitchPreference mSearchSuggestions; private ChromeSwitchPreference mAutocompleteTopSites; @@ -128,7 +128,7 @@ private void removePreferenceIfPresent(String key) { } } - private ManagedPreferenceDelegate createManagedPreferenceDelegate() { + private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() { return preference -> { String key = preference.getKey(); if (PREF_SEARCH_SUGGESTIONS.equals(key)) { diff --git a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java index 380489657501..4599136a5cfb 100644 --- a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java +++ b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java @@ -15,7 +15,7 @@ */ package org.chromium.chrome.browser.qrreader; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import com.google.android.gms.vision.Tracker; import com.google.android.gms.vision.barcode.Barcode; diff --git a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java index de5a0f3b1bf1..fb8a3c6035b5 100644 --- a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java +++ b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java @@ -15,7 +15,7 @@ */ package org.chromium.chrome.browser.qrreader; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import com.google.android.gms.vision.MultiProcessor; import com.google.android.gms.vision.Tracker; diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java index 594213b46108..187ae597abb7 100644 --- a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java @@ -9,7 +9,7 @@ import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; @@ -18,10 +18,11 @@ import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.flags.ChromeFeatureList; -import org.chromium.chrome.browser.flags.FeatureUtilities; import org.chromium.chrome.browser.night_mode.NightModeUtils; import org.chromium.chrome.browser.preferences.BravePreferenceKeys; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.ui.base.DeviceFormFactor; @@ -41,7 +42,7 @@ public void onCreate(Bundle savedInstanceState) { removePreferenceIfPresent(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY); } - if (!NightModeUtils.isNightModeSupported() || !FeatureUtilities.isNightModeAvailable()) { + if (!NightModeUtils.isNightModeSupported()) { removePreferenceIfPresent(PREF_UI_THEME); } @@ -78,7 +79,7 @@ public void onActivityCreated(Bundle savedInstanceState) { ContextUtils.getApplicationContext()); ((ChromeSwitchPreference) enableBottomToolbar) .setChecked(!isTablet - && FeatureUtilities.isBottomToolbarEnabled()); + && BottomToolbarConfiguration.isBottomToolbarEnabled()); } } @@ -105,7 +106,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); if (BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY.equals(key)) { SharedPreferences prefs = ContextUtils.getAppSharedPreferences(); - Boolean originalStatus = FeatureUtilities.isBottomToolbarEnabled(); + Boolean originalStatus = BottomToolbarConfiguration.isBottomToolbarEnabled(); prefs.edit() .putBoolean(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, !originalStatus) diff --git a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java index cbfe747bf35a..7cb7cdb60a2d 100644 --- a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java @@ -7,8 +7,8 @@ import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; @@ -16,6 +16,8 @@ import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.BraveRelaunchUtils; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; /** * Fragment to keep track of all the display related preferences. diff --git a/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java b/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java index b7cb58b41289..e9eb95153271 100644 --- a/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java @@ -6,12 +6,13 @@ package org.chromium.chrome.browser.settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRelaunchUtils; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; public class BackgroundVideoPlaybackPreference diff --git a/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java index 6c9a5961b0ac..0a5f4972e029 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java @@ -7,13 +7,15 @@ import android.os.Bundle; import android.content.SharedPreferences; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.base.ContextUtils; import org.chromium.chrome.browser.BraveLaunchIntentDispatcher; import org.chromium.chrome.browser.preferences.BravePreferenceKeys; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.chrome.R; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; public class BraveCustomTabsPreference extends BravePreferenceFragment implements Preference.OnPreferenceChangeListener { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java index e7d7ca4103aa..899a01424892 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java @@ -11,7 +11,8 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.settings.BravePreferenceFragment; -import org.chromium.chrome.browser.settings.TextMessagePreference; +import org.chromium.components.browser_ui.settings.TextMessagePreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import java.io.IOException; import java.io.InputStream; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java index 759dd91895f4..9af3bd950e84 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java @@ -12,7 +12,7 @@ import android.os.Bundle; import android.os.Handler; import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.util.DisplayMetrics; import android.widget.TextView; import android.os.Build; @@ -20,16 +20,18 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveFeatureList; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.homepage.settings.BraveHomepageSettings; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; +import org.chromium.chrome.browser.privacy.settings.BravePrivacySettings; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; -import org.chromium.chrome.browser.settings.homepage.BraveHomepageSettings; -import org.chromium.chrome.browser.settings.privacy.BravePrivacySettings; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; +import org.chromium.components.browser_ui.settings.ChromeBasePreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import java.util.HashMap; @@ -51,6 +53,7 @@ public class BraveMainPreferencesBase extends BravePreferenceFragment { private static final String PREF_BRAVE_REWARDS = "brave_rewards"; private static final String PREF_HOMEPAGE = "homepage"; private static final String PREF_USE_CUSTOM_TABS = "use_custom_tabs"; + private static final String PREF_LANGUAGES = "languages"; private final HashMap mRemovedPreferences = new HashMap<>(); @@ -136,7 +139,7 @@ private void rearrangePreferenceOrders() { findPreference(PREF_SYNC).setOrder(++order); findPreference(PREF_ACCESSIBILITY).setOrder(++order); findPreference(PREF_CONTENT_SETTINGS).setOrder(++order); - findPreference(MainSettings.PREF_LANGUAGES).setOrder(++order); + findPreference(PREF_LANGUAGES).setOrder(++order); findPreference(MainSettings.PREF_DATA_REDUCTION).setOrder(++order); findPreference(MainSettings.PREF_DOWNLOADS).setOrder(++order); // This preference doesn't exist by default in Release mode @@ -196,7 +199,7 @@ public boolean onPreferenceClick(Preference preference) { int padding = dp2px(20); titleTextView.setPadding(padding, padding, padding, padding); titleTextView.setTextSize(18); - titleTextView.setTextColor(context.getResources().getColor(R.color.standard_mode_tint)); + titleTextView.setTextColor(context.getResources().getColor(R.color.default_icon_color_tint_list)); titleTextView.setTypeface(null, Typeface.BOLD); AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.Theme_Chromium_AlertDialog) diff --git a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java index bcdb1592c6df..f6cf8e4ac583 100644 --- a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java +++ b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import android.os.Build; import android.view.Menu; import android.view.MenuInflater; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java index 087a9b7e8ddf..d5e51a20568a 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java @@ -7,8 +7,8 @@ import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; @@ -17,6 +17,8 @@ import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.BraveRewardsPanelPopup; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; /** * Fragment to keep track of all Brave Rewards related preferences. diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java index 155c93d1eea9..23ce2662b94e 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.settings; import android.content.Context; -import android.support.v7.preference.DialogPreference; +import androidx.preference.DialogPreference; import android.util.AttributeSet; import org.chromium.chrome.R; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java index 16a9b19b2757..fe935e3009b0 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.settings; import android.os.Bundle; -import android.support.v7.preference.PreferenceDialogFragmentCompat; +import androidx.preference.PreferenceDialogFragmentCompat; import android.view.View; import org.chromium.chrome.browser.BraveRewardsNativeWorker; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java b/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java index 2ca41863320e..07a42093bb1f 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java @@ -8,7 +8,7 @@ import android.content.Context; import android.view.View; -import org.chromium.chrome.browser.settings.search_engine.SearchEngineAdapter; +import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter; import org.chromium.components.search_engines.TemplateUrl; public class BraveSearchEngineAdapter extends SearchEngineAdapter { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java index 85e5041e904a..c5bac36b87a5 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java @@ -10,7 +10,7 @@ import android.view.View; import android.widget.ListView; -import org.chromium.chrome.browser.settings.search_engine.SearchEngineAdapter; +import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter; import org.chromium.chrome.R; public class BraveSearchEnginePreference extends ListFragment { diff --git a/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java b/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java index 7be30fcfa9b7..157b1d51ed85 100644 --- a/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java @@ -6,10 +6,11 @@ package org.chromium.chrome.browser.settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager; diff --git a/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java b/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java index e9962a616532..f0505d7b7083 100644 --- a/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java +++ b/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java @@ -6,6 +6,7 @@ package org.chromium.chrome.browser.settings; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tab.TabCreationState; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver; @@ -26,7 +27,7 @@ public SearchEngineTabModelSelectorObserver(TabModelSelector tabModelSelector) { public void onChange() {} @Override - public void onNewTabCreated(Tab tab) {} + public void onNewTabCreated(Tab tab, @TabCreationState int creationState) {} @Override public void onTabModelSelected(TabModel newModel, TabModel oldModel) { diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java index da687973a870..a6bf0d932202 100644 --- a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java @@ -14,8 +14,8 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnFocusChangeListener; @@ -31,8 +31,8 @@ import org.chromium.chrome.browser.BraveRewardsPanelPopup; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.settings.BravePreferenceFragment; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.util.BraveDbUtil; /** diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java index 876996821c6c..c4231979bfa1 100644 --- a/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java @@ -10,12 +10,12 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRelaunchUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.util.BraveDbUtil; /** diff --git a/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java b/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java deleted file mode 100644 index 856867a6165f..000000000000 --- a/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.settings.privacy; - -import androidx.annotation.DrawableRes; - -import org.chromium.chrome.browser.browsing_data.BrowsingDataType; -import org.chromium.chrome.R; - -public class BraveClearBrowsingDataPreferencesAdvanced extends ClearBrowsingDataFragmentAdvanced { - private static final int CLEAR_DOWNLOADS = DialogOption.NUM_ENTRIES; - - // TODO(samartnik): disabling option as it requires futher research - // At the moment causes issue https://github.com/brave/brave-browser/issues/8737 - // @Override - // protected List getDialogOptions() { - // return Arrays.asList(DialogOption.CLEAR_HISTORY, DialogOption.CLEAR_COOKIES_AND_SITE_DATA, - // DialogOption.CLEAR_CACHE, DialogOption.CLEAR_PASSWORDS, - // DialogOption.CLEAR_FORM_DATA, DialogOption.CLEAR_SITE_SETTINGS, CLEAR_DOWNLOADS); - // } - - // TODO(samartnik): disabling option as it requires futher research - // At the moment causes issue https://github.com/brave/brave-browser/issues/8737 - // @Override - // protected Set getAllOptions() { - // Set all = super.getAllOptions(); - // all.add(CLEAR_DOWNLOADS); - // return all; - // } - - static boolean isValidDataType(int type) { - // TODO(samartnik): disabling option as it requires futher research - // At the moment causes issue https://github.com/brave/brave-browser/issues/8737 - // return type == CLEAR_DOWNLOADS; - return false; - } - - static @BrowsingDataType int getDataType(int type) { - switch (type) { - case CLEAR_DOWNLOADS: - return BrowsingDataType.DOWNLOADS; - default: - throw new IllegalArgumentException(); - } - } - - static String getPreferenceKey(int type) { - switch (type) { - case CLEAR_DOWNLOADS: - return "clear_downloads_checkbox"; - default: - throw new IllegalArgumentException(); - } - } - - static @DrawableRes int getIcon(int type) { - switch (type) { - case CLEAR_DOWNLOADS: - return R.drawable.ic_file_download_24dp; - default: - throw new IllegalArgumentException(); - } - } -} diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java index e5bbb79be46b..dd5bc3e6e318 100644 --- a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.settings.themes; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.RadioGroup; @@ -16,6 +16,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.preferences.BravePref; +import org.chromium.chrome.browser.night_mode.settings.RadioButtonGroupThemePreference; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; import org.chromium.chrome.browser.BraveRelaunchUtils; diff --git a/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java similarity index 93% rename from android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java rename to android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java index 18af76ed170e..b49a947a977e 100644 --- a/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java @@ -3,19 +3,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.website; +package org.chromium.chrome.browser.site_settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import java.util.HashMap; -public class BraveSiteSettingsPreferencesBase extends BravePreferenceFragment { +public class BraveSiteSettingsPreferencesBase extends SiteSettingsPreferenceFragment { private static final String DESKTOP_MODE_CATEGORY_KEY = "desktop_mode_category"; private static final String PLAY_YT_VIDEO_IN_BROWSER_CATEGORY_KEY = "play_yt_video_in_browser_category"; private static final String ADS_KEY = "ads"; diff --git a/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java b/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java similarity index 85% rename from android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java rename to android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java index df06cc200926..6413d32b009e 100644 --- a/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java +++ b/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.website; +package org.chromium.chrome.browser.site_settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; public class DesktopModePreferences diff --git a/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java b/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java similarity index 86% rename from android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java rename to android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java index d6a4c10618a7..f4803c8f2c64 100644 --- a/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java +++ b/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.website; +package org.chromium.chrome.browser.site_settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; public class PlayYTVideoInBrowserPreferences diff --git a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java index 352436ebaef1..1be1bf1c42fc 100644 --- a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java +++ b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java @@ -19,18 +19,15 @@ import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.util.UrlConstants; +import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; public class BraveTabCreator extends ChromeTabCreator { - public BraveTabCreator(ChromeActivity activity, - WindowAndroid nativeWindow, - StartupTabPreloader startupTabPreloader, - Supplier tabDelegateFactory, - boolean incognito) { - super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito); + public BraveTabCreator(ChromeActivity activity, WindowAndroid nativeWindow, StartupTabPreloader startupTabPreloader, + Supplier tabDelegateFactory, boolean incognito, OverviewNTPCreator overviewNTPCreator) { + super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito, overviewNTPCreator); } @Override diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java b/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java index c7b4390ac83c..dc49d5b699ab 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java @@ -12,7 +12,7 @@ import android.util.AttributeSet; import org.chromium.chrome.R; -import org.chromium.chrome.browser.partnercustomizations.HomepageManager; +import org.chromium.chrome.browser.homepage.HomepageManager; import org.chromium.chrome.browser.tab.Tab; /** diff --git a/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java similarity index 93% rename from android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java rename to android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java index 338a095f6a74..38567ef82bae 100644 --- a/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java @@ -1,9 +1,9 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.flags; +package org.chromium.chrome.browser.toolbar.bottom; import android.app.Activity; import android.content.SharedPreferences; @@ -16,7 +16,7 @@ import org.chromium.chrome.browser.preferences.BravePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -public class BraveFeatureUtilities { +public class BraveBottomToolbarConfiguration { private static final int SMALL_SCREEN_WIDTH = 360; private static final int SMALL_SCREEN_HEIGHT = 640; @@ -57,3 +57,4 @@ private static boolean isSmallScreen() { return (width <= SMALL_SCREEN_WIDTH) && (height <= SMALL_SCREEN_HEIGHT); } } + diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java index c97fd3edd06f..c594b8c1e71e 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java @@ -13,14 +13,17 @@ import android.view.ViewGroup; import android.view.ViewStub; +import org.chromium.base.Callback; import org.chromium.base.ContextUtils; import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; -import org.chromium.chrome.browser.partnercustomizations.HomepageManager; +import org.chromium.chrome.browser.homepage.HomepageManager; +import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.toolbar.HomeButton; import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; @@ -38,19 +41,18 @@ public class BraveBottomToolbarCoordinator private SearchAccelerator mSearchAccelerator; private BottomToolbarNewTabButton mNewTabButton; private ActivityTabProvider mBraveTabProvider; - private OnClickListener mOriginalHomeButtonListener; + private Runnable mOriginalHomeButtonRunnable; private final Context mContext = ContextUtils.getApplicationContext(); BraveBottomToolbarCoordinator(ViewStub stub, ActivityTabProvider tabProvider, - OnClickListener homeButtonListener, OnClickListener searchAcceleratorListener, - ObservableSupplier shareButtonListener, - OnLongClickListener tabsSwitcherLongClickListner, - ThemeColorProvider themeColorProvider) { - super(stub, tabProvider, homeButtonListener, searchAcceleratorListener, shareButtonListener, - tabsSwitcherLongClickListner, themeColorProvider); + OnLongClickListener tabsSwitcherLongClickListner, ThemeColorProvider themeColorProvider, + ObservableSupplier shareDelegateSupplier, Supplier showStartSurfaceCallable, + Runnable openHomepageAction, Callback setUrlBarFocusAction) { + super(stub, tabProvider, tabsSwitcherLongClickListner, themeColorProvider, shareDelegateSupplier, + showStartSurfaceCallable, openHomepageAction, setUrlBarFocusAction); mBraveTabProvider = tabProvider; - mOriginalHomeButtonListener = homeButtonListener; + mOriginalHomeButtonRunnable = openHomepageAction; } @Override @@ -80,14 +82,12 @@ public boolean onLongClick(View v) { } @Override - void initializeWithNative(OnClickListener tabSwitcherListener, - OnClickListener newTabClickListener, OnClickListener closeTabsClickListener, + void initializeWithNative(OnClickListener tabSwitcherListener, OnClickListener newTabClickListener, AppMenuButtonHelper menuButtonHelper, OverviewModeBehavior overviewModeBehavior, - TabCountProvider tabCountProvider, IncognitoStateProvider incognitoStateProvider, - ViewGroup topToolbarRoot) { - super.initializeWithNative(tabSwitcherListener, newTabClickListener, closeTabsClickListener, - menuButtonHelper, overviewModeBehavior, tabCountProvider, incognitoStateProvider, - topToolbarRoot); + TabCountProvider tabCountProvider, IncognitoStateProvider incognitoStateProvider, ViewGroup topToolbarRoot, + Runnable closeAllTabsAction) { + super.initializeWithNative(tabSwitcherListener, newTabClickListener, menuButtonHelper, overviewModeBehavior, + tabCountProvider, incognitoStateProvider, topToolbarRoot, closeAllTabsAction); View root = (View) topToolbarRoot.getParent(); View bottom_toolbar_browsing = root.findViewById(R.id.bottom_toolbar_browsing); @@ -100,7 +100,7 @@ void initializeWithNative(OnClickListener tabSwitcherListener, final OnClickListener homeButtonListener = v -> { final boolean isHomepageEnabled = HomepageManager.isHomepageEnabled(); if (isHomepageEnabled) { - mOriginalHomeButtonListener.onClick(v); + mOriginalHomeButtonRunnable.run(); } else { newTabClickListener.onClick(v); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java index b8995d9d8e8b..37ce4b63de14 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java @@ -5,7 +5,7 @@ package org.chromium.chrome.browser.toolbar.bottom; -import org.chromium.chrome.browser.flags.FeatureUtilities; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; /** * Brave's extension for BottomToolbarVariationManager @@ -16,12 +16,12 @@ public class BraveBottomToolbarVariationManager private static @Variations String getBraveVariation() { if (sBraveVariation != null) return sBraveVariation; - sBraveVariation = FeatureUtilities.getBottomToolbarVariation(); + sBraveVariation = BOTTOM_TOOLBAR_VARIATION.getValue(); return sBraveVariation; } public static boolean isBraveVariation() { - return FeatureUtilities.isBottomToolbarEnabled() + return BottomToolbarConfiguration.isBottomToolbarEnabled() && getBraveVariation().equals(Variations.NONE); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java index 4f641f3da60e..a0c138d51fcd 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java @@ -14,6 +14,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.tab.TabImpl; import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.MenuButton; @@ -25,8 +26,6 @@ */ public class BraveBrowsingModeBottomToolbarCoordinator extends BrowsingModeBottomToolbarCoordinator { - private Callback mBookmarkButtonListenerSupplierCallback; - private ObservableSupplier mBookmarkButtonListenerSupplier; private final BrowsingModeBottomToolbarLinearLayout mBraveToolbarRoot; private final ActivityTabProvider mBraveTabProvider; private final BookmarksButton mBookmarkButton; @@ -46,15 +45,14 @@ public class BraveBrowsingModeBottomToolbarCoordinator if (BraveBottomToolbarVariationManager.isBraveVariation()) { mBookmarkButton.setVisibility(View.VISIBLE); getNewTabButtonParent().setVisibility(View.GONE); - - mBookmarkButtonListenerSupplierCallback = bookmarkButtonListener -> { - mBookmarkButton.setOnClickListener(bookmarkButtonListener); + OnClickListener bookmarkClickHandler = v -> { + TabImpl tab = (TabImpl) mBraveTabProvider.get(); + if (tab == null || tab.getActivity() == null) { + return; + } + tab.getActivity().addOrEditBookmark(tab); }; - // To avoid extensive patching we use shareButtonListenerSupplier for both - // share and bookmark buttons. Thus we can't use them both simultaneously. - mBookmarkButtonListenerSupplier = shareButtonListenerSupplier; - mBookmarkButton.setActivityTabProvider(mBraveTabProvider); - mBookmarkButtonListenerSupplier.addObserver(mBookmarkButtonListenerSupplierCallback); + mBookmarkButton.setOnClickListener(bookmarkClickHandler); } mMenuButton = mBraveToolbarRoot.findViewById(R.id.menu_button_wrapper); if (!BottomToolbarVariationManager.isMenuButtonOnBottom()) { @@ -85,9 +83,6 @@ public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { @Override public void destroy() { super.destroy(); - if (mBookmarkButtonListenerSupplier != null) { - mBookmarkButtonListenerSupplier.removeObserver(mBookmarkButtonListenerSupplierCallback); - } mBookmarkButton.destroy(); mMenuButton.destroy(); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index 3b3ba0b4f9e3..35df40c2900b 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -39,6 +39,7 @@ import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettings; import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettingsObserver; +import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.AppearancePreferences; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabImpl; @@ -113,7 +114,7 @@ protected void onFinishInflate() { ImageButton forwardButton = findViewById(R.id.forward_button); if (forwardButton != null) { final Drawable forwardButtonDrawable = UiUtils.getTintedDrawable( - getContext(), R.drawable.btn_right_tablet, R.color.standard_mode_tint); + getContext(), R.drawable.btn_right_tablet, R.color.default_icon_color_tint_list); forwardButton.setImageDrawable(forwardButtonDrawable); } } @@ -241,7 +242,7 @@ public void onPageLoadFinished(final Tab tab, String url) { public void onDidFinishNavigation(Tab tab, NavigationHandle navigation) { if (getToolbarDataProvider().getTab() == tab && mBraveRewardsNativeWorker != null && !tab.isIncognito()) { - mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl()); + mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString()); } } @@ -257,7 +258,7 @@ public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) { if (getToolbarDataProvider().getTab() == tab && mBraveRewardsNativeWorker != null && !tab.isIncognito()) { - mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl()); + mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString()); } } }; @@ -275,13 +276,13 @@ public void onClick(View v) { return; } try { - URL url = new URL(currentTab.getUrl()); + URL url = new URL(currentTab.getUrlString()); // Don't show shields popup if protocol is not valid for shields. if (!isValidProtocolForShields(url.getProtocol())) { return; } - mBraveShieldsMenuHandler.show(mBraveShieldsButton, currentTab.getUrl(), - url.getHost(), currentTab.getId(), ((TabImpl)currentTab).getProfile()); + mBraveShieldsMenuHandler.show(mBraveShieldsButton, currentTab.getUrlString(), + url.getHost(), currentTab.getId(), Profile.fromWebContents(((TabImpl)currentTab).getWebContents())); } catch (Exception e) { // Do nothing if url is invalid. // Just return w/o showing shields popup. @@ -428,7 +429,7 @@ private boolean isShieldsOnForTab(Tab tab) { assert false; return false; } - return BraveShieldsContentSettings.getShields(((TabImpl)tab).getProfile(), tab.getUrl(), + return BraveShieldsContentSettings.getShields(Profile.fromWebContents(((TabImpl)tab).getWebContents()), tab.getUrlString(), BraveShieldsContentSettings.RESOURCE_IDENTIFIER_BRAVE_SHIELDS); } diff --git a/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java b/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java index ebc51ecebbc3..bdedda02a3bc 100644 --- a/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java +++ b/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java @@ -343,7 +343,7 @@ protected void onHandleWork(Intent intent) { // Kick off the migration task only after the browser has // completed startup, as migration requires a profile. PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> { - BrowserStartupController.get(LibraryProcessType.PROCESS_BROWSER) + BrowserStartupController.getInstance() .addStartupCompletedObserver(new BrowserStartupController.StartupCallback() { @Override public void onSuccess() { diff --git a/android/java/proguard.flags b/android/java/proguard.flags index 4440300382db..ef39801aff5b 100644 --- a/android/java/proguard.flags +++ b/android/java/proguard.flags @@ -10,4 +10,4 @@ } -keepattributes JavascriptInterface --keep class android.support.design.widget.BottomSheetBehavior { *; } +-keep class com.google.android.material.bottomsheet.BottomSheetBehavior { *; } diff --git a/android/java/res/layout/brave_bookmark_toolbar.xml b/android/java/res/layout/brave_bookmark_toolbar.xml index c4ecf01e61e9..4ca0d31e46ef 100644 --- a/android/java/res/layout/brave_bookmark_toolbar.xml +++ b/android/java/res/layout/brave_bookmark_toolbar.xml @@ -11,7 +11,7 @@ diff --git a/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml b/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml index 982ce19051a8..f167b5a1291e 100644 --- a/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml +++ b/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/brave_shields_blocks_scripts_switch" - android:textColor="@color/standard_mode_tint" + android:textColor="@color/default_icon_color_tint_list" android:orientation="horizontal" android:paddingStart="10dp" android:gravity="start|center_vertical" diff --git a/android/java/res/layout/brave_shields_switcher.xml b/android/java/res/layout/brave_shields_switcher.xml index a58b101e7994..65876be871ca 100644 --- a/android/java/res/layout/brave_shields_switcher.xml +++ b/android/java/res/layout/brave_shields_switcher.xml @@ -18,7 +18,7 @@ android:text="@string/brave_shields" android:orientation="horizontal" android:fontFamily="sans-serif-medium" - android:textColor="@color/standard_mode_tint" + android:textColor="@color/default_icon_color_tint_list" android:textSize="18sp" /> + android:textColor="@color/default_icon_color_tint_list" /> diff --git a/android/java/res/layout/brave_sync_device.xml b/android/java/res/layout/brave_sync_device.xml index 6c79bc6c0e01..425f68ed2305 100644 --- a/android/java/res/layout/brave_sync_device.xml +++ b/android/java/res/layout/brave_sync_device.xml @@ -38,7 +38,7 @@ style="@style/ListItemEndIcon" android:contentDescription="@string/remove" android:src="@drawable/ic_delete_white_24dp" - app:tint="@color/standard_mode_tint" + app:tint="@color/default_icon_color_tint_list" android:layout_centerVertical="true" android:layout_alignParentEnd="true" /> diff --git a/android/java/res/layout/brave_sync_layout.xml b/android/java/res/layout/brave_sync_layout.xml index d09bbccecc11..c895920fd498 100644 --- a/android/java/res/layout/brave_sync_layout.xml +++ b/android/java/res/layout/brave_sync_layout.xml @@ -246,7 +246,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/copy_paste" - app:tint="@color/standard_mode_tint" + app:tint="@color/default_icon_color_tint_list" android:background="@android:color/transparent" android:contentDescription="@string/brave_sync_word_count_text" android:gravity="end|center" /> diff --git a/android/java/res/layout/fragment_super_referral_share.xml b/android/java/res/layout/fragment_super_referral_share.xml index 687f9e0e90b6..68434dfb16ab 100644 --- a/android/java/res/layout/fragment_super_referral_share.xml +++ b/android/java/res/layout/fragment_super_referral_share.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@string/share_brave_with_your_friends" - android:textColor="@color/standard_mode_tint" + android:textColor="@color/default_icon_color_tint_list" android:fontFamily="sans-serif" android:textStyle="bold"/> diff --git a/android/java/res/layout/new_tab_page_incognito.xml b/android/java/res/layout/new_tab_page_incognito.xml index 617ae1e798c2..abe51b1e3051 100644 --- a/android/java/res/layout/new_tab_page_incognito.xml +++ b/android/java/res/layout/new_tab_page_incognito.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/brave_new_tab_private_header" - android:textAppearance="@style/TextAppearance.WhiteHeadline" /> + android:textAppearance="@style/TextAppearance.Headline.Primary.Light" /> + + + + app:iconTint="@color/default_icon_color_tint_list" /> diff --git a/android/java/res_night/values-night/brave_colors.xml b/android/java/res/values-night/brave_colors.xml similarity index 100% rename from android/java/res_night/values-night/brave_colors.xml rename to android/java/res/values-night/brave_colors.xml diff --git a/android/java/res/xml/appearance_preferences.xml b/android/java/res/xml/appearance_preferences.xml index eea67d3b90d8..4f82c364518d 100644 --- a/android/java/res/xml/appearance_preferences.xml +++ b/android/java/res/xml/appearance_preferences.xml @@ -5,20 +5,20 @@ You can obtain one at http://mozilla.org/MPL/2.0/. --> - - diff --git a/android/java/res/xml/background_images_preferences.xml b/android/java/res/xml/background_images_preferences.xml index b10cc8dcbd1a..d0b50abebb72 100644 --- a/android/java/res/xml/background_images_preferences.xml +++ b/android/java/res/xml/background_images_preferences.xml @@ -7,13 +7,13 @@ - - - - diff --git a/android/java/res/xml/brave_main_preferences.xml b/android/java/res/xml/brave_main_preferences.xml index f1ddd309b7d5..1b7b6f4f1d07 100644 --- a/android/java/res/xml/brave_main_preferences.xml +++ b/android/java/res/xml/brave_main_preferences.xml @@ -11,12 +11,12 @@ android:key="search_engine_section" android:order="0" android:title="@string/prefs_section_search_engine"/> - - - - - - - - - - - - - - - - diff --git a/android/java/res/xml/brave_rewards_debug_preferences.xml b/android/java/res/xml/brave_rewards_debug_preferences.xml index 74576c1b2fed..fcf5bc1edbef 100644 --- a/android/java/res/xml/brave_rewards_debug_preferences.xml +++ b/android/java/res/xml/brave_rewards_debug_preferences.xml @@ -7,7 +7,7 @@ - diff --git a/android/java/res/xml/brave_rewards_preferences.xml b/android/java/res/xml/brave_rewards_preferences.xml index 90e9338de13f..de845232ed99 100644 --- a/android/java/res/xml/brave_rewards_preferences.xml +++ b/android/java/res/xml/brave_rewards_preferences.xml @@ -7,7 +7,7 @@ - - - - \ No newline at end of file diff --git a/android/java/res/xml/clear_browsing_data_preferences_tab.xml b/android/java/res/xml/clear_browsing_data_preferences_tab.xml index f9db196f100e..b6dee4403908 100644 --- a/android/java/res/xml/clear_browsing_data_preferences_tab.xml +++ b/android/java/res/xml/clear_browsing_data_preferences_tab.xml @@ -8,47 +8,47 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - - - - - diff --git a/android/java/res/xml/closing_all_tabs_closes_brave_preference.xml b/android/java/res/xml/closing_all_tabs_closes_brave_preference.xml index 95812bc7519b..82dc16476aba 100644 --- a/android/java/res/xml/closing_all_tabs_closes_brave_preference.xml +++ b/android/java/res/xml/closing_all_tabs_closes_brave_preference.xml @@ -6,7 +6,7 @@ - - - - - - - - - diff --git a/android/java/res/xml/use_custom_tabs_brave_preference.xml b/android/java/res/xml/use_custom_tabs_brave_preference.xml index 295bf47a9164..64284c227203 100644 --- a/android/java/res/xml/use_custom_tabs_brave_preference.xml +++ b/android/java/res/xml/use_custom_tabs_brave_preference.xml @@ -6,7 +6,7 @@ - +{% endblock %} diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 608d08b5c11b..e0481cc105cf 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -29,7 +29,7 @@ public void testClassesExist() throws Exception { Assert.assertTrue(classExists("org/chromium/chrome/browser/settings/MainSettings")); Assert.assertTrue(classExists("org/chromium/components/sync/AndroidSyncSettings")); Assert.assertTrue(classExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge")); - Assert.assertTrue(classExists("org/chromium/chrome/browser/externalnav/ExternalNavigationHandler")); + Assert.assertTrue(classExists("org/chromium/components/external_intents/ExternalNavigationHandler")); Assert.assertTrue(classExists("org/chromium/chrome/browser/LaunchIntentDispatcher")); } @@ -44,9 +44,10 @@ public void testMethodsExist() throws Exception { Assert.assertTrue( methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", "extensiveBookmarkChangesEnded")); Assert.assertTrue(methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", "createBookmarkItem")); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/externalnav/ExternalNavigationHandler", + Assert.assertTrue(methodExists("org/chromium/components/external_intents/ExternalNavigationHandler", "clobberCurrentTabWithFallbackUrl")); Assert.assertTrue(methodExists("org/chromium/chrome/browser/LaunchIntentDispatcher", "isCustomTabIntent")); + Assert.assertTrue(methodExists("org/chromium/chrome/browser/homepage/HomepageManager", "shouldCloseAppWithZeroTabs")); } @Test diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index 3fa5245eec38..b2dadaa4efc3 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -206,9 +206,6 @@ By installing this extension, you are agreeing to the Google Widevine Terms of Use. You agree that Brave is not responsible for any damages or losses in connection with your use of Google Widevine. - - Autoplay media - Autoplay diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index b73bfd257122..13d47c1f114e 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -30,7 +30,6 @@ #include "components/autofill/core/common/autofill_payments_features.h" #include "components/feed/feed_feature_list.h" #include "components/offline_pages/core/offline_page_feature.h" -#include "components/omnibox/common/omnibox_features.h" #include "components/password_manager/core/common/password_manager_features.h" #include "components/security_state/core/features.h" #include "components/sync/driver/sync_driver_switches.h" @@ -153,17 +152,17 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { // Enabled features. std::unordered_set enabled_features = { - // Upgrade all mixed content + // Upgrade all mixed content blink::features::kMixedContentAutoupgrade.name, password_manager::features::kPasswordImport.name, - // Remove URL bar mixed control and allow site specific override instead + // Remove URL bar mixed control and allow site specific override instead features::kMixedContentSiteSetting.name, - // Warn about Mixed Content optionally blockable content + // Warn about Mixed Content optionally blockable content security_state::features::kPassiveMixedContentWarning.name, - // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated on - // this feature. + // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated + // on + // this feature. features::kWebUIDarkMode.name, - omnibox::kSimplifyHttpsIndicator.name, }; if (!base::CommandLine::ForCurrentProcess()->HasSwitch( @@ -173,18 +172,19 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { // Disabled features. const std::unordered_set disabled_features = { - autofill::features::kAutofillServerCommunication.name, - blink::features::kTextFragmentAnchor.name, - features::kAllowPopupsDuringPageUnload.name, - features::kLookalikeUrlNavigationSuggestionsUI.name, - features::kNotificationTriggers.name, - features::kSmsReceiver.name, - features::kVideoPlaybackQuality.name, - features::kTabHoverCards.name, + autofill::features::kAutofillEnableAccountWalletStorage.name, + autofill::features::kAutofillServerCommunication.name, + blink::features::kTextFragmentAnchor.name, + features::kAllowPopupsDuringPageUnload.name, + features::kLookalikeUrlNavigationSuggestionsUI.name, + features::kNotificationTriggers.name, + features::kSmsReceiver.name, + features::kVideoPlaybackQuality.name, + features::kTabHoverCards.name, #if defined(OS_ANDROID) - feed::kInterestFeedContentSuggestions.name, - translate::kTranslateUI.name, - offline_pages::kPrefetchingOfflinePagesFeature.name, + feed::kInterestFeedContentSuggestions.name, + translate::kTranslateUI.name, + offline_pages::kPrefetchingOfflinePagesFeature.name, #endif }; command_line.AppendFeatures(enabled_features, disabled_features); diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index acab442d43d4..ff2bd7a3e004 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -12,7 +12,6 @@ #include "chrome/test/base/in_process_browser_test.h" #include "components/autofill/core/common/autofill_features.h" #include "components/autofill/core/common/autofill_payments_features.h" -#include "components/omnibox/common/omnibox_features.h" #include "components/password_manager/core/common/password_manager_features.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/content_features.h" @@ -43,6 +42,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisableHyperlinkAuditing) { IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { const base::Feature* disabled_features[] = { + &autofill::features::kAutofillEnableAccountWalletStorage, &autofill::features::kAutofillServerCommunication, &blink::features::kTextFragmentAnchor, &features::kAllowPopupsDuringPageUnload, @@ -59,7 +59,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, EnabledFeatures) { const base::Feature* enabled_features[] = { - &omnibox::kSimplifyHttpsIndicator, &password_manager::features::kPasswordImport, }; diff --git a/app/brave_strings.grd b/app/brave_strings.grd index 210b84f41ebf..7ac4846153a3 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -159,6 +159,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> + @@ -231,6 +232,24 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> Brave - $1Brave + + + + $1Brave - Network Sign-in - Brave + + + + + + Brave - Network Sign-in - $1Brave + + + + + + $1Brave - Network Sign-in + + @@ -363,6 +382,12 @@ Brave is unable to recover your settings. Brave is trying to show passwords. + + Brave is trying to copy passwords. + + + Brave is trying to edit passwords. + Brave wants to export your passwords. @@ -371,6 +396,12 @@ Brave is unable to recover your settings. Brave is trying to show passwords. Type your Windows password to allow this. + + Brave is trying to copy passwords. Type your Windows password to allow this. + + + Brave is trying to edit passwords. Type your Windows password to allow this. + Brave wants to export your passwords. Type your Windows password to allow this. diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp index 64a0cc8300da..e83719046b55 100644 --- a/app/extensions_strings.grdp +++ b/app/extensions_strings.grdp @@ -17,15 +17,9 @@ background page - - This is blocked due to mature content. - This extension may have been corrupted. - - Enable - Collect errors diff --git a/app/generated_resources.grd b/app/generated_resources.grd index a64cf2392f6c..543a99cf5c77 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -249,6 +249,7 @@ are declared in tools/grit/grit_rule.gni. + @@ -285,11 +286,13 @@ are declared in tools/grit/grit_rule.gni. + + @@ -360,23 +363,19 @@ are declared in tools/grit/grit_rule.gni. $1google.com wants to - - Allow + + $1google.com wants to: $2use your microphone - - Block + + $1google.com wants to: $2use your microphone and $3use your location + + + $1google.com wants to: $2use your microphone, $3use your location, and more Customize - - - - Continue - - - Did you mean to go to $1http://intranetsite/? @@ -1086,8 +1085,8 @@ are declared in tools/grit/grit_rule.gni. Save Page &As... - - Reader mode + + Toggle Reader Mode More Too&ls @@ -1582,6 +1581,9 @@ are declared in tools/grit/grit_rule.gni. Failed - $1Disk full + + Being scanned + Unconfirmed @@ -1638,7 +1640,7 @@ are declared in tools/grit/grit_rule.gni. $1bla.exe can't be downloaded securely. - Advanced Protection recommends sending $1bla.exe to Brave to check for malware. + $1bla.exe may be dangerous. Send to Brave Advanced Protection for scanning? This file is not commonly downloaded and may be dangerous. @@ -1652,6 +1654,9 @@ are declared in tools/grit/grit_rule.gni. This file can't be downloaded securely. + + This file is being scanned. + Scan complete, no issues identified. @@ -1671,6 +1676,12 @@ are declared in tools/grit/grit_rule.gni. This file is encrypted and has been blocked from opening. + + + Insecure download blocked + + + Dangerous download blocked @@ -1720,7 +1731,7 @@ are declared in tools/grit/grit_rule.gni. Open now - Scan + Send @@ -1844,6 +1855,18 @@ are declared in tools/grit/grit_rule.gni. + + + + $1file.exe may be dangerous. Send to Brave Advanced Protection for scanning? + + + + + $1file.exe may be dangerous. Send to Brave Advanced Protection for scanning? Press Shift+F6 to cycle to the downloads bar area. + + + @@ -2328,18 +2351,12 @@ are declared in tools/grit/grit_rule.gni. • $1You might need permission to continue ... - - Automatic Downloads - Continue blocking automatic downloads of multiple files Always allow $1example.com to download multiple files - - Manage download settings... - This site downloaded multiple files automatically @@ -2368,9 +2385,6 @@ are declared in tools/grit/grit_rule.gni. This page set cookies. - - Manage cookie blocking... - Show cookies and other site data... @@ -2410,9 +2424,6 @@ are declared in tools/grit/grit_rule.gni. Continue blocking - - Manage pop-up blocking... - Always allow $1mail.google.com to access your camera and microphone @@ -2530,16 +2541,16 @@ are declared in tools/grit/grit_rule.gni. Block cookies - Turn off for this site + Allow cookies Site not working? - Some sites use third-party cookies to load their pages. If a site isn't working, you can try turning off cookie blocking. + Some sites use third-party cookies to load their pages. If a site isn't working, you can try allowing cookies. - Sites can’t use your browsing activity across different sites to personalize ads + Sites can't use cookies that track you across the web Third-party cookie blocking @@ -2564,51 +2575,6 @@ are declared in tools/grit/grit_rule.gni. - - - Issued To - - - Issued By - - - Common Name (CN) - - - Organization (O) - - - Organizational Unit (OU) - - - Serial Number - - - Validity Period - - - Issued On - - - Expires On - - - Fingerprints - - - SHA-256 Fingerprint - - - SHA-1 Fingerprint - - - - Extensions - - - Certificate Subject Alternative Name - - Base64-encoded ASCII, single certificate @@ -3385,6 +3351,12 @@ are declared in tools/grit/grit_rule.gni. Renderer: $1http://www.google.com + + Dedicated Worker: $1https://googlechrome.github.io/samples/dedicated-worker/basic/dedicated-worker.js + + + Shared Worker: $1https://googlechrome.github.io/samples/shared-worker/basic/shared-worker.js + Service Worker: $1https://googlechrome.github.io/samples/service-worker/basic/service-worker.js @@ -3451,6 +3423,9 @@ are declared in tools/grit/grit_rule.gni. Profile Importer + + QR Code Generator + WiFi Credentials Getter @@ -3510,9 +3485,6 @@ are declared in tools/grit/grit_rule.gni. Uninstall app? - - "$1Gmail Checker" will be uninstalled. - Data associated with this app will be removed from this device. @@ -3531,6 +3503,15 @@ are declared in tools/grit/grit_rule.gni. Remove "$1Gmail Checker"? + + Send a request to your administrator to install "$1Gmail Checker"? + + + You already requested "$1Gmail Checker" + + + Your admin has blocked "$1Gmail Checker" + "$1Extension Manager" would like to remove "$2Gmail Checker". @@ -3633,6 +3614,9 @@ are declared in tools/grit/grit_rule.gni. Manually control site permissions. + + From your administrator: $1Please visit www.example.com/extension for more information. + • $1Read and change all your data on the websites you visit @@ -3926,9 +3910,6 @@ are declared in tools/grit/grit_rule.gni. Lock and unlock the screen - - Change the bookmarks user interface - Monitor the behavior of other extensions, including visited URLs @@ -4030,12 +4011,6 @@ are declared in tools/grit/grit_rule.gni. Could not load '$1/path/to/file' for theme. - - Could not load icon '$1icon.png' for page action. - - - Could not load icon '$1icon.png' for browser action. - @@ -4279,6 +4254,42 @@ Keep your key file in a safe place. You will need it to create new versions of y Add theme + + Ask a parent + + + Go get a parent to approve "$1Gmail Checker" + + + extension + + + app + + + $1Junior wants to install an $2extension that can: + + + Approve + + + Cancel + + + Choose parent account for approval + + + Parent account + + + Enter password + + + Password incorrect + + + Send + Remove @@ -4684,25 +4695,6 @@ Keep your key file in a safe place. You will need it to create new versions of y - - - - Sync this password to your iPhone - - - Get this password on your iPhone - - - Share this password with your iPhone - - - Send to phone - - - No thanks - - - Updated $130 min ago @@ -5083,6 +5075,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Remove suggestion from clipboard? + + + Always Show Full URLs + + + + + Always show full URLs + + @@ -5512,31 +5514,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Reset to default zoom level - - - Respond to Accessibility Events - - - - $1maps.google.com wants to respond to accessibility events - - - Accessibility Events - - - - - See text and images copied to the clipboard - - - - $1maps.google.com wants to see text and images copied to the clipboard - - - Clipboard - - Clipboard read access allowed @@ -5736,6 +5714,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Update + + Save passwords for this site + Password for $1Alexander @@ -5929,9 +5910,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Clear browsing data - - Run Flash - The selected data has been removed from Brave and synced devices. Your Brave Account 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>. @@ -5960,9 +5938,6 @@ Keep your key file in a safe place. You will need it to create new versions of y {NUM_POPUPS,plural,=1{Pop-up blocked} other{# pop-ups blocked}} - - Manage handler settings... - (Brave error pages) @@ -6232,6 +6207,14 @@ Keep your key file in a safe place. You will need it to create new versions of y =1 {Move tab to new window} other {Move tabs to new window}} + + {NUM_TABS, plural, + =1 {Move tab to another window} + other {Move tabs to another window}} + + + New window + @@ -6284,6 +6267,32 @@ Keep your key file in a safe place. You will need it to create new versions of y =1 {Move Tab to New Window} other {Move Tabs to New Window}} + + {NUM_TABS, plural, + =1 {Move Tab to Another Window} + other {Move Tabs to Another Window}} + + + New Window + + + + + + + {NUM_PAGES, plural, + =0 {$1Brave} + =1 {$1Brave and 1 other tab} + other {$1Brave and # other tabs}} + + + + + {NUM_PAGES, plural, + =0 {$1Brave} + =1 {$1Brave and 1 Other Tab} + other {$1Brave and # Other Tabs}} + @@ -6297,6 +6306,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Close group + + Move group to new window + Send feedback @@ -6314,6 +6326,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Close Group + + Move Group to New Window + Send Feedback @@ -6660,8 +6675,8 @@ Keep your key file in a safe place. You will need it to create new versions of y - - Home page + + Homepage @@ -6764,19 +6779,25 @@ Keep your key file in a safe place. You will need it to create new versions of y - Text shared from other device + Text copied from other device - Text shared from $1Jimmy's Pixel + Text copied from $1Jimmy's Pixel - Image shared from other device + Image copied from other device - Image shared from $1Jimmy's Pixel + Image copied from $1Jimmy's Pixel - Copied to your clipboard + Press $1Ctrl+V to paste + + + Preparing download + + + Processing image @@ -6871,17 +6892,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Cookies from $1example.com will be cleared on exit - - - Cookies from multiple sites allowed. - - - Cookies from multiple sites blocked. - - - Cookies from multiple sites will be cleared on exit. - - Allowed @@ -7034,23 +7044,6 @@ Keep your key file in a safe place. You will need it to create new versions of y no cookie selected - - - Key: - - - Value: - - - - Origin: - - - Size on disk: - - - Last modified: - Cookies @@ -7060,14 +7053,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Application cache - - Manifest: - - - - Size: - - Web databases @@ -7095,9 +7080,6 @@ Keep your key file in a safe place. You will need it to create new versions of y None - - Last accessed: - Service Workers @@ -7484,6 +7466,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Webpage, Complete + + Webpage, Single File (Web Bundle) + @@ -7526,11 +7511,6 @@ Please help our engineers fix this problem. Tell us what happened right before y $1https://backgroundfetch.com wants to download multiple files - - - Download - - Download multiple files @@ -7981,17 +7961,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - $1mail.google.com wants to send you notifications - - - - Notifications - - - - Show notifications - Settings @@ -8017,12 +7986,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Notifications blocked - - Notifications for $1example.com are blocked - - - Notifications are automatically blocked for all sites except ones you allow - @@ -8455,22 +8418,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - $1maps.google.com wants to use your computer's location - - - - - $1maps.google.com wants to use your device's location - - - Location - - - - Know your location - This page contains elements from the following sites that are tracking your location: @@ -8483,9 +8430,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Clear these settings for future visits - - Manage location settings... - This page is tracking your location. @@ -8494,17 +8438,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - $1www.google.com wants to get full control of your MIDI devices - - - - MIDI Devices - - - - Use your MIDI devices - This page has full control of MIDI devices. @@ -8523,9 +8456,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Clear these settings for future visits - - Manage MIDI settings... - @@ -8533,9 +8463,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - Manage media settings... - This page is accessing your camera and microphone. @@ -8609,20 +8536,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - Know your unique device identifier - - - $1https://www.youtube.com wants to play protected content. Your device’s identity will be verified by Brave. - - - $1https://www.youtube.com wants to play protected content. Your device's identity will be verified by Brave and may be accessed by this site. - - - Protected Media Identifier - - View and manage saved passwords in your $1Brave Account @@ -8828,65 +8741,9 @@ Please help our engineers fix this problem. Tell us what happened right before y - - $1html5rocks.com wants to use your camera and microphone - - - $1html5rocks.com wants to use your microphone - - - $1html5rocks.com wants to use your camera - $1html5rocks.com wants to share your screen - - Use your microphone - - - Use your camera - - - - Microphone - - - Camera - - - Media - - - - - - Use NFC devices - - - - $1google.com wants to send and receive info when you tap your phone on an NFC device - - - NFC - - - - - - - Access Virtual Reality devices and data - - - Track camera position and map your room - - - - $1google.com wants to be able to start virtual reality sessions - - - $1google.com wants to track camera position and map your room - - @@ -8932,30 +8789,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Always block $1mail.google.com from accessing sensors - - - - $1html5rocks.com wants to permanently store data on your device - - - $1html5rocks.com wants to permanently store large data on your device - - - Storage - - - - - $1html5rocks.com wants to permanently store data on your local computer - - - $1html5rocks.com wants to permanently store large data on your local computer - - - - Store files on this device - - @@ -9071,6 +8904,9 @@ Please help our engineers fix this problem. Tell us what happened right before y New window + + New tabbed window + Pin to shelf @@ -9375,7 +9211,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Command unavailable. Press control-N to open a new window. - Entered window overview mode. Press tab to navigate. + Entered window overview mode. Swipe to navigate, or press tab if using a keyboard. Entered full screen @@ -9406,28 +9242,31 @@ Please help our engineers fix this problem. Tell us what happened right before y Add a query param in URL to auto-refresh the page: chrome://device-log/?refresh=<sec> - + Refresh - + Clear + + Clear Types + No log entries - - Show: + + Log Level: - + Error - + User - + Event - + Debug @@ -9857,6 +9696,44 @@ Please help our engineers fix this problem. Tell us what happened right before y Save changes + + + $1example.com will be able to edit $2README.md until you close all tabs for this site + + + $1example.com will be able to edit files in $2My Project until you close all tabs for this site + + + $1example.com will be able to view $2README.md until you close all tabs for this site + + + $1example.com will be able to view files in $2My Project until you close all tabs for this site + + + Let site edit $1README.md? + + + Let site edit files? + + + Let site view $1README.md? + + + Let site view files? + + + Edit file + + + Edit files + + + View file + + + View files + + This page is allowed to edit files @@ -9879,12 +9756,21 @@ Please help our engineers fix this problem. Tell us what happened right before y $1example.com can edit the following files and folders + + $1example.com can view $2README.md + + + $1example.com can view the following files + $1example.com can view files in $2My Project $1example.com can view files in the following folders + + $1example.com can view the following files and folders + $1example.com can view and edit the following files and folders @@ -10185,6 +10071,22 @@ Please help our engineers fix this problem. Tell us what happened right before y Reinsert your security key and try again + + + Fingerprint not recognized + + + Your fingerprint couldn't be recognized. Try again. + + + {NUM_ATTEMPTS, plural, + =1 {You have one attempt remaining.} + other {You have # attempts remaining.}} + + + Your security key is locked because your fingerprint couldn't be recognized. To unlock it, enter your PIN. + + Account @@ -10303,12 +10205,36 @@ Please help our engineers fix this problem. Tell us what happened right before y These files violate your organization's security policies and can't be dropped. + + This upload violates your organization's security policies. Do you want to proceed anyway? + + + This pasted data violates your organization's security policies. Do you want to proceed anyway? + + + This dropped data violates your organization's security policies. Do you want to proceed anyway? + + + These dropped files violate your organization's security policies. Do you want to proceed anyway? + Something went wrong. Scanning could not be completed. Please try again. + + Proceed anyway + + + Cancel + Cancel upload + + Your organization can scan files up to 50 MB. Try uploading a smaller file. + + + This upload is encrypted and violates your organization's security policies. + @@ -10327,10 +10253,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Scan before opening? - The selected file is unknown and may be dangerous. Advanced Protection recommends sending this file to Brave to check for malware. + The selected file is unknown and may be dangerous. Send to Brave Advanced Protection for scanning? - Scan + Send Cancel @@ -10370,13 +10296,54 @@ Please help our engineers fix this problem. Tell us what happened right before y Verify + + + Uninstall "$1Gmail Checker"? + + + + + Also clear 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 + + + + Learn more + + + + + SODA Service + + - App paused + $1Gmail Checker is paused - The limit on "$1Brave Photos" that your parent set ran out. You can use it for $22 hours and 30 minutes tomorrow. + You reached the time limit your parent set for $1Brave Photos. You can use it for $22 hours and 30 minutes tomorrow. + + + + You reached the time limit your parent set for $1Brave Photos Brave app. You can use it for $22 hours and 30 minutes tomorrow. + + + + + $1Gmail Checker is blocked + + + + $1Brave Photos is blocked by your parent. Ask your parent for permission to use this app. + + + + $1Brave Photos is blocked by admin. Ask admin for permission to use this app. diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp new file mode 100644 index 000000000000..f5e241511348 --- /dev/null +++ b/app/os_settings_search_tag_strings.grdp @@ -0,0 +1,39 @@ + + + + + + + Network settings + + + Internet settings + + + Ethernet settings + + + Configure Ethernet + + + Wi-Fi settings + + + Turn on Wi-Fi + + + Enable Wi-Fi + + + Turn off Wi-Fi + + + Disable Wi-Fi + + + Connect Wi-Fi + + + Disconnect Wi-Fi + + diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index a41b73924dbb..1068c4570e67 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -3,6 +3,12 @@ + + + + Turn on + + Build Details @@ -19,6 +25,123 @@ Developer Mode + + Restart + + + Restart and reset + + + Nearly up to date! Restart your device to finish updating. + + + Updating your device + + + Updating your device ($190%) + + + Updating your device to $1stable channel ($290%) + + + Update schedule + + + Your administrator is rolling back this device ($190%) + + + Your administrator rolled back this device. Please save important files, then restart. All data on the device will be deleted. + + + Channel changed. Restart your device to apply changes. + + + Powerwash for added security + + + This upgrade resets your Bravebook and removes current user data. + + + Change channel + + + Change channel and Powerwash + + + You are changing to a channel with an older version of $1Chrome OS. The channel change will be applied when the channel version matches the version currently installed on your device. + + + Channel change will be applied later + + + This will remove all local users, files, data, and other settings after your next restart. All users will need to sign in again. + + + Powerwash required on next reboot + + + You are updating to an unstable version of $1Chrome OS which contains features that are in progress. Crashes and unexpected bugs will occur. Please proceed with caution. + + + Warning: you are switching to developer channel + + + Beta + + + Developer - unstable + + + Stable + + + Update will be downloaded using $10 MB of mobile data. Would you like to continue? + + + Download update using mobile data + + + beta + + + canary + + + dev + + + Channel + + + stable + + + Check for updates + + + Currently on $1stable + + + Additional details + + + Internet connection required + + + See what's new + + + Your $1Bravebook is up to date + + + This device will get automatic software and security updates until $1September 2020. <a target="_blank" href="$2https://google.com/">Learn more</a> + + + This device stopped getting automatic software and security updates in $1September 2020. <a target="_blank" href="$2https://google.com/">Learn more</a> + + + This is the last automatic software and security update for this $1Bravebook. To get future updates, upgrade to a newer model. <a target="_blank" href="$2https://google.com/">Learn more</a> + @@ -33,11 +156,14 @@ Sync your settings - - Turn on Sync + + Turn on - - Turn off Sync + + Turn off + + + Your apps and settings will sync across all Chrome OS devices where you are signed in with your Brave account. For browser sync options, go to<a>Brave settings</a>. Apps @@ -51,6 +177,18 @@ Wallpaper + + Brave Accounts + + + My accounts + + + Fingerprint + + + Manage other profiles + @@ -59,16 +197,101 @@ Languages + + Add languages or reorder list. <a>Learn more</a></a> + + + Input method + + + Enabled + + + Show input options + + + Your administrator has limited the available input methods. + + + Manage input methods + + + Manage input methods + + + Show input options in the shelf + + + Restart device to show system text in $1English + + + Show system text in this language + + + + System text is shown in this language + Reverse scrolling <a>Learn more</a> + + Device + + + Scrolling + Personalization + + Take photo + + + Capture video + + + Discard photo or video + + + User image preview + + + Switch to video recorder + + + Choose a picture to display for your account on the sign-in screen + + + Switch to camera mode + + + Choose a file + + + Existing photo from camera or file + + + Existing video from camera or file + + + Photo by $1John Doe + + + Photo was captured + + + Photo was discarded + + + Photo mode entered + + + Video mode entered + @@ -80,6 +303,30 @@ Change device account image + + Ambient mode + + + Enabled + + + Disabled + + + On + + + Off + + + Choose what you see on your screen + + + Brave Photos + + + Art gallery + @@ -88,10 +335,2254 @@ Used by Brave browser and $1Bravebook Launcher + + Brave Assistant + + + Enabled + + + Disabled + + + On + + + Off + + + Search and Assistant + Files + + Disconnect Google Drive account + + + Network file shares + + + Set up or manage network file shares. <a>Learn more</a> + + + Add file share + + + Error mounting share. Check the file share URL and try again. + + + Error mounting share. Please check your credentials and try again. + + + Error mounting share. The specified share was not found on the network. + + + Error mounting share. Please check that the file server you are connecting to supports SMBv2 or later. + + + Error mounting share. The specified share is already mounted. + + + Error mounting share. Too many SMB shares are already mounted. + + + Invalid URL format. Supported formats are \\server\share and smb://server/share. + + + Invalid URL format. Server must be specified as a host name when SSO authentication is used. + + + Share mounted successfully. + + + + + Show navigation buttons + + + Navigate home, back, and switch apps with buttons in tablet mode. Turned on when BraveVox or Automatic clicks is enabled. + + + + + Always show accessibility options in the system menu + + + Show large mouse cursor + + + Adjust cursor size + + + Default + + + Large + + + Use high contrast mode + + + Enable sticky keys (to perform keyboard shortcuts by typing them sequentially) + + + Enable BraveVox (spoken feedback) + + + Open BraveVox settings + + + Enable fullscreen magnifier + + + Fullscreen zoom level: + + + Enable docked magnifier + + + Docked zoom level: + + + 2x + + + 4x + + + 6x + + + 8x + + + 10x + + + 12x + + + 14x + + + 16x + + + 18x + + + 20x + + + Enable tap dragging + + + Automatically click when the cursor stops + + + Delay before click + + + 0.6 seconds + + + 0.8 seconds + + + 1 second + + + 2 seconds + + + 4 seconds + + + Revert to left click after action + + + Stabilize click location + + + Movement threshold + + + Extra small + + + Small + + + Default + + + Large + + + Extra large + + + Send your voice to Brave to allow dictation into any text field. + + + Enable dictation (speak to type) + + + Enable on-screen keyboard + + + Play the same audio through all speakers (mono audio) + + + Play sound on startup + + + Display + + + Enable accessibility features to make your device easier to use. <a>Learn more</a> + + + Highlight the text caret when it appears or moves + + + Highlight the mouse cursor when it's moving + + + Highlight the object with keyboard focus when it changes + + + Enable select-to-speak + + + Hear text read aloud + + + Highlight what you want to hear, then press Search + S. You can also press and hold the Search key, or tap the Select-to-Speak icon near your profile image to make a selection. + + + Tap the Select-to-Speak icon near your profile image, then select what you want to hear. + + + Open select-to-speak settings + + + Switch Access (control the computer with just one or two switches) + + + Switch Access options + + + Switch Access settings + + + Switch action assignment + + + None + + + Space + + + Enter + + + Select + + + Next + + + Previous + + + Auto-scan + + + Enable auto-scan + + + Scanning speed + + + Keyboard scanning speed + + + $11.5s + + + Text-to-Speech + + + Open display device settings + + + Allows you to adjust your screen resolution + + + Open appearance settings + + + Customize your text size + + + Keyboard and text input + + + Open keyboard device settings + + + Allows you to adjust your keyboard repeat rate, word prediction, and more + + + Mouse and touchpad + + + Open mouse and touchpad device settings + + + Allows you to enable/disable tap-to-click and tap dragging + + + Audio and captions + + + Add additional features + + + Text-to-Speech voice settings + + + Select and customize text-to-speech voices + + + Preferred Voices + + + No voices found + + + More languages + + + Speech Properties + + + Rate + + + Slowest + + + Fastest + + + Pitch + + + Lowest + + + Highest + + + Volume + + + Quietest + + + Loudest + + + $1120% + + + $1120% (default) + + + Preview + + + Text to preview + + + Hi there! I'm your text-to-speech voice. + + + Voice to preview + + + Play + + + Speech Engines + + + Manage accessibility features + + + + + Manage your signed-in accounts. Websites, apps, and extensions in Brave and Google Play may use these accounts to customize your experience, depending on permissions. <a>Learn more</a> + + + Add a school account or manage child accounts here. <a>Learn more</a> + + + Accounts + + + To sign out of the primary account on this device, click the time on your screen. In the menu that appears, click "Sign out". + + + Account managed by $1user@example.com. To sign out of the primary account on this device, click the time on your screen. In the menu that appears, click "Sign out". + + + Account managed by $1first@example.com and $2second@example.com. To sign out of the primary account on this device, click the time on your screen. In the menu that appears, click "Sign out". + + + Remove this account + + + Add account + + + Add school account + + + Your administrator has disabled the addition of more Brave Accounts + + + Addition of more Brave Accounts is disabled + + + Sign in again + + + Not updated yet + + + Update account + + + Sign in + + + Update account, $1abcd@google.com + + + Sign in, $1abcd@google.com + + + More actions, $1abcd@google.com + + + Managed by $1google.com + + + Primary account + + + + + Plugin VM + + + Plugin VM + + + Set up permissions + + + Give access to printers + + + Manage shared folders + + + Shared folders + + + To share, right-click on a folder in Files app, then select "Share with Plugin VM". + + + Removing folders from here will stop sharing but will not delete files. + + + Remove sharing + + + Uninstall Plugin VM + + + Uninstall + + + Removing Plugin VM will delete your VM. This includes its applications, settings, and data. Are you sure you wish to continue? + + + + + Linux (Beta) + + + Linux + + + Manage shared folders + + + Shared folders + + + To share, right-click on a folder in Files app, then select "Share with Linux". + + + Removing folders from here will stop sharing but will not delete files. + + + Remove sharing + + + Couldn't unshare because an application is using this folder. The folder will be unshared when Linux is next shut down. + + + Unshare failed + + + Try again + + + Shared folders will appear here + + + Backup & restore + + + Backup + + + Backup Linux apps and files + + + Restore + + + Replace your Linux apps and files with a previous backup + + + Confirm Restore + + + Restoring from a backup will delete existing Linux applications and data in your Linux files folder. + + + Remove + + + USB preferences + + + Give Linux apps permission to access USB devices. Linux won't remember a USB device after it's removed. + + + Only Android devices are currently supported. + + + Available USB devices will appear here. + + + Develop Android apps + + + To create and test your apps, enable the Android Debug Bridge (ADB). Note that this action allows installation of Android apps that haven't been verified by Brave, and requires a factory reset to disable. + + + Enable ADB debugging + + + Restart and continue + + + Enable ADB debugging? + + + Disable ADB debugging? + + + An upgrade to Debian 10 (Buster) is available + + + Current version is Debian 9 (Stretch) + + + Upgrade + + + Port forwarding + + + Make Linux ports available to other devices on your network. + + + Your ports will appear here + + + Port number + + + Label + + + Add + + + Add Port + + + Add port number + + + Label (Optional) + + + TCP + + + UDP + + + Error forwarding port + + + Change + + + Disk size + + + Resize Linux Disk + + + Your container doesn't support being resized. To adjust the amount of space that is pre-allocated to Linux (Beta), back up and then restore into a new container. + + + Loading data, this may take up to a few seconds. + + + Error loading data + + + Retry + + + Cancel + + + Resize + + + Resizing + + + Error resizing disk + + + Done + + + A factory reset of this Bravebook is required to enable ADB debugging. <a target="_blank" href="$1">Learn more</a> + + + To enable ADB debugging, a restart of this $1Bravebook is required. Disabling it requires a reset to factory settings. + + + Disabling ADB debugging will reset this $1Bravebook to factory settings. All user accounts and local data will be erased. + + + Shared folders are available in Linux at $1/mnt/chromeos. + + + Run Linux tools, editors, and IDEs on your $1Bravebook. <a target="_blank" href="$2https://google.com/">Learn more</a> + + + Remove Linux for $1Bravebook + + + Ports + + + Give access to microphone + + + Linux restart required + + + Changes to microphone will take effect when Linux is next restarted. + + + + + Google Play Store + + + Manage Android preferences + + + Remove Google Play Store + + + Remove + + + Remove Android apps? + + + Remove Android apps + + + Manage Play app links + + + + + Stylus + + + Show stylus tools in the shelf + + + Open stylus tools when the stylus is removed + + + Find more stylus apps + + + Open Google Play + + + Note-taking app + + + Enable note-taking from lock screen + + + Keep latest note on lock screen + + + Lock screen notes + + + None available + + + Loading apps... + + + + + Connected + + + Connected, $1100% battery + + + Connecting... + + + Paired devices + + + Bluetooth configuration is controlled by $1joe@gmail.com. + + + Unpaired devices + + + Connect + + + Disconnect + + + Bluetooth enable + + + Show available Bluetooth devices + + + No paired devices + + + No Bluetooth devices found + + + Not connected + + + Bluetooth + + + Connect to Bluetooth device + + + Remove from list + + Pair + + + enter + + + Accept + + + Reject + + + Please enter the PIN for "$1Nexus S": + + + Please enter this PIN code on "$1Nexus S": + + + Please enter the passkey for "$1Nexus S": + + + Please enter this passkey on "$1Nexus S": + + + Please confirm this passkey is shown on "$1Nexus S": + + + Connecting to "$1Nexus S" + + + Connection to "$1Nexus 4" still in progress + + + Failed to connect to "$1Nexus S". + + + Authentication failed while connecting to "$1Nexus 4". + + + Authentication canceled while connecting to "$1Nexus 4". + + + Authentication code rejected while connecting to "$1Nexus 4". + + + Authentication timeout while connecting to "$1Nexus 4". + + + Unsupported Bluetooth device: "$1Nexus 4". + + + Write operation exceeds the maximum length of the attribute to: "$1Nexus 4". + + + Connection is congested to remote device: "$1Nexus 4". + + + Insufficient encryption for a given operation on: "$1Nexus 4". + + + Read or write operation was requested with an invalid offset on: "$1Nexus 4". + + + Read operation is not permitted on: "$1Nexus 4". + + + The given request is not supported to: "$1Nexus 4". + + + Write operation is not permitted on: "$1Nexus 4". + + + + + Parental controls + + + Set website restrictions & screen time limits with Family Link + + + Connect to the internet to set up parental controls + + + Open the Family Link app to see your supervision settings + + + Set up + + + Set up button + + + + + Mouse + + + Touchpad + + + Enable tap-to-click + + + Touchpad speed + + + Touchpad scroll speed + + + Slow + + + Fast + + + Mouse speed + + + Mouse scroll speed + + + Swap primary mouse button + + + Reverse scrolling + + + Enable mouse acceleration + + + Enable mouse scroll acceleration + + + Enable touchpad acceleration + + + Enable touchpad scroll acceleration + + + Mouse and touchpad + + + + + Print server + + + Printers + + + Set up or manage CUPS printers. <a>Learn more</a> + + + Add Printer + + + Save detected printers to your profile, or add a new printer. <a>Learn more</a> + + + Add printers to your profile + + + There are $13 printers available to save. + + + There is 1 printer available to save. + + + There are no printers available to save. + + + Edit + + + Remove + + + Set up + + + Set up $1HP OfficeJet 500 + + + Save + + + Save $1HP OfficeJet 500 + + + Search printers + + + Your saved printers + + + You have $13 saved printers. + + + You have 1 saved printer. + + + You have no saved printers. + + + Show more + + + Add a nearby printer + + + Add a printer manually + + + Add a print server + + + Advanced printer configuration + + + Printer details + + + Advanced + + + Show advanced printer options + + + Address + + + Address + + + Protocol + + + URI + + + Name + + + Model + + + Queue + + + Add + + + Add Manually + + + Add Nearby Printers + + + Internet Printing Protocol (IPP) + + + Internet Printing Protocol (IPPS) + + + Internet Printing Protocol (HTTP) + + + Internet Printing Protocol (HTTPS) + + + AppSocket (TCP/IP) + + + Line Printer Daemon (LPD) + + + USB + + + IPP over USB (IPPUSB) + + + Configuring $1Acme Printer ... + + + Manufacturer + + + Or specify your printer PPD <a>Learn more</a> + + + Browse to specify your printer PPD + + + Browse + + + Invalid file selected. Try again. + + + Added $1Acme Printer + + + Updated $1Acme Printer + + + $1Acme Printer is no longer available + + + There are no available printers. + + + Searching... + + + Unable to add printer. Please check your printer's configuration and try again. + + + Unable to add printer. Please check your printer's configuration and try again. + + + Can’t connect to printer. Check that the printer is turned on and is connected to your Bravebook by Wi-Fi or USB. + + + Can’t load large PPD. Maximum size is 250 kB. + + + File is the wrong format. Check the PPD file and try again. + + + Can’t find PPD. Make sure your Bravebook is online and try again. + + + Can’t find PPD. Make sure your Bravebook is online and try again. + + + Printer configuration is handled by the administrator. + + + Requested printer changes would make the printer unusable. + + + Connect to the internet to add a printer + + + Please check your connection to see available printers in your network + + + No internet connection + + + Connect to a network and try again + + + Edit printer + + + Save + + + Current PPD file in use: $1example.ppd.gz + + + $1Printer could not be configured automatically. Please specify advanced printer details. <a>Learn more</a> + + + End User License Agreement + + + Couldn't detect a printer. Please enter printer address again. + + + Unable to set up printer. Please check configuration and try again. + + + Did not find any printers from the print server + + + Found 1 printer from the print server + + + Found $15 printers from the print server + + + Invalid address. Please check the address and try again. + + + Couldn't detect the print server. Please check the address and try again. + + + Couldn't add the print server. Please check the server's configuration and try again. + + + + + Add connection + + + Add network connection + + + Add connection is disabled by your administrator + + + Add $1VPN Demo... + + + Add OpenVPN / L2TP... + + + Add Wi-Fi... + + + Configure $1My WiFi network + + + Network Details + + + Enabling + + + Initializing + + + Join $1WiFi network + + + Searching for mobile networks + + + Known Networks + + + None + + + Network + + + $1Mobile Data - $2Verizon Wireless + + + Mobile data enable + + + Get data connection + + + Let this device find other devices with your Brave Account that have a mobile data connection + + + Wi-Fi enable + + + All networks + + + Known networks + + + Preferred networks will be preferred over other known networks if more than one is available + + + Preferred networks + + + Add to preferred + + + Remove from preferred + + + Forget + + + Allow mobile data roaming + + + On, not roaming + + + On, roaming + + + Roaming off + + + Always connect through this VPN + + + Automatically connect to this network + + + Automatically connect to cellular network + + + Activate + + + Configure + + + Connect + + + Disconnect + + + Forget + + + View Account + + + Connecting to this network is disabled by your administrator + + + IP Address + + + Configure IP address automatically + + + Prefer this network + + + Network configuration is controlled by $1joe@gmail.com. + + + Advanced + + + Show advanced network properties + + + Network + + + Show network address settings + + + Proxy + + + Show proxy settings + + + Other users of this device can use this network. + + + Network out of range + + + Trouble connecting. Please contact $1Brave Fi for assistance. + + + Trouble connecting. Please contact your carrier for assistance. + + + Unable to detect your phone + + + To use Instant Tethering, turn on notifications for Google Play Services. + + + On your '$1Brave Pixel': + + + On your '$1Brave Pixel' and '$2Brave Pixel 2': + + + On your devices: + + + Go to Settings > Apps & notifications > Notifications. + + + Tap App notifications > Google Play services. + + + Turn on Google Play services. + + + Scroll to the bottom of the screen and turn on Instant Tethering, if it appears. If it doesn't, you're all set. + + + Connect to new hotspot? + + + Available device: + + + $1100% Battery + + + Your $1Brave Pixel XL will create a private Wi-Fi connection. + + + Some carriers might block this feature. + + + While the hotspot is on, your $1Brave Pixel XL will: + + + Use mobile data + + + Use the battery more quickly (currently $1100%) + + + Disconnect from Wi-Fi + + + Not now + + + Connect + + + Looking for a mobile network. <a target="_blank" href="$1">Learn more</a> + + + + + These settings may only be modified by the owner: + + + These settings are controlled by enterprise policy. Please contact your administrator for more information. + + + Enable Guest browsing + + + Show usernames and photos on the sign-in screen + + + Restrict sign-in to the following users: + + + $1John Smith (owner) + + + Remove $1John Smith + + + Add user + + + Email address + + + This user already exists + + + + + Connected devices + + + Set up + + + Verify + + + Android phone + + + Enabled + + + Disabled + + + Instant Tethering + + + Connect to the internet through your phone + + + Messages + + + Send and receive text messages from your $1Bravebook. <a target="_blank" href="$2https://google.com/">Learn more</a> + + + + + On the lock screen + + + Hide sensitive content + + + Show lock screen when waking from sleep + + + Show all notification content + + + PIN or password + + + Set up + + + Don't show notifications at all + + + Edit Fingerprints + + + Set up a faster way to unlock your device + + + Password only + + + Change PIN + + + $11 fingerprints set up + + + Sign in automatically + + + Finger $11 + + + delete [$1Fingerprint 1] + + + Screen lock options + + + Forget phone + + + Disconnect your phone from your $1Bravebook + + + Disconnect your phone from your $1Bravebook. They will no longer connect automatically. + + + Disconnect + + + Connect your $1Bravebook with your phone. <a target="_blank" href="$2https://google.com/">Learn more</a> + + + No eligible devices. <a target="_blank" href="$1https://google.com/">Learn more</a> + + + Waiting for verification. <a target="_blank" href="$1https://google.com/">Learn more</a> + + + Unlock your $1Bravebook with your phone. <a target="_blank" href="$2https://google.com/">Learn more</a> + + + Lock screen from sleep mode + + + Set up PIN + + + Screen lock + + + Security and sign-in + + + Enter your password to configure screen lock + + + Enter your password to configure security and sign-in + + + + + Advanced + + + Configure Kerberos + + + Edit the configuration file + + + Remember password + + + Password + + + Kerberos username + + + To automatically refresh a ticket, check “Remember password.” Your password will be stored on your device only. + + + Network problem or bad realm + + + Username invalid + + + Username not known to server + + + A ticket with this username already exists + + + Contacting server for realm failed + + + Password invalid + + + Password expired + + + KDC does not support encryption type + + + Couldn't get Kerberos ticket. Try again, or contact your organization's device admin. (Error code $1123). + + + Section nested in group: $1[realms] (inside a block of curly braces '{ ... }) + + + Section syntax error: $1[realms + + + Expected opening curly brace: $1ticket_lifetime = 1d (in the line after 'EXAMPLE.COM = )' + + + Extra curly brace: $1} (without having a corresponding opening curly brace '{') + + + Relation syntax error: $1ticket_lifetime : 1d + + + Configuration option not supported: $1ccache_type = 1 + + + Section not supported: $1[appdefaults] + + + Failed to parse configuration + + + Refresh + + + Add a Kerberos ticket + + + Refresh a Kerberos ticket + + + + + Add a ticket + + + Refresh now + + + Set as active ticket + + + Expired + + + Tickets + + + Remove from this device + + + Refresh + + + Active + + + Ticket removed + + + Ticket refreshed + + + Valid for $17 hours 12 minutes + + + Choose a ticket to use for authentication. <a target="_blank" href="$1https://google.com/">Learn more</a> + + + Kerberos tickets + + + Kerberos tickets + + + + + Power + + + Power source + + + Battery + + + AC adapter + + + Low-power charger + + + Checking power sources... + + + When idle + + + While charging + + + Idle action while charging + + + While on battery + + + Idle action while on battery + + + Sleep + + + Turn off display + + + Keep display on + + + Other + + + Sleep when cover is closed + + + Sign out when cover is closed + + + Shut down when cover is closed + + + $156% - $22 hours and 20 minutes left + + + $156% - $22 hours and 20 minutes until full + + + $156% + + + + + Powerwash + + + Restart your device + + + Remove all user accounts and reset your $1Brave device to be just like new. + + + A restart is required before your device can be reset with Powerwash. <a>Learn more</a> + + + Reset + + + Reset Button + + + + + Brave Assistant + + + "Ok Brave" + + + Access your Assistant when you say "Ok Brave." + + + Access your Assistant when you say "Ok Brave." To save battery, choose “On (Recommended.)” Your Assistant will respond only when your device is plugged in or charging. + + + On (Recommended) + + + Always on + + + Off + + + Voice match + + + Retrain + + + Notifications + + + Allow the Assistant to show you notifications + + + Preferred input + + + Default to using voice instead of keyboard + + + Brave Assistant settings + + + + + Displays + + + Drag to move a display + + + Arrangement + + + Mirror $1HP Z27n + + + Mirrored + + + Ambient colors + + + Adjusts the screen color to match the environment + + + Night Light + + + Night Light will turn on automatically at sunset + + + Night Light will turn off automatically at sunrise + + + Custom + + + Schedule + + + Never + + + Sunset to Sunrise + + + Start time + + + End time + + + Make it easier to look at your screen or read in dim light + + + Color temperature + + + Warmer + + + Cooler + + + Allow windows to span displays + + + On + + + Off + + + Resolution + + + $11600 x $21200 + + + $11600 x $21200 (Best) + + + $11600 x $21200 (Native) + + + Determines sharpness of text and images + + + $11600 x $21200 ($360 Hertz) + + + $11600 x $21200 ($360 Hertz) - interlaced + + + Display Size + + + Make items on your screen smaller or larger + + + $1120% + + + Looks like $11600 x $21200 + + + Looks like $11600 x $21200 (Native) + + + Looks like $11600 x $21200 (Default) + + + Tiny + + + Huge + + + Screen + + + Extended display + + + Primary display + + + Orientation + + + Auto-rotate + + + 0° (Default) + + + Adjust the boundaries of your desktop within the display + + + Overscan + + + Adjust the boundaries of your display + + + Tap the following keys to adjust or move the cropping area + + + Shrink / Expand + + + Move + + + Reset + + + Calibrate touchscreen + + + Set up and adjust the accuracy of your touchscreen + + + + + Smart Lock + + + Unlock device only + + + Unlock device and sign in to Brave Account + + + + + Add Fingerprint + + + Saved fingerprints + + + Note: Your fingerprint may be less secure than a strong password or PIN. + + + + + Enter your PIN + + + Confirm your PIN + + + Confirm your password + + + + + Set up your fingerprint + + + Add another + + + Fingerprint added. + + + Lift then try again. + + + Try again. + + + Move slightly to capture a different part of the fingerprint. + + + + + Date and time + + + Time zone + + + Time zone + + + Set automatically + + + Choose from list + + + Automatic time zone detection is disabled + + + Use your IP address to determine location (default) + + + Use only Wi-Fi to determine location + + + Use Wi-Fi or mobile networks to determine location + + + Time zone + + + Set time zone automatically using your location + + + Time zone detection method + + + Use 24-hour clock + + + Set date and time + + + + + Keyboard + + + Ctrl + + + Alt + + + Caps Lock + + + Command + + + Diamond + + + Escape + + + Backspace + + + Assistant + + + Disabled + + + External Command + + + External Meta + + + Meta + + + Treat top-row keys as function keys + + + Enable auto-repeat + + + Delay before repeat + + + Long + + + Short + + + Repeat rate + + + Slow + + + Fast + + + View keyboard shortcuts + + + Change language and input settings + + + Launcher + + + Search + + + Hold the Launcher key to switch the behavior of the top-row keys + + + Hold the Search key to switch the behavior of the top-row keys + + + + + Apps + + + Manage your apps + + + + + Storage management + + + In use + + + Available + + + My files + + + Browsing data + + + Apps and extensions + + + Linux (Beta) storage + + + Other users + + + Calculating... + + + Unknown + + + Device is low on space + + + To free up space, delete files from device storage. + + + If space isn’t made available, users and data may be automatically removed. + + + Device space critically low + + + Free up at least 512 MB of space or your device will become unresponsive. To free up space, delete files from device storage. + + + If you don’t free up space, users and data may be automatically removed. + + + External storage preferences + + + Apps from Google Play may require full file system access to read and write files on external storage devices. Files and folders created on the device are visible to anyone who uses the external drive. <a target="_blank" href="$1https://google.com/">Learn more</a> + + + Available devices will appear here. + + + Available devices + + + Storage Usage Overview + + + System + diff --git a/app/printing_strings.grdp b/app/printing_strings.grdp index 15375c0ea0bb..b24dbc7f0295 100644 --- a/app/printing_strings.grdp +++ b/app/printing_strings.grdp @@ -108,9 +108,6 @@ Save to Google Drive - Total: $110 $2sheets of paper - - $110 $2sheets of paper @@ -132,7 +129,7 @@ Out of bounds page reference, limit is $11 - Use a number to indicate how many copies to print (1 to 999). + Use a number to indicate how many copies to print (1 to $11). Scale amount must be a number between 10 and 200. diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp index cc9175b58c06..b0772a5224dc 100644 --- a/app/settings_brave_strings.grdp +++ b/app/settings_brave_strings.grdp @@ -17,7 +17,7 @@ Updating Brave ($190%) - Nearly up to date! Relaunch Brave to finish updating. + Nearly up to date! Relaunch Brave to finish updating. Private windows won't reopen. Brave is up to date @@ -88,6 +88,26 @@ By turning this off, you can sign in to Brave sites like Gmail without signing in to Brave + + + Brave can help keep you safe from data breaches, bad extensions, and more + + + Brave can't check for updates. Try checking your internet connection. + + + Brave didn't update, something went wrong. <a target="_blank" href="$1">Fix Brave update problems and failed updates.</a> + + + Brave can't check your passwords because you're not signed in + + + Safe Browsing is off. Brave recommends turning it on. + + + Brave can't check your extensions. Try again later. + + This will delete 1 item from this device. To retrieve your data later, sign in to Brave as $1foo@example.com. @@ -120,9 +140,6 @@ Sign in to sync and personalize Brave across your devices - - Sync and personalize Brave across your devices - diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index b78b1815719a..4bc9d2b03571 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -18,128 +18,11 @@ More actions - - Turn on - Version $115.0.865.0 ($2Developer Build) $3 $4 - - - Additional details - - - Channel - - - Check for updates - - - stable - - - beta - - - canary - - - dev - - - Currently on $1stable - - - Update schedule - - - This device will get automatic software and security updates until $1September 2020. <a target="_blank" href="$2https://google.com/">Learn more</a> - - - This is the last automatic software and security update for this $1Bravebook. To get future updates, upgrade to a newer model. <a target="_blank" href="$2https://google.com/">Learn more</a> - - - Restart - - - Restart and reset - - - Powerwash for added security - - - This upgrade resets your Bravebook and removes current user data. - - - Updating your device - - - Updating your device ($190%) - - - Nearly up to date! Restart your device to finish updating. - - - Updating your device to $1stable channel ($290%) - - - Channel changed. Restart your device to apply changes. - - - Your administrator is rolling back this device ($190%) - - - Your administrator rolled back this device. Please save important files, then restart. All data on the device will be deleted. - - - Your $1Bravebook is up to date - - - - - Change channel - - - Change channel and Powerwash - - - You are changing to a channel with an older version of $1Chrome OS. The channel change will be applied when the channel version matches the version currently installed on your device. - - - Channel change will be applied later - - - This will remove all local users, files, data, and other settings after your next restart. All users will need to sign in again. - - - Powerwash required on next reboot - - - You are updating to an unstable version of $1Chrome OS which contains features that are in progress. Crashes and unexpected bugs will occur. Please proceed with caution. - - - Warning: you are switching to developer channel - - - Stable - - - Beta - - - Developer - unstable - - - - - Update will be downloaded using $10 MB of mobile data. Would you like to continue? - - - Download update using mobile data - - Relaunch @@ -150,15 +33,6 @@ Report an issue - - Internet connection required - - - See what's new - - - Checking for updates - Automatically update Brave for all users @@ -169,90 +43,6 @@ - - Captions - - - Settings - - - Preview - - - Text size - - - Text font - - - Text color - - - Text opacity - - - Background opacity - - - Opaque - - - Semi-transparent - - - Transparent - - - Text shadow - - - None - - - Raised - - - Depressed - - - Uniform - - - Drop shadow - - - Background color - - - Black - - - White - - - Red - - - Green - - - Blue - - - Yellow - - - Cyan - - - Magenta - - - Default - - - Enable Live Caption - Accessibility @@ -271,473 +61,13 @@ If an image doesn’t have a useful description, Brave will try to provide one for you. To create descriptions, images are sent to Brave. + + Live caption + + + Live caption detects speech in media and automatically generates captions for all media playing in Brave. + - - Always show accessibility options in the system menu - - - Text-to-Speech voice settings - - - Select and customize text-to-speech voices - - - Switch Access settings - - - Switch action assignment - - - Space - - - Enter - - - None - - - Select - - - Next - - - Previous - - - Auto-scan - - - Enable auto-scan - - - Scanning speed - - - Keyboard scanning speed - - - $11.5s - - - Show large mouse cursor - - - Adjust cursor size - - - Default - - - Large - - - Use high contrast mode - - - Enable sticky keys (to perform keyboard shortcuts by typing them sequentially) - - - Enable BraveVox (spoken feedback) - - - Open BraveVox settings - - - Enable fullscreen magnifier - - - Fullscreen zoom level: - - - Enable docked magnifier - - - Docked zoom level: - - - 2x - - - 4x - - - 6x - - - 8x - - - 10x - - - 12x - - - 14x - - - 16x - - - 18x - - - 20x - - - Enable tap dragging - - - Automatically click when the cursor stops - - - Delay before click - - - 0.6 seconds - - - 0.8 seconds - - - 1 second - - - 2 seconds - - - 4 seconds - - - Revert to left click after action - - - Stabilize click location - - - Movement threshold - - - Extra small - - - Small - - - Default - - - Large - - - Extra large - - - Enable on-screen keyboard - - - Send your voice to Brave to allow dictation into any text field. - - - Enable dictation (speak to type) - - - Play the same audio through all speakers (mono audio) - - - Play sound on startup - - - Enable accessibility features to make your device easier to use. <a>Learn more</a> - - - Add additional features - - - Customize your text size - - - Open appearance settings - - - Audio and captions - - - Highlight the text caret when it appears or moves - - - Highlight the mouse cursor when it's moving - - - Display - - - Open display device settings - - - Allows you to adjust your screen resolution - - - Highlight the object with keyboard focus when it changes - - - Keyboard and text input - - - Open keyboard device settings - - - Allows you to adjust your keyboard repeat rate, word prediction, and more - - - Manage accessibility features - - - Mouse and touchpad - - - Open mouse and touchpad device settings - - - Allows you to enable/disable tap-to-click and tap dragging - - - Enable select-to-speak - - - Hear text read aloud - - - Highlight what you want to hear, then press Search + S. You can also press and hold the Search key, or tap the Select-to-Speak icon near your profile image to make a selection. - - - Tap the Select-to-Speak icon near your profile image, then select what you want to hear. - - - Open select-to-speak settings - - - Switch Access (control the computer with just one or two switches) - - - Switch Access options - - - Text-to-Speech - - - Preferred Voices - - - No voices found - - - More languages - - - Speech Properties - - - Rate - - - Slowest - - - Fastest - - - Pitch - - - Lowest - - - Highest - - - Volume - - - Quietest - - - Loudest - - - $1120% - - - $1120% (default) - - - Preview - - - Text to preview - - - Hi there! I'm your text-to-speech voice. - - - Voice to preview - - - Play - - - Speech Engines - - - - - - - Linux (Beta) - - - Linux - - - Run Linux tools, editors, and IDEs on your $1Bravebook. <a target="_blank" href="$2https://google.com/">Learn more</a> - - - Remove Linux for $1Bravebook - - - Remove - - - Manage shared folders - - - Shared folders - - - Shared folders will appear here - - - To share, right-click on a folder in Files app, then select "Share with Linux". - - - Shared folders are available in Linux at $1/mnt/chromeos. - - - Removing folders from here will stop sharing but will not delete files. - - - Remove sharing - - - Backup & restore - - - Backup - - - Backup Linux apps and files - - - Restore - - - Replace your Linux apps and files with a previous backup - - - Confirm Restore - - - Restoring from a backup will delete existing Linux applications and data in your Linux files folder. - - - USB preferences - - - Available USB devices will appear here. - - - Give Linux apps permission to access USB devices. Linux won't remember a USB device after it's removed. - - - Only Android devices are currently supported. - - - Develop Android apps - - - To create and test your apps, enable the Android Debug Bridge (ADB). Note that this action allows installation of Android apps that haven't been verified by Brave, and requires a factory reset to disable. - - - Enable ADB debugging - - - A factory reset of this Bravebook is required to enable ADB debugging. <a target="_blank" href="$1">Learn more</a> - - - Enable ADB debugging? - - - Disable ADB debugging? - - - To enable ADB debugging, a restart of this $1Bravebook is required. Disabling it requires a reset to factory settings. - - - Disabling ADB debugging will reset this $1Bravebook to factory settings. All user accounts and local data will be erased. - - - Restart and continue - - - Upgrade - - - An upgrade to Debian 10 (Buster) is available - - - Current version is Debian 9 (Stretch) - - - - - Plugin VM - - - Plugin VM - - - Set up permissions - - - Give access to printers - - - Manage shared folders - - - Shared folders - - - To share, right-click on a folder in Files app, then select "Share with Plugin VM". - - - Removing folders from here will stop sharing but will not delete files. - - - Remove sharing - - - Uninstall Plugin VM - - - Uninstall - - - Removing Plugin VM will delete your VM. This includes its applications, settings, and data. Are you sure you wish to continue? - - Google Play Store @@ -745,25 +75,9 @@ Android settings - - Google Play Store - Install apps and games from Google Play on your $1Bravebook. <a target="_blank" href="$2https://google.com/">Learn more</a> - - Manage Android preferences - - - Remove Google Play Store - - - Remove - - - - Remove Android apps? - @@ -773,20 +87,6 @@ <br><br> This doesn’t affect apps or content on other devices. - - Remove Android apps - - - Manage Play app links - - - - - Apps - - - Manage your apps - @@ -857,6 +157,12 @@ Show warning before quitting with ⌘Q + + Reader mode for web pages + + + Offer to show articles in reader mode, when supported + @@ -908,6 +214,9 @@ Clear + + Custom + Delete @@ -1006,9 +315,120 @@ Your card is expired + + UPI ID + + + Never + Passwords + + Check passwords + + + Canceled + + + Checked passwords + + + Keep your passwords safe from data breaches and other security issues + + + $1Brave can't check your passwords. Try checking your internet connection. + + + $1Brave can check your passwords when you sign in with your Brave Account + + + No saved passwords. $1Brave can check your passwords when you save them. + + + $1Brave can't check your passwords. Try again after 24 hours or <a href="$2" target="_blank">check passwords in your Brave Account</a>. + + + $1Brave can't check your passwords. Try again after 24 hours. + + + $1Brave can't check your passwords. Try again later. + + + {COUNT, plural, + =0 {No compromised passwords found} + =1 {{COUNT} compromised password} + other {{COUNT} compromised passwords}} + + + Check again + + + Try again + + + Checking passwords ($16 of $231)… + + + Cancel + + + Just now + + + Compromised passwords + + + Change these passwords immediately to keep your account safe: + + + Change password + + + Open the app to change your password + + + Found in data breach + + + Entered on deceptive site + + + Entered on deceptive site and found in data breach + + + $1Brave will notify you when you sign in with a compromised password + + + Show password + + + Hide password + + + Edit password + + + Remove password + + + Remove password? + + + Removing this password will not delete your account on $1airbnb.com. Change your password or delete your account on $2<a href="https://airbnb.com" target="_blank">airbnb.com</a> to keep it safe from others. + + + Edit password + + + Make sure the password you are saving matches your password for $1airbnb.com + + + Site + + + App + Offer to save passwords @@ -1051,9 +471,15 @@ Details + + Copy password + Website + + App ($1com.netflix.mediaclient) + Username @@ -1081,6 +507,14 @@ View and manage saved passwords in your <a is="action-link" href="$1" target="_blank">Brave Account</a> + + + Opt-in to account storage + + + + Opt-out of account storage + Export passwords... @@ -1125,131 +559,7 @@ Default browser - Make default - - - - - - - Bluetooth - - - Paired devices - - - Unpaired devices - - - Pair - - - Connect to Bluetooth device - - - No paired devices - - - No Bluetooth devices found - - - Bluetooth enable - - - enter - - - Accept - - - Connect - - - Disconnect - - - Reject - - - Show available Bluetooth devices - - - Remove from list - - - Please enter the PIN for "$1Nexus S": - - - Please enter this PIN code on "$1Nexus S": - - - Please enter the passkey for "$1Nexus S": - - - Please enter this passkey on "$1Nexus S": - - - Please confirm this passkey is shown on "$1Nexus S": - - - Connected - - - Connected, $1100% battery - - - Not connected - - - Connecting... - - - Connecting to "$1Nexus S" - - - Connection to "$1Nexus 4" still in progress - - - Failed to connect to "$1Nexus S". - - - Authentication failed while connecting to "$1Nexus 4". - - - Authentication canceled while connecting to "$1Nexus 4". - - - Authentication code rejected while connecting to "$1Nexus 4". - - - Authentication timeout while connecting to "$1Nexus 4". - - - Unsupported Bluetooth device: "$1Nexus 4". - - - Write operation exceeds the maximum length of the attribute to: "$1Nexus 4". - - - Connection is congested to remote device: "$1Nexus 4". - - - Insufficient encryption for a given operation on: "$1Nexus 4". - - - Read or write operation was requested with an invalid offset on: "$1Nexus 4". - - - Read operation is not permitted on: "$1Nexus 4". - - - The given request is not supported to: "$1Nexus 4". - - - Write operation is not permitted on: "$1Nexus 4". - - - Bluetooth configuration is controlled by $1joe@gmail.com. + Make default @@ -1529,258 +839,6 @@ Manage Cloud Print devices - - - Print server - - - Printers - - - Set up or manage CUPS printers. <a>Learn more</a> - - - Add Printer - - - Save detected printers to your profile, or add a new printer. <a>Learn more</a> - - - Add printers to your profile - - - There are $13 printers available to save. - - - There is 1 printer available to save. - - - There are no printers available to save. - - - Edit - - - Remove - - - Set up - - - Set up $1HP OfficeJet 500 - - - Save - - - Save $1HP OfficeJet 500 - - - Search printers - - - Your saved printers - - - You have $13 saved printers. - - - You have 1 saved printer. - - - You have no saved printers. - - - Show more - - - Add a nearby printer - - - Add a printer manually - - - Add a print server - - - Advanced printer configuration - - - Printer details - - - Advanced - - - Show advanced printer options - - - Address - - - Address - - - Protocol - - - URI - - - Name - - - Model - - - Queue - - - Add - - - Add Manually - - - Add Nearby Printers - - - Internet Printing Protocol (IPP) - - - Internet Printing Protocol (IPPS) - - - Internet Printing Protocol (HTTP) - - - Internet Printing Protocol (HTTPS) - - - AppSocket (TCP/IP) - - - Line Printer Daemon (LPD) - - - USB - - - IPP over USB (IPPUSB) - - - Configuring $1Acme Printer ... - - - Manufacturer - - - Or specify your printer PPD <a>Learn more</a> - - - Browse to specify your printer PPD - - - Browse - - - Invalid file selected. Try again. - - - Added $1Acme Printer - - - Updated $1Acme Printer - - - $1Acme Printer is no longer available - - - There are no available printers. - - - Searching... - - - Unable to add printer. Please check your printer's configuration and try again. - - - Unable to add printer. Please check your printer's configuration and try again. - - - Can’t connect to printer. Check that the printer is turned on and is connected to your Bravebook by Wi-Fi or USB. - - - Can’t load large PPD. Maximum size is 250 kB. - - - File is the wrong format. Check the PPD file and try again. - - - Can’t find PPD. Make sure your Bravebook is online and try again. - - - Can’t find PPD. Make sure your Bravebook is online and try again. - - - Printer configuration is handled by the administrator. - - - Requested printer changes would make the printer unusable. - - - Connect to the internet to add a printer - - - Please check your connection to see available printers in your network - - - No internet connection - - - Connect to a network and try again - - - Edit printer - - - Save - - - Current PPD file in use: $1example.ppd.gz - - - $1Printer could not be configured automatically. Please specify advanced printer details. <a>Learn more</a> - - - End User License Agreement - - - Couldn't detect a printer. Please enter printer address again. - - - Unable to set up printer. Please check configuration and try again. - - - Did not find any printers from the print server - - - Found 1 printer from the print server - - - Found $15 printers from the print server - - - Invalid address. Please check the address and try again. - - - Couldn't detect the print server. Please check the address and try again. - - - Couldn't add the print server. Please check the server's configuration and try again. - - - Printers @@ -1803,24 +861,12 @@ Ask where to save each file before downloading - - Disconnect Google Drive account - Open certain file types automatically after downloading - - Network file shares - - - Set up or manage network file shares. <a>Learn more</a> - - - Add file share - File share URL @@ -1836,30 +882,6 @@ Remember sign-in info - - Share mounted successfully. - - - Error mounting share. Check the file share URL and try again. - - - Error mounting share. Please check your credentials and try again. - - - Error mounting share. The specified share was not found on the network. - - - Error mounting share. Please check that the file server you are connecting to supports SMBv2 or later. - - - Error mounting share. The specified share is already mounted. - - - Invalid URL format. Supported formats are \\server\share and smb://server/share. - - - Invalid URL format. Server must be specified as a host name when SSO authentication is used. - Authentication method @@ -1874,187 +896,8 @@ - - - - Kerberos tickets - - - Kerberos tickets - - - Choose a ticket to use for authentication. <a target="_blank" href="$1https://google.com/">Learn more</a> - - - Tickets - - - Add a ticket - - - Refresh now - - - Set as active ticket - - - Remove from this device - - - Ticket removed - - - Ticket refreshed - - - Valid for $17 hours 12 minutes - - - Expired - - - Refresh - - - Active - - - Add a Kerberos ticket - - - Refresh a Kerberos ticket - - - To automatically refresh a ticket, check “Remember password.” Your password will be stored on your device only. - - - Kerberos username - - - Password - - - Remember password - - - Refresh - - - Advanced - - - Configure Kerberos - - - Edit the configuration file - - - Network problem or bad realm - - - Username invalid - - - Username not known to server - - - A ticket with this username already exists - - - Contacting server for realm failed - - - Password invalid - - - Password expired - - - KDC does not support encryption type - - - Couldn't get Kerberos ticket. Try again, or contact your organization's device admin. (Error code $1123). - - - Section nested in group: $1[realms] (inside a block of curly braces '{ ... }) - - - Section syntax error: $1[realms - - - Expected opening curly brace: $1ticket_lifetime = 1d (in the line after 'EXAMPLE.COM = )' - - - Extra curly brace: $1} (without having a corresponding opening curly brace '{') - - - Relation syntax error: $1ticket_lifetime : 1d - - - Configuration option not supported: $1ccache_type = 1 - - - Section not supported: $1[appdefaults] - - - Failed to parse configuration - - - - - - - Date and time - - - Time zone - - - Time zone - - - Set automatically - - - Choose from list - - - Automatic time zone detection is disabled - - - Use your IP address to determine location (default) - - - Use only Wi-Fi to determine location - - - Use Wi-Fi or mobile networks to determine location - - - Time zone - - - Set time zone automatically using your location - - - Time zone detection method - - - Use 24-hour clock - - - Set date and time - - - - - Smart Lock - - - Unlock your $1Bravebook with your Android phone. - Set up @@ -2103,58 +946,13 @@ Smart Lock options - - Unlock device only - - - Unlock device and sign in to Brave Account - - - Network - Configure network - - Configure $1My WiFi network - - - Join $1WiFi network - - - Network Details - - - Known Networks - - - Add connection - - - Add network connection - - - Add connection is disabled by your administrator - - - Add Wi-Fi... - - - Add OpenVPN / L2TP... - - - Add $1VPN Demo... - - - Enabling - - - Initializing - Allow other users of this device to use this network @@ -2209,39 +1007,6 @@ Not provided - - Searching for mobile networks - - - Advanced - - - Show advanced network properties - - - Network - - - Show network address settings - - - Proxy - - - Show proxy settings - - - Allow mobile data roaming - - - On, not roaming - - - On, roaming - - - Roaming off - Mobile data network @@ -2260,12 +1025,6 @@ No networks - - Other users of this device can use this network. - - - Network configuration is controlled by $1joe@gmail.com. - This proxy is enforced by your administrator @@ -2406,157 +1165,6 @@ PIN values do not match. - - - Prefer this network - - - Automatically connect to this network - - - Automatically connect to cellular network - - - Always connect through this VPN - - - Configure IP address automatically - - - IP Address - - - Forget - - - View Account - - - Activate - - - Configure - - - Connect - - - Disconnect - - - Connecting to this network is disabled by your administrator - - - Known networks - - - Preferred networks - - - Preferred networks will be preferred over other known networks if more than one is available - - - All networks - - - Add to preferred - - - Remove from preferred - - - Forget - - - None - - - Network out of range - - - Trouble connecting. Please contact $1Brave Fi for assistance. - - - Trouble connecting. Please contact your carrier for assistance. - - - Unable to detect your phone - - - To use Instant Tethering, turn on notifications for Google Play Services. - - - On your '$1Brave Pixel': - - - On your '$1Brave Pixel' and '$2Brave Pixel 2': - - - On your devices: - - - Go to Settings > Apps & notifications > Notifications. - - - Tap App notifications > Google Play services. - - - Turn on Google Play services. - - - Scroll to the bottom of the screen and turn on Instant Tethering, if it appears. If it doesn't, you're all set. - - - Looking for a mobile network. <a target="_blank" href="$1">Learn more</a> - - - $1Mobile Data - $2Verizon Wireless - - - Connect to new hotspot? - - - Available device: - - - $1100% Battery - - - Your $1Brave Pixel XL will create a private Wi-Fi connection. - - - Some carriers might block this feature. - - - While the hotspot is on, your $1Brave Pixel XL will: - - - Use mobile data - - - Use the battery more quickly (currently $1100%) - - - Disconnect from Wi-Fi - - - Not now - - - Connect - - - Get data connection - - - Let this device find other devices with your Brave Account that have a mobile data connection - - - Mobile data enable - - - Wi-Fi enable - @@ -2893,21 +1501,8 @@ Show language options - - Add languages or reorder list. - - - Add languages or reorder list. <a>Learn more</a></a> - - - - System text is shown in this language - - - Show system text in this language - - - Restart device to show system text in $1English + + Add languages or reorder list. @@ -2940,27 +1535,6 @@ This language is used when translating pages - - Input method - - - Enabled - - - Show input options - - - Your administrator has limited the available input methods. - - - Manage input methods - - - Manage input methods - - - Show input options in the shelf - Keyboard apps @@ -3035,17 +1609,123 @@ More - - Show suggestions for similar pages when a page can't be found + + + + Safety check + + + Running... + + + Safety check ran a moment ago + + + {NUM_MINS, plural, + =1 {Safety check ran 1 minute ago} + other {Safety check ran {NUM_MINS} minutes ago}} + + + {NUM_HOURS, plural, + =1 {Safety check ran 1 hour ago} + other {Safety check ran {NUM_HOURS} hours ago}} + + + Safety check ran at $114:30 + + + Safety check ran today + + + Safety check ran yesterday + + + {NUM_DAYS, plural, + =1 {Safety check ran 1 day ago} + other {Safety check ran {NUM_DAYS} days ago}} + + + Safety check ran on $1April 1st, 2020 + + + Safety check is running. + + + Safety check has completed. + + + Check now + + + Run safety check now + + + Running + + + Passed + + + Info + + + Warning + + + Updates + + + Updates are managed by <a target="_blank" href="$1">your administrator</a> + + + Passwords + + + {NUM_PASSWORDS, plural, + =1 {Change password} + other {Change passwords}} - - Sends the web address of the page you're trying to reach to Brave + + Safe Browsing is on and protecting you from harmful sites and downloads - - Autocomplete searches and URLs + + <a target="_blank" href="$1">Your administrator</a> has turned off Safe Browsing - - Sends some cookies and searches from the address bar and search box to your default search engine + + An extension has turned off Safe Browsing + + + Manage + + + Manage Safe Browsing + + + Extensions + + + You're protected from potentially harmful extensions + + + {NUM_EXTENSIONS, plural, + =1 {1 potentially harmful extension is off. You can also remove it.} + other {{NUM_EXTENSIONS} potentially harmful extensions are off. You can also remove them.}} + + + {NUM_EXTENSIONS, plural, + =1 {You turned 1 potentially harmful extension back on} + other {You turned {NUM_EXTENSIONS} potentially harmful extensions back on}} + + + {NUM_EXTENSIONS, plural, + =1 {Your administrator turned 1 potentially harmful extension back on} + other {Your administrator turned {NUM_EXTENSIONS} potentially harmful extensions back on}} + + + Review + + + Review extensions Preload pages for faster browsing and searching @@ -3053,6 +1733,9 @@ Uses cookies to remember your preferences, even if you don’t visit those pages + + Pre-fetches information from pages, including pages you have not yet visited. Information fetched may include cookies, if you allow cookies. + Google Safe Browsing (protects you and your device from dangerous sites) @@ -3062,26 +1745,62 @@ Help improve Brave security + + Sends URLs of some pages you visit, limited system information, and some page content to Brave, to help discover new threats and protect everyone on the web. + Safe Browsing - - To detect dangerous apps and sites, Brave sends URLs of some pages you visit, limited system information, and some page content to Brave + + Enhanced protection - - Enhanced spell check + + Faster, proactive protection against dangerous websites, downloads, and extensions. Warns you about password breaches. Requires browsing data to be sent to Brave. - - Help improve Brave's features and performance + + Predicts and warns you about dangerous events before they happen - - Automatically sends crash reports to Brave + + Keeps you safe on Brave and may be used to improve your security in other Brave apps when you are signed in - - Make searches and browsing better + + Improves security for you and everyone on the web - - Sends URLs of pages you visit to Brave + + Warns you if passwords are exposed in a data breach + + + Sends URLs to Safe Browsing to check them. Also sends a small sample of pages, downloads, extension activity, and system information to help discover new threats. Temporarily links this data to your Brave Account when you're signed in, to protect you across Brave apps. + + + Standard protection + + + Standard protection against websites, downloads, and extensions that are known to be dangerous. + + + Detects and warns you about dangerous events when they happen + + + Checks URLs with a list of unsafe sites stored in Brave. If a site tries to steal your password, or when you download a harmful file, Brave may also send URLs, including bits of page content, to Safe Browsing. + + + Help improve security on the web for everyone + + + No protection (not recommended) + + + Does not protect you against dangerous websites, downloads, and extensions. You’ll still get Safe Browsing protection, where available, in other Brave services, like Gmail and Search. + + + Turn off Safe Browsing? + + + Safe Browsing protects you against attackers who may trick you into doing something dangerous like installing malicious software or revealing personal information like passwords, phone numbers, or credit cards. If you turn it off, be careful when browsing unfamiliar or unreputable sites. + + + Turn off Send a "Do Not Track" request with your browsing traffic @@ -3098,9 +1817,18 @@ Keep Wi-Fi on during sleep + + Permissions and content settings + + + Controls what information sites can use and show (location, camera, pop-ups, and more) + Security + + Safe Browsing (protection from dangerous sites) and other security settings + Advanced security @@ -3116,6 +1844,45 @@ Manage HTTPS/SSL certificates and settings + + Use secure DNS + + + Determines how to connect to websites over a secure connection + + + With your current service provider + + + Secure DNS may not be available all the time + + + With a provider of your choice + + + Provider options + + + With + + + See this provider's <a target="_blank" href="$1https://google.com/">privacy policy</a> + + + This setting is disabled on managed browsers + + + This setting is disabled because parental controls are on + + + Enter custom provider + + + Enter a correctly formatted URL + + + Please verify that this is a valid provider or try again later + Content settings @@ -3140,6 +1907,48 @@ More settings that relate to privacy, security, and data collection + + No recently changed permissions + + + Automatically blocked $1Notifications + + + Blocked $1Location + + + Allowed $1Camera + + + automatically blocked $1Notifications + + + blocked $1Location + + + allowed $1Camera + + + $1Automatically blocked Notifications, $2blocked Location + + + $1Automatically blocked Notifications, $2blocked Location, $3allowed Camera + + + $1Automatically blocked Notifications, $2blocked Location, $3allowed Camera, and more + + + Current private session: $1automatically blocked Notifications + + + Current private session: $1automatically blocked Notifications, $2blocked Location + + + Current private session: $1automatically blocked Notifications, $2blocked Location, $3allowed Camera + + + Current private session: $1automatically blocked Notifications, $2blocked Location, $3allowed Camera, and more + @@ -3168,60 +1977,16 @@ - - - - Powerwash - - - Restart your device - - - Remove all user accounts and reset your $1Brave device to be just like new. - - - A restart is required before your device can be reset with Powerwash. <a>Learn more</a> - - - Reset - - - Reset Button - - - Search engine - - - Search and Assistant - - Search engine used in the <a target="_blank" href="$1">address bar</a> Manage search engines - - - Brave Assistant - - - Enabled - - - Disabled - - - On - - - Off - - @@ -3270,52 +2035,6 @@ Manage - - - - Brave Assistant - - - "Ok Brave" - - - Access your Assistant when you say "Ok Brave." - - - Access your Assistant when you say "Ok Brave." To save battery, choose “On (Recommended.)” Your Assistant will respond only when your device is plugged in or charging. - - - On (Recommended) - - - Always on - - - Off - - - Voice match - - - Retrain - - - Notifications - - - Allow the Assistant to show you notifications - - - Preferred input - - - Default to using voice instead of keyboard - - - Brave Assistant settings - - - embedded on $1www.google.com @@ -3353,18 +2072,17 @@ Ads - - Augmented Reality + Augmented reality - Ask when a site wants to access your camera position or map your room + Ask when a site wants to create a 3D map of your surroundings or track camera position - Ask when a site wants to access your camera position or map your room (recommended) + Ask when a site wants to create a 3D map of your surroundings or track camera position (recommended) - Do not allow sites to access your camera position or map your room + Do not allow sites to create a 3D map of your surroundings or track camera position Automatic downloads @@ -3390,6 +2108,66 @@ Do not allow sites to see text and images copied to the clipboard + + Cookies and other site data + + + General settings + + + Allow all cookies + + + Sites can use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart + + + Sites can use cookies to see your browsing activity across different sites, for example, to personalize ads + + + Block third-party cookies in Private + + + Sites can use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart + + + While in private, sites can't use your cookies to see your browsing activity across different sites, for example, to personalize ads. Some sites may not work properly. + + + Block third-party cookies + + + Sites can use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart + + + Sites can't use your cookies to see your browsing activity across different sites, for example, to personalize ads. Some sites may not work properly. + + + Block all cookies (not recommended) + + + Sites can't use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart + + + Sites can't use your cookies to see your browsing activity across different sites, for example, to personalize ads + + + Many sites may not work properly + + + Clear cookies and site data when you close all windows + + + Manage site specific exceptions + + + Sites that can always use cookies + + + Always clear cookies when windows are closed + + + Sites that can never use cookies + Cookies and site data @@ -3465,18 +2243,17 @@ Allow sites to play protected content (recommended) - - Virtual Reality + Virtual reality - Ask when a site wants to access your virtual reality devices/data + Ask when a site wants to use your virtual reality devices and data - Ask when a site wants to access your virtual reality devices/data (recommended) + Ask when a site wants to use your virtual reality devices and data (recommended) - Do not allow sites to access your virtual reality devices/data + Do not allow sites to use your virtual reality devices and data @@ -3486,6 +2263,9 @@ Allow identifiers for protected content (computer restart may be required) + + Recent activity + Unsandboxed plugin access @@ -3510,6 +2290,18 @@ Motion sensors + + Bluetooth devices + + + Ask when a site wants to access Bluetooth devices + + + Ask when a site wants to access Bluetooth devices (recommended) + + + Do not allow any sites to access Bluetooth devices + USB devices @@ -3600,6 +2392,24 @@ Show all (recommended) + + {COUNT, plural, + =0 {Cookies are allowed} + =1 {Cookies are allowed, 1 exception} + other {Cookies are allowed, {COUNT} exceptions}} + + + {COUNT, plural, + =0 {Cookies are blocked} + =1 {Cookies are blocked, 1 exception} + other {Cookies are blocked, {COUNT} exceptions}} + + + Third-party cookies are blocked + + + Third-party cookies are blocked in Private mode + Allow sites to save and read cookie data @@ -3748,6 +2558,15 @@ Permissions + + Additional permissions + + + Content + + + Additional content settings + To change this setting, first <a target="_blank" href="$1">turn on identifiers</a> @@ -3821,7 +2640,7 @@ This will clear $18 GB of data stored by sites and installed apps. - You'll be signed out of all sites, including in any open tabs. + You'll be signed out of all sites, including in open tabs. Clear site data @@ -3881,10 +2700,10 @@ Offline data in installed apps will also be cleared - This will clear all data and cookies stored by $1https://www.google.co.uk. + This will clear all data and cookies stored by $1www.example.com. - - This will clear all data and cookies stored by $1https://www.google.co.uk and its installed app. + + This will clear all data and cookies stored by $1www.example.com and its installed apps. This will delete any data stored on your device for all the sites shown. Do you want to continue? @@ -3950,6 +2769,9 @@ Do not allow any site to discover nearby Bluetooth devices + + No Bluetooth devices found + No USB devices found @@ -4015,7 +2837,7 @@ {NUM_COOKIES, plural, =1 {1 cookie} - other {# cookies}} + other {{NUM_COOKIES} cookies}} Origin @@ -4061,23 +2883,10 @@ You and Brave - - Manage other profiles - Brave Profile photo - - Sign out - - - - Enter your PIN - - - Confirm your PIN - PIN may be easy to guess @@ -4090,134 +2899,18 @@ PINs do not match - - Show lock screen when waking from sleep - - - Screen lock - - - Security and sign-in - - - Screen lock options - - - Lock screen from sleep mode - - - Password only - - - PIN or password - - - Sign in automatically - - - Change PIN - - - Set up PIN - - - Edit Fingerprints - - - Set up a faster way to unlock your device - - - Set up - - - $11 fingerprints set up - - - Fingerprint - - - Saved fingerprints - - - Add Fingerprint - - - Note: Your fingerprint may be less secure than a strong password or PIN. - - - delete [$1Fingerprint 1] - - - Finger $11 - - - Add account - - - Manage your signed-in accounts. Websites, apps, and extensions in Brave and Google Play may use these accounts to customize your experience, depending on permissions. <a>Learn more</a> - - - Accounts - - - My accounts - - - Brave Accounts - - - To sign out of the primary account on this device, click the time on your screen. In the menu that appears, click "Sign out". - - - Your administrator has disabled the addition of more Brave Accounts - - - Addition of more Brave Accounts is disabled - - - Sign in again - - - Not updated yet - - - More actions, $1abcd@google.com - - - Update account - - - Sign in - - - Update account, $1abcd@google.com - - - Sign in, $1abcd@google.com - - - Remove this account - - - Managed by $1google.com - - - Primary account - $1abcd@google.com was removed from this device - - Set up your fingerprint + + School account - Touch the power button with your finger The fingerprint sensor is in the power button. Touch it lightly with any finger. - Touch the fingerprint sensor with your finger @@ -4230,108 +2923,17 @@ The fingerprint sensor is the top right-hand key on your keyboard. Touch it lightly with any finger. - - - Fingerprint added. - - - Lift then try again. - - - Try again. - - - Move slightly to capture a different part of the fingerprint. - - - Confirm your password - - - Add another - - - Enter your password to configure screen lock - - - Enter your password to configure security and sign-in - Password Invalid password - - Choose a picture to display for your account on the sign-in screen - - - Choose a file - - - Take photo - - - Capture video - - - Discard photo or video - - - Photo was captured - - - Photo was discarded - - - Switch to camera mode - - - Switch to video recorder - - - Photo mode entered - - - Video mode entered - - - User image preview - - - Photo by $1John Doe - - - Existing photo from camera or file - - - Existing video from camera or file - Sign in - - Get Brave smarts in Brave - - - Use another account - - - Syncing to $1abcd@google.com - - - Turn off - - - Sync isn't working - - - Error syncing passwords - - - Sync is paused - 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 Account and can be managed on <a href="$2" target="_blank"><a href="$2" target="_blank">Brave Dashboard</a></a>. @@ -4357,76 +2959,24 @@ - - Sign in to get your bookmarks, history, passwords, and other settings on all your devices. You'll also automatically be signed in to your Brave services. <a>Learn more</a> - Changes to your bookmarks, history, passwords, and other settings will no longer be synced to your Brave Account. However, your existing data will remain stored in your Brave Account and can be managed on <a href="$1" target="_blank"><a href="$1" target="_blank">Brave Dashboard</a></a>. - - This will sign you out of your Brave Accounts. Your bookmarks, history, passwords, and more will no longer be synced. - - - Show profile stats - - - Also remove your existing data from this device - - - Clear and Sign Out - - - - Sync - - - Other Brave services - - - Sync and Brave services + + This will sign you out of your Brave Accounts. Your bookmarks, history, passwords, and more will no longer be synced. - - Manage sync + + Show profile stats - - Please wait... + + Also remove your existing data from this device Sync will start once you leave sync settings - - Cancel sync - - - Cancel sync? - - - You can turn on sync anytime in settings - - - Check your internet connection. If the problem continues, try signing out and signing in again. - - - Sync everything - Manage your Brave Account - - Apps - - - Extensions - - - Settings - - - Addresses, phone numbers, and more - - - History - Themes & Wallpapers @@ -4440,18 +2990,6 @@ Themes - - Bookmarks - - - Passwords - - - Open Tabs - - - Google Drive search suggestions - Activity and interactions @@ -4460,18 +2998,6 @@ Manage synced data on Brave Dashboard - - - Data from Brave sync - - - Encryption options - - - Encryption options - - - Encrypt synced passwords with your Brave username and password Encrypt synced data with your own <a href="$1" target="_blank"><a href="$1" target="_blank">sync passphrase</a></a>. This doesn't include payment methods and addresses from Brave Pay. @@ -4485,54 +3011,12 @@ To turn this on, <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a> to remove your sync passphrase - - Empty passphrase is not allowed - - - You must enter the same passphrase twice - - - The passphrase you entered is incorrect - If you forgot your passphrase or want to change this setting, <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a>. - - Passphrase - - - Confirm passphrase - - - Submit - - - Use default settings - Control how your browsing history is used to personalize Search, ads, and more - - Use your History to personalize Search and other Brave services - - - On - - - Off - - - For example, get suggestions in YouTube based on Brave browsing - - - Your synced data was encrypted - - - Turned off because you disabled syncing history - - - History recording is turned off in Activity controls. - @@ -4579,62 +3063,6 @@ - - - - These settings may only be modified by the owner: - - - These settings are controlled by enterprise policy. Please contact your administrator for more information. - - - Enable Guest browsing - - - Show usernames and photos on the sign-in screen - - - Restrict sign-in to the following users: - - - $1John Smith (owner) - - - Remove $1John Smith - - - Add user - - - Email address - - - This user already exists - - - - - - - Parental controls - - - Set website restrictions & screen time limits with Family Link - - - Connect to the internet to set up parental controls - - - Open the Family Link app to see your supervision settings - - - Set up - - - Set up button - - - @@ -4649,9 +3077,6 @@ - - Web content - Page zoom @@ -4673,9 +3098,6 @@ Very large - - Custom - Customize fonts @@ -4703,468 +3125,9 @@ Huge - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. - - - Loading... - - - Advanced font settings - - - Open extension options - The quick brown fox jumps over the lazy dog - - Requires extension from the Web Store - - - - - - Device - - - Mouse - - - Touchpad - - - Mouse and touchpad - - - Keyboard - - - - Enable tap-to-click - - - Touchpad speed - - - Slow - - - Fast - - - Scrolling - - - - Mouse speed - - - Swap primary mouse button - - - Reverse scrolling - - - Enable mouse acceleration - - - Enable touchpad acceleration - - - - Search - - - Launcher - - - Ctrl - - - Alt - - - Caps Lock - - - Diamond - - - Escape - - - Backspace - - - Assistant - - - Disabled - - - External Command - - - Command - - - External Meta - - - Meta - - - Treat top-row keys as function keys - - - Hold the Search key to switch the behavior of the top-row keys - - - Hold the Launcher key to switch the behavior of the top-row keys - - - Enable auto-repeat - - - Delay before repeat - - - Long - - - Short - - - Repeat rate - - - Slow - - - Fast - - - View keyboard shortcuts - - - Change language and input settings - - - - - Stylus - - - Open stylus tools when the stylus is removed - - - Show stylus tools in the shelf - - - Find more stylus apps - - - Open Google Play - - - Note-taking app - - - Lock screen notes - - - Enable note-taking from lock screen - - - Keep latest note on lock screen - - - None available - - - Loading apps... - - - - - Displays - - - Arrangement - - - Drag to move a display - - - Mirror $1HP Z27n - - - Mirrored - - - Night Light - - - Night Light will turn on automatically at sunset - - - Night Light will turn off automatically at sunrise - - - Custom - - - Schedule - - - Never - - - Sunset to Sunrise - - - Start time - - - End time - - - Make it easier to look at your screen or read in dim light - - - Color temperature - - - Warmer - - - Cooler - - - Allow windows to span displays - - - On - - - Off - - - Screen - - - Primary display - - - Extended display - - - Resolution - - - $11600 x $21200 - - - $11600 x $21200 (Best) - - - $11600 x $21200 (Native) - - - Determines sharpness of text and images - - - $11600 x $21200 ($360 Hertz) - - - $11600 x $21200 ($360 Hertz) - interlaced - - - Display Size - - - Make items on your screen smaller or larger - - - $1120% - - - Tiny - - - Huge - - - Looks like $11600 x $21200 - - - Looks like $11600 x $21200 (Default) - - - Looks like $11600 x $21200 (Native) - - - Orientation - - - Auto-rotate - - - 0° (Default) - - - Ambient colors - - - Adjusts the screen color to match the environment - - - Adjust the boundaries of your desktop within the display - - - Overscan - - - Adjust the boundaries of your display - - - Tap the following keys to adjust or move the cropping area - - - Shrink / Expand - - - Move - - - Reset - - - Calibrate touchscreen - - - Set up and adjust the accuracy of your touchscreen - - - - - Storage management - - - In use - - - Available - - - My files - - - Browsing data - - - Android storage - - - Linux (Beta) storage - - - Other users - - - Calculating... - - - Unknown - - - Device is low on space - - - To free up space, delete files from device storage. - - - If space isn’t made available, users and data may be automatically removed. - - - Device space critically low - - - Free up at least 512 MB of space or your device will become unresponsive. To free up space, delete files from device storage. - - - If you don’t free up space, users and data may be automatically removed. - - - External storage preferences - - - Apps from Google Play may require full file system access to read and write files on external storage devices. Files and folders created on the device are visible to anyone who uses the external drive. <a target="_blank" href="$1https://google.com/">Learn more</a> - - - Available devices will appear here. - - - Available devices - - - Storage Usage Overview - - - - - Power - - - Power source - - - Battery - - - AC adapter - - - Low-power charger - - - Checking power sources... - - - When idle - - - Sleep - - - Turn off display - - - Keep display on - - - Other - - - Sleep when cover is closed - - - Sign out when cover is closed - - - Shut down when cover is closed - - - $156% - $22 hours and 20 minutes left - - - $156% - $22 hours and 20 minutes until full - - - $156% - - @@ -5185,72 +3148,6 @@ - - - - Connected devices - - - Android phone - - - Connect your $1Bravebook with your phone. <a target="_blank" href="$2https://google.com/">Learn more</a> - - - No eligible devices. <a target="_blank" href="$1https://google.com/">Learn more</a> - - - Waiting for verification. <a target="_blank" href="$1https://google.com/">Learn more</a> - - - Set up - - - Verify - - - Enabled - - - Disabled - - - Unlock your $1Bravebook with your phone. <a target="_blank" href="$2https://google.com/">Learn more</a> - - - Instant Tethering - - - Connect to the internet through your phone - - - Messages - - - Send and receive text messages from your $1Bravebook. <a target="_blank" href="$2https://google.com/">Learn more</a> - - - Forget phone - - - Disconnect your phone from your $1Bravebook - - - Disconnect your phone from your $1Bravebook. They will no longer connect automatically. - - - Disconnect - - - - - - Your password may be compromised - - - Change Password - - @@ -5271,15 +3168,15 @@ {NUM_ITEMS, plural, =1 {1 item} - other {# items}} + other {{NUM_ITEMS} items}} Registry entries to be removed or changed: - {NUM_DOWNLOAD, plural, + {NUM_DOWNLOADS, plural, =1 {1 more} - other {# more}} + other {{NUM_DOWNLOADS} more}} An error occurred while Brave was removing harmful software @@ -5402,21 +3299,6 @@ $1Bookmarks is not available to Guest users. - - - On the lock screen - - - Show all notification content - - - Don't show notifications at all - - - Hide sensitive content - - - Manage security keys diff --git a/app/shared_settings_strings.grdp b/app/shared_settings_strings.grdp new file mode 100644 index 000000000000..c509803f6196 --- /dev/null +++ b/app/shared_settings_strings.grdp @@ -0,0 +1,254 @@ + + + + + + + Captions + + + Settings + + + Preview + + + Text size + + + Text font + + + Text color + + + Text opacity + + + Background opacity + + + Opaque + + + Semi-transparent + + + Transparent + + + Text shadow + + + None + + + Raised + + + Depressed + + + Uniform + + + Drop shadow + + + Background color + + + Black + + + White + + + Red + + + Green + + + Blue + + + Yellow + + + Cyan + + + Magenta + + + Default + + + + + Make searches and browsing better + + + Sends URLs of pages you visit to Brave + + + Enhanced spell check + + + Autocomplete searches and URLs + + + Sends some cookies and searches from the address bar and search box to your default search engine + + + Help improve Brave's features and performance + + + Automatically sends crash reports to Brave + + + Show suggestions for similar pages when a page can't be found + + + Sends the web address of the page you're trying to reach to Brave + + + Google Drive search suggestions + + + + + Syncing to $1abcd@google.com + + + Sync is paused + + + Get Brave smarts in Brave + + + Turn off + + + Settings + + + Sync isn't working + + + Error syncing passwords + + + Manage sync + + + Manage what you sync + + + Use another account + + + + + Clear and Sign Out + + + Sign out + + + + Addresses, phone numbers, and more + + + History + + + Extensions + + + Open Tabs + + + Sync everything + + + Apps + + + Other Brave services + + + Customize sync + + + Sync data + + + + + Passwords + + + Passphrase + + + Encryption options + + + Submit + + + Encrypt synced passwords with your Brave username and password + + + Bookmarks + + + Encryption options + + + You must enter the same passphrase twice + + + Empty passphrase is not allowed + + + The passphrase you entered is incorrect + + + Data from Brave sync + + + Review your synced data + + + Sync and Brave services + + + Confirm passphrase + + + Please wait... + + + Check your internet connection. If the problem continues, try signing out and signing in again. + + + Sync + + + Cancel sync + + + Cancel sync? + + + You can turn on sync anytime in settings + + + + + Checking for updates + + diff --git a/app/vector_icons/BUILD.gn b/app/vector_icons/BUILD.gn index 8f8832b083a6..384e65d3c3de 100644 --- a/app/vector_icons/BUILD.gn +++ b/app/vector_icons/BUILD.gn @@ -8,7 +8,6 @@ aggregate_vector_icons("brave_vector_icons") { icon_directory = "." icons = [ - "autoplay_status.icon", "download_unlock.icon", "sad_folder.icon", "speedreader.icon", diff --git a/app/web_time_limit_error_page_strings.grdp b/app/web_time_limit_error_page_strings.grdp index 65f526f54601..17b9d05a2515 100644 --- a/app/web_time_limit_error_page_strings.grdp +++ b/app/web_time_limit_error_page_strings.grdp @@ -11,11 +11,11 @@ - $1Brave is paused + $1Education.com is paused - The limit on $1Brave that your parent set ran out. + You reached the time limit your parent set for $1Brave. diff --git a/browser/BUILD.gn b/browser/BUILD.gn index 4619ed392196..0b4ecd242676 100644 --- a/browser/BUILD.gn +++ b/browser/BUILD.gn @@ -22,7 +22,9 @@ source_set("browser_process") { "//chrome/browser/*", "//brave/browser/*", "//brave:browser_dependencies", - "//brave/test:*" + "//brave/components/brave_ads/test:*", + "//brave/components/brave_rewards/test:*", + "//brave/test:*", ] sources = [ @@ -64,8 +66,8 @@ source_set("browser_process") { "component_updater/brave_component_updater_configurator.h", "component_updater/brave_component_updater_delegate.cc", "component_updater/brave_component_updater_delegate.h", - "geolocation/brave_geolocation_permission_context.cc", - "geolocation/brave_geolocation_permission_context.h", + "geolocation/brave_geolocation_permission_context_delegate.cc", + "geolocation/brave_geolocation_permission_context_delegate.h", "metrics/metrics_reporting_util.cc", "metrics/metrics_reporting_util.h", "search_engines/guest_window_search_engine_provider_service.cc", @@ -115,7 +117,6 @@ source_set("browser_process") { "content_settings", "download", "net", - "permissions", "profiles", "renderer_context_menu", "ui", @@ -179,6 +180,7 @@ source_set("browser_process") { "ntp_background_images", "//services/network/public/cpp", "//services/service_manager/embedder", + "//third_party/blink/public/mojom:mojom_platform_headers", "//third_party/widevine/cdm:buildflags", "//ui/base", ] diff --git a/browser/autoplay/BUILD.gn b/browser/autoplay/BUILD.gn index 260b0cf0641c..125358d7e4c9 100644 --- a/browser/autoplay/BUILD.gn +++ b/browser/autoplay/BUILD.gn @@ -11,6 +11,7 @@ source_set("autoplay") { "//chrome/common", "//components/content_settings/core/common", "//components/permissions", + "//content/public/browser", "//third_party/blink/public/mojom:web_feature_mojo_bindings", ] } diff --git a/browser/autoplay/autoplay_permission_context.cc b/browser/autoplay/autoplay_permission_context.cc index 8da2e24a7f0f..a92ad78f4408 100644 --- a/browser/autoplay/autoplay_permission_context.cc +++ b/browser/autoplay/autoplay_permission_context.cc @@ -12,11 +12,13 @@ #include "chrome/common/chrome_features.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/permissions/permission_request_id.h" +#include "content/public/browser/browser_context.h" #include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h" -AutoplayPermissionContext::AutoplayPermissionContext(Profile* profile) - : PermissionContextBase( - profile, +AutoplayPermissionContext::AutoplayPermissionContext( + content::BrowserContext* browser_context) + : permissions::PermissionContextBase( + browser_context, ContentSettingsType::AUTOPLAY, blink::mojom::FeaturePolicyFeature::kAutoplay) {} @@ -41,10 +43,10 @@ void AutoplayPermissionContext::NotifyPermissionSet( const permissions::PermissionRequestID& id, const GURL& requesting_origin, const GURL& embedding_origin, - BrowserPermissionCallback callback, + permissions::BrowserPermissionCallback callback, bool persist, ContentSetting content_setting) { - PermissionContextBase::NotifyPermissionSet( + permissions::PermissionContextBase::NotifyPermissionSet( id, requesting_origin, embedding_origin, std::move(callback), persist, content_setting); // Ask -> Allow diff --git a/browser/autoplay/autoplay_permission_context.h b/browser/autoplay/autoplay_permission_context.h index a4b5de8ad81a..a55e92906ce6 100644 --- a/browser/autoplay/autoplay_permission_context.h +++ b/browser/autoplay/autoplay_permission_context.h @@ -7,11 +7,11 @@ #define BRAVE_BROWSER_AUTOPLAY_AUTOPLAY_PERMISSION_CONTEXT_H_ #include "base/macros.h" -#include "chrome/browser/permissions/permission_context_base.h" +#include "components/permissions/permission_context_base.h" -class AutoplayPermissionContext : public PermissionContextBase { +class AutoplayPermissionContext : public permissions::PermissionContextBase { public: - explicit AutoplayPermissionContext(Profile* profile); + explicit AutoplayPermissionContext(content::BrowserContext* browser_context); ~AutoplayPermissionContext() override; private: @@ -22,7 +22,7 @@ class AutoplayPermissionContext : public PermissionContextBase { void NotifyPermissionSet(const permissions::PermissionRequestID& id, const GURL& requesting_origin, const GURL& embedding_origin, - BrowserPermissionCallback callback, + permissions::BrowserPermissionCallback callback, bool persist, ContentSetting content_setting) override; bool IsRestrictedToSecureOrigins() const override; diff --git a/browser/autoplay/autoplay_permission_context_browsertest.cc b/browser/autoplay/autoplay_permission_context_browsertest.cc index 7ff7a7ded949..e0d2f5a8d62a 100644 --- a/browser/autoplay/autoplay_permission_context_browsertest.cc +++ b/browser/autoplay/autoplay_permission_context_browsertest.cc @@ -16,7 +16,6 @@ #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h" #include "chrome/common/chrome_content_client.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -24,6 +23,7 @@ #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/permissions/permission_request.h" +#include "components/permissions/test/mock_permission_prompt_factory.h" #include "components/prefs/pref_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/test/browser_test_utils.h" @@ -146,8 +146,8 @@ class AutoplayPermissionContextBrowserTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, DISABLED_BlockByDefault) { std::string result; - PermissionRequestManager* manager = - PermissionRequestManager::FromWebContents(contents()); + permissions::PermissionRequestManager* manager = + permissions::PermissionRequestManager::FromWebContents(contents()); NavigateToURLUntilLoadStop(autoplay_method_url()); EXPECT_FALSE(manager->IsRequestInProgress()); @@ -186,8 +186,8 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, DISABLED_AskAutoplay) { std::string result; AskAutoplay(); - PermissionRequestManager* manager = - PermissionRequestManager::FromWebContents(contents()); + permissions::PermissionRequestManager* manager = + permissions::PermissionRequestManager::FromWebContents(contents()); NavigateToURLUntilLoadStop(autoplay_method_url()); EXPECT_TRUE(manager->IsRequestInProgress()); @@ -225,13 +225,14 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, ClickAllow) { std::string result; AskAutoplay(); - PermissionRequestManager* manager = - PermissionRequestManager::FromWebContents(contents()); + permissions::PermissionRequestManager* manager = + permissions::PermissionRequestManager::FromWebContents(contents()); auto popup_prompt_factory = - std::make_unique(manager); + std::make_unique(manager); EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount()); - popup_prompt_factory->set_response_type(PermissionRequestManager::ACCEPT_ALL); + popup_prompt_factory->set_response_type( + permissions::PermissionRequestManager::ACCEPT_ALL); NavigateToURLUntilLoadStop(autoplay_method_url()); EXPECT_TRUE(popup_prompt_factory->RequestTypeSeen( @@ -262,13 +263,14 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, ClickAllow) { IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, ClickAllowMuted) { std::string result; AskAutoplay(); - PermissionRequestManager* manager = - PermissionRequestManager::FromWebContents(contents()); + permissions::PermissionRequestManager* manager = + permissions::PermissionRequestManager::FromWebContents(contents()); auto popup_prompt_factory = - std::make_unique(manager); + std::make_unique(manager); EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount()); - popup_prompt_factory->set_response_type(PermissionRequestManager::ACCEPT_ALL); + popup_prompt_factory->set_response_type( + permissions::PermissionRequestManager::ACCEPT_ALL); NavigateToURLUntilLoadStop(autoplay_method_muted_url()); EXPECT_TRUE(popup_prompt_factory->RequestTypeSeen( @@ -300,13 +302,14 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, DISABLED_ClickBlock) { std::string result; AskAutoplay(); - PermissionRequestManager* manager = - PermissionRequestManager::FromWebContents(contents()); + permissions::PermissionRequestManager* manager = + permissions::PermissionRequestManager::FromWebContents(contents()); auto popup_prompt_factory = - std::make_unique(manager); + std::make_unique(manager); EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount()); - popup_prompt_factory->set_response_type(PermissionRequestManager::DENY_ALL); + popup_prompt_factory->set_response_type( + permissions::PermissionRequestManager::DENY_ALL); NavigateToURLUntilLoadStop(autoplay_method_url()); EXPECT_TRUE(popup_prompt_factory->RequestTypeSeen( @@ -364,10 +367,10 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, AllowAutoplay) { std::string result; AllowAutoplay(); - PermissionRequestManager* manager = - PermissionRequestManager::FromWebContents(contents()); + permissions::PermissionRequestManager* manager = + permissions::PermissionRequestManager::FromWebContents(contents()); auto popup_prompt_factory = - std::make_unique(manager); + std::make_unique(manager); EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount()); @@ -426,10 +429,10 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, DISABLED_BlockAutoplay) { std::string result; BlockAutoplay(); - PermissionRequestManager* manager = - PermissionRequestManager::FromWebContents(contents()); + permissions::PermissionRequestManager* manager = + permissions::PermissionRequestManager::FromWebContents(contents()); auto popup_prompt_factory = - std::make_unique(manager); + std::make_unique(manager); EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount()); @@ -482,10 +485,10 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, // Default allow autoplay on file urls IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, FileAutoplay) { std::string result; - PermissionRequestManager* manager = - PermissionRequestManager::FromWebContents(contents()); + permissions::PermissionRequestManager* manager = + permissions::PermissionRequestManager::FromWebContents(contents()); auto popup_prompt_factory = - std::make_unique(manager); + std::make_unique(manager); EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount()); diff --git a/browser/autoplay/autoplay_permission_context_unittest.cc b/browser/autoplay/autoplay_permission_context_unittest.cc index 9b5efe8c987d..98e924ab1e6a 100644 --- a/browser/autoplay/autoplay_permission_context_unittest.cc +++ b/browser/autoplay/autoplay_permission_context_unittest.cc @@ -12,13 +12,13 @@ #include "base/bind.h" #include "base/macros.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" -#include "chrome/browser/permissions/permission_request_manager.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/permissions/permission_request_id.h" +#include "components/permissions/permission_request_manager.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" @@ -43,7 +43,7 @@ class AutoplayPermissionContextTest : public AutoplayPermissionContext { void NotifyPermissionSet(const permissions::PermissionRequestID& id, const GURL& requesting_origin, const GURL& embedder_origin, - BrowserPermissionCallback callback, + permissions::BrowserPermissionCallback callback, bool persist, ContentSetting content_setting) override { if (!(persist && content_setting == CONTENT_SETTING_ALLOW)) @@ -69,7 +69,7 @@ class AutoplayPermissionContextTests // content::RenderViewHostTestHarness: void SetUp() override { content::RenderViewHostTestHarness::SetUp(); - PermissionRequestManager::CreateForWebContents(web_contents()); + permissions::PermissionRequestManager::CreateForWebContents(web_contents()); } std::unique_ptr CreateBrowserContext() override { diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java index 095ea81e1b18..0d4a17e0fe9e 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 3869fe7935a4..e33e4c348236 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -96,7 +96,7 @@ using extensions::ChromeContentBrowserClientExtensionsPart; #if BUILDFLAG(ENABLE_SPEEDREADER) #include "brave/browser/speedreader/speedreader_tab_helper.h" #include "brave/components/speedreader/speedreader_throttle.h" -#include "content/public/common/resource_type.h" +#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" #endif #if BUILDFLAG(BINANCE_ENABLED) @@ -293,7 +293,7 @@ BraveContentBrowserClient::CreateURLLoaderThrottles( speedreader::SpeedreaderTabHelper::FromWebContents(contents); if (tab_helper && tab_helper->IsActiveForMainFrame() && request.resource_type - == static_cast(content::ResourceType::kMainFrame)) { + == static_cast(blink::mojom::ResourceType::kMainFrame)) { result.push_back(std::make_unique( g_brave_browser_process->speedreader_whitelist(), base::ThreadTaskRunnerHandle::Get())); diff --git a/browser/brave_rewards/rewards_tab_helper.cc b/browser/brave_rewards/rewards_tab_helper.cc index 9f367e31f283..52d3fbfb6496 100644 --- a/browser/brave_rewards/rewards_tab_helper.cc +++ b/browser/brave_rewards/rewards_tab_helper.cc @@ -19,10 +19,9 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_user_data.h" -#include "content/public/common/resource_load_info.mojom.h" -#include "content/public/common/resource_type.h" +#include "third_party/blink/public/mojom/loader/resource_load_info.mojom.h" -using content::ResourceType; +using blink::mojom::ResourceType; // DEFINE_WEB_CONTENTS_USER_DATA_KEY(brave_rewards::RewardsTabHelper); @@ -72,18 +71,27 @@ void RewardsTabHelper::DidFinishNavigation(content::NavigationHandle* handle) { void RewardsTabHelper::ResourceLoadComplete( content::RenderFrameHost* render_frame_host, const content::GlobalRequestID& request_id, - const content::mojom::ResourceLoadInfo& resource_load_info) { + const blink::mojom::ResourceLoadInfo& resource_load_info) { if (!rewards_service_ || !render_frame_host) return; // TODO(nejczdovc): do we need to get anyother type then XHR?? - if (resource_load_info.resource_type == content::ResourceType::kMedia || - resource_load_info.resource_type == content::ResourceType::kXhr || - resource_load_info.resource_type == content::ResourceType::kImage || - resource_load_info.resource_type == content::ResourceType::kScript) { - rewards_service_->OnXHRLoad(tab_id_, GURL(resource_load_info.final_url), - web_contents()->GetURL(), - resource_load_info.referrer); + switch (resource_load_info.request_destination) { + // Formerly ResourceType::kMedia + case network::mojom::RequestDestination::kAudio: + case network::mojom::RequestDestination::kTrack: + case network::mojom::RequestDestination::kVideo: + // Best match for ResourceType::kXhr (though, not limited to kXhr) + case network::mojom::RequestDestination::kEmpty: + // Formerly ResourceType::kImage + case network::mojom::RequestDestination::kImage: + case network::mojom::RequestDestination::kScript: + rewards_service_->OnXHRLoad(tab_id_, GURL(resource_load_info.final_url), + web_contents()->GetURL(), + resource_load_info.referrer); + break; + default: + break; } } diff --git a/browser/brave_rewards/rewards_tab_helper.h b/browser/brave_rewards/rewards_tab_helper.h index 7f178f50c712..1e8ff7cf242e 100644 --- a/browser/brave_rewards/rewards_tab_helper.h +++ b/browser/brave_rewards/rewards_tab_helper.h @@ -41,7 +41,7 @@ class RewardsTabHelper : public RewardsServiceObserver, void ResourceLoadComplete( content::RenderFrameHost* render_frame_host, const content::GlobalRequestID& request_id, - const content::mojom::ResourceLoadInfo& resource_load_info) override; + const blink::mojom::ResourceLoadInfo& resource_load_info) override; void DidAttachInterstitialPage() override; void OnVisibilityChanged(content::Visibility visibility) override; void WebContentsDestroyed() override; diff --git a/browser/brave_stats_updater.cc b/browser/brave_stats_updater.cc index 232708fc28be..242dc35acaa2 100644 --- a/browser/brave_stats_updater.cc +++ b/browser/brave_stats_updater.cc @@ -65,7 +65,7 @@ GURL GetUpdateURL(const GURL& base_update_url, namespace brave { -GURL BraveStatsUpdater::g_base_update_url_( +std::string BraveStatsUpdater::g_base_update_url_( "https://laptop-updates.brave.com/1/usage/brave-core"); BraveStatsUpdater::BraveStatsUpdater(PrefService* pref_service) @@ -189,7 +189,7 @@ void BraveStatsUpdater::SendServerPing() { auto stats_updater_params = std::make_unique(pref_service_); resource_request->url = - GetUpdateURL(g_base_update_url_, *stats_updater_params); + GetUpdateURL(GURL(g_base_update_url_), *stats_updater_params); resource_request->load_flags = net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE | @@ -206,7 +206,8 @@ void BraveStatsUpdater::SendServerPing() { } // static -void BraveStatsUpdater::SetBaseUpdateURLForTest(const GURL& base_update_url) { +void BraveStatsUpdater::SetBaseUpdateURLForTest( + const std::string& base_update_url) { g_base_update_url_ = base_update_url; } diff --git a/browser/brave_stats_updater.h b/browser/brave_stats_updater.h index 3d7bef00ba67..8f1ca7955a6f 100644 --- a/browser/brave_stats_updater.h +++ b/browser/brave_stats_updater.h @@ -65,8 +65,8 @@ class BraveStatsUpdater { void SendServerPing(); friend class ::BraveStatsUpdaterBrowserTest; - static void SetBaseUpdateURLForTest(const GURL& base_update_url); - static GURL g_base_update_url_; + static void SetBaseUpdateURLForTest(const std::string& base_update_url); + static std::string g_base_update_url_; PrefService* pref_service_; StatsUpdatedCallback stats_updated_callback_; diff --git a/browser/brave_stats_updater_browsertest.cc b/browser/brave_stats_updater_browsertest.cc index bf3220908bb6..31d0187937bc 100644 --- a/browser/brave_stats_updater_browsertest.cc +++ b/browser/brave_stats_updater_browsertest.cc @@ -63,7 +63,7 @@ class BraveStatsUpdaterBrowserTest : public InProcessBrowserTest { void SetBaseUpdateURLForTest() { std::unique_ptr env(base::Environment::Create()); brave::BraveStatsUpdater::SetBaseUpdateURLForTest( - embedded_test_server()->GetURL("/1/usage/brave-core")); + embedded_test_server()->GetURL("/1/usage/brave-core").spec()); env->SetVar("BRAVE_REFERRALS_SERVER", embedded_test_server()->host_port_pair().ToString()); env->SetVar("BRAVE_REFERRALS_LOCAL", "1"); // use http for local testing diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc b/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc index 4e22ba3b6a64..9cec8b219e3b 100644 --- a/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc +++ b/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc @@ -20,13 +20,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" -namespace { -const GURL kBraveURL("https://www.brave.com"); -const GURL kBatURL("https://basicattentiontoken.org"); -const GURL kGoogleURL("https://www.google.com"); -const GURL kAbcURL("https://www.abc.com"); -} // namespace - class BraveBrowsingDataRemoverDelegateTest : public testing::Test { public: void SetUp() override { @@ -62,6 +55,10 @@ class BraveBrowsingDataRemoverDelegateTest : public testing::Test { }; TEST_F(BraveBrowsingDataRemoverDelegateTest, ShieldsSettingsClearTest) { + const GURL kBraveURL("https://www.brave.com"); + const GURL kBatURL("https://basicattentiontoken.org"); + const GURL kGoogleURL("https://www.google.com"); + const GURL kAbcURL("https://www.abc.com"); // Four settings are added. // First two settings are shields settings in PLUGINS type. // Javascript is not counted as shields type because it's stored to diff --git a/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc b/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc index 632415477d23..18682bcbb2d0 100644 --- a/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc +++ b/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc @@ -30,13 +30,6 @@ #include "content/public/browser/host_zoom_map.h" #endif -namespace { -const GURL kBraveURL("https://www.brave.com"); -const GURL kBatURL("https://basicattentiontoken.org"); -const GURL kGoogleURL("https://www.google.com"); -const GURL kAbcURL("https://www.abc.com"); -} // namespace - class BraveSiteSettingsCounterTest : public testing::Test { public: void SetUp() override { @@ -92,6 +85,10 @@ class BraveSiteSettingsCounterTest : public testing::Test { // Tests that the counter correctly counts each setting. TEST_F(BraveSiteSettingsCounterTest, Count) { + const GURL kBraveURL("https://www.brave.com"); + const GURL kBatURL("https://basicattentiontoken.org"); + const GURL kGoogleURL("https://www.google.com"); + const GURL kAbcURL("https://www.abc.com"); // Check below four settings for different host are counted properly. map()->SetContentSettingDefaultScope( kBraveURL, GURL(), ContentSettingsType::PLUGINS, diff --git a/browser/extensions/api/brave_shields_api_browsertest.cc b/browser/extensions/api/brave_shields_api_browsertest.cc index 08ec60ab454d..261035eb9422 100644 --- a/browser/extensions/api/brave_shields_api_browsertest.cc +++ b/browser/extensions/api/brave_shields_api_browsertest.cc @@ -198,7 +198,11 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, AllowScriptsOnceIframe) { constexpr char kJavascriptSetParams[] = "[\"block\", \"https://www.brave.com/\"]"; constexpr char kJavascriptGetParams[] = "[\"https://www.brave.com/\"]"; -const GURL kBraveURL("https://www.brave.com"); + +const GURL& GetBraveURL() { + static const GURL kBraveURL("https://www.brave.com"); + return kBraveURL; +} // Test javascript content setting works properly via braveShields api. IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, @@ -225,7 +229,7 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, // Check Block is set. ContentSetting setting = HostContentSettingsMapFactory::GetForProfile(browser()->profile()) - ->GetContentSetting(kBraveURL, GURL(), + ->GetContentSetting(GetBraveURL(), GURL(), ContentSettingsType::JAVASCRIPT, ""); EXPECT_EQ(setting, CONTENT_SETTING_BLOCK); } @@ -235,12 +239,13 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, PRE_ShieldSettingsPersistTest) { HostContentSettingsMapFactory::GetForProfile(browser()->profile()) ->SetContentSettingDefaultScope( - kBraveURL, GURL(), ContentSettingsType::PLUGINS, + GetBraveURL(), GURL(), ContentSettingsType::PLUGINS, brave_shields::kHTTPUpgradableResources, CONTENT_SETTING_ALLOW); ContentSetting setting = HostContentSettingsMapFactory::GetForProfile(browser()->profile()) - ->GetContentSetting(kBraveURL, GURL(), ContentSettingsType::PLUGINS, + ->GetContentSetting(GetBraveURL(), GURL(), + ContentSettingsType::PLUGINS, brave_shields::kHTTPUpgradableResources); EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); } @@ -248,7 +253,8 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, ShieldSettingsPersistTest) { ContentSetting setting = HostContentSettingsMapFactory::GetForProfile(browser()->profile()) - ->GetContentSetting(kBraveURL, GURL(), ContentSettingsType::PLUGINS, + ->GetContentSetting(GetBraveURL(), GURL(), + ContentSettingsType::PLUGINS, brave_shields::kHTTPUpgradableResources); EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); } @@ -256,13 +262,13 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, ShieldSettingsPersistTest) { // Checks flash configuration isn't persisted across the sessions. IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, PRE_FlashPersistTest) { HostContentSettingsMapFactory::GetForProfile(browser()->profile()) - ->SetContentSettingDefaultScope(kBraveURL, GURL(), + ->SetContentSettingDefaultScope(GetBraveURL(), GURL(), ContentSettingsType::PLUGINS, std::string(), CONTENT_SETTING_ALLOW); ContentSetting setting = HostContentSettingsMapFactory::GetForProfile(browser()->profile()) - ->GetContentSetting(kBraveURL, GURL(), + ->GetContentSetting(GetBraveURL(), GURL(), ContentSettingsType::PLUGINS, std::string()); EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); } @@ -270,7 +276,7 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, PRE_FlashPersistTest) { IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, FlashPersistTest) { ContentSetting setting = HostContentSettingsMapFactory::GetForProfile(browser()->profile()) - ->GetContentSetting(kBraveURL, GURL(), + ->GetContentSetting(GetBraveURL(), GURL(), ContentSettingsType::PLUGINS, std::string()); EXPECT_EQ(setting, CONTENT_SETTING_BLOCK); } diff --git a/browser/extensions/brave_extension_service.cc b/browser/extensions/brave_extension_service.cc index f919a4a410af..a23af646cf7d 100644 --- a/browser/extensions/brave_extension_service.cc +++ b/browser/extensions/brave_extension_service.cc @@ -62,7 +62,7 @@ void BraveExtensionService::AddComponentExtension(const Extension* extension) { syncer::StringOrdinal(), extensions::kInstallFlagNone, std::string(), - base::nullopt); + {} /* ruleset_checksums */); extensions::ContentSettingsService::Get(profile_)->OnExtensionPrefsLoaded( extension->id(), extension_prefs_); } diff --git a/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc b/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc index a8616a1bfcb8..5a69ffd40695 100644 --- a/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc +++ b/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc @@ -53,8 +53,17 @@ class MockBrowserClient : public content::ContentBrowserClient { } }; -GURL magnet_url("magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c&dn=Big+Buck+Bunny&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fbig-buck-bunny.torrent"); // NOLINT -GURL torrent_url("https://webtorrent.io/torrents/big-buck-bunny.torrent"); +const GURL& GetMagnetUrl() { + static const GURL magnet_url( + "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c&dn=Big+Buck+Bunny&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fbig-buck-bunny.torrent"); // NOLINT + return magnet_url; +} + +const GURL& GetTorrentUrl() { + static const GURL torrent_url( + "https://webtorrent.io/torrents/big-buck-bunny.torrent"); + return torrent_url; +} } // namespace @@ -141,12 +150,12 @@ TEST_F(BraveWebTorrentNavigationThrottleUnitTest, web_contents_tester()->NavigateAndCommit(GURL("http://example.com")); content::RenderFrameHost* host = render_frame_host_tester(main_rfh())->AppendChild("child"); - content::MockNavigationHandle test_handle(torrent_url, host); + content::MockNavigationHandle test_handle(GetTorrentUrl(), host); test_handle.set_starting_site_instance(host->GetSiteInstance()); auto throttle = std::make_unique(&test_handle); EXPECT_EQ(NavigationThrottle::DEFER, throttle->WillStartRequest().action()) - << torrent_url; + << GetTorrentUrl(); } // Tests the case of loading a torrent without having the extension @@ -156,12 +165,12 @@ TEST_F(BraveWebTorrentNavigationThrottleUnitTest, web_contents_tester()->NavigateAndCommit(GURL("http://example.com")); content::RenderFrameHost* host = render_frame_host_tester(main_rfh())->AppendChild("child"); - content::MockNavigationHandle test_handle(magnet_url, host); + content::MockNavigationHandle test_handle(GetMagnetUrl(), host); test_handle.set_starting_site_instance(host->GetSiteInstance()); auto throttle = std::make_unique(&test_handle); EXPECT_EQ(NavigationThrottle::DEFER, throttle->WillStartRequest().action()) - << magnet_url; + << GetMagnetUrl(); } @@ -172,12 +181,12 @@ TEST_F(BraveWebTorrentNavigationThrottleUnitTest, WebTorrentUrlInstalled) { web_contents_tester()->NavigateAndCommit(GURL("http://example.com")); content::RenderFrameHost* host = render_frame_host_tester(main_rfh())->AppendChild("child"); - content::MockNavigationHandle test_handle(magnet_url, host); + content::MockNavigationHandle test_handle(GetMagnetUrl(), host); test_handle.set_starting_site_instance(host->GetSiteInstance()); auto throttle = std::make_unique(&test_handle); EXPECT_EQ(NavigationThrottle::PROCEED, throttle->WillStartRequest().action()) - << magnet_url; + << GetMagnetUrl(); } // Tests the case of loading a torrent when the WebTorrent is explicitly @@ -187,12 +196,12 @@ TEST_F(BraveWebTorrentNavigationThrottleUnitTest, WebTorrentDisabledByPref) { web_contents_tester()->NavigateAndCommit(GURL("http://example.com")); content::RenderFrameHost* host = render_frame_host_tester(main_rfh())->AppendChild("child"); - content::MockNavigationHandle test_handle(magnet_url, host); + content::MockNavigationHandle test_handle(GetMagnetUrl(), host); test_handle.set_starting_site_instance(host->GetSiteInstance()); auto throttle = std::make_unique(&test_handle); EXPECT_EQ(NavigationThrottle::PROCEED, - throttle->WillStartRequest().action()) << magnet_url; + throttle->WillStartRequest().action()) << GetMagnetUrl(); } } // namespace extensions diff --git a/browser/geolocation/brave_geolocation_permission_context.cc b/browser/geolocation/brave_geolocation_permission_context.cc deleted file mode 100644 index a637baac1185..000000000000 --- a/browser/geolocation/brave_geolocation_permission_context.cc +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "brave/browser/geolocation/brave_geolocation_permission_context.h" - -#include - -#include "brave/browser/profiles/profile_util.h" -#include "components/content_settings/core/common/content_settings.h" -#include "components/prefs/pref_service.h" -#include "brave/common/tor/pref_names.h" - -BraveGeolocationPermissionContext::BraveGeolocationPermissionContext( - Profile* profile) : GeolocationPermissionContext(profile) { -} - -BraveGeolocationPermissionContext::~BraveGeolocationPermissionContext() { -} - -void BraveGeolocationPermissionContext::DecidePermission( - content::WebContents* web_contents, - const permissions::PermissionRequestID& id, - const GURL& requesting_origin, - const GURL& embedding_origin, - bool user_gesture, - BrowserPermissionCallback callback) { - if (brave::IsTorProfile(profile())) { - std::move(callback).Run(ContentSetting::CONTENT_SETTING_BLOCK); - return; - } - - return GeolocationPermissionContext::DecidePermission( - web_contents, id, requesting_origin, embedding_origin, user_gesture, - std::move(callback)); -} diff --git a/browser/geolocation/brave_geolocation_permission_context.h b/browser/geolocation/brave_geolocation_permission_context.h deleted file mode 100644 index 24f480bfba02..000000000000 --- a/browser/geolocation/brave_geolocation_permission_context.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_H_ -#define BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_H_ - -#include "chrome/browser/geolocation/geolocation_permission_context.h" - -class BraveGeolocationPermissionContext : public GeolocationPermissionContext { - public: - explicit BraveGeolocationPermissionContext(Profile* profile); - ~BraveGeolocationPermissionContext() override; - - void DecidePermission(content::WebContents* web_contents, - const permissions::PermissionRequestID& id, - const GURL& requesting_origin, - const GURL& embedding_origin, - bool user_gesture, - BrowserPermissionCallback callback) override; - - private: - DISALLOW_COPY_AND_ASSIGN(BraveGeolocationPermissionContext); -}; - -#endif // BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_H_ diff --git a/browser/geolocation/brave_geolocation_permission_context_delegate.cc b/browser/geolocation/brave_geolocation_permission_context_delegate.cc new file mode 100644 index 000000000000..1e2d70214b8d --- /dev/null +++ b/browser/geolocation/brave_geolocation_permission_context_delegate.cc @@ -0,0 +1,40 @@ +/* Copyright (c) 2019 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "brave/browser/geolocation/brave_geolocation_permission_context_delegate.h" + +#include + +#include "brave/browser/profiles/profile_util.h" +#include "chrome/browser/profiles/profile.h" +#include "components/content_settings/core/common/content_settings.h" +#include "components/permissions/permission_request_id.h" +#include "content/public/browser/web_contents.h" +#include "url/gurl.h" + +BraveGeolocationPermissionContextDelegate:: + BraveGeolocationPermissionContextDelegate( + content::BrowserContext* browser_context) + : GeolocationPermissionContextDelegate(browser_context), + profile_(Profile::FromBrowserContext(browser_context)) {} + +BraveGeolocationPermissionContextDelegate:: + ~BraveGeolocationPermissionContextDelegate() {} + +bool BraveGeolocationPermissionContextDelegate::DecidePermission( + content::WebContents* web_contents, + const permissions::PermissionRequestID& id, + const GURL& requesting_origin, + bool user_gesture, + permissions::BrowserPermissionCallback* callback, + permissions::GeolocationPermissionContext* context) { + if (brave::IsTorProfile(profile_)) { + std::move(*callback).Run(ContentSetting::CONTENT_SETTING_BLOCK); + return true; + } + + return GeolocationPermissionContextDelegate::DecidePermission( + web_contents, id, requesting_origin, user_gesture, callback, context); +} diff --git a/browser/geolocation/brave_geolocation_permission_context_delegate.h b/browser/geolocation/brave_geolocation_permission_context_delegate.h new file mode 100644 index 000000000000..4a42a39f0d56 --- /dev/null +++ b/browser/geolocation/brave_geolocation_permission_context_delegate.h @@ -0,0 +1,33 @@ +/* Copyright (c) 2019 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_ +#define BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_ + +#include "chrome/browser/geolocation/geolocation_permission_context_delegate.h" + +class Profile; + +class BraveGeolocationPermissionContextDelegate + : public GeolocationPermissionContextDelegate { + public: + explicit BraveGeolocationPermissionContextDelegate( + content::BrowserContext* browser_context); + ~BraveGeolocationPermissionContextDelegate() override; + + bool DecidePermission( + content::WebContents* web_contents, + const permissions::PermissionRequestID& id, + const GURL& requesting_origin, + bool user_gesture, + permissions::BrowserPermissionCallback* callback, + permissions::GeolocationPermissionContext* context) override; + + private: + Profile* profile_; + DISALLOW_COPY_AND_ASSIGN(BraveGeolocationPermissionContextDelegate); +}; + +#endif // BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_ diff --git a/browser/net/BUILD.gn b/browser/net/BUILD.gn index fb316fcbdfec..6ffc9be77e35 100644 --- a/browser/net/BUILD.gn +++ b/browser/net/BUILD.gn @@ -64,6 +64,7 @@ source_set("net") { "//net", "//services/network/public/cpp", "//services/network/public/mojom", + "//third_party/blink/public/mojom:mojom_platform_headers", "//third_party/re2", "//url", ] diff --git a/browser/net/brave_ad_block_tp_network_delegate_helper.cc b/browser/net/brave_ad_block_tp_network_delegate_helper.cc index 9ea0d2295c62..d12d67cb92d1 100644 --- a/browser/net/brave_ad_block_tp_network_delegate_helper.cc +++ b/browser/net/brave_ad_block_tp_network_delegate_helper.cc @@ -25,8 +25,6 @@ #include "extensions/common/url_pattern.h" #include "ui/base/resource/resource_bundle.h" -using content::ResourceType; - namespace brave { void ShouldBlockAdOnTaskRunner(std::shared_ptr ctx) { diff --git a/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc b/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc index 3471830f2d08..fe72320b9f9c 100644 --- a/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc +++ b/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc @@ -7,6 +7,7 @@ #include "brave/common/brave_paths.h" #include "brave/components/brave_shields/common/brave_shield_constants.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/common/chrome_paths.h" diff --git a/browser/net/brave_proxying_web_socket.cc b/browser/net/brave_proxying_web_socket.cc index bb1c0958b437..dba8258953c2 100644 --- a/browser/net/brave_proxying_web_socket.cc +++ b/browser/net/brave_proxying_web_socket.cc @@ -183,13 +183,14 @@ void BraveProxyingWebSocket::OnConnectionEstablished( mojo::PendingRemote websocket, mojo::PendingReceiver client_receiver, network::mojom::WebSocketHandshakeResponsePtr response, - mojo::ScopedDataPipeConsumerHandle readable) { + mojo::ScopedDataPipeConsumerHandle readable, + mojo::ScopedDataPipeProducerHandle writable) { DCHECK(forwarding_handshake_client_); DCHECK(!is_done_); remote_endpoint_ = response->remote_endpoint; forwarding_handshake_client_->OnConnectionEstablished( std::move(websocket), std::move(client_receiver), std::move(response), - std::move(readable)); + std::move(readable), std::move(writable)); OnError(net::ERR_FAILED); } diff --git a/browser/net/brave_proxying_web_socket.h b/browser/net/brave_proxying_web_socket.h index 43b47677961e..564f05dd01e6 100644 --- a/browser/net/brave_proxying_web_socket.h +++ b/browser/net/brave_proxying_web_socket.h @@ -80,7 +80,8 @@ class BraveProxyingWebSocket : public network::mojom::WebSocketHandshakeClient, mojo::PendingRemote websocket, mojo::PendingReceiver client_receiver, network::mojom::WebSocketHandshakeResponsePtr response, - mojo::ScopedDataPipeConsumerHandle readable) override; + mojo::ScopedDataPipeConsumerHandle readable, + mojo::ScopedDataPipeProducerHandle writable) override; // network::mojom::AuthenticationHandler method: void OnAuthRequired(const net::AuthChallengeInfo& auth_info, diff --git a/browser/net/url_context.cc b/browser/net/url_context.cc index d298ec698b01..a1f012bd4692 100644 --- a/browser/net/url_context.cc +++ b/browser/net/url_context.cc @@ -60,7 +60,7 @@ void BraveRequestInfo::FillCTX(const network::ResourceRequest& request, ctx->referrer_policy = request.referrer_policy; ctx->resource_type = - static_cast(request.resource_type); + static_cast(request.resource_type); ctx->is_webtorrent_disabled = #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT) diff --git a/browser/net/url_context.h b/browser/net/url_context.h index f5c7cf622745..217ec9acaf55 100644 --- a/browser/net/url_context.h +++ b/browser/net/url_context.h @@ -10,8 +10,8 @@ #include #include -#include "content/public/common/resource_type.h" #include "net/url_request/url_request.h" +#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" #include "url/gurl.h" class BraveRequestHandler; @@ -96,9 +96,9 @@ struct BraveRequestInfo { // can properly detect that the info couldn't be obtained. // TODO(iefremov): Replace with something like |WebRequestResourceType| to // distinguish WebSockets. - static constexpr content::ResourceType kInvalidResourceType = - static_cast(-1); - content::ResourceType resource_type = kInvalidResourceType; + static constexpr blink::mojom::ResourceType kInvalidResourceType = + static_cast(-1); + blink::mojom::ResourceType resource_type = kInvalidResourceType; std::string upload_data; diff --git a/browser/permissions/BUILD.gn b/browser/permissions/BUILD.gn deleted file mode 100644 index dbf9e0e7a8e7..000000000000 --- a/browser/permissions/BUILD.gn +++ /dev/null @@ -1,14 +0,0 @@ -import("//build/config/features.gni") - -source_set("permissions") { - sources = [ - "brave_permission_manager.cc", - "brave_permission_manager.h", - "brave_permission_manager_factory.cc", - "brave_permission_manager_factory.h", - ] - - deps = [ - "//content/public/browser", - ] -} diff --git a/browser/permissions/brave_permission_manager.cc b/browser/permissions/brave_permission_manager.cc deleted file mode 100644 index 4eb5f917182b..000000000000 --- a/browser/permissions/brave_permission_manager.cc +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "brave/browser/permissions/brave_permission_manager.h" - -#include - -#include "brave/browser/autoplay/autoplay_permission_context.h" -#include "components/content_settings/core/common/content_settings_types.h" - -BravePermissionManager::BravePermissionManager(Profile* profile) - : PermissionManager(profile) { - permission_contexts_[ContentSettingsType::AUTOPLAY] = - std::make_unique(profile); -} diff --git a/browser/permissions/brave_permission_manager.h b/browser/permissions/brave_permission_manager.h deleted file mode 100644 index f6990690085f..000000000000 --- a/browser/permissions/brave_permission_manager.h +++ /dev/null @@ -1,18 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_ -#define BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_ - -#include "chrome/browser/permissions/permission_manager.h" - -class BravePermissionManager : public PermissionManager { - public: - explicit BravePermissionManager(Profile* profile); - - private: - DISALLOW_COPY_AND_ASSIGN(BravePermissionManager); -}; - -#endif // BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_ diff --git a/browser/permissions/brave_permission_manager_factory.cc b/browser/permissions/brave_permission_manager_factory.cc deleted file mode 100644 index f84e491fcab9..000000000000 --- a/browser/permissions/brave_permission_manager_factory.cc +++ /dev/null @@ -1,34 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "brave/browser/permissions/brave_permission_manager_factory.h" - -#include "brave/browser/permissions/brave_permission_manager.h" -#include "chrome/browser/permissions/permission_manager.h" -#include "chrome/browser/permissions/permission_manager.h" -#include "chrome/browser/profiles/profile.h" - -// static -PermissionManager* -BravePermissionManagerFactory::GetForProfile(Profile* profile) { - return static_cast( - GetInstance()->GetServiceForBrowserContext(profile, true)); -} - -// static -BravePermissionManagerFactory* BravePermissionManagerFactory::GetInstance() { - return base::Singleton::get(); -} - -BravePermissionManagerFactory::BravePermissionManagerFactory() - : PermissionManagerFactory() { -} - -BravePermissionManagerFactory::~BravePermissionManagerFactory() { -} - -KeyedService* BravePermissionManagerFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { - return new BravePermissionManager(Profile::FromBrowserContext(context)); -} diff --git a/browser/permissions/brave_permission_manager_factory.h b/browser/permissions/brave_permission_manager_factory.h deleted file mode 100644 index 53e7092be569..000000000000 --- a/browser/permissions/brave_permission_manager_factory.h +++ /dev/null @@ -1,28 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_FACTORR_H_ -#define BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_FACTORR_H_ - -#include "chrome/browser/permissions/permission_manager_factory.h" - -class BravePermissionManagerFactory : public PermissionManagerFactory { - public: - static PermissionManager* GetForProfile(Profile* profile); - static BravePermissionManagerFactory* GetInstance(); - - private: - friend struct base::DefaultSingletonTraits; - - BravePermissionManagerFactory(); - ~BravePermissionManagerFactory() override; - - // BrowserContextKeyedBaseFactory methods: - KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const override; - - DISALLOW_COPY_AND_ASSIGN(BravePermissionManagerFactory); -}; - -#endif // BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_FACTORR_H_ diff --git a/browser/profiles/brave_profile_manager.cc b/browser/profiles/brave_profile_manager.cc index 8fc5f59739ff..0f4f7ac55ed4 100644 --- a/browser/profiles/brave_profile_manager.cc +++ b/browser/profiles/brave_profile_manager.cc @@ -10,6 +10,7 @@ #include #include "base/metrics/histogram_macros.h" +#include "brave/browser/brave_rewards/rewards_service_factory.h" #include "brave/browser/profiles/profile_util.h" #include "brave/browser/tor/buildflags.h" #include "brave/browser/tor/tor_profile_service.h" @@ -19,7 +20,6 @@ #include "brave/common/tor/pref_names.h" #include "brave/common/tor/tor_constants.h" #include "brave/components/brave_ads/browser/ads_service_factory.h" -#include "brave/browser/brave_rewards/rewards_service_factory.h" #include "brave/components/brave_shields/browser/ad_block_regional_service.h" #include "brave/components/brave_shields/browser/ad_block_service.h" #include "brave/components/brave_shields/browser/brave_shields_util.h" @@ -141,6 +141,8 @@ std::string BraveProfileManager::GetLastUsedProfileName() { void BraveProfileManager::DoFinalInitForServices(Profile* profile, bool go_off_the_record) { ProfileManager::DoFinalInitForServices(profile, go_off_the_record); + if (!do_final_services_init_) + return; brave_ads::AdsServiceFactory::GetForProfile(profile); brave_rewards::RewardsServiceFactory::GetForProfile(profile); #if BUILDFLAG(BRAVE_WALLET_ENABLED) @@ -154,6 +156,20 @@ void BraveProfileManager::DoFinalInitForServices(Profile* profile, #endif } +bool BraveProfileManager::IsAllowedProfilePath( + const base::FilePath& path) const { + // Chromium only allows profiles to be created in the user_data_dir, but we + // want to also be able to create profile in subfolders of user_data_dir. + return ProfileManager::IsAllowedProfilePath(path) || + user_data_dir().IsParent(path.DirName()); +} + +void BraveProfileManager::AddProfileToStorage(Profile* profile) { + if (brave::IsTorProfile(profile)) + return; + ProfileManager::AddProfileToStorage(profile); +} + void BraveProfileManager::OnProfileCreated(Profile* profile, bool success, bool is_new_profile) { @@ -164,13 +180,6 @@ void BraveProfileManager::OnProfileCreated(Profile* profile, #if BUILDFLAG(ENABLE_TOR) if (brave::IsTorProfile(profile)) { - ProfileAttributesEntry* entry; - ProfileAttributesStorage& storage = GetProfileAttributesStorage(); - if (storage.GetProfileAttributesWithPath(profile->GetPath(), &entry)) { - profile->GetPrefs()->SetBoolean(prefs::kForceEphemeralProfiles, true); - entry->SetIsEphemeral(true); - } - #if BUILDFLAG(ENABLE_EXTENSIONS) // This is added in addition to our AreExtensionsDisabled override in // brave_extensions_browser_client_impl because there were extension @@ -178,7 +187,10 @@ void BraveProfileManager::OnProfileCreated(Profile* profile, // only. extensions::ExtensionService* extension_service = extensions::ExtensionSystem::Get(profile)->extension_service(); - extension_service->BlockAllExtensions(); + // In tests, BraveProfileManagerWithoutInit is used, so extension_service + // won't be there. + if (extension_service) + extension_service->BlockAllExtensions(); #endif // We need to wait until OnProfileCreated to @@ -239,3 +251,9 @@ void BraveProfileManager::Observe(int type, } } } + +BraveProfileManagerWithoutInit::BraveProfileManagerWithoutInit( + const base::FilePath& user_data_dir) + : BraveProfileManager(user_data_dir) { + set_do_final_services_init(false); +} diff --git a/browser/profiles/brave_profile_manager.h b/browser/profiles/brave_profile_manager.h index 934676e571cf..eee16185fa7d 100644 --- a/browser/profiles/brave_profile_manager.h +++ b/browser/profiles/brave_profile_manager.h @@ -23,6 +23,8 @@ class BraveProfileManager : public ProfileManager { void InitProfileUserPrefs(Profile* profile) override; std::string GetLastUsedProfileName() override; void SetNonPersonalProfilePrefs(Profile* profile) override; + bool IsAllowedProfilePath(const base::FilePath& path) const override; + void AddProfileToStorage(Profile* profile) override; void OnProfileCreated(Profile* profile, bool success, @@ -41,4 +43,12 @@ class BraveProfileManager : public ProfileManager { DISALLOW_COPY_AND_ASSIGN(BraveProfileManager); }; +class BraveProfileManagerWithoutInit : public BraveProfileManager { + public: + explicit BraveProfileManagerWithoutInit(const base::FilePath& user_data_dir); + + private: + DISALLOW_COPY_AND_ASSIGN(BraveProfileManagerWithoutInit); +}; + #endif // BRAVE_BROWSER_PROFILES_BRAVE_PROFILE_MANAGER_H_ diff --git a/browser/profiles/brave_profile_manager_unittest.cc b/browser/profiles/brave_profile_manager_unittest.cc index 4b5da1940a07..04744562026b 100644 --- a/browser/profiles/brave_profile_manager_unittest.cc +++ b/browser/profiles/brave_profile_manager_unittest.cc @@ -238,7 +238,6 @@ TEST_F(BraveProfileManagerTest, NoWebtorrentInTorProfile) { } TEST_F(BraveProfileManagerTest, ProxyConfigMonitorInTorProfile) { - ScopedTorLaunchPreventerForTest prevent_tor_process; ProfileManager* profile_manager = g_browser_process->profile_manager(); base::FilePath dest_path = temp_dir_.GetPath().AppendASCII(TestingProfile::kTestUserProfileDir); diff --git a/browser/profiles/tor_unittest_profile_manager.h b/browser/profiles/tor_unittest_profile_manager.h index 0c77e4214c2a..1a8d8161688c 100644 --- a/browser/profiles/tor_unittest_profile_manager.h +++ b/browser/profiles/tor_unittest_profile_manager.h @@ -8,12 +8,12 @@ #include -#include "chrome/browser/profiles/profile_manager.h" +#include "brave/browser/profiles/brave_profile_manager.h" -class TorUnittestProfileManager : public ProfileManagerWithoutInit { +class TorUnittestProfileManager : public BraveProfileManagerWithoutInit { public: explicit TorUnittestProfileManager(const base::FilePath& user_data_dir) - : ProfileManagerWithoutInit(user_data_dir) {} + : BraveProfileManagerWithoutInit(user_data_dir) {} ~TorUnittestProfileManager() override = default; protected: diff --git a/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc b/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc index fd06ba60bdba..2bc680cf9c6e 100644 --- a/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc +++ b/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc @@ -1,4 +1,5 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -14,7 +15,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "components/prefs/pref_service.h" #include "components/spellcheck/browser/pref_names.h" -#include "content/public/common/context_menu_params.h" +#include "content/public/browser/context_menu_params.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -40,7 +41,7 @@ class BraveSpellingMenuObserverTest : public InProcessBrowserTest { observer_.reset(new SpellingMenuObserver(menu_.get())); menu_->SetObserver(observer_.get()); // Uncomment to print the menu to standard output for each test. - //menu_->EnablePrintMenu(); + // menu_->EnablePrintMenu(); } void InitMenu(const char* word, const char* suggestion) { diff --git a/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc b/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc index 733af2f6cbb9..9fb49b96c778 100644 --- a/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc +++ b/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc @@ -17,7 +17,7 @@ #include "components/language/core/browser/pref_names.h" #include "components/prefs/pref_service.h" #include "components/spellcheck/browser/pref_names.h" -#include "content/public/common/context_menu_params.h" +#include "content/public/browser/context_menu_params.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/browser/resources/extensions/BUILD.gn b/browser/resources/extensions/BUILD.gn index 45605475d8f3..8693d25ef5c5 100644 --- a/browser/resources/extensions/BUILD.gn +++ b/browser/resources/extensions/BUILD.gn @@ -7,7 +7,7 @@ grit("resources") { source = "extensions_resources.grd" # The .grd contains references to generated files. - source_is_generated = true + enable_input_discovery_for_gn_analyze = true grit_flags = [ "-E", "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), diff --git a/browser/resources/settings/BUILD.gn b/browser/resources/settings/BUILD.gn index 3cda4e79901b..d4a81764db2a 100644 --- a/browser/resources/settings/BUILD.gn +++ b/browser/resources/settings/BUILD.gn @@ -8,13 +8,19 @@ import("//tools/grit/grit_rule.gni") grit("resources") { source = "settings_resources.grd" + grit_flags = [ + "-E", + "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), + ] + + deps = [ ":polymer3_elements" ] defines = [ "is_release_channel=$is_release_channel", "enable_tor=$enable_tor", "enable_brave_wayback_machine=$enable_brave_wayback_machine", ] - source_is_generated = optimize_webui + enable_input_discovery_for_gn_analyze = optimize_webui outputs = [ "grit/brave_settings_resources.h", @@ -60,3 +66,16 @@ if (optimize_webui) { ] } } + +group("polymer3_elements") { + public_deps = [ + # Sub-folder targets + "brave_appearance_page:polymer3_elements", + "brave_privacy_page:polymer3_elements", + "default_brave_shields_page:polymer3_elements", + "social_blocking_page:polymer3_elements", + # TODO(petemill): Add Local targets (e.g. brave_settings_overrides) + # when settings is rendered fully with ES Modules / polymer3, e.g.: + # ":modulize", + ] +} diff --git a/browser/resources/settings/brave_appearance_page/BUILD.gn b/browser/resources/settings/brave_appearance_page/BUILD.gn new file mode 100644 index 000000000000..1027c7a5b915 --- /dev/null +++ b/browser/resources/settings/brave_appearance_page/BUILD.gn @@ -0,0 +1,181 @@ +# Copyright (c) 2020 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# you can obtain one at http://mozilla.org/MPL/2.0/. + +import("//third_party/closure_compiler/compile_js.gni") +import("//tools/polymer/polymer.gni") +import("//ui/webui/resources/tools/js_modulizer.gni") +import("//chrome/browser/resources/settings/settings.gni") + +js_type_check("closure_compile") { + deps = [ + ":brave_appearance_browser_proxy", + ":brave_theme", + ":super_referral", + ":toolbar" + ] +} + +js_library("brave_appearance_browser_proxy") { + deps = [ + "//ui/webui/resources/js:cr", + ] + externs_list = [ + "$externs_path/chrome_send.js", + "$externs_path/management.js", + ] +} + +js_library("brave_theme") { + deps = [ + ":brave_appearance_browser_proxy", + "//chrome/browser/resources/settings:route", + "//chrome/browser/resources/settings:router", + "//ui/webui/resources/js:cr", + "//ui/webui/resources/js:load_time_data", + "//ui/webui/resources/js:web_ui_listener_behavior", + ] + externs_list = [ + "$externs_path/settings_private.js", + ] +} + +js_library("super_referral") { + deps = [ + ":brave_appearance_browser_proxy", + "//chrome/browser/resources/settings:route", + "//chrome/browser/resources/settings:router", + "//ui/webui/resources/js:assert", + "//ui/webui/resources/js:cr", + "//ui/webui/resources/js:i18n_behavior", + "//ui/webui/resources/js:load_time_data", + ] + externs_list = [ + "$externs_path/settings_private.js", + ] +} + +js_library("toolbar") { + externs_list = [ + "$externs_path/settings_private.js", + ] +} + + +js_type_check("closure_compile_module") { + is_polymer3 = true + deps = [ + ":brave_appearance_browser_proxy.m", + ":brave_theme.m", + ":super_referral.m", + ":toolbar.m", + ] +} + +js_library("brave_appearance_browser_proxy.m") { + sources = [ "$root_gen_dir/brave/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.m.js" ] + deps = [ + "//ui/webui/resources/js:cr.m", + ] + externs_list = [ + "$externs_path/chrome_send.js", + "$externs_path/management.js", + ] + extra_deps = [ ":brave_appearance_browser_proxy_module" ] +} + +js_library("brave_theme.m") { + deps = [ + ":brave_appearance_browser_proxy.m", + "//chrome/browser/resources/settings:route.m", + "//chrome/browser/resources/settings:router.m", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:load_time_data.m", + "//ui/webui/resources/js:web_ui_listener_behavior.m", + ] + externs_list = [ + "$externs_path/settings_private.js", + ] + extra_deps = [ + ":brave_theme_module", + ] +} + +js_library("super_referral.m") { + deps = [ + ":brave_appearance_browser_proxy.m", + "//chrome/browser/resources/settings:route.m", + "//chrome/browser/resources/settings:router.m", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:i18n_behavior.m", + "//ui/webui/resources/js:load_time_data.m", + ] + externs_list = [ + "$externs_path/settings_private.js", + ] + extra_deps = [ + ":super_referral_module" + ] +} + +js_library("toolbar.m") { + externs_list = [ + "$externs_path/settings_private.js", + ] + extra_deps = [ + ":toolbar_module" + ] +} + + +# make modules +group("polymer3_elements") { + public_deps = [ + ":brave_theme_module", + ":super_referral_module", + ":toolbar_module", + ":brave_appearance_browser_proxy_module", + ] +} + +polymer_modulizer("brave_theme") { + js_file = "brave_theme.js" + html_file = "brave_theme.html" + html_type = "dom-module" + auto_imports = settings_auto_imports + [ + "ui/webui/resources/html/assert.html|assert", + "chrome/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.html|BraveAppearanceBrowserProxy, BraveAppearanceBrowserProxyImpl", + "chrome/browser/resources/settings/appearance_page/brave_appearance_browser_proxy.html|AppearanceBrowserProxy, AppearanceBrowserProxyImpl", + "chrome/browser/resources/settings/route.html|routes", + "chrome/browser/resources/settings/router.html|Router", + ] + namespace_rewrites = settings_namespace_rewrites +} + +polymer_modulizer("super_referral") { + js_file = "super_referral.js" + html_file = "super_referral.html" + html_type = "dom-module" + auto_imports = settings_auto_imports + [ + "ui/webui/resources/html/assert.html|assert", + "chrome/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.html|BraveAppearanceBrowserProxy, BraveAppearanceBrowserProxyImpl", + "chrome/browser/resources/settings/appearance_page/brave_appearance_browser_proxy.html|AppearanceBrowserProxy, AppearanceBrowserProxyImpl", + ] + namespace_rewrites = settings_namespace_rewrites +} + +polymer_modulizer("toolbar") { + js_file = "toolbar.js" + html_file = "toolbar.html" + html_type = "dom-module" + auto_imports = settings_auto_imports + namespace_rewrites = settings_namespace_rewrites +} + +js_modulizer("brave_appearance_browser_proxy_module") { + input_files = [ + "brave_appearance_browser_proxy.js", + ] + namespace_rewrites = settings_namespace_rewrites +} diff --git a/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.js b/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.js index cdeef9009659..d54762b1d4c0 100644 --- a/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.js +++ b/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.js @@ -37,6 +37,7 @@ cr.define('settings', function() { cr.addSingletonGetter(BraveAppearanceBrowserProxyImpl); + // #cr_define_end return { BraveAppearanceBrowserProxy: BraveAppearanceBrowserProxy, BraveAppearanceBrowserProxyImpl: BraveAppearanceBrowserProxyImpl, diff --git a/browser/resources/settings/brave_appearance_page/brave_theme.html b/browser/resources/settings/brave_appearance_page/brave_theme.html new file mode 100644 index 000000000000..19f9e5e6f112 --- /dev/null +++ b/browser/resources/settings/brave_appearance_page/brave_theme.html @@ -0,0 +1,33 @@ + + + + + + + + + + + + diff --git a/browser/resources/settings/brave_appearance_page/brave_theme.js b/browser/resources/settings/brave_appearance_page/brave_theme.js new file mode 100644 index 000000000000..5090f2aade50 --- /dev/null +++ b/browser/resources/settings/brave_appearance_page/brave_theme.js @@ -0,0 +1,75 @@ +// Copyright (c) 2020 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// you can obtain one at http://mozilla.org/MPL/2.0/. + +(function() { + +/** + * 'settings-brave-appearance-theme' is the settings page area containing + * brave's appearance related settings that located at the top of appearance + * area. + */ +Polymer({ + is: 'settings-brave-appearance-theme', + + behaviors: [ + WebUIListenerBehavior, + ], + + properties: { + braveThemeList_: Array, + braveThemeType_: Number, + }, + + /** @private {?settings.BraveAppearanceBrowserProxy} */ + browserProxy_: null, + + observers: [ + 'updateSelected_(braveThemeType_, braveThemeList_)', + ], + + /** @override */ + created: function() { + this.browserProxy_ = settings.BraveAppearanceBrowserProxyImpl.getInstance(); + }, + + /** @override */ + ready: function() { + this.addWebUIListener('brave-theme-type-changed', (type) => { + this.braveThemeType_ = type; + }) + this.browserProxy_.getBraveThemeList().then(list => { + this.braveThemeList_ = JSON.parse(list); + }) + this.browserProxy_.getBraveThemeType().then(type => { + this.braveThemeType_ = type; + }) + }, + + onBraveThemeTypeChange_: function() { + this.browserProxy_.setBraveThemeType(Number(this.$.braveThemeType.value)); + }, + + braveThemeTypeEqual_: function(theme1, theme2) { + return theme1 === theme2; + }, + + onThemeTap_: function() { + settings.Router.getInstance().navigateTo(settings.routes.THEMES); + }, + + // Wait for the dom-repeat to populate the #value so the correct option gets selected. + updateSelected_: function() { + this.async(() => { + this.$.braveThemeType.value = this.braveThemeType_; + }); + }, + + useThemesSubPage_: function() { + return loadTimeData.getString('superReferralThemeName') !== ""; + } +}); + +})(); \ No newline at end of file diff --git a/browser/resources/settings/brave_appearance_page/brave_appearance_page.html b/browser/resources/settings/brave_appearance_page/super_referral.html similarity index 51% rename from browser/resources/settings/brave_appearance_page/brave_appearance_page.html rename to browser/resources/settings/brave_appearance_page/super_referral.html index f9493c81317d..50cebf5370b4 100644 --- a/browser/resources/settings/brave_appearance_page/brave_appearance_page.html +++ b/browser/resources/settings/brave_appearance_page/super_referral.html @@ -1,39 +1,7 @@ - - - - - - - - - - - - + - - - - + diff --git a/browser/resources/settings/brave_appearance_page/brave_appearance_page.js b/browser/resources/settings/brave_appearance_page/super_referral.js similarity index 75% rename from browser/resources/settings/brave_appearance_page/brave_appearance_page.js rename to browser/resources/settings/brave_appearance_page/super_referral.js index ddc64d1aef8a..b7fd40afb39a 100644 --- a/browser/resources/settings/brave_appearance_page/brave_appearance_page.js +++ b/browser/resources/settings/brave_appearance_page/super_referral.js @@ -1,84 +1,9 @@ -/* 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/. */ +// Copyright (c) 2020 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// you can obtain one at http://mozilla.org/MPL/2.0/. (function() { -'use strict'; - -/** - * 'settings-brave-appearance-theme' is the settings page area containing - * brave's appearance related settings that located at the top of appearance - * area. - */ -Polymer({ - is: 'settings-brave-appearance-theme', - - behaviors: [ - WebUIListenerBehavior, - ], - - properties: { - braveThemeList_: Array, - braveThemeType_: Number, - }, - - /** @private {?settings.BraveAppearanceBrowserProxy} */ - browserProxy_: null, - - observers: [ - 'updateSelected_(braveThemeType_, braveThemeList_)', - ], - - /** @override */ - created: function() { - this.browserProxy_ = settings.BraveAppearanceBrowserProxyImpl.getInstance(); - }, - - /** @override */ - ready: function() { - this.addWebUIListener('brave-theme-type-changed', (type) => { - this.braveThemeType_ = type; - }) - this.browserProxy_.getBraveThemeList().then(list => { - this.braveThemeList_ = JSON.parse(list); - }) - this.browserProxy_.getBraveThemeType().then(type => { - this.braveThemeType_ = type; - }) - }, - - onBraveThemeTypeChange_: function() { - this.browserProxy_.setBraveThemeType(Number(this.$.braveThemeType.value)); - }, - - braveThemeTypeEqual_: function(theme1, theme2) { - return theme1 === theme2; - }, - - onThemeTap_: function() { - settings.Router.getInstance().navigateTo(settings.routes.THEMES); - }, - - // Wait for the dom-repeat to populate the #value so the correct option gets selected. - updateSelected_: function() { - this.async(() => { - this.$.braveThemeType.value = this.braveThemeType_; - }); - }, - - useThemesSubPage_: function() { - return loadTimeData.getString('superReferralThemeName') !== ""; - } -}); - -/** - * 'settings-brave-appearance-toolbar' is the settings page area containing - * brave's appearance settings related to the toolbar. - */ -Polymer({ - is: 'settings-brave-appearance-toolbar', -}); /** * ID for autogenerated themes. Should match @@ -339,4 +264,5 @@ Polymer({ this.themeSublabel_ = this.i18n(i18nId); } }); -})(); + +})(); \ No newline at end of file diff --git a/browser/resources/settings/brave_appearance_page/toolbar.html b/browser/resources/settings/brave_appearance_page/toolbar.html new file mode 100644 index 000000000000..374753799775 --- /dev/null +++ b/browser/resources/settings/brave_appearance_page/toolbar.html @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/browser/resources/settings/brave_appearance_page/toolbar.js b/browser/resources/settings/brave_appearance_page/toolbar.js new file mode 100644 index 000000000000..3e24952324c3 --- /dev/null +++ b/browser/resources/settings/brave_appearance_page/toolbar.js @@ -0,0 +1,16 @@ +// Copyright (c) 2020 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// you can obtain one at http://mozilla.org/MPL/2.0/. + +(function() { + +/** + * 'settings-brave-appearance-toolbar' is the settings page area containing + * brave's appearance settings related to the toolbar. + */ +Polymer({ + is: 'settings-brave-appearance-toolbar', +}); + +})(); diff --git a/browser/resources/settings/brave_privacy_page/BUILD.gn b/browser/resources/settings/brave_privacy_page/BUILD.gn new file mode 100644 index 000000000000..324d755b61f0 --- /dev/null +++ b/browser/resources/settings/brave_privacy_page/BUILD.gn @@ -0,0 +1,35 @@ +# Copyright (c) 2020 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# you can obtain one at http://mozilla.org/MPL/2.0/. + +import("//third_party/closure_compiler/compile_js.gni") +import("//tools/polymer/polymer.gni") +import("//ui/webui/resources/tools/js_modulizer.gni") +import("//chrome/browser/resources/settings/settings.gni") + +# ES Module conversion from HTML Imports code + +group("polymer3_elements") { + public_deps = [ + ":brave_personalization_options_module", + ":brave_privacy_page_browser_proxy_module", + ] +} + +polymer_modulizer("brave_personalization_options") { + js_file = "brave_personalization_options.js" + html_file = "brave_personalization_options.html" + html_type = "dom-module" + auto_imports = settings_auto_imports + [ + "chrome/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.html|BravePrivacyBrowserProxy, BravePrivacyBrowserProxyImpl", + ] + namespace_rewrites = settings_namespace_rewrites +} + +js_modulizer("brave_privacy_page_browser_proxy_module") { + input_files = [ + "brave_privacy_page_browser_proxy.js", + ] + namespace_rewrites = settings_namespace_rewrites +} diff --git a/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.js b/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.js index 10d3e0c1ddd2..af696d97de52 100644 --- a/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.js +++ b/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.js @@ -71,6 +71,7 @@ cr.define('settings', function() { cr.addSingletonGetter(BravePrivacyBrowserProxyImpl); + // #cr_define_end return { BravePrivacyBrowserProxy: BravePrivacyBrowserProxy, BravePrivacyBrowserProxyImpl: BravePrivacyBrowserProxyImpl, diff --git a/browser/resources/settings/brave_settings_overrides.html b/browser/resources/settings/brave_settings_overrides.html index e76a847361e1..86d80b0119e4 100644 --- a/browser/resources/settings/brave_settings_overrides.html +++ b/browser/resources/settings/brave_settings_overrides.html @@ -3,12 +3,14 @@ + + - - diff --git a/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch b/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch index 20b547272f4d..1ec4d7dffb1f 100644 --- a/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch +++ b/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch @@ -1,21 +1,20 @@ diff --git a/chrome/browser/resources/settings/appearance_page/appearance_page.html b/chrome/browser/resources/settings/appearance_page/appearance_page.html -index bdbf90e2482d817ca0cfddb1fe5b0d7c1de58258..9bb5d2a70a62848821d5a2189ad0de096279a3c1 100644 +index fc68a42c1a6e349bbbba7170506cac1f250b25de..10e24bcc5ce584531ef367a4a94af9766f12fe7f 100644 --- a/chrome/browser/resources/settings/appearance_page/appearance_page.html +++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -18,6 +18,12 @@ +@@ -21,6 +21,11 @@ + -+ -+ -+ ++ ++ + + @@ -74,7 +74,7 @@ index 4bf9895408296493db9aaff1e9e3094786464cd7..8abb10b5d2eec14d7ac09e457b1a9c6e