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

chrome/browser/tab_contents/tab_contents_view_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <vector>
@@ skipping 71 matching lines @@
   // this will be perfectly happy to insert overlapping render views, so care
   // should be taken that the correct one is hidden/shown.
   void InsertIntoContentArea(GtkWidget* widget);
 
   void CancelDragIfAny();
 
   // We keep track of the timestamp of the latest mousedown event.
   static gboolean OnMouseDown(GtkWidget* widget,
                               GdkEventButton* event, TabContentsViewGtk* view);
 
-  // Used to adjust the size of its children when the size of |expanded_| is
-  // changed.
-  static void OnChildSizeRequest(GtkWidget* widget,
-                                 GtkWidget* child,
-                                 GtkRequisition* requisition,
+  // Used to propagate size changes on |fixed_| to its children.
+  static gboolean OnSizeAllocate(GtkWidget* widget,
+                                 GtkAllocation* config,
                                  TabContentsViewGtk* view);
 
-  // Used to propagate the size change of |expanded_| to our RWHV to resize the
-  // renderer content.
-  static void OnSizeAllocate(GtkWidget* widget,
-                             GtkAllocation* allocation,
-                             TabContentsViewGtk* view);
-
   static void OnSetFloatingPosition(
       GtkFloatingContainer* floating_container, GtkAllocation* allocation,
       TabContentsViewGtk* tab_contents_view);
 
-  // Contains |expanded_| as its GtkBin member and a possible floating widget
-  // from |popup_view_|.
+  // Contains |fixed_| as its GtkBin member and a possible floating widget from
+  // |popup_view_|.
   OwnedWidgetGtk floating_;
 
-  // This container holds the tab's web page views. It is a GtkExpandedContainer
-  // so that we can control the size of the web pages.
-  GtkWidget* expanded_;
+  // This container holds the tab's web page views. It is a GtkFixed so that we
+  // can control the size of the web pages.
+  GtkWidget* fixed_;
 
   // The context menu is reset every time we show it, but we keep a pointer to
   // between uses so that it won't go out of scope before we're done with it.
   scoped_ptr<RenderViewContextMenuGtk> context_menu_;
 
   // The event for the last mouse down we handled. We need this for context
   // menus and drags.
   GdkEventButton last_mouse_down_;
 
   // Used to get notifications about renderers coming and going.
@@ skipping 19 matching lines @@
   scoped_ptr<TabContentsDragSource> drag_source_;
 
   // The size we want the tab contents view to be.  We keep this in a separate
   // variable because resizing in GTK+ is async.
   gfx::Size requested_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewGtk);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_