Add application locale policy.

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"
 
 #include <cstdlib>
 
 #include "app/app_paths.h"
 #include "app/app_switches.h"
@@ skipping 363 matching lines @@
   PathService::Get(app::DIR_LOCALES, &locale_path);
   std::string resolved_locale;
   std::vector<std::string> candidates;
   const std::string system_locale = GetSystemLocale();
 
   // We only use --lang and the app pref on Windows.  On Linux, we only
   // 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, check to see if there's a --lang flag.
-  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-  const std::string& lang_arg =
-      parsed_command_line.GetSwitchValueASCII(switches::kLang);
-  if (!lang_arg.empty())
-    candidates.push_back(lang_arg);
-
-  // Second, try user prefs.
+  // First, try the preference value.
   if (!pref_locale.empty())
     candidates.push_back(WideToASCII(pref_locale));
 
   // Next, try the system locale.
   candidates.push_back(system_locale);
 
 #elif defined(OS_CHROMEOS)
-  // We use --lang on chroemos for debugging/troubleshooting purpose.
-  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-  const std::string& lang_arg =
-      parsed_command_line.GetSwitchValueASCII(switches::kLang);
-  if (!lang_arg.empty())
-    candidates.push_back(lang_arg);
-
-  // On ChromeOS, try user prefs. This restores the locale used by the
-  // previous run of the OS.
+  // On ChromeOS, use the application locale preference.
   if (!pref_locale.empty())
     candidates.push_back(WideToASCII(pref_locale));
 
 #elif defined(OS_POSIX)
   // On POSIX, we also check LANGUAGE environment variable, which is supported
   // by gettext to specify a priority list of prefered languages.
   const char* env_language = ::getenv("LANGUAGE");
   if (env_language)
     SplitAndNormalizeLanguageList(env_language, &candidates);
 
@@ skipping 20 matching lines @@
     return fallback_locale;
   }
 
   // No locale data file was found; we shouldn't get here.
   NOTREACHED();
 
   return std::string();
 
 #else  // !defined(OS_MACOSX)
 
-  // Use any override (Cocoa for the browser), otherwise use the command line
-  // argument.
+  // Use any override (Cocoa for the browser), otherwise use the preference
+  // passed to the function.
   std::string app_locale = l10n_util::GetLocaleOverride();
   if (app_locale.empty()) {
-    const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-    app_locale = parsed_command_line.GetSwitchValueASCII(switches::kLang);
+    app_locale = WideToASCII(pref_locale);
   }
 
   // The above should handle all of the cases Chrome normally hits, but for some
   // unit tests, we need something to fall back too.
   if (app_locale.empty())
     app_locale = "en-US";
 
   // Windows/Linux call SetICUDefaultLocale after determining the actual locale
   // with CheckAndResolveLocal to make ICU APIs work in that locale.
   // Mac doesn't use a locale directory tree of resources (it uses Mac style
@@ skipping 405 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