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

chrome/browser/chromeos/customization_document.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/chromeos/customization_document.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/system/statistics_provider.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 180 matching lines @@
     }
   }
 
   // If manifest doesn't exist still apply values from VPD.
   statistics_provider->GetMachineStatistic(kInitialLocaleAttr,
                                            &initial_locale_);
   statistics_provider->GetMachineStatistic(kInitialTimezoneAttr,
                                            &initial_timezone_);
   statistics_provider->GetMachineStatistic(kKeyboardLayoutAttr,
                                            &keyboard_layout_);
+  configured_locales_.resize(0);
+  base::SplitString(initial_locale_, ',', &configured_locales_);
+  // Let's always have configured_locales_.front() a valid entry.
+  if (configured_locales_.size() == 0)
+    configured_locales_.push_back(std::string());

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

I think this breaks assumptions.
If initial_locale VPD value is empty then configured_locales() getter should
return empty vector. One could even check its size.

Caller of configured_locales() should not check its content for valid values.

Just make initial_locale_default() return empty string in that case.

Another thing should always happen: if initial_locale_default() is empty string
(i.e. empty VPD values + customization manifest missing), locale will be en-US.
I think this already is the case.

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

In offline discussion we've decided to leave this as is.

On 2014/01/30 13:23:28, Nikita Kostylev wrote:

+}
+
+const std::vector<std::string>&
+StartupCustomizationDocument::configured_locales() const {
+  return configured_locales_;
+}
+
+const std::string& StartupCustomizationDocument::initial_locale_default()
+    const {
+  DCHECK(configured_locales_.size() > 0);
+  return configured_locales_.front();
 }
 
 std::string StartupCustomizationDocument::GetHelpPage(
     const std::string& locale) const {
   return GetLocaleSpecificString(locale, kSetupContentAttr, kHelpPageAttr);
 }
 
 std::string StartupCustomizationDocument::GetEULAPage(
     const std::string& locale) const {
   return GetLocaleSpecificString(locale, kSetupContentAttr, kEulaPageAttr);
@@ skipping 110 matching lines @@
       locale, kAppContentAttr, kInitialStartPageAttr);
 }
 
 std::string ServicesCustomizationDocument::GetSupportPage(
     const std::string& locale) const {
   return GetLocaleSpecificString(
       locale, kAppContentAttr, kSupportPageAttr);
 }
 
 }  // namespace chromeos