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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 616603004: Replacing the OVERRIDE with override and FINAL with final in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 9978bf4ba5406603d3ce4a23d80bd6823806c053..7385804e556c3ac9623847e3ecf16e2e71a51575 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -96,116 +96,116 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
virtual ~RenderWidgetHostViewAndroid();
// RenderWidgetHostView implementation.
- virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
- virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& msg) override;
+ virtual void InitAsChild(gfx::NativeView parent_view) override;
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 RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
- virtual void WasShown() OVERRIDE;
- virtual void WasHidden() 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;
+ RenderWidgetHostView* reference_host_view) override;
+ virtual RenderWidgetHost* GetRenderWidgetHost() const override;
+ virtual void WasShown() override;
+ virtual void WasHidden() 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 void MovePluginWindows(
- const std::vector<WebPluginGeometry>& moves) OVERRIDE;
- virtual void Focus() OVERRIDE;
- virtual void Blur() 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::Size GetPhysicalBackingSize() const OVERRIDE;
- virtual float GetTopControlsLayoutHeight() const OVERRIDE;
- virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
- virtual void SetIsLoading(bool is_loading) OVERRIDE;
+ const std::vector<WebPluginGeometry>& moves) override;
+ virtual void Focus() override;
+ virtual void Blur() 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::Size GetPhysicalBackingSize() const override;
+ virtual float GetTopControlsLayoutHeight() const 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;
- virtual void FocusedNodeChanged(bool is_editable_node) OVERRIDE;
+ const ViewHostMsg_TextInputState_Params& params) override;
+ virtual void ImeCancelComposition() override;
+ virtual void FocusedNodeChanged(bool is_editable_node) override;
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;
- virtual void AcceleratedSurfaceInitialized(int route_id) OVERRIDE;
- virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
- virtual void SetBackgroundOpaque(bool transparent) OVERRIDE;
+ const ViewHostMsg_SelectionBounds_Params& params) override;
+ virtual void AcceleratedSurfaceInitialized(int route_id) override;
+ virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
+ virtual void SetBackgroundOpaque(bool transparent) 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 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 void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
- virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
- virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
+ const base::Callback<void(bool)>& callback) override;
+ virtual bool CanCopyToVideoFrame() const override;
+ virtual void GetScreenInfo(blink::WebScreenInfo* results) override;
+ virtual gfx::Rect GetBoundsInRootWindow() override;
+ virtual gfx::GLSurfaceHandle GetCompositingSurface() override;
virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
- InputEventAckState ack_result) OVERRIDE;
+ InputEventAckState ack_result) override;
virtual InputEventAckState FilterInputEvent(
- const blink::WebInputEvent& input_event) OVERRIDE;
- virtual void OnSetNeedsFlushInput() OVERRIDE;
+ const blink::WebInputEvent& input_event) override;
+ virtual void OnSetNeedsFlushInput() override;
virtual void GestureEventAck(const blink::WebGestureEvent& event,
- InputEventAckState ack_result) OVERRIDE;
+ InputEventAckState ack_result) override;
virtual BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
- BrowserAccessibilityDelegate* delegate) OVERRIDE;
- virtual bool LockMouse() OVERRIDE;
- virtual void UnlockMouse() OVERRIDE;
+ BrowserAccessibilityDelegate* delegate) override;
+ virtual bool LockMouse() override;
+ virtual void UnlockMouse() override;
virtual void OnSwapCompositorFrame(
uint32 output_surface_id,
- scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
- virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE;
- virtual void DidStopFlinging() OVERRIDE;
+ scoped_ptr<cc::CompositorFrame> frame) override;
+ virtual void DidOverscroll(const DidOverscrollParams& params) override;
+ virtual void DidStopFlinging() override;
virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
- const SkBitmap& zoomed_bitmap) OVERRIDE;
+ const SkBitmap& zoomed_bitmap) override;
virtual scoped_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
- OVERRIDE;
- virtual void LockCompositingSurface() OVERRIDE;
- virtual void UnlockCompositingSurface() OVERRIDE;
+ override;
+ virtual void LockCompositingSurface() override;
+ virtual void UnlockCompositingSurface() override;
virtual void OnTextSurroundingSelectionResponse(const base::string16& content,
size_t start_offset,
- size_t end_offset) OVERRIDE;
+ size_t end_offset) override;
// cc::DelegatedFrameResourceCollectionClient implementation.
- virtual void UnusedResourcesAreAvailable() OVERRIDE;
+ virtual void UnusedResourcesAreAvailable() override;
// ui::GestureProviderClient implementation.
- virtual void OnGestureEvent(const ui::GestureEventData& gesture) OVERRIDE;
+ virtual void OnGestureEvent(const ui::GestureEventData& gesture) override;
// ui::WindowAndroidObserver implementation.
- virtual void OnCompositingDidCommit() OVERRIDE;
- virtual void OnAttachCompositor() OVERRIDE;
- virtual void OnDetachCompositor() OVERRIDE;
+ virtual void OnCompositingDidCommit() override;
+ virtual void OnAttachCompositor() override;
+ virtual void OnDetachCompositor() override;
virtual void OnVSync(base::TimeTicks frame_time,
- base::TimeDelta vsync_period) OVERRIDE;
- virtual void OnAnimate(base::TimeTicks begin_frame_time) OVERRIDE;
+ base::TimeDelta vsync_period) override;
+ virtual void OnAnimate(base::TimeTicks begin_frame_time) override;
// ImageTransportFactoryAndroidObserver implementation.
- virtual void OnLostResources() OVERRIDE;
+ virtual void OnLostResources() override;
// DelegatedFrameEvictor implementation
- virtual void EvictDelegatedFrame() OVERRIDE;
+ virtual void EvictDelegatedFrame() override;
- virtual SkColorType PreferredReadbackFormat() OVERRIDE;
+ virtual SkColorType PreferredReadbackFormat() override;
// GestureTextSelectorClient implementation.
- virtual void ShowSelectionHandlesAutomatically() OVERRIDE;
- virtual void SelectRange(float x1, float y1, float x2, float y2) OVERRIDE;
- virtual void LongPress(base::TimeTicks time, float x, float y) OVERRIDE;
+ virtual void ShowSelectionHandlesAutomatically() override;
+ virtual void SelectRange(float x1, float y1, float x2, float y2) override;
+ virtual void LongPress(base::TimeTicks time, float x, float y) override;
// Non-virtual methods
void SetContentViewCore(ContentViewCoreImpl* content_view_core);
@@ -260,14 +260,14 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
private:
// TouchSelectionControllerClient implementation.
- virtual bool SupportsAnimation() const OVERRIDE;
- virtual void SetNeedsAnimate() OVERRIDE;
- virtual void MoveCaret(const gfx::PointF& position) OVERRIDE;
+ virtual bool SupportsAnimation() const override;
+ virtual void SetNeedsAnimate() override;
+ virtual void MoveCaret(const gfx::PointF& position) override;
virtual void SelectBetweenCoordinates(const gfx::PointF& start,
- const gfx::PointF& end) OVERRIDE;
+ const gfx::PointF& end) override;
virtual void OnSelectionEvent(SelectionEventType event,
- const gfx::PointF& anchor_position) OVERRIDE;
- virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE;
+ const gfx::PointF& anchor_position) override;
+ virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override;
void RunAckCallbacks();
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698