Index: content/ppapi_plugin/ppapi_plugin_main.cc |
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc |
index 4550e90637b316deffed870d0fb319b70c86e07b..734c8dc693433ff74827ccaa63629733189dbc58 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" |
@@ -11,6 +12,7 @@ |
#include "content/ppapi_plugin/ppapi_thread.h" |
#include "content/public/common/content_switches.h" |
#include "content/public/common/main_function_params.h" |
+#include "ui/base/ui_base_switches.h" |
raymes
2012/08/03 22:05:17
Wrong order.
|
#include "ppapi/proxy/proxy_module.h" |
#if defined(OS_WIN) |
@@ -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"); |