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

chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index e568e45f267f33e66ae4f6cd6b4c56bf80d6adf8..1869885996ef1a32f91f546694b25e52fc11c783 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -22,6 +22,7 @@
 #include "chromeos/ime/input_method_manager.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
@@ -253,10 +254,17 @@ base::ListValue* NetworkScreenHandler::GetLanguageList() {
     std::string native_name;
     language_info->GetString("nativeDisplayName", &native_name);
 
-    if (display_name != native_name)
+    // If it's option group divider, add field name.
+    if (value.empty()) {

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

nit: Check for a specific constant instead.

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

Done.

+      language_info->SetString(
+          "optionGroupName",
+          l10n_util::GetStringUTF16(IDS_OOBE_OTHER_LANGUAGES));
+    }
+    if (display_name != native_name) {
       display_name = base::StringPrintf("%s - %s",
                                         display_name.c_str(),
                                         native_name.c_str());
+    }
 
     language_info->SetString("value", value);
     language_info->SetString("title", display_name);