chrome/browser/android/chrome_jni_registrar.cc - Issue 11830043: Move content/components/navigation_interception to src/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: chrome/browser/android/chrome_jni_registrar.cc

Issue 11830043: Move content/components/navigation_interception to src/components (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix win build 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

« android_webview/lib/main/webview_entry_point.cc ('K') | « chrome/browser/DEPS ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index a55a797a3beba7016f938b958d9e6a284e82398f..9c36e307faade9b9766e58c5c8113faa2cf92ed9 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -17,15 +17,15 @@

#include "chrome/browser/ui/android/chrome_http_auth_handler.h"

#include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"

#include "chrome/browser/ui/android/navigation_popup.h"

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

#include "components/web_contents_delegate_android/component_jni_registrar.h"

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

namespace chrome {

namespace android {

static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

// Register JNI for components we depend on.

- { "NavigationInterception", content::RegisterNavigationInterceptionJni },

+ { "NavigationInterception", components::RegisterNavigationInterceptionJni },

{ "WebContentsDelegateAndroid",

components::RegisterWebContentsDelegateAndroidJni },

// Register JNI for chrome classes.