diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 12:38:53 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 12:38:53 +0000 |
| commit | 8812e3d07c527b8fd43e4bb27b6a4c886bb888b5 (patch) | |
| tree | ba91c0a948a6bd0186e541093336f17f07f99517 /android_webview | |
| parent | dcc35f7f72212aff1a2f88c2502b4006175c60e0 (diff) | |
| download | chromium_src-8812e3d07c527b8fd43e4bb27b6a4c886bb888b5.zip chromium_src-8812e3d07c527b8fd43e4bb27b6a4c886bb888b5.tar.gz chromium_src-8812e3d07c527b8fd43e4bb27b6a4c886bb888b5.tar.bz2 | |
components: Move navigation_interception into navigation_interception namespace.
BUG=238221
R=joi@chromium.org, joth@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/15402004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc | 2 | ||||
| -rw-r--r-- | android_webview/lib/main/webview_entry_point.cc | 2 | ||||
| -rw-r--r-- | android_webview/native/aw_contents.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc index 4c73893..34b6ada 100644 --- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc +++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc @@ -24,8 +24,8 @@ #include "net/url_request/url_request.h" using android_webview::AwContentsIoThreadClient; -using components::InterceptNavigationDelegate; using content::BrowserThread; +using navigation_interception::InterceptNavigationDelegate; namespace { diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc index e005098..8b8b039 100644 --- a/android_webview/lib/main/webview_entry_point.cc +++ b/android_webview/lib/main/webview_entry_point.cc @@ -14,7 +14,7 @@ static base::android::RegistrationMethod kWebViewDependencyRegisteredMethods[] = { { "NavigationInterception", - components::RegisterNavigationInterceptionJni }, + navigation_interception::RegisterNavigationInterceptionJni }, { "WebContentsDelegateAndroid", components::RegisterWebContentsDelegateAndroidJni }, }; diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index 22675f8..359ecbb 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -58,7 +58,7 @@ using base::android::ConvertUTF8ToJavaString; using base::android::JavaRef; using base::android::ScopedJavaGlobalRef; using base::android::ScopedJavaLocalRef; -using components::InterceptNavigationDelegate; +using navigation_interception::InterceptNavigationDelegate; using content::BrowserThread; using content::ContentViewCore; using content::WebContents; |