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

Side by Side Diff: content/renderer/input/input_handler_proxy.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_PROXY_H_ 5 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_
6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_ 6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 24 matching lines...) Expand all
35 DID_HANDLE, 35 DID_HANDLE,
36 DID_NOT_HANDLE, 36 DID_NOT_HANDLE,
37 DROP_EVENT 37 DROP_EVENT
38 }; 38 };
39 EventDisposition HandleInputEventWithLatencyInfo( 39 EventDisposition HandleInputEventWithLatencyInfo(
40 const blink::WebInputEvent& event, 40 const blink::WebInputEvent& event,
41 ui::LatencyInfo* latency_info); 41 ui::LatencyInfo* latency_info);
42 EventDisposition HandleInputEvent(const blink::WebInputEvent& event); 42 EventDisposition HandleInputEvent(const blink::WebInputEvent& event);
43 43
44 // cc::InputHandlerClient implementation. 44 // cc::InputHandlerClient implementation.
45 virtual void WillShutdown() OVERRIDE; 45 virtual void WillShutdown() override;
46 virtual void Animate(base::TimeTicks time) OVERRIDE; 46 virtual void Animate(base::TimeTicks time) override;
47 virtual void MainThreadHasStoppedFlinging() OVERRIDE; 47 virtual void MainThreadHasStoppedFlinging() override;
48 virtual void DidOverscroll( 48 virtual void DidOverscroll(
49 const gfx::PointF& causal_event_viewport_point, 49 const gfx::PointF& causal_event_viewport_point,
50 const gfx::Vector2dF& accumulated_overscroll, 50 const gfx::Vector2dF& accumulated_overscroll,
51 const gfx::Vector2dF& latest_overscroll_delta) OVERRIDE; 51 const gfx::Vector2dF& latest_overscroll_delta) override;
52 52
53 // blink::WebGestureCurveTarget implementation. 53 // blink::WebGestureCurveTarget implementation.
54 virtual bool scrollBy(const blink::WebFloatSize& offset, 54 virtual bool scrollBy(const blink::WebFloatSize& offset,
55 const blink::WebFloatSize& velocity); 55 const blink::WebFloatSize& velocity);
56 56
57 bool gesture_scroll_on_impl_thread_for_testing() const { 57 bool gesture_scroll_on_impl_thread_for_testing() const {
58 return gesture_scroll_on_impl_thread_; 58 return gesture_scroll_on_impl_thread_;
59 } 59 }
60 60
61 private: 61 private:
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 gfx::Vector2dF current_fling_velocity_; 121 gfx::Vector2dF current_fling_velocity_;
122 122
123 bool smooth_scroll_enabled_; 123 bool smooth_scroll_enabled_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); 125 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy);
126 }; 126 };
127 127
128 } // namespace content 128 } // namespace content
129 129
130 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_ 130 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_
OLDNEW
« no previous file with comments | « content/renderer/input/input_event_filter_unittest.cc ('k') | content/renderer/input/input_handler_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698