summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_process_impl.h
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-09 10:32:54 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-09 10:32:54 +0000
commit5ee200b423be84efa02659b972093fed44d987a2 (patch)
tree563c7368e382f697b2a87f0be6537133238faf52 /chrome/browser/browser_process_impl.h
parent0aa4047c7625056708bc6cd9de6ff9573961ae28 (diff)
downloadchromium_src-5ee200b423be84efa02659b972093fed44d987a2.zip
chromium_src-5ee200b423be84efa02659b972093fed44d987a2.tar.gz
chromium_src-5ee200b423be84efa02659b972093fed44d987a2.tar.bz2
Revert 166704 - Convert PrefChangeRegistrar usages, batch 1.
TBR=mmenke@chromium.org,rickcam@chromium.org,dhollowa@chromium.org BUG=155525,160177 Review URL: https://chromiumcodereview.appspot.com/11376003 Speculative revert to check if memory usage increase was caused by this change and its parent change. TBR=joi@chromium.org Review URL: https://codereview.chromium.org/11366170 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.h')
-rw-r--r--chrome/browser/browser_process_impl.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 8f127f2..5f18e62 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -17,6 +17,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
#include "base/threading/non_thread_safe.h"
#include "base/timer.h"
#include "chrome/browser/browser_process.h"
@@ -41,7 +42,8 @@ class PolicyService;
// Real implementation of BrowserProcess that creates and returns the services.
class BrowserProcessImpl : public BrowserProcess,
- public base::NonThreadSafe {
+ public base::NonThreadSafe,
+ public PrefObserver {
public:
// |local_state_task_runner| must be a shutdown-blocking task runner.
BrowserProcessImpl(base::SequencedTaskRunner* local_state_task_runner,
@@ -118,6 +120,10 @@ class BrowserProcessImpl : public BrowserProcess,
virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
+ // PrefObserver implementation.
+ virtual void OnPreferenceChanged(PrefServiceBase* service,
+ const std::string& pref_name) OVERRIDE;
+
private:
void CreateMetricsService();
void CreateWatchdogThread();