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

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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
Index: chrome/browser/chromeos/preferences.h
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index 0789d3caedcd6b7e997a4bdbb9828b1542d59fbe..d00b66e3af26c5a70412bd534a0257ac431f8566 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -14,6 +14,7 @@
#include "chrome/browser/prefs/pref_service_observer.h"
class PrefService;
+class PrefServiceSyncable;
namespace chromeos {
namespace input_method {
@@ -32,17 +33,17 @@ class Preferences : public PrefServiceObserver {
virtual ~Preferences();
// This method will register the prefs associated with Chrome OS settings.
- static void RegisterUserPrefs(PrefService* prefs);
+ static void RegisterUserPrefs(PrefServiceSyncable* prefs);
// This method will initialize Chrome OS settings to values in user prefs.
- void Init(PrefService* prefs);
+ void Init(PrefServiceSyncable* prefs);
- void InitUserPrefsForTesting(PrefService* prefs);
+ void InitUserPrefsForTesting(PrefServiceSyncable* prefs);
void SetInputMethodListForTesting();
private:
// Initializes all member prefs.
- void InitUserPrefs(PrefService* prefs);
+ void InitUserPrefs(PrefServiceSyncable* prefs);
// Callback method for preference changes.
void OnPreferenceChanged(const std::string& pref_name);
@@ -98,7 +99,7 @@ class Preferences : public PrefServiceObserver {
// PrefServiceObserver implementation.
virtual void OnIsSyncingChanged() OVERRIDE;
- PrefService* prefs_;
+ PrefServiceSyncable* prefs_;
input_method::InputMethodManager* input_method_manager_;
« no previous file with comments | « chrome/browser/chromeos/power/session_length_limiter_unittest.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698