From a5b0faeada09112dbca53967eae546afe1289d82 Mon Sep 17 00:00:00 2001 From: Jason Sadler Date: Fri, 17 May 2019 16:35:04 -0400 Subject: [PATCH] Fixes brave/brave-browser#4069 --- ...ave_component_extension_resource_manager.cc | 12 ++++++++---- .../brave_app_menu_model_browsertest.cc | 9 +++++++++ .../brave_actions_container_browsertest.cc | 10 ++++++++-- .../browser/buildflags/buildflags.gni | 3 ++- components/brave_rewards/browser/BUILD.gn | 18 +++++++++--------- 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/browser/extensions/brave_component_extension_resource_manager.cc b/browser/extensions/brave_component_extension_resource_manager.cc index 8ccce2b666c1..ce3c61f4fda7 100644 --- a/browser/extensions/brave_component_extension_resource_manager.cc +++ b/browser/extensions/brave_component_extension_resource_manager.cc @@ -7,13 +7,17 @@ #include "brave/components/brave_extension/grit/brave_extension_generated_map.h" #include "brave/components/brave_extension/grit/brave_extension_resources_map.h" -#include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_extension_resources_map.h" -#include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_panel_generated_map.h" +#include "brave/components/brave_rewards/browser/buildflags/buildflags.h" #include "brave/components/brave_sync/grit/brave_sync_generated_map.h" #include "brave/components/brave_sync/grit/brave_sync_resources_map.h" #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources_map.h" #include "brave/components/brave_webtorrent/grit/brave_webtorrent_generated_map.h" +#if BUILDFLAG(BRAVE_REWARDS_ENABLED) +#include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_extension_resources_map.h" +#include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_panel_generated_map.h" +#endif + namespace extensions { BraveComponentExtensionResourceManager:: @@ -25,7 +29,7 @@ BraveComponentExtensionResourceManager() { AddComponentResourceEntries( kBraveExtensionGenerated, kBraveExtensionGeneratedSize); - +#if BUILDFLAG(BRAVE_REWARDS_ENABLED) AddComponentResourceEntries( kBraveRewardsExtensionResources, kBraveRewardsExtensionResourcesSize); @@ -33,7 +37,7 @@ BraveComponentExtensionResourceManager() { AddComponentResourceEntries( kBraveRewardsPanelGenerated, kBraveRewardsPanelGeneratedSize); - +#endif AddComponentResourceEntries( kBraveSyncResources, kBraveSyncResourcesSize); diff --git a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc index e6503983e971..92f8daab28cc 100644 --- a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc +++ b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc @@ -18,6 +18,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "brave/components/brave_rewards/browser/buildflags/buildflags.h" using BraveAppMenuBrowserTest = InProcessBrowserTest; @@ -32,7 +33,11 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuBrowserTest, BasicTest) { EXPECT_NE(-1, normal_model.GetIndexOfCommandId(IDC_SHOW_BRAVE_SYNC)); auto* command_controller = browser()->command_controller(); + #if BUILDFLAG(BRAVE_REWARDS_ENABLED) EXPECT_TRUE(command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_REWARDS)); + #else + EXPECT_FALSE(command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_REWARDS)); + #endif EXPECT_TRUE(command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_SYNC)); // Create proviate browser. @@ -49,7 +54,11 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuBrowserTest, BasicTest) { EXPECT_NE(-1, private_model.GetIndexOfCommandId(IDC_SHOW_BRAVE_SYNC)); command_controller = private_browser->command_controller(); + #if BUILDFLAG(BRAVE_REWARDS_ENABLED) EXPECT_TRUE(command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_REWARDS)); + #else + EXPECT_FALSE(command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_REWARDS)); + #endif EXPECT_TRUE(command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_SYNC)); content::WindowedNotificationObserver browser_creation_observer( 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 558f52e137bd..b5bb6e80df25 100644 --- a/browser/ui/views/brave_actions/brave_actions_container_browsertest.cc +++ b/browser/ui/views/brave_actions/brave_actions_container_browsertest.cc @@ -7,7 +7,7 @@ #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/common/pref_names.h" +#include "brave/components/brave_rewards/browser/buildflags/buildflags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" @@ -24,6 +24,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#if BUILDFLAG(BRAVE_REWARDS_ENABLED) +#include "brave/components/brave_rewards/common/pref_names.h" +#endif + class BraveActionsContainerTest : public InProcessBrowserTest { public: BraveActionsContainerTest() = default; @@ -57,6 +61,7 @@ class BraveActionsContainerTest : public InProcessBrowserTest { DISALLOW_COPY_AND_ASSIGN(BraveActionsContainerTest); }; +#if BUILDFLAG(BRAVE_REWARDS_ENABLED) IN_PROC_BROWSER_TEST_F(BraveActionsContainerTest, HideBraveRewardsAction) { // By default the action should be shown. EXPECT_FALSE(prefs_->GetBoolean(brave_rewards::prefs::kBraveRewardsEnabled)); @@ -90,7 +95,7 @@ IN_PROC_BROWSER_TEST_F(BraveActionsContainerTest, HideBraveRewardsAction) { } IN_PROC_BROWSER_TEST_F(BraveActionsContainerTest, - BraveRewadsActionHiddenInGuestSession) { + BraveRewardsActionHiddenInGuestSession) { // By default the action should be shown. EXPECT_FALSE(prefs_->GetBoolean(brave_rewards::prefs::kBraveRewardsEnabled)); EXPECT_FALSE(prefs_->GetBoolean(kHideBraveRewardsButton)); @@ -120,3 +125,4 @@ IN_PROC_BROWSER_TEST_F(BraveActionsContainerTest, Init(browser); CheckBraveRewardsActionShown(false); } +#endif diff --git a/components/brave_ads/browser/buildflags/buildflags.gni b/components/brave_ads/browser/buildflags/buildflags.gni index a0113746b844..5dcfb1e9751c 100644 --- a/components/brave_ads/browser/buildflags/buildflags.gni +++ b/components/brave_ads/browser/buildflags/buildflags.gni @@ -1,5 +1,6 @@ +import("//brave/components/brave_rewards/browser/buildflags/buildflags.gni") import("//build/config/features.gni") declare_args() { - brave_ads_enabled = !is_android + brave_ads_enabled = !is_android && brave_rewards_enabled } diff --git a/components/brave_rewards/browser/BUILD.gn b/components/brave_rewards/browser/BUILD.gn index 0649ea84a4cd..07a19561a732 100644 --- a/components/brave_rewards/browser/BUILD.gn +++ b/components/brave_rewards/browser/BUILD.gn @@ -39,15 +39,6 @@ source_set("browser") { "rewards_internals_info.h", ] - if (enable_extensions) { - sources += [ - "extension_rewards_notification_service_observer.cc", - "extension_rewards_notification_service_observer.h", - "extension_rewards_service_observer.cc", - "extension_rewards_service_observer.h", - ] - } - deps = [ "//base", "//brave/components/brave_rewards/common", @@ -86,6 +77,15 @@ source_set("browser") { "rewards_notification_service_impl.h", ] + if (enable_extensions) { + sources += [ + "extension_rewards_notification_service_observer.cc", + "extension_rewards_notification_service_observer.h", + "extension_rewards_service_observer.cc", + "extension_rewards_service_observer.h", + ] + } + if (!is_android) { sources += [ "rewards_helper.cc",