diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:45:47 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:45:47 +0000 |
| commit | b1de2c717ac103f2c66110510072ce4731e51015 (patch) | |
| tree | 6ece76e06f3118052d1913774d49fa71b8802fb6 /chrome/browser/managed_mode | |
| parent | e659eb915610370c828a64ae2d82519cc10c60e7 (diff) | |
| download | chromium_src-b1de2c717ac103f2c66110510072ce4731e51015.zip chromium_src-b1de2c717ac103f2c66110510072ce4731e51015.tar.gz chromium_src-b1de2c717ac103f2c66110510072ce4731e51015.tar.bz2 | |
Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.
This is a step towards removing registration methods from PrefService and simplifying its class hierarchy.
TBR=ben@chromium.org
BUG=155525
Review URL: https://chromiumcodereview.appspot.com/11741003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/managed_mode')
| -rw-r--r-- | chrome/browser/managed_mode/managed_mode.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/managed_mode/managed_mode.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/managed_mode/managed_mode.cc b/chrome/browser/managed_mode/managed_mode.cc index 5749d81..5f426c7 100644 --- a/chrome/browser/managed_mode/managed_mode.cc +++ b/chrome/browser/managed_mode/managed_mode.cc @@ -10,6 +10,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/managed_mode/managed_mode_site_list.h" #include "chrome/browser/policy/url_blacklist_manager.h" +#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -33,8 +34,8 @@ ManagedMode* ManagedMode::GetInstance() { } // static -void ManagedMode::RegisterPrefs(PrefServiceSimple* prefs) { - prefs->RegisterBooleanPref(prefs::kInManagedMode, false); +void ManagedMode::RegisterPrefs(PrefRegistrySimple* registry) { + registry->RegisterBooleanPref(prefs::kInManagedMode, false); } // static diff --git a/chrome/browser/managed_mode/managed_mode.h b/chrome/browser/managed_mode/managed_mode.h index a079128..8318336 100644 --- a/chrome/browser/managed_mode/managed_mode.h +++ b/chrome/browser/managed_mode/managed_mode.h @@ -24,7 +24,7 @@ struct DefaultSingletonTraits; class ManagedModeSiteList; class ManagedModeURLFilter; class PrefChangeRegistrar; -class PrefServiceSimple; +class PrefRegistrySimple; class PrefServiceSyncable; class Profile; @@ -42,7 +42,7 @@ class ManagedMode : public chrome::BrowserListObserver, public: typedef base::Callback<void(bool)> EnterCallback; - static void RegisterPrefs(PrefServiceSimple* prefs); + static void RegisterPrefs(PrefRegistrySimple* registry); // Initializes the singleton, setting the managed_profile_. Must be called // after g_browser_process and the LocalState have been created. |