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

Side by Side Diff: content/renderer/input/input_handler_wrapper.h

Issue 2050033002: Revert of Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: 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 CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_ 5 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_
6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_ 6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 10 matching lines...) Expand all
21 21
22 // This class lives on the compositor thread. 22 // This class lives on the compositor thread.
23 class InputHandlerWrapper : public ui::InputHandlerProxyClient { 23 class InputHandlerWrapper : public ui::InputHandlerProxyClient {
24 public: 24 public:
25 InputHandlerWrapper( 25 InputHandlerWrapper(
26 InputHandlerManager* input_handler_manager, 26 InputHandlerManager* input_handler_manager,
27 int routing_id, 27 int routing_id,
28 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, 28 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
29 const base::WeakPtr<cc::InputHandler>& input_handler, 29 const base::WeakPtr<cc::InputHandler>& input_handler,
30 const base::WeakPtr<RenderViewImpl>& render_view_impl, 30 const base::WeakPtr<RenderViewImpl>& render_view_impl,
31 bool enable_smooth_scrolling); 31 bool enable_smooth_scrolling,
32 bool enable_wheel_gestures);
32 ~InputHandlerWrapper() override; 33 ~InputHandlerWrapper() override;
33 34
34 int routing_id() const { return routing_id_; } 35 int routing_id() const { return routing_id_; }
35 ui::InputHandlerProxy* input_handler_proxy() { 36 ui::InputHandlerProxy* input_handler_proxy() {
36 return &input_handler_proxy_; 37 return &input_handler_proxy_;
37 } 38 }
38 39
39 // InputHandlerProxyClient implementation. 40 // InputHandlerProxyClient implementation.
40 void WillShutdown() override; 41 void WillShutdown() override;
41 void TransferActiveWheelFlingAnimation( 42 void TransferActiveWheelFlingAnimation(
(...skipping 19 matching lines...) Expand all
61 62
62 // Can only be accessed on the main thread. 63 // Can only be accessed on the main thread.
63 base::WeakPtr<RenderViewImpl> render_view_impl_; 64 base::WeakPtr<RenderViewImpl> render_view_impl_;
64 65
65 DISALLOW_COPY_AND_ASSIGN(InputHandlerWrapper); 66 DISALLOW_COPY_AND_ASSIGN(InputHandlerWrapper);
66 }; 67 };
67 68
68 } // namespace content 69 } // namespace content
69 70
70 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_ 71 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_
OLDNEW
« no previous file with comments | « content/renderer/input/input_handler_manager.cc ('k') | content/renderer/input/input_handler_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698