Merge 149937 - Set the default locale for ICU in the PPAPI process.

BUG=140432

Review URL: https://chromiumcodereview.appspot.com/10853007

TBR=brettw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10834166

git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@149939 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 0 deletions

diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index 7f79f48..f9690ee 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -4,6 +4,7 @@
 
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
+#include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
@@ -12,6 +13,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "ppapi/proxy/proxy_module.h"
+#include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
@@ -45,6 +47,14 @@ int PpapiPluginMain(const content::MainFunctionParams& parameters) {
       ChildProcess::WaitForDebugger("Ppapi");
   }
 
+  // Set the default locale to be the current UI language. WebKit uses ICU's
+  // default locale for some font settings (especially switching between
+  // Japanese and Chinese fonts for the same characters).
+  if (command_line.HasSwitch(switches::kLang)) {
+    std::string locale = command_line.GetSwitchValueASCII(switches::kLang);
+    base::i18n::SetICUDefaultLocale(locale);
+  }
+
   MessageLoop main_message_loop;
   base::PlatformThread::SetName("CrPPAPIMain");