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

content/browser/tab_contents/tab_contents_view_gtk.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/tab_contents/tab_contents_view_helper.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/base/gtk/focus_store_gtk.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 
 namespace content {
 
-class TabContentsViewWrapperGtk;
+class WebContentsViewGtkDelegate;
 class WebDragDestDelegate;
 class WebDragDestGtk;
 class WebDragSourceGtk;
 
 class CONTENT_EXPORT TabContentsViewGtk : public WebContentsView {
  public:
   // The corresponding TabContents is passed in the constructor, and manages
   // our lifetime. This doesn't need to be the case, but is this way currently
   // because that's what was easiest when they were split. We optionally take
   // |wrapper| which creates an intermediary widget layer for features from the
   // Embedding layer that lives with the WebContentsView.
   // TODO(jam): make this take a WebContents once it's created from content.
-  explicit TabContentsViewGtk(content::WebContents* web_contents,
-                              TabContentsViewWrapperGtk* wrapper);
+  TabContentsViewGtk(content::WebContents* web_contents,
+                     WebContentsViewGtkDelegate* delegate);
   virtual ~TabContentsViewGtk();
 
   // Override the stored focus widget. This call only makes sense when the
   // tab contents is not focused.
   void SetFocusedWidget(GtkWidget* widget);
 
-  TabContentsViewWrapperGtk* wrapper() const { return view_wrapper_.get(); }
+  WebContentsViewGtkDelegate* delegate() const { return delegate_.get(); }
   TabContents* tab_contents() { return tab_contents_; }
   GtkWidget* expanded_container() { return expanded_.get(); }
   WebContents* web_contents();
 
   // Allows our embeder to intercept incoming drag messages.
   void SetDragDestDelegate(WebDragDestDelegate* delegate);
 
   // WebContentsView implementation --------------------------------------------
 
   virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
@@ skipping 87 matching lines @@
   // The helper object that handles drag destination related interactions with
   // GTK.
   scoped_ptr<WebDragDestGtk> drag_dest_;
 
   // Object responsible for handling drags from the page for us.
   scoped_ptr<WebDragSourceGtk> drag_source_;
 
   // Our optional views wrapper. If non-NULL, we return this widget as our
   // GetNativeView() and insert |expanded_| as its child in the GtkWidget
   // hierarchy.
-  scoped_ptr<TabContentsViewWrapperGtk> view_wrapper_;
+  scoped_ptr<WebContentsViewGtkDelegate> delegate_;
 
   // The size we want the tab contents view to be.  We keep this in a separate
   // variable because resizing in GTK+ is async.
   gfx::Size requested_size_;
 
   // The overlaid view. Owned by the caller of |InstallOverlayView|; this is a
   // weak reference.
   GtkWidget* overlaid_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewGtk);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_