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

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame.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/frame_host/render_widget_host_view_child_frame.h
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
index 4ca0716b4fd088d0b3381a372895620a49f23313..4774d5553255bc0e3d122b394823ed4dea769c5c 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -28,7 +28,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
: public RenderWidgetHostViewBase {
public:
explicit RenderWidgetHostViewChildFrame(RenderWidgetHost* widget);
- virtual ~RenderWidgetHostViewChildFrame();
+ ~RenderWidgetHostViewChildFrame() override;
void set_cross_process_frame_connector(
CrossProcessFrameConnector* frame_connector) {
@@ -36,93 +36,90 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
}
// RenderWidgetHostView implementation.
- 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 void Focus() 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 gfx::Vector2dF GetLastScrollOffset() const override;
- virtual gfx::NativeView GetNativeView() const override;
- virtual gfx::NativeViewId GetNativeViewId() const override;
- virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
- virtual void SetBackgroundOpaque(bool opaque) override;
- virtual gfx::Size GetPhysicalBackingSize() const 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;
+ void Focus() override;
+ bool HasFocus() const override;
+ bool IsSurfaceAvailableForCopy() const override;
+ void Show() override;
+ void Hide() override;
+ bool IsShowing() override;
+ gfx::Rect GetViewBounds() const override;
+ gfx::Vector2dF GetLastScrollOffset() const override;
+ gfx::NativeView GetNativeView() const override;
+ gfx::NativeViewId GetNativeViewId() const override;
+ gfx::NativeViewAccessible GetNativeViewAccessible() override;
+ void SetBackgroundOpaque(bool opaque) override;
+ gfx::Size GetPhysicalBackingSize() const override;
// RenderWidgetHostViewBase implementation.
- 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 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;
+ 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 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;
#if defined(OS_MACOSX) || defined(USE_AURA)
- virtual void ImeCompositionRangeChanged(
+ void ImeCompositionRangeChanged(
const gfx::Range& range,
const std::vector<gfx::Rect>& character_bounds) override;
#endif
- virtual void RenderProcessGone(base::TerminationStatus status,
- int error_code) 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 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,
const 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 HasAcceleratedSurface(const gfx::Size& desired_size) override;
- virtual void OnSwapCompositorFrame(
- uint32 output_surface_id,
- scoped_ptr<cc::CompositorFrame> frame) override;
- virtual void GetScreenInfo(blink::WebScreenInfo* results) override;
- virtual gfx::Rect GetBoundsInRootWindow() override;
- virtual gfx::GLSurfaceHandle GetCompositingSurface() override;
+ bool CanCopyToVideoFrame() const override;
+ bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
+ void OnSwapCompositorFrame(uint32 output_surface_id,
+ scoped_ptr<cc::CompositorFrame> frame) override;
+ void GetScreenInfo(blink::WebScreenInfo* results) override;
+ gfx::Rect GetBoundsInRootWindow() override;
+ gfx::GLSurfaceHandle GetCompositingSurface() override;
#if defined(USE_AURA)
virtual void ProcessAckedTouchEvent(
const TouchEventWithLatencyInfo& touch,
InputEventAckState ack_result) override;
#endif // defined(USE_AURA)
- virtual bool LockMouse() override;
- virtual void UnlockMouse() override;
+ bool LockMouse() override;
+ void UnlockMouse() override;
#if defined(OS_MACOSX)
// RenderWidgetHostView implementation.
- 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;
+ 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;
// RenderWidgetHostViewBase implementation.
- virtual bool PostProcessEventForPluginIme(
+ bool PostProcessEventForPluginIme(
const NativeWebKeyboardEvent& event) override;
#endif // defined(OS_MACOSX)
@@ -137,10 +134,10 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
gfx::NativeViewAccessible accessible_parent) override;
virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override;
#endif
- virtual BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
+ BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
BrowserAccessibilityDelegate* delegate) override;
- virtual SkColorType PreferredReadbackFormat() override;
+ SkColorType PreferredReadbackFormat() override;
protected:
friend class RenderWidgetHostView;

Powered by Google App Engine
This is Rietveld 408576698