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

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/input_events_blocker.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 #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"
 
 namespace {
 
 const char kJsScreenPath[] = "login.NetworkScreen";
 
 // JS API callbacks names.
 const char kJsApiNetworkOnExit[] = "networkOnExit";
@@ skipping 211 matching lines @@
     if (!languages_list->GetDictionary(i, &language_info))
       NOTREACHED();
 
     std::string value;
     language_info->GetString("code", &value);
     std::string display_name;
     language_info->GetString("displayName", &display_name);
     std::string native_name;
     language_info->GetString("nativeDisplayName", &native_name);
 
+    // If it's option group divider, add field name.
+    if (value.empty())

[Dmitry Polukhin, 2014/01/28 19:40:30]

Please add {} because it if(true) statement has two lines and bellow please do
the same.
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Condit...

[Alexander Alekseev, 2014/01/29 15:39:00]

Done.

+      language_info->SetString("optionGroupName",
+                               l10n_util::GetStringUTF16(IDS_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);
     language_info->SetBoolean("selected", value == app_locale);
   }
   return languages_list;
@@ skipping 44 matching lines @@
     timezone_option->SetString("value", timezone_id);
     timezone_option->SetString("title", timezone_name);
     timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
     timezone_list->Append(timezone_option.release());
   }
 
   return timezone_list.release();
 }
 
 }  // namespace chromeos