content/components/navigation_interception/intercept_navigation_delegate.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: content/components/navigation_interception/intercept_navigation_delegate.cc

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

Patch Set: Created 8 years, 2 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

« content/components/navigation_interception/DEPS ('K') | « content/components/navigation_interception/intercept_navigation_delegate.h ('k') | content/components/navigation_interception/intercept_navigation_resource_throttle.h » ('j') | content/components/navigation_interception/intercept_navigation_resource_throttle.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/components/navigation_interception/intercept_navigation_delegate.cc

diff --git a/chrome/browser/component/navigation_interception/intercept_navigation_delegate.cc b/content/components/navigation_interception/intercept_navigation_delegate.cc

similarity index 90%

rename from chrome/browser/component/navigation_interception/intercept_navigation_delegate.cc

rename to content/components/navigation_interception/intercept_navigation_delegate.cc

index 3b934fa4f0a338066f1edb7176a61e202893791b..9e1c268c1fb9eb9fc24608733ccd89ed39e26759 100644

--- a/chrome/browser/component/navigation_interception/intercept_navigation_delegate.cc

+++ b/content/components/navigation_interception/intercept_navigation_delegate.cc

@@ -2,17 +2,17 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include "base/android/jni_android.h"

#include "base/android/jni_string.h"

#include "base/callback.h"

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

+#include "content/components/navigation_interception/intercept_navigation_resource_throttle.h"

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

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

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

#include "googleurl/src/gurl.h"

-#include "jni/InterceptNavigationDelegate_jni.h"

+#include "navigation_interception/jni/InterceptNavigationDelegate_jni.h"

#include "net/url_request/url_request.h"

using base::android::ConvertUTF8ToJavaString;

@@ -21,7 +21,7 @@ using content::BrowserThread;

using content::RenderViewHost;

using content::WebContents;

-namespace navigation_interception {

+namespace content {

namespace {

@@ -106,4 +106,4 @@ bool RegisterInterceptNavigationDelegate(JNIEnv* env) {

return RegisterNativesImpl(env);

}

-} // namespace navigation_interception

+} // content