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

Unified Diff: content/renderer/input/input_handler_proxy_unittest.cc

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out some webrtc files. Created 5 years, 8 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/renderer/input/input_handler_proxy_unittest.cc
diff --git a/content/renderer/input/input_handler_proxy_unittest.cc b/content/renderer/input/input_handler_proxy_unittest.cc
index 382536687ff248b91db8eb698fbb57e64db3ca7c..7994914e0b3aa4da902a0fe40daf695c395e8e92 100644
--- a/content/renderer/input/input_handler_proxy_unittest.cc
+++ b/content/renderer/input/input_handler_proxy_unittest.cc
@@ -75,7 +75,7 @@ WebGestureEvent CreateFling(WebGestureDevice source_device,
class MockInputHandler : public cc::InputHandler {
public:
MockInputHandler() {}
- virtual ~MockInputHandler() {}
+ ~MockInputHandler() override {}
MOCK_METHOD0(PinchGestureBegin, void());
MOCK_METHOD2(PinchGestureUpdate,
@@ -100,18 +100,18 @@ class MockInputHandler : public cc::InputHandler {
MOCK_METHOD0(ScrollEnd, void());
MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus());
- virtual scoped_ptr<cc::SwapPromiseMonitor>
- CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) override {
- return scoped_ptr<cc::SwapPromiseMonitor>();
+ scoped_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor(
+ ui::LatencyInfo* latency) override {
+ return scoped_ptr<cc::SwapPromiseMonitor>();
}
cc::ScrollElasticityHelper* CreateScrollElasticityHelper() override {
return NULL;
}
- virtual void BindToClient(cc::InputHandlerClient* client) override {}
+ void BindToClient(cc::InputHandlerClient* client) override {}
- virtual void MouseMoveAt(const gfx::Point& mouse_position) override {}
+ void MouseMoveAt(const gfx::Point& mouse_position) override {}
MOCK_METHOD2(IsCurrentlyScrollingLayerAt,
bool(const gfx::Point& point,
@@ -120,11 +120,11 @@ class MockInputHandler : public cc::InputHandler {
MOCK_METHOD1(HaveWheelEventHandlersAt, bool(const gfx::Point& point));
MOCK_METHOD1(DoTouchEventsBlockScrollAt, bool(const gfx::Point& point));
- virtual void SetRootLayerScrollOffsetDelegate(
+ void SetRootLayerScrollOffsetDelegate(
cc::LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate)
override {}
- virtual void OnRootLayerDelegatedScrollOffsetChanged() override {}
+ void OnRootLayerDelegatedScrollOffsetChanged() override {}
DISALLOW_COPY_AND_ASSIGN(MockInputHandler);
};
@@ -163,14 +163,14 @@ class MockInputHandlerProxyClient
: public content::InputHandlerProxyClient {
public:
MockInputHandlerProxyClient() {}
- virtual ~MockInputHandlerProxyClient() {}
+ ~MockInputHandlerProxyClient() override {}
- virtual void WillShutdown() override {}
+ void WillShutdown() override {}
MOCK_METHOD1(TransferActiveWheelFlingAnimation,
void(const WebActiveWheelFlingParameters&));
- virtual blink::WebGestureCurve* CreateFlingAnimationCurve(
+ blink::WebGestureCurve* CreateFlingAnimationCurve(
WebGestureDevice deviceSource,
const WebFloatPoint& velocity,
const WebSize& cumulative_scroll) override {
@@ -180,9 +180,9 @@ class MockInputHandlerProxyClient
}
MOCK_METHOD1(DidOverscroll, void(const DidOverscrollParams&));
- virtual void DidStopFlinging() override {}
- virtual void DidReceiveInputEvent(const blink::WebInputEvent&) override {}
- virtual void DidAnimateForInput() override {}
+ void DidStopFlinging() override {}
+ void DidReceiveInputEvent(const blink::WebInputEvent&) override {}
+ void DidAnimateForInput() override {}
private:
DISALLOW_COPY_AND_ASSIGN(MockInputHandlerProxyClient);
@@ -192,7 +192,7 @@ class MockInputHandlerProxyClientWithDidReceiveInputEvent
: public MockInputHandlerProxyClient {
public:
MockInputHandlerProxyClientWithDidReceiveInputEvent() {}
- virtual ~MockInputHandlerProxyClientWithDidReceiveInputEvent() {}
+ ~MockInputHandlerProxyClientWithDidReceiveInputEvent() override {}
MOCK_METHOD1(DidReceiveInputEvent, void(const blink::WebInputEvent&));
MOCK_METHOD0(DidAnimateForInput, void());
« no previous file with comments | « content/renderer/device_sensors/device_sensor_event_pump.h ('k') | content/renderer/java/gin_java_bridge_value_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698