Change visibility semantics for Instant.

chrome/browser/ui/gtk/tab_contents_container_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 CHROME_BROWSER_UI_GTK_TAB_CONTENTS_CONTAINER_GTK_H_
 #define CHROME_BROWSER_UI_GTK_TAB_CONTENTS_CONTAINER_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
@@ skipping 18 matching lines @@
  public:
   explicit TabContentsContainerGtk(StatusBubbleGtk* status_bubble);
   virtual ~TabContentsContainerGtk();
 
   void Init();
 
   // Make the specified tab visible.
   void SetTab(TabContents* tab);
   TabContents* tab() const { return tab_; }
 
-  // Returns the TabContents currently displayed.
-  TabContents* GetVisibleTab();
-
+  void SetPreview(TabContents* preview);
   bool HasPreview() const { return preview_ != NULL; }
 
-  void SetPreview(TabContents* preview);
-  void PopPreview();
+  // Returns the TabContents currently displayed.
+  TabContents* GetVisibleTab() const { return preview_ ? preview_ : tab_; }
 
   // Remove the tab from the hierarchy.
   void DetachTab(TabContents* tab);
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   GtkWidget* widget() { return floating_.get(); }
@@ skipping 12 matching lines @@
   static void OnSetFloatingPosition(
       GtkFloatingContainer* container, GtkAllocation* allocation,
       TabContentsContainerGtk* tab_contents_container);
 
   // Adds |tab| to the container and starts showing it.
   void PackTab(TabContents* tab);
 
   // Stops showing |tab|.
   void HideTab(TabContents* tab);
 
-  // Removes |preview_|.
-  void RemovePreview();
-
   // Handle focus traversal on the tab contents container. Focus should not
   // traverse to the preview contents.
   CHROMEGTK_CALLBACK_1(TabContentsContainerGtk, gboolean, OnFocus,
                        GtkDirectionType);
 
   content::NotificationRegistrar registrar_;
 
   // The TabContents for the currently selected tab. This will be showing
   // unless there is a preview contents.
   TabContents* tab_;
@@ skipping 14 matching lines @@
   // We insert and remove WebContents GtkWidgets into this expanded_. This
   // should not be a GtkVBox since there were errors with timing where the vbox
   // was horizontally split with the top half displaying the current WebContents
   // and bottom half displaying the loading page.
   GtkWidget* expanded_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsContainerGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_TAB_CONTENTS_CONTAINER_GTK_H_