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

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

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 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/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "content/renderer/input/input_handler_manager.h" 9 #include "content/renderer/input/input_handler_manager.h"
10 #include "content/renderer/input/input_handler_proxy.h" 10 #include "content/renderer/input/input_handler_proxy.h"
11 #include "content/renderer/input/input_handler_proxy_client.h" 11 #include "content/renderer/input/input_handler_proxy_client.h"
12 #include "third_party/WebKit/public/platform/WebSchedulerProxy.h" 12 #include "third_party/WebKit/public/platform/WebSchedulerProxy.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 // This class lives on the compositor thread. 16 // This class lives on the compositor thread.
17 class InputHandlerWrapper : public InputHandlerProxyClient { 17 class InputHandlerWrapper : public InputHandlerProxyClient {
18 public: 18 public:
19 InputHandlerWrapper(InputHandlerManager* input_handler_manager, 19 InputHandlerWrapper(InputHandlerManager* input_handler_manager,
20 int routing_id, 20 int routing_id,
21 const scoped_refptr<base::MessageLoopProxy>& main_loop, 21 const scoped_refptr<base::MessageLoopProxy>& main_loop,
22 const base::WeakPtr<cc::InputHandler>& input_handler, 22 const base::WeakPtr<cc::InputHandler>& input_handler,
23 const base::WeakPtr<RenderViewImpl>& render_view_impl); 23 const base::WeakPtr<RenderViewImpl>& render_view_impl);
24 virtual ~InputHandlerWrapper(); 24 virtual ~InputHandlerWrapper();
25 25
26 int routing_id() const { return routing_id_; } 26 int routing_id() const { return routing_id_; }
27 InputHandlerProxy* input_handler_proxy() { return &input_handler_proxy_; } 27 InputHandlerProxy* input_handler_proxy() { return &input_handler_proxy_; }
28 28
29 // InputHandlerProxyClient implementation. 29 // InputHandlerProxyClient implementation.
30 virtual void WillShutdown() OVERRIDE; 30 virtual void WillShutdown() override;
31 virtual void TransferActiveWheelFlingAnimation( 31 virtual void TransferActiveWheelFlingAnimation(
32 const blink::WebActiveWheelFlingParameters& params) OVERRIDE; 32 const blink::WebActiveWheelFlingParameters& params) override;
33 virtual blink::WebGestureCurve* CreateFlingAnimationCurve( 33 virtual blink::WebGestureCurve* CreateFlingAnimationCurve(
34 blink::WebGestureDevice deviceSource, 34 blink::WebGestureDevice deviceSource,
35 const blink::WebFloatPoint& velocity, 35 const blink::WebFloatPoint& velocity,
36 const blink::WebSize& cumulativeScroll) OVERRIDE; 36 const blink::WebSize& cumulativeScroll) override;
37 virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE; 37 virtual void DidOverscroll(const DidOverscrollParams& params) override;
38 virtual void DidStopFlinging() OVERRIDE; 38 virtual void DidStopFlinging() override;
39 virtual void DidReceiveInputEvent() OVERRIDE; 39 virtual void DidReceiveInputEvent() override;
40 40
41 private: 41 private:
42 InputHandlerManager* input_handler_manager_; 42 InputHandlerManager* input_handler_manager_;
43 int routing_id_; 43 int routing_id_;
44 InputHandlerProxy input_handler_proxy_; 44 InputHandlerProxy input_handler_proxy_;
45 scoped_refptr<base::MessageLoopProxy> main_loop_; 45 scoped_refptr<base::MessageLoopProxy> main_loop_;
46 blink::WebSchedulerProxy web_scheduler_proxy_; 46 blink::WebSchedulerProxy web_scheduler_proxy_;
47 47
48 // Can only be accessed on the main thread. 48 // Can only be accessed on the main thread.
49 base::WeakPtr<RenderViewImpl> render_view_impl_; 49 base::WeakPtr<RenderViewImpl> render_view_impl_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(InputHandlerWrapper); 51 DISALLOW_COPY_AND_ASSIGN(InputHandlerWrapper);
52 }; 52 };
53 53
54 } // namespace content 54 } // namespace content
55 55
56 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_ 56 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_
OLDNEW
« no previous file with comments | « content/renderer/input/input_handler_proxy_unittest.cc ('k') | content/renderer/java/gin_java_bridge_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698