diff options
author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 21:27:28 +0000 |
---|---|---|
committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 21:27:28 +0000 |
commit | 8ae73b8a54edaec49c0f158e58e55098fe72e31a (patch) | |
tree | 0483f6f03f5f48730967e311363c0b8a89a769d1 /android_webview | |
parent | 8925704a862a5d26e073d08455825341f07f527c (diff) | |
download | chromium_src-8ae73b8a54edaec49c0f158e58e55098fe72e31a.zip chromium_src-8ae73b8a54edaec49c0f158e58e55098fe72e31a.tar.gz chromium_src-8ae73b8a54edaec49c0f158e58e55098fe72e31a.tar.bz2 |
Revert 166758 - Move navigation interception component to content/components
Broke the build at http://build.chromium.org/p/chromium.linux/builders/Android%20Builder%20%28dbg%29/builds/20261
Original commit message follows:
1. Move C++ source from chrome/browser/component/navigation_interception
to content/components/navigation_interception.
2. Change the namespace from navigation_interception:: to content::
3. Change Java package from org.chromium.chrome.browser.components.
navigation_interception to org.chromium.content.components.
navigation_interception.
I will follow up with another patch to completely remove
chrome/browser/component/navigation_interception once external
dependencies have been updated to use the component at its new
component
BUG=157575
Review URL: https://chromiumcodereview.appspot.com/11293017
TBR=jknotten@chromium.org
Review URL: https://codereview.chromium.org/11361177
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r-- | android_webview/Android.mk | 3 | ||||
-rw-r--r-- | android_webview/DEPS | 6 | ||||
-rw-r--r-- | android_webview/android_webview.gyp | 6 | ||||
-rw-r--r-- | android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc | 4 | ||||
-rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwContents.java | 2 | ||||
-rw-r--r-- | android_webview/native/android_webview_jni_registrar.cc | 4 | ||||
-rw-r--r-- | android_webview/native/aw_contents.cc | 4 |
7 files changed, 14 insertions, 15 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index c24fab7..8c424ed 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -29,8 +29,7 @@ LOCAL_SRC_FILES += \ # browser components LOCAL_SRC_FILES += \ $(call all-java-files-under, ../chrome/browser/component/web_contents_delegate_android/java/src) \ - $(call all-java-files-under, \ - ../content/components/navigation_interception/java/src) \ + $(call all-java-files-under, ../chrome/browser/component/navigation_interception/java/src) \ # TODO(mkosiba): Remove chromium_chrome dep once required browser # components are in (replace it with contentview). diff --git a/android_webview/DEPS b/android_webview/DEPS index 29747ce..2ae1b78 100644 --- a/android_webview/DEPS +++ b/android_webview/DEPS @@ -1,14 +1,14 @@ # Please include joth@ and (joi@ or erikwright@) on the review for any changes # to DEPS files under android_webview/ -# Do not add any includes under chrome/ anywhere in android_webview. +# With the exception of chrome/browser/component, do not add any includes under +# chrome/ anywhere in android_webview. include_rules = [ # lib is the top-level target, and must remain a leaf in the dependency tree. "-android_webview/lib", - "!chrome/browser/component", - "+content/components", + "+chrome/browser/component", "+content/public/common", "+jni", "+net", diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 99f1e05..e0e66f0 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -29,8 +29,8 @@ 'type': 'static_library', 'dependencies': [ '../content/content.gyp:content', - '../content/content.gyp:navigation_interception', '../android_webview/native/webview_native.gyp:webview_native', + '../chrome/browser/component/components.gyp:navigation_interception', '../chrome/browser/component/components.gyp:web_contents_delegate_android', '../chrome/browser/component/components.gyp:browser_component_jni_headers', '../ui/ui.gyp:ui_resources', @@ -105,7 +105,7 @@ 'type': 'none', 'dependencies': [ '../content/content.gyp:content_java', - '../content/content.gyp:navigation_interception_java', + '../chrome/browser/component/components.gyp:navigation_interception_java', '../chrome/browser/component/components.gyp:web_contents_delegate_android_java', '../ui/ui.gyp:ui_java', ], @@ -120,11 +120,11 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_java', + '../chrome/browser/component/components.gyp:navigation_interception_java', '../chrome/browser/component/components.gyp:web_contents_delegate_android_java', '../chrome/chrome_resources.gyp:packed_extra_resources', '../chrome/chrome_resources.gyp:packed_resources', '../content/content.gyp:content_java', - '../content/content.gyp:navigation_interception_java', '../media/media.gyp:media_java', '../net/net.gyp:net_java', '../ui/ui.gyp:ui_java', 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 c04a00f..387c3b9 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 @@ -9,7 +9,7 @@ #include "android_webview/common/url_constants.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "content/components/navigation_interception/intercept_navigation_delegate.h" +#include "chrome/browser/component/navigation_interception/intercept_navigation_delegate.h" #include "content/public/browser/resource_controller.h" #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/resource_dispatcher_host_login_delegate.h" @@ -18,7 +18,7 @@ #include "net/base/load_flags.h" #include "net/url_request/url_request.h" -using content::InterceptNavigationDelegate; +using navigation_interception::InterceptNavigationDelegate; namespace { diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index 3c018d5..800f160 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -20,11 +20,11 @@ import android.webkit.ValueCallback; import org.chromium.base.CalledByNative; import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.chrome.browser.component.navigation_interception.InterceptNavigationDelegate; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.LoadUrlParams; import org.chromium.content.browser.NavigationHistory; import org.chromium.content.common.CleanupReference; -import org.chromium.content.components.navigation_interception.InterceptNavigationDelegate; import org.chromium.net.X509Util; import org.chromium.ui.gfx.NativeWindow; diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc index 5c29e22..beb2fd8 100644 --- a/android_webview/native/android_webview_jni_registrar.cc +++ b/android_webview/native/android_webview_jni_registrar.cc @@ -15,14 +15,14 @@ #include "android_webview/native/js_result_handler.h" #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" +#include "chrome/browser/component/navigation_interception/component_jni_registrar.h" #include "chrome/browser/component/web_contents_delegate_android/component_jni_registrar.h" -#include "content/components/navigation_interception/component_jni_registrar.h" namespace android_webview { static base::android::RegistrationMethod kWebViewRegisteredMethods[] = { // Register JNI for components we depend on. - { "navigation_interception", content::RegisterNavigationInterceptionJni }, + { "navigation_interception", navigation_interception::RegisterJni }, { "web_contents_delegate_android", web_contents_delegate_android::RegisterJni }, // Register JNI for android_webview classes. diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index 1419646..9da03b3 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 "content/components/navigation_interception/intercept_navigation_delegate.h" +#include "chrome/browser/component/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; |