diff options
| author | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 03:55:16 +0000 |
|---|---|---|
| committer | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 03:55:16 +0000 |
| commit | 62885abfdaced9bad3f119e5f4f15b81f34c02c6 (patch) | |
| tree | 97eba6bb62094c692561f9355d037a392e72e54f /android_webview/native | |
| parent | 62c607121a2c0b5bf463cd6da0fd568140523e30 (diff) | |
| download | chromium_src-62885abfdaced9bad3f119e5f4f15b81f34c02c6.zip chromium_src-62885abfdaced9bad3f119e5f4f15b81f34c02c6.tar.gz chromium_src-62885abfdaced9bad3f119e5f4f15b81f34c02c6.tar.bz2 | |
Move content/components/navigation_interception to src/components
BUG=169312
Review URL: https://chromiumcodereview.appspot.com/11830043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native')
| -rw-r--r-- | android_webview/native/DEPS | 1 | ||||
| -rw-r--r-- | android_webview/native/aw_contents.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/android_webview/native/DEPS b/android_webview/native/DEPS index 452c80b..6693d30 100644 --- a/android_webview/native/DEPS +++ b/android_webview/native/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+ui/gl", # Components that Android WebView depends on. + "+components/navigation_interception", "+components/web_contents_delegate_android", # TODO(joth): Remove if we can move the compositor driver into ../browser/ diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index e319f58..3750650 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" { |