Index: content/browser/web_contents/web_contents_view_guest.h |
diff --git a/content/browser/web_contents/web_contents_view_guest.h b/content/browser/web_contents/web_contents_view_guest.h |
index dfb76e7486946790f898ce5bed14674e0826bf28..e21f19a6956e2338a4776e514321e6b2ecfc8742 100644 |
--- a/content/browser/web_contents/web_contents_view_guest.h |
+++ b/content/browser/web_contents/web_contents_view_guest.h |
@@ -31,7 +31,7 @@ class WebContentsViewGuest : public WebContentsView, |
BrowserPluginGuest* guest, |
scoped_ptr<WebContentsView> platform_view, |
RenderViewHostDelegateView* platform_view_delegate_view); |
- virtual ~WebContentsViewGuest(); |
+ ~WebContentsViewGuest() override; |
WebContents* web_contents(); |
@@ -45,45 +45,46 @@ class WebContentsViewGuest : public WebContentsView, |
const ContextMenuParams& params) const; |
// 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; |
#if defined(OS_MACOSX) |
- virtual void SetAllowOtherViews(bool allow) override; |
- virtual bool GetAllowOtherViews() const override; |
- virtual bool IsEventTracking() const override; |
- virtual void CloseTabAfterEventTracking() override; |
+ void SetAllowOtherViews(bool allow) override; |
+ bool GetAllowOtherViews() const override; |
+ bool IsEventTracking() const override; |
+ void CloseTabAfterEventTracking() override; |
#endif |
// Backend implementation of RenderViewHostDelegateView. |
- virtual void ShowContextMenu(RenderFrameHost* render_frame_host, |
- const ContextMenuParams& params) 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 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 WebContentsImpl whose contents we display. |