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

Side by Side Diff: content/browser/web_contents/web_contents_view_mac.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 unified diff | Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_view_guest.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 public RenderViewHostDelegateView { 59 public RenderViewHostDelegateView {
60 public: 60 public:
61 // The corresponding WebContentsImpl is passed in the constructor, and manages 61 // The corresponding WebContentsImpl is passed in the constructor, and manages
62 // our lifetime. This doesn't need to be the case, but is this way currently 62 // our lifetime. This doesn't need to be the case, but is this way currently
63 // because that's what was easiest when they were split. 63 // because that's what was easiest when they were split.
64 WebContentsViewMac(WebContentsImpl* web_contents, 64 WebContentsViewMac(WebContentsImpl* web_contents,
65 WebContentsViewDelegate* delegate); 65 WebContentsViewDelegate* delegate);
66 virtual ~WebContentsViewMac(); 66 virtual ~WebContentsViewMac();
67 67
68 // WebContentsView implementation -------------------------------------------- 68 // WebContentsView implementation --------------------------------------------
69 virtual gfx::NativeView GetNativeView() const OVERRIDE; 69 virtual gfx::NativeView GetNativeView() const override;
70 virtual gfx::NativeView GetContentNativeView() const OVERRIDE; 70 virtual gfx::NativeView GetContentNativeView() const override;
71 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; 71 virtual gfx::NativeWindow GetTopLevelNativeWindow() const override;
72 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE; 72 virtual void GetContainerBounds(gfx::Rect* out) const override;
73 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 73 virtual void SizeContents(const gfx::Size& size) override;
74 virtual void Focus() OVERRIDE; 74 virtual void Focus() override;
75 virtual void SetInitialFocus() OVERRIDE; 75 virtual void SetInitialFocus() override;
76 virtual void StoreFocus() OVERRIDE; 76 virtual void StoreFocus() override;
77 virtual void RestoreFocus() OVERRIDE; 77 virtual void RestoreFocus() override;
78 virtual DropData* GetDropData() const OVERRIDE; 78 virtual DropData* GetDropData() const override;
79 virtual gfx::Rect GetViewBounds() const OVERRIDE; 79 virtual gfx::Rect GetViewBounds() const override;
80 virtual void SetAllowOtherViews(bool allow) OVERRIDE; 80 virtual void SetAllowOtherViews(bool allow) override;
81 virtual bool GetAllowOtherViews() const OVERRIDE; 81 virtual bool GetAllowOtherViews() const override;
82 virtual void CreateView( 82 virtual void CreateView(
83 const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE; 83 const gfx::Size& initial_size, gfx::NativeView context) override;
84 virtual RenderWidgetHostViewBase* CreateViewForWidget( 84 virtual RenderWidgetHostViewBase* CreateViewForWidget(
85 RenderWidgetHost* render_widget_host) OVERRIDE; 85 RenderWidgetHost* render_widget_host) override;
86 virtual RenderWidgetHostViewBase* CreateViewForPopupWidget( 86 virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
87 RenderWidgetHost* render_widget_host) OVERRIDE; 87 RenderWidgetHost* render_widget_host) override;
88 virtual void SetPageTitle(const base::string16& title) OVERRIDE; 88 virtual void SetPageTitle(const base::string16& title) override;
89 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; 89 virtual void RenderViewCreated(RenderViewHost* host) override;
90 virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE; 90 virtual void RenderViewSwappedIn(RenderViewHost* host) override;
91 virtual void SetOverscrollControllerEnabled(bool enabled) OVERRIDE; 91 virtual void SetOverscrollControllerEnabled(bool enabled) override;
92 virtual bool IsEventTracking() const OVERRIDE; 92 virtual bool IsEventTracking() const override;
93 virtual void CloseTabAfterEventTracking() OVERRIDE; 93 virtual void CloseTabAfterEventTracking() override;
94 94
95 // Backend implementation of RenderViewHostDelegateView. 95 // Backend implementation of RenderViewHostDelegateView.
96 virtual void ShowContextMenu(RenderFrameHost* render_frame_host, 96 virtual void ShowContextMenu(RenderFrameHost* render_frame_host,
97 const ContextMenuParams& params) OVERRIDE; 97 const ContextMenuParams& params) override;
98 virtual void ShowPopupMenu(RenderFrameHost* render_frame_host, 98 virtual void ShowPopupMenu(RenderFrameHost* render_frame_host,
99 const gfx::Rect& bounds, 99 const gfx::Rect& bounds,
100 int item_height, 100 int item_height,
101 double item_font_size, 101 double item_font_size,
102 int selected_item, 102 int selected_item,
103 const std::vector<MenuItem>& items, 103 const std::vector<MenuItem>& items,
104 bool right_aligned, 104 bool right_aligned,
105 bool allow_multiple_selection) OVERRIDE; 105 bool allow_multiple_selection) override;
106 virtual void HidePopupMenu() OVERRIDE; 106 virtual void HidePopupMenu() override;
107 virtual void StartDragging(const DropData& drop_data, 107 virtual void StartDragging(const DropData& drop_data,
108 blink::WebDragOperationsMask allowed_operations, 108 blink::WebDragOperationsMask allowed_operations,
109 const gfx::ImageSkia& image, 109 const gfx::ImageSkia& image,
110 const gfx::Vector2d& image_offset, 110 const gfx::Vector2d& image_offset,
111 const DragEventSourceInfo& event_info) OVERRIDE; 111 const DragEventSourceInfo& event_info) override;
112 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; 112 virtual void UpdateDragCursor(blink::WebDragOperation operation) override;
113 virtual void GotFocus() OVERRIDE; 113 virtual void GotFocus() override;
114 virtual void TakeFocus(bool reverse) OVERRIDE; 114 virtual void TakeFocus(bool reverse) override;
115 115
116 // A helper method for closing the tab in the 116 // A helper method for closing the tab in the
117 // CloseTabAfterEventTracking() implementation. 117 // CloseTabAfterEventTracking() implementation.
118 void CloseTab(); 118 void CloseTab();
119 119
120 WebContentsImpl* web_contents() { return web_contents_; } 120 WebContentsImpl* web_contents() { return web_contents_; }
121 WebContentsViewDelegate* delegate() { return delegate_.get(); } 121 WebContentsViewDelegate* delegate() { return delegate_.get(); }
122 122
123 private: 123 private:
124 // The WebContentsImpl whose contents we display. 124 // The WebContentsImpl whose contents we display.
(...skipping 13 matching lines...) Expand all
138 bool allow_other_views_; 138 bool allow_other_views_;
139 139
140 scoped_ptr<PopupMenuHelper> popup_menu_helper_; 140 scoped_ptr<PopupMenuHelper> popup_menu_helper_;
141 141
142 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); 142 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
143 }; 143 };
144 144
145 } // namespace content 145 } // namespace content
146 146
147 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 147 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_guest.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698