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

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

Issue 884103004: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/web_contents/web_contents_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a63bb884f3a61cb2300bcfeac9f27f7475d52f7a..9f7216f657732dd50d79d4d458a35a5ce6021ddb 100644
--- a/content/browser/web_contents/web_contents_view_android.h
+++ b/content/browser/web_contents/web_contents_view_android.h
@@ -22,7 +22,7 @@ class WebContentsViewAndroid : public WebContentsView,
public:
WebContentsViewAndroid(WebContentsImpl* web_contents,
WebContentsViewDelegate* delegate);
- virtual ~WebContentsViewAndroid();
+ ~WebContentsViewAndroid() override;
// Sets the interface to the view system. ContentViewCoreImpl is owned
// by its Java ContentViewCore counterpart, whose lifetime is managed
@@ -30,48 +30,49 @@ 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 void CreateView(
- const gfx::Size& initial_size, gfx::NativeView context) override;
- virtual RenderWidgetHostViewBase* CreateViewForWidget(
- RenderWidgetHost* render_widget_host, bool is_guest_view_hack) override;
- virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
+ gfx::NativeView GetNativeView() const override;
+ gfx::NativeView GetContentNativeView() const override;
+ gfx::NativeWindow GetTopLevelNativeWindow() const override;
+ void GetContainerBounds(gfx::Rect* out) const override;
+ void SizeContents(const gfx::Size& size) override;
+ void Focus() override;
+ void SetInitialFocus() override;
+ void StoreFocus() override;
+ void RestoreFocus() override;
+ DropData* GetDropData() const override;
+ gfx::Rect GetViewBounds() const override;
+ void CreateView(const gfx::Size& initial_size,
+ gfx::NativeView context) override;
+ RenderWidgetHostViewBase* CreateViewForWidget(
+ RenderWidgetHost* render_widget_host,
+ bool is_guest_view_hack) override;
+ 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;
+ void SetPageTitle(const base::string16& title) override;
+ void RenderViewCreated(RenderViewHost* host) override;
+ void RenderViewSwappedIn(RenderViewHost* host) override;
+ void SetOverscrollControllerEnabled(bool enabled) override;
// Backend implementation of RenderViewHostDelegateView.
- virtual void ShowContextMenu(RenderFrameHost* render_frame_host,
- const ContextMenuParams& params) override;
- virtual void ShowPopupMenu(RenderFrameHost* render_frame_host,
- const gfx::Rect& bounds,
- int item_height,
- double item_font_size,
- int selected_item,
- const std::vector<MenuItem>& items,
- bool right_aligned,
- 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;
+ void ShowContextMenu(RenderFrameHost* render_frame_host,
+ const ContextMenuParams& params) override;
+ void ShowPopupMenu(RenderFrameHost* render_frame_host,
+ const gfx::Rect& bounds,
+ int item_height,
+ double item_font_size,
+ int selected_item,
+ const std::vector<MenuItem>& items,
+ bool right_aligned,
+ bool allow_multiple_selection) override;
+ void HidePopupMenu() override;
+ void StartDragging(const DropData& drop_data,
+ blink::WebDragOperationsMask allowed_ops,
+ const gfx::ImageSkia& image,
+ const gfx::Vector2d& image_offset,
+ const DragEventSourceInfo& event_info) override;
+ void UpdateDragCursor(blink::WebDragOperation operation) override;
+ void GotFocus() override;
+ void TakeFocus(bool reverse) override;
private:
// The WebContents whose contents we display.
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698