Convert tabcontentscontainer to use a vbox instead of a fixed. The

comment in the code mentions that a vbox would cause a split screen,
but looking at the code, it seems like that's not possible because
we hide the old TCVG before adding new ones.  These days the vbox
contains all TCVGs and only shows one at a time (I think in the past
we tried to remove them, but we don't have that problem now).

This simplifies the code by not having to use our own size-allocate
handler.

Review URL: http://codereview.chromium.org/354018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30843 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 14 deletions

diff --git a/chrome/browser/gtk/tab_contents_container_gtk.h b/chrome/browser/gtk/tab_contents_container_gtk.h
index 8a7a8c7..6e1ad2a 100644
--- a/chrome/browser/gtk/tab_contents_container_gtk.h
+++ b/chrome/browser/gtk/tab_contents_container_gtk.h
@@ -58,15 +58,6 @@ class TabContentsContainerGtk : public NotificationObserver,
   // get notified.
   void TabContentsDestroyed(TabContents* contents);
 
-  // Implements our hack around a GtkFixed. The entire size of the GtkFixed is
-  // allocated to normal tab contents views, while the status bubble is
-  // informed of its parent and its parent's allocation (it makes a decision
-  // about layout later.)
-  static void OnFixedSizeAllocate(
-      GtkWidget* fixed,
-      GtkAllocation* allocation,
-      TabContentsContainerGtk* container);
-
   // Handler for |floating_|'s "set-floating-position" signal. During this
   // callback, we manually set the position of the status bubble.
   static void OnSetFloatingPosition(
@@ -87,11 +78,9 @@ class TabContentsContainerGtk : public NotificationObserver,
   // their positions manually set in OnSetFloatingPosition.
   OwnedWidgetGtk floating_;
 
-  // We insert and remove TabContents GtkWidgets into this fixed_. 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 TabContents
-  // and bottom half displaying the loading page.
-  GtkWidget* fixed_;
+  // We insert TabContentsViewGtks into this container_.  We only show one
+  // TabVontentsViewGtk at a time, so we can use a vbox or an hbox.
+  GtkWidget* container_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsContainerGtk);
 };