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

Unified Diff: content/browser/renderer_host/input/touch_emulator.h

Issue 821223002: Pass gesture detector config type when enabling touch emulator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@touch-emulator-enabled
Patch Set: Rebased; storing config type Created 5 years, 11 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/input/touch_emulator.h
diff --git a/content/browser/renderer_host/input/touch_emulator.h b/content/browser/renderer_host/input/touch_emulator.h
index ea74f6292f849e06a94a8a600453a2595355ce81..f7d53dda30bc416a2a9348b59c18f697f2437656 100644
--- a/content/browser/renderer_host/input/touch_emulator.h
+++ b/content/browser/renderer_host/input/touch_emulator.h
@@ -10,6 +10,7 @@
#include "content/common/input/input_event_ack_state.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/events/gesture_detection/filtered_gesture_provider.h"
+#include "ui/events/gesture_detection/gesture_provider_config_helper.h"
#include "ui/gfx/geometry/size_f.h"
namespace content {
@@ -20,7 +21,7 @@ class CONTENT_EXPORT TouchEmulator : public ui::GestureProviderClient {
explicit TouchEmulator(TouchEmulatorClient* client);
~TouchEmulator() override;
- void Enable();
+ void Enable(ui::GestureProviderConfigType config_type);
void Disable();
// Note that TouchEmulator should always listen to touch events and their acks
@@ -76,6 +77,7 @@ class CONTENT_EXPORT TouchEmulator : public ui::GestureProviderClient {
// Disabled emulator does only process touch acks left from previous
// emulation. It does not intercept any events.
scoped_ptr<ui::FilteredGestureProvider> gesture_provider_;
+ ui::GestureProviderConfigType gesture_provider_config_type_;
// While emulation is on, default cursor is touch. Pressing shift changes
// cursor to the pinch one.

Powered by Google App Engine
This is Rietveld 408576698