The UI language rather than the locale is now used to pick Chrome's language ...

app/l10n_util.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <glib/gutils.h>
 #endif
 
+#include <algorithm>
 #include <cstdlib>
+#include <iterator>
 
 #include "app/app_paths.h"
 #include "app/l10n_util_collator.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "gfx/canvas.h"
 #include "unicode/rbbi.h"
 
 #if defined(OS_MACOSX)
 #include "app/l10n_util_mac.h"
+#elif defined(OS_WIN)
+#include "app/l10n_util_win.h"
 #endif
 
 namespace {
 
 #if defined(OS_WIN)
 static const FilePath::CharType kLocaleFileExtension[] = L".dll";
 #elif defined(OS_POSIX)
 static const FilePath::CharType kLocaleFileExtension[] = ".pak";
 #endif
 
@@ skipping 275 matching lines @@
 // cases.
 void AdjustParagraphDirectionality(string16* paragraph) {
 #if defined(OS_LINUX)
   if (base::i18n::IsRTL() &&
       base::i18n::StringContainsStrongRTLChars(*paragraph)) {
     paragraph->insert(0, 1, static_cast<char16>(base::i18n::kRightToLeftMark));
   }
 #endif
 }
 
+std::string GetCanonicalLocale(const std::string& locale) {
+  return base::i18n::GetCanonicalLocale(locale.c_str());
+}
+
 }  // namespace
 
 namespace l10n_util {
 
 std::string GetApplicationLocale(const std::string& pref_locale) {
 #if defined(OS_MACOSX)
 
   // Use any override (Cocoa for the browser), otherwise use the preference
   // passed to the function.
   std::string app_locale = l10n_util::GetLocaleOverride();
@@ skipping 24 matching lines @@
   // look at the LC_*/LANG environment variables.  We do, however, pass --lang
   // to renderer and plugin processes so they know what language the parent
   // process decided to use.
 
 #if defined(OS_WIN)
 
   // First, try the preference value.
   if (!pref_locale.empty())
     candidates.push_back(pref_locale);
 
-  // Next, try the system locale.
-  candidates.push_back(base::i18n::GetConfiguredLocale());
+  // Next, try the overridden locale.
+  const std::vector<std::string>& languages = l10n_util::GetLocaleOverrides();
+  if (!languages.empty()) {
+    candidates.reserve(candidates.size() + languages.size());
+    std::transform(languages.begin(), languages.end(),
+                   std::back_inserter(candidates), &GetCanonicalLocale);
+  } else {
+    // If no override was set, defer to ICU
+    candidates.push_back(base::i18n::GetConfiguredLocale());
+  }
 
 #elif defined(OS_CHROMEOS)
 
   // On ChromeOS, use the application locale preference.
   if (!pref_locale.empty())
     candidates.push_back(pref_locale);
 
 #elif defined(OS_POSIX) && defined(TOOLKIT_USES_GTK)
 
   // GLib implements correct environment variable parsing with
@@ skipping 470 matching lines @@
   for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
     if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale))
       // TODO(jungshik) : Put them at the of the list with language codes
       // enclosed by brackets instead of skipping.
         continue;
     locale_codes->push_back(kAcceptLanguageList[i]);
   }
 }
 
 }  // namespace l10n_util