Move TabContentsViewGtk's delegate to content\public\browser. Also name it a delegate instead of a …

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.h"
 #include "content/browser/renderer_host/render_view_host_factory.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/tab_contents_view_wrapper_gtk.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 "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::WebContents;
 
@@ skipping 37 matching lines @@
   delegate->ContentsZoomChange(event->direction == GDK_SCROLL_UP);
   return TRUE;
 }
 
 }  // namespace
 
 namespace content {
 
 TabContentsViewGtk::TabContentsViewGtk(
     content::WebContents* web_contents,
-    content::TabContentsViewWrapperGtk* view_wrapper)
+    content::WebContentsViewGtkDelegate* delegate)
     : tab_contents_(static_cast<TabContents*>(web_contents)),
       expanded_(gtk_expanded_container_new()),
-      view_wrapper_(view_wrapper),
+      delegate_(delegate),
       overlaid_view_(NULL) {
   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 (view_wrapper_.get())
-    view_wrapper_->WrapView(this);
+  if (delegate_.get())
+    delegate_->WrapView(this);
 }
 
 TabContentsViewGtk::~TabContentsViewGtk() {
   expanded_.Destroy();
 }
 
 void TabContentsViewGtk::CreateView(const gfx::Size& initial_size) {
   requested_size_ = initial_size;
 }
 
@@ skipping 20 matching lines @@
                    G_CALLBACK(OnMouseMove), tab_contents_);
   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 (view_wrapper_.get())
-    view_wrapper_->OnCreateViewForWidget();
+  if (delegate_.get())
+    delegate_->OnCreateViewForWidget();
 
   return view;
 }
 
 gfx::NativeView TabContentsViewGtk::GetNativeView() const {
-  if (view_wrapper_.get())
-    return view_wrapper_->GetNativeView();
+  if (delegate_.get())
+    return delegate_->GetNativeView();
 
   return expanded_.get();
 }
 
 gfx::NativeView TabContentsViewGtk::GetContentNativeView() const {
   RenderWidgetHostView* rwhv = tab_contents_->GetRenderWidgetHostView();
   if (!rwhv)
     return NULL;
   return rwhv->GetNativeView();
 }
@@ skipping 45 matching lines @@
   if (rwhv)
     rwhv->SetSize(size);
 }
 
 void TabContentsViewGtk::RenderViewCreated(RenderViewHost* host) {
 }
 
 void TabContentsViewGtk::Focus() {
   if (tab_contents_->ShowingInterstitialPage()) {
     tab_contents_->GetInterstitialPage()->Focus();
-  } else if (wrapper()) {
-    wrapper()->Focus();
+  } else if (delegate_.get()) {
+    delegate_->Focus();
   }
 }
 
 void TabContentsViewGtk::SetInitialFocus() {
   if (tab_contents_->FocusLocationBarByDefault())
     tab_contents_->SetFocusToLocationBar(false);
   else
     Focus();
 }
 
@@ skipping 84 matching lines @@
 }
 
 // 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,
                                      GtkDirectionType focus) {
   // Give our view wrapper first chance at this event.
-  if (view_wrapper_.get()) {
+  if (delegate_.get()) {
     gboolean return_value = FALSE;
-    if (view_wrapper_->OnNativeViewFocusEvent(widget, focus, &return_value))
+    if (delegate_->OnNativeViewFocusEvent(widget, focus, &return_value))
       return return_value;
   }
 
   // If we already have focus, let the next widget have a shot at it. We will
   // reach this situation after the call to gtk_widget_child_focus() in
   // TakeFocus().
   if (gtk_widget_is_focus(widget))
     return FALSE;
 
   gtk_widget_grab_focus(widget);
@@ skipping 47 matching lines @@
 }
 
 void TabContentsViewGtk::ShowContextMenu(
     const content::ContextMenuParams& params) {
   // Allow delegates to handle the context menu operation first.
   if (web_contents()->GetDelegate() &&
       web_contents()->GetDelegate()->HandleContextMenu(params)) {
     return;
   }
 
-  if (wrapper())
-    wrapper()->ShowContextMenu(params);
+  if (delegate_.get())
+    delegate_->ShowContextMenu(params);
   else
     DLOG(ERROR) << "Cannot show context menus without a delegate.";
 }
 
 void TabContentsViewGtk::ShowPopupMenu(const gfx::Rect& bounds,
                                        int item_height,
                                        double item_font_size,
                                        int selected_item,
                                        const std::vector<WebMenuItem>& items,
                                        bool right_aligned) {
@@ skipping 43 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