Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: chrome/browser/chromeos/preferences.h

Issue 11293249: Remove PrefObserver usage, batch 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/api/prefs/pref_member.h ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences.h
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index 4c27fd30c293042c81b67884604452d7a4adabc6..10d747eadbc161daa5e6851b9c02c7eef545d2d6 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/compiler_specific.h"
-#include "base/prefs/public/pref_observer.h"
#include "chrome/browser/api/prefs/pref_member.h"
#include "chrome/browser/chromeos/language_preferences.h"
@@ -24,7 +23,7 @@ class InputMethodManager;
// is first initialized, it will initialize the OS settings to what's stored in
// the preferences. These include touchpad settings, etc.
// When the preferences change, we change the settings to reflect the new value.
-class Preferences : public PrefObserver {
+class Preferences {
public:
Preferences();
explicit Preferences(
@@ -37,10 +36,6 @@ class Preferences : public PrefObserver {
// This method will initialize Chrome OS settings to values in user prefs.
void Init(PrefService* prefs);
- // Overridden from PrefObserver:
- virtual void OnPreferenceChanged(PrefServiceBase* service,
- const std::string& pref_name) OVERRIDE;
-
void InitUserPrefsForTesting(PrefService* prefs);
void SetInputMethodListForTesting();
@@ -48,6 +43,9 @@ class Preferences : public PrefObserver {
// Initializes all member prefs.
void InitUserPrefs(PrefService* prefs);
+ // Callback method for preference changes.
+ void OnPreferenceChanged(const std::string& pref_name);
+
// This will set the OS settings when the preference changes.
// If this method is called with NULL, it will set all OS settings to what's
// stored in the preferences.
« no previous file with comments | « chrome/browser/api/prefs/pref_member.h ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698