Chromium Code Reviews| Index: content/browser/web_contents/web_contents_view_mac.h |
| =================================================================== |
| --- content/browser/web_contents/web_contents_view_mac.h (revision 164670) |
| +++ content/browser/web_contents/web_contents_view_mac.h (working copy) |
| @@ -47,29 +47,31 @@ |
| - (content::WebContentsImpl*)webContents; |
| @end |
| +namespace content { |
| + |
| // Mac-specific implementation of the WebContentsView. It owns an NSView that |
| // contains all of the contents of the tab and associated child views. |
| class WebContentsViewMac |
| - : public content::WebContentsView, |
| - public content::RenderViewHostDelegateView { |
| + : public WebContentsView, |
|
tfarina
2012/10/29 19:37:19
can be moved above now.
jam
2012/10/29 20:01:51
Done.
|
| + public RenderViewHostDelegateView { |
| public: |
| // The corresponding WebContentsImpl is passed in the constructor, and manages |
| // our lifetime. This doesn't need to be the case, but is this way currently |
| // because that's what was easiest when they were split. |
| - WebContentsViewMac(content::WebContentsImpl* web_contents, |
| - content::WebContentsViewDelegate* delegate); |
| + WebContentsViewMac(WebContentsImpl* web_contents, |
| + WebContentsViewDelegate* delegate); |
| virtual ~WebContentsViewMac(); |
| // WebContentsView implementation -------------------------------------------- |
| virtual void CreateView(const gfx::Size& initial_size) OVERRIDE; |
| - virtual content::RenderWidgetHostView* CreateViewForWidget( |
| - content::RenderWidgetHost* render_widget_host) OVERRIDE; |
| + virtual RenderWidgetHostView* CreateViewForWidget( |
| + RenderWidgetHost* render_widget_host) 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 RenderViewCreated(content::RenderViewHost* host) OVERRIDE; |
| + virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; |
| virtual void SetPageTitle(const string16& title) OVERRIDE; |
| virtual void OnTabCrashed(base::TerminationStatus status, |
| int error_code) OVERRIDE; |
| @@ -85,8 +87,8 @@ |
| // Backend implementation of RenderViewHostDelegateView. |
| virtual void ShowContextMenu( |
| - const content::ContextMenuParams& params, |
| - content::ContextMenuSourceType type) OVERRIDE; |
| + const ContextMenuParams& params, |
|
tfarina
2012/10/29 19:37:19
fits above.
jam
2012/10/29 20:01:51
Done.
|
| + ContextMenuSourceType type) OVERRIDE; |
| virtual void ShowPopupMenu(const gfx::Rect& bounds, |
| int item_height, |
| double item_font_size, |
| @@ -106,12 +108,12 @@ |
| // CloseTabAfterEventTracking() implementation. |
| void CloseTab(); |
| - content::WebContentsImpl* web_contents() { return web_contents_; } |
| - content::WebContentsViewDelegate* delegate() { return delegate_.get(); } |
| + WebContentsImpl* web_contents() { return web_contents_; } |
| + WebContentsViewDelegate* delegate() { return delegate_.get(); } |
| private: |
| // The WebContentsImpl whose contents we display. |
| - content::WebContentsImpl* web_contents_; |
| + WebContentsImpl* web_contents_; |
| // The Cocoa NSView that lives in the view hierarchy. |
| scoped_nsobject<WebContentsViewCocoa> cocoa_view_; |
| @@ -121,9 +123,11 @@ |
| scoped_nsobject<FocusTracker> focus_tracker_; |
| // Our optional delegate. |
| - scoped_ptr<content::WebContentsViewDelegate> delegate_; |
| + scoped_ptr<WebContentsViewDelegate> delegate_; |
| DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); |
| }; |
| +} // namespace content |
| + |
| #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ |