Change visibility semantics for Instant.

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"
@@ skipping 47 matching lines @@
                      G_CALLBACK(OnSetFloatingPosition), this);
   }
 
   gtk_widget_show(expanded_);
   gtk_widget_show(floating_.get());
 
   ViewIDUtil::SetDelegateForWidget(widget(), this);
 }
 
 void TabContentsContainerGtk::SetTab(TabContents* tab) {
-  HideTab(tab_);
-  if (tab_) {
-    registrar_.Remove(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                      content::Source<TabContents>(tab_));
-  }
+  if (tab_ == tab)
+    return;
+
+  if (tab_)
+    HideTab(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<TabContents>(tab_));
+  if (tab_) {
+    // If the preview is becoming the new permanent tab, we just reassign some
+    // pointers. Otherwise, we have to actually add it to the widget hierarchy.
+    if (tab_ == preview_)
+      preview_ = NULL;
+    else
+      PackTab(tab_);
+
+    // Make sure that the tab is below the find bar. Sometimes the content
+    // native view will be null.
+    GtkWidget* widget = tab_->web_contents()->GetContentNativeView();
+    if (widget) {
+      GdkWindow* content_gdk_window = gtk_widget_get_window(widget);
+      if (content_gdk_window)
+        gdk_window_lower(content_gdk_window);
+    }
   }
 }
 
-TabContents* TabContentsContainerGtk::GetVisibleTab() {
-  return preview_ ? preview_ : tab_;
-}
+void TabContentsContainerGtk::SetPreview(TabContents* preview) {
+  if (preview_ == preview)
+    return;
 
-void TabContentsContainerGtk::SetPreview(TabContents* preview) {
-  if (preview_)
-    RemovePreview();
-  else
-    HideTab(tab_);
+  if (preview_) {
+    HideTab(preview_);
+    GtkWidget* preview_widget = preview_->web_contents()->GetNativeView();
+    if (preview_widget)
+      gtk_container_remove(GTK_CONTAINER(expanded_), preview_widget);
+  }
 
   preview_ = preview;
 
-  PackTab(preview);
-  registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                 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<TabContents>(preview_));
-  preview_ = NULL;
-}
-
-void TabContentsContainerGtk::PopPreview() {
-  if (!preview_)
-    return;
-
-  RemovePreview();
-
-  PackTab(tab_);
+  if (preview_)
+    PackTab(preview_);
 }
 
 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()->WasShown();
+  registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
+                 content::Source<TabContents>(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();
+  registrar_.Remove(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
+                    content::Source<TabContents>(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<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();
+    SetPreview(NULL);
   else if (tab_ && contents == tab_->web_contents())
     SetTab(NULL);
   else
     NOTREACHED();
 }
 
 // Prevent |preview_| from getting focus via the tab key. If |tab_| exists, try
 // to focus that. Otherwise, do nothing, but stop event propagation. See bug
 // http://crbug.com/63365
 gboolean TabContentsContainerGtk::OnFocus(GtkWidget* widget,
@@ skipping 40 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);
 }