Index: content/browser/renderer_host/render_widget_host_unittest.cc |
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc |
index d70356d9bfdccd502b4dd82ef7d69ea5d10be704..fdc09716424886a2c1fb68bab7607708b20458ee 100644 |
--- a/content/browser/renderer_host/render_widget_host_unittest.cc |
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc |
@@ -70,47 +70,47 @@ class MockInputRouter : public InputRouter { |
virtual ~MockInputRouter() {} |
// InputRouter |
- virtual void Flush() OVERRIDE { |
+ virtual void Flush() override { |
flush_called_ = true; |
} |
- virtual bool SendInput(scoped_ptr<IPC::Message> message) OVERRIDE { |
+ virtual bool SendInput(scoped_ptr<IPC::Message> message) override { |
send_event_called_ = true; |
return true; |
} |
virtual void SendMouseEvent( |
- const MouseEventWithLatencyInfo& mouse_event) OVERRIDE { |
+ const MouseEventWithLatencyInfo& mouse_event) override { |
sent_mouse_event_ = true; |
} |
virtual void SendWheelEvent( |
- const MouseWheelEventWithLatencyInfo& wheel_event) OVERRIDE { |
+ const MouseWheelEventWithLatencyInfo& wheel_event) override { |
sent_wheel_event_ = true; |
} |
virtual void SendKeyboardEvent( |
const NativeWebKeyboardEvent& key_event, |
const ui::LatencyInfo& latency_info, |
- bool is_shortcut) OVERRIDE { |
+ bool is_shortcut) override { |
sent_keyboard_event_ = true; |
} |
virtual void SendGestureEvent( |
- const GestureEventWithLatencyInfo& gesture_event) OVERRIDE { |
+ const GestureEventWithLatencyInfo& gesture_event) override { |
sent_gesture_event_ = true; |
} |
virtual void SendTouchEvent( |
- const TouchEventWithLatencyInfo& touch_event) OVERRIDE { |
+ const TouchEventWithLatencyInfo& touch_event) override { |
send_touch_event_not_cancelled_ = |
client_->FilterInputEvent(touch_event.event, touch_event.latency) == |
INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
} |
- virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const OVERRIDE { |
+ virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override { |
NOTREACHED(); |
return NULL; |
} |
- virtual bool ShouldForwardTouchEvent() const OVERRIDE { return true; } |
- virtual void OnViewUpdated(int view_flags) OVERRIDE {} |
- virtual bool HasPendingEvents() const OVERRIDE { return false; } |
+ virtual bool ShouldForwardTouchEvent() const override { return true; } |
+ virtual void OnViewUpdated(int view_flags) override {} |
+ virtual bool HasPendingEvents() const override { return false; } |
// IPC::Listener |
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { |
+ virtual bool OnMessageReceived(const IPC::Message& message) override { |
message_received_ = true; |
return false; |
} |
@@ -153,7 +153,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl { |
virtual void OnTouchEventAck( |
const TouchEventWithLatencyInfo& event, |
- InputEventAckState ack_result) OVERRIDE { |
+ InputEventAckState ack_result) override { |
// Sniff touch acks. |
acked_touch_event_type_ = event.event.type; |
RenderWidgetHostImpl::OnTouchEventAck(event, ack_result); |
@@ -185,7 +185,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl { |
} |
protected: |
- virtual void NotifyRendererUnresponsive() OVERRIDE { |
+ virtual void NotifyRendererUnresponsive() override { |
unresponsive_timer_fired_ = true; |
} |
@@ -215,7 +215,7 @@ class RenderWidgetHostProcess : public MockRenderProcessHost { |
// Fills the given update parameters with resonable default values. |
void InitUpdateRectParams(ViewHostMsg_UpdateRect_Params* params); |
- virtual bool HasConnection() const OVERRIDE { return true; } |
+ virtual bool HasConnection() const override { return true; } |
protected: |
// Indicates the flags that should be sent with a repaint request. This |
@@ -278,27 +278,27 @@ class TestView : public TestRenderWidgetHostView { |
} |
// RenderWidgetHostView override. |
- virtual gfx::Rect GetViewBounds() const OVERRIDE { |
+ virtual gfx::Rect GetViewBounds() const override { |
return bounds_; |
} |
virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, |
- InputEventAckState ack_result) OVERRIDE { |
+ InputEventAckState ack_result) override { |
acked_event_ = touch.event; |
++acked_event_count_; |
} |
virtual void WheelEventAck(const WebMouseWheelEvent& event, |
- InputEventAckState ack_result) OVERRIDE { |
+ InputEventAckState ack_result) override { |
if (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) |
return; |
unhandled_wheel_event_count_++; |
unhandled_wheel_event_ = event; |
} |
virtual void GestureEventAck(const WebGestureEvent& event, |
- InputEventAckState ack_result) OVERRIDE { |
+ InputEventAckState ack_result) override { |
gesture_event_type_ = event.type; |
ack_result_ = ack_result; |
} |
- virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE { |
+ virtual gfx::Size GetPhysicalBackingSize() const override { |
if (use_fake_physical_backing_size_) |
return mock_physical_backing_size_; |
return TestRenderWidgetHostView::GetPhysicalBackingSize(); |
@@ -376,20 +376,20 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { |
protected: |
virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
- bool* is_keyboard_shortcut) OVERRIDE { |
+ bool* is_keyboard_shortcut) override { |
prehandle_keyboard_event_type_ = event.type; |
prehandle_keyboard_event_called_ = true; |
return prehandle_keyboard_event_; |
} |
virtual void HandleKeyboardEvent( |
- const NativeWebKeyboardEvent& event) OVERRIDE { |
+ const NativeWebKeyboardEvent& event) override { |
unhandled_keyboard_event_type_ = event.type; |
unhandled_keyboard_event_called_ = true; |
} |
virtual bool HandleWheelEvent( |
- const blink::WebMouseWheelEvent& event) OVERRIDE { |
+ const blink::WebMouseWheelEvent& event) override { |
handle_wheel_event_called_ = true; |
return handle_wheel_event_; |
} |