Revert 34954 - Fix issue 11258: Linux: gracefully handle small browser window

TODO: Make location bar to be freely shrinkable. Will be addressed in another CL.

BUG=11258
TEST=See bug report.

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

TBR=suzhe@chromium.org
Review URL: http://codereview.chromium.org/502073

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

1 files changed, 14 insertions, 5 deletions

diff --git a/chrome/browser/gtk/tab_contents_container_gtk.h b/chrome/browser/gtk/tab_contents_container_gtk.h
index 91c2301..8a7a8c7 100644
--- a/chrome/browser/gtk/tab_contents_container_gtk.h
+++ b/chrome/browser/gtk/tab_contents_container_gtk.h
@@ -58,6 +58,15 @@ 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(
@@ -73,16 +82,16 @@ class TabContentsContainerGtk : public NotificationObserver,
   StatusBubbleGtk* status_bubble_;
 
   // Top of the TabContentsContainerGtk widget hierarchy. A cross between a
-  // GtkBin and a GtkFixed, |floating_| has |expanded_| as its one "real" child,
+  // GtkBin and a GtkFixed, |floating_| has |fixed_| as its one "real" child,
   // and the various things that hang off the bottom (status bubble, etc) have
   // their positions manually set in OnSetFloatingPosition.
   OwnedWidgetGtk floating_;
 
-  // We insert and remove TabContents 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 TabContents
+  // 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* expanded_;
+  GtkWidget* fixed_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsContainerGtk);
 };