Use ExtensionPrefs instead of custom pref handling

brave · Jul 17, 2019 · 26afc11 · 26afc11
1 parent a61bbbf
commit 26afc11
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 17 deletions.
diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc
@@ -142,10 +142,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(kNewTabPageShowClock, true);
   registry->RegisterBooleanPref(kNewTabPageShowTopSites, true);
   registry->RegisterBooleanPref(kNewTabPageShowStats, true);
-
-  // Whether Brave Wallet has been enabled at least once and should therefore
-  // be loaded on future startups.
-  registry->RegisterBooleanPref(kWalletHasBeenLoadedOnce, false);
 }
 
 }  // namespace brave
diff --git a/browser/brave_profile_prefs_browsertest.cc b/browser/brave_profile_prefs_browsertest.cc
@@ -47,8 +47,6 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, MiscBravePrefs) {
       browser()->profile()->GetPrefs()->GetBoolean(kHideBraveRewardsButton));
   EXPECT_FALSE(
       browser()->profile()->GetPrefs()->GetBoolean(kIPFSCompanionEnabled));
-  EXPECT_FALSE(
-      browser()->profile()->GetPrefs()->GetBoolean(kWalletHasBeenLoadedOnce));
 }
 
 IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest,

diff --git a/browser/extensions/brave_component_loader.cc b/browser/extensions/brave_component_loader.cc
@@ -23,6 +23,7 @@
 #include "chrome/common/pref_names.h"
 #include "components/grit/brave_components_resources.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 
 namespace extensions {
@@ -54,11 +55,6 @@ void BraveComponentLoader::OnComponentReady(std::string extension_id,
     ExtensionPrefs::Get((content::BrowserContext *)profile_)->
         SetAllowFileAccess(extension_id, true);
   }
-#if BUILDFLAG(BRAVE_WALLET_ENABLED)
-  if (extension_id == ethereum_remote_client_extension_id) {
-    profile_prefs_->SetBoolean(kWalletHasBeenLoadedOnce, true);
-  }
-#endif
 }
 
 void BraveComponentLoader::AddExtension(const std::string& extension_id,
@@ -115,10 +111,9 @@ void BraveComponentLoader::AddDefaultComponentExtensions(
   }
 
 #if BUILDFLAG(BRAVE_WALLET_ENABLED)
-  // If brave://wallet has been loaded at least once, then load it again
-  // on future startups.
-  if (profile_prefs_->FindPreference(kWalletHasBeenLoadedOnce) &&
-      profile_prefs_->GetBoolean(kWalletHasBeenLoadedOnce)) {
+  // If brave://wallet has been loaded at least once, then load it again.
+  if (ExtensionPrefs::Get((content::BrowserContext *)profile_)->
+    HasPrefForExtension(ethereum_remote_client_extension_id)) {
     AddEthereumRemoteClientExtension();
   }
 #endif

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 kWalletHasBeenLoadedOnce[] = "brave.wallet_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 kWalletHasBeenLoadedOnce[];
 
 #endif  // BRAVE_COMMON_PREF_NAMES_H_