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

Unified Diff: chrome/browser/chromeos/language_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/language_preferences.h
diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h
index 237b130cbfd296a29af9fc81464700c25c784675..19c0031557a1cebc1e5779231930477b2f950d19 100644
--- a/chrome/browser/chromeos/language_preferences.h
+++ b/chrome/browser/chromeos/language_preferences.h
@@ -36,7 +36,7 @@ struct LanguageMultipleChoicePreference {
int item_message_id; // Resource grd ID for the combobox item.
} values_and_ids[kMaxItems];
int label_message_id; // Resource grd ID for the label.
- PrefService::PrefSyncStatus sync_status;
+ PrefServiceSyncable::PrefSyncStatus sync_status;
};
// The struct is used for preferences of boolean values, like switches to
@@ -46,7 +46,7 @@ struct LanguageBooleanPrefs {
bool default_pref_value;
const char* ibus_config_name;
int message_id;
- PrefService::PrefSyncStatus sync_status;
+ PrefServiceSyncable::PrefSyncStatus sync_status;
};
// The struct is used for preferences of integer range values, like the
@@ -58,7 +58,7 @@ struct LanguageIntegerRangePreference {
int max_pref_value;
const char* ibus_config_name;
int message_id;
- PrefService::PrefSyncStatus sync_status;
+ PrefServiceSyncable::PrefSyncStatus sync_status;
};
// ---------------------------------------------------------------------------
@@ -123,7 +123,7 @@ struct PinyinIntegerPref {
const char* pref_name; // Chrome preference name.
int default_pref_value;
const char* ibus_config_name;
- PrefService::PrefSyncStatus sync_status;
+ PrefServiceSyncable::PrefSyncStatus sync_status;
// TODO(yusukes): Add message_id if needed.
};
@@ -161,7 +161,7 @@ extern const int kXkbAutoRepeatIntervalInMs;
extern const char kPreferredKeyboardLayout[];
// Registers non-user prefs for the default keyboard layout on the login screen.
-void RegisterPrefs(PrefService* local_state);
+void RegisterPrefs(PrefServiceSimple* local_state);
} // language_prefs
} // chromeos

Powered by Google App Engine
This is Rietveld 408576698