diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 19:42:54 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 19:42:54 +0000 |
| commit | fa202fd676d44a25fd67bc7ff2ad618633f92715 (patch) | |
| tree | c03bcbf60b1d2cecfe75ef125c0156409ef0e50b /content/port/browser | |
| parent | cc8d95de1aaf0e3cb79799a1b444dfb3d0820c12 (diff) | |
| download | chromium_src-fa202fd676d44a25fd67bc7ff2ad618633f92715.zip chromium_src-fa202fd676d44a25fd67bc7ff2ad618633f92715.tar.gz chromium_src-fa202fd676d44a25fd67bc7ff2ad618633f92715.tar.bz2 | |
Upstream hooks for javascript touch handlers on Android.
Review URL: https://chromiumcodereview.appspot.com/11195033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/port/browser')
| -rw-r--r-- | content/port/browser/render_view_host_delegate_view.h | 6 | ||||
| -rw-r--r-- | content/port/browser/render_widget_host_view_port.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/content/port/browser/render_view_host_delegate_view.h b/content/port/browser/render_view_host_delegate_view.h index f2b02ff5..b59d6e0 100644 --- a/content/port/browser/render_view_host_delegate_view.h +++ b/content/port/browser/render_view_host_delegate_view.h @@ -67,12 +67,6 @@ class CONTENT_EXPORT RenderViewHostDelegateView { // retrieved by doing a Shift-Tab. virtual void TakeFocus(bool reverse) {} -#if defined(OS_ANDROID) - // Called when an unhandled touch event is sent back from the renderer. - // TODO(joth): This should be pure virtual. - virtual void ConfirmTouchEvent(bool handled) {} -#endif - protected: virtual ~RenderViewHostDelegateView() {} }; diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h index 45c0a5d..7667066 100644 --- a/content/port/browser/render_widget_host_view_port.h +++ b/content/port/browser/render_widget_host_view_port.h @@ -232,7 +232,7 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView { virtual void UpdateFrameInfo(const gfx::Point& scroll_offset, float page_scale_factor, const gfx::Size& content_size) = 0; - virtual void DidSetNeedTouchEvents(bool need_touch_events) = 0; + virtual void HasTouchEventHandlers(bool need_touch_events) = 0; #endif virtual void AcceleratedSurfaceNew( |