diff options
Diffstat (limited to 'content/browser/renderer_host')
112 files changed, 1051 insertions, 1150 deletions
diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h index 98a2ca3..792bfc5 100644 --- a/content/browser/renderer_host/clipboard_message_filter.h +++ b/content/browser/renderer_host/clipboard_message_filter.h @@ -21,12 +21,12 @@ class ClipboardMessageFilter : public BrowserMessageFilter { public: ClipboardMessageFilter(); - virtual void OverrideThreadForMessage( - const IPC::Message& message, - BrowserThread::ID* thread) override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OverrideThreadForMessage(const IPC::Message& message, + BrowserThread::ID* thread) override; + bool OnMessageReceived(const IPC::Message& message) override; + private: - virtual ~ClipboardMessageFilter(); + ~ClipboardMessageFilter() override; void OnWriteObjectsAsync(const ui::Clipboard::ObjectMap& objects); void OnWriteObjectsSync(const ui::Clipboard::ObjectMap& objects, diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h index b61816c..dcac74a 100644 --- a/content/browser/renderer_host/database_message_filter.h +++ b/content/browser/renderer_host/database_message_filter.h @@ -20,18 +20,17 @@ class DatabaseMessageFilter : public BrowserMessageFilter, explicit DatabaseMessageFilter(storage::DatabaseTracker* db_tracker); // BrowserMessageFilter implementation. - virtual void OnChannelClosing() override; - virtual void OverrideThreadForMessage( - const IPC::Message& message, - BrowserThread::ID* thread) override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelClosing() override; + void OverrideThreadForMessage(const IPC::Message& message, + BrowserThread::ID* thread) override; + bool OnMessageReceived(const IPC::Message& message) override; storage::DatabaseTracker* database_tracker() const { return db_tracker_.get(); } private: - virtual ~DatabaseMessageFilter(); + ~DatabaseMessageFilter() override; class PromptDelegate; @@ -72,10 +71,10 @@ class DatabaseMessageFilter : public BrowserMessageFilter, int error); // DatabaseTracker::Observer callbacks (file thread) - virtual void OnDatabaseSizeChanged(const std::string& origin_identifier, - const base::string16& database_name, - int64 database_size) override; - virtual void OnDatabaseScheduledForDeletion( + void OnDatabaseSizeChanged(const std::string& origin_identifier, + const base::string16& database_name, + int64 database_size) override; + void OnDatabaseScheduledForDeletion( const std::string& origin_identifier, const base::string16& database_name) override; diff --git a/content/browser/renderer_host/delegated_frame_evictor.h b/content/browser/renderer_host/delegated_frame_evictor.h index 7855b31..796b6c2 100644 --- a/content/browser/renderer_host/delegated_frame_evictor.h +++ b/content/browser/renderer_host/delegated_frame_evictor.h @@ -20,7 +20,7 @@ class CONTENT_EXPORT DelegatedFrameEvictor : public RendererFrameManagerClient { public: // |client| must outlive |this|. explicit DelegatedFrameEvictor(DelegatedFrameEvictorClient* client); - virtual ~DelegatedFrameEvictor(); + ~DelegatedFrameEvictor() override; void SwappedFrame(bool visible); void DiscardedFrame(); @@ -31,7 +31,7 @@ class CONTENT_EXPORT DelegatedFrameEvictor : public RendererFrameManagerClient { private: // RendererFrameManagerClient implementation. - virtual void EvictCurrentFrame() override; + void EvictCurrentFrame() override; DelegatedFrameEvictorClient* client_; bool has_frame_; diff --git a/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h index 515b4c4..54a5830 100644 --- a/content/browser/renderer_host/file_utilities_message_filter.h +++ b/content/browser/renderer_host/file_utilities_message_filter.h @@ -21,12 +21,12 @@ class FileUtilitiesMessageFilter : public BrowserMessageFilter { explicit FileUtilitiesMessageFilter(int process_id); // BrowserMessageFilter implementation. - virtual void OverrideThreadForMessage( - const IPC::Message& message, - BrowserThread::ID* thread) override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OverrideThreadForMessage(const IPC::Message& message, + BrowserThread::ID* thread) override; + bool OnMessageReceived(const IPC::Message& message) override; + private: - virtual ~FileUtilitiesMessageFilter(); + ~FileUtilitiesMessageFilter() override; typedef void (*FileInfoWriteFunc)(IPC::Message* reply_msg, const base::File::Info& file_info); diff --git a/content/browser/renderer_host/gamepad_browser_message_filter.h b/content/browser/renderer_host/gamepad_browser_message_filter.h index 316676c..e5dc8ae 100644 --- a/content/browser/renderer_host/gamepad_browser_message_filter.h +++ b/content/browser/renderer_host/gamepad_browser_message_filter.h @@ -22,18 +22,16 @@ class GamepadBrowserMessageFilter : GamepadBrowserMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // GamepadConsumer implementation. - virtual void OnGamepadConnected( - unsigned index, - const blink::WebGamepad& gamepad) override; - virtual void OnGamepadDisconnected( - unsigned index, - const blink::WebGamepad& gamepad) override; + void OnGamepadConnected(unsigned index, + const blink::WebGamepad& gamepad) override; + void OnGamepadDisconnected(unsigned index, + const blink::WebGamepad& gamepad) override; private: - virtual ~GamepadBrowserMessageFilter(); + ~GamepadBrowserMessageFilter() override; void OnGamepadStartPolling(base::SharedMemoryHandle* renderer_handle); void OnGamepadStopPolling(); diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h index d2f0ace..57dfe9b 100644 --- a/content/browser/renderer_host/gpu_message_filter.h +++ b/content/browser/renderer_host/gpu_message_filter.h @@ -37,7 +37,7 @@ class GpuMessageFilter : public BrowserMessageFilter { RenderWidgetHelper* render_widget_helper); // BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // This set of API is used to subscribe to frame presentation events. // See RenderWidgetHostViewFrameSubscriber for more details. @@ -52,7 +52,7 @@ class GpuMessageFilter : public BrowserMessageFilter { struct CreateViewCommandBufferRequest; struct FrameSubscription; - virtual ~GpuMessageFilter(); + ~GpuMessageFilter() override; // Message handlers called on the browser IO thread: void OnEstablishGpuChannel(CauseForGpuLaunch, diff --git a/content/browser/renderer_host/input/gesture_event_queue_unittest.cc b/content/browser/renderer_host/input/gesture_event_queue_unittest.cc index 3fbae1e..ea5a19c 100644 --- a/content/browser/renderer_host/input/gesture_event_queue_unittest.cc +++ b/content/browser/renderer_host/input/gesture_event_queue_unittest.cc @@ -45,7 +45,7 @@ class GestureEventQueueTest : public testing::Test, } // GestureEventQueueClient - virtual void SendGestureEventImmediately( + void SendGestureEventImmediately( const GestureEventWithLatencyInfo& event) override { ++sent_gesture_event_count_; if (sync_ack_result_) { @@ -54,9 +54,8 @@ class GestureEventQueueTest : public testing::Test, } } - virtual void OnGestureEventAck( - const GestureEventWithLatencyInfo& event, - InputEventAckState ack_result) override { + void OnGestureEventAck(const GestureEventWithLatencyInfo& event, + InputEventAckState ack_result) override { ++acked_gesture_event_count_; last_acked_event_ = event.event; if (sync_followup_event_) { @@ -66,9 +65,8 @@ class GestureEventQueueTest : public testing::Test, } // TouchpadTapSuppressionControllerClient - virtual void SendMouseEventImmediately( - const MouseEventWithLatencyInfo& event) override { - } + void SendMouseEventImmediately( + const MouseEventWithLatencyInfo& event) override {} protected: static GestureEventQueue::Config DefaultConfig() { diff --git a/content/browser/renderer_host/input/gesture_text_selector.h b/content/browser/renderer_host/input/gesture_text_selector.h index 5e339a6..e494045 100644 --- a/content/browser/renderer_host/input/gesture_text_selector.h +++ b/content/browser/renderer_host/input/gesture_text_selector.h @@ -37,7 +37,7 @@ class CONTENT_EXPORT GestureTextSelectorClient { class CONTENT_EXPORT GestureTextSelector : public ui::SimpleGestureListener { public: explicit GestureTextSelector(GestureTextSelectorClient* client); - virtual ~GestureTextSelector(); + ~GestureTextSelector() override; // This should be called before |event| is seen by the platform gesture // detector or forwarded to web content. @@ -49,11 +49,11 @@ class CONTENT_EXPORT GestureTextSelector : public ui::SimpleGestureListener { ShouldStartTextSelection); // SimpleGestureListener implementation. - virtual bool OnSingleTapUp(const ui::MotionEvent& e) override; - virtual bool OnScroll(const ui::MotionEvent& e1, - const ui::MotionEvent& e2, - float distance_x, - float distance_y) override; + bool OnSingleTapUp(const ui::MotionEvent& e) override; + bool OnScroll(const ui::MotionEvent& e1, + const ui::MotionEvent& e2, + float distance_x, + float distance_y) override; static bool ShouldStartTextSelection(const ui::MotionEvent& event); diff --git a/content/browser/renderer_host/input/gesture_text_selector_unittest.cc b/content/browser/renderer_host/input/gesture_text_selector_unittest.cc index ee8240e..3070586 100644 --- a/content/browser/renderer_host/input/gesture_text_selector_unittest.cc +++ b/content/browser/renderer_host/input/gesture_text_selector_unittest.cc @@ -37,17 +37,17 @@ class GestureTextSelectorTest : public testing::Test, } // GestureTextSelectorClient implementation. - virtual void ShowSelectionHandlesAutomatically() override { + void ShowSelectionHandlesAutomatically() override { event_log_.push_back("Show"); } - virtual void SelectRange(float x1, float y1, float x2, float y2) override { + void SelectRange(float x1, float y1, float x2, float y2) override { std::stringstream ss; ss << "SelectRange(" << x1 << ", " << y1 << ", " << x2 << ", " << y2 << ")"; event_log_.push_back(ss.str()); } - virtual void LongPress(base::TimeTicks time, float x, float y) override { + void LongPress(base::TimeTicks time, float x, float y) override { event_log_.push_back("LongPress"); } diff --git a/content/browser/renderer_host/input/input_router.h b/content/browser/renderer_host/input/input_router.h index 1b30815..96b68c3 100644 --- a/content/browser/renderer_host/input/input_router.h +++ b/content/browser/renderer_host/input/input_router.h @@ -22,7 +22,7 @@ class InputRouterClient; // received, it is free to customize when those events are dispatched. class InputRouter : public IPC::Listener { public: - virtual ~InputRouter() {} + ~InputRouter() override {} // Should be called only in response to |SetNeedsFlush| requests made via // the |InputRouterClient|. diff --git a/content/browser/renderer_host/input/input_router_impl.h b/content/browser/renderer_host/input/input_router_impl.h index 0f7b023..b08c1e3 100644 --- a/content/browser/renderer_host/input/input_router_impl.h +++ b/content/browser/renderer_host/input/input_router_impl.h @@ -53,49 +53,46 @@ class CONTENT_EXPORT InputRouterImpl InputAckHandler* ack_handler, int routing_id, const Config& config); - virtual ~InputRouterImpl(); + ~InputRouterImpl() override; // InputRouter - virtual void Flush() override; - virtual bool SendInput(scoped_ptr<IPC::Message> message) override; - virtual void SendMouseEvent( - const MouseEventWithLatencyInfo& mouse_event) override; - virtual void SendWheelEvent( + void Flush() override; + bool SendInput(scoped_ptr<IPC::Message> message) override; + void SendMouseEvent(const MouseEventWithLatencyInfo& mouse_event) override; + void SendWheelEvent( const MouseWheelEventWithLatencyInfo& wheel_event) override; - virtual void SendKeyboardEvent( - const NativeWebKeyboardEvent& key_event, - const ui::LatencyInfo& latency_info, - bool is_keyboard_shortcut) override; - virtual void SendGestureEvent( + void SendKeyboardEvent(const NativeWebKeyboardEvent& key_event, + const ui::LatencyInfo& latency_info, + bool is_keyboard_shortcut) override; + void SendGestureEvent( const GestureEventWithLatencyInfo& gesture_event) override; - virtual void SendTouchEvent( - const TouchEventWithLatencyInfo& touch_event) override; - virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override; - virtual bool ShouldForwardTouchEvent() const override; - virtual void OnViewUpdated(int view_flags) override; - virtual bool HasPendingEvents() const override; + void SendTouchEvent(const TouchEventWithLatencyInfo& touch_event) override; + const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override; + bool ShouldForwardTouchEvent() const override; + void OnViewUpdated(int view_flags) override; + bool HasPendingEvents() const override; // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; private: friend class InputRouterImplTest; // TouchpadTapSuppressionControllerClient - virtual void SendMouseEventImmediately( + void SendMouseEventImmediately( const MouseEventWithLatencyInfo& mouse_event) override; // TouchEventQueueClient - virtual void SendTouchEventImmediately( + void SendTouchEventImmediately( const TouchEventWithLatencyInfo& touch_event) override; - virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event, - InputEventAckState ack_result) override; + void OnTouchEventAck(const TouchEventWithLatencyInfo& event, + InputEventAckState ack_result) override; // GetureEventFilterClient - virtual void SendGestureEventImmediately( + void SendGestureEventImmediately( const GestureEventWithLatencyInfo& gesture_event) override; - virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event, - InputEventAckState ack_result) override; + void OnGestureEventAck(const GestureEventWithLatencyInfo& event, + InputEventAckState ack_result) override; bool SendMoveCaret(scoped_ptr<IPC::Message> message); bool SendSelectRange(scoped_ptr<IPC::Message> message); diff --git a/content/browser/renderer_host/input/input_router_impl_perftest.cc b/content/browser/renderer_host/input/input_router_impl_perftest.cc index 0538392..28576b3 100644 --- a/content/browser/renderer_host/input/input_router_impl_perftest.cc +++ b/content/browser/renderer_host/input/input_router_impl_perftest.cc @@ -28,26 +28,26 @@ namespace { class NullInputAckHandler : public InputAckHandler { public: NullInputAckHandler() : ack_count_(0) {} - virtual ~NullInputAckHandler() {} + ~NullInputAckHandler() override {} // InputAckHandler - virtual void OnKeyboardEventAck(const NativeWebKeyboardEvent& event, - InputEventAckState ack_result) override { + void OnKeyboardEventAck(const NativeWebKeyboardEvent& event, + InputEventAckState ack_result) override { ++ack_count_; } - virtual void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event, - InputEventAckState ack_result) override { + void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event, + InputEventAckState ack_result) override { ++ack_count_; } - virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event, - InputEventAckState ack_result) override { + void OnTouchEventAck(const TouchEventWithLatencyInfo& event, + InputEventAckState ack_result) override { ++ack_count_; } - virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event, - InputEventAckState ack_result) override { + void OnGestureEventAck(const GestureEventWithLatencyInfo& event, + InputEventAckState ack_result) override { ++ack_count_; } - virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) override { + void OnUnexpectedEventAck(UnexpectedEventAckType type) override { ++ack_count_; } @@ -66,28 +66,28 @@ class NullInputAckHandler : public InputAckHandler { class NullInputRouterClient : public InputRouterClient { public: NullInputRouterClient() {} - virtual ~NullInputRouterClient() {} + ~NullInputRouterClient() override {} // InputRouterClient - virtual InputEventAckState FilterInputEvent( + InputEventAckState FilterInputEvent( const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info) override { return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; } - virtual void IncrementInFlightEventCount() override {} - virtual void DecrementInFlightEventCount() override {} - virtual void OnHasTouchEventHandlers(bool has_handlers) override {} - virtual void DidFlush() override {} - virtual void SetNeedsFlush() override {} - virtual void DidOverscroll(const DidOverscrollParams& params) override {} + void IncrementInFlightEventCount() override {} + void DecrementInFlightEventCount() override {} + void OnHasTouchEventHandlers(bool has_handlers) override {} + void DidFlush() override {} + void SetNeedsFlush() override {} + void DidOverscroll(const DidOverscrollParams& params) override {} }; class NullIPCSender : public IPC::Sender { public: NullIPCSender() : sent_count_(0) {} - virtual ~NullIPCSender() {} + ~NullIPCSender() override {} - virtual bool Send(IPC::Message* message) override { + bool Send(IPC::Message* message) override { delete message; ++sent_count_; return true; diff --git a/content/browser/renderer_host/input/mock_input_ack_handler.h b/content/browser/renderer_host/input/mock_input_ack_handler.h index 126eaa9..93f7cca 100644 --- a/content/browser/renderer_host/input/mock_input_ack_handler.h +++ b/content/browser/renderer_host/input/mock_input_ack_handler.h @@ -15,18 +15,18 @@ class InputRouter; class MockInputAckHandler : public InputAckHandler { public: MockInputAckHandler(); - virtual ~MockInputAckHandler(); + ~MockInputAckHandler() override; // InputAckHandler - virtual void OnKeyboardEventAck(const NativeWebKeyboardEvent& event, - InputEventAckState ack_result) override; - virtual void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event, - InputEventAckState ack_result) override; - virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event, - InputEventAckState ack_result) override; - virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event, - InputEventAckState ack_result) override; - virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) override; + void OnKeyboardEventAck(const NativeWebKeyboardEvent& event, + InputEventAckState ack_result) override; + void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event, + InputEventAckState ack_result) override; + void OnTouchEventAck(const TouchEventWithLatencyInfo& event, + InputEventAckState ack_result) override; + void OnGestureEventAck(const GestureEventWithLatencyInfo& event, + InputEventAckState ack_result) override; + void OnUnexpectedEventAck(UnexpectedEventAckType type) override; size_t GetAndResetAckCount(); diff --git a/content/browser/renderer_host/input/mock_input_router_client.h b/content/browser/renderer_host/input/mock_input_router_client.h index 3eb5a25..a552ac0 100644 --- a/content/browser/renderer_host/input/mock_input_router_client.h +++ b/content/browser/renderer_host/input/mock_input_router_client.h @@ -17,18 +17,18 @@ class InputRouter; class MockInputRouterClient : public InputRouterClient { public: MockInputRouterClient(); - virtual ~MockInputRouterClient(); + ~MockInputRouterClient() override; // InputRouterClient - virtual InputEventAckState FilterInputEvent( + InputEventAckState FilterInputEvent( const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info) override; - virtual void IncrementInFlightEventCount() override; - virtual void DecrementInFlightEventCount() override; - virtual void OnHasTouchEventHandlers(bool has_handlers) override; - virtual void SetNeedsFlush() override; - virtual void DidFlush() override; - virtual void DidOverscroll(const DidOverscrollParams& params) override; + void IncrementInFlightEventCount() override; + void DecrementInFlightEventCount() override; + void OnHasTouchEventHandlers(bool has_handlers) override; + void SetNeedsFlush() override; + void DidFlush() override; + void DidOverscroll(const DidOverscrollParams& params) override; bool GetAndResetFilterEventCalled(); size_t GetAndResetDidFlushCount(); diff --git a/content/browser/renderer_host/input/motion_event_web.h b/content/browser/renderer_host/input/motion_event_web.h index 4bd0be8..8177a9f 100644 --- a/content/browser/renderer_host/input/motion_event_web.h +++ b/content/browser/renderer_host/input/motion_event_web.h @@ -14,28 +14,28 @@ namespace content { class MotionEventWeb : public ui::MotionEvent { public: explicit MotionEventWeb(const blink::WebTouchEvent& event); - virtual ~MotionEventWeb(); + ~MotionEventWeb() override; // ui::MotionEvent - virtual int GetId() const override; - virtual Action GetAction() const override; - virtual int GetActionIndex() const override; - virtual size_t GetPointerCount() const override; - virtual int GetPointerId(size_t pointer_index) const override; - virtual float GetX(size_t pointer_index) const override; - virtual float GetY(size_t pointer_index) const override; - virtual float GetRawX(size_t pointer_index) const override; - virtual float GetRawY(size_t pointer_index) const override; - virtual float GetTouchMajor(size_t pointer_index) const override; - virtual float GetTouchMinor(size_t pointer_index) const override; - virtual float GetOrientation(size_t pointer_index) const override; - virtual float GetPressure(size_t pointer_index) const override; - virtual base::TimeTicks GetEventTime() const override; - virtual ToolType GetToolType(size_t pointer_index) const override; - virtual int GetButtonState() const override; - virtual int GetFlags() const override; - virtual scoped_ptr<MotionEvent> Clone() const override; - virtual scoped_ptr<MotionEvent> Cancel() const override; + int GetId() const override; + Action GetAction() const override; + int GetActionIndex() const override; + size_t GetPointerCount() const override; + int GetPointerId(size_t pointer_index) const override; + float GetX(size_t pointer_index) const override; + float GetY(size_t pointer_index) const override; + float GetRawX(size_t pointer_index) const override; + float GetRawY(size_t pointer_index) const override; + float GetTouchMajor(size_t pointer_index) const override; + float GetTouchMinor(size_t pointer_index) const override; + float GetOrientation(size_t pointer_index) const override; + float GetPressure(size_t pointer_index) const override; + base::TimeTicks GetEventTime() const override; + ToolType GetToolType(size_t pointer_index) const override; + int GetButtonState() const override; + int GetFlags() const override; + scoped_ptr<MotionEvent> Clone() const override; + scoped_ptr<MotionEvent> Cancel() const override; private: blink::WebTouchEvent event_; diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc index 69eaf9b..6be46f3 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc +++ b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc @@ -47,10 +47,10 @@ class MockSyntheticGesture : public SyntheticGesture { step_count_(0) { *finished_ = false; } - virtual ~MockSyntheticGesture() {} + ~MockSyntheticGesture() override {} - virtual Result ForwardInputEvents(const base::TimeTicks& timestamp, - SyntheticGestureTarget* target) override { + Result ForwardInputEvents(const base::TimeTicks& timestamp, + SyntheticGestureTarget* target) override { step_count_++; if (step_count_ == num_steps_) { *finished_ = true; @@ -75,22 +75,19 @@ class MockSyntheticGestureTarget : public SyntheticGestureTarget { MockSyntheticGestureTarget() : flush_requested_(false), pointer_assumed_stopped_time_ms_(kPointerAssumedStoppedTimeMs) {} - virtual ~MockSyntheticGestureTarget() {} + ~MockSyntheticGestureTarget() override {} // SyntheticGestureTarget: - virtual void DispatchInputEventToPlatform( - const WebInputEvent& event) override {} + void DispatchInputEventToPlatform(const WebInputEvent& event) override {} - virtual void SetNeedsFlush() override { - flush_requested_ = true; - } + void SetNeedsFlush() override { flush_requested_ = true; } - virtual SyntheticGestureParams::GestureSourceType + SyntheticGestureParams::GestureSourceType GetDefaultSyntheticGestureSourceType() const override { return SyntheticGestureParams::TOUCH_INPUT; } - virtual base::TimeDelta PointerAssumedStoppedTime() const override { + base::TimeDelta PointerAssumedStoppedTime() const override { return base::TimeDelta::FromMilliseconds(pointer_assumed_stopped_time_ms_); } @@ -98,11 +95,9 @@ class MockSyntheticGestureTarget : public SyntheticGestureTarget { pointer_assumed_stopped_time_ms_ = time_ms; } - virtual float GetTouchSlopInDips() const override { - return kTouchSlopInDips; - } + float GetTouchSlopInDips() const override { return kTouchSlopInDips; } - virtual float GetMinScalingSpanInDips() const override { + float GetMinScalingSpanInDips() const override { return kMinScalingSpanInDips; } @@ -118,7 +113,7 @@ class MockSyntheticGestureTarget : public SyntheticGestureTarget { class MockScrollGestureTarget : public MockSyntheticGestureTarget { public: MockScrollGestureTarget() : total_abs_scroll_distance_length_(0) {} - virtual ~MockScrollGestureTarget() {} + ~MockScrollGestureTarget() override {} gfx::Vector2dF start_to_end_distance() const { return start_to_end_distance_; @@ -135,10 +130,9 @@ class MockScrollGestureTarget : public MockSyntheticGestureTarget { class MockScrollMouseTarget : public MockScrollGestureTarget { public: MockScrollMouseTarget() {} - virtual ~MockScrollMouseTarget() {} + ~MockScrollMouseTarget() override {} - virtual void DispatchInputEventToPlatform( - const WebInputEvent& event) override { + void DispatchInputEventToPlatform(const WebInputEvent& event) override { ASSERT_EQ(event.type, WebInputEvent::MouseWheel); const WebMouseWheelEvent& mouse_wheel_event = static_cast<const WebMouseWheelEvent&>(event); @@ -151,10 +145,9 @@ class MockScrollMouseTarget : public MockScrollGestureTarget { class MockScrollTouchTarget : public MockScrollGestureTarget { public: MockScrollTouchTarget() : started_(false) {} - virtual ~MockScrollTouchTarget() {} + ~MockScrollTouchTarget() override {} - virtual void DispatchInputEventToPlatform( - const WebInputEvent& event) override { + void DispatchInputEventToPlatform(const WebInputEvent& event) override { ASSERT_TRUE(WebInputEvent::isTouchEventType(event.type)); const WebTouchEvent& touch_event = static_cast<const WebTouchEvent&>(event); ASSERT_EQ(touch_event.touchesLength, 1U); @@ -200,10 +193,9 @@ class MockSyntheticPinchTouchTarget : public MockSyntheticGestureTarget { last_pointer_distance_(0), zoom_direction_(ZOOM_DIRECTION_UNKNOWN), started_(false) {} - virtual ~MockSyntheticPinchTouchTarget() {} + ~MockSyntheticPinchTouchTarget() override {} - virtual void DispatchInputEventToPlatform( - const WebInputEvent& event) override { + void DispatchInputEventToPlatform(const WebInputEvent& event) override { ASSERT_TRUE(WebInputEvent::isTouchEventType(event.type)); const WebTouchEvent& touch_event = static_cast<const WebTouchEvent&>(event); ASSERT_EQ(touch_event.touchesLength, 2U); @@ -278,7 +270,7 @@ class MockSyntheticPinchTouchTarget : public MockSyntheticGestureTarget { class MockSyntheticTapGestureTarget : public MockSyntheticGestureTarget { public: MockSyntheticTapGestureTarget() : state_(NOT_STARTED) {} - virtual ~MockSyntheticTapGestureTarget() {} + ~MockSyntheticTapGestureTarget() override {} bool GestureFinished() const { return state_ == FINISHED; } gfx::PointF position() const { return position_; } @@ -300,10 +292,9 @@ class MockSyntheticTapGestureTarget : public MockSyntheticGestureTarget { class MockSyntheticTapTouchTarget : public MockSyntheticTapGestureTarget { public: MockSyntheticTapTouchTarget() {} - virtual ~MockSyntheticTapTouchTarget() {} + ~MockSyntheticTapTouchTarget() override {} - virtual void DispatchInputEventToPlatform( - const WebInputEvent& event) override { + void DispatchInputEventToPlatform(const WebInputEvent& event) override { ASSERT_TRUE(WebInputEvent::isTouchEventType(event.type)); const WebTouchEvent& touch_event = static_cast<const WebTouchEvent&>(event); ASSERT_EQ(touch_event.touchesLength, 1U); @@ -333,10 +324,9 @@ class MockSyntheticTapTouchTarget : public MockSyntheticTapGestureTarget { class MockSyntheticTapMouseTarget : public MockSyntheticTapGestureTarget { public: MockSyntheticTapMouseTarget() {} - virtual ~MockSyntheticTapMouseTarget() {} + ~MockSyntheticTapMouseTarget() override {} - virtual void DispatchInputEventToPlatform( - const WebInputEvent& event) override { + void DispatchInputEventToPlatform(const WebInputEvent& event) override { ASSERT_TRUE(WebInputEvent::isMouseEventType(event.type)); const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event); diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_base.h b/content/browser/renderer_host/input/synthetic_gesture_target_base.h index a95c5d4..d48be11 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_target_base.h +++ b/content/browser/renderer_host/input/synthetic_gesture_target_base.h @@ -25,7 +25,7 @@ class RenderWidgetHostImpl; class SyntheticGestureTargetBase : public SyntheticGestureTarget { public: explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host); - virtual ~SyntheticGestureTargetBase(); + ~SyntheticGestureTargetBase() override; virtual void DispatchWebTouchEventToPlatform( const blink::WebTouchEvent& web_touch, @@ -40,19 +40,18 @@ class SyntheticGestureTargetBase : public SyntheticGestureTarget { const ui::LatencyInfo& latency_info); // SyntheticGestureTarget: - virtual void DispatchInputEventToPlatform( - const blink::WebInputEvent& event) override; + void DispatchInputEventToPlatform(const blink::WebInputEvent& event) override; - virtual void SetNeedsFlush() override; + void SetNeedsFlush() override; - virtual SyntheticGestureParams::GestureSourceType - GetDefaultSyntheticGestureSourceType() const override; + SyntheticGestureParams::GestureSourceType + GetDefaultSyntheticGestureSourceType() const override; - virtual base::TimeDelta PointerAssumedStoppedTime() const override; + base::TimeDelta PointerAssumedStoppedTime() const override; - virtual float GetTouchSlopInDips() const override; + float GetTouchSlopInDips() const override; - virtual float GetMinScalingSpanInDips() const override; + float GetMinScalingSpanInDips() const override; protected: RenderWidgetHostImpl* render_widget_host() const { return host_; } diff --git a/content/browser/renderer_host/input/synthetic_pinch_gesture.h b/content/browser/renderer_host/input/synthetic_pinch_gesture.h index 60530c1..71e79ec 100644 --- a/content/browser/renderer_host/input/synthetic_pinch_gesture.h +++ b/content/browser/renderer_host/input/synthetic_pinch_gesture.h @@ -18,9 +18,9 @@ namespace content { class CONTENT_EXPORT SyntheticPinchGesture : public SyntheticGesture { public: explicit SyntheticPinchGesture(const SyntheticPinchGestureParams& params); - virtual ~SyntheticPinchGesture(); + ~SyntheticPinchGesture() override; - virtual SyntheticGesture::Result ForwardInputEvents( + SyntheticGesture::Result ForwardInputEvents( const base::TimeTicks& timestamp, SyntheticGestureTarget* target) override; diff --git a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h index 5940f9a..080e2db 100644 --- a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h +++ b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h @@ -28,9 +28,9 @@ class CONTENT_EXPORT SyntheticSmoothScrollGesture : public SyntheticGesture { public: explicit SyntheticSmoothScrollGesture( const SyntheticSmoothScrollGestureParams& params); - virtual ~SyntheticSmoothScrollGesture(); + ~SyntheticSmoothScrollGesture() override; - virtual SyntheticGesture::Result ForwardInputEvents( + SyntheticGesture::Result ForwardInputEvents( const base::TimeTicks& timestamp, SyntheticGestureTarget* target) override; diff --git a/content/browser/renderer_host/input/synthetic_tap_gesture.h b/content/browser/renderer_host/input/synthetic_tap_gesture.h index b73f861..a42b2dd 100644 --- a/content/browser/renderer_host/input/synthetic_tap_gesture.h +++ b/content/browser/renderer_host/input/synthetic_tap_gesture.h @@ -16,9 +16,9 @@ namespace content { class CONTENT_EXPORT SyntheticTapGesture : public SyntheticGesture { public: explicit SyntheticTapGesture(const SyntheticTapGestureParams& params); - virtual ~SyntheticTapGesture(); + ~SyntheticTapGesture() override; - virtual SyntheticGesture::Result ForwardInputEvents( + SyntheticGesture::Result ForwardInputEvents( const base::TimeTicks& timestamp, SyntheticGestureTarget* target) override; diff --git a/content/browser/renderer_host/input/touch_action_browsertest.cc b/content/browser/renderer_host/input/touch_action_browsertest.cc index a4f59cd..6222232 100644 --- a/content/browser/renderer_host/input/touch_action_browsertest.cc +++ b/content/browser/renderer_host/input/touch_action_browsertest.cc @@ -97,7 +97,7 @@ class TouchActionBrowserTest : public ContentBrowserTest { } // ContentBrowserTest: - virtual void SetUpCommandLine(CommandLine* cmd) override { + void SetUpCommandLine(CommandLine* cmd) override { cmd->AppendSwitchASCII(switches::kTouchEvents, switches::kTouchEventsEnabled); // TODO(rbyers): Remove this switch once touch-action ships. diff --git a/content/browser/renderer_host/input/touch_emulator.h b/content/browser/renderer_host/input/touch_emulator.h index 7cadc52..c364eb9 100644 --- a/content/browser/renderer_host/input/touch_emulator.h +++ b/content/browser/renderer_host/input/touch_emulator.h @@ -18,7 +18,7 @@ namespace content { class CONTENT_EXPORT TouchEmulator : public ui::GestureProviderClient { public: explicit TouchEmulator(TouchEmulatorClient* client); - virtual ~TouchEmulator(); + ~TouchEmulator() override; void Enable(); void Disable(); @@ -45,7 +45,7 @@ class CONTENT_EXPORT TouchEmulator : public ui::GestureProviderClient { private: // ui::GestureProviderClient implementation. - virtual void OnGestureEvent(const ui::GestureEventData& gesture) override; + void OnGestureEvent(const ui::GestureEventData& gesture) override; // Returns cursor size in DIP. gfx::SizeF InitCursorFromResource( diff --git a/content/browser/renderer_host/input/touch_emulator_unittest.cc b/content/browser/renderer_host/input/touch_emulator_unittest.cc index 498da56..caaf894 100644 --- a/content/browser/renderer_host/input/touch_emulator_unittest.cc +++ b/content/browser/renderer_host/input/touch_emulator_unittest.cc @@ -67,13 +67,11 @@ class TouchEmulatorTest : public testing::Test, #endif } - virtual void ForwardGestureEvent( - const blink::WebGestureEvent& event) override { + void ForwardGestureEvent(const blink::WebGestureEvent& event) override { forwarded_events_.push_back(event.type); } - virtual void ForwardEmulatedTouchEvent( - const blink::WebTouchEvent& event) override { + void ForwardEmulatedTouchEvent(const blink::WebTouchEvent& event) override { forwarded_events_.push_back(event.type); EXPECT_EQ(1U, event.touchesLength); EXPECT_EQ(last_mouse_x_, event.touches[0].position.x); @@ -86,9 +84,9 @@ class TouchEmulatorTest : public testing::Test, } } - virtual void SetCursor(const WebCursor& cursor) override {} + void SetCursor(const WebCursor& cursor) override {} - virtual void ShowContextMenuAtPoint(const gfx::Point& point) override {} + void ShowContextMenuAtPoint(const gfx::Point& point) override {} protected: TouchEmulator* emulator() const { diff --git a/content/browser/renderer_host/input/touch_event_queue_unittest.cc b/content/browser/renderer_host/input/touch_event_queue_unittest.cc index 7ac519e..6bcec4f 100644 --- a/content/browser/renderer_host/input/touch_event_queue_unittest.cc +++ b/content/browser/renderer_host/input/touch_event_queue_unittest.cc @@ -47,7 +47,7 @@ class TouchEventQueueTest : public testing::Test, } // TouchEventQueueClient - virtual void SendTouchEventImmediately( + void SendTouchEventImmediately( const TouchEventWithLatencyInfo& event) override { ++sent_event_count_; last_sent_event_ = event.event; @@ -57,9 +57,8 @@ class TouchEventQueueTest : public testing::Test, } } - virtual void OnTouchEventAck( - const TouchEventWithLatencyInfo& event, - InputEventAckState ack_result) override { + void OnTouchEventAck(const TouchEventWithLatencyInfo& event, + InputEventAckState ack_result) override { ++acked_event_count_; last_acked_event_ = event.event; last_acked_event_state_ = ack_result; diff --git a/content/browser/renderer_host/input/touch_handle_unittest.cc b/content/browser/renderer_host/input/touch_handle_unittest.cc index 03903c3..28ba7a5 100644 --- a/content/browser/renderer_host/input/touch_handle_unittest.cc +++ b/content/browser/renderer_host/input/touch_handle_unittest.cc @@ -34,24 +34,24 @@ struct MockDrawableData { class MockTouchHandleDrawable : public TouchHandleDrawable { public: explicit MockTouchHandleDrawable(MockDrawableData* data) : data_(data) {} - virtual ~MockTouchHandleDrawable() {} + ~MockTouchHandleDrawable() override {} - virtual void SetEnabled(bool enabled) override { data_->enabled = enabled; } + void SetEnabled(bool enabled) override { data_->enabled = enabled; } - virtual void SetOrientation(TouchHandleOrientation orientation) override { + void SetOrientation(TouchHandleOrientation orientation) override { data_->orientation = orientation; } - virtual void SetAlpha(float alpha) override { data_->alpha = alpha; } + void SetAlpha(float alpha) override { data_->alpha = alpha; } - virtual void SetFocus(const gfx::PointF& position) override { + void SetFocus(const gfx::PointF& position) override { // Anchor focus to the top left of the rect (regardless of orientation). data_->rect.set_origin(position); } - virtual void SetVisible(bool visible) override { data_->visible = visible; } + void SetVisible(bool visible) override { data_->visible = visible; } - virtual bool IntersectsWith(const gfx::RectF& rect) const override { + bool IntersectsWith(const gfx::RectF& rect) const override { return data_->rect.Intersects(rect); } @@ -72,36 +72,34 @@ class TouchHandleTest : public testing::Test, public TouchHandleClient { virtual ~TouchHandleTest() {} // TouchHandleClient implementation. - virtual void OnHandleDragBegin(const TouchHandle& handle) override { + void OnHandleDragBegin(const TouchHandle& handle) override { dragging_ = true; } - virtual void OnHandleDragUpdate(const TouchHandle& handle, - const gfx::PointF& new_position) override { + void OnHandleDragUpdate(const TouchHandle& handle, + const gfx::PointF& new_position) override { dragged_ = true; drag_position_ = new_position; } - virtual void OnHandleDragEnd(const TouchHandle& handle) override { + void OnHandleDragEnd(const TouchHandle& handle) override { dragging_ = false; } - virtual void OnHandleTapped(const TouchHandle& handle) override { - tapped_ = true; - } + void OnHandleTapped(const TouchHandle& handle) override { tapped_ = true; } - virtual void SetNeedsAnimate() override { needs_animate_ = true; } + void SetNeedsAnimate() override { needs_animate_ = true; } - virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override { + scoped_ptr<TouchHandleDrawable> CreateDrawable() override { return scoped_ptr<TouchHandleDrawable>( new MockTouchHandleDrawable(&drawable_data_)); } - virtual base::TimeDelta GetTapTimeout() const override { + base::TimeDelta GetTapTimeout() const override { return base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs); } - virtual float GetTapSlop() const override { return kDefaultTapSlop; } + float GetTapSlop() const override { return kDefaultTapSlop; } void Animate(TouchHandle& handle) { needs_animate_ = false; diff --git a/content/browser/renderer_host/input/touch_input_browsertest.cc b/content/browser/renderer_host/input/touch_input_browsertest.cc index e25b6be..95e5f73 100644 --- a/content/browser/renderer_host/input/touch_input_browsertest.cc +++ b/content/browser/renderer_host/input/touch_input_browsertest.cc @@ -97,7 +97,7 @@ class InputEventMessageFilter : public BrowserMessageFilter { InputEventAckState last_ack_state() const { return state_; } protected: - virtual ~InputEventMessageFilter() {} + ~InputEventMessageFilter() override {} private: void ReceivedEventAck(WebInputEvent::Type type, InputEventAckState state) { @@ -108,7 +108,7 @@ class InputEventMessageFilter : public BrowserMessageFilter { } // BrowserMessageFilter: - virtual bool OnMessageReceived(const IPC::Message& message) override { + bool OnMessageReceived(const IPC::Message& message) override { if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) { InputHostMsg_HandleInputEvent_ACK::Param params; InputHostMsg_HandleInputEvent_ACK::Read(&message, ¶ms); @@ -159,7 +159,7 @@ class TouchInputBrowserTest : public ContentBrowserTest { host->GetProcess()->AddFilter(filter_.get()); } - virtual void SetUpCommandLine(CommandLine* cmd) override { + void SetUpCommandLine(CommandLine* cmd) override { cmd->AppendSwitchASCII(switches::kTouchEvents, switches::kTouchEventsEnabled); } diff --git a/content/browser/renderer_host/input/touch_selection_controller.h b/content/browser/renderer_host/input/touch_selection_controller.h index 4e33594..1ded1a97 100644 --- a/content/browser/renderer_host/input/touch_selection_controller.h +++ b/content/browser/renderer_host/input/touch_selection_controller.h @@ -44,7 +44,7 @@ class CONTENT_EXPORT TouchSelectionController : public TouchHandleClient { TouchSelectionController(TouchSelectionControllerClient* client, base::TimeDelta tap_timeout, float tap_slop); - virtual ~TouchSelectionController(); + ~TouchSelectionController() override; // To be called when the selection bounds have changed. // Note that such updates will trigger handle updates only if preceded @@ -86,15 +86,15 @@ class CONTENT_EXPORT TouchSelectionController : public TouchHandleClient { enum InputEventType { TAP, LONG_PRESS, INPUT_EVENT_TYPE_NONE }; // TouchHandleClient implementation. - virtual void OnHandleDragBegin(const TouchHandle& handle) override; - virtual void OnHandleDragUpdate(const TouchHandle& handle, - const gfx::PointF& new_position) override; - virtual void OnHandleDragEnd(const TouchHandle& handle) override; - virtual void OnHandleTapped(const TouchHandle& handle) override; - virtual void SetNeedsAnimate() override; - virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override; - virtual base::TimeDelta GetTapTimeout() const override; - virtual float GetTapSlop() const override; + void OnHandleDragBegin(const TouchHandle& handle) override; + void OnHandleDragUpdate(const TouchHandle& handle, + const gfx::PointF& new_position) override; + void OnHandleDragEnd(const TouchHandle& handle) override; + void OnHandleTapped(const TouchHandle& handle) override; + void SetNeedsAnimate() override; + scoped_ptr<TouchHandleDrawable> CreateDrawable() override; + base::TimeDelta GetTapTimeout() const override; + float GetTapSlop() const override; void ShowInsertionHandleAutomatically(); void ShowSelectionHandlesAutomatically(); diff --git a/content/browser/renderer_host/input/touch_selection_controller_unittest.cc b/content/browser/renderer_host/input/touch_selection_controller_unittest.cc index 1ffd384..1b3451e 100644 --- a/content/browser/renderer_host/input/touch_selection_controller_unittest.cc +++ b/content/browser/renderer_host/input/touch_selection_controller_unittest.cc @@ -19,13 +19,13 @@ class MockTouchHandleDrawable : public TouchHandleDrawable { public: explicit MockTouchHandleDrawable(bool* contains_point) : intersects_rect_(contains_point) {} - virtual ~MockTouchHandleDrawable() {} - virtual void SetEnabled(bool enabled) override {} - virtual void SetOrientation(TouchHandleOrientation orientation) override {} - virtual void SetAlpha(float alpha) override {} - virtual void SetFocus(const gfx::PointF& position) override {} - virtual void SetVisible(bool visible) override {} - virtual bool IntersectsWith(const gfx::RectF& rect) const override { + ~MockTouchHandleDrawable() override {} + void SetEnabled(bool enabled) override {} + void SetOrientation(TouchHandleOrientation orientation) override {} + void SetAlpha(float alpha) override {} + void SetFocus(const gfx::PointF& position) override {} + void SetVisible(bool visible) override {} + bool IntersectsWith(const gfx::RectF& rect) const override { return *intersects_rect_; } @@ -60,29 +60,29 @@ class TouchSelectionControllerTest : public testing::Test, // TouchSelectionControllerClient implementation. - virtual bool SupportsAnimation() const override { return animation_enabled_; } + bool SupportsAnimation() const override { return animation_enabled_; } - virtual void SetNeedsAnimate() override { needs_animate_ = true; } + void SetNeedsAnimate() override { needs_animate_ = true; } - virtual void MoveCaret(const gfx::PointF& position) override { + void MoveCaret(const gfx::PointF& position) override { caret_moved_ = true; caret_position_ = position; } - virtual void SelectBetweenCoordinates(const gfx::PointF& start, - const gfx::PointF& end) override { + void SelectBetweenCoordinates(const gfx::PointF& start, + const gfx::PointF& end) override { selection_moved_ = true; selection_start_ = start; selection_end_ = end; } - virtual void OnSelectionEvent(SelectionEventType event, - const gfx::PointF& end_position) override { + void OnSelectionEvent(SelectionEventType event, + const gfx::PointF& end_position) override { last_event_ = event; last_event_start_ = end_position; } - virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override { + scoped_ptr<TouchHandleDrawable> CreateDrawable() override { return scoped_ptr<TouchHandleDrawable>( new MockTouchHandleDrawable(&dragging_enabled_)); } diff --git a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h index 6f93f1d..64e5d47 100644 --- a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h +++ b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h @@ -30,7 +30,7 @@ class TouchpadTapSuppressionController : public TapSuppressionControllerClient { TouchpadTapSuppressionController( TouchpadTapSuppressionControllerClient* client, const TapSuppressionController::Config& config); - virtual ~TouchpadTapSuppressionController(); + ~TouchpadTapSuppressionController() override; // Should be called on arrival of GestureFlingCancel events. void GestureFlingCancel(); @@ -52,8 +52,8 @@ class TouchpadTapSuppressionController : public TapSuppressionControllerClient { friend class MockRenderWidgetHost; // TapSuppressionControllerClient implementation. - virtual void DropStashedTapDown() override; - virtual void ForwardStashedTapDown() override; + void DropStashedTapDown() override; + void ForwardStashedTapDown() override; TouchpadTapSuppressionControllerClient* client_; MouseEventWithLatencyInfo stashed_mouse_down_; diff --git a/content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h b/content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h index 2b3e21d..35ff274 100644 --- a/content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h +++ b/content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h @@ -22,7 +22,7 @@ class TouchscreenTapSuppressionController TouchscreenTapSuppressionController( GestureEventQueue* geq, const TapSuppressionController::Config& config); - virtual ~TouchscreenTapSuppressionController(); + ~TouchscreenTapSuppressionController() override; // Should be called on arrival of GestureFlingCancel events. void GestureFlingCancel(); @@ -37,8 +37,8 @@ class TouchscreenTapSuppressionController private: // TapSuppressionControllerClient implementation. - virtual void DropStashedTapDown() override; - virtual void ForwardStashedTapDown() override; + void DropStashedTapDown() override; + void ForwardStashedTapDown() override; GestureEventQueue* gesture_event_queue_; diff --git a/content/browser/renderer_host/media/audio_input_device_manager.h b/content/browser/renderer_host/media/audio_input_device_manager.h index b744603..a2d4ca4 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager.h +++ b/content/browser/renderer_host/media/audio_input_device_manager.h @@ -45,13 +45,13 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider { const StreamDeviceInfo* GetOpenedDeviceInfoById(int session_id); // MediaStreamProvider implementation, called on IO thread. - virtual void Register(MediaStreamProviderListener* listener, - const scoped_refptr<base::SingleThreadTaskRunner>& - device_task_runner) override; - virtual void Unregister() override; - virtual void EnumerateDevices(MediaStreamType stream_type) override; - virtual int Open(const StreamDeviceInfo& device) override; - virtual void Close(int session_id) override; + void Register(MediaStreamProviderListener* listener, + const scoped_refptr<base::SingleThreadTaskRunner>& + device_task_runner) override; + void Unregister() override; + void EnumerateDevices(MediaStreamType stream_type) override; + int Open(const StreamDeviceInfo& device) override; + void Close(int session_id) override; void UseFakeDevice(); bool ShouldUseFakeDevice() const; @@ -73,7 +73,7 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider { void GetFakeDeviceNames(media::AudioDeviceNames* device_names); typedef std::vector<StreamDeviceInfo> StreamDeviceList; - virtual ~AudioInputDeviceManager(); + ~AudioInputDeviceManager() override; // Enumerates audio input devices on media stream device thread. void EnumerateOnDeviceThread(MediaStreamType stream_type); diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h index 43dd3bb..b847bf6 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.h +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h @@ -107,19 +107,19 @@ class CONTENT_EXPORT AudioInputRendererHost media::UserInputMonitor* user_input_monitor); // BrowserMessageFilter implementation. - virtual void OnChannelClosing() override; - virtual void OnDestruct() const override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelClosing() override; + void OnDestruct() const override; + bool OnMessageReceived(const IPC::Message& message) override; // AudioInputController::EventHandler implementation. - virtual void OnCreated(media::AudioInputController* controller) override; - virtual void OnRecording(media::AudioInputController* controller) override; - virtual void OnError(media::AudioInputController* controller, - media::AudioInputController::ErrorCode error_code) override; - virtual void OnData(media::AudioInputController* controller, - const media::AudioBus* data) override; - virtual void OnLog(media::AudioInputController* controller, - const std::string& message) override; + void OnCreated(media::AudioInputController* controller) override; + void OnRecording(media::AudioInputController* controller) override; + void OnError(media::AudioInputController* controller, + media::AudioInputController::ErrorCode error_code) override; + void OnData(media::AudioInputController* controller, + const media::AudioBus* data) override; + void OnLog(media::AudioInputController* controller, + const std::string& message) override; private: // TODO(henrika): extend test suite (compare AudioRenderHost) @@ -130,7 +130,7 @@ class CONTENT_EXPORT AudioInputRendererHost struct AudioEntry; typedef std::map<int, AudioEntry*> AudioEntryMap; - virtual ~AudioInputRendererHost(); + ~AudioInputRendererHost() override; // Methods called on IO thread ---------------------------------------------- diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.h b/content/browser/renderer_host/media/audio_input_sync_writer.h index 65e8622..1ace401 100644 --- a/content/browser/renderer_host/media/audio_input_sync_writer.h +++ b/content/browser/renderer_host/media/audio_input_sync_writer.h @@ -32,14 +32,14 @@ class AudioInputSyncWriter : public media::AudioInputController::SyncWriter { int shared_memory_segment_count, const media::AudioParameters& params); - virtual ~AudioInputSyncWriter(); + ~AudioInputSyncWriter() override; // media::AudioInputController::SyncWriter implementation. - virtual void UpdateRecordedBytes(uint32 bytes) override; - virtual void Write(const media::AudioBus* data, - double volume, - bool key_pressed) override; - virtual void Close() override; + void UpdateRecordedBytes(uint32 bytes) override; + void Write(const media::AudioBus* data, + double volume, + bool key_pressed) override; + void Close() override; bool Init(); bool PrepareForeignSocket(base::ProcessHandle process_handle, diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc index 3c31820..43555fc 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_renderer_host.cc @@ -42,7 +42,7 @@ class AudioRendererHost::AudioEntry const std::string& output_device_id, scoped_ptr<base::SharedMemory> shared_memory, scoped_ptr<media::AudioOutputController::SyncReader> reader); - virtual ~AudioEntry(); + ~AudioEntry() override; int stream_id() const { return stream_id_; @@ -69,12 +69,11 @@ class AudioRendererHost::AudioEntry private: // media::AudioOutputController::EventHandler implementation. - virtual void OnCreated() override; - virtual void OnPlaying() override; - virtual void OnPaused() override; - virtual void OnError() override; - virtual void OnDeviceChange(int new_buffer_size, int new_sample_rate) - override; + void OnCreated() override; + void OnPlaying() override; + void OnPaused() override; + void OnError() override; + void OnDeviceChange(int new_buffer_size, int new_sample_rate) override; AudioRendererHost* const host_; const int stream_id_; diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h index 8959cdd..11bc13f 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.h +++ b/content/browser/renderer_host/media/audio_renderer_host.h @@ -81,9 +81,9 @@ class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter { const RenderViewHost::GetAudioOutputControllersCallback& callback) const; // BrowserMessageFilter implementation. - virtual void OnChannelClosing() override; - virtual void OnDestruct() const override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelClosing() override; + void OnDestruct() const override; + bool OnMessageReceived(const IPC::Message& message) override; // Returns true if any streams managed by this host are actively playing. Can // be called from any thread. @@ -105,7 +105,7 @@ class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter { class AudioEntry; typedef std::map<int, AudioEntry*> AudioEntryMap; - virtual ~AudioRendererHost(); + ~AudioRendererHost() override; // Methods called on IO thread ---------------------------------------------- diff --git a/content/browser/renderer_host/media/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h index 0a563cd..16af192 100644 --- a/content/browser/renderer_host/media/audio_sync_reader.h +++ b/content/browser/renderer_host/media/audio_sync_reader.h @@ -31,12 +31,12 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader { AudioSyncReader(base::SharedMemory* shared_memory, const media::AudioParameters& params); - virtual ~AudioSyncReader(); + ~AudioSyncReader() override; // media::AudioOutputController::SyncReader implementations. - virtual void UpdatePendingBytes(uint32 bytes) override; - virtual void Read(media::AudioBus* dest) override; - virtual void Close() override; + void UpdatePendingBytes(uint32 bytes) override; + void Read(media::AudioBus* dest) override; + void Close() override; bool Init(); bool PrepareForeignSocket(base::ProcessHandle process_handle, diff --git a/content/browser/renderer_host/media/media_capture_devices_impl.h b/content/browser/renderer_host/media/media_capture_devices_impl.h index 8fefa4d..77174cc 100644 --- a/content/browser/renderer_host/media/media_capture_devices_impl.h +++ b/content/browser/renderer_host/media/media_capture_devices_impl.h @@ -15,8 +15,8 @@ class MediaCaptureDevicesImpl : public MediaCaptureDevices { static MediaCaptureDevicesImpl* GetInstance(); // Overriden from MediaCaptureDevices - virtual const MediaStreamDevices& GetAudioCaptureDevices() override; - virtual const MediaStreamDevices& GetVideoCaptureDevices() override; + const MediaStreamDevices& GetAudioCaptureDevices() override; + const MediaStreamDevices& GetVideoCaptureDevices() override; // Called by MediaStreamManager to notify the change of media capture // devices, these 2 methods are called in IO thread. @@ -26,7 +26,7 @@ class MediaCaptureDevicesImpl : public MediaCaptureDevices { private: friend struct DefaultSingletonTraits<MediaCaptureDevicesImpl>; MediaCaptureDevicesImpl(); - virtual ~MediaCaptureDevicesImpl(); + ~MediaCaptureDevicesImpl() override; void UpdateAudioDevicesOnUIThread(const content::MediaStreamDevices& devices); void UpdateVideoDevicesOnUIThread(const content::MediaStreamDevices& devices); diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h index 87c95d4..f35ae26 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h @@ -33,34 +33,33 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter, MediaStreamManager* media_stream_manager); // MediaStreamRequester implementation. - virtual void StreamGenerated( - int render_frame_id, - int page_request_id, - const std::string& label, - const StreamDeviceInfoArray& audio_devices, - const StreamDeviceInfoArray& video_devices) override; - virtual void StreamGenerationFailed( + void StreamGenerated(int render_frame_id, + int page_request_id, + const std::string& label, + const StreamDeviceInfoArray& audio_devices, + const StreamDeviceInfoArray& video_devices) override; + void StreamGenerationFailed( int render_frame_id, int page_request_id, content::MediaStreamRequestResult result) override; - virtual void DeviceStopped(int render_frame_id, - const std::string& label, - const StreamDeviceInfo& device) override; - virtual void DevicesEnumerated(int render_frame_id, - int page_request_id, - const std::string& label, - const StreamDeviceInfoArray& devices) override; - virtual void DeviceOpened(int render_frame_id, - int page_request_id, - const std::string& label, - const StreamDeviceInfo& video_device) override; + void DeviceStopped(int render_frame_id, + const std::string& label, + const StreamDeviceInfo& device) override; + void DevicesEnumerated(int render_frame_id, + int page_request_id, + const std::string& label, + const StreamDeviceInfoArray& devices) override; + void DeviceOpened(int render_frame_id, + int page_request_id, + const std::string& label, + const StreamDeviceInfo& video_device) override; // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelClosing() override; protected: - virtual ~MediaStreamDispatcherHost(); + ~MediaStreamDispatcherHost() override; private: friend class MockMediaStreamDispatcherHost; diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h index d5dbf9f..78c722e 100644 --- a/content/browser/renderer_host/media/media_stream_manager.h +++ b/content/browser/renderer_host/media/media_stream_manager.h @@ -72,7 +72,7 @@ class CONTENT_EXPORT MediaStreamManager MediaRequestResponseCallback; explicit MediaStreamManager(media::AudioManager* audio_manager); - virtual ~MediaStreamManager(); + ~MediaStreamManager() override; // Used to access VideoCaptureManager. VideoCaptureManager* video_capture_manager(); @@ -165,18 +165,14 @@ class CONTENT_EXPORT MediaStreamManager void EnsureDeviceMonitorStarted(); // Implements MediaStreamProviderListener. - virtual void Opened(MediaStreamType stream_type, - int capture_session_id) override; - virtual void Closed(MediaStreamType stream_type, - int capture_session_id) override; - virtual void DevicesEnumerated(MediaStreamType stream_type, - const StreamDeviceInfoArray& devices) override; - virtual void Aborted(MediaStreamType stream_type, - int capture_session_id) override; + void Opened(MediaStreamType stream_type, int capture_session_id) override; + void Closed(MediaStreamType stream_type, int capture_session_id) override; + void DevicesEnumerated(MediaStreamType stream_type, + const StreamDeviceInfoArray& devices) override; + void Aborted(MediaStreamType stream_type, int capture_session_id) override; // Implements base::SystemMonitor::DevicesChangedObserver. - virtual void OnDevicesChanged( - base::SystemMonitor::DeviceType device_type) override; + void OnDevicesChanged(base::SystemMonitor::DeviceType device_type) override; // Called by the tests to specify a fake UI that should be used for next // generated stream (or when using --use-fake-ui-for-media-stream). @@ -195,7 +191,7 @@ class CONTENT_EXPORT MediaStreamManager // But for some tests which use TestBrowserThreadBundle, we need to call // WillDestroyCurrentMessageLoop explicitly because the notification happens // too late. (see http://crbug.com/247525#c14). - virtual void WillDestroyCurrentMessageLoop() override; + void WillDestroyCurrentMessageLoop() override; // Sends log messages to the render process hosts whose corresponding render // processes are making device requests, to be used by the @@ -208,8 +204,8 @@ class CONTENT_EXPORT MediaStreamManager static void SendMessageToNativeLog(const std::string& message); // base::PowerObserver overrides. - virtual void OnSuspend() override; - virtual void OnResume() override; + void OnSuspend() override; + void OnResume() override; protected: // Used for testing. diff --git a/content/browser/renderer_host/media/media_stream_manager_unittest.cc b/content/browser/renderer_host/media/media_stream_manager_unittest.cc index 15da678..51ab0a5 100644 --- a/content/browser/renderer_host/media/media_stream_manager_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_manager_unittest.cc @@ -55,9 +55,9 @@ typedef media::FakeAudioManager AudioManagerPlatform; class MockAudioManager : public AudioManagerPlatform { public: MockAudioManager() : AudioManagerPlatform(&fake_audio_log_factory_) {} - virtual ~MockAudioManager() {} + ~MockAudioManager() override {} - virtual void GetAudioInputDeviceNames( + void GetAudioInputDeviceNames( media::AudioDeviceNames* device_names) override { DCHECK(device_names->empty()); if (HasAudioInputDevices()) { diff --git a/content/browser/renderer_host/media/media_stream_track_metrics_host.h b/content/browser/renderer_host/media/media_stream_track_metrics_host.h index 5f36f26..35235db 100644 --- a/content/browser/renderer_host/media/media_stream_track_metrics_host.h +++ b/content/browser/renderer_host/media/media_stream_track_metrics_host.h @@ -31,10 +31,10 @@ class MediaStreamTrackMetricsHost explicit MediaStreamTrackMetricsHost(); protected: - virtual ~MediaStreamTrackMetricsHost(); + ~MediaStreamTrackMetricsHost() override; // BrowserMessageFilter override. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; private: void OnAddTrack(uint64 id, bool is_audio, bool is_remote); diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy.h b/content/browser/renderer_host/media/media_stream_ui_proxy.h index c61bbfa..23fc592 100644 --- a/content/browser/renderer_host/media/media_stream_ui_proxy.h +++ b/content/browser/renderer_host/media/media_stream_ui_proxy.h @@ -90,23 +90,22 @@ class CONTENT_EXPORT MediaStreamUIProxy { class CONTENT_EXPORT FakeMediaStreamUIProxy : public MediaStreamUIProxy { public: explicit FakeMediaStreamUIProxy(); - virtual ~FakeMediaStreamUIProxy(); + ~FakeMediaStreamUIProxy() override; void SetAvailableDevices(const MediaStreamDevices& devices); void SetMicAccess(bool access); void SetCameraAccess(bool access); // MediaStreamUIProxy overrides. - virtual void RequestAccess( - const MediaStreamRequest& request, - const ResponseCallback& response_callback) override; - virtual void CheckAccess(const GURL& security_origin, - MediaStreamType type, - int render_process_id, - int render_frame_id, - const base::Callback<void(bool)>& callback) override; - virtual void OnStarted(const base::Closure& stop_callback, - const WindowIdCallback& window_id_callback) override; + void RequestAccess(const MediaStreamRequest& request, + const ResponseCallback& response_callback) override; + void CheckAccess(const GURL& security_origin, + MediaStreamType type, + int render_process_id, + int render_frame_id, + const base::Callback<void(bool)>& callback) override; + void OnStarted(const base::Closure& stop_callback, + const WindowIdCallback& window_id_callback) override; private: // This is used for RequestAccess(). diff --git a/content/browser/renderer_host/media/peer_connection_tracker_host.h b/content/browser/renderer_host/media/peer_connection_tracker_host.h index f1f3521..0d7b506 100644 --- a/content/browser/renderer_host/media/peer_connection_tracker_host.h +++ b/content/browser/renderer_host/media/peer_connection_tracker_host.h @@ -26,17 +26,17 @@ class PeerConnectionTrackerHost : public BrowserMessageFilter, PeerConnectionTrackerHost(int render_process_id); // content::BrowserMessageFilter override. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OverrideThreadForMessage(const IPC::Message& message, - BrowserThread::ID* thread) override; - virtual void OnChannelConnected(int32 peer_pid) override; - virtual void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OverrideThreadForMessage(const IPC::Message& message, + BrowserThread::ID* thread) override; + void OnChannelConnected(int32 peer_pid) override; + void OnChannelClosing() override; // base::PowerObserver override. - virtual void OnSuspend() override; + void OnSuspend() override; protected: - virtual ~PeerConnectionTrackerHost(); + ~PeerConnectionTrackerHost() override; private: // Handlers for peer connection messages coming from the renderer. diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc index 18a5e5d..c0b462b 100644 --- a/content/browser/renderer_host/media/video_capture_controller.cc +++ b/content/browser/renderer_host/media/video_capture_controller.cc @@ -53,7 +53,7 @@ class PoolBuffer : public media::VideoCaptureDevice::Client::Buffer { } private: - virtual ~PoolBuffer() { pool_->RelinquishProducerReservation(id()); } + ~PoolBuffer() override { pool_->RelinquishProducerReservation(id()); } const scoped_refptr<VideoCaptureBufferPool> pool_; }; @@ -61,11 +61,9 @@ class PoolBuffer : public media::VideoCaptureDevice::Client::Buffer { class SyncPointClientImpl : public media::VideoFrame::SyncPointClient { public: explicit SyncPointClientImpl(GLHelper* gl_helper) : gl_helper_(gl_helper) {} - virtual ~SyncPointClientImpl() {} - virtual uint32 InsertSyncPoint() override { - return gl_helper_->InsertSyncPoint(); - } - virtual void WaitSyncPoint(uint32 sync_point) override { + ~SyncPointClientImpl() override {} + uint32 InsertSyncPoint() override { return gl_helper_->InsertSyncPoint(); } + void WaitSyncPoint(uint32 sync_point) override { gl_helper_->WaitSyncPoint(sync_point); } @@ -156,24 +154,23 @@ class VideoCaptureController::VideoCaptureDeviceClient explicit VideoCaptureDeviceClient( const base::WeakPtr<VideoCaptureController>& controller, const scoped_refptr<VideoCaptureBufferPool>& buffer_pool); - virtual ~VideoCaptureDeviceClient(); + ~VideoCaptureDeviceClient() override; // VideoCaptureDevice::Client implementation. - virtual scoped_refptr<Buffer> ReserveOutputBuffer( - media::VideoFrame::Format format, - const gfx::Size& size) override; - virtual void OnIncomingCapturedData(const uint8* data, - int length, - const VideoCaptureFormat& frame_format, - int rotation, - base::TimeTicks timestamp) override; - virtual void OnIncomingCapturedVideoFrame( + scoped_refptr<Buffer> ReserveOutputBuffer(media::VideoFrame::Format format, + const gfx::Size& size) override; + void OnIncomingCapturedData(const uint8* data, + int length, + const VideoCaptureFormat& frame_format, + int rotation, + base::TimeTicks timestamp) override; + void OnIncomingCapturedVideoFrame( const scoped_refptr<Buffer>& buffer, const VideoCaptureFormat& buffer_format, const scoped_refptr<media::VideoFrame>& frame, base::TimeTicks timestamp) override; - virtual void OnError(const std::string& reason) override; - virtual void OnLog(const std::string& message) override; + void OnError(const std::string& reason) override; + void OnLog(const std::string& message) override; private: scoped_refptr<Buffer> DoReserveOutputBuffer(media::VideoFrame::Format format, diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h index cf6e73f..1fd9813 100644 --- a/content/browser/renderer_host/media/video_capture_host.h +++ b/content/browser/renderer_host/media/video_capture_host.h @@ -71,29 +71,29 @@ class CONTENT_EXPORT VideoCaptureHost explicit VideoCaptureHost(MediaStreamManager* media_stream_manager); // BrowserMessageFilter implementation. - virtual void OnChannelClosing() override; - virtual void OnDestruct() const override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelClosing() override; + void OnDestruct() const override; + bool OnMessageReceived(const IPC::Message& message) override; // VideoCaptureControllerEventHandler implementation. - virtual void OnError(const VideoCaptureControllerID& id) override; - virtual void OnBufferCreated(const VideoCaptureControllerID& id, - base::SharedMemoryHandle handle, - int length, - int buffer_id) override; - virtual void OnBufferDestroyed(const VideoCaptureControllerID& id, - int buffer_id) override; - virtual void OnBufferReady(const VideoCaptureControllerID& id, - int buffer_id, - const media::VideoCaptureFormat& format, - const gfx::Rect& visible_rect, - base::TimeTicks timestamp) override; - virtual void OnMailboxBufferReady(const VideoCaptureControllerID& id, - int buffer_id, - const gpu::MailboxHolder& mailbox_holder, - const media::VideoCaptureFormat& format, - base::TimeTicks timestamp) override; - virtual void OnEnded(const VideoCaptureControllerID& id) override; + void OnError(const VideoCaptureControllerID& id) override; + void OnBufferCreated(const VideoCaptureControllerID& id, + base::SharedMemoryHandle handle, + int length, + int buffer_id) override; + void OnBufferDestroyed(const VideoCaptureControllerID& id, + int buffer_id) override; + void OnBufferReady(const VideoCaptureControllerID& id, + int buffer_id, + const media::VideoCaptureFormat& format, + const gfx::Rect& visible_rect, + base::TimeTicks timestamp) override; + void OnMailboxBufferReady(const VideoCaptureControllerID& id, + int buffer_id, + const gpu::MailboxHolder& mailbox_holder, + const media::VideoCaptureFormat& format, + base::TimeTicks timestamp) override; + void OnEnded(const VideoCaptureControllerID& id) override; private: friend class BrowserThread; @@ -101,7 +101,7 @@ class CONTENT_EXPORT VideoCaptureHost friend class MockVideoCaptureHost; friend class VideoCaptureHostTest; - virtual ~VideoCaptureHost(); + ~VideoCaptureHost() override; // IPC message: Start capture on the VideoCaptureDevice referenced by // |session_id|. |device_id| is an id created by VideoCaptureMessageFilter diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h index 1914f97..a42fc53 100644 --- a/content/browser/renderer_host/media/video_capture_manager.h +++ b/content/browser/renderer_host/media/video_capture_manager.h @@ -45,17 +45,17 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider { scoped_ptr<media::VideoCaptureDeviceFactory> factory); // Implements MediaStreamProvider. - virtual void Register(MediaStreamProviderListener* listener, - const scoped_refptr<base::SingleThreadTaskRunner>& - device_task_runner) override; + void Register(MediaStreamProviderListener* listener, + const scoped_refptr<base::SingleThreadTaskRunner>& + device_task_runner) override; - virtual void Unregister() override; + void Unregister() override; - virtual void EnumerateDevices(MediaStreamType stream_type) override; + void EnumerateDevices(MediaStreamType stream_type) override; - virtual int Open(const StreamDeviceInfo& device) override; + int Open(const StreamDeviceInfo& device) override; - virtual void Close(int capture_session_id) override; + void Close(int capture_session_id) override; // Called by VideoCaptureHost to locate a capture device for |capture_params|, // adding the Host as a client of the device's controller if successful. The @@ -132,7 +132,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider { } private: - virtual ~VideoCaptureManager(); + ~VideoCaptureManager() override; struct DeviceEntry; // Checks to see if |entry| has no clients left on its controller. If so, diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host.h b/content/browser/renderer_host/media/webrtc_identity_service_host.h index 2033e67..1cc1f6b 100644 --- a/content/browser/renderer_host/media/webrtc_identity_service_host.h +++ b/content/browser/renderer_host/media/webrtc_identity_service_host.h @@ -30,10 +30,10 @@ class CONTENT_EXPORT WebRTCIdentityServiceHost : public BrowserMessageFilter { scoped_refptr<WebRTCIdentityStore> identity_store); protected: - virtual ~WebRTCIdentityServiceHost(); + ~WebRTCIdentityServiceHost() override; // content::BrowserMessageFilter override. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; private: // |sequence_number| is the same as in the OnRequestIdentity call. diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc index b5fb68e..4a9c5d2 100644 --- a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc +++ b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc @@ -29,11 +29,10 @@ class MockWebRTCIdentityStore : public WebRTCIdentityStore { public: MockWebRTCIdentityStore() : WebRTCIdentityStore(base::FilePath(), NULL) {} - virtual base::Closure RequestIdentity( - const GURL& origin, - const std::string& identity_name, - const std::string& common_name, - const CompletionCallback& callback) override { + base::Closure RequestIdentity(const GURL& origin, + const std::string& identity_name, + const std::string& common_name, + const CompletionCallback& callback) override { EXPECT_TRUE(callback_.is_null()); callback_ = callback; @@ -51,7 +50,7 @@ class MockWebRTCIdentityStore : public WebRTCIdentityStore { } private: - virtual ~MockWebRTCIdentityStore() {} + ~MockWebRTCIdentityStore() override {} void OnCancel() { callback_.Reset(); } @@ -67,13 +66,13 @@ class WebRTCIdentityServiceHostForTest : public WebRTCIdentityServiceHost { policy->Add(FAKE_RENDERER_ID); } - virtual bool Send(IPC::Message* message) override { + bool Send(IPC::Message* message) override { messages_.push_back(*message); delete message; return true; } - virtual bool OnMessageReceived(const IPC::Message& message) override { + bool OnMessageReceived(const IPC::Message& message) override { return WebRTCIdentityServiceHost::OnMessageReceived(message); } @@ -84,7 +83,7 @@ class WebRTCIdentityServiceHostForTest : public WebRTCIdentityServiceHost { void ClearMessages() { messages_.clear(); } private: - virtual ~WebRTCIdentityServiceHostForTest() { + ~WebRTCIdentityServiceHostForTest() override { ChildProcessSecurityPolicyImpl* policy = ChildProcessSecurityPolicyImpl::GetInstance(); policy->Remove(FAKE_RENDERER_ID); diff --git a/content/browser/renderer_host/memory_benchmark_message_filter.h b/content/browser/renderer_host/memory_benchmark_message_filter.h index cd32ba4..d30e3a7 100644 --- a/content/browser/renderer_host/memory_benchmark_message_filter.h +++ b/content/browser/renderer_host/memory_benchmark_message_filter.h @@ -15,9 +15,10 @@ class MemoryBenchmarkMessageFilter : public BrowserMessageFilter { public: MemoryBenchmarkMessageFilter(); - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; + private: - virtual ~MemoryBenchmarkMessageFilter(); + ~MemoryBenchmarkMessageFilter() override; void OnHeapProfilerDump(const std::string& reason); diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.h b/content/browser/renderer_host/p2p/socket_dispatcher_host.h index 692a927..18b18df 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.h +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.h @@ -39,12 +39,12 @@ class P2PSocketDispatcherHost net::URLRequestContextGetter* url_context); // content::BrowserMessageFilter overrides. - virtual void OnChannelClosing() override; - virtual void OnDestruct() const override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelClosing() override; + void OnDestruct() const override; + bool OnMessageReceived(const IPC::Message& message) override; // net::NetworkChangeNotifier::IPAddressObserver interface. - virtual void OnIPAddressChanged() override; + void OnIPAddressChanged() override; // Starts the RTP packet header dumping. Must be called on the IO thread. void StartRtpDump( @@ -56,7 +56,7 @@ class P2PSocketDispatcherHost void StopRtpDumpOnUIThread(bool incoming, bool outgoing); protected: - virtual ~P2PSocketDispatcherHost(); + ~P2PSocketDispatcherHost() override; private: friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>; diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.h b/content/browser/renderer_host/p2p/socket_host_tcp.h index 24aeb97..e532ae7 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp.h +++ b/content/browser/renderer_host/p2p/socket_host_tcp.h @@ -32,21 +32,22 @@ class CONTENT_EXPORT P2PSocketHostTcpBase : public P2PSocketHost { int socket_id, P2PSocketType type, net::URLRequestContextGetter* url_context); - virtual ~P2PSocketHostTcpBase(); + ~P2PSocketHostTcpBase() override; bool InitAccepted(const net::IPEndPoint& remote_address, net::StreamSocket* socket); // P2PSocketHost overrides. - virtual bool Init(const net::IPEndPoint& local_address, - const P2PHostAndIPEndPoint& remote_address) override; - virtual void Send(const net::IPEndPoint& to, - const std::vector<char>& data, - const rtc::PacketOptions& options, - uint64 packet_id) override; - virtual P2PSocketHost* AcceptIncomingTcpConnection( - const net::IPEndPoint& remote_address, int id) override; - virtual bool SetOption(P2PSocketOption option, int value) override; + bool Init(const net::IPEndPoint& local_address, + const P2PHostAndIPEndPoint& remote_address) override; + void Send(const net::IPEndPoint& to, + const std::vector<char>& data, + const rtc::PacketOptions& options, + uint64 packet_id) override; + P2PSocketHost* AcceptIncomingTcpConnection( + const net::IPEndPoint& remote_address, + int id) override; + bool SetOption(P2PSocketOption option, int value) override; protected: // Derived classes will provide the implementation. @@ -104,13 +105,14 @@ class CONTENT_EXPORT P2PSocketHostTcp : public P2PSocketHostTcpBase { int socket_id, P2PSocketType type, net::URLRequestContextGetter* url_context); - virtual ~P2PSocketHostTcp(); + ~P2PSocketHostTcp() override; protected: - virtual int ProcessInput(char* input, int input_len) override; - virtual void DoSend(const net::IPEndPoint& to, - const std::vector<char>& data, - const rtc::PacketOptions& options) override; + int ProcessInput(char* input, int input_len) override; + void DoSend(const net::IPEndPoint& to, + const std::vector<char>& data, + const rtc::PacketOptions& options) override; + private: DISALLOW_COPY_AND_ASSIGN(P2PSocketHostTcp); }; @@ -126,13 +128,14 @@ class CONTENT_EXPORT P2PSocketHostStunTcp : public P2PSocketHostTcpBase { P2PSocketType type, net::URLRequestContextGetter* url_context); - virtual ~P2PSocketHostStunTcp(); + ~P2PSocketHostStunTcp() override; protected: - virtual int ProcessInput(char* input, int input_len) override; - virtual void DoSend(const net::IPEndPoint& to, - const std::vector<char>& data, - const rtc::PacketOptions& options) override; + int ProcessInput(char* input, int input_len) override; + void DoSend(const net::IPEndPoint& to, + const std::vector<char>& data, + const rtc::PacketOptions& options) override; + private: int GetExpectedPacketSize(const char* data, int len, int* pad_bytes); diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.h b/content/browser/renderer_host/p2p/socket_host_tcp_server.h index f34cf38..df20532 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp_server.h +++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.h @@ -31,19 +31,19 @@ class CONTENT_EXPORT P2PSocketHostTcpServer : public P2PSocketHost { P2PSocketHostTcpServer(IPC::Sender* message_sender, int socket_id, P2PSocketType client_type); - virtual ~P2PSocketHostTcpServer(); + ~P2PSocketHostTcpServer() override; // P2PSocketHost overrides. - virtual bool Init(const net::IPEndPoint& local_address, - const P2PHostAndIPEndPoint& remote_address) override; - virtual void Send(const net::IPEndPoint& to, - const std::vector<char>& data, - const rtc::PacketOptions& options, - uint64 packet_id) override; - virtual P2PSocketHost* AcceptIncomingTcpConnection( - const net::IPEndPoint& remote_address, int id) override; - virtual bool SetOption(P2PSocketOption option, int value) override; - + bool Init(const net::IPEndPoint& local_address, + const P2PHostAndIPEndPoint& remote_address) override; + void Send(const net::IPEndPoint& to, + const std::vector<char>& data, + const rtc::PacketOptions& options, + uint64 packet_id) override; + P2PSocketHost* AcceptIncomingTcpConnection( + const net::IPEndPoint& remote_address, + int id) override; + bool SetOption(P2PSocketOption option, int value) override; private: friend class P2PSocketHostTcpServerTest; diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc index 6db5c16..bc8649a 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc @@ -26,7 +26,7 @@ class FakeServerSocket : public net::ServerSocket { accept_socket_(NULL) { } - virtual ~FakeServerSocket() {} + ~FakeServerSocket() override {} bool listening() { return listening_; } @@ -47,19 +47,19 @@ class FakeServerSocket : public net::ServerSocket { } } - virtual int Listen(const net::IPEndPoint& address, int backlog) override { + int Listen(const net::IPEndPoint& address, int backlog) override { local_address_ = address; listening_ = true; return net::OK; } - virtual int GetLocalAddress(net::IPEndPoint* address) const override { + int GetLocalAddress(net::IPEndPoint* address) const override { *address = local_address_; return net::OK; } - virtual int Accept(scoped_ptr<net::StreamSocket>* socket, - const net::CompletionCallback& callback) override { + int Accept(scoped_ptr<net::StreamSocket>* socket, + const net::CompletionCallback& callback) override { DCHECK(socket); if (!incoming_sockets_.empty()) { socket->reset(incoming_sockets_.front()); diff --git a/content/browser/renderer_host/p2p/socket_host_test_utils.h b/content/browser/renderer_host/p2p/socket_host_test_utils.h index 5ba645d..acab45f 100644 --- a/content/browser/renderer_host/p2p/socket_host_test_utils.h +++ b/content/browser/renderer_host/p2p/socket_host_test_utils.h @@ -31,7 +31,7 @@ class MockIPCSender : public IPC::Sender { class FakeSocket : public net::StreamSocket { public: FakeSocket(std::string* written_data); - virtual ~FakeSocket(); + ~FakeSocket() override; void set_async_write(bool async_write) { async_write_ = async_write; } void AppendInputData(const char* data, int data_size); @@ -41,26 +41,28 @@ class FakeSocket : public net::StreamSocket { void SetLocalAddress(const net::IPEndPoint& local_address); // net::Socket implementation. - virtual int Read(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) override; - virtual int Write(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) override; - virtual int SetReceiveBufferSize(int32 size) override; - virtual int SetSendBufferSize(int32 size) override; - virtual int Connect(const net::CompletionCallback& callback) override; - virtual void Disconnect() override; - virtual bool IsConnected() const override; - virtual bool IsConnectedAndIdle() const override; - virtual int GetPeerAddress(net::IPEndPoint* address) const override; - virtual int GetLocalAddress(net::IPEndPoint* address) const override; - virtual const net::BoundNetLog& NetLog() const override; - virtual void SetSubresourceSpeculation() override; - virtual void SetOmniboxSpeculation() override; - virtual bool WasEverUsed() const override; - virtual bool UsingTCPFastOpen() const override; - virtual bool WasNpnNegotiated() const override; - virtual net::NextProto GetNegotiatedProtocol() const override; - virtual bool GetSSLInfo(net::SSLInfo* ssl_info) override; + int Read(net::IOBuffer* buf, + int buf_len, + const net::CompletionCallback& callback) override; + int Write(net::IOBuffer* buf, + int buf_len, + const net::CompletionCallback& callback) override; + int SetReceiveBufferSize(int32 size) override; + int SetSendBufferSize(int32 size) override; + int Connect(const net::CompletionCallback& callback) override; + void Disconnect() override; + bool IsConnected() const override; + bool IsConnectedAndIdle() const override; + int GetPeerAddress(net::IPEndPoint* address) const override; + int GetLocalAddress(net::IPEndPoint* address) const override; + const net::BoundNetLog& NetLog() const override; + void SetSubresourceSpeculation() override; + void SetOmniboxSpeculation() override; + bool WasEverUsed() const override; + bool UsingTCPFastOpen() const override; + bool WasNpnNegotiated() const override; + net::NextProto GetNegotiatedProtocol() const override; + bool GetSSLInfo(net::SSLInfo* ssl_info) override; private: void DoAsyncWrite(scoped_refptr<net::IOBuffer> buf, int buf_len, diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h index 263e972..6db6faa 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp.h +++ b/content/browser/renderer_host/p2p/socket_host_udp.h @@ -29,18 +29,19 @@ class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost { P2PSocketHostUdp(IPC::Sender* message_sender, int socket_id, P2PMessageThrottler* throttler); - virtual ~P2PSocketHostUdp(); + ~P2PSocketHostUdp() override; // P2PSocketHost overrides. - virtual bool Init(const net::IPEndPoint& local_address, - const P2PHostAndIPEndPoint& remote_address) override; - virtual void Send(const net::IPEndPoint& to, - const std::vector<char>& data, - const rtc::PacketOptions& options, - uint64 packet_id) override; - virtual P2PSocketHost* AcceptIncomingTcpConnection( - const net::IPEndPoint& remote_address, int id) override; - virtual bool SetOption(P2PSocketOption option, int value) override; + bool Init(const net::IPEndPoint& local_address, + const P2PHostAndIPEndPoint& remote_address) override; + void Send(const net::IPEndPoint& to, + const std::vector<char>& data, + const rtc::PacketOptions& options, + uint64 packet_id) override; + P2PSocketHost* AcceptIncomingTcpConnection( + const net::IPEndPoint& remote_address, + int id) override; + bool SetOption(P2PSocketOption option, int value) override; private: friend class P2PSocketHostUdpTest; diff --git a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc index 076c752..ae02349 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc +++ b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc @@ -29,7 +29,7 @@ namespace { class FakeTiming : public rtc::Timing { public: FakeTiming() : now_(0.0) {} - virtual double TimerNow() override { return now_; } + double TimerNow() override { return now_; } void set_now(double now) { now_ = now; } private: @@ -46,27 +46,27 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket { : sent_packets_(sent_packets) { } - virtual void Close() override { - } + void Close() override {} - virtual int GetPeerAddress(net::IPEndPoint* address) const override { + int GetPeerAddress(net::IPEndPoint* address) const override { NOTREACHED(); return net::ERR_SOCKET_NOT_CONNECTED; } - virtual int GetLocalAddress(net::IPEndPoint* address) const override { + int GetLocalAddress(net::IPEndPoint* address) const override { *address = address_; return 0; } - virtual int Listen(const net::IPEndPoint& address) override { + int Listen(const net::IPEndPoint& address) override { address_ = address; return 0; } - virtual int RecvFrom(net::IOBuffer* buf, int buf_len, - net::IPEndPoint* address, - const net::CompletionCallback& callback) override { + int RecvFrom(net::IOBuffer* buf, + int buf_len, + net::IPEndPoint* address, + const net::CompletionCallback& callback) override { CHECK(recv_callback_.is_null()); if (incoming_packets_.size() > 0) { scoped_refptr<net::IOBuffer> buffer(buf); @@ -85,22 +85,19 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket { } } - virtual int SendTo(net::IOBuffer* buf, int buf_len, - const net::IPEndPoint& address, - const net::CompletionCallback& callback) override { + int SendTo(net::IOBuffer* buf, + int buf_len, + const net::IPEndPoint& address, + const net::CompletionCallback& callback) override { scoped_refptr<net::IOBuffer> buffer(buf); std::vector<char> data_vector(buffer->data(), buffer->data() + buf_len); sent_packets_->push_back(UDPPacket(address, data_vector)); return buf_len; } - virtual int SetReceiveBufferSize(int32 size) override { - return net::OK; - } + int SetReceiveBufferSize(int32 size) override { return net::OK; } - virtual int SetSendBufferSize(int32 size) override { - return net::OK; - } + int SetSendBufferSize(int32 size) override { return net::OK; } void ReceivePacket(const net::IPEndPoint& address, std::vector<char> data) { if (!recv_callback_.is_null()) { @@ -116,53 +113,43 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket { } } - virtual const net::BoundNetLog& NetLog() const override { - return net_log_; - } + const net::BoundNetLog& NetLog() const override { return net_log_; } - virtual void AllowAddressReuse() override { - NOTIMPLEMENTED(); - } + void AllowAddressReuse() override { NOTIMPLEMENTED(); } - virtual void AllowBroadcast() override { - NOTIMPLEMENTED(); - } + void AllowBroadcast() override { NOTIMPLEMENTED(); } - virtual int JoinGroup( - const net::IPAddressNumber& group_address) const override { + int JoinGroup(const net::IPAddressNumber& group_address) const override { NOTIMPLEMENTED(); return net::ERR_NOT_IMPLEMENTED; } - virtual int LeaveGroup( - const net::IPAddressNumber& group_address) const override { + int LeaveGroup(const net::IPAddressNumber& group_address) const override { NOTIMPLEMENTED(); return net::ERR_NOT_IMPLEMENTED; } - virtual int SetMulticastInterface(uint32 interface_index) override { + int SetMulticastInterface(uint32 interface_index) override { NOTIMPLEMENTED(); return net::ERR_NOT_IMPLEMENTED; } - virtual int SetMulticastTimeToLive(int time_to_live) override { + int SetMulticastTimeToLive(int time_to_live) override { NOTIMPLEMENTED(); return net::ERR_NOT_IMPLEMENTED; } - virtual int SetMulticastLoopbackMode(bool loopback) override { + int SetMulticastLoopbackMode(bool loopback) override { NOTIMPLEMENTED(); return net::ERR_NOT_IMPLEMENTED; } - virtual int SetDiffServCodePoint(net::DiffServCodePoint dscp) override { + int SetDiffServCodePoint(net::DiffServCodePoint dscp) override { NOTIMPLEMENTED(); return net::ERR_NOT_IMPLEMENTED; } - virtual void DetachFromThread() override { - NOTIMPLEMENTED(); - } + void DetachFromThread() override { NOTIMPLEMENTED(); } private: net::IPEndPoint address_; diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h index 932fb09..bd0c61d 100644 --- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h +++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h @@ -42,22 +42,21 @@ class CONTENT_EXPORT BrowserPpapiHostImpl : public BrowserPpapiHost { const base::FilePath& profile_data_directory, bool in_process, bool external_plugin); - virtual ~BrowserPpapiHostImpl(); + ~BrowserPpapiHostImpl() override; // BrowserPpapiHost. - virtual ppapi::host::PpapiHost* GetPpapiHost() override; - virtual base::ProcessHandle GetPluginProcessHandle() const override; - virtual bool IsValidInstance(PP_Instance instance) const override; - virtual bool GetRenderFrameIDsForInstance(PP_Instance instance, - int* render_process_id, - int* render_frame_id) const - override; - virtual const std::string& GetPluginName() override; - virtual const base::FilePath& GetPluginPath() override; - virtual const base::FilePath& GetProfileDataDirectory() override; - virtual GURL GetDocumentURLForInstance(PP_Instance instance) override; - virtual GURL GetPluginURLForInstance(PP_Instance instance) override; - virtual void SetOnKeepaliveCallback( + ppapi::host::PpapiHost* GetPpapiHost() override; + base::ProcessHandle GetPluginProcessHandle() const override; + bool IsValidInstance(PP_Instance instance) const override; + bool GetRenderFrameIDsForInstance(PP_Instance instance, + int* render_process_id, + int* render_frame_id) const override; + const std::string& GetPluginName() override; + const base::FilePath& GetPluginPath() override; + const base::FilePath& GetProfileDataDirectory() override; + GURL GetDocumentURLForInstance(PP_Instance instance) override; + GURL GetPluginURLForInstance(PP_Instance instance) override; + void SetOnKeepaliveCallback( const BrowserPpapiHost::OnKeepaliveCallback& callback) override; void set_plugin_process_handle(base::ProcessHandle handle) { @@ -93,12 +92,12 @@ class CONTENT_EXPORT BrowserPpapiHostImpl : public BrowserPpapiHost { BrowserPpapiHostImpl* browser_ppapi_host_impl); // IPC::MessageFilter. - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; void OnHostDestroyed(); private: - virtual ~HostMessageFilter(); + ~HostMessageFilter() override; void OnKeepalive(); void OnHostMsgLogInterfaceUsage(int hash) const; diff --git a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h index 31a0a0e..84161f33 100644 --- a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h +++ b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h @@ -26,9 +26,9 @@ class ContentBrowserPepperHostFactory : public ppapi::host::HostFactory { // Non-owning pointer to the filter must outlive this class. explicit ContentBrowserPepperHostFactory(BrowserPpapiHostImpl* host); - virtual ~ContentBrowserPepperHostFactory(); + ~ContentBrowserPepperHostFactory() override; - virtual scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost( + scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost( ppapi::host::PpapiHost* host, const ppapi::proxy::ResourceMessageCallParams& params, PP_Instance instance, diff --git a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc index 08f4180..e2c909c 100644 --- a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc +++ b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc @@ -23,14 +23,14 @@ class FontMessageFilter : public ppapi::host::ResourceMessageFilter { FontMessageFilter(); // ppapi::host::ResourceMessageFilter implementation. - virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( + scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( const IPC::Message& msg) override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; private: - virtual ~FontMessageFilter(); + ~FontMessageFilter() override; // Message handler. int32_t OnHostMsgGetFontFamilies(ppapi::host::HostMessageContext* context); diff --git a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h index c002e63..643be70 100644 --- a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h +++ b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h @@ -17,7 +17,7 @@ class PepperBrowserFontSingletonHost : public ppapi::host::ResourceHost { PepperBrowserFontSingletonHost(BrowserPpapiHost* host, PP_Instance instance, PP_Resource resource); - virtual ~PepperBrowserFontSingletonHost(); + ~PepperBrowserFontSingletonHost() override; private: DISALLOW_COPY_AND_ASSIGN(PepperBrowserFontSingletonHost); diff --git a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h index 693349e..f3c3c94 100644 --- a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h +++ b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h @@ -25,29 +25,28 @@ class PepperExternalFileRefBackend : public PepperFileRefBackend { PepperExternalFileRefBackend(ppapi::host::PpapiHost* host, int render_process_id, const base::FilePath& path); - virtual ~PepperExternalFileRefBackend(); + ~PepperExternalFileRefBackend() override; // PepperFileRefBackend overrides. - virtual int32_t MakeDirectory(ppapi::host::ReplyMessageContext context, - int32_t make_directory_flags) override; - virtual int32_t Touch(ppapi::host::ReplyMessageContext context, - PP_Time last_accessed_time, - PP_Time last_modified_time) override; - virtual int32_t Delete(ppapi::host::ReplyMessageContext context) override; - virtual int32_t Rename(ppapi::host::ReplyMessageContext context, - PepperFileRefHost* new_file_ref) override; - virtual int32_t Query(ppapi::host::ReplyMessageContext context) override; - virtual int32_t ReadDirectoryEntries(ppapi::host::ReplyMessageContext context) - override; - virtual int32_t GetAbsolutePath(ppapi::host::ReplyMessageContext context) - override; - virtual storage::FileSystemURL GetFileSystemURL() const override; - virtual base::FilePath GetExternalFilePath() const override; + int32_t MakeDirectory(ppapi::host::ReplyMessageContext context, + int32_t make_directory_flags) override; + int32_t Touch(ppapi::host::ReplyMessageContext context, + PP_Time last_accessed_time, + PP_Time last_modified_time) override; + int32_t Delete(ppapi::host::ReplyMessageContext context) override; + int32_t Rename(ppapi::host::ReplyMessageContext context, + PepperFileRefHost* new_file_ref) override; + int32_t Query(ppapi::host::ReplyMessageContext context) override; + int32_t ReadDirectoryEntries( + ppapi::host::ReplyMessageContext context) override; + int32_t GetAbsolutePath(ppapi::host::ReplyMessageContext context) override; + storage::FileSystemURL GetFileSystemURL() const override; + base::FilePath GetExternalFilePath() const override; - virtual int32_t CanRead() const override; - virtual int32_t CanWrite() const override; - virtual int32_t CanCreate() const override; - virtual int32_t CanReadWrite() const override; + int32_t CanRead() const override; + int32_t CanWrite() const override; + int32_t CanCreate() const override; + int32_t CanReadWrite() const override; private: // Generic reply callback. diff --git a/content/browser/renderer_host/pepper/pepper_file_io_host.h b/content/browser/renderer_host/pepper/pepper_file_io_host.h index 4930535..36f7dba 100644 --- a/content/browser/renderer_host/pepper/pepper_file_io_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h @@ -38,10 +38,10 @@ class PepperFileIOHost : public ppapi::host::ResourceHost, PepperFileIOHost(BrowserPpapiHostImpl* host, PP_Instance instance, PP_Resource resource); - virtual ~PepperFileIOHost(); + ~PepperFileIOHost() override; // ppapi::host::ResourceHost override. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/pepper_file_ref_host.h b/content/browser/renderer_host/pepper/pepper_file_ref_host.h index 60e814b..5f6d11e 100644 --- a/content/browser/renderer_host/pepper/pepper_file_ref_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_ref_host.h @@ -65,13 +65,13 @@ class CONTENT_EXPORT PepperFileRefHost PP_Resource resource, const base::FilePath& external_path); - virtual ~PepperFileRefHost(); + ~PepperFileRefHost() override; // ResourceHost overrides. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; - virtual bool IsFileRefHost() override; + bool IsFileRefHost() override; // Required to support Rename(). PP_FileSystemType GetFileSystemType() const; diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h index 7a63699..669adde 100644 --- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h @@ -37,7 +37,7 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost PP_Instance instance, PP_Resource resource, PP_FileSystemType type); - virtual ~PepperFileSystemBrowserHost(); + ~PepperFileSystemBrowserHost() override; // Opens the PepperFileSystemBrowserHost to use an existing file system at the // given |root_url|. The file system at |root_url| must already be opened and @@ -46,10 +46,10 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost void OpenExisting(const GURL& root_url, const base::Closure& callback); // ppapi::host::ResourceHost overrides. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; - virtual bool IsFileSystemHost() override; + bool IsFileSystemHost() override; // Supports FileRefs direct access on the host side. PP_FileSystemType GetType() const { return type_; } diff --git a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h index 923a508..301f97e 100644 --- a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h @@ -43,12 +43,12 @@ class PepperFlashFileMessageFilter : public ppapi::host::ResourceMessageFilter { typedef base::Callback<bool(int, const base::FilePath&)> CheckPermissionsCallback; - virtual ~PepperFlashFileMessageFilter(); + ~PepperFlashFileMessageFilter() override; // ppapi::host::ResourceMessageFilter overrides. - virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( + scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( const IPC::Message& msg) override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.h b/content/browser/renderer_host/pepper/pepper_gamepad_host.h index a64692c..8d6ee73 100644 --- a/content/browser/renderer_host/pepper/pepper_gamepad_host.h +++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.h @@ -37,19 +37,17 @@ class CONTENT_EXPORT PepperGamepadHost : PP_Instance instance, PP_Resource resource); - virtual ~PepperGamepadHost(); + ~PepperGamepadHost() override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; // GamepadConsumer implementation. - virtual void OnGamepadConnected( - unsigned index, - const blink::WebGamepad& gamepad) override {} - virtual void OnGamepadDisconnected( - unsigned index, - const blink::WebGamepad& gamepad) override {} + void OnGamepadConnected(unsigned index, + const blink::WebGamepad& gamepad) override {} + void OnGamepadDisconnected(unsigned index, + const blink::WebGamepad& gamepad) override {} private: int32_t OnRequestMemory(ppapi::host::HostMessageContext* context); diff --git a/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h b/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h index 45675c1..a532184 100644 --- a/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h @@ -43,15 +43,15 @@ class CONTENT_EXPORT PepperHostResolverMessageFilter bool private_api); protected: - virtual ~PepperHostResolverMessageFilter(); + ~PepperHostResolverMessageFilter() override; private: typedef std::vector<PP_NetAddress_Private> NetAddressList; // ppapi::host::ResourceMessageFilter overrides. - virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( + scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( const IPC::Message& message) override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h index 8bd1053..e210763 100644 --- a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h +++ b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h @@ -28,29 +28,28 @@ class PepperInternalFileRefBackend : public PepperFileRefBackend { int render_process_id, base::WeakPtr<PepperFileSystemBrowserHost> fs_host, const std::string& path); - virtual ~PepperInternalFileRefBackend(); + ~PepperInternalFileRefBackend() override; // PepperFileRefBackend overrides. - virtual int32_t MakeDirectory(ppapi::host::ReplyMessageContext context, - int32_t make_directory_flags) override; - virtual int32_t Touch(ppapi::host::ReplyMessageContext context, - PP_Time last_accessed_time, - PP_Time last_modified_time) override; - virtual int32_t Delete(ppapi::host::ReplyMessageContext context) override; - virtual int32_t Rename(ppapi::host::ReplyMessageContext context, - PepperFileRefHost* new_file_ref) override; - virtual int32_t Query(ppapi::host::ReplyMessageContext context) override; - virtual int32_t ReadDirectoryEntries(ppapi::host::ReplyMessageContext context) - override; - virtual int32_t GetAbsolutePath(ppapi::host::ReplyMessageContext context) - override; - virtual storage::FileSystemURL GetFileSystemURL() const override; - virtual base::FilePath GetExternalFilePath() const override; - - virtual int32_t CanRead() const override; - virtual int32_t CanWrite() const override; - virtual int32_t CanCreate() const override; - virtual int32_t CanReadWrite() const override; + int32_t MakeDirectory(ppapi::host::ReplyMessageContext context, + int32_t make_directory_flags) override; + int32_t Touch(ppapi::host::ReplyMessageContext context, + PP_Time last_accessed_time, + PP_Time last_modified_time) override; + int32_t Delete(ppapi::host::ReplyMessageContext context) override; + int32_t Rename(ppapi::host::ReplyMessageContext context, + PepperFileRefHost* new_file_ref) override; + int32_t Query(ppapi::host::ReplyMessageContext context) override; + int32_t ReadDirectoryEntries( + ppapi::host::ReplyMessageContext context) override; + int32_t GetAbsolutePath(ppapi::host::ReplyMessageContext context) override; + storage::FileSystemURL GetFileSystemURL() const override; + base::FilePath GetExternalFilePath() const override; + + int32_t CanRead() const override; + int32_t CanWrite() const override; + int32_t CanCreate() const override; + int32_t CanReadWrite() const override; private: // Generic reply callback. diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h index 1767cf8..02a89ad 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h @@ -24,10 +24,10 @@ class PepperMessageFilter : public BrowserMessageFilter { PepperMessageFilter(); // BrowserMessageFilter methods. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; protected: - virtual ~PepperMessageFilter(); + ~PepperMessageFilter() override; private: void OnX509CertificateParseDER(const std::vector<char>& der, diff --git a/content/browser/renderer_host/pepper/pepper_network_monitor_host.h b/content/browser/renderer_host/pepper/pepper_network_monitor_host.h index 13886ba..7197421 100644 --- a/content/browser/renderer_host/pepper/pepper_network_monitor_host.h +++ b/content/browser/renderer_host/pepper/pepper_network_monitor_host.h @@ -26,10 +26,10 @@ class CONTENT_EXPORT PepperNetworkMonitorHost PP_Instance instance, PP_Resource resource); - virtual ~PepperNetworkMonitorHost(); + ~PepperNetworkMonitorHost() override; // net::NetworkChangeNotifier::IPAddressObserver interface. - virtual void OnIPAddressChanged() override; + void OnIPAddressChanged() override; private: void OnPermissionCheckResult(bool can_use_network_monitor); diff --git a/content/browser/renderer_host/pepper/pepper_network_proxy_host.h b/content/browser/renderer_host/pepper/pepper_network_proxy_host.h index 3b8aec83..eddbc89 100644 --- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.h +++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.h @@ -37,7 +37,7 @@ class CONTENT_EXPORT PepperNetworkProxyHost : public ppapi::host::ResourceHost { PP_Instance instance, PP_Resource resource); - virtual ~PepperNetworkProxyHost(); + ~PepperNetworkProxyHost() override; private: // We retrieve the appropriate URLRequestContextGetter and whether this API @@ -55,7 +55,7 @@ class CONTENT_EXPORT PepperNetworkProxyHost : public ppapi::host::ResourceHost { void DidGetUIThreadData(const UIThreadData&); // ResourceHost implementation. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc index db9c5d2..aa9c4dd 100644 --- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc +++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc @@ -47,8 +47,8 @@ PP_Rect PrintAreaToPPPrintArea(const gfx::Rect& print_area, class PrintingContextDelegate : public printing::PrintingContext::Delegate { public: // PrintingContext::Delegate methods. - virtual gfx::NativeView GetParentView() override { return NULL; } - virtual std::string GetAppLocale() override { + gfx::NativeView GetParentView() override { return NULL; } + std::string GetAppLocale() override { return GetContentClient()->browser()->GetApplicationLocale(); } }; diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.h b/content/browser/renderer_host/pepper/pepper_print_settings_manager.h index 2ff5465..9199e72 100644 --- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.h +++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.h @@ -32,10 +32,10 @@ class CONTENT_EXPORT PepperPrintSettingsManagerImpl : public PepperPrintSettingsManager { public: PepperPrintSettingsManagerImpl() {} - virtual ~PepperPrintSettingsManagerImpl() {} + ~PepperPrintSettingsManagerImpl() override {} // PepperPrintSettingsManager implementation. - virtual void GetDefaultPrintSettings( + void GetDefaultPrintSettings( PepperPrintSettingsManager::Callback callback) override; private: diff --git a/content/browser/renderer_host/pepper/pepper_printing_host.h b/content/browser/renderer_host/pepper/pepper_printing_host.h index 327a3b8..fb2536d 100644 --- a/content/browser/renderer_host/pepper/pepper_printing_host.h +++ b/content/browser/renderer_host/pepper/pepper_printing_host.h @@ -22,10 +22,10 @@ class CONTENT_EXPORT PepperPrintingHost : public ppapi::host::ResourceHost { PP_Instance instance, PP_Resource resource, scoped_ptr<PepperPrintSettingsManager> print_settings_manager); - virtual ~PepperPrintingHost(); + ~PepperPrintingHost() override; // ppapi::host::ResourceHost implementation. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc index c2a9633..1dddfbb 100644 --- a/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc +++ b/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc @@ -21,10 +21,10 @@ namespace { class MockPepperPrintSettingsManager : public PepperPrintSettingsManager { public: MockPepperPrintSettingsManager(const PP_PrintSettings_Dev& settings); - virtual ~MockPepperPrintSettingsManager() {} + ~MockPepperPrintSettingsManager() override {} // PepperPrintSettingsManager implementation. - virtual void GetDefaultPrintSettings( + void GetDefaultPrintSettings( PepperPrintSettingsManager::Callback callback) override; private: diff --git a/content/browser/renderer_host/pepper/pepper_renderer_connection.h b/content/browser/renderer_host/pepper/pepper_renderer_connection.h index 14fc112..109da1f 100644 --- a/content/browser/renderer_host/pepper/pepper_renderer_connection.h +++ b/content/browser/renderer_host/pepper/pepper_renderer_connection.h @@ -36,10 +36,10 @@ class PepperRendererConnection : public BrowserMessageFilter { explicit PepperRendererConnection(int render_process_id); // BrowserMessageFilter overrides. - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; private: - virtual ~PepperRendererConnection(); + ~PepperRendererConnection() override; // Returns the host for the child process for the given |child_process_id|. // If |child_process_id| is 0, returns the host owned by this diff --git a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h index 23d449c..b1bc22f 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h @@ -41,7 +41,7 @@ class CONTENT_EXPORT PepperTCPServerSocketMessageFilter static size_t GetNumInstances(); protected: - virtual ~PepperTCPServerSocketMessageFilter(); + ~PepperTCPServerSocketMessageFilter() override; private: enum State { @@ -53,9 +53,9 @@ class CONTENT_EXPORT PepperTCPServerSocketMessageFilter }; // ppapi::host::ResourceMessageFilter overrides. - virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( + scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( const IPC::Message& message) override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h index 0e4d5cb..7c9250f 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h @@ -63,12 +63,12 @@ class CONTENT_EXPORT PepperTCPSocketMessageFilter static size_t GetNumInstances(); private: - virtual ~PepperTCPSocketMessageFilter(); + ~PepperTCPSocketMessageFilter() override; // ppapi::host::ResourceMessageFilter overrides. - virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( + scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( const IPC::Message& message) override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_host.h b/content/browser/renderer_host/pepper/pepper_truetype_font_host.h index 25ef72d..b449547 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_host.h +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_host.h @@ -28,9 +28,9 @@ class CONTENT_EXPORT PepperTrueTypeFontHost : public ppapi::host::ResourceHost { PP_Resource resource, const ppapi::proxy::SerializedTrueTypeFontDesc& desc); - virtual ~PepperTrueTypeFontHost(); + ~PepperTrueTypeFontHost() override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc index 177ff12..3730724 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc @@ -27,14 +27,14 @@ class FontMessageFilter : public ppapi::host::ResourceMessageFilter { FontMessageFilter(); // ppapi::host::ResourceMessageFilter implementation. - virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( + scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( const IPC::Message& msg) override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; private: - virtual ~FontMessageFilter(); + ~FontMessageFilter() override; // Message handlers. int32_t OnHostMsgGetFontFamilies(ppapi::host::HostMessageContext* context); diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h index 69a471b..19999ca 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h @@ -17,7 +17,7 @@ class PepperTrueTypeFontListHost : public ppapi::host::ResourceHost { PepperTrueTypeFontListHost(BrowserPpapiHost* host, PP_Instance instance, PP_Resource resource); - virtual ~PepperTrueTypeFontListHost(); + ~PepperTrueTypeFontListHost() override; private: DISALLOW_COPY_AND_ASSIGN(PepperTrueTypeFontListHost); diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm b/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm index fb4bc45..1e52e17 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm @@ -98,16 +98,15 @@ class PepperTrueTypeFontMac : public PepperTrueTypeFont { PepperTrueTypeFontMac(); // PepperTrueTypeFont implementation. - virtual int32_t Initialize( - ppapi::proxy::SerializedTrueTypeFontDesc* desc) override; - virtual int32_t GetTableTags(std::vector<uint32_t>* tags) override; - virtual int32_t GetTable(uint32_t table_tag, - int32_t offset, - int32_t max_data_length, - std::string* data) override; + int32_t Initialize(ppapi::proxy::SerializedTrueTypeFontDesc* desc) override; + int32_t GetTableTags(std::vector<uint32_t>* tags) override; + int32_t GetTable(uint32_t table_tag, + int32_t offset, + int32_t max_data_length, + std::string* data) override; private: - virtual ~PepperTrueTypeFontMac() override; + ~PepperTrueTypeFontMac() override; virtual int32_t GetEntireFont(int32_t offset, int32_t max_data_length, diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h index 1a1dccb..1aa2c36ca 100644 --- a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h @@ -53,13 +53,13 @@ class CONTENT_EXPORT PepperUDPSocketMessageFilter static size_t GetNumInstances(); protected: - virtual ~PepperUDPSocketMessageFilter(); + ~PepperUDPSocketMessageFilter() override; private: // ppapi::host::ResourceMessageFilter overrides. - virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( + scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( const IPC::Message& message) override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc index ed9d249..7c75c32 100644 --- a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc +++ b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc @@ -33,9 +33,9 @@ const int kFile3ID = 3; class FakeBackend : public QuotaReservationManager::QuotaBackend { public: FakeBackend() {} - virtual ~FakeBackend() {} + ~FakeBackend() override {} - virtual void ReserveQuota( + void ReserveQuota( const GURL& origin, storage::FileSystemType type, int64 delta, @@ -45,18 +45,18 @@ class FakeBackend : public QuotaReservationManager::QuotaBackend { base::Bind(base::IgnoreResult(callback), base::File::FILE_OK, delta)); } - virtual void ReleaseReservedQuota(const GURL& origin, - storage::FileSystemType type, - int64 size) override {} + void ReleaseReservedQuota(const GURL& origin, + storage::FileSystemType type, + int64 size) override {} - virtual void CommitQuotaUsage(const GURL& origin, - storage::FileSystemType type, - int64 delta) override {} + void CommitQuotaUsage(const GURL& origin, + storage::FileSystemType type, + int64 delta) override {} - virtual void IncrementDirtyCount(const GURL& origin, - storage::FileSystemType type) override {} - virtual void DecrementDirtyCount(const GURL& origin, - storage::FileSystemType type) override {} + void IncrementDirtyCount(const GURL& origin, + storage::FileSystemType type) override {} + void DecrementDirtyCount(const GURL& origin, + storage::FileSystemType type) override {} private: DISALLOW_COPY_AND_ASSIGN(FakeBackend); diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 4146c91..4d221b6 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -160,27 +160,23 @@ class OpenChannelToPpapiPluginCallback context_(context) { } - virtual void GetPpapiChannelInfo(base::ProcessHandle* renderer_handle, - int* renderer_id) override { + void GetPpapiChannelInfo(base::ProcessHandle* renderer_handle, + int* renderer_id) override { *renderer_handle = filter()->PeerHandle(); *renderer_id = filter()->render_process_id(); } - virtual void OnPpapiChannelOpened(const IPC::ChannelHandle& channel_handle, - base::ProcessId plugin_pid, - int plugin_child_id) override { + void OnPpapiChannelOpened(const IPC::ChannelHandle& channel_handle, + base::ProcessId plugin_pid, + int plugin_child_id) override { ViewHostMsg_OpenChannelToPepperPlugin::WriteReplyParams( reply_msg(), channel_handle, plugin_pid, plugin_child_id); SendReplyAndDeleteThis(); } - virtual bool OffTheRecord() override { - return filter()->OffTheRecord(); - } + bool OffTheRecord() override { return filter()->OffTheRecord(); } - virtual ResourceContext* GetResourceContext() override { - return context_; - } + ResourceContext* GetResourceContext() override { return context_; } private: ResourceContext* context_; @@ -195,26 +191,24 @@ class OpenChannelToPpapiBrokerCallback routing_id_(routing_id) { } - virtual ~OpenChannelToPpapiBrokerCallback() {} + ~OpenChannelToPpapiBrokerCallback() override {} - virtual void GetPpapiChannelInfo(base::ProcessHandle* renderer_handle, - int* renderer_id) override { + void GetPpapiChannelInfo(base::ProcessHandle* renderer_handle, + int* renderer_id) override { *renderer_handle = filter_->PeerHandle(); *renderer_id = filter_->render_process_id(); } - virtual void OnPpapiChannelOpened(const IPC::ChannelHandle& channel_handle, - base::ProcessId plugin_pid, - int /* plugin_child_id */) override { + void OnPpapiChannelOpened(const IPC::ChannelHandle& channel_handle, + base::ProcessId plugin_pid, + int /* plugin_child_id */) override { filter_->Send(new ViewMsg_PpapiBrokerChannelCreated(routing_id_, plugin_pid, channel_handle)); delete this; } - virtual bool OffTheRecord() override { - return filter_->OffTheRecord(); - } + bool OffTheRecord() override { return filter_->OffTheRecord(); } private: scoped_refptr<RenderMessageFilter> filter_; @@ -237,15 +231,11 @@ class RenderMessageFilter::OpenChannelToNpapiPluginCallback sent_plugin_channel_request_(false) { } - virtual int ID() override { - return filter()->render_process_id(); - } + int ID() override { return filter()->render_process_id(); } - virtual ResourceContext* GetResourceContext() override { - return context_; - } + ResourceContext* GetResourceContext() override { return context_; } - virtual bool OffTheRecord() override { + bool OffTheRecord() override { if (filter()->OffTheRecord()) return true; if (GetContentClient()->browser()->AllowSaveLocalState(context_)) @@ -259,26 +249,22 @@ class RenderMessageFilter::OpenChannelToNpapiPluginCallback return false; } - virtual void SetPluginInfo(const WebPluginInfo& info) override { - info_ = info; - } + void SetPluginInfo(const WebPluginInfo& info) override { info_ = info; } - virtual void OnFoundPluginProcessHost(PluginProcessHost* host) override { + void OnFoundPluginProcessHost(PluginProcessHost* host) override { DCHECK(host); host_ = host; } - virtual void OnSentPluginChannelRequest() override { + void OnSentPluginChannelRequest() override { sent_plugin_channel_request_ = true; } - virtual void OnChannelOpened(const IPC::ChannelHandle& handle) override { + void OnChannelOpened(const IPC::ChannelHandle& handle) override { WriteReplyAndDeleteThis(handle); } - virtual void OnError() override { - WriteReplyAndDeleteThis(IPC::ChannelHandle()); - } + void OnError() override { WriteReplyAndDeleteThis(IPC::ChannelHandle()); } PluginProcessHost* host() const { return host_; diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index 5aa9054..e9e68d0 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -102,12 +102,12 @@ class CONTENT_EXPORT RenderMessageFilter : public BrowserMessageFilter { DOMStorageContextWrapper* dom_storage_context); // IPC::MessageFilter methods: - virtual void OnChannelClosing() override; + void OnChannelClosing() override; // BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnDestruct() const override; - virtual base::TaskRunner* OverrideTaskRunnerForMessage( + bool OnMessageReceived(const IPC::Message& message) override; + void OnDestruct() const override; + base::TaskRunner* OverrideTaskRunnerForMessage( const IPC::Message& message) override; bool OffTheRecord() const; @@ -120,7 +120,7 @@ class CONTENT_EXPORT RenderMessageFilter : public BrowserMessageFilter { net::CookieStore* GetCookieStoreForURL(const GURL& url); protected: - virtual ~RenderMessageFilter(); + ~RenderMessageFilter() override; // This method will be overridden by TestSaveImageFromDataURL class for test. virtual void DownloadUrl(int render_view_id, diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc index d684d78..f2856bf 100644 --- a/content/browser/renderer_host/render_process_host_browsertest.cc +++ b/content/browser/renderer_host/render_process_host_browsertest.cc @@ -42,12 +42,12 @@ class RenderProcessHostTest : public ContentBrowserTest, protected: // RenderProcessHostObserver: - virtual void RenderProcessExited(RenderProcessHost* host, - base::TerminationStatus status, - int exit_code) override { + void RenderProcessExited(RenderProcessHost* host, + base::TerminationStatus status, + int exit_code) override { ++process_exits_; } - virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override { + void RenderProcessHostDestroyed(RenderProcessHost* host) override { ++host_destructions_; } @@ -120,14 +120,14 @@ class ShellCloser : public RenderProcessHostObserver { protected: // RenderProcessHostObserver: - virtual void RenderProcessExited(RenderProcessHost* host, - base::TerminationStatus status, - int exit_code) override { + void RenderProcessExited(RenderProcessHost* host, + base::TerminationStatus status, + int exit_code) override { logging_string_->append("ShellCloser::RenderProcessExited "); shell_->Close(); } - virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override { + void RenderProcessHostDestroyed(RenderProcessHost* host) override { logging_string_->append("ShellCloser::RenderProcessHostDestroyed "); } @@ -144,13 +144,13 @@ class ObserverLogger : public RenderProcessHostObserver { protected: // RenderProcessHostObserver: - virtual void RenderProcessExited(RenderProcessHost* host, - base::TerminationStatus status, - int exit_code) override { + void RenderProcessExited(RenderProcessHost* host, + base::TerminationStatus status, + int exit_code) override { logging_string_->append("ObserverLogger::RenderProcessExited "); } - virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override { + void RenderProcessHostDestroyed(RenderProcessHost* host) override { logging_string_->append("ObserverLogger::RenderProcessHostDestroyed "); host_destroyed_ = true; } diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index f9b5f01..fa0a406 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -311,7 +311,7 @@ class RendererSandboxedProcessLauncherDelegate #endif // OS_POSIX {} - virtual ~RendererSandboxedProcessLauncherDelegate() {} + ~RendererSandboxedProcessLauncherDelegate() override {} #if defined(OS_WIN) virtual void PreSpawnTarget(sandbox::TargetPolicy* policy, @@ -321,16 +321,14 @@ class RendererSandboxedProcessLauncherDelegate } #elif defined(OS_POSIX) - virtual bool ShouldUseZygote() override { + bool ShouldUseZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); base::CommandLine::StringType renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); return renderer_prefix.empty(); } - virtual base::ScopedFD TakeIpcFd() override { - return ipc_fd_.Pass(); - } + base::ScopedFD TakeIpcFd() override { return ipc_fd_.Pass(); } #endif // OS_WIN private: @@ -344,7 +342,7 @@ const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey"; class SessionStorageHolder : public base::SupportsUserData::Data { public: SessionStorageHolder() {} - virtual ~SessionStorageHolder() {} + ~SessionStorageHolder() override {} void Hold(const SessionStorageNamespaceMap& sessions, int view_route_id) { session_storage_namespaces_awaiting_close_[view_route_id] = sessions; diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index 4a679aa..7ab0dc2 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h @@ -87,70 +87,68 @@ class CONTENT_EXPORT RenderProcessHostImpl RenderProcessHostImpl(BrowserContext* browser_context, StoragePartitionImpl* storage_partition_impl, bool is_isolated_guest); - virtual ~RenderProcessHostImpl(); + ~RenderProcessHostImpl() override; // RenderProcessHost implementation (public portion). - virtual void EnableSendQueue() override; - virtual bool Init() override; - virtual int GetNextRoutingID() override; - virtual void AddRoute(int32 routing_id, IPC::Listener* listener) override; - virtual void RemoveRoute(int32 routing_id) override; - virtual void AddObserver(RenderProcessHostObserver* observer) override; - virtual void RemoveObserver(RenderProcessHostObserver* observer) override; - virtual void ReceivedBadMessage() override; - virtual void WidgetRestored() override; - virtual void WidgetHidden() override; - virtual int VisibleWidgetCount() const override; - virtual bool IsIsolatedGuest() const override; - virtual StoragePartition* GetStoragePartition() const override; - virtual bool FastShutdownIfPossible() override; - virtual void DumpHandles() override; - virtual base::ProcessHandle GetHandle() const override; - virtual BrowserContext* GetBrowserContext() const override; - virtual bool InSameStoragePartition( - StoragePartition* partition) const override; - virtual int GetID() const override; - virtual bool HasConnection() const override; - virtual void SetIgnoreInputEvents(bool ignore_input_events) override; - virtual bool IgnoreInputEvents() const override; - virtual void Cleanup() override; - virtual void AddPendingView() override; - virtual void RemovePendingView() override; - virtual void SetSuddenTerminationAllowed(bool enabled) override; - virtual bool SuddenTerminationAllowed() const override; - virtual IPC::ChannelProxy* GetChannel() override; - virtual void AddFilter(BrowserMessageFilter* filter) override; - virtual bool FastShutdownForPageCount(size_t count) override; - virtual bool FastShutdownStarted() const override; - virtual base::TimeDelta GetChildProcessIdleTime() const override; - virtual void ResumeRequestsForView(int route_id) override; - virtual void FilterURL(bool empty_allowed, GURL* url) override; + void EnableSendQueue() override; + bool Init() override; + int GetNextRoutingID() override; + void AddRoute(int32 routing_id, IPC::Listener* listener) override; + void RemoveRoute(int32 routing_id) override; + void AddObserver(RenderProcessHostObserver* observer) override; + void RemoveObserver(RenderProcessHostObserver* observer) override; + void ReceivedBadMessage() override; + void WidgetRestored() override; + void WidgetHidden() override; + int VisibleWidgetCount() const override; + bool IsIsolatedGuest() const override; + StoragePartition* GetStoragePartition() const override; + bool FastShutdownIfPossible() override; + void DumpHandles() override; + base::ProcessHandle GetHandle() const override; + BrowserContext* GetBrowserContext() const override; + bool InSameStoragePartition(StoragePartition* partition) const override; + int GetID() const override; + bool HasConnection() const override; + void SetIgnoreInputEvents(bool ignore_input_events) override; + bool IgnoreInputEvents() const override; + void Cleanup() override; + void AddPendingView() override; + void RemovePendingView() override; + void SetSuddenTerminationAllowed(bool enabled) override; + bool SuddenTerminationAllowed() const override; + IPC::ChannelProxy* GetChannel() override; + void AddFilter(BrowserMessageFilter* filter) override; + bool FastShutdownForPageCount(size_t count) override; + bool FastShutdownStarted() const override; + base::TimeDelta GetChildProcessIdleTime() const override; + void ResumeRequestsForView(int route_id) override; + void FilterURL(bool empty_allowed, GURL* url) override; #if defined(ENABLE_WEBRTC) - virtual void EnableAecDump(const base::FilePath& file) override; - virtual void DisableAecDump() override; - virtual void SetWebRtcLogMessageCallback( + void EnableAecDump(const base::FilePath& file) override; + void DisableAecDump() override; + void SetWebRtcLogMessageCallback( base::Callback<void(const std::string&)> callback) override; - virtual WebRtcStopRtpDumpCallback StartRtpDump( + WebRtcStopRtpDumpCallback StartRtpDump( bool incoming, bool outgoing, const WebRtcRtpPacketCallback& packet_callback) override; #endif - virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id) - override; - virtual void NotifyTimezoneChange() override; - virtual ServiceRegistry* GetServiceRegistry() override; + void ResumeDeferredNavigation(const GlobalRequestID& request_id) override; + void NotifyTimezoneChange() override; + ServiceRegistry* GetServiceRegistry() override; // IPC::Sender via RenderProcessHost. - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // IPC::Listener via RenderProcessHost. - virtual bool OnMessageReceived(const IPC::Message& msg) override; - virtual void OnChannelConnected(int32 peer_pid) override; - virtual void OnChannelError() override; - virtual void OnBadMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& msg) override; + void OnChannelConnected(int32 peer_pid) override; + void OnChannelError() override; + void OnBadMessageReceived(const IPC::Message& message) override; // ChildProcessLauncher::Client implementation. - virtual void OnProcessLaunched() override; + void OnProcessLaunched() override; scoped_refptr<AudioRendererHost> audio_renderer_host() const; @@ -323,7 +321,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Handle termination of our process. void ProcessDied(bool already_dead); - virtual void OnGpuSwitching() override; + void OnGpuSwitching() override; #if defined(ENABLE_WEBRTC) void OnRegisterAecDumpConsumer(int id); diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index db4a21e..2fdaf0aa 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -34,11 +34,10 @@ class RenderViewHostTestWebContentsObserver : public WebContentsObserver { explicit RenderViewHostTestWebContentsObserver(WebContents* web_contents) : WebContentsObserver(web_contents), navigation_count_(0) {} - virtual ~RenderViewHostTestWebContentsObserver() {} + ~RenderViewHostTestWebContentsObserver() override {} - virtual void DidNavigateMainFrame( - const LoadCommittedDetails& details, - const FrameNavigateParams& params) override { + void DidNavigateMainFrame(const LoadCommittedDetails& details, + const FrameNavigateParams& params) override { observed_socket_address_ = params.socket_address; base_url_ = params.base_url; ++navigation_count_; diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index aa23096..c6fdf05 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -110,69 +110,68 @@ class CONTENT_EXPORT RenderViewHostImpl bool swapped_out, bool hidden, bool has_initialized_audio_host); - virtual ~RenderViewHostImpl(); + ~RenderViewHostImpl() override; // RenderViewHost implementation. - virtual RenderFrameHost* GetMainFrame() override; - virtual void AllowBindings(int binding_flags) override; - virtual void ClearFocusedElement() override; - virtual bool IsFocusedElementEditable() override; - virtual void ClosePage() override; - virtual void CopyImageAt(int x, int y) override; - virtual void SaveImageAt(int x, int y) override; - virtual void DirectoryEnumerationFinished( + RenderFrameHost* GetMainFrame() override; + void AllowBindings(int binding_flags) override; + void ClearFocusedElement() override; + bool IsFocusedElementEditable() override; + void ClosePage() override; + void CopyImageAt(int x, int y) override; + void SaveImageAt(int x, int y) override; + void DirectoryEnumerationFinished( int request_id, const std::vector<base::FilePath>& files) override; - virtual void DisableScrollbarsForThreshold(const gfx::Size& size) override; - virtual void DragSourceEndedAt( - int client_x, int client_y, int screen_x, int screen_y, - blink::WebDragOperation operation) override; - virtual void DragSourceSystemDragEnded() override; - virtual void DragTargetDragEnter( - const DropData& drop_data, - const gfx::Point& client_pt, - const gfx::Point& screen_pt, - blink::WebDragOperationsMask operations_allowed, - int key_modifiers) override; - virtual void DragTargetDragOver( - const gfx::Point& client_pt, - const gfx::Point& screen_pt, - blink::WebDragOperationsMask operations_allowed, - int key_modifiers) override; - virtual void DragTargetDragLeave() override; - virtual void DragTargetDrop(const gfx::Point& client_pt, - const gfx::Point& screen_pt, - int key_modifiers) override; - virtual void EnableAutoResize(const gfx::Size& min_size, - const gfx::Size& max_size) override; - virtual void DisableAutoResize(const gfx::Size& new_size) override; - virtual void EnablePreferredSizeMode() override; - virtual void ExecuteMediaPlayerActionAtLocation( + void DisableScrollbarsForThreshold(const gfx::Size& size) override; + void DragSourceEndedAt(int client_x, + int client_y, + int screen_x, + int screen_y, + blink::WebDragOperation operation) override; + void DragSourceSystemDragEnded() override; + void DragTargetDragEnter(const DropData& drop_data, + const gfx::Point& client_pt, + const gfx::Point& screen_pt, + blink::WebDragOperationsMask operations_allowed, + int key_modifiers) override; + void DragTargetDragOver(const gfx::Point& client_pt, + const gfx::Point& screen_pt, + blink::WebDragOperationsMask operations_allowed, + int key_modifiers) override; + void DragTargetDragLeave() override; + void DragTargetDrop(const gfx::Point& client_pt, + const gfx::Point& screen_pt, + int key_modifiers) override; + void EnableAutoResize(const gfx::Size& min_size, + const gfx::Size& max_size) override; + void DisableAutoResize(const gfx::Size& new_size) override; + void EnablePreferredSizeMode() override; + void ExecuteMediaPlayerActionAtLocation( const gfx::Point& location, const blink::WebMediaPlayerAction& action) override; - virtual void ExecutePluginActionAtLocation( + void ExecutePluginActionAtLocation( const gfx::Point& location, const blink::WebPluginAction& action) override; - virtual void ExitFullscreen() override; - virtual void FilesSelectedInChooser( + void ExitFullscreen() override; + void FilesSelectedInChooser( const std::vector<content::FileChooserFileInfo>& files, FileChooserParams::Mode permissions) override; - virtual RenderViewHostDelegate* GetDelegate() const override; - virtual int GetEnabledBindings() const override; - virtual SiteInstanceImpl* GetSiteInstance() const override; - virtual bool IsRenderViewLive() const override; - virtual void NotifyMoveOrResizeStarted() override; - virtual void SetWebUIProperty(const std::string& name, - const std::string& value) override; - virtual void Zoom(PageZoom zoom) override; - virtual void SyncRendererPrefs() override; - virtual WebPreferences GetWebkitPreferences() override; - virtual void UpdateWebkitPreferences( - const WebPreferences& prefs) override; - virtual void OnWebkitPreferencesChanged() override; - virtual void GetAudioOutputControllers( + RenderViewHostDelegate* GetDelegate() const override; + int GetEnabledBindings() const override; + SiteInstanceImpl* GetSiteInstance() const override; + bool IsRenderViewLive() const override; + void NotifyMoveOrResizeStarted() override; + void SetWebUIProperty(const std::string& name, + const std::string& value) override; + void Zoom(PageZoom zoom) override; + void SyncRendererPrefs() override; + WebPreferences GetWebkitPreferences() override; + void UpdateWebkitPreferences(const WebPreferences& prefs) override; + void OnWebkitPreferencesChanged() override; + void GetAudioOutputControllers( const GetAudioOutputControllersCallback& callback) const override; - virtual void SelectWordAroundCaret() override; + void SelectWordAroundCaret() override; #if defined(OS_ANDROID) virtual void ActivateNearestFindResult(int request_id, @@ -262,22 +261,20 @@ class CONTENT_EXPORT RenderViewHostImpl } // RenderWidgetHost public overrides. - virtual void Init() override; - virtual void Shutdown() override; - virtual void WasHidden() override; - virtual void WasShown(const ui::LatencyInfo& latency_info) override; - virtual bool IsRenderView() const override; - virtual bool OnMessageReceived(const IPC::Message& msg) override; - virtual void GotFocus() override; - virtual void LostCapture() override; - virtual void LostMouseLock() override; - virtual void SetIsLoading(bool is_loading) override; - virtual void ForwardMouseEvent( - const blink::WebMouseEvent& mouse_event) override; - virtual void OnPointerEventActivate() override; - virtual void ForwardKeyboardEvent( - const NativeWebKeyboardEvent& key_event) override; - virtual gfx::Rect GetRootWindowResizerRect() const override; + void Init() override; + void Shutdown() override; + void WasHidden() override; + void WasShown(const ui::LatencyInfo& latency_info) override; + bool IsRenderView() const override; + bool OnMessageReceived(const IPC::Message& msg) override; + void GotFocus() override; + void LostCapture() override; + void LostMouseLock() override; + void SetIsLoading(bool is_loading) override; + void ForwardMouseEvent(const blink::WebMouseEvent& mouse_event) override; + void OnPointerEventActivate() override; + void ForwardKeyboardEvent(const NativeWebKeyboardEvent& key_event) override; + gfx::Rect GetRootWindowResizerRect() const override; // Creates a new RenderView with the given route id. void CreateNewWindow( @@ -333,15 +330,15 @@ class CONTENT_EXPORT RenderViewHostImpl protected: // RenderWidgetHost protected overrides. - virtual void OnUserGesture() override; - virtual void NotifyRendererUnresponsive() override; - virtual void NotifyRendererResponsive() override; - virtual void OnRenderAutoResized(const gfx::Size& size) override; - virtual void RequestToLockMouse(bool user_gesture, - bool last_unlocked_by_target) override; - virtual bool IsFullscreen() const override; - virtual void OnFocus() override; - virtual void OnBlur() override; + void OnUserGesture() override; + void NotifyRendererUnresponsive() override; + void NotifyRendererResponsive() override; + void OnRenderAutoResized(const gfx::Size& size) override; + void RequestToLockMouse(bool user_gesture, + bool last_unlocked_by_target) override; + bool IsFullscreen() const override; + void OnFocus() override; + void OnBlur() override; // IPC message handlers. void OnShowView(int route_id, diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 017a364..1389f8d 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -29,9 +29,9 @@ namespace content { class RenderViewHostTestBrowserClient : public TestContentBrowserClient { public: RenderViewHostTestBrowserClient() {} - virtual ~RenderViewHostTestBrowserClient() {} + ~RenderViewHostTestBrowserClient() override {} - virtual bool IsHandledURL(const GURL& url) override { + bool IsHandledURL(const GURL& url) override { return url.scheme() == url::kFileScheme; } @@ -119,18 +119,18 @@ TEST_F(RenderViewHostTest, DontGrantBindingsToSharedProcess) { class MockDraggingRenderViewHostDelegateView : public RenderViewHostDelegateView { public: - virtual ~MockDraggingRenderViewHostDelegateView() {} - virtual void StartDragging(const DropData& drop_data, - blink::WebDragOperationsMask allowed_ops, - const gfx::ImageSkia& image, - const gfx::Vector2d& image_offset, - const DragEventSourceInfo& event_info) override { + ~MockDraggingRenderViewHostDelegateView() override {} + void StartDragging(const DropData& drop_data, + blink::WebDragOperationsMask allowed_ops, + const gfx::ImageSkia& image, + const gfx::Vector2d& image_offset, + const DragEventSourceInfo& event_info) override { drag_url_ = drop_data.url; html_base_url_ = drop_data.html_base_url; } - virtual void UpdateDragCursor(blink::WebDragOperation operation) override {} - virtual void GotFocus() override {} - virtual void TakeFocus(bool reverse) override {} + void UpdateDragCursor(blink::WebDragOperation operation) override {} + void GotFocus() override {} + void TakeFocus(bool reverse) override {} virtual void UpdatePreferredSize(const gfx::Size& pref_size) {} GURL drag_url() { @@ -284,12 +284,12 @@ class TestSaveImageFromDataURL : public RenderMessageFilter { } protected: - virtual ~TestSaveImageFromDataURL() { } - virtual void DownloadUrl(int render_view_id, - const GURL& url, - const Referrer& referrer, - const base::string16& suggested_name, - const bool use_prompt) const override { + ~TestSaveImageFromDataURL() override {} + void DownloadUrl(int render_view_id, + const GURL& url, + const Referrer& referrer, + const base::string16& suggested_name, + const bool use_prompt) const override { url_string_ = url.spec(); is_downloaded_ = true; } diff --git a/content/browser/renderer_host/render_widget_host_browsertest.cc b/content/browser/renderer_host/render_widget_host_browsertest.cc index fae4127..e85a485 100644 --- a/content/browser/renderer_host/render_widget_host_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_browsertest.cc @@ -19,7 +19,7 @@ class RenderWidgetHostBrowserTest : public ContentBrowserTest { public: RenderWidgetHostBrowserTest() {} - virtual void SetUpOnMainThread() override { + void SetUpOnMainThread() override { ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir_)); } diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index f152c57..47cfba2 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -124,8 +124,7 @@ class RenderWidgetHostIteratorImpl : public RenderWidgetHostIterator { : current_index_(0) { } - virtual ~RenderWidgetHostIteratorImpl() { - } + ~RenderWidgetHostIteratorImpl() override {} void Add(RenderWidgetHost* host) { hosts_.push_back(RenderWidgetHostID(host->GetProcess()->GetID(), @@ -133,7 +132,7 @@ class RenderWidgetHostIteratorImpl : public RenderWidgetHostIterator { } // RenderWidgetHostIterator: - virtual RenderWidgetHost* GetNextHost() override { + RenderWidgetHost* GetNextHost() override { RenderWidgetHost* host = NULL; while (current_index_ < hosts_.size() && !host) { RenderWidgetHostID id = hosts_[current_index_]; diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index f0da2fb..de95733 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -106,7 +106,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl RenderProcessHost* process, int routing_id, bool hidden); - virtual ~RenderWidgetHostImpl(); + ~RenderWidgetHostImpl() override; // Similar to RenderWidgetHost::FromID, but returning the Impl object. static RenderWidgetHostImpl* FromID(int32 process_id, int32 routing_id); @@ -126,47 +126,41 @@ class CONTENT_EXPORT RenderWidgetHostImpl } // RenderWidgetHost implementation. - virtual void UpdateTextDirection(blink::WebTextDirection direction) override; - virtual void NotifyTextDirection() override; - virtual void Focus() override; - virtual void Blur() override; - virtual void SetActive(bool active) override; - virtual void CopyFromBackingStore( + void UpdateTextDirection(blink::WebTextDirection direction) override; + void NotifyTextDirection() override; + void Focus() override; + void Blur() override; + void SetActive(bool active) override; + void CopyFromBackingStore( const gfx::Rect& src_rect, const gfx::Size& accelerated_dst_size, const base::Callback<void(bool, const SkBitmap&)>& callback, const SkColorType color_type) override; - virtual bool CanCopyFromBackingStore() override; + bool CanCopyFromBackingStore() override; #if defined(OS_ANDROID) virtual void LockBackingStore() override; virtual void UnlockBackingStore() override; #endif - virtual void ForwardMouseEvent( - const blink::WebMouseEvent& mouse_event) override; - virtual void ForwardWheelEvent( - const blink::WebMouseWheelEvent& wheel_event) override; - virtual void ForwardKeyboardEvent( - const NativeWebKeyboardEvent& key_event) override; - virtual RenderProcessHost* GetProcess() const override; - virtual int GetRoutingID() const override; - virtual RenderWidgetHostView* GetView() const override; - virtual bool IsLoading() const override; - virtual bool IsRenderView() const override; - virtual void ResizeRectChanged(const gfx::Rect& new_rect) override; - virtual void RestartHangMonitorTimeout() override; - virtual void SetIgnoreInputEvents(bool ignore_input_events) override; - virtual void WasResized() override; - virtual void AddKeyPressEventCallback( + void ForwardMouseEvent(const blink::WebMouseEvent& mouse_event) override; + void ForwardWheelEvent(const blink::WebMouseWheelEvent& wheel_event) override; + void ForwardKeyboardEvent(const NativeWebKeyboardEvent& key_event) override; + RenderProcessHost* GetProcess() const override; + int GetRoutingID() const override; + RenderWidgetHostView* GetView() const override; + bool IsLoading() const override; + bool IsRenderView() const override; + void ResizeRectChanged(const gfx::Rect& new_rect) override; + void RestartHangMonitorTimeout() override; + void SetIgnoreInputEvents(bool ignore_input_events) override; + void WasResized() override; + void AddKeyPressEventCallback(const KeyPressEventCallback& callback) override; + void RemoveKeyPressEventCallback( const KeyPressEventCallback& callback) override; - virtual void RemoveKeyPressEventCallback( - const KeyPressEventCallback& callback) override; - virtual void AddMouseEventCallback( - const MouseEventCallback& callback) override; - virtual void RemoveMouseEventCallback( - const MouseEventCallback& callback) override; - virtual void GetWebScreenInfo(blink::WebScreenInfo* result) override; + void AddMouseEventCallback(const MouseEventCallback& callback) override; + void RemoveMouseEventCallback(const MouseEventCallback& callback) override; + void GetWebScreenInfo(blink::WebScreenInfo* result) override; - virtual SkColorType PreferredReadbackFormat() override; + SkColorType PreferredReadbackFormat() override; // Forces redraw in the renderer and when the update reaches the browser // grabs snapshot from the compositor. Returns PNG-encoded snapshot. @@ -199,10 +193,10 @@ class CONTENT_EXPORT RenderWidgetHostImpl virtual void Shutdown(); // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; // Sends a message to the corresponding object in the renderer. - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // Indicates if the page has finished loading. virtual void SetIsLoading(bool is_loading); @@ -278,12 +272,12 @@ class CONTENT_EXPORT RenderWidgetHostImpl void SetTouchEventEmulationEnabled(bool enabled); // TouchEmulatorClient implementation. - virtual void ForwardGestureEvent( + void ForwardGestureEvent( const blink::WebGestureEvent& gesture_event) override; - virtual void ForwardEmulatedTouchEvent( + void ForwardEmulatedTouchEvent( const blink::WebTouchEvent& touch_event) override; - virtual void SetCursor(const WebCursor& cursor) override; - virtual void ShowContextMenuAtPoint(const gfx::Point& point) override; + void SetCursor(const WebCursor& cursor) override; + void ShowContextMenuAtPoint(const gfx::Point& point) override; // Queues a synthetic gesture for testing purposes. Invokes the on_complete // callback when the gesture is finished running. @@ -437,7 +431,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl void FlushInput(); // InputRouterClient - virtual void SetNeedsFlush() override; + void SetNeedsFlush() override; // Indicates whether the renderer drives the RenderWidgetHosts's size or the // other way around. @@ -484,7 +478,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl #endif protected: - virtual RenderWidgetHostImpl* AsRenderWidgetHostImpl() override; + RenderWidgetHostImpl* AsRenderWidgetHostImpl() override; // Create a LatencyInfo struct with INPUT_EVENT_LATENCY_RWH_COMPONENT // component if it is not already in |original|. And if |original| is @@ -643,25 +637,25 @@ class CONTENT_EXPORT RenderWidgetHostImpl bool KeyPressListenersHandleEvent(const NativeWebKeyboardEvent& event); // InputRouterClient - virtual InputEventAckState FilterInputEvent( + InputEventAckState FilterInputEvent( const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info) override; - virtual void IncrementInFlightEventCount() override; - virtual void DecrementInFlightEventCount() override; - virtual void OnHasTouchEventHandlers(bool has_handlers) override; - virtual void DidFlush() override; - virtual void DidOverscroll(const DidOverscrollParams& params) override; + void IncrementInFlightEventCount() override; + void DecrementInFlightEventCount() override; + void OnHasTouchEventHandlers(bool has_handlers) override; + void DidFlush() override; + void DidOverscroll(const DidOverscrollParams& params) override; // InputAckHandler - virtual void OnKeyboardEventAck(const NativeWebKeyboardEvent& event, - InputEventAckState ack_result) override; - virtual void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event, - InputEventAckState ack_result) override; - virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event, - InputEventAckState ack_result) override; - virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event, - InputEventAckState ack_result) override; - virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) override; + void OnKeyboardEventAck(const NativeWebKeyboardEvent& event, + InputEventAckState ack_result) override; + void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event, + InputEventAckState ack_result) override; + void OnTouchEventAck(const TouchEventWithLatencyInfo& event, + InputEventAckState ack_result) override; + void OnGestureEventAck(const GestureEventWithLatencyInfo& event, + InputEventAckState ack_result) override; + void OnUnexpectedEventAck(UnexpectedEventAckType type) override; void OnSyntheticGestureCompleted(SyntheticGesture::Result result); diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 56e90a5..5d610ae 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -67,50 +67,45 @@ class MockInputRouter : public InputRouter { message_received_(false), client_(client) { } - virtual ~MockInputRouter() {} + ~MockInputRouter() override {} // InputRouter - virtual void Flush() override { - flush_called_ = true; - } - virtual bool SendInput(scoped_ptr<IPC::Message> message) override { + void Flush() override { flush_called_ = true; } + bool SendInput(scoped_ptr<IPC::Message> message) override { send_event_called_ = true; return true; } - virtual void SendMouseEvent( - const MouseEventWithLatencyInfo& mouse_event) override { + void SendMouseEvent(const MouseEventWithLatencyInfo& mouse_event) override { sent_mouse_event_ = true; } - virtual void SendWheelEvent( + void SendWheelEvent( 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 { + void SendKeyboardEvent(const NativeWebKeyboardEvent& key_event, + const ui::LatencyInfo& latency_info, + bool is_shortcut) override { sent_keyboard_event_ = true; } - virtual void SendGestureEvent( + void SendGestureEvent( const GestureEventWithLatencyInfo& gesture_event) override { sent_gesture_event_ = true; } - virtual void SendTouchEvent( - const TouchEventWithLatencyInfo& touch_event) override { + void SendTouchEvent(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 { + 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; } + bool ShouldForwardTouchEvent() const override { return true; } + void OnViewUpdated(int view_flags) override {} + bool HasPendingEvents() const override { return false; } // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& message) override { + bool OnMessageReceived(const IPC::Message& message) override { message_received_ = true; return false; } @@ -151,9 +146,8 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl { using RenderWidgetHostImpl::resize_ack_pending_; using RenderWidgetHostImpl::input_router_; - virtual void OnTouchEventAck( - const TouchEventWithLatencyInfo& event, - InputEventAckState ack_result) override { + void OnTouchEventAck(const TouchEventWithLatencyInfo& event, + InputEventAckState ack_result) override { // Sniff touch acks. acked_touch_event_type_ = event.event.type; RenderWidgetHostImpl::OnTouchEventAck(event, ack_result); @@ -185,7 +179,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl { } protected: - virtual void NotifyRendererUnresponsive() override { + void NotifyRendererUnresponsive() override { unresponsive_timer_fired_ = true; } @@ -205,8 +199,7 @@ class RenderWidgetHostProcess : public MockRenderProcessHost { : MockRenderProcessHost(browser_context), update_msg_reply_flags_(0) { } - virtual ~RenderWidgetHostProcess() { - } + ~RenderWidgetHostProcess() override {} void set_update_msg_reply_flags(int flags) { update_msg_reply_flags_ = flags; @@ -215,7 +208,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; } + bool HasConnection() const override { return true; } protected: // Indicates the flags that should be sent with a repaint request. This @@ -278,27 +271,25 @@ class TestView : public TestRenderWidgetHostView { } // RenderWidgetHostView override. - virtual gfx::Rect GetViewBounds() const override { - return bounds_; - } - virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, - InputEventAckState ack_result) override { + gfx::Rect GetViewBounds() const override { return bounds_; } + void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, + InputEventAckState ack_result) override { acked_event_ = touch.event; ++acked_event_count_; } - virtual void WheelEventAck(const WebMouseWheelEvent& event, - InputEventAckState ack_result) override { + void WheelEventAck(const WebMouseWheelEvent& event, + 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 { + void GestureEventAck(const WebGestureEvent& event, + InputEventAckState ack_result) override { gesture_event_type_ = event.type; ack_result_ = ack_result; } - virtual gfx::Size GetPhysicalBackingSize() const override { + gfx::Size GetPhysicalBackingSize() const override { if (use_fake_physical_backing_size_) return mock_physical_backing_size_; return TestRenderWidgetHostView::GetPhysicalBackingSize(); @@ -342,7 +333,7 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { handle_wheel_event_(false), handle_wheel_event_called_(false) { } - virtual ~MockRenderWidgetHostDelegate() {} + ~MockRenderWidgetHostDelegate() override {} // Tests that make sure we ignore keyboard event acknowledgments to events we // didn't send work by making sure we didn't call UnhandledKeyboardEvent(). @@ -375,21 +366,19 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { } protected: - virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, - bool* is_keyboard_shortcut) override { + bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, + 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 { + void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override { unhandled_keyboard_event_type_ = event.type; unhandled_keyboard_event_called_ = true; } - virtual bool HandleWheelEvent( - const blink::WebMouseWheelEvent& event) override { + bool HandleWheelEvent(const blink::WebMouseWheelEvent& event) override { handle_wheel_event_called_ = true; return handle_wheel_event_; } diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h index 7dd1c80..d30bc5d 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h @@ -66,24 +66,24 @@ typedef const base::Callback<void(bool, const SkBitmap&)> class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, public IPC::Listener { public: - virtual ~RenderWidgetHostViewBase(); + ~RenderWidgetHostViewBase() override; // RenderWidgetHostView implementation. - virtual void SetBackgroundOpaque(bool opaque) override; - virtual bool GetBackgroundOpaque() override; - virtual ui::TextInputClient* GetTextInputClient() override; - virtual bool IsShowingContextMenu() const override; - virtual void SetShowingContextMenu(bool showing_menu) override; - virtual base::string16 GetSelectedText() const override; - virtual bool IsMouseLocked() override; - virtual gfx::Size GetVisibleViewportSize() const override; - virtual void SetInsets(const gfx::Insets& insets) override; - virtual void BeginFrameSubscription( + void SetBackgroundOpaque(bool opaque) override; + bool GetBackgroundOpaque() override; + ui::TextInputClient* GetTextInputClient() override; + bool IsShowingContextMenu() const override; + void SetShowingContextMenu(bool showing_menu) override; + base::string16 GetSelectedText() const override; + bool IsMouseLocked() override; + gfx::Size GetVisibleViewportSize() const override; + void SetInsets(const gfx::Insets& insets) override; + void BeginFrameSubscription( scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override; - virtual void EndFrameSubscription() override; + void EndFrameSubscription() override; // IPC::Listener implementation: - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; // Called by the host when the input flush has completed. void OnDidFlushInput(); diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index 81917b6..dff9e9c 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -61,7 +61,7 @@ class RenderWidgetHostViewBrowserTest : public ContentBrowserTest { callback_invoke_count_(0), frames_captured_(0) {} - virtual void SetUpOnMainThread() override { + void SetUpOnMainThread() override { ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir_)); } @@ -218,7 +218,7 @@ class CompositingRenderWidgetHostViewBrowserTest test_dir().AppendASCII("rwhv_compositing_animation.html")); } - virtual bool SetUpSourceSurface(const char* wait_message) override { + bool SetUpSourceSurface(const char* wait_message) override { content::DOMMessageQueue message_queue; NavigateToURL(shell(), TestUrl()); if (wait_message != NULL) { @@ -247,10 +247,10 @@ class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber { : callback_(callback) { } - virtual bool ShouldCaptureFrame(const gfx::Rect& damage_rect, - base::TimeTicks present_time, - scoped_refptr<media::VideoFrame>* storage, - DeliverFrameCallback* callback) override { + bool ShouldCaptureFrame(const gfx::Rect& damage_rect, + base::TimeTicks present_time, + scoped_refptr<media::VideoFrame>* storage, + DeliverFrameCallback* callback) override { // Only allow one frame capture to be made. Otherwise, the compositor could // start multiple captures, unbounded, and eventually its own limiter logic // will begin invoking |callback| with a |false| result. This flakes out @@ -505,9 +505,7 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture void SetAllowableError(int amount) { allowable_error_ = amount; } void SetExcludeRect(gfx::Rect exclude) { exclude_rect_ = exclude; } - virtual GURL TestUrl() override { - return GURL(test_url_); - } + GURL TestUrl() override { return GURL(test_url_); } void SetTestUrl(std::string url) { test_url_ = url; } @@ -754,13 +752,13 @@ class CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI() {} protected: - virtual void SetUpCommandLine(base::CommandLine* cmd) override { + void SetUpCommandLine(base::CommandLine* cmd) override { CompositingRenderWidgetHostViewBrowserTestTabCapture::SetUpCommandLine(cmd); cmd->AppendSwitchASCII(switches::kForceDeviceScaleFactor, base::StringPrintf("%f", scale())); } - virtual bool ShouldContinueAfterTestURLLoad() override { + bool ShouldContinueAfterTestURLLoad() override { // Short-circuit a pass for platforms where setting up high-DPI fails. const float actual_scale_factor = GetScaleFactorForView(GetRenderWidgetHostView()); diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h index d58c05b..acab4f0 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.h +++ b/content/browser/renderer_host/render_widget_host_view_mac.h @@ -216,7 +216,7 @@ class CONTENT_EXPORT RenderWidgetHostViewMac // TODO(lazyboy): Remove |is_guest_view_hack| once BrowserPlugin has migrated // to use RWHVChildFrame (http://crbug.com/330264). RenderWidgetHostViewMac(RenderWidgetHost* widget, bool is_guest_view_hack); - virtual ~RenderWidgetHostViewMac(); + ~RenderWidgetHostViewMac() override; RenderWidgetHostViewCocoa* cocoa_view() const { return cocoa_view_; } @@ -228,107 +228,104 @@ class CONTENT_EXPORT RenderWidgetHostViewMac void SetAllowPauseForResizeOrRepaint(bool allow); // RenderWidgetHostView implementation. - virtual bool OnMessageReceived(const IPC::Message& msg) override; - virtual void InitAsChild(gfx::NativeView parent_view) override; - virtual RenderWidgetHost* GetRenderWidgetHost() const override; - virtual void SetSize(const gfx::Size& size) override; - virtual void SetBounds(const gfx::Rect& rect) override; - virtual gfx::Vector2dF GetLastScrollOffset() const override; - virtual gfx::NativeView GetNativeView() const override; - virtual gfx::NativeViewId GetNativeViewId() const override; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; - virtual bool HasFocus() const override; - virtual bool IsSurfaceAvailableForCopy() const override; - virtual void Show() override; - virtual void Hide() override; - virtual bool IsShowing() override; - virtual gfx::Rect GetViewBounds() const override; - virtual void SetShowingContextMenu(bool showing) override; - virtual void SetActive(bool active) override; - virtual void SetTakesFocusOnlyOnMouseDown(bool flag) override; - virtual void SetWindowVisibility(bool visible) override; - virtual void WindowFrameChanged() override; - virtual void ShowDefinitionForSelection() override; - virtual bool SupportsSpeech() const override; - virtual void SpeakSelection() override; - virtual bool IsSpeaking() const override; - virtual void StopSpeaking() override; - virtual void SetBackgroundOpaque(bool opaque) override; + bool OnMessageReceived(const IPC::Message& msg) override; + void InitAsChild(gfx::NativeView parent_view) override; + RenderWidgetHost* GetRenderWidgetHost() const override; + void SetSize(const gfx::Size& size) override; + void SetBounds(const gfx::Rect& rect) override; + gfx::Vector2dF GetLastScrollOffset() const override; + gfx::NativeView GetNativeView() const override; + gfx::NativeViewId GetNativeViewId() const override; + gfx::NativeViewAccessible GetNativeViewAccessible() override; + bool HasFocus() const override; + bool IsSurfaceAvailableForCopy() const override; + void Show() override; + void Hide() override; + bool IsShowing() override; + gfx::Rect GetViewBounds() const override; + void SetShowingContextMenu(bool showing) override; + void SetActive(bool active) override; + void SetTakesFocusOnlyOnMouseDown(bool flag) override; + void SetWindowVisibility(bool visible) override; + void WindowFrameChanged() override; + void ShowDefinitionForSelection() override; + bool SupportsSpeech() const override; + void SpeakSelection() override; + bool IsSpeaking() const override; + void StopSpeaking() override; + void SetBackgroundOpaque(bool opaque) override; // Implementation of RenderWidgetHostViewBase. - virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, - const gfx::Rect& pos) override; - virtual void InitAsFullscreen( - RenderWidgetHostView* reference_host_view) override; - virtual void WasShown() override; - virtual void WasHidden() override; - virtual void MovePluginWindows( - const std::vector<WebPluginGeometry>& moves) override; - virtual void Focus() override; - virtual void Blur() override; - virtual void UpdateCursor(const WebCursor& cursor) override; - virtual void SetIsLoading(bool is_loading) override; - virtual void TextInputTypeChanged(ui::TextInputType type, - ui::TextInputMode input_mode, - bool can_compose_inline) override; - virtual void ImeCancelComposition() override; - virtual void ImeCompositionRangeChanged( + void InitAsPopup(RenderWidgetHostView* parent_host_view, + const gfx::Rect& pos) override; + void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override; + void WasShown() override; + void WasHidden() override; + void MovePluginWindows(const std::vector<WebPluginGeometry>& moves) override; + void Focus() override; + void Blur() override; + void UpdateCursor(const WebCursor& cursor) override; + void SetIsLoading(bool is_loading) override; + void TextInputTypeChanged(ui::TextInputType type, + ui::TextInputMode input_mode, + bool can_compose_inline) override; + void ImeCancelComposition() override; + void ImeCompositionRangeChanged( const gfx::Range& range, const std::vector<gfx::Rect>& character_bounds) override; - virtual void RenderProcessGone(base::TerminationStatus status, - int error_code) override; - virtual void RenderWidgetHostGone() override; - virtual void Destroy() override; - virtual void SetTooltipText(const base::string16& tooltip_text) override; - virtual void SelectionChanged(const base::string16& text, - size_t offset, - const gfx::Range& range) override; - virtual void SelectionBoundsChanged( + void RenderProcessGone(base::TerminationStatus status, + int error_code) override; + void RenderWidgetHostGone() override; + void Destroy() override; + void SetTooltipText(const base::string16& tooltip_text) override; + void SelectionChanged(const base::string16& text, + size_t offset, + const gfx::Range& range) override; + void SelectionBoundsChanged( const ViewHostMsg_SelectionBounds_Params& params) override; - virtual void CopyFromCompositingSurface( + void CopyFromCompositingSurface( const gfx::Rect& src_subrect, const gfx::Size& dst_size, const base::Callback<void(bool, const SkBitmap&)>& callback, SkColorType color_type) override; - virtual void CopyFromCompositingSurfaceToVideoFrame( + void CopyFromCompositingSurfaceToVideoFrame( const gfx::Rect& src_subrect, const scoped_refptr<media::VideoFrame>& target, const base::Callback<void(bool)>& callback) override; - virtual bool CanCopyToVideoFrame() const override; - virtual bool CanSubscribeFrame() const override; - virtual void BeginFrameSubscription( + bool CanCopyToVideoFrame() const override; + bool CanSubscribeFrame() const override; + void BeginFrameSubscription( scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override; - virtual void EndFrameSubscription() override; - virtual void OnSwapCompositorFrame( - uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) override; - virtual BrowserAccessibilityManager* CreateBrowserAccessibilityManager( + void EndFrameSubscription() override; + void OnSwapCompositorFrame(uint32 output_surface_id, + scoped_ptr<cc::CompositorFrame> frame) override; + BrowserAccessibilityManager* CreateBrowserAccessibilityManager( BrowserAccessibilityDelegate* delegate) override; - virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds) - override; - virtual void AccessibilityShowMenu(const gfx::Point& point) override; - virtual bool PostProcessEventForPluginIme( + gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds) override; + void AccessibilityShowMenu(const gfx::Point& point) override; + bool PostProcessEventForPluginIme( const NativeWebKeyboardEvent& event) override; - virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) override; - virtual void GetScreenInfo(blink::WebScreenInfo* results) override; - virtual gfx::Rect GetBoundsInRootWindow() override; - virtual gfx::GLSurfaceHandle GetCompositingSurface() override; + bool HasAcceleratedSurface(const gfx::Size& desired_size) override; + void GetScreenInfo(blink::WebScreenInfo* results) override; + gfx::Rect GetBoundsInRootWindow() override; + gfx::GLSurfaceHandle GetCompositingSurface() override; - virtual bool LockMouse() override; - virtual void UnlockMouse() override; - virtual void WheelEventAck(const blink::WebMouseWheelEvent& event, - InputEventAckState ack_result) override; + bool LockMouse() override; + void UnlockMouse() override; + void WheelEventAck(const blink::WebMouseWheelEvent& event, + InputEventAckState ack_result) override; // IPC::Sender implementation. - virtual bool Send(IPC::Message* message) override; + bool Send(IPC::Message* message) override; - virtual SkColorType PreferredReadbackFormat() override; + SkColorType PreferredReadbackFormat() override; // gfx::DisplayObserver implementation. - virtual void OnDisplayAdded(const gfx::Display& new_display) override; - virtual void OnDisplayRemoved(const gfx::Display& old_display) override; - virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) override; + void OnDisplayAdded(const gfx::Display& new_display) override; + void OnDisplayRemoved(const gfx::Display& old_display) override; + void OnDisplayMetricsChanged(const gfx::Display& display, + uint32_t metrics) override; // Forwards the mouse event to the renderer. void ForwardMouseEvent(const blink::WebMouseEvent& event); @@ -419,20 +416,19 @@ class CONTENT_EXPORT RenderWidgetHostViewMac void PauseForPendingResizeOrRepaintsAndDraw(); // DelegatedFrameHostClient implementation. - virtual ui::Compositor* GetCompositor() const override; - virtual ui::Layer* GetLayer() override; - virtual RenderWidgetHostImpl* GetHost() override; - virtual bool IsVisible() override; - virtual scoped_ptr<ResizeLock> CreateResizeLock( - bool defer_compositor_lock) override; - virtual gfx::Size DesiredFrameSize() override; - virtual float CurrentDeviceScaleFactor() override; - virtual gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) override; - virtual DelegatedFrameHost* GetDelegatedFrameHost() const override; + ui::Compositor* GetCompositor() const override; + ui::Layer* GetLayer() override; + RenderWidgetHostImpl* GetHost() override; + bool IsVisible() override; + scoped_ptr<ResizeLock> CreateResizeLock(bool defer_compositor_lock) override; + gfx::Size DesiredFrameSize() override; + float CurrentDeviceScaleFactor() override; + gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) override; + DelegatedFrameHost* GetDelegatedFrameHost() const override; // BrowserCompositorViewMacClient implementation. - virtual bool BrowserCompositorViewShouldAckImmediately() const override; - virtual void BrowserCompositorViewFrameSwapped( + bool BrowserCompositorViewShouldAckImmediately() const override; + void BrowserCompositorViewFrameSwapped( const std::vector<ui::LatencyInfo>& latency_info) override; private: diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm index ab9c945..6ecb669 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm @@ -72,7 +72,7 @@ bool CheckObjectRespondsToEditCommands(NSArray* edit_commands, id test_obj) { class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { public: MockRenderWidgetHostDelegate() {} - virtual ~MockRenderWidgetHostDelegate() {} + ~MockRenderWidgetHostDelegate() override {} }; // Create a RenderWidget for which we can filter messages. @@ -86,7 +86,7 @@ class RenderWidgetHostEditCommandCounter : public RenderWidgetHostImpl { edit_command_message_count_(0) { } - virtual bool Send(IPC::Message* message) override { + bool Send(IPC::Message* message) override { if (message->type() == InputMsg_ExecuteEditCommand::ID) edit_command_message_count_++; return RenderWidgetHostImpl::Send(message); diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm index feea4ab..a51d5a8 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm @@ -91,7 +91,7 @@ namespace { class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { public: MockRenderWidgetHostDelegate() {} - virtual ~MockRenderWidgetHostDelegate() {} + ~MockRenderWidgetHostDelegate() override {} }; class MockRenderWidgetHostImpl : public RenderWidgetHostImpl { diff --git a/content/browser/renderer_host/render_widget_resize_helper.cc b/content/browser/renderer_host/render_widget_resize_helper.cc index 212fcf1..3cc329d 100644 --- a/content/browser/renderer_host/render_widget_resize_helper.cc +++ b/content/browser/renderer_host/render_widget_resize_helper.cc @@ -72,21 +72,20 @@ class PumpableTaskRunner void RemoveWrappedTaskFromQueue(WrappedTask* task); // base::SingleThreadTaskRunner implementation: - virtual bool PostDelayedTask(const tracked_objects::Location& from_here, - const base::Closure& task, - base::TimeDelta delay) override; + bool PostDelayedTask(const tracked_objects::Location& from_here, + const base::Closure& task, + base::TimeDelta delay) override; - virtual bool PostNonNestableDelayedTask( - const tracked_objects::Location& from_here, - const base::Closure& task, - base::TimeDelta delay) override; + bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, + const base::Closure& task, + base::TimeDelta delay) override; - virtual bool RunsTasksOnCurrentThread() const override; + bool RunsTasksOnCurrentThread() const override; private: friend class WrappedTask; - virtual ~PumpableTaskRunner(); + ~PumpableTaskRunner() override; // A queue of live messages. Must hold |task_queue_lock_| to access. Tasks // are added only on the IO thread and removed only on the UI thread. The diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.h b/content/browser/renderer_host/socket_stream_dispatcher_host.h index a06a9ba..af1b83b 100644 --- a/content/browser/renderer_host/socket_stream_dispatcher_host.h +++ b/content/browser/renderer_host/socket_stream_dispatcher_host.h @@ -37,32 +37,32 @@ class SocketStreamDispatcherHost : public BrowserMessageFilter, ResourceContext* resource_context); // BrowserMessageFilter: - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // Make this object inactive. // Remove all active SocketStreamHost objects. void Shutdown(); // SocketStream::Delegate: - virtual void OnConnected(net::SocketStream* socket, - int max_pending_send_allowed) override; - virtual void OnSentData(net::SocketStream* socket, int amount_sent) override; - virtual void OnReceivedData(net::SocketStream* socket, - const char* data, int len) override; - virtual void OnClose(net::SocketStream* socket) override; - virtual void OnError(const net::SocketStream* socket, int error) override; - virtual void OnSSLCertificateError(net::SocketStream* socket, - const net::SSLInfo& ssl_info, - bool fatal) override; - virtual bool CanGetCookies(net::SocketStream* socket, - const GURL& url) override; - virtual bool CanSetCookie(net::SocketStream* request, - const GURL& url, - const std::string& cookie_line, - net::CookieOptions* options) override; + void OnConnected(net::SocketStream* socket, + int max_pending_send_allowed) override; + void OnSentData(net::SocketStream* socket, int amount_sent) override; + void OnReceivedData(net::SocketStream* socket, + const char* data, + int len) override; + void OnClose(net::SocketStream* socket) override; + void OnError(const net::SocketStream* socket, int error) override; + void OnSSLCertificateError(net::SocketStream* socket, + const net::SSLInfo& ssl_info, + bool fatal) override; + bool CanGetCookies(net::SocketStream* socket, const GURL& url) override; + bool CanSetCookie(net::SocketStream* request, + const GURL& url, + const std::string& cookie_line, + net::CookieOptions* options) override; protected: - virtual ~SocketStreamDispatcherHost(); + ~SocketStreamDispatcherHost() override; private: // Message handlers called by OnMessageReceived. diff --git a/content/browser/renderer_host/socket_stream_host.cc b/content/browser/renderer_host/socket_stream_host.cc index 17ed383..deef6cc 100644 --- a/content/browser/renderer_host/socket_stream_host.cc +++ b/content/browser/renderer_host/socket_stream_host.cc @@ -18,7 +18,7 @@ const char* kSocketIdKey = "socketId"; class SocketStreamId : public net::SocketStream::UserData { public: explicit SocketStreamId(int socket_id) : socket_id_(socket_id) {} - virtual ~SocketStreamId() {} + ~SocketStreamId() override {} int socket_id() const { return socket_id_; } private: diff --git a/content/browser/renderer_host/socket_stream_host.h b/content/browser/renderer_host/socket_stream_host.h index 73e8f72..94234fb 100644 --- a/content/browser/renderer_host/socket_stream_host.h +++ b/content/browser/renderer_host/socket_stream_host.h @@ -34,7 +34,7 @@ class SocketStreamHost : public SSLErrorHandler::Delegate { int child_id, int render_frame_id, int socket_id); - virtual ~SocketStreamHost(); + ~SocketStreamHost() override; // Gets socket_id associated with |socket|. static int SocketIdFromSocketStream(const net::SocketStream* socket); @@ -58,9 +58,8 @@ class SocketStreamHost : public SSLErrorHandler::Delegate { base::WeakPtr<SSLErrorHandler::Delegate> AsSSLErrorHandlerDelegate(); // SSLErrorHandler::Delegate methods: - virtual void CancelSSLRequest(int error, - const net::SSLInfo* ssl_info) override; - virtual void ContinueSSLRequest() override; + void CancelSSLRequest(int error, const net::SSLInfo* ssl_info) override; + void ContinueSSLRequest() override; private: net::SocketStream::Delegate* delegate_; diff --git a/content/browser/renderer_host/software_frame_manager.h b/content/browser/renderer_host/software_frame_manager.h index 496a89a..5572985 100644 --- a/content/browser/renderer_host/software_frame_manager.h +++ b/content/browser/renderer_host/software_frame_manager.h @@ -39,7 +39,7 @@ class CONTENT_EXPORT SoftwareFrameManager : public RendererFrameManagerClient { public: explicit SoftwareFrameManager( base::WeakPtr<SoftwareFrameManagerClient> client); - virtual ~SoftwareFrameManager(); + ~SoftwareFrameManager() override; // Swaps to a new frame from shared memory. This frame is guaranteed to // not be evicted until SwapToNewFrameComplete is called. @@ -64,7 +64,7 @@ class CONTENT_EXPORT SoftwareFrameManager : public RendererFrameManagerClient { private: // Called by SoftwareFrameMemoryManager to demand that the current frame // be evicted. - virtual void EvictCurrentFrame() override; + void EvictCurrentFrame() override; base::WeakPtr<SoftwareFrameManagerClient> client_; diff --git a/content/browser/renderer_host/software_frame_manager_unittest.cc b/content/browser/renderer_host/software_frame_manager_unittest.cc index 8cbd0af..0569f25 100644 --- a/content/browser/renderer_host/software_frame_manager_unittest.cc +++ b/content/browser/renderer_host/software_frame_manager_unittest.cc @@ -25,13 +25,11 @@ class FakeSoftwareFrameManagerClient : public SoftwareFrameManagerClient { HostSharedBitmapManager::current()->ProcessRemoved( base::GetCurrentProcessHandle()); } - virtual void SoftwareFrameWasFreed(uint32 output_surface_id, - unsigned frame_id) override { + void SoftwareFrameWasFreed(uint32 output_surface_id, + unsigned frame_id) override { freed_frames_.push_back(std::make_pair(output_surface_id, frame_id)); } - virtual void ReleaseReferencesToSoftwareFrame() override { - ++evicted_count_; - } + void ReleaseReferencesToSoftwareFrame() override { ++evicted_count_; } bool SwapToNewFrame(uint32 output_surface, unsigned frame_id) { cc::SoftwareFrameData frame; diff --git a/content/browser/renderer_host/text_input_client_mac_unittest.mm b/content/browser/renderer_host/text_input_client_mac_unittest.mm index eddff7b..e208ccd 100644 --- a/content/browser/renderer_host/text_input_client_mac_unittest.mm +++ b/content/browser/renderer_host/text_input_client_mac_unittest.mm @@ -26,7 +26,7 @@ const int64 kTaskDelayMs = 200; class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { public: MockRenderWidgetHostDelegate() {} - virtual ~MockRenderWidgetHostDelegate() {} + ~MockRenderWidgetHostDelegate() override {} }; // This test does not test the WebKit side of the dictionary system (which diff --git a/content/browser/renderer_host/text_input_client_message_filter.h b/content/browser/renderer_host/text_input_client_message_filter.h index be72ddc..1918620 100644 --- a/content/browser/renderer_host/text_input_client_message_filter.h +++ b/content/browser/renderer_host/text_input_client_message_filter.h @@ -25,10 +25,10 @@ class CONTENT_EXPORT TextInputClientMessageFilter explicit TextInputClientMessageFilter(int child_id); // BrowserMessageFilter override: - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; protected: - virtual ~TextInputClientMessageFilter(); + ~TextInputClientMessageFilter() override; private: // IPC Message handlers: diff --git a/content/browser/renderer_host/websocket_dispatcher_host.h b/content/browser/renderer_host/websocket_dispatcher_host.h index 2ef0380..b9cdd34 100644 --- a/content/browser/renderer_host/websocket_dispatcher_host.h +++ b/content/browser/renderer_host/websocket_dispatcher_host.h @@ -56,7 +56,7 @@ class CONTENT_EXPORT WebSocketDispatcherHost : public BrowserMessageFilter { const WebSocketHostFactory& websocket_host_factory); // BrowserMessageFilter: - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // The following methods are used by WebSocketHost::EventInterface to send // IPCs from the browser to the renderer or child process. Any of them may @@ -116,7 +116,7 @@ class CONTENT_EXPORT WebSocketDispatcherHost : public BrowserMessageFilter { private: typedef base::hash_map<int, WebSocketHost*> WebSocketHostTable; - virtual ~WebSocketDispatcherHost(); + ~WebSocketDispatcherHost() override; WebSocketHost* CreateWebSocketHost(int routing_id); diff --git a/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc b/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc index 3986ea5..d59a3c4 100644 --- a/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc @@ -35,14 +35,14 @@ class MockWebSocketHost : public WebSocketHost { net::URLRequestContext* url_request_context, WebSocketDispatcherHostTest* owner); - virtual ~MockWebSocketHost() {} + ~MockWebSocketHost() override {} - virtual bool OnMessageReceived(const IPC::Message& message) override { + bool OnMessageReceived(const IPC::Message& message) override { received_messages_.push_back(message); return true; } - virtual void GoAway() override; + void GoAway() override; std::vector<IPC::Message> received_messages_; base::WeakPtr<WebSocketDispatcherHostTest> owner_; diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc index 7749be8..9b557fe 100644 --- a/content/browser/renderer_host/websocket_host.cc +++ b/content/browser/renderer_host/websocket_host.cc @@ -88,28 +88,27 @@ class WebSocketEventHandler : public net::WebSocketEventInterface { WebSocketEventHandler(WebSocketDispatcherHost* dispatcher, int routing_id, int render_frame_id); - virtual ~WebSocketEventHandler(); + ~WebSocketEventHandler() override; // net::WebSocketEventInterface implementation - virtual ChannelState OnAddChannelResponse( - bool fail, - const std::string& selected_subprotocol, - const std::string& extensions) override; - virtual ChannelState OnDataFrame(bool fin, - WebSocketMessageType type, - const std::vector<char>& data) override; - virtual ChannelState OnClosingHandshake() override; - virtual ChannelState OnFlowControl(int64 quota) override; - virtual ChannelState OnDropChannel(bool was_clean, - uint16 code, - const std::string& reason) override; - virtual ChannelState OnFailChannel(const std::string& message) override; - virtual ChannelState OnStartOpeningHandshake( + ChannelState OnAddChannelResponse(bool fail, + const std::string& selected_subprotocol, + const std::string& extensions) override; + ChannelState OnDataFrame(bool fin, + WebSocketMessageType type, + const std::vector<char>& data) override; + ChannelState OnClosingHandshake() override; + ChannelState OnFlowControl(int64 quota) override; + ChannelState OnDropChannel(bool was_clean, + uint16 code, + const std::string& reason) override; + ChannelState OnFailChannel(const std::string& message) override; + ChannelState OnStartOpeningHandshake( scoped_ptr<net::WebSocketHandshakeRequestInfo> request) override; - virtual ChannelState OnFinishOpeningHandshake( + ChannelState OnFinishOpeningHandshake( scoped_ptr<net::WebSocketHandshakeResponseInfo> response) override; - virtual ChannelState OnSSLCertificateError( + ChannelState OnSSLCertificateError( scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks, const GURL& url, const net::SSLInfo& ssl_info, @@ -120,14 +119,13 @@ class WebSocketEventHandler : public net::WebSocketEventInterface { public: SSLErrorHandlerDelegate( scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks); - virtual ~SSLErrorHandlerDelegate(); + ~SSLErrorHandlerDelegate() override; base::WeakPtr<SSLErrorHandler::Delegate> GetWeakPtr(); // SSLErrorHandler::Delegate methods - virtual void CancelSSLRequest(int error, - const net::SSLInfo* ssl_info) override; - virtual void ContinueSSLRequest() override; + void CancelSSLRequest(int error, const net::SSLInfo* ssl_info) override; + void ContinueSSLRequest() override; private: scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks_; |