Move a bunch more code into the content namespace.

content/browser/web_contents/web_contents_view_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 13 matching lines @@
 #include "content/public/browser/web_contents_view_delegate.h"
 #include "ui/base/gtk/gtk_expanded_container.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webdropdata.h"
 
 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.
 gboolean OnLeaveNotify(GtkWidget* widget, GdkEventCrossing* event,
                        WebContentsImpl* web_contents) {
   if (web_contents->GetDelegate())
     web_contents->GetDelegate()->ContentsMouseEvent(
         web_contents, gfx::Point(event->x_root, event->y_root), false);
   return FALSE;
 }
 
 // Called when the mouse moves within the widget. We notify our delegate.
 gboolean OnMouseMove(GtkWidget* widget, GdkEventMotion* event,
                      WebContentsImpl* web_contents) {
   if (web_contents->GetDelegate())
     web_contents->GetDelegate()->ContentsMouseEvent(
         web_contents, gfx::Point(event->x_root, event->y_root), true);
   return FALSE;
 }
 
 // See tab_contents_view_views.cc for discussion of mouse scroll zooming.
 gboolean OnMouseScroll(GtkWidget* widget, GdkEventScroll* event,
                        WebContentsImpl* web_contents) {
   if ((event->state & gtk_accelerator_get_default_mod_mask()) !=
       GDK_CONTROL_MASK) {
     return FALSE;
   }
 
-  content::WebContentsDelegate* delegate = web_contents->GetDelegate();
+  WebContentsDelegate* delegate = web_contents->GetDelegate();
   if (!delegate)
     return FALSE;
 
   if (!(event->direction == GDK_SCROLL_DOWN ||
         event->direction == GDK_SCROLL_UP)) {
     return FALSE;
   }
 
   delegate->ContentsZoomChange(event->direction == GDK_SCROLL_UP);
   return TRUE;
 }
 
 }  // namespace
 
-namespace content {
-
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewGtk* rv = new WebContentsViewGtk(web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
 
 WebContentsViewGtk::WebContentsViewGtk(
     WebContentsImpl* web_contents,
-    content::WebContentsViewDelegate* delegate)
+    WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
       expanded_(gtk_expanded_container_new()),
       delegate_(delegate) {
   gtk_widget_set_name(expanded_.get(), "chrome-web-contents-view");
   g_signal_connect(expanded_.get(), "size-allocate",
                    G_CALLBACK(OnSizeAllocateThunk), this);
   g_signal_connect(expanded_.get(), "child-size-request",
                    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_);
 }
 
 WebContentsViewGtk::~WebContentsViewGtk() {
   expanded_.Destroy();
 }
 
 void WebContentsViewGtk::CreateView(const gfx::Size& initial_size) {
@@ skipping 21 matching lines @@
                    G_CALLBACK(OnLeaveNotify), web_contents_);
   g_signal_connect(content_view, "motion-notify-event",
                    G_CALLBACK(OnMouseMove), web_contents_);
   g_signal_connect(content_view, "scroll-event",
                    G_CALLBACK(OnMouseScroll), web_contents_);
   gtk_widget_add_events(content_view, GDK_LEAVE_NOTIFY_MASK |
                         GDK_POINTER_MOTION_MASK);
   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());
 
   return view;
 }
 
 gfx::NativeView WebContentsViewGtk::GetNativeView() const {
   if (delegate_.get())
     return delegate_->GetNativeView();
@@ skipping 49 matching lines @@
 void WebContentsViewGtk::SizeContents(const gfx::Size& size) {
   // We don't need to manually set the size of of widgets in GTK+, but we do
   // need to pass the sizing information on to the RWHV which will pass the
   // sizing information on to the renderer.
   requested_size_ = size;
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
 }
 
-void WebContentsViewGtk::RenderViewCreated(content::RenderViewHost* host) {
+void WebContentsViewGtk::RenderViewCreated(RenderViewHost* host) {
 }
 
 void WebContentsViewGtk::Focus() {
   if (web_contents_->ShowingInterstitialPage()) {
     web_contents_->GetInterstitialPage()->Focus();
   } else if (delegate_.get()) {
     delegate_->Focus();
   }
 }
 
@@ skipping 87 matching lines @@
   if (gtk_widget_is_focus(widget))
     return FALSE;
 
   gtk_widget_grab_focus(widget);
   bool reverse = focus == GTK_DIR_TAB_BACKWARD;
   web_contents_->FocusThroughTabTraversal(reverse);
   return TRUE;
 }
 
 void WebContentsViewGtk::ShowContextMenu(
-    const content::ContextMenuParams& params,
-    content::ContextMenuSourceType type) {
+    const ContextMenuParams& params,
+    ContextMenuSourceType type) {
   if (delegate_.get())
     delegate_->ShowContextMenu(params, type);
   else
     DLOG(ERROR) << "Cannot show context menus without a delegate.";
 }
 
 void WebContentsViewGtk::ShowPopupMenu(const gfx::Rect& bounds,
                                        int item_height,
                                        double item_font_size,
                                        int selected_item,
@@ skipping 45 matching lines @@
   // We manually tell our RWHV to resize the renderer content.  This avoids
   // spurious resizes from GTK+.
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
   if (web_contents_->GetInterstitialPage())
     web_contents_->GetInterstitialPage()->SetSize(size);
 }
 
 }  // namespace content