| Index: chrome/common/common_glue.cc
|
| diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc
|
| index 95417ab133150eb95942f38dba95f8c38129d78b..71312bbee0cc3afefb0fbea3b8d0c29880d3f03e 100644
|
| --- a/chrome/common/common_glue.cc
|
| +++ b/chrome/common/common_glue.cc
|
| @@ -29,13 +29,13 @@ bool IsPluginRunningInRendererProcess() {
|
| return !IsPluginProcess();
|
| }
|
|
|
| -std::wstring GetWebKitLocale() {
|
| +std::string GetWebKitLocale() {
|
| // The browser process should have passed the locale to the renderer via the
|
| // --lang command line flag. In single process mode, this will return the
|
| // wrong value. TODO(tc): Fix this for single process mode.
|
| const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
|
| - const std::wstring& lang =
|
| - parsed_command_line.GetSwitchValue(switches::kLang);
|
| + const std::string& lang =
|
| + parsed_command_line.GetSwitchValueASCII(switches::kLang);
|
| DCHECK(!lang.empty() ||
|
| (!parsed_command_line.HasSwitch(switches::kRendererProcess) &&
|
| !parsed_command_line.HasSwitch(switches::kPluginProcess)));
|
|
|