android_webview/native/android_webview_jni_registrar.cc - Issue 11365199: Move WebContentsDelegateAndroid to content/components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/native/android_webview_jni_registrar.cc

Issue 11365199: Move WebContentsDelegateAndroid to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: android_webview/native/android_webview_jni_registrar.cc

diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc

index 5c29e22dba55f7b2e8314b897123bb95deb4ddc7..e223ecd9e396bea2f717663eec190fd69549709f 100644

--- a/android_webview/native/android_webview_jni_registrar.cc

+++ b/android_webview/native/android_webview_jni_registrar.cc

@@ -15,8 +15,8 @@

#include "android_webview/native/js_result_handler.h"

#include "base/android/jni_android.h"

#include "base/android/jni_registrar.h"

-#include "chrome/browser/component/web_contents_delegate_android/component_jni_registrar.h"

#include "content/components/navigation_interception/component_jni_registrar.h"

+#include "content/components/web_contents_delegate_android/component_jni_registrar.h"

namespace android_webview {

@@ -24,7 +24,7 @@ static base::android::RegistrationMethod kWebViewRegisteredMethods[] = {

// Register JNI for components we depend on.

{ "navigation_interception", content::RegisterNavigationInterceptionJni },

{ "web_contents_delegate_android",

- web_contents_delegate_android::RegisterJni },

+ content::RegisterWebContentsDelegateAndroidJni },

// Register JNI for android_webview classes.

{ "AndroidProtocolHandler", RegisterAndroidProtocolHandler },

{ "AndroidStreamReaderUrlRequestJob",