Re-land r51526

views/controls/tabbed_pane/native_tabbed_pane_gtk.cc

 // Copyright (c) 2010 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 "views/controls/tabbed_pane/native_tabbed_pane_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
@@ skipping 57 matching lines @@
   WidgetGtk* widget = WidgetGtk::GetViewForNative(page);
 
   // detach the content view from widget so that we can delete widget
   // without destroying the content view.
   View* removed_tab = GetTabViewAt(index);
   widget->GetRootView()->RemoveChildView(removed_tab);
 
   // widget delete itself when native_view is deleted.
   gtk_notebook_remove_page(GTK_NOTEBOOK(native_view()), index);
 
+  // Removing a tab might change the size of the tabbed pane.
+  RootView* root_view = GetRootView();
+  if (root_view)
+    GetRootView()->Layout();
+
   return removed_tab;
 }
 
 void NativeTabbedPaneGtk::SelectTabAt(int index) {
   DCHECK((index >= 0) && (index < GetTabCount()));
   gtk_notebook_set_current_page(GTK_NOTEBOOK(native_view()), index);
 }
 
 int NativeTabbedPaneGtk::GetTabCount() {
   return gtk_notebook_get_n_pages(GTK_NOTEBOOK(native_view()));
 }
 
 int NativeTabbedPaneGtk::GetSelectedTabIndex() {
   return gtk_notebook_get_current_page(GTK_NOTEBOOK(native_view()));
 }
 
 View* NativeTabbedPaneGtk::GetSelectedTab() {
   return GetTabViewAt(GetSelectedTabIndex());
 }
 
 View* NativeTabbedPaneGtk::GetView() {
   return this;
 }
 
 void NativeTabbedPaneGtk::SetFocus() {
   Focus();
 }
 
+gfx::Size NativeTabbedPaneGtk::GetPreferredSize() {
+  if (!native_view())
+    return gfx::Size();
+
+  // For some strange reason (or maybe it's a bug), the requisition is not
+  // returned in the passed requisition parameter, but instead written to the
+  // widget's requisition field.
+  GtkRequisition requisition = { 0, 0 };
+  gtk_widget_size_request(GTK_WIDGET(native_view()), &requisition);
+  GtkRequisition& size(GTK_WIDGET(native_view())->requisition);
+  return gfx::Size(size.width, size.height);
+}
+
 gfx::NativeView NativeTabbedPaneGtk::GetTestingHandle() const {
   return native_view();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneGtk, NativeControlGtk override:
 
 void NativeTabbedPaneGtk::CreateNativeControl() {
   GtkWidget* widget = gtk_notebook_new();
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widget), GTK_POS_TOP);
@@ skipping 43 matching lines @@
   GtkWidget* label = gtk_label_new(WideToUTF8(title).c_str());
   gtk_widget_show(label);
   gtk_notebook_insert_page(GTK_NOTEBOOK(native_view()),
                            page,
                            label,
                            index);
   g_object_unref(page);
 
   if (tab_count == 0 && select_if_first_tab)
     gtk_notebook_set_current_page(GTK_NOTEBOOK(native_view()), 0);
+
+  // Relayout the hierarchy, since the added tab might require more space.
+  RootView* root_view = GetRootView();
+  if (root_view)
+    GetRootView()->Layout();
 }
 
 WidgetGtk* NativeTabbedPaneGtk::GetWidgetAt(int index) {
   DCHECK(index <= GetTabCount());
   GtkWidget* page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(native_view()),
                                               index);
   WidgetGtk* widget = WidgetGtk::GetViewForNative(page);
   DCHECK(widget);
   return widget;
 }
@@ skipping 21 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneWrapper, public:
 
 // static
 NativeTabbedPaneWrapper* NativeTabbedPaneWrapper::CreateNativeWrapper(
     TabbedPane* tabbed_pane) {
   return new NativeTabbedPaneGtk(tabbed_pane);
 }
 
 }  // namespace views