Expand VPD initial_locale to a list of locales. Use the expanded VPD initial_locale on the OOBE.

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h

Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
index 32bf026b16a7813b834a4d6357f6277148c1ce0d..fe5545712eca8b8893221feeba4e8b6f574f1e18 100644
--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
@@ -46,6 +46,8 @@ class CrosLanguageOptionsHandler
   // The return value will look like:
   // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'},
   //  ...]
+  // "most relevant" languages, as set in initial_locale in VPD, will be first
+  // in the list.
   static base::ListValue* GetAcceptLanguageList(
       const input_method::InputMethodDescriptors& descriptors);
 
@@ -53,6 +55,10 @@ class CrosLanguageOptionsHandler
   // The return value will look like:
   // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'},
   //  ...]
+  //   "most relevant" languages, as set in initial_locale in VPD, will be first
+  // in the list.
+  //   An entry with empty "code" is used as a divider to separate "most

[Nikita (slow), 2014/01/30 13:23:28]

nit: Update comment to reflect that divider constant.

[Alexander Alekseev, 2014/01/31 12:46:54]

Done.

+  // relevant" languages against other.
   static base::ListValue* GetUILanguageList(
       const input_method::InputMethodDescriptors& descriptors);
 
@@ -88,9 +94,12 @@ class CrosLanguageOptionsHandler
 
   // Gets the list of languages with |descriptors| based on
   // |base_language_codes|.
+  // |insert_divider| means to insert empty string between "most relevant"
+  // languages and other.
   static base::ListValue* GetLanguageListInternal(
       const input_method::InputMethodDescriptors& descriptors,
-      const std::vector<std::string>& base_language_codes);
+      const std::vector<std::string>& base_language_codes,
+      bool insert_divider);
 
   // OptionsPageUIHandler implementation.
   virtual void InitializePage() OVERRIDE;