Merge pull request #3791 from brave/crypto-wallets-infobar

Use Infobars for Dapp detection and MetaMask detection
brave · Oct 31, 2019 · 9f0f0dc · 9f0f0dc
2 parents d8ed0cd + 5a5fcb4
commit 9f0f0dc
Show file tree

Hide file tree

Showing 16 changed files with 351 additions and 188 deletions.
diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -169,9 +169,6 @@
       <message name="IDS_WIDEVINE_PERMISSION_REQUEST_TEXT_FRAGMENT" desc="Text fragment for Widevine permission request. 'Widevine' is the name of a plugin and should not be translated.">
           Install and run Widevine
       </message>
-      <message name="IDS_WALLET_PERMISSION_REQUEST_TEXT_FRAGMENT" desc="Text fragment for wallet installation permission request.">
-          Install Crypto Wallets
-      </message>
       <message name="IDS_WIDEVINE_DONT_ASK_AGAIN_CHECKBOX" desc="Checkbox for prevent showing widevine install prompt">
         Don't ask again
       </message>
@@ -627,6 +624,22 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_BRAVE_P3A_ENABLE_SETTING_SUBITEM" desc="Description that shows under main toggle setting for P3A">
         This anonymous info only lets Brave estimate the overall usage of certain features.
       </message>
+      <!-- Web3 detection -->
+      <message name="IDS_BRAVE_CRYPTO_WALLETS_METAMASK_INFOBAR_TEXT" desc="Text that shows on the info bar when a Dapp is detected">
+        Crypto Wallets is now available in Brave. You can't use MetaMask and Crypto Wallets at the same time.
+      </message>
+      <message name="IDS_BRAVE_CRYPTO_WALLETS_INFOBAR_TEXT" desc="Text that shows on the info bar when a Dapp is detected">
+        Set up Crypto Wallets to interact with this app and others like it.
+      </message>
+      <message name="IDS_BRAVE_CRYPTO_WALLETS_USE_CRYPTO_WALLETS" desc="Use Crypto Wallets">
+        Use Crypto Wallets
+      </message>
+      <message name="IDS_BRAVE_CRYPTO_WALLETS_USE_METAMASK" desc="Use MetaMask and don't use Crypto Wallets">
+        Use MetaMask
+      </message>
+      <message name="IDS_BRAVE_CRYPTO_WALLETS_SETUP" desc="Use Crypto Wallets">
+        SETUP
+      </message>
     </messages>
     <includes>
       <include name="IDR_BRAVE_GOOGLE_ANALYTICS_POLYFILL" file="resources/js/google_analytics_polyfill.js" type="BINDATA" />

diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -215,15 +215,6 @@ source_set("browser_process") {
     ]
   }
 
-  if (brave_wallet_enabled) {
-    sources += [
-      "brave_wallet/brave_wallet_utils.cc",
-      "brave_wallet/brave_wallet_utils.h",
-      "brave_wallet/wallet_installation_permission_request.cc",
-      "brave_wallet/wallet_installation_permission_request.h",
-    ]
-  }
-
   if (enable_tor) {
     deps += [
       "//brave/components/services/tor/public/cpp:manifest",

diff --git a/browser/brave_browser_main_parts.cc b/browser/brave_browser_main_parts.cc
@@ -26,6 +26,7 @@
 
 #if !defined(OS_ANDROID)
 #include "brave/browser/infobars/brave_confirm_p3a_infobar_delegate.h"
+#include "brave/browser/infobars/crypto_wallets_infobar_delegate.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/web_contents.h"

diff --git a/browser/brave_wallet/brave_wallet_utils.cc b/browser/brave_wallet/brave_wallet_utils.cc
diff --git a/browser/brave_wallet/brave_wallet_utils.h b/browser/brave_wallet/brave_wallet_utils.h
diff --git a/browser/brave_wallet/wallet_installation_permission_request.cc b/browser/brave_wallet/wallet_installation_permission_request.cc
diff --git a/browser/brave_wallet/wallet_installation_permission_request.h b/browser/brave_wallet/wallet_installation_permission_request.h
diff --git a/browser/extensions/api/brave_wallet_api.cc b/browser/extensions/api/brave_wallet_api.cc
@@ -10,13 +10,14 @@
 
 #include "base/base64.h"
 #include "base/environment.h"
-#include "brave/browser/brave_wallet/brave_wallet_utils.h"
+#include "brave/browser/infobars/crypto_wallets_infobar_delegate.h"
 #include "brave/browser/profiles/profile_util.h"
 #include "brave/common/extensions/api/brave_wallet.h"
 #include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_contents.h"
@@ -58,7 +59,15 @@ BraveWalletPromptToEnableWalletFunction::Run() {
                             base::NumberToString(params->tab_id)));
   }
 
-  RequestWalletInstallationPermission(contents);
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(contents);
+  if (infobar_service) {
+    auto* registry = extensions::ExtensionRegistry::Get(profile);
+    bool metamask_enabled = !brave::IsTorProfile(profile) &&
+      registry->ready_extensions().GetByID(metamask_extension_id);
+    CryptoWalletsInfoBarDelegate::Create(infobar_service, metamask_enabled);
+  }
+
   return RespondNow(NoArguments());
 }