Index: chrome/browser/chromeos/preferences.h |
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h |
index ec85a01684d93bf194b89f49ec023005737e8858..57d58dc4a699527731c0dacddf8ebb925025ec84 100644 |
--- a/chrome/browser/chromeos/preferences.h |
+++ b/chrome/browser/chromeos/preferences.h |
@@ -17,6 +17,9 @@ |
class PrefService; |
namespace chromeos { |
+namespace input_method { |
+class InputMethodManager; |
+} // namespace input_method |
// The Preferences class handles Chrome OS preferences. When the class |
// is first initialized, it will initialize the OS settings to what's stored in |
@@ -25,6 +28,8 @@ namespace chromeos { |
class Preferences : public content::NotificationObserver { |
public: |
Preferences(); |
+ explicit Preferences( |
+ input_method::InputMethodManager* input_method_manager); // for testing |
virtual ~Preferences(); |
// This method will register the prefs associated with Chrome OS settings. |
@@ -42,7 +47,13 @@ class Preferences : public content::NotificationObserver { |
const content::NotificationSource& source, |
const content::NotificationDetails& details) OVERRIDE; |
+ void InitUserPrefsForTesting(PrefService* prefs); |
+ void SetInputMethodListForTesting(); |
+ |
private: |
+ // Initializes all member prefs. |
+ void InitUserPrefs(PrefService* prefs); |
+ |
// 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. |
@@ -79,6 +90,9 @@ class Preferences : public content::NotificationObserver { |
const char* name, |
const std::string& value); |
+ // Restores the user's preferred input method / keyboard layout on signing in. |
+ void SetInputMethodList(); |
+ |
// Updates the mapping of modifier keys following current prefs values. |
void UpdateModifierKeyMapping(); |
@@ -87,6 +101,8 @@ class Preferences : public content::NotificationObserver { |
// underlying XKB API requires it. |
void UpdateAutoRepeatRate(); |
+ input_method::InputMethodManager* input_method_manager_; |
+ |
BooleanPrefMember tap_to_click_enabled_; |
BooleanPrefMember natural_scroll_; |
BooleanPrefMember vert_edge_scroll_enabled_; |