android_webview/native/android_webview_jni_registrar.cc - Issue 11823046: Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

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 11823046: Move content/components/web_contents_delegate_android to components/web_contents_delegate_android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix DEPS, namespace content->components. Ready for review. Created 7 years, 11 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/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 486329550e25b89814e10cbd09f0caafff0b5f0c..a177cdfb6857d76e25d1c58e5c589dfc74df2636 100644

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

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

@@ -16,8 +16,8 @@

#include "android_webview/native/js_result_handler.h"

#include "base/android/jni_android.h"

#include "base/android/jni_registrar.h"

+#include "components/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 {

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

// Register JNI for components we depend on.

{ "navigation_interception", content::RegisterNavigationInterceptionJni },

{ "web_contents_delegate_android",

- content::RegisterWebContentsDelegateAndroidJni },

+ components::RegisterWebContentsDelegateAndroidJni },

// Register JNI for android_webview classes.

{ "AndroidProtocolHandler", RegisterAndroidProtocolHandler },

{ "AwContents", RegisterAwContents },

« android_webview/native/DEPS ('K') | « android_webview/native/DEPS ('k') | android_webview/native/aw_web_contents_delegate.h » ('j') | chrome/browser/DEPS » ('J')