Index: chrome/browser/gtk/tab_contents_container_gtk.h |
diff --git a/chrome/browser/gtk/tab_contents_container_gtk.h b/chrome/browser/gtk/tab_contents_container_gtk.h |
index 6e1ad2a47bbc90deb551391a7b41504c2937fb7c..8a7a8c7ca5a7b82d6f39354e4a2da4e5fb5eb1dd 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( |
@@ -78,9 +87,11 @@ class TabContentsContainerGtk : public NotificationObserver, |
// their positions manually set in OnSetFloatingPosition. |
OwnedWidgetGtk floating_; |
- // 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_; |
+ // 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_; |
DISALLOW_COPY_AND_ASSIGN(TabContentsContainerGtk); |
}; |