summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll_main.cc
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-19 19:50:48 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-19 19:50:48 +0000
commitd90de1c0fdaa6cb12b0d4a964ec7d9ff0a71e4d3 (patch)
tree09ff2947df75f74f6d26e8ba0390b2de13431553 /chrome/app/chrome_dll_main.cc
parentea0a1ff0dc20845fb28d172d28724420e60a7fb1 (diff)
downloadchromium_src-d90de1c0fdaa6cb12b0d4a964ec7d9ff0a71e4d3.zip
chromium_src-d90de1c0fdaa6cb12b0d4a964ec7d9ff0a71e4d3.tar.gz
chromium_src-d90de1c0fdaa6cb12b0d4a964ec7d9ff0a71e4d3.tar.bz2
Adds the application locale police that allows to enforce the kApplicationLocale preference.
bug=44504 test=none Review URL: http://codereview.chromium.org/2809058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
-rwxr-xr-x[-rw-r--r--]chrome/app/chrome_dll_main.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 9e3feb8..03dbac6 100644..100755
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -718,7 +718,14 @@ int ChromeMain(int argc, char** argv) {
// browser process as a command line flag.
DCHECK(parsed_command_line.HasSwitch(switches::kLang) ||
process_type == switches::kZygoteProcess);
- ResourceBundle::InitSharedInstance(std::wstring());
+
+ // TODO(markusheintz): The command line flag --lang is actually processed
+ // by the CommandLinePrefStore, and made available through the PrefService
+ // via the preference prefs::kApplicationLocale. The browser process uses
+ // the --lang flag to passe the value of the PrefService in here. Maybe this
+ // value could be passed in a different way.
+ ResourceBundle::InitSharedInstance(
+ parsed_command_line.GetSwitchValue(switches::kLang));
#if defined(OS_MACOSX)
// Update the process name (need resources to get the strings, so