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

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

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/input/input_handler_proxy.h ('k') | content/renderer/input/input_handler_wrapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d64288cbbf545306c06200a5ccfe9b9cda8204b7..59f3efd206df96454bdd7641e9fd66fb58da9213 100644
--- a/content/renderer/input/input_handler_proxy_unittest.cc
+++ b/content/renderer/input/input_handler_proxy_unittest.cc
@@ -99,13 +99,13 @@ class MockInputHandler : public cc::InputHandler {
MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus());
virtual scoped_ptr<cc::SwapPromiseMonitor>
- CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) OVERRIDE {
+ CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) override {
return scoped_ptr<cc::SwapPromiseMonitor>();
}
- virtual void BindToClient(cc::InputHandlerClient* client) OVERRIDE {}
+ virtual void BindToClient(cc::InputHandlerClient* client) override {}
- virtual void MouseMoveAt(const gfx::Point& mouse_position) OVERRIDE {}
+ virtual void MouseMoveAt(const gfx::Point& mouse_position) override {}
MOCK_METHOD2(IsCurrentlyScrollingLayerAt,
bool(const gfx::Point& point,
@@ -115,9 +115,9 @@ class MockInputHandler : public cc::InputHandler {
virtual void SetRootLayerScrollOffsetDelegate(
cc::LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate)
- OVERRIDE {}
+ override {}
- virtual void OnRootLayerDelegatedScrollOffsetChanged() OVERRIDE {}
+ virtual void OnRootLayerDelegatedScrollOffsetChanged() override {}
DISALLOW_COPY_AND_ASSIGN(MockInputHandler);
};
@@ -158,7 +158,7 @@ class MockInputHandlerProxyClient
MockInputHandlerProxyClient() {}
virtual ~MockInputHandlerProxyClient() {}
- virtual void WillShutdown() OVERRIDE {}
+ virtual void WillShutdown() override {}
MOCK_METHOD1(TransferActiveWheelFlingAnimation,
void(const WebActiveWheelFlingParameters&));
@@ -166,15 +166,15 @@ class MockInputHandlerProxyClient
virtual blink::WebGestureCurve* CreateFlingAnimationCurve(
WebGestureDevice deviceSource,
const WebFloatPoint& velocity,
- const WebSize& cumulative_scroll) OVERRIDE {
+ const WebSize& cumulative_scroll) override {
return new FakeWebGestureCurve(
blink::WebFloatSize(velocity.x, velocity.y),
blink::WebFloatSize(cumulative_scroll.width, cumulative_scroll.height));
}
MOCK_METHOD1(DidOverscroll, void(const DidOverscrollParams&));
- virtual void DidStopFlinging() OVERRIDE {}
- virtual void DidReceiveInputEvent() OVERRIDE {}
+ virtual void DidStopFlinging() override {}
+ virtual void DidReceiveInputEvent() override {}
private:
DISALLOW_COPY_AND_ASSIGN(MockInputHandlerProxyClient);
« no previous file with comments | « content/renderer/input/input_handler_proxy.h ('k') | content/renderer/input/input_handler_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698