Index: android_webview/lib/main/webview_entry_point.cc |
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc |
index 506334c96196db0f83736f2cdb345fdf8394c410..0b8b72fdbd08042b7ab76927a10ece3186382b26 100644 |
--- a/android_webview/lib/main/webview_entry_point.cc |
+++ b/android_webview/lib/main/webview_entry_point.cc |
@@ -10,6 +10,7 @@ |
#include "content/public/app/content_main.h" |
#include "content/public/browser/android/compositor.h" |
#include "content/public/common/content_switches.h" |
+#include "ui/base/ui_base_switches.h" |
// This is called by the VM when the shared library is first loaded. |
// Most of the initialization is done in LibraryLoadedOnMainThread(), not here. |
@@ -27,6 +28,12 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
CommandLine::ForCurrentProcess()->AppendSwitch( |
switches::kEnableWebViewSynchronousAPIs); |
+ // TODO: The default locale needs to be set in order to prevent assertion |
+ // failures in WebKit. However, this is really a single process mode issue |
+ // and should be properly fixed. See bug 153758. |
+ CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
+ switches::kLang, "en-US"); |
+ |
// TODO: The next two lines are temporarily required for the renderer |
// initialization to not crash. |
// See BUG 152904. |