android_webview/native/aw_contents.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: android_webview/native/aw_contents.cc

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

Patch Set: Rebase 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/aw_contents.cc

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

index e319f58b56df4eaa1951dd6dd8c7792cf3677a86..375065077e980a6bfe1350a2690b96f15c30bcfd 100644

--- a/android_webview/native/aw_contents.cc

+++ b/android_webview/native/aw_contents.cc

@@ -27,7 +27,7 @@

#include "base/pickle.h"

#include "base/supports_user_data.h"

#include "cc/layer.h"

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

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

#include "content/public/browser/android/content_view_core.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/cert_store.h"

@@ -65,9 +65,9 @@ using base::android::ConvertUTF8ToJavaString;

using base::android::JavaRef;

using base::android::ScopedJavaGlobalRef;

using base::android::ScopedJavaLocalRef;

+using components::InterceptNavigationDelegate;

using content::BrowserThread;

using content::ContentViewCore;

-using content::InterceptNavigationDelegate;

using content::WebContents;

extern "C" {

« no previous file with comments | « android_webview/native/DEPS ('k') | build/all.gyp » ('j') | no next file with comments »