Sync starting language and input method preferences

chrome/browser/chromeos/preferences.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 69 matching lines @@
 
   // A variant of SetLanguageConfigStringList. You can pass comma-separated
   // values. Examples of |value|: "", "Control+space,Hiragana"
   void SetLanguageConfigStringListAsCSV(const char* section,
                                         const char* name,
                                         const std::string& value);
 
   // Restores the user's preferred input method / keyboard layout on signing in.
   void SetInputMethodList();
 
+  // Parses and applies the local extension IME pref.
+  void SetEnabledExtensionImes();
+
+  // Copies local language and input method prefs to their global counterparts.
+  void SetSyncedLocalePrefs();
+
   // Updates the initial key repeat delay and key repeat interval following
   // current prefs values. We set the delay and interval at once since an
   // underlying XKB API requires it.
   void UpdateAutoRepeatRate();
 
   // Force natural scroll to on if --enable-natural-scroll-default is specified
   // on the cmd line.
   void ForceNaturalScrollDefault();
 
   // PrefServiceSyncableObserver implementation.
@@ skipping 17 matching lines @@
   BooleanPrefMember natural_scroll_;
   BooleanPrefMember vert_edge_scroll_enabled_;
   IntegerPrefMember speed_factor_;
   IntegerPrefMember mouse_sensitivity_;
   IntegerPrefMember touchpad_sensitivity_;
   BooleanPrefMember primary_mouse_button_right_;
   FilePathPrefMember download_default_directory_;
   BooleanPrefMember touch_hud_projection_enabled_;
 
   // Input method preferences.
-  StringPrefMember preload_engines_;
-  StringPrefMember current_input_method_;
   StringPrefMember previous_input_method_;
   StringPrefMember enabled_extension_imes_;
+  // Only apply the local variants to the device settings, since the user may
+  // have different hardware keyboards on their devices. We only use the global
+  // variants to note the user's most recent choices, and in the initial
+  // post-OOBE sync, we add the global most recent choices to the local values.
+  // This never affects existing profiles.
+  StringPrefMember preferred_languages_;
+  StringPrefMember preferred_languages_local_;
+  StringPrefMember preload_engines_;
+  StringPrefMember preload_engines_local_;
+  StringPrefMember current_input_method_;
+  StringPrefMember enabled_extension_imes_local_;
+
+  // Whether the global language/input method prefs should be merged into the
+  // local settings for this device. False if we have ever synced.
+  bool should_merge_locale_prefs_;
 
   BooleanPrefMember xkb_auto_repeat_enabled_;
   IntegerPrefMember xkb_auto_repeat_delay_pref_;
   IntegerPrefMember xkb_auto_repeat_interval_pref_;
 
   // User owning these preferences.
   const User* user_;
 
   // Whether user is a primary user.
   bool user_is_primary_;
 
   DISALLOW_COPY_AND_ASSIGN(Preferences);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_