Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2061)

Unified Diff: android_webview/lib/main/webview_entry_point.cc

Issue 10831060: Refactor the Android port to allow access to the chrome layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gyp fixes Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 04a52dfa134b8a335a5c0d70c9173fa50ef7def1..2053910599c366a5bff4d07a43c2bcb3ce16f6dc 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/android_webview/lib/main/webview_entry_point.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "android_webview/lib/main/webview_main_delegate.h"
+#include "android_webview/native/android_webview_jni_registrar.h"
#include "base/android/jni_android.h"
#include "content/public/app/android_library_loader_hooks.h"
#include "content/public/app/content_main.h"
@@ -12,9 +13,11 @@
JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
base::android::InitVM(vm);
JNIEnv* env = base::android::AttachCurrentThread();
- if (!content::RegisterLibraryLoaderEntryHook(env)) {
+ if (!content::RegisterLibraryLoaderEntryHook(env))
+ return -1;
+
+ if (!android_webview::RegisterJni(env))
return -1;
- }
content::SetContentMainDelegate(new android_webview::WebViewMainDelegate());

Powered by Google App Engine
This is Rietveld 408576698