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

Unified Diff: content/browser/renderer_host/render_widget_host_impl.h

Issue 667943003: Standardize usage of virtual/override/final in content/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_impl.h
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index f0da2fb3f7b20248934a64b1f872672bb7f3a92e..de957337fb4dec44da35ec34f315843efb5d1177 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);

Powered by Google App Engine
This is Rietveld 408576698