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

Unified Diff: content/browser/web_contents/web_contents_view_android.h

Issue 628213003: Replace OVERRIDE and FINAL with override and final in content/browser/web_contents (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/web_contents/web_contents_view_android.h
diff --git a/content/browser/web_contents/web_contents_view_android.h b/content/browser/web_contents/web_contents_view_android.h
index 9170fc55c6d3823ada7faa18870d3100767a8632..e4c9e60672c9e46b29f9e4370ede4007c3e6e2c9 100644
--- a/content/browser/web_contents/web_contents_view_android.h
+++ b/content/browser/web_contents/web_contents_view_android.h
@@ -30,31 +30,31 @@ class WebContentsViewAndroid : public WebContentsView,
void SetContentViewCore(ContentViewCoreImpl* content_view_core);
// WebContentsView implementation --------------------------------------------
- virtual gfx::NativeView GetNativeView() const OVERRIDE;
- virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
- virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
- virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
- virtual void SizeContents(const gfx::Size& size) OVERRIDE;
- virtual void Focus() OVERRIDE;
- virtual void SetInitialFocus() OVERRIDE;
- virtual void StoreFocus() OVERRIDE;
- virtual void RestoreFocus() OVERRIDE;
- virtual DropData* GetDropData() const OVERRIDE;
- virtual gfx::Rect GetViewBounds() const OVERRIDE;
+ virtual gfx::NativeView GetNativeView() const override;
+ virtual gfx::NativeView GetContentNativeView() const override;
+ virtual gfx::NativeWindow GetTopLevelNativeWindow() const override;
+ virtual void GetContainerBounds(gfx::Rect* out) const override;
+ virtual void SizeContents(const gfx::Size& size) override;
+ virtual void Focus() override;
+ virtual void SetInitialFocus() override;
+ virtual void StoreFocus() override;
+ virtual void RestoreFocus() override;
+ virtual DropData* GetDropData() const override;
+ virtual gfx::Rect GetViewBounds() const override;
virtual void CreateView(
- const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE;
+ const gfx::Size& initial_size, gfx::NativeView context) override;
virtual RenderWidgetHostViewBase* CreateViewForWidget(
- RenderWidgetHost* render_widget_host) OVERRIDE;
+ RenderWidgetHost* render_widget_host) override;
virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
- RenderWidgetHost* render_widget_host) OVERRIDE;
- virtual void SetPageTitle(const base::string16& title) OVERRIDE;
- virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
- virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE;
- virtual void SetOverscrollControllerEnabled(bool enabled) OVERRIDE;
+ RenderWidgetHost* render_widget_host) override;
+ virtual void SetPageTitle(const base::string16& title) override;
+ virtual void RenderViewCreated(RenderViewHost* host) override;
+ virtual void RenderViewSwappedIn(RenderViewHost* host) override;
+ virtual void SetOverscrollControllerEnabled(bool enabled) override;
// Backend implementation of RenderViewHostDelegateView.
virtual void ShowContextMenu(RenderFrameHost* render_frame_host,
- const ContextMenuParams& params) OVERRIDE;
+ const ContextMenuParams& params) override;
virtual void ShowPopupMenu(RenderFrameHost* render_frame_host,
const gfx::Rect& bounds,
int item_height,
@@ -62,16 +62,16 @@ class WebContentsViewAndroid : public WebContentsView,
int selected_item,
const std::vector<MenuItem>& items,
bool right_aligned,
- bool allow_multiple_selection) OVERRIDE;
- virtual void HidePopupMenu() OVERRIDE;
+ bool allow_multiple_selection) override;
+ virtual void HidePopupMenu() override;
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;
- virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE;
- virtual void GotFocus() OVERRIDE;
- virtual void TakeFocus(bool reverse) OVERRIDE;
+ const DragEventSourceInfo& event_info) override;
+ virtual void UpdateDragCursor(blink::WebDragOperation operation) override;
+ virtual void GotFocus() override;
+ virtual void TakeFocus(bool reverse) override;
private:
// The WebContents whose contents we display.
« no previous file with comments | « content/browser/web_contents/web_contents_impl_unittest.cc ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698