add brave_payments_enabled flag and disable on windows for now

brave · Jul 6, 2018 · 0fada47 · 0fada47
1 parent 88efc80
commit 0fada47
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 21 deletions.
diff --git a/browser/payments/BUILD.gn b/browser/payments/BUILD.gn
@@ -1,10 +1,29 @@
+declare_args() {
+  # anonize doesn't currently build on windows
+  brave_payments_enabled = is_mac || is_linux
+}
+
+config("external_config") {
+  visibility = [ ":payments" ]
+
+  defines = []
+  if (brave_payments_enabled) {
+    defines += [ "BRAVE_PAYMENTS_ENABLED" ]
+  }
+}
+
 source_set("payments") {
+  public_configs = [
+    ":external_config"
+  ]
+
   sources = [
     "payments_service.cc",
     "payments_service.h",
     "payments_service_factory.cc",
     "payments_service_factory.h",
   ]
+
   deps = [
     "//base",
     "//components/keyed_service/content",
@@ -14,7 +33,13 @@ source_set("payments") {
     "//content/public/browser",
     "//services/network/public/mojom",
   ]
-  if (is_mac || is_linux) {
+
+  if (brave_payments_enabled) {
+    sources += [
+      "payments_service_impl.cc",
+      "payments_service_impl.h",
+    ]
+
     deps += [
       "//brave/vendor/bat-native-ledger",
     ]

diff --git a/browser/payments/payments_service.cc b/browser/payments/payments_service.cc
@@ -3,22 +3,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "brave/browser/payments/payments_service.h"
 
-#include "bat/ledger/ledger.h"
+#include "base/logging.h"
 
 namespace payments {
 
-  PaymentsService::PaymentsService() :
-      ledger_(new braveledger_ledger::Ledger()) {
+  PaymentsService::PaymentsService() {
   }
 
   PaymentsService::~PaymentsService() {
   }
 
   void PaymentsService::CreateWallet() {
-    ledger_->createWallet();
-  }
-
-  void PaymentsService::Shutdown() {
-    ledger_.reset();
+    NOTREACHED();
   }
 }  // namespace history
diff --git a/browser/payments/payments_service.h b/browser/payments/payments_service.h
@@ -10,25 +10,16 @@
 #include "base/macros.h"
 #include "components/keyed_service/core/keyed_service.h"
 
-namespace braveledger_ledger {
-class Ledger;
-}
-
 namespace payments {
 
 class PaymentsService : public KeyedService {
  public:
   PaymentsService();
   ~PaymentsService() override;
 
-  // KeyedService:
-  void Shutdown() override;
-
-  void CreateWallet();
+  virtual void CreateWallet();
 
  private:
-  std::unique_ptr<braveledger_ledger::Ledger> ledger_;
-
   DISALLOW_COPY_AND_ASSIGN(PaymentsService);
 };
 

diff --git a/browser/payments/payments_service_factory.cc b/browser/payments/payments_service_factory.cc
@@ -9,6 +9,10 @@
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
+#if defined(BRAVE_PAYMENTS_ENABLED)
+#include "brave/browser/payments/payments_service_impl.h"
+#endif
+
 // static
 payments::PaymentsService* PaymentsServiceFactory::GetForProfile(
     Profile* profile) {
@@ -35,14 +39,22 @@ PaymentsServiceFactory::~PaymentsServiceFactory() {
 
 KeyedService* PaymentsServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
+#if defined(BRAVE_PAYMENTS_ENABLED)
   std::unique_ptr<payments::PaymentsService> payments_service(
-      new payments::PaymentsService());
+      new payments::PaymentsServiceImpl());
   return payments_service.release();
+#else
+  return NULL;
+#endif
 }
 
 content::BrowserContext* PaymentsServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return chrome::GetBrowserContextOwnInstanceInIncognito(context);
+  if (context->IsOffTheRecord())
+    return chrome::GetBrowserContextOwnInstanceInIncognito(context);
+
+  // use original profile for session profiles
+  return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool PaymentsServiceFactory::ServiceIsNULLWhileTesting() const {

diff --git a/browser/payments/payments_service_impl.cc b/browser/payments/payments_service_impl.cc
@@ -0,0 +1,25 @@
+/* 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/payments/payments_service_impl.h"
+
+#include "bat/ledger/ledger.h"
+
+namespace payments {
+
+  PaymentsServiceImpl::PaymentsServiceImpl() :
+      ledger_(new braveledger_ledger::Ledger()) {
+  }
+
+  PaymentsServiceImpl::~PaymentsServiceImpl() {
+  }
+
+  void PaymentsServiceImpl::CreateWallet() {
+    ledger_->createWallet();
+  }
+
+  void PaymentsServiceImpl::Shutdown() {
+    ledger_.reset();
+    PaymentsService::Shutdown();
+  }
+}  // namespace history
diff --git a/browser/payments/payments_service_impl.h b/browser/payments/payments_service_impl.h
@@ -0,0 +1,36 @@
+/* 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_PAYMENTS_PAYMENTS_SERVICE_IMPL_
+#define BRAVE_BROWSER_PAYMENTS_PAYMENTS_SERVICE_IMPL_
+
+#include <memory>
+
+#include "brave/browser/payments/payments_service.h"
+
+namespace braveledger_ledger {
+class Ledger;
+}
+
+namespace payments {
+
+class PaymentsServiceImpl : public PaymentsService {
+ public:
+  PaymentsServiceImpl();
+  ~PaymentsServiceImpl() override;
+
+  // KeyedService:
+  void Shutdown() override;
+
+  void CreateWallet() override;
+
+ private:
+  std::unique_ptr<braveledger_ledger::Ledger> ledger_;
+
+  DISALLOW_COPY_AND_ASSIGN(PaymentsServiceImpl);
+};
+
+}  // namespace history
+
+#endif  // BRAVE_BROWSER_PAYMENTS_PAYMENTS_SERVICE_IMPL_