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/browser_process_impl.h | |
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/browser_process_impl.h')
-rw-r--r-- | chrome/browser/browser_process_impl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index fb3901f..b01591f 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -25,7 +25,7 @@ class ChromeNetLog; class ChromeResourceDispatcherHostDelegate; class CommandLine; class RemoteDebuggingServer; -class PrefServiceSimple; +class PrefRegistrySimple; class PromoResourceService; #if defined(ENABLE_PLUGIN_INSTALLATION) @@ -76,7 +76,7 @@ class BrowserProcessImpl : public BrowserProcess, virtual IOThread* io_thread() OVERRIDE; virtual WatchDogThread* watchdog_thread() OVERRIDE; virtual ProfileManager* profile_manager() OVERRIDE; - virtual PrefServiceSimple* local_state() OVERRIDE; + virtual PrefService* local_state() OVERRIDE; virtual net::URLRequestContextGetter* system_request_context() OVERRIDE; virtual chrome_variations::VariationsService* variations_service() OVERRIDE; #if defined(OS_CHROMEOS) @@ -132,6 +132,8 @@ class BrowserProcessImpl : public BrowserProcess, virtual void PlatformSpecificCommandLineProcessing( const CommandLine& command_line) OVERRIDE; + static void RegisterPrefs(PrefRegistrySimple* registry); + private: void CreateMetricsService(); void CreateWatchdogThread(); @@ -182,7 +184,7 @@ class BrowserProcessImpl : public BrowserProcess, scoped_ptr<ProfileManager> profile_manager_; bool created_local_state_; - scoped_ptr<PrefServiceSimple> local_state_; + scoped_ptr<PrefService> local_state_; bool created_icon_manager_; scoped_ptr<IconManager> icon_manager_; |