diff options
Diffstat (limited to 'apps/shell/app_shell_browser_context.cc')
-rw-r--r-- | apps/shell/app_shell_browser_context.cc | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/apps/shell/app_shell_browser_context.cc b/apps/shell/app_shell_browser_context.cc index e95fa75..f85697d 100644 --- a/apps/shell/app_shell_browser_context.cc +++ b/apps/shell/app_shell_browser_context.cc @@ -5,11 +5,6 @@ #include "apps/shell/app_shell_browser_context.h" #include "apps/app_load_service_factory.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_service_factory.h" -#include "base/prefs/testing_pref_store.h" -#include "components/user_prefs/pref_registry_syncable.h" -#include "components/user_prefs/user_prefs.h" namespace { @@ -18,11 +13,6 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() { apps::AppLoadServiceFactory::GetInstance(); } -// See chrome::RegisterProfilePrefs() in chrome/browser/prefs/browser_prefs.cc -void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) { - // TODO(jamescook): ExtensionPrefs::RegisterProfilePrefs(registry) -} - } // namespace namespace apps { @@ -33,19 +23,6 @@ namespace apps { AppShellBrowserContext::AppShellBrowserContext() : content::ShellBrowserContext(false, NULL) { EnsureBrowserContextKeyedServiceFactoriesBuilt(); - - base::PrefServiceFactory factory; - factory.set_user_prefs(new TestingPrefStore); - factory.set_extension_prefs(new TestingPrefStore); - // app_shell should not require syncable preferences, but for now we need to - // recycle some of the RegisterProfilePrefs() code in Chrome. - // TODO(jamescook): Convert this to user_prefs::PrefRegistrySimple. - user_prefs::PrefRegistrySyncable* pref_registry = - new user_prefs::PrefRegistrySyncable; - // Prefs should be registered before the PrefService is created. - RegisterPrefs(pref_registry); - prefs_ = factory.Create(pref_registry).Pass(); - user_prefs::UserPrefs::Set(this, prefs_.get()); } AppShellBrowserContext::~AppShellBrowserContext() { |