android_webview/native/aw_contents.cc - Issue 11293017: Move navigation interception component 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/aw_contents.cc

Issue 11293017: Move navigation interception component to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add findbugs suppression for compatibility code. 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/aw_contents.cc

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

index 9da03b318f16e1a8ce901c5a7cbe5c1943d8091f..1419646fad98b8cf38761f1b86801dac18cf3b14 100644

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

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

@@ -16,7 +16,7 @@

#include "base/bind.h"

#include "base/callback.h"

#include "base/supports_user_data.h"

-#include "chrome/browser/component/navigation_interception/intercept_navigation_delegate.h"

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

@@ -36,8 +36,8 @@ using base::android::ScopedJavaGlobalRef;

using base::android::ScopedJavaLocalRef;

using content::BrowserThread;

using content::ContentViewCore;

+using content::InterceptNavigationDelegate;

using content::WebContents;

-using navigation_interception::InterceptNavigationDelegate;

extern "C" {

static AwGLDrawFunction GLDrawFunction;