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

Unified Diff: content/browser/frame_host/render_widget_host_view_guest.h

Issue 631013003: Replacing the OVERRIDE with override and FINAL with final in content/browser/frame_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_widget_host_view_guest.h
diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h
index c1f877e2958e7b6b92fbc097b824ec9ef12168dd..9d83c3fb68141a5f5450dc16725d8867a0367bc8 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.h
+++ b/content/browser/frame_host/render_widget_host_view_guest.h
@@ -50,105 +50,105 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
RenderWidgetHostImpl* embedder);
// RenderWidgetHostView implementation.
- virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
- virtual void InitAsChild(gfx::NativeView parent_view) 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 gfx::NativeView GetNativeView() const OVERRIDE;
- virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
- virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
- virtual gfx::Rect GetViewBounds() const OVERRIDE;
- virtual void SetBackgroundOpaque(bool opaque) OVERRIDE;
- virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE;
- virtual base::string16 GetSelectedText() const OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& msg) override;
+ virtual void InitAsChild(gfx::NativeView parent_view) 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 gfx::NativeView GetNativeView() const override;
+ virtual gfx::NativeViewId GetNativeViewId() const override;
+ virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
+ virtual gfx::Rect GetViewBounds() const override;
+ virtual void SetBackgroundOpaque(bool opaque) override;
+ virtual gfx::Size GetPhysicalBackingSize() const override;
+ virtual base::string16 GetSelectedText() const override;
// RenderWidgetHostViewBase implementation.
virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
- const gfx::Rect& pos) OVERRIDE;
+ const gfx::Rect& pos) override;
virtual void InitAsFullscreen(
- RenderWidgetHostView* reference_host_view) OVERRIDE;
- virtual void WasShown() OVERRIDE;
- virtual void WasHidden() OVERRIDE;
+ RenderWidgetHostView* reference_host_view) override;
+ virtual void WasShown() override;
+ virtual void WasHidden() override;
virtual void MovePluginWindows(
- const std::vector<WebPluginGeometry>& moves) OVERRIDE;
- virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
- virtual void SetIsLoading(bool is_loading) OVERRIDE;
+ const std::vector<WebPluginGeometry>& moves) override;
+ virtual void UpdateCursor(const WebCursor& cursor) override;
+ virtual void SetIsLoading(bool is_loading) override;
virtual void TextInputStateChanged(
- const ViewHostMsg_TextInputState_Params& params) OVERRIDE;
- virtual void ImeCancelComposition() OVERRIDE;
+ const ViewHostMsg_TextInputState_Params& params) override;
+ virtual void ImeCancelComposition() override;
#if defined(OS_MACOSX) || defined(USE_AURA)
virtual void ImeCompositionRangeChanged(
const gfx::Range& range,
- const std::vector<gfx::Rect>& character_bounds) OVERRIDE;
+ 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;
+ 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;
+ const gfx::Range& range) override;
virtual void SelectionBoundsChanged(
- const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
+ const ViewHostMsg_SelectionBounds_Params& params) override;
virtual void CopyFromCompositingSurface(
const gfx::Rect& src_subrect,
const gfx::Size& dst_size,
CopyFromCompositingSurfaceCallback& callback,
- const SkColorType color_type) OVERRIDE;
+ const SkColorType color_type) override;
virtual void OnSwapCompositorFrame(
uint32 output_surface_id,
- scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
+ scoped_ptr<cc::CompositorFrame> frame) override;
#if defined(USE_AURA)
virtual void ProcessAckedTouchEvent(
const TouchEventWithLatencyInfo& touch,
- InputEventAckState ack_result) OVERRIDE;
+ InputEventAckState ack_result) override;
#endif
- virtual bool LockMouse() OVERRIDE;
- virtual void UnlockMouse() OVERRIDE;
- virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
+ virtual bool LockMouse() override;
+ virtual void UnlockMouse() override;
+ virtual void GetScreenInfo(blink::WebScreenInfo* results) 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;
+ 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;
// RenderWidgetHostViewBase implementation.
virtual bool PostProcessEventForPluginIme(
- const NativeWebKeyboardEvent& event) OVERRIDE;
+ const NativeWebKeyboardEvent& event) override;
#endif // defined(OS_MACOSX)
#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
// RenderWidgetHostViewBase implementation.
virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
- const SkBitmap& zoomed_bitmap) OVERRIDE;
+ const SkBitmap& zoomed_bitmap) override;
#endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
#if defined(OS_ANDROID)
- virtual void LockCompositingSurface() OVERRIDE;
- virtual void UnlockCompositingSurface() OVERRIDE;
+ virtual void LockCompositingSurface() override;
+ virtual void UnlockCompositingSurface() override;
#endif // defined(OS_ANDROID)
#if defined(OS_WIN)
virtual void SetParentNativeViewAccessible(
- gfx::NativeViewAccessible accessible_parent) OVERRIDE;
- virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
+ gfx::NativeViewAccessible accessible_parent) override;
+ virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override;
#endif
// Overridden from ui::GestureEventHelper.
- virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE;
- virtual void DispatchGestureEvent(ui::GestureEvent* event) OVERRIDE;
- virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
+ virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
+ virtual void DispatchGestureEvent(ui::GestureEvent* event) override;
+ virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) override;
- virtual SkColorType PreferredReadbackFormat() OVERRIDE;
+ virtual SkColorType PreferredReadbackFormat() override;
protected:
friend class RenderWidgetHostView;
« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698