Fix navigator.language in single process mode.

zcbenz · zcbenz · commit 6e0302b2ed4b · 2012-09-24T20:04:32.000+08:00
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -20,24 +20,20 @@
 
 #include "content/nw/src/shell_content_browser_client.h"
 
-#include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/threading/thread_restrictions.h"
-#include "content/public/common/content_switches.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/nw/src/browser/shell_devtools_delegate.h"
 #include "content/nw/src/browser/shell_resource_dispatcher_host_delegate.h"
-#include "content/nw/src/common/shell_switches.h"
 #include "content/nw/src/media/media_internals.h"
 #include "content/nw/src/shell.h"
 #include "content/nw/src/shell_browser_context.h"
 #include "content/nw/src/shell_browser_main_parts.h"
 #include "geolocation/shell_access_token_store.h"
 #include "googleurl/src/gurl.h"
-#include "ui/base/l10n/l10n_util.h"
 
 namespace content {
 
@@ -60,10 +56,6 @@ void ShellContentBrowserClient::RenderProcessHostCreated(
   render_process_id_ = host->GetID();
 }
 
-std::string ShellContentBrowserClient::GetApplicationLocale() {
-  return l10n_util::GetApplicationLocale("en-US");
-}
-
 void ShellContentBrowserClient::ResourceDispatcherHostCreated() {
   resource_dispatcher_host_delegate_.reset(
       new ShellResourceDispatcherHostDelegate());
diff --git a/src/shell_content_browser_client.h b/src/shell_content_browser_client.h
@@ -27,7 +27,6 @@ class ShellContentBrowserClient : public ContentBrowserClient {
   virtual BrowserMainParts* CreateBrowserMainParts(
       const MainFunctionParams& parameters) OVERRIDE;
   virtual void RenderProcessHostCreated(RenderProcessHost* host) OVERRIDE;
-  virtual std::string GetApplicationLocale() OVERRIDE;
   virtual void ResourceDispatcherHostCreated() OVERRIDE;
   virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
   virtual std::string GetDefaultDownloadName() OVERRIDE;
diff --git a/src/shell_main_delegate.cc b/src/shell_main_delegate.cc
@@ -34,8 +34,10 @@
 #include "content/nw/src/shell_browser_main.h"
 #include "content/nw/src/shell_content_browser_client.h"
 #include "third_party/node/src/node_version.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/base/ui_base_switches.h"
 
 #include <stdio.h>
 
@@ -105,6 +107,10 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   // Enforce single process
   command_line->AppendSwitch(switches::kSingleProcess);
 
+  // Fix navigator.language in single process mode
+  std::string locale = l10n_util::GetApplicationLocale("en-US");
+  command_line->AppendSwitchASCII(switches::kLang, locale);
+
   InitLogging();
 
   SetContentClient(&content_client_);
