TabContentsWrapper -> TabContents, part 41.

chrome/browser/ui/gtk/tab_contents_container_gtk.cc

Index: chrome/browser/ui/gtk/tab_contents_container_gtk.cc
diff --git a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
index 5055fbedae7aac1a441ff43acd901ff06efd903d..8e6c1b797b0ec0d0829b87d75a19798f0ca07685 100644
--- a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
+++ b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
@@ -8,7 +8,7 @@
 
 #include "base/i18n/rtl.h"
 #include "chrome/browser/ui/gtk/status_bubble_gtk.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -64,11 +64,11 @@ void TabContentsContainerGtk::Init() {
   ViewIDUtil::SetDelegateForWidget(widget(), this);
 }
 
-void TabContentsContainerGtk::SetTab(TabContentsWrapper* tab) {
+void TabContentsContainerGtk::SetTab(TabContents* tab) {
   HideTab(tab_);
   if (tab_) {
     registrar_.Remove(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                      content::Source<TabContentsWrapper>(tab_));
+                      content::Source<TabContents>(tab_));
   }
 
   tab_ = tab;
@@ -81,15 +81,15 @@ void TabContentsContainerGtk::SetTab(TabContentsWrapper* tab) {
     // Otherwise we actually have to add it to the widget hierarchy.
     PackTab(tab);
     registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                   content::Source<TabContentsWrapper>(tab_));
+                   content::Source<TabContents>(tab_));
   }
 }
 
-TabContentsWrapper* TabContentsContainerGtk::GetVisibleTab() {
+TabContents* TabContentsContainerGtk::GetVisibleTab() {
   return preview_ ? preview_ : tab_;
 }
 
-void TabContentsContainerGtk::SetPreview(TabContentsWrapper* preview) {
+void TabContentsContainerGtk::SetPreview(TabContents* preview) {
   if (preview_)
     RemovePreview();
   else
@@ -99,7 +99,7 @@ void TabContentsContainerGtk::SetPreview(TabContentsWrapper* preview) {
 
   PackTab(preview);
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                 content::Source<TabContentsWrapper>(preview_));
+                 content::Source<TabContents>(preview_));
 }
 
 void TabContentsContainerGtk::RemovePreview() {
@@ -113,7 +113,7 @@ void TabContentsContainerGtk::RemovePreview() {
     gtk_container_remove(GTK_CONTAINER(expanded_), preview_widget);
 
   registrar_.Remove(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                    content::Source<TabContentsWrapper>(preview_));
+                    content::Source<TabContents>(preview_));
   preview_ = NULL;
 }
 
@@ -126,7 +126,7 @@ void TabContentsContainerGtk::PopPreview() {
   PackTab(tab_);
 }
 
-void TabContentsContainerGtk::PackTab(TabContentsWrapper* tab) {
+void TabContentsContainerGtk::PackTab(TabContents* tab) {
   if (!tab)
     return;
 
@@ -149,7 +149,7 @@ void TabContentsContainerGtk::PackTab(TabContentsWrapper* tab) {
   tab->web_contents()->ShowContents();
 }
 
-void TabContentsContainerGtk::HideTab(TabContentsWrapper* tab) {
+void TabContentsContainerGtk::HideTab(TabContents* tab) {
   if (!tab)
     return;
 
@@ -160,7 +160,7 @@ void TabContentsContainerGtk::HideTab(TabContentsWrapper* tab) {
   tab->web_contents()->WasHidden();
 }
 
-void TabContentsContainerGtk::DetachTab(TabContentsWrapper* tab) {
+void TabContentsContainerGtk::DetachTab(TabContents* tab) {
   gfx::NativeView widget = tab->web_contents()->GetNativeView();
 
   // It is possible to detach an unrealized, unparented WebContents if you
@@ -180,7 +180,7 @@ void TabContentsContainerGtk::Observe(
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED, type);
   WebContentsDestroyed(
-      content::Source<TabContentsWrapper>(source)->web_contents());
+      content::Source<TabContents>(source)->web_contents());
 }
 
 void TabContentsContainerGtk::WebContentsDestroyed(WebContents* contents) {