Remove redundant Dapp detection pref

brave · Jul 9, 2019 · e492cc2 · e492cc2
1 parent e6c34eb
commit e492cc2
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 16 deletions.
diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc
@@ -10,7 +10,6 @@
 #include "brave/common/pref_names.h"
 #include "brave/components/brave_rewards/browser/rewards_service.h"
 #include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h"
-#include "brave/components/brave_wallet/browser/buildflags/buildflags.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/common/pref_names.h"
@@ -130,9 +129,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(kNewTabPageShowClock, true);
   registry->RegisterBooleanPref(kNewTabPageShowTopSites, true);
   registry->RegisterBooleanPref(kNewTabPageShowStats, true);
-
-  // Dapp detection
-  registry->RegisterBooleanPref(kDappDetectionEnabled, true);
 }
 
 }  // namespace brave
diff --git a/browser/dapp/dapp_utils.cc b/browser/dapp/dapp_utils.cc
@@ -16,11 +16,6 @@ namespace {
 base::Closure g_quit_closure_for_test;
 }  // namespace
 
-bool DappDetectionEnabled(content::BrowserContext* browser_context) {
-  Profile* profile = Profile::FromBrowserContext(browser_context);
-  return profile->GetPrefs()->GetBoolean(kDappDetectionEnabled);
-}
-
 void RequestWalletInstallationPermission(content::WebContents* web_contents) {
   DCHECK(web_contents);
 

diff --git a/browser/dapp/dapp_utils.h b/browser/dapp/dapp_utils.h
@@ -13,7 +13,6 @@ class BrowserContext;
 class WebContents;
 }  // content
 
-bool DappDetectionEnabled(content::BrowserContext* browser_context);
 void RequestWalletInstallationPermission(content::WebContents* web_contents);
 
 void SetQuitClosureForDappDetectionTest(const base::Closure& quit_closure);

diff --git a/browser/extensions/api/brave_shields_api.cc b/browser/extensions/api/brave_shields_api.cc
@@ -93,9 +93,6 @@ BraveShieldsDappAvailableFunction::Run() {
       brave_shields::DappAvailable::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  if (!DappDetectionEnabled(browser_context()))
-    return RespondNow(NoArguments());
-
 #if BUILDFLAG(BRAVE_WALLET_ENABLED)
   // Get web contents for this tab
   content::WebContents* contents = nullptr;

diff --git a/browser/extensions/api/brave_shields_api_browsertest.cc b/browser/extensions/api/brave_shields_api_browsertest.cc
@@ -332,7 +332,6 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest,
 
 #if BUILDFLAG(BRAVE_WALLET_ENABLED)
 IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, DappDetectionTest) {
-  browser()->profile()->GetPrefs()->SetBoolean(kDappDetectionEnabled, true);
   EXPECT_TRUE(
       NavigateToURLUntilLoadStop("a.com", "/dapp.html"));
 

diff --git a/common/pref_names.cc b/common/pref_names.cc
@@ -57,4 +57,3 @@ const char kNewTabPageShowBackgroundImage[] =
 const char kNewTabPageShowClock[] = "brave.new_tab_page.show_clock";
 const char kNewTabPageShowTopSites[] = "brave.new_tab_page.show_top_sites";
 const char kNewTabPageShowStats[] = "brave.new_tab_page.show_stats";
-const char kDappDetectionEnabled[] = "brave.dapp_detection_enabled";
diff --git a/common/pref_names.h b/common/pref_names.h
@@ -50,6 +50,5 @@ extern const char kNewTabPageShowBackgroundImage[];
 extern const char kNewTabPageShowClock[];
 extern const char kNewTabPageShowTopSites[];
 extern const char kNewTabPageShowStats[];
-extern const char kDappDetectionEnabled[];
 
 #endif  // BRAVE_COMMON_PREF_NAMES_H_