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

Unified Diff: content/browser/web_contents/web_contents_view_mac.mm

Issue 11275062: Move content\browser\web_contents to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_view_mac.mm
===================================================================
--- content/browser/web_contents/web_contents_view_mac.mm (revision 164713)
+++ content/browser/web_contents/web_contents_view_mac.mm (working copy)
@@ -36,6 +36,7 @@
using content::RenderWidgetHostViewMac;
using content::WebContents;
using content::WebContentsImpl;
+using content::WebContentsViewMac;
// Ensure that the WebKit::WebDragOperation enum values stay in sync with
// NSDragOperation constants, since the code below static_casts between 'em.
@@ -74,11 +75,9 @@
*render_view_host_delegate_view = rv;
return rv;
}
-}
-WebContentsViewMac::WebContentsViewMac(
- WebContentsImpl* web_contents,
- content::WebContentsViewDelegate* delegate)
+WebContentsViewMac::WebContentsViewMac(WebContentsImpl* web_contents,
+ WebContentsViewDelegate* delegate)
: web_contents_(web_contents),
delegate_(delegate) {
}
@@ -99,7 +98,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
@@ -194,7 +193,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,9 +279,8 @@
}
}
-void WebContentsViewMac::ShowContextMenu(
- const content::ContextMenuParams& params,
- content::ContextMenuSourceType type) {
+void WebContentsViewMac::ShowContextMenu(const ContextMenuParams& params,
+ ContextMenuSourceType type) {
// Allow delegates to handle the context menu operation first.
if (web_contents_->GetDelegate() &&
web_contents_->GetDelegate()->HandleContextMenu(params)) {
@@ -335,6 +333,8 @@
web_contents_->Close(web_contents_->GetRenderViewHost());
}
+} // namespace content
+
@implementation WebContentsViewCocoa
- (id)initWithWebContentsViewMac:(WebContentsViewMac*)w {
« no previous file with comments | « content/browser/web_contents/web_contents_view_mac.h ('k') | content/browser/web_contents/web_contents_view_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698