TabContentsWrapper -> TabContents, part 41.

chrome/browser/ui/gtk/constrained_window_gtk.h

Index: chrome/browser/ui/gtk/constrained_window_gtk.h
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h
index 410dba3a7467ba7dedd7322ffd7d5a8fe03d06ea..0e0e1c37a8fd13920ff5cc0af17c7bbf96212ae3 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.h
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.h
@@ -16,7 +16,6 @@
 #include "ui/base/gtk/owned_widget_gtk.h"
 
 class TabContents;
-typedef TabContents TabContentsWrapper;
 typedef struct _GdkColor GdkColor;
 class ChromeWebContentsViewDelegateGtk;
 
@@ -48,7 +47,7 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
  public:
   typedef ChromeWebContentsViewDelegateGtk TabContentsViewType;
 
-  ConstrainedWindowGtk(TabContentsWrapper* wrapper,
+  ConstrainedWindowGtk(TabContents* tab_contents,
                        ConstrainedWindowGtkDelegate* delegate);
   virtual ~ConstrainedWindowGtk();
 
@@ -57,8 +56,8 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
   virtual void CloseConstrainedWindow() OVERRIDE;
   virtual void FocusConstrainedWindow() OVERRIDE;
 
-  // Returns the TabContentsWrapper that constrains this Constrained Window.
-  TabContentsWrapper* owner() const { return wrapper_; }
+  // Returns the TabContents that constrains this Constrained Window.
+  TabContents* owner() const { return tab_contents_; }
 
   // Returns the toplevel widget that displays this "window".
   GtkWidget* widget() { return border_.get(); }
@@ -75,8 +74,8 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
   CHROMEGTK_CALLBACK_1(ConstrainedWindowGtk, void, OnHierarchyChanged,
                        GtkWidget*);
 
-  // The TabContentsWrapper that owns and constrains this ConstrainedWindow.
-  TabContentsWrapper* wrapper_;
+  // The TabContents that owns and constrains this ConstrainedWindow.
+  TabContents* tab_contents_;
 
   // The top level widget container that exports to our WebContentsView.
   ui::OwnedWidgetGtk border_;