summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/DEPS3
-rw-r--r--chrome/browser/android/chrome_jni_registrar.cc4
-rw-r--r--chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc5
3 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 00ea7c6..55e162e 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -6,10 +6,9 @@ include_rules = [
"+chrome/tools/profiles", # For history unit tests.
"+chromeos",
"+components/auto_login_parser",
+ "+components/navigation_interception",
"+components/visitedlink/browser",
"+components/web_contents_delegate_android",
- # TODO(boliu): Remove when content/components is moved to components.
- "+content/components",
"+content/public/browser",
"+device/bluetooth",
"+device/media_transfer_protocol",
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index a3f9f8a..2fca549 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -18,15 +18,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.
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 5ee7d58..1128b52 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -55,7 +55,7 @@
#endif
#if defined(OS_ANDROID)
-#include "content/components/navigation_interception/intercept_navigation_delegate.h"
+#include "components/navigation_interception/intercept_navigation_delegate.h"
#endif
#if defined(OS_CHROMEOS)
@@ -153,8 +153,7 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
#if defined(OS_ANDROID)
if (!is_prerendering && resource_type == ResourceType::MAIN_FRAME) {
throttles->push_back(
- content::InterceptNavigationDelegate::CreateThrottleFor(
- request));
+ components::InterceptNavigationDelegate::CreateThrottleFor(request));
}
#endif
#if defined(OS_CHROMEOS)