TabContentsWrapper -> TabContents, part 41.

chrome/browser/ui/gtk/tab_contents_container_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 "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
 
 #include <algorithm>
 
 #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"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/gtk/gtk_expanded_container.h"
 #include "ui/base/gtk/gtk_floating_container.h"
 #include "ui/gfx/native_widget_types.h"
 
 using content::WebContents;
 
@@ skipping 35 matching lines @@
     g_signal_connect(floating_.get(), "set-floating-position",
                      G_CALLBACK(OnSetFloatingPosition), this);
   }
 
   gtk_widget_show(expanded_);
   gtk_widget_show(floating_.get());
 
   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;
 
   if (tab_ == preview_) {
     // If the preview contents is becoming the new permanent tab contents, we
     // just reassign some pointers.
     preview_ = NULL;
   } else if (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
     HideTab(tab_);
 
   preview_ = preview;
 
   PackTab(preview);
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                 content::Source<TabContentsWrapper>(preview_));
+                 content::Source<TabContents>(preview_));
 }
 
 void TabContentsContainerGtk::RemovePreview() {
   if (!preview_)
     return;
 
   HideTab(preview_);
 
   GtkWidget* preview_widget = preview_->web_contents()->GetNativeView();
   if (preview_widget)
     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;
 }
 
 void TabContentsContainerGtk::PopPreview() {
   if (!preview_)
     return;
 
   RemovePreview();
 
   PackTab(tab_);
 }
 
-void TabContentsContainerGtk::PackTab(TabContentsWrapper* tab) {
+void TabContentsContainerGtk::PackTab(TabContents* tab) {
   if (!tab)
     return;
 
   gfx::NativeView widget = tab->web_contents()->GetNativeView();
   if (widget) {
     if (gtk_widget_get_parent(widget) != expanded_)
       gtk_container_add(GTK_CONTAINER(expanded_), widget);
     gtk_widget_show(widget);
   }
 
   // We need to make sure that we are below the findbar.
   // Sometimes the content native view will be null.
   if (tab->web_contents()->GetContentNativeView()) {
     GdkWindow* content_gdk_window = gtk_widget_get_window(
         tab->web_contents()->GetContentNativeView());
     if (content_gdk_window)
       gdk_window_lower(content_gdk_window);
   }
 
   tab->web_contents()->ShowContents();
 }
 
-void TabContentsContainerGtk::HideTab(TabContentsWrapper* tab) {
+void TabContentsContainerGtk::HideTab(TabContents* tab) {
   if (!tab)
     return;
 
   gfx::NativeView widget = tab->web_contents()->GetNativeView();
   if (widget)
     gtk_widget_hide(widget);
 
   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
   // slow things down enough in valgrind. Might happen in the real world, too.
   if (widget) {
     GtkWidget* parent = gtk_widget_get_parent(widget);
     if (parent) {
       DCHECK_EQ(parent, expanded_);
       gtk_container_remove(GTK_CONTAINER(expanded_), widget);
     }
   }
 }
 
 void TabContentsContainerGtk::Observe(
     int type,
     const content::NotificationSource& source,
     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) {
   // Sometimes, a WebContents is destroyed before we know about it. This allows
   // us to clean up our state in case this happens.
   if (preview_ && contents == preview_->web_contents())
     PopPreview();
   else if (tab_ && contents == tab_->web_contents())
     SetTab(NULL);
   else
@@ skipping 47 matching lines @@
     g_value_set_int(&value, allocation->width - requisition.width);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    status->widget(), "x", &value);
 
   int child_y = std::max(allocation->height - requisition.height, 0);
   g_value_set_int(&value, child_y + status->y_offset());
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    status->widget(), "y", &value);
   g_value_unset(&value);
 }