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

Side by Side Diff: ui/events/blink/input_handler_proxy.h

Issue 2047093002: Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Remove unused, uninitialized variable on mac causing occasional failure Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_ 5 #ifndef UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_
6 #define UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_ 6 #define UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 29 matching lines...) Expand all
40 40
41 InputHandlerProxy(cc::InputHandler* input_handler, 41 InputHandlerProxy(cc::InputHandler* input_handler,
42 InputHandlerProxyClient* client); 42 InputHandlerProxyClient* client);
43 ~InputHandlerProxy() override; 43 ~InputHandlerProxy() override;
44 44
45 InputScrollElasticityController* scroll_elasticity_controller() { 45 InputScrollElasticityController* scroll_elasticity_controller() {
46 return scroll_elasticity_controller_.get(); 46 return scroll_elasticity_controller_.get();
47 } 47 }
48 48
49 void set_smooth_scroll_enabled(bool value) { smooth_scroll_enabled_ = value; } 49 void set_smooth_scroll_enabled(bool value) { smooth_scroll_enabled_ = value; }
50 void set_use_gesture_events_for_mouse_wheel(bool value) {
51 use_gesture_events_for_mouse_wheel_ = value;
52 }
53 50
54 enum EventDisposition { 51 enum EventDisposition {
55 DID_HANDLE, 52 DID_HANDLE,
56 DID_NOT_HANDLE, 53 DID_NOT_HANDLE,
57 DID_HANDLE_NON_BLOCKING, 54 DID_HANDLE_NON_BLOCKING,
58 DROP_EVENT 55 DROP_EVENT
59 }; 56 };
60 EventDisposition HandleInputEventWithLatencyInfo( 57 EventDisposition HandleInputEventWithLatencyInfo(
61 const blink::WebInputEvent& event, 58 const blink::WebInputEvent& event,
62 ui::LatencyInfo* latency_info); 59 ui::LatencyInfo* latency_info);
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 194
198 // Non-zero only within the scope of |scrollBy|. 195 // Non-zero only within the scope of |scrollBy|.
199 gfx::Vector2dF current_fling_velocity_; 196 gfx::Vector2dF current_fling_velocity_;
200 197
201 // Used to animate rubber-band over-scroll effect on Mac. 198 // Used to animate rubber-band over-scroll effect on Mac.
202 std::unique_ptr<InputScrollElasticityController> 199 std::unique_ptr<InputScrollElasticityController>
203 scroll_elasticity_controller_; 200 scroll_elasticity_controller_;
204 201
205 bool smooth_scroll_enabled_; 202 bool smooth_scroll_enabled_;
206 bool uma_latency_reporting_enabled_; 203 bool uma_latency_reporting_enabled_;
207 bool use_gesture_events_for_mouse_wheel_;
208 204
209 // The merged result of the last touch start with previous touch starts. 205 // The merged result of the last touch start with previous touch starts.
210 // This value will get returned for subsequent TouchMove events to allow 206 // This value will get returned for subsequent TouchMove events to allow
211 // passive events not to block scrolling. 207 // passive events not to block scrolling.
212 int32_t touch_start_result_; 208 int32_t touch_start_result_;
213 209
214 base::TimeTicks last_fling_animate_time_; 210 base::TimeTicks last_fling_animate_time_;
215 211
216 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); 212 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy);
217 }; 213 };
218 214
219 } // namespace ui 215 } // namespace ui
220 216
221 #endif // UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_ 217 #endif // UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/layout_test/layout_test_content_renderer_client.cc ('k') | ui/events/blink/input_handler_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698