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

chrome/browser/gtk/tab_contents_container_gtk.cc

 // Copyright (c) 2009 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/gtk/tab_contents_container_gtk.h"
 
 #include "app/gfx/native_widget_types.h"
 #include "app/l10n_util.h"
-#include "chrome/browser/gtk/gtk_expanded_container.h"
 #include "chrome/browser/gtk/gtk_floating_container.h"
 #include "chrome/browser/gtk/status_bubble_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/common/notification_service.h"
 
+namespace {
+
+// Allocates all normal tab contents views to the size of the passed in
+// |allocation|.
+void ResizeChildren(GtkWidget* widget, void* param) {
+  GtkAllocation* allocation = reinterpret_cast<GtkAllocation*>(param);
+  if (!GTK_WIDGET_VISIBLE(widget))
+    return;
+
+  if (widget->allocation.width != allocation->width ||
+      widget->allocation.height != allocation->height) {
+    gtk_widget_set_size_request(widget, allocation->width,
+                                allocation->height);
+  }
+}
+
+}  // namespace
+
 TabContentsContainerGtk::TabContentsContainerGtk(StatusBubbleGtk* status_bubble)
     : tab_contents_(NULL),
       status_bubble_(status_bubble) {
   Init();
 }
 
 TabContentsContainerGtk::~TabContentsContainerGtk() {
   floating_.Destroy();
 }
 
 void TabContentsContainerGtk::Init() {
   // A high level overview of the TabContentsContainer:
   //
   // +- GtkFloatingContainer |floating_| -------------------------------+
-  // |+- GtkExpandedContainer |expanded_| -----------------------------+|
+  // |+- GtkFixedContainer |fixed_| -----------------------------------+|
   // ||                                                                ||
   // ||                                                                ||
   // ||                                                                ||
   // ||                                                                ||
   // |+- (StatusBubble) ------+                                        ||
   // |+                       +                                        ||
   // |+-----------------------+----------------------------------------+|
   // +------------------------------------------------------------------+
 
   floating_.Own(gtk_floating_container_new());
   gtk_widget_set_name(floating_.get(), "chrome-tab-contents-container");
 
-  expanded_ = gtk_expanded_container_new();
-  gtk_container_add(GTK_CONTAINER(floating_.get()), expanded_);
+  fixed_ = gtk_fixed_new();
+  g_signal_connect(fixed_, "size-allocate",
+                   G_CALLBACK(OnFixedSizeAllocate), this);
+  gtk_container_add(GTK_CONTAINER(floating_.get()), fixed_);
 
   if (status_bubble_) {
     gtk_floating_container_add_floating(GTK_FLOATING_CONTAINER(floating_.get()),
                                         status_bubble_->widget());
     g_signal_connect(floating_.get(), "set-floating-position",
                      G_CALLBACK(OnSetFloatingPosition), this);
   }
 
-  gtk_widget_show(expanded_);
+  gtk_widget_show(fixed_);
   gtk_widget_show(floating_.get());
 
   ViewIDUtil::SetDelegateForWidget(widget(), this);
 }
 
 void TabContentsContainerGtk::SetTabContents(TabContents* tab_contents) {
   if (tab_contents_) {
     gfx::NativeView widget = tab_contents_->GetNativeView();
     if (widget)
       gtk_widget_hide(widget);
@@ skipping 15 matching lines @@
     // is shown. I'm not entirely sure that we need to observe this event under
     // GTK, but am putting a stub implementation and a comment saying that if
     // we crash after that NOTIMPLEMENTED(), we'll need it.
     registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_CHANGED,
                    Source<NavigationController>(&tab_contents_->controller()));
     registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
                    Source<TabContents>(tab_contents_));
 
     gfx::NativeView widget = tab_contents_->GetNativeView();
     if (widget) {
-      if (widget->parent != expanded_)
-        gtk_container_add(GTK_CONTAINER(expanded_), widget);
+      if (widget->parent != fixed_)
+        gtk_fixed_put(GTK_FIXED(fixed_), widget, 0, 0);
       gtk_widget_show(widget);
     }
 
     // We need to make sure that we are below the findbar.
     // Sometimes the content native view will be null.
     // TODO(estade): will this case ever cause findbar occlusion problems?
     if (tab_contents_->GetContentNativeView()) {
       GdkWindow* content_gdk_window =
           tab_contents_->GetContentNativeView()->window;
       if (content_gdk_window)
         gdk_window_lower(content_gdk_window);
     }
   }
 }
 
 void TabContentsContainerGtk::DetachTabContents(TabContents* tab_contents) {
   gfx::NativeView widget = tab_contents->GetNativeView();
   // It is possible to detach an unrealized, unparented TabContents if you
   // slow things down enough in valgrind. Might happen in the real world, too.
   if (widget && widget->parent) {
-    DCHECK_EQ(widget->parent, expanded_);
-    gtk_container_remove(GTK_CONTAINER(expanded_), widget);
+    DCHECK_EQ(widget->parent, fixed_);
+    gtk_container_remove(GTK_CONTAINER(fixed_), widget);
   }
 }
 
 void TabContentsContainerGtk::Observe(NotificationType type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
   if (type == NotificationType::RENDER_VIEW_HOST_CHANGED) {
     RenderViewHostSwitchedDetails* switched_details =
         Details<RenderViewHostSwitchedDetails>(details).ptr();
     RenderViewHostChanged(switched_details->old_host,
@@ skipping 27 matching lines @@
       view_id == VIEW_ID_TAB_CONTAINER_FOCUS_VIEW) {
     return widget();
   }
 
   return NULL;
 }
 
 // -----------------------------------------------------------------------------
 
 // static
+void TabContentsContainerGtk::OnFixedSizeAllocate(
+    GtkWidget* fixed,
+    GtkAllocation* allocation,
+    TabContentsContainerGtk* container) {
+  // Set all the tab contents GtkWidgets to the size of the allocation.
+  gtk_container_foreach(GTK_CONTAINER(fixed), ResizeChildren, allocation);
+}
+
+// static
 void TabContentsContainerGtk::OnSetFloatingPosition(
     GtkFloatingContainer* floating_container, GtkAllocation* allocation,
     TabContentsContainerGtk* tab_contents_container) {
   StatusBubbleGtk* status = tab_contents_container->status_bubble_;
 
   // Look at the size request of the status bubble and tell the
   // GtkFloatingContainer where we want it positioned.
   GtkRequisition requisition;
   gtk_widget_size_request(status->widget(), &requisition);
 
   bool ltr = (l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT);
 
   GValue value = { 0, };
   g_value_init(&value, G_TYPE_INT);
   if (ltr ^ status->flip_horizontally())  // Is it on the left?
     g_value_set_int(&value, 0);
   else
     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->y + 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);
 }