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

chrome/browser/chromeos/customization_document.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_CUSTOMIZATION_DOCUMENT_H_
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 
 #include <string>

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

<vector>

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

Done.

 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
@@ skipping 50 matching lines @@
  public:
   static StartupCustomizationDocument* GetInstance();
 
   std::string GetHelpPage(const std::string& locale) const;
   std::string GetEULAPage(const std::string& locale) const;
 
   const std::string& registration_url() const { return registration_url_; }
 
   // These methods can be called even if !IsReady(), in this case VPD values
   // will be returned.
+  //
+  // Raw value of "initial_locale" like initial_locale="en-US,sv,da,fi,no" .
   const std::string& initial_locale() const { return initial_locale_; }
+  // Vector of individual locale values.

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

nit: Insert empty line before comment (same below).

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

Done.

+  const std::vector<std::string>& configured_locales() const;
+  // configured_locales().front() - default locale value.

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

Please rewrite comment and remove configured_locales().front() mention. No need
to expose method implementation.

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

Done.

+  const std::string& initial_locale_default() const;
   const std::string& initial_timezone() const { return initial_timezone_; }
   const std::string& keyboard_layout() const { return keyboard_layout_; }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, VPD);
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, BadManifest);
   friend struct DefaultSingletonTraits<StartupCustomizationDocument>;
 
   // C-tor for singleton construction.
   StartupCustomizationDocument();
 
   // C-tor for test construction.
   StartupCustomizationDocument(system::StatisticsProvider* provider,
                                const std::string& manifest);
 
   virtual ~StartupCustomizationDocument();
 
   void Init(system::StatisticsProvider* provider);
 
   // If |attr| exists in machine stat, assign it to |value|.
   void InitFromMachineStatistic(const char* attr, std::string* value);
 
   std::string initial_locale_;
+  std::vector<std::string> configured_locales_;
   std::string initial_timezone_;
   std::string keyboard_layout_;
   std::string registration_url_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupCustomizationDocument);
 };
 
 // OEM services customization document class.
 // ServicesCustomizationDocument is fetched from network or local file but on
 // FILE thread therefore it may not be ready just after creation. Fetching of
@@ skipping 57 matching lines @@
 
   // How many times we already tried to fetch customization manifest file.
   int num_retries_;
 
   DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_