summaryrefslogtreecommitdiffstats
path: root/components/web_contents_delegate_android
diff options
context:
space:
mode:
authormvanouwerkerk@chromium.org <mvanouwerkerk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-21 22:27:22 +0000
committermvanouwerkerk@chromium.org <mvanouwerkerk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-21 22:27:22 +0000
commit5cdc6a264395b84864159f388f27063ce9fc6c1e (patch)
tree3e493b02b9eb577c9f89420bc6779b32b4dba1ed /components/web_contents_delegate_android
parent0565a27e5b0a09193b3daea9710cc991e19a75e4 (diff)
downloadchromium_src-5cdc6a264395b84864159f388f27063ce9fc6c1e.zip
chromium_src-5cdc6a264395b84864159f388f27063ce9fc6c1e.tar.gz
chromium_src-5cdc6a264395b84864159f388f27063ce9fc6c1e.tar.bz2
Delete didProgrammaticallyScroll plumbing.
This code was part of the feature that allowed developers to hide the top controls (e.g. the url bar) by calling scrollTo. This feature was never launched and never will be. See bug for further details. BUG=295887 Review URL: https://codereview.chromium.org/26887008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/web_contents_delegate_android')
-rw-r--r--components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java9
-rw-r--r--components/web_contents_delegate_android/web_contents_delegate_android.cc10
-rw-r--r--components/web_contents_delegate_android/web_contents_delegate_android.h4
3 files changed, 0 insertions, 23 deletions
diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java
index 7db0705..8a655fc 100644
--- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java
+++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java
@@ -149,13 +149,4 @@ public class WebContentsDelegateAndroid {
public boolean isFullscreenForTabOrPending() {
return false;
}
-
- /**
- * Called from WebKit to request that the top controls be shown or hidden.
- * The implementation should call ContentViewCore.showTopControls to actually
- * show or hide the top controls.
- */
- @CalledByNative
- public void didProgrammaticallyScroll(int scrollX, int scrollY) {
- }
}
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc
index e5e7838..6b233dc 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc
@@ -309,16 +309,6 @@ bool WebContentsDelegateAndroid::IsFullscreenForTabOrPending(
env, obj.obj());
}
-void WebContentsDelegateAndroid::DidProgrammaticallyScroll(
- WebContents* web_contents, const gfx::Vector2d& scroll_point) {
- JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
- if (obj.is_null())
- return;
- Java_WebContentsDelegateAndroid_didProgrammaticallyScroll(
- env, obj.obj(), scroll_point.x(), scroll_point.y());
-}
-
// ----------------------------------------------------------------------------
// Native JNI methods
// ----------------------------------------------------------------------------
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h
index d375be9..5e88906 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.h
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.h
@@ -10,7 +10,6 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/web_contents_delegate.h"
-#include "ui/gfx/vector2d.h"
class GURL;
@@ -85,9 +84,6 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
bool enter_fullscreen) OVERRIDE;
virtual bool IsFullscreenForTabOrPending(
const content::WebContents* web_contents) const OVERRIDE;
- virtual void DidProgrammaticallyScroll(
- content::WebContents* web_contents,
- const gfx::Vector2d& scroll_point) OVERRIDE;
protected:
base::android::ScopedJavaLocalRef<jobject> GetJavaDelegate(JNIEnv* env) const;