Index: content/browser/web_contents/web_contents_view_gtk.cc |
=================================================================== |
--- content/browser/web_contents/web_contents_view_gtk.cc (revision 163514) |
+++ content/browser/web_contents/web_contents_view_gtk.cc (working copy) |
@@ -31,9 +31,8 @@ |
using WebKit::WebDragOperation; |
using WebKit::WebDragOperationsMask; |
-using content::RenderWidgetHost; |
-using content::WebContents; |
+namespace content { |
namespace { |
// Called when the mouse leaves the widget. We notify our delegate. |
@@ -62,7 +61,7 @@ |
return FALSE; |
} |
- content::WebContentsDelegate* delegate = web_contents->GetDelegate(); |
+ WebContentsDelegate* delegate = web_contents->GetDelegate(); |
if (!delegate) |
return FALSE; |
@@ -77,8 +76,6 @@ |
} // namespace |
-namespace content { |
- |
WebContentsView* CreateWebContentsView( |
WebContentsImpl* web_contents, |
WebContentsViewDelegate* delegate, |
@@ -90,7 +87,7 @@ |
WebContentsViewGtk::WebContentsViewGtk( |
WebContentsImpl* web_contents, |
- content::WebContentsViewDelegate* delegate) |
+ WebContentsViewDelegate* delegate) |
: web_contents_(web_contents), |
expanded_(gtk_expanded_container_new()), |
delegate_(delegate) { |
@@ -101,7 +98,7 @@ |
G_CALLBACK(OnChildSizeRequestThunk), this); |
gtk_widget_show(expanded_.get()); |
- drag_source_.reset(new content::WebDragSourceGtk(web_contents)); |
+ drag_source_.reset(new WebDragSourceGtk(web_contents)); |
if (delegate_.get()) |
delegate_->Initialize(expanded_.get(), &focus_store_); |
@@ -143,7 +140,7 @@ |
InsertIntoContentArea(content_view); |
// Renderer target DnD. |
- drag_dest_.reset(new content::WebDragDestGtk(web_contents_, content_view)); |
+ drag_dest_.reset(new WebDragDestGtk(web_contents_, content_view)); |
if (delegate_.get()) |
drag_dest_->set_delegate(delegate_->GetDragDestDelegate()); |
@@ -213,7 +210,7 @@ |
rwhv->SetSize(size); |
} |
-void WebContentsViewGtk::RenderViewCreated(content::RenderViewHost* host) { |
+void WebContentsViewGtk::RenderViewCreated(RenderViewHost* host) { |
} |
void WebContentsViewGtk::Focus() { |
@@ -321,8 +318,8 @@ |
} |
void WebContentsViewGtk::ShowContextMenu( |
- const content::ContextMenuParams& params, |
- content::ContextMenuSourceType type) { |
+ const ContextMenuParams& params, |
+ ContextMenuSourceType type) { |
if (delegate_.get()) |
delegate_->ShowContextMenu(params, type); |
else |