Override lang setting from cmdline argument

rogerwang · rogerwang · commit 49a5981d5569 · 2013-10-28T09:56:50.000+08:00
diff --git a/src/net/shell_url_request_context_getter.cc b/src/net/shell_url_request_context_getter.cc
@@ -31,6 +31,7 @@
 #include "content/nw/src/net/app_protocol_handler.h"
 #include "content/nw/src/nw_protocol_handler.h"
 #include "content/nw/src/nw_shell.h"
+#include "content/nw/src/shell_content_browser_client.h"
 #include "net/cert/cert_verifier.h"
 #include "net/ssl/default_server_bound_cert_store.h"
 #include "net/dns/host_resolver.h"
@@ -109,7 +110,11 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!url_request_context_.get()) {
-    url_request_context_.reset(new net::URLRequestContext());
+    ShellContentBrowserClient* browser_client =
+      static_cast<ShellContentBrowserClient*>(
+          GetContentClient()->browser());
+
+  url_request_context_.reset(new net::URLRequestContext());
     network_delegate_.reset(new ShellNetworkDelegate);
     url_request_context_->set_network_delegate(network_delegate_.get());
     storage_.reset(
@@ -132,7 +137,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
         new net::DefaultServerBoundCertStore(NULL),
         base::WorkerPool::GetTaskRunner(true)));
 
-    std::string accept_lang = l10n_util::GetApplicationLocale(std::string());
+    std::string accept_lang = browser_client->GetApplicationLocale();
     if (accept_lang.empty())
       accept_lang = "en-us,en";
     else
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -56,6 +56,7 @@
 #include "geolocation/shell_access_token_store.h"
 #include "url/gurl.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/ui_base_switches.h"
 #include "content/common/dom_storage/dom_storage_map.h"
 #include "webkit/common/webpreferences.h"
 #include "webkit/common/user_agent/user_agent_util.h"
@@ -135,7 +136,12 @@ WebContentsViewPort* ShellContentBrowserClient::OverrideCreateWebContentsView(
 }
 
 std::string ShellContentBrowserClient::GetApplicationLocale() {
-  return l10n_util::GetApplicationLocale(std::string());
+  CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  std::string pref_locale;
+  if (cmd_line->HasSwitch(switches::kLang)) {
+    pref_locale = cmd_line->GetSwitchValueASCII(switches::kLang);
+  }
+  return l10n_util::GetApplicationLocale(pref_locale);
 }
 
 void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
diff --git a/src/shell_main_delegate.cc b/src/shell_main_delegate.cc
@@ -137,6 +137,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
 
 void ShellMainDelegate::PreSandboxStartup() {
   breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
 
 #if defined(OS_MACOSX)
   OverrideFrameworkBundlePath();
@@ -145,7 +146,6 @@ void ShellMainDelegate::PreSandboxStartup() {
 #endif  // OS_MACOSX
   InitializeResourceBundle();
 
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line->GetSwitchValueASCII(switches::kProcessType);
 
