Chromium Code Reviews| Index: content/browser/web_contents/web_contents_view_mac.mm |
| =================================================================== |
| --- content/browser/web_contents/web_contents_view_mac.mm (revision 164670) |
| +++ content/browser/web_contents/web_contents_view_mac.mm (working copy) |
| @@ -73,11 +73,10 @@ |
| *render_view_host_delegate_view = rv; |
| return rv; |
| } |
| -} |
| WebContentsViewMac::WebContentsViewMac( |
| WebContentsImpl* web_contents, |
|
tfarina
2012/10/29 19:37:19
will fit above now.
jam
2012/10/29 20:01:51
Done.
|
| - content::WebContentsViewDelegate* delegate) |
| + WebContentsViewDelegate* delegate) |
| : web_contents_(web_contents), |
| delegate_(delegate) { |
| } |
| @@ -98,7 +97,7 @@ |
| } |
| RenderWidgetHostView* WebContentsViewMac::CreateViewForWidget( |
| - content::RenderWidgetHost* render_widget_host) { |
| + RenderWidgetHost* render_widget_host) { |
| if (render_widget_host->GetView()) { |
| // During testing, the view will already be set up in most cases to the |
| // test view, so we don't want to clobber it with a real one. To verify that |
| @@ -193,7 +192,7 @@ |
| offset:offset]; |
| } |
| -void WebContentsViewMac::RenderViewCreated(content::RenderViewHost* host) { |
| +void WebContentsViewMac::RenderViewCreated(RenderViewHost* host) { |
| // We want updates whenever the intrinsic width of the webpage changes. |
| // Put the RenderView into that mode. The preferred width is used for example |
| // when the "zoom" button in the browser window is clicked. |
| @@ -280,8 +279,8 @@ |
| } |
| void WebContentsViewMac::ShowContextMenu( |
| - const content::ContextMenuParams& params, |
| - content::ContextMenuSourceType type) { |
| + const ContextMenuParams& params, |
|
tfarina
2012/10/29 19:37:19
can be moved above now.
jam
2012/10/29 20:01:51
Done.
|
| + ContextMenuSourceType type) { |
| // Allow delegates to handle the context menu operation first. |
| if (web_contents_->GetDelegate() && |
| web_contents_->GetDelegate()->HandleContextMenu(params)) { |
| @@ -334,6 +333,8 @@ |
| web_contents_->Close(web_contents_->GetRenderViewHost()); |
| } |
| +} // namespace content |
| + |
| @implementation WebContentsViewCocoa |
| - (id)initWithWebContentsViewMac:(WebContentsViewMac*)w { |