Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(882)

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.h

Issue 11028144: touch: Cleanup touch-event mode switching on windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_win.h
diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h
index 23153354827e4389c76139741feee147de62c81f..0ef7d177d88c98ac9c9ae019de6dd9891a7d320a 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.h
+++ b/content/browser/renderer_host/render_widget_host_view_win.h
@@ -201,8 +201,7 @@ class RenderWidgetHostViewWin
const base::Callback<void(bool)>& callback,
skia::PlatformBitmap* output) OVERRIDE;
virtual void OnAcceleratedCompositingStateChange() OVERRIDE;
- virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type,
- bool processed) OVERRIDE;
+ virtual void ProcessTouchAck(bool processed) OVERRIDE;
virtual void SetHasHorizontalScrollbar(
bool has_horizontal_scrollbar) OVERRIDE;
virtual void SetScrollOffsetPinning(
@@ -407,15 +406,9 @@ class RenderWidgetHostViewWin
// a WM_POINTERDOWN message.
void ResetPointerDownContext();
- // Switches between raw-touches mode and gesture mode. Currently touch mode
- // will only take effect when kEnableTouchEvents is in effect.
- void UpdateDesiredTouchMode(bool touch);
-
- // Set window to receive gestures.
- void SetToGestureMode();
-
- // Set window to raw touch events. Returns whether registering was successful.
- bool SetToTouchMode();
+ // Sets the appropriate mode for raw-touches or gestures. Currently touch mode
+ // will only take effect when kEnableTouchEvents is in effect (on Win7+).
+ void UpdateDesiredTouchMode();
// Configures the enable/disable state of |ime_input_| to match with the
// current |text_input_type_|.

Powered by Google App Engine
This is Rietveld 408576698