Allow country-specific languages in UI list at 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 <algorithm>
+
 #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/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
+#include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 namespace {
 
   // Manifest attributes names.
 const char kVersionAttr[] = "version";
 const char kDefaultAttr[] = "default";
 const char kInitialLocaleAttr[] = "initial_locale";
@@ skipping 247 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_);
+
+  std::for_each(configured_locales_.begin(),
+                configured_locales_.end(),
+                l10n_util::GetCanonicalLocale);
+
   // Let's always have configured_locales_.front() a valid entry.
   if (configured_locales_.size() == 0)
     configured_locales_.push_back(std::string());
 }
 
 const std::vector<std::string>&
 StartupCustomizationDocument::configured_locales() const {
   return configured_locales_;
 }
 
@@ skipping 340 matching lines @@
   g_test_services_customization_document->network_delay_ = base::TimeDelta();
 }
 
 // static
 void ServicesCustomizationDocument::ShutdownForTesting() {
   delete g_test_services_customization_document;
   g_test_services_customization_document = NULL;
 }
 
 }  // namespace chromeos