Move creation of content TabContentsViews to content so that we can hide these headers through DEPS…

content/browser/tab_contents/tab_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/tab_contents/tab_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "content/browser/tab_contents/interstitial_page_impl.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/web_drag_dest_gtk.h"
 #include "content/browser/tab_contents/web_drag_source_gtk.h"
 #include "content/public/browser/web_contents_delegate.h"
-#include "content/public/browser/web_contents_view_gtk_delegate.h"
+#include "content/public/browser/web_contents_view_delegate.h"
 #include "ui/base/gtk/gtk_expanded_container.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;
@@ skipping 38 matching lines @@
   delegate->ContentsZoomChange(event->direction == GDK_SCROLL_UP);
   return TRUE;
 }
 
 }  // namespace
 
 namespace content {
 
 TabContentsViewGtk::TabContentsViewGtk(
     content::WebContents* web_contents,
-    content::WebContentsViewGtkDelegate* delegate)
+    content::WebContentsViewDelegate* delegate)
     : tab_contents_(static_cast<TabContents*>(web_contents)),
       expanded_(gtk_expanded_container_new()),
       delegate_(delegate) {
   gtk_widget_set_name(expanded_.get(), "chrome-tab-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));
 
   if (delegate_.get())
-    delegate_->WrapView(this);
+    delegate_->Initialize(expanded_.get());
 }
 
 TabContentsViewGtk::~TabContentsViewGtk() {
   expanded_.Destroy();
 }
 
 void TabContentsViewGtk::CreateView(const gfx::Size& initial_size) {
   requested_size_ = initial_size;
 }
 
@@ skipping 21 matching lines @@
   g_signal_connect(content_view, "scroll-event",
                    G_CALLBACK(OnMouseScroll), tab_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(tab_contents_, content_view));
 
   if (delegate_.get())
-    delegate_->OnCreateViewForWidget();
+    drag_dest_->set_delegate(delegate_->GetDragDestDelegate());
 
   return view;
 }
 
 gfx::NativeView TabContentsViewGtk::GetNativeView() const {
   if (delegate_.get())
     return delegate_->GetNativeView();
 
   return expanded_.get();
 }
@@ skipping 128 matching lines @@
 // iterated past the last focusable element on the page).
 void TabContentsViewGtk::TakeFocus(bool reverse) {
   if (!tab_contents_->GetDelegate())
     return;
   if (!tab_contents_->GetDelegate()->TakeFocus(reverse)) {
     gtk_widget_child_focus(GTK_WIDGET(GetTopLevelNativeWindow()),
         reverse ? GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD);
   }
 }
 
-void TabContentsViewGtk::SetDragDestDelegate(
-    content::WebDragDestDelegate* delegate) {
-  drag_dest_->set_delegate(delegate);
-}
-
 void TabContentsViewGtk::InsertIntoContentArea(GtkWidget* widget) {
   gtk_container_add(GTK_CONTAINER(expanded_.get()), widget);
 }
 
 // Called when the content view gtk widget is tabbed to, or after the call to
 // gtk_widget_child_focus() in TakeFocus(). We return true
 // and grab focus if we don't have it. The call to
 // FocusThroughTabTraversal(bool) forwards the "move focus forward" effect to
 // webkit.
 gboolean TabContentsViewGtk::OnFocus(GtkWidget* widget,
@@ skipping 127 matching lines @@
   // We manually tell our RWHV to resize the renderer content.  This avoids
   // spurious resizes from GTK+.
   RenderWidgetHostView* rwhv = tab_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
   if (tab_contents_->GetInterstitialPage())
     tab_contents_->GetInterstitialPage()->SetSize(size);
 }
 
 }  // namespace content