diff --git a/browser/BUILD.gn b/browser/BUILD.gn index 06a3a4bfb58a..72546d934e67 100644 --- a/browser/BUILD.gn +++ b/browser/BUILD.gn @@ -176,6 +176,7 @@ source_set("browser_process") { "//content/public/browser", "//content/public/common", "//extensions/buildflags", + "//extensions/common:common_constants", "//brave/chromium_src:browser", "browsing_data", "themes", diff --git a/browser/brave_content_browser_client_browsertest.cc b/browser/brave_content_browser_client_browsertest.cc index de8ddd78f225..c2e5aeae2ee8 100644 --- a/browser/brave_content_browser_client_browsertest.cc +++ b/browser/brave_content_browser_client_browsertest.cc @@ -9,7 +9,6 @@ #include "base/strings/utf_string_conversions.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/common/brave_paths.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/components/brave_rewards/browser/buildflags/buildflags.h" #include "brave/components/brave_shields/common/brave_shield_constants.h" @@ -32,6 +31,7 @@ #include "content/public/test/test_navigation_observer.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" +#include "extensions/common/constants.h" #include "net/dns/mock_host_resolver.h" class BraveContentBrowserClientTest : public InProcessBrowserTest { diff --git a/browser/brave_content_browser_client_unittest.cc b/browser/brave_content_browser_client_unittest.cc index e8fb2b78d11c..0e640ec3d265 100644 --- a/browser/brave_content_browser_client_unittest.cc +++ b/browser/brave_content_browser_client_unittest.cc @@ -10,8 +10,8 @@ #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(ENABLE_EXTENSIONS) -#include "brave/common/extensions/extension_constants.h" #include "extensions/browser/extension_registry.h" +#include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #endif diff --git a/browser/brave_wallet/BUILD.gn b/browser/brave_wallet/BUILD.gn index 77c79f86fccc..50d7d1c3c149 100644 --- a/browser/brave_wallet/BUILD.gn +++ b/browser/brave_wallet/BUILD.gn @@ -17,5 +17,6 @@ source_set("brave_wallet") { "//components/pref_registry", "//components/prefs", "//extensions/browser", + "//extensions/common:common_constants", ] } diff --git a/browser/extensions/BUILD.gn b/browser/extensions/BUILD.gn index 7511cccfce94..ee0506738a08 100644 --- a/browser/extensions/BUILD.gn +++ b/browser/extensions/BUILD.gn @@ -110,7 +110,7 @@ source_set("extensions") { if (ntp_widget_utils_enabled) { deps += [ "//brave/components/ntp_widget_utils/browser", - ] + ] } if (ipfs_enabled) { diff --git a/browser/extensions/api/binance_api.cc b/browser/extensions/api/binance_api.cc index 8f4c5edb7e9c..bc6ab29e0314 100644 --- a/browser/extensions/api/binance_api.cc +++ b/browser/extensions/api/binance_api.cc @@ -14,7 +14,6 @@ #include "brave/browser/profiles/profile_util.h" #include "brave/common/extensions/api/binance.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/browser/binance/binance_service_factory.h" #include "brave/components/binance/browser/binance_service.h" @@ -26,6 +25,7 @@ #include "chrome/browser/profiles/profile.h" #include "components/prefs/pref_service.h" #include "extensions/browser/extension_util.h" +#include "extensions/common/constants.h" namespace { diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index c6919d812dc8..f4ed9573b510 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -16,7 +16,6 @@ #include "brave/browser/extensions/api/brave_action_api.h" #include "brave/browser/profiles/profile_util.h" #include "brave/common/extensions/api/brave_rewards.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/components/brave_ads/browser/ads_service.h" #include "brave/components/brave_ads/browser/ads_service_factory.h" #include "brave/components/brave_rewards/browser/rewards_service.h" @@ -26,6 +25,7 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/constants.h" using brave_ads::AdsService; using brave_ads::AdsServiceFactory; diff --git a/browser/extensions/api/brave_shields_api.cc b/browser/extensions/api/brave_shields_api.cc index 45b6fa50cfe6..d60cba83b024 100644 --- a/browser/extensions/api/brave_shields_api.cc +++ b/browser/extensions/api/brave_shields_api.cc @@ -12,7 +12,6 @@ #include "brave/browser/extensions/api/brave_action_api.h" #include "brave/browser/webcompat_reporter/webcompat_reporter_dialog.h" #include "brave/common/extensions/api/brave_shields.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/components/brave_shields/browser/ad_block_base_service.h" #include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h" #include "brave/components/brave_shields/browser/ad_block_regional_service_manager.h" @@ -30,6 +29,7 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_util.h" +#include "extensions/common/constants.h" using brave_shields::BraveShieldsWebContentsObserver; using brave_shields::ControlType; diff --git a/browser/extensions/api/brave_shields_api_browsertest.cc b/browser/extensions/api/brave_shields_api_browsertest.cc index 1024c4c9f683..5d4c82d9bc71 100644 --- a/browser/extensions/api/brave_shields_api_browsertest.cc +++ b/browser/extensions/api/brave_shields_api_browsertest.cc @@ -6,7 +6,6 @@ #include "base/path_service.h" #include "brave/browser/extensions/api/brave_shields_api.h" #include "brave/common/brave_paths.h" -#include "brave/common/extensions/extension_constants.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/extensions/api/content_settings/content_settings_api.h" @@ -25,6 +24,7 @@ #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/constants.h" #include "extensions/common/extension_builder.h" #include "net/dns/mock_host_resolver.h" diff --git a/browser/extensions/api/brave_wallet_api.cc b/browser/extensions/api/brave_wallet_api.cc index 957582a1b428..d45b154bc821 100644 --- a/browser/extensions/api/brave_wallet_api.cc +++ b/browser/extensions/api/brave_wallet_api.cc @@ -15,7 +15,6 @@ #include "brave/browser/profiles/profile_util.h" #include "brave/common/brave_wallet_constants.h" #include "brave/common/extensions/api/brave_wallet.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/grit/brave_generated_resources.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" @@ -26,6 +25,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_util.h" +#include "extensions/common/constants.h" #include "brave/browser/brave_wallet/brave_wallet_service_factory.h" #include "brave/components/brave_wallet/browser/brave_wallet_service.h" #include "ui/base/l10n/l10n_util.h" diff --git a/browser/extensions/api/brave_wallet_api_browsertest.cc b/browser/extensions/api/brave_wallet_api_browsertest.cc index 72981c2af648..17bf530aa973 100644 --- a/browser/extensions/api/brave_wallet_api_browsertest.cc +++ b/browser/extensions/api/brave_wallet_api_browsertest.cc @@ -8,7 +8,6 @@ #include "brave/browser/infobars/crypto_wallets_infobar_delegate.h" #include "brave/common/brave_paths.h" #include "brave/common/brave_wallet_constants.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" @@ -20,6 +19,7 @@ #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_registry.h" +#include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/test/extension_test_message_listener.h" diff --git a/browser/extensions/api/gemini_api.cc b/browser/extensions/api/gemini_api.cc index fd7df508f4f3..b9a088fad824 100644 --- a/browser/extensions/api/gemini_api.cc +++ b/browser/extensions/api/gemini_api.cc @@ -11,7 +11,6 @@ #include #include "brave/common/extensions/api/gemini.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/browser/gemini/gemini_service_factory.h" #include "brave/components/ntp_widget_utils/browser/ntp_widget_utils_region.h" #include "brave/components/gemini/browser/gemini_service.h" @@ -21,6 +20,7 @@ #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" #include "extensions/browser/extension_util.h" +#include "extensions/common/constants.h" namespace { diff --git a/browser/extensions/brave_component_loader.cc b/browser/extensions/brave_component_loader.cc index 783166e88a0b..cf04b727747d 100644 --- a/browser/extensions/brave_component_loader.cc +++ b/browser/extensions/brave_component_loader.cc @@ -13,7 +13,6 @@ #include "brave/browser/component_updater/brave_component_installer.h" #include "brave/common/brave_switches.h" #include "brave/common/brave_wallet_constants.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h" #include "brave/components/brave_extension/grit/brave_extension.h" @@ -31,6 +30,7 @@ #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" +#include "extensions/common/constants.h" namespace extensions { diff --git a/browser/extensions/brave_extension_management.cc b/browser/extensions/brave_extension_management.cc index 3717b93c110a..29f95ed66dae 100644 --- a/browser/extensions/brave_extension_management.cc +++ b/browser/extensions/brave_extension_management.cc @@ -9,7 +9,6 @@ #include "brave/browser/brave_browser_process_impl.h" #include "brave/browser/tor/buildflags.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/common/tor/pref_names.h" #include "brave/browser/extensions/brave_extension_provider.h" @@ -17,6 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "components/prefs/pref_service.h" #include "extensions/browser/extension_registry.h" +#include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_urls.h" diff --git a/browser/extensions/brave_extension_provider.cc b/browser/extensions/brave_extension_provider.cc index f37b7622bcfa..85f1777a6f99 100644 --- a/browser/extensions/brave_extension_provider.cc +++ b/browser/extensions/brave_extension_provider.cc @@ -11,10 +11,10 @@ #include "base/strings/utf_string_conversions.h" #include "brave/browser/brave_browser_process_impl.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" #include "brave/components/brave_component_updater/browser/extension_whitelist_service.h" #include "brave/grit/brave_generated_resources.h" +#include "extensions/common/constants.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/browser/extensions/brave_extension_service.cc b/browser/extensions/brave_extension_service.cc index d2dfab9547f1..e35702e403c7 100644 --- a/browser/extensions/brave_extension_service.cc +++ b/browser/extensions/brave_extension_service.cc @@ -9,11 +9,11 @@ #include "base/one_shot_event.h" #include "brave/browser/profiles/profile_util.h" -#include "brave/common/extensions/extension_constants.h" #include "chrome/browser/extensions/api/content_settings/content_settings_service.h" #include "chrome/browser/profiles/profile.h" #include "extensions/browser/extension_action.h" #include "extensions/browser/extension_action_manager.h" +#include "extensions/common/constants.h" namespace extensions { diff --git a/browser/extensions/brave_wallet_apitest.cc b/browser/extensions/brave_wallet_apitest.cc index 6fb679df40e4..f42b168e75b0 100644 --- a/browser/extensions/brave_wallet_apitest.cc +++ b/browser/extensions/brave_wallet_apitest.cc @@ -6,11 +6,11 @@ #include "base/path_service.h" #include "brave/common/brave_paths.h" #include "brave/common/brave_wallet_constants.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "chrome/browser/extensions/extension_apitest.h" #include "components/prefs/pref_service.h" #include "content/public/test/browser_test.h" +#include "extensions/common/constants.h" #include "extensions/test/result_catcher.h" namespace extensions { diff --git a/browser/extensions/brave_webtorrent_navigation_throttle.cc b/browser/extensions/brave_webtorrent_navigation_throttle.cc index 4d8f8ed84184..29b33fc66670 100644 --- a/browser/extensions/brave_webtorrent_navigation_throttle.cc +++ b/browser/extensions/brave_webtorrent_navigation_throttle.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "brave/browser/extensions/brave_component_loader.h" #include "brave/browser/profiles/profile_util.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/common/url_constants.h" #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" @@ -22,6 +21,7 @@ #include "content/public/common/url_constants.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" +#include "extensions/common/constants.h" #include "extensions/common/extension.h" #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT) diff --git a/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc b/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc index 9b06e80a90a4..988b1bf20659 100644 --- a/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc +++ b/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc @@ -13,7 +13,6 @@ #include "base/files/scoped_temp_dir.h" #include "brave/browser/profiles/brave_profile_manager.h" #include "brave/browser/profiles/profile_util.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/load_error_reporter.h" @@ -31,6 +30,7 @@ #include "content/public/test/test_renderer_host.h" #include "content/public/test/web_contents_tester.h" #include "extensions/browser/extension_system.h" +#include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/browser/infobars/BUILD.gn b/browser/infobars/BUILD.gn index 9b9c5971c6a8..c515edd03ba6 100644 --- a/browser/infobars/BUILD.gn +++ b/browser/infobars/BUILD.gn @@ -38,6 +38,7 @@ source_set("infobars") { "//brave/common:pref_names", "//brave/components/brave_wallet/browser:browser", "//components/user_prefs:user_prefs", + "//extensions/common:common_constants", ] } diff --git a/browser/infobars/crypto_wallets_infobar_delegate.cc b/browser/infobars/crypto_wallets_infobar_delegate.cc index bd1ee9ed0f2f..7e33bd7ca33f 100644 --- a/browser/infobars/crypto_wallets_infobar_delegate.cc +++ b/browser/infobars/crypto_wallets_infobar_delegate.cc @@ -11,7 +11,6 @@ #include "brave/browser/brave_wallet/brave_wallet_service_factory.h" #include "brave/browser/ui/brave_pages.h" #include "brave/common/brave_wallet_constants.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/common/url_constants.h" #include "brave/components/brave_wallet/browser/brave_wallet_service.h" @@ -25,6 +24,7 @@ #include "components/strings/grit/components_strings.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" +#include "extensions/common/constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/vector_icons.h" diff --git a/browser/net/brave_torrent_redirect_network_delegate_helper.cc b/browser/net/brave_torrent_redirect_network_delegate_helper.cc index 06a79001d99e..aa85b571ff88 100644 --- a/browser/net/brave_torrent_redirect_network_delegate_helper.cc +++ b/browser/net/brave_torrent_redirect_network_delegate_helper.cc @@ -10,7 +10,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/network_constants.h" #include "brave/components/brave_webtorrent/browser/webtorrent_util.h" #include "extensions/common/constants.h" diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index 2dc66562ac81..3fa4306e4c9e 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -317,6 +317,7 @@ source_set("ui") { "//chrome/browser/extensions", "//components/sessions", "//extensions/browser", + "//extensions/common:common_constants", ] } diff --git a/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.cc b/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.cc index d852521f1efc..4de55c696b8d 100644 --- a/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.cc +++ b/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.cc @@ -8,10 +8,10 @@ #include #include "base/strings/utf_string_conversions.h" -#include "brave/common/extensions/constants.h" #include "cc/paint/paint_flags.h" #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "chrome/grit/theme_resources.h" +#include "extensions/common/constants.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" @@ -22,8 +22,6 @@ #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/skia_paint_util.h" -using namespace brave_actions; // NOLINT - base::Optional BraveActionIconWithBadgeImageSource::GetCustomGraphicSize() { return kBraveActionGraphicSize; diff --git a/browser/ui/brave_actions/brave_action_view_controller.cc b/browser/ui/brave_actions/brave_action_view_controller.cc index f27323982878..c5411ed8acb4 100644 --- a/browser/ui/brave_actions/brave_action_view_controller.cc +++ b/browser/ui/brave_actions/brave_action_view_controller.cc @@ -11,7 +11,6 @@ #include "brave/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.h" #include "brave/browser/profiles/profile_util.h" -#include "brave/common/extensions/extension_constants.h" #include "chrome/browser/extensions/extension_view_host.h" #include "chrome/browser/extensions/extension_view_host_factory.h" #include "chrome/browser/profiles/profile.h" @@ -21,6 +20,7 @@ #include "components/sessions/content/session_tab_helper.h" #include "components/vector_icons/vector_icons.h" #include "extensions/browser/extension_action.h" +#include "extensions/common/constants.h" #include "ui/base/theme_provider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/canvas_image_source.h" diff --git a/browser/ui/toolbar/brave_location_bar_model_delegate.cc b/browser/ui/toolbar/brave_location_bar_model_delegate.cc index ac269e80e0f9..f373c1a4d67e 100644 --- a/browser/ui/toolbar/brave_location_bar_model_delegate.cc +++ b/browser/ui/toolbar/brave_location_bar_model_delegate.cc @@ -13,7 +13,7 @@ #include "extensions/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_EXTENSIONS) -#include "brave/common/extensions/extension_constants.h" +#include "extensions/common/constants.h" #endif BraveLocationBarModelDelegate::BraveLocationBarModelDelegate(Browser* browser) : diff --git a/browser/ui/toolbar/brave_location_bar_model_delegate_unittest.cc b/browser/ui/toolbar/brave_location_bar_model_delegate_unittest.cc index 5952730838a5..b3a36465155a 100644 --- a/browser/ui/toolbar/brave_location_bar_model_delegate_unittest.cc +++ b/browser/ui/toolbar/brave_location_bar_model_delegate_unittest.cc @@ -11,7 +11,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(ENABLE_EXTENSIONS) -#include "brave/common/extensions/extension_constants.h" +#include "extensions/common/constants.h" #endif using BraveLocationBarModelDelegateTest = testing::Test; diff --git a/browser/ui/toolbar/brave_toolbar_actions_model.cc b/browser/ui/toolbar/brave_toolbar_actions_model.cc index 95412c680fce..001a6f282438 100644 --- a/browser/ui/toolbar/brave_toolbar_actions_model.cc +++ b/browser/ui/toolbar/brave_toolbar_actions_model.cc @@ -4,8 +4,8 @@ #include "brave/browser/ui/toolbar/brave_toolbar_actions_model.h" -#include "brave/common/extensions/extension_constants.h" #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" +#include "extensions/common/constants.h" #include "extensions/common/extension.h" bool BraveToolbarActionsModel::ShouldAddExtension(const extensions::Extension* extension) { diff --git a/browser/ui/views/brave_actions/brave_action_view.cc b/browser/ui/views/brave_actions/brave_action_view.cc index fd18ae526d62..df097bf7e92a 100644 --- a/browser/ui/views/brave_actions/brave_action_view.cc +++ b/browser/ui/views/brave_actions/brave_action_view.cc @@ -7,12 +7,12 @@ #include -#include "brave/common/extensions/constants.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h" +#include "extensions/common/constants.h" #include "third_party/skia/include/core/SkPath.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" @@ -52,7 +52,7 @@ SkPath BraveActionView::GetHighlightPath() const { // making it inset so that the badge can show outside it in the // fake margin on the right that we are creating. SkPath path; - gfx::Insets highlight_insets(0, 0, 0, brave_actions::kBraveActionRightMargin); + gfx::Insets highlight_insets(0, 0, 0, kBraveActionRightMargin); gfx::Rect rect(size()); rect.Inset(highlight_insets); const int radii = ChromeLayoutProvider::Get()->GetCornerRadiusMetric( diff --git a/browser/ui/views/brave_actions/brave_actions_container.cc b/browser/ui/views/brave_actions/brave_actions_container.cc index bff15b7dec69..df7456356db3 100644 --- a/browser/ui/views/brave_actions/brave_actions_container.cc +++ b/browser/ui/views/brave_actions/brave_actions_container.cc @@ -17,8 +17,6 @@ #include "brave/browser/ui/views/brave_actions/brave_rewards_action_stub_view.h" #include "brave/browser/ui/views/rounded_separator.h" #include "brave/common/brave_switches.h" -#include "brave/common/extensions/constants.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/components/brave_rewards/browser/buildflags/buildflags.h" #include "brave/components/brave_rewards/common/pref_names.h" @@ -35,6 +33,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_observer.h" #include "extensions/browser/extension_system.h" +#include "extensions/common/constants.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/view.h" diff --git a/browser/ui/views/brave_actions/brave_actions_container_browsertest.cc b/browser/ui/views/brave_actions/brave_actions_container_browsertest.cc index 2f5623046e88..548ce564db0a 100644 --- a/browser/ui/views/brave_actions/brave_actions_container_browsertest.cc +++ b/browser/ui/views/brave_actions/brave_actions_container_browsertest.cc @@ -5,7 +5,6 @@ #include "brave/browser/ui/views/brave_actions/brave_actions_container.h" #include "brave/browser/ui/views/location_bar/brave_location_bar_view.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/components/brave_rewards/browser/buildflags/buildflags.h" #include "chrome/browser/browser_process.h" @@ -24,6 +23,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test.h" #include "content/public/test/test_utils.h" +#include "extensions/common/constants.h" #if BUILDFLAG(BRAVE_REWARDS_ENABLED) #include "brave/components/brave_rewards/common/pref_names.h" diff --git a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc index 0d32fd61d36a..6cd0240bef0e 100644 --- a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc +++ b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc @@ -10,7 +10,6 @@ #include #include "brave/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.h" // NOLINT -#include "brave/common/extensions/constants.h" #include "brave/components/brave_rewards/common/pref_names.h" #include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_extension_resources.h" // NOLINT #include "chrome/browser/profiles/profile.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h" #include "components/prefs/pref_service.h" +#include "extensions/common/constants.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/geometry/rect.h" @@ -70,8 +70,7 @@ BraveRewardsActionStubView::BraveRewardsActionStubView(Profile* profile, gfx::ImageSkia image; const SkBitmap bitmap = rb.GetImageNamed(IDR_BRAVE_REWARDS_ICON_64) .AsBitmap(); - float scale = static_cast(bitmap.width()) / - brave_actions::kBraveActionGraphicSize; + float scale = static_cast(bitmap.width()) / kBraveActionGraphicSize; image.AddRepresentation(gfx::ImageSkiaRep(bitmap, scale)); image_source->SetIcon(gfx::Image(image)); // Set text on badge @@ -106,7 +105,7 @@ SkPath BraveRewardsActionStubView::GetHighlightPath() const { // Set the highlight path for the toolbar button, // making it inset so that the badge can show outside it in the // fake margin on the right that we are creating. - gfx::Insets highlight_insets(0, 0, 0, brave_actions::kBraveActionRightMargin); + gfx::Insets highlight_insets(0, 0, 0, kBraveActionRightMargin); gfx::Rect rect(GetPreferredSize()); rect.Inset(highlight_insets); const int radii = ChromeLayoutProvider::Get()->GetCornerRadiusMetric( diff --git a/browser/ui/views/frame/brave_browser_view.cc b/browser/ui/views/frame/brave_browser_view.cc index 4184329c5e5f..a4ec88d9d1ac 100644 --- a/browser/ui/views/frame/brave_browser_view.cc +++ b/browser/ui/views/frame/brave_browser_view.cc @@ -16,8 +16,8 @@ #endif #if BUILDFLAG(ENABLE_BRAVE_TRANSLATE_EXTENSION) -#include "brave/common/extensions/extension_constants.h" #include "extensions/browser/extension_registry.h" +#include "extensions/common/constants.h" #endif void BraveBrowserView::SetStarredState(bool is_starred) { diff --git a/browser/ui/views/translate/brave_translate_icon_view.cc b/browser/ui/views/translate/brave_translate_icon_view.cc index 4adf2251ed18..401eb22c8b59 100644 --- a/browser/ui/views/translate/brave_translate_icon_view.cc +++ b/browser/ui/views/translate/brave_translate_icon_view.cc @@ -6,7 +6,6 @@ #include "brave/browser/ui/views/translate/brave_translate_icon_view.h" #include "chrome/browser/ui/browser.h" -#include "brave/common/extensions/extension_constants.h" #include "chrome/browser/extensions/webstore_install_with_prompt.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" @@ -14,6 +13,7 @@ #include "chrome/browser/ui/views/translate/translate_bubble_view.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" +#include "extensions/common/constants.h" BraveTranslateIconView::BraveTranslateIconView( CommandUpdater* command_updater, diff --git a/browser/ui/webui/settings/brave_default_extensions_handler.cc b/browser/ui/webui/settings/brave_default_extensions_handler.cc index 22b391017f1d..7f7b43b233ab 100644 --- a/browser/ui/webui/settings/brave_default_extensions_handler.cc +++ b/browser/ui/webui/settings/brave_default_extensions_handler.cc @@ -12,7 +12,6 @@ #include "brave/browser/brave_browser_process_impl.h" #include "brave/browser/extensions/brave_component_loader.h" #include "brave/browser/tor/buildflags.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources.h" #include "chrome/browser/about_flags.h" @@ -33,6 +32,7 @@ #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" +#include "extensions/common/constants.h" #include "extensions/common/feature_switch.h" #if BUILDFLAG(ENABLE_TOR) diff --git a/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc b/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc index 99868f42019c..055c0bcfc581 100644 --- a/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc +++ b/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc @@ -10,8 +10,8 @@ #include "chrome/browser/browser_process.h" #if !defined(OS_ANDROID) -#include "brave/common/extensions/extension_constants.h" #include "chrome/browser/component_updater/component_updater_utils.h" +#include "extensions/common/constants.h" #endif namespace component_updater { diff --git a/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc index d8f938f1062b..3af688fe65d0 100644 --- a/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc +++ b/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc @@ -9,9 +9,9 @@ #include "brave/browser/brave_browser_process_impl.h" #include "brave/browser/widevine/widevine_utils.h" -#include "brave/common/extensions/extension_constants.h" #include "chrome/browser/component_updater/component_updater_utils.h" #include "components/component_updater/component_updater_service.h" +#include "extensions/common/constants.h" namespace component_updater { diff --git a/chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc index 29c8310dd570..80f3e8f23b26 100644 --- a/chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc +++ b/chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc @@ -8,11 +8,11 @@ #undef IsComponentExtensionWhitelisted #include "base/stl_util.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/components/brave_extension/grit/brave_extension.h" -#include "components/grit/brave_components_resources.h" #include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_extension_resources.h" #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources.h" +#include "components/grit/brave_components_resources.h" +#include "extensions/common/constants.h" namespace extensions { diff --git a/chromium_src/chrome/browser/history/history_utils.cc b/chromium_src/chrome/browser/history/history_utils.cc index d5326ab9ea5b..001317beb84d 100644 --- a/chromium_src/chrome/browser/history/history_utils.cc +++ b/chromium_src/chrome/browser/history/history_utils.cc @@ -11,7 +11,7 @@ #include "extensions/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_EXTENSIONS) -#include "brave/common/extensions/extension_constants.h" +#include "extensions/common/constants.h" #endif bool CanAddURLToHistory(const GURL& url) { diff --git a/chromium_src/chrome/browser/sessions/session_common_utils.cc b/chromium_src/chrome/browser/sessions/session_common_utils.cc index 61057df4946c..308ac607194e 100644 --- a/chromium_src/chrome/browser/sessions/session_common_utils.cc +++ b/chromium_src/chrome/browser/sessions/session_common_utils.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/common/extensions/extension_constants.h" +#include "extensions/common/constants.h" #include "url/gurl.h" #define ShouldTrackURLForRestore ShouldTrackURLForRestore_ChromiumImpl diff --git a/chromium_src/chrome/browser/ui/views/extensions/extension_popup.cc b/chromium_src/chrome/browser/ui/views/extensions/extension_popup.cc index 0acdeaf25094..8cca1b23af3a 100644 --- a/chromium_src/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chromium_src/chrome/browser/ui/views/extensions/extension_popup.cc @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "brave/common/extensions/extension_constants.h" #include "chrome/browser/extensions/extension_view_host.h" +#include "extensions/common/constants.h" namespace { bool IsBraveExtension(extensions::ExtensionViewHost* host) { diff --git a/chromium_src/extensions/browser/extension_action_manager.cc b/chromium_src/extensions/browser/extension_action_manager.cc index abd96f4f81ef..56cf9b54d525 100644 --- a/chromium_src/extensions/browser/extension_action_manager.cc +++ b/chromium_src/extensions/browser/extension_action_manager.cc @@ -3,15 +3,14 @@ // 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/common/extensions/constants.h" -#include "brave/common/extensions/extension_constants.h" +#include "extensions/common/constants.h" // Avoid a jump from small image to large image when the non-default // image is set. #define BRAVE_GET_EXTENSION_ACTION \ (extension.id() == brave_rewards_extension_id || \ extension.id() == brave_extension_id) ? \ - brave_actions::kBraveActionGraphicSize : + kBraveActionGraphicSize : #include "../../../../extensions/browser/extension_action_manager.cc" #undef BRAVE_GET_EXTENSION_ACTION diff --git a/chromium_src/extensions/browser/sandboxed_unpacker.cc b/chromium_src/extensions/browser/sandboxed_unpacker.cc index decc833e4df2..6739b4bf3acc 100644 --- a/chromium_src/extensions/browser/sandboxed_unpacker.cc +++ b/chromium_src/extensions/browser/sandboxed_unpacker.cc @@ -7,7 +7,7 @@ #include "base/values.h" #include "base/json/json_reader.h" -#include "brave/common/extensions/extension_constants.h" +#include "extensions/common/constants.h" namespace brave { diff --git a/chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc b/chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc index 068ad6d9c4c4..6a0c566a5e39 100644 --- a/chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc +++ b/chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/values.h" -#include "brave/common/extensions/extension_constants.h" +#include "extensions/common/constants.h" #include "testing/gtest/include/gtest/gtest.h" namespace brave { diff --git a/common/extensions/extension_constants.cc b/chromium_src/extensions/common/constants.cc similarity index 90% rename from common/extensions/extension_constants.cc rename to chromium_src/extensions/common/constants.cc index c8d9b9282347..4d08d1c99121 100644 --- a/common/extensions/extension_constants.cc +++ b/chromium_src/extensions/common/constants.cc @@ -1,9 +1,12 @@ -/* 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/. */ -#include "brave/common/extensions/extension_constants.h" +#include "../../../../extensions/common/constants.cc" + +const int kBraveActionGraphicSize = 18; +const int kBraveActionRightMargin = 2; const char brave_extension_id[] = "mnojpmjdmbbfmejpflffifhffcmidifd"; const char brave_rewards_extension_id[] = "jidkidbbcafjabdphckchenhfomhnfma"; @@ -47,5 +50,5 @@ const char ipfs_companion_extension_public_key[] = const char ipfs_companion_beta_extension_id[] = "hjoieblefckbooibpepigmacodalfndh"; -const char google_translate_extension_id[] = - "aapbdbdomjkkjkaonfhkkikfgjllcleb"; +const char google_translate_extension_id[] = "aapbdbdomjkkjkaonfhkkikfgjllcleb"; + diff --git a/common/extensions/extension_constants.h b/chromium_src/extensions/common/constants.h similarity index 77% rename from common/extensions/extension_constants.h rename to chromium_src/extensions/common/constants.h index 9d9bfcecaaea..b208d777d49e 100644 --- a/common/extensions/extension_constants.h +++ b/chromium_src/extensions/common/constants.h @@ -1,10 +1,15 @@ -/* 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/. */ -#ifndef BRAVE_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_ -#define BRAVE_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_ +#ifndef BRAVE_CHROMIUM_SRC_EXTNESIONS_COMMON_CONSTANTS_H_ +#define BRAVE_CHROMIUM_SRC_EXTNESIONS_COMMON_CONSTANTS_H_ + +#include "../../../../extensions/common/constants.h" + +extern const int kBraveActionGraphicSize; +extern const int kBraveActionRightMargin; extern const char brave_extension_id[]; extern const char brave_rewards_extension_id[]; @@ -33,4 +38,4 @@ extern const char ipfs_companion_beta_extension_id[]; extern const char google_translate_extension_id[]; -#endif // BRAVE_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_ +#endif // BRAVE_CHROMIUM_SRC_EXTNESIONS_COMMON_CONSTANTS_H_ diff --git a/common/BUILD.gn b/common/BUILD.gn index 7c51e2ffbcdb..f2062cdf53e2 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -81,12 +81,12 @@ source_set("common") { sources += [ "extensions/brave_extensions_api_provider.cc", "extensions/brave_extensions_api_provider.h", - "extensions/extension_constants.cc", - "extensions/extension_constants.h", "extensions/whitelist.cc", "extensions/whitelist.h", ] + deps += [ "//extensions/common:common_constants" ] + public_deps = [ "extensions/api", ] diff --git a/common/extensions/constants.h b/common/extensions/constants.h deleted file mode 100644 index 99c94931a21c..000000000000 --- a/common/extensions/constants.h +++ /dev/null @@ -1,16 +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/. */ - -#ifndef BRAVE_COMMON_EXTENSIONS_CONSTANTS_H_ -#define BRAVE_COMMON_EXTENSIONS_CONSTANTS_H_ - -namespace brave_actions { - -const int kBraveActionGraphicSize = 18; -const int kBraveActionRightMargin = 2; - -} // namespace brave_actions - -#endif // BRAVE_COMMON_EXTENSIONS_CONSTANTS_H_ diff --git a/common/extensions/whitelist.cc b/common/extensions/whitelist.cc index b965f47b442b..ceddb915a1f3 100644 --- a/common/extensions/whitelist.cc +++ b/common/extensions/whitelist.cc @@ -5,8 +5,8 @@ #include "brave/common/extensions/whitelist.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" +#include "extensions/common/constants.h" // This is a hardcoded list of vetted extensions, mostly // the built-in ones that ship with Brave or are used for diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc index a0d546ac37f4..0ddfe1fa682e 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc @@ -9,7 +9,6 @@ #include "brave/browser/extensions/api/brave_action_api.h" #include "brave/browser/ui/views/brave_actions/brave_actions_container.h" #include "brave/browser/ui/views/location_bar/brave_location_bar_view.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.h" #include "brave/components/brave_rewards/browser/test/common/rewards_browsertest_context_util.h" #include "brave/components/brave_rewards/common/pref_names.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/constants.h" #include "testing/gtest/include/gtest/gtest.h" namespace rewards_browsertest_helper { diff --git a/components/brave_wallet/browser/BUILD.gn b/components/brave_wallet/browser/BUILD.gn index 2e6d4fbda8fe..846351b3ebee 100644 --- a/components/brave_wallet/browser/BUILD.gn +++ b/components/brave_wallet/browser/BUILD.gn @@ -16,7 +16,6 @@ source_set("browser") { deps = [ "//base", - "//brave/common:common", "//brave/common:pref_names", "//components/keyed_service/content", "//components/keyed_service/core", @@ -24,5 +23,6 @@ source_set("browser") { "//components/prefs", "//components/user_prefs", "//extensions/browser", + "//extensions/common:common_constants", ] } diff --git a/components/brave_wallet/browser/brave_wallet_service.cc b/components/brave_wallet/browser/brave_wallet_service.cc index 1084716555e8..9032f2a35a45 100644 --- a/components/brave_wallet/browser/brave_wallet_service.cc +++ b/components/brave_wallet/browser/brave_wallet_service.cc @@ -14,7 +14,6 @@ #include "base/task/post_task.h" #include "base/task_runner_util.h" #include "brave/common/brave_wallet_constants.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/pref_names.h" #include "brave/components/brave_wallet/browser/brave_wallet_delegate.h" #include "components/user_prefs/user_prefs.h" @@ -31,6 +30,7 @@ #include "extensions/browser/shared_user_script_manager.h" #include "extensions/browser/unloaded_extension_reason.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/common/constants.h" BraveWalletService::BraveWalletService(content::BrowserContext* context, std::unique_ptr brave_wallet_delegate) diff --git a/components/brave_webtorrent/browser/content_browser_client_helper.h b/components/brave_webtorrent/browser/content_browser_client_helper.h index 43ccab5d5424..e3ee3fa9daa1 100644 --- a/components/brave_webtorrent/browser/content_browser_client_helper.h +++ b/components/brave_webtorrent/browser/content_browser_client_helper.h @@ -13,7 +13,6 @@ #include "base/strings/string_util.h" #include "base/task/post_task.h" #include "brave/common/url_constants.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/components/brave_webtorrent/browser/webtorrent_util.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "content/public/browser/browser_task_traits.h" diff --git a/components/brave_webtorrent/browser/webtorrent_util.cc b/components/brave_webtorrent/browser/webtorrent_util.cc index 464cf241e5af..a30f203f390c 100644 --- a/components/brave_webtorrent/browser/webtorrent_util.cc +++ b/components/brave_webtorrent/browser/webtorrent_util.cc @@ -8,7 +8,6 @@ #include #include "base/strings/string_util.h" -#include "brave/common/extensions/extension_constants.h" #include "brave/common/network_constants.h" #include "brave/common/pref_names.h" #include "chrome/browser/profiles/profile.h" diff --git a/test/BUILD.gn b/test/BUILD.gn index 95f32301abff..d90332db8a53 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -153,6 +153,7 @@ test("brave_unit_tests") { "//components/version_info", "//content/public/common", "//content/test:test_support", + "//extensions/common:common_constants", "//services/network/public/cpp:cpp", "//services/network:test_support", ] @@ -746,6 +747,7 @@ test("brave_browser_tests") { "//components/prefs", "//components/safe_browsing/core:features", "//content/test:test_support", + "//extensions/common:common_constants", "//ppapi/buildflags", ":brave_browser_tests_deps", "//third_party/blink/public/common",