diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-24 13:19:37 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-24 13:19:37 +0000 |
| commit | a6e8c49d3b1d9981ebd0e56a89ffc1c79543eb19 (patch) | |
| tree | ca2df2ebfa9314623de454fbe96d2f5e33863d41 /android_webview/lib/main/webview_entry_point.cc | |
| parent | a9a064bff8415c30fb4f25ceac2cd6d61e44da54 (diff) | |
| download | chromium_src-a6e8c49d3b1d9981ebd0e56a89ffc1c79543eb19.zip chromium_src-a6e8c49d3b1d9981ebd0e56a89ffc1c79543eb19.tar.gz chromium_src-a6e8c49d3b1d9981ebd0e56a89ffc1c79543eb19.tar.bz2 | |
Set kEnableWebViewSynchronousAPIs later
Currently it's set too early, and gets overritten when
LibraryLoadedOnMainThread re-initializes the command line.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11662018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/lib/main/webview_entry_point.cc')
| -rw-r--r-- | android_webview/lib/main/webview_entry_point.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc index 8a4996f..567161e 100644 --- a/android_webview/lib/main/webview_entry_point.cc +++ b/android_webview/lib/main/webview_entry_point.cc @@ -5,10 +5,8 @@ #include "android_webview/lib/main/aw_main_delegate.h" #include "android_webview/native/android_webview_jni_registrar.h" #include "base/android/jni_android.h" -#include "base/command_line.h" #include "content/public/app/android_library_loader_hooks.h" #include "content/public/app/content_main.h" -#include "content/public/common/content_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. @@ -21,11 +19,6 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { if (!android_webview::RegisterJni(env)) return -1; - // Set the command line to enable synchronous API compatibility. - CommandLine::Init(0, NULL); - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableWebViewSynchronousAPIs); - content::SetContentMainDelegate(new android_webview::AwMainDelegate()); return JNI_VERSION_1_4; |