Add braveRewards.requestAdsEnabledPopupClosed() extension function.

fix brave/brave-browser#16964

Author: aseren

browser/extensions/api/brave_rewards_api.cc

@@ -1336,5 +1336,25 @@ ExtensionFunction::ResponseAction BraveRewardsUpdatePrefsFunction::Run() {
   return RespondNow(NoArguments());
 }
 
+BraveRewardsRequestAdsEnabledPopupClosedFunction::
+    ~BraveRewardsRequestAdsEnabledPopupClosedFunction() = default;
+
+ExtensionFunction::ResponseAction
+BraveRewardsRequestAdsEnabledPopupClosedFunction::Run() {
+  auto params(
+      brave_rewards::RequestAdsEnabledPopupClosed::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+
+  Profile* profile = Profile::FromBrowserContext(browser_context());
+  RewardsService* rewards_service =
+      RewardsServiceFactory::GetForProfile(profile);
+
+  if (rewards_service) {
+    rewards_service->RequestAdsEnabledPopupClosed(params->ads_enabled);
+  }
+
+  return RespondNow(NoArguments());
+}
+
 }  // namespace api
 }  // namespace extensions

browser/extensions/api/brave_rewards_api.h

@@ -506,6 +506,18 @@ class BraveRewardsUpdatePrefsFunction : public ExtensionFunction {
   ResponseAction Run() override;
 };
 
+class BraveRewardsRequestAdsEnabledPopupClosedFunction
+    : public ExtensionFunction {
+ public:
+  DECLARE_EXTENSION_FUNCTION("braveRewards.requestAdsEnabledPopupClosed",
+                             UNKNOWN)
+
+ protected:
+  ~BraveRewardsRequestAdsEnabledPopupClosedFunction() override;
+
+  ResponseAction Run() override;
+};
+
 }  // namespace api
 }  // namespace extensions
 

common/extensions/api/brave_rewards.json

@@ -1305,6 +1305,17 @@
             }
           }
         ]
+      },
+      {
+        "name": "requestAdsEnabledPopupClosed",
+        "type": "function",
+        "description": "",
+        "parameters": [
+          {
+            "name": "ads_enabled",
+            "type": "boolean"
+          }
+        ]
       }
     ]
   }

components/brave_rewards/browser/rewards_service.h

@@ -317,6 +317,8 @@ class RewardsService : public KeyedService {
       const std::string& query,
       ProcessRewardsPageUrlCallback callback) = 0;
 
+  virtual void RequestAdsEnabledPopupClosed(bool ads_enabled) = 0;
+
   virtual void DisconnectWallet() = 0;
 
   virtual void GetAnonWalletStatus(GetAnonWalletStatusCallback callback) = 0;

components/brave_rewards/browser/rewards_service_impl.cc

@@ -2936,6 +2936,17 @@ void RewardsServiceImpl::ProcessRewardsPageUrl(
       {});
 }
 
+void RewardsServiceImpl::RequestAdsEnabledPopupClosed(bool ads_enabled) {
+  if (ads_enabled) {
+    // If Rewards were previously enabled, this call will only turn on Ads.
+    EnableRewards();
+  }
+
+  for (auto& observer : observers_) {
+    observer.OnRequestAdsEnabledPopupClosed(ads_enabled);
+  }
+}
+
 void RewardsServiceImpl::OnDisconnectWallet(
     const std::string& wallet_type,
     const ledger::type::Result result) {

components/brave_rewards/browser/rewards_service_impl.h

@@ -305,6 +305,8 @@ class RewardsServiceImpl : public RewardsService,
       const std::string& query,
       ProcessRewardsPageUrlCallback callback) override;
 
+  void RequestAdsEnabledPopupClosed(bool ads_enabled) override;
+
   void DisconnectWallet() override;
 
   void GetAnonWalletStatus(GetAnonWalletStatusCallback callback) override;

components/brave_rewards/browser/rewards_service_observer.h

@@ -51,6 +51,8 @@ class RewardsServiceObserver : public base::CheckedObserver {
       const ledger::type::RewardsType type,
       const ledger::type::ContributionProcessor processor) {}
 
+  virtual void OnRequestAdsEnabledPopupClosed(bool ads_enabled) {}
+
   virtual void OnAdsEnabled(
       brave_rewards::RewardsService* rewards_service,
       bool ads_enabled) {}