TabContents -> WebContentsImpl, part 5.

content/browser/web_contents/web_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_
+#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_
+#define CONTENT_BROWSER_WEB_CONTENTS_WEB_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/browser/web_contents/web_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 WebContentsViewDelegate;
 class WebDragDestDelegate;
 class WebDragDestGtk;
 class WebDragSourceGtk;
 
-class CONTENT_EXPORT TabContentsViewGtk : public WebContentsView {
+class CONTENT_EXPORT WebContentsViewGtk : 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.
-  TabContentsViewGtk(WebContentsImpl* web_contents,
+  WebContentsViewGtk(WebContentsImpl* web_contents,
                      WebContentsViewDelegate* delegate);
-  virtual ~TabContentsViewGtk();
+  virtual ~WebContentsViewGtk();
 
   WebContentsViewDelegate* delegate() const { return delegate_.get(); }
   WebContents* web_contents();
 
   // WebContentsView implementation --------------------------------------------
 
   virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
   virtual content::RenderWidgetHostView* CreateViewForWidget(
       content::RenderWidgetHost* render_widget_host) OVERRIDE;
 
@@ skipping 48 matching lines @@
 
  private:
   // Insert the given widget into the content area. Should only be used for
   // web pages and the like (including interstitials and sad tab). Note that
   // this will be perfectly happy to insert overlapping render views, so care
   // should be taken that the correct one is hidden/shown.
   void InsertIntoContentArea(GtkWidget* widget);
 
   // Handle focus traversal on the render widget native view. Can be overridden
   // by subclasses.
-  CHROMEGTK_CALLBACK_1(TabContentsViewGtk, gboolean, OnFocus, GtkDirectionType);
+  CHROMEGTK_CALLBACK_1(WebContentsViewGtk, gboolean, OnFocus, GtkDirectionType);
 
   // Used to adjust the size of its children when the size of |expanded_| is
   // changed.
-  CHROMEGTK_CALLBACK_2(TabContentsViewGtk, void, OnChildSizeRequest,
+  CHROMEGTK_CALLBACK_2(WebContentsViewGtk, void, OnChildSizeRequest,
                        GtkWidget*, GtkRequisition*);
 
   // Used to propagate the size change of |expanded_| to our RWHV to resize the
   // renderer content.
-  CHROMEGTK_CALLBACK_1(TabContentsViewGtk, void, OnSizeAllocate,
+  CHROMEGTK_CALLBACK_1(WebContentsViewGtk, void, OnSizeAllocate,
                        GtkAllocation*);
 
   // The WebContentsImpl whose contents we display.
   WebContentsImpl* tab_contents_;
 
   // Common implementations of some WebContentsView methods.
-  TabContentsViewHelper tab_contents_view_helper_;
+  WebContentsViewHelper web_contents_view_helper_;
 
   // This container holds the tab's web page views. It is a GtkExpandedContainer
   // so that we can control the size of the web pages.
   ui::OwnedWidgetGtk expanded_;
 
   ui::FocusStoreGtk focus_store_;
 
   // 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<WebContentsViewDelegate> 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_;
 
-  DISALLOW_COPY_AND_ASSIGN(TabContentsViewGtk);
+  DISALLOW_COPY_AND_ASSIGN(WebContentsViewGtk);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
+#endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_