summaryrefslogtreecommitdiffstats
path: root/app/l10n_util.cc
diff options
context:
space:
mode:
authorglotov@chromium.org <glotov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 17:47:40 +0000
committerglotov@chromium.org <glotov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 17:47:40 +0000
commitebbb4cb63575cab7623a9e2aa60a6f995684ae6a (patch)
treee04ee91a833ed32e10fdace893f9c50e3803b89c /app/l10n_util.cc
parent0deeafa87a239f5ec502248c7e680109e1cbd9ad (diff)
downloadchromium_src-ebbb4cb63575cab7623a9e2aa60a6f995684ae6a.zip
chromium_src-ebbb4cb63575cab7623a9e2aa60a6f995684ae6a.tar.gz
chromium_src-ebbb4cb63575cab7623a9e2aa60a6f995684ae6a.tar.bz2
Revert 41728 - Fix of the initial locale set.
BUG=35248 TEST=Switch the language used by the ChromiumOS using the top left corner menu of the Network selection wizard. Or you may use the following command on desktop using Chromium (built with GYP_DEFINES="chromeos=1"): out/Debug/chrome loginmanager loginscreen=network Check that the next time you start chromium, the selected language will be the default. Review URL: http://codereview.chromium.org/985001 TBR=glotov@google.com Review URL: http://codereview.chromium.org/1015006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/l10n_util.cc')
-rw-r--r--app/l10n_util.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/app/l10n_util.cc b/app/l10n_util.cc
index 94b93ad..727fe25 100644
--- a/app/l10n_util.cc
+++ b/app/l10n_util.cc
@@ -464,13 +464,6 @@ std::string GetApplicationLocale(const std::wstring& pref_locale) {
// Next, try the system locale.
candidates.push_back(system_locale);
-
-#elif defined(OS_CHROMEOS)
- // On ChromeOS, first, try user prefs. This restores the locale used
- // by the previous run of the OS.
- 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.