Re-land r51526

chrome/browser/chromeos/options/options_window_view.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 "chrome/browser/options_window.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 17 matching lines @@
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/widget/root_view.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 #include "views/window/window_gtk.h"
 
 
 namespace chromeos {
 
 ///////////////////////////////////////////////////////////////////////////////
+// GtkPreferencePageHost
+//
+//  Hosts a GTK preference page and takes care of sizing it appropriately.
+//
+class GtkPreferencePageHost : public views::NativeViewHost {
+ public:
+  explicit GtkPreferencePageHost(GtkWidget* widget);
+
+ private:
+  // views::View overrides:
+  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
+  virtual gfx::Size GetPreferredSize();
+
+  GtkWidget* widget_;
+
+  DISALLOW_COPY_AND_ASSIGN(GtkPreferencePageHost);
+};
+
+GtkPreferencePageHost::GtkPreferencePageHost(GtkWidget* widget)
+    : widget_(widget) {
+  set_background(views::Background::CreateSolidBackground(SK_ColorWHITE));
+}
+
+void GtkPreferencePageHost::ViewHierarchyChanged(bool is_add,
+                                                 View* parent,
+                                                 View* child) {
+  NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
+  if (is_add && child == this)
+    Attach(widget_);
+}
+
+gfx::Size GtkPreferencePageHost::GetPreferredSize() {
+  // We need to show the widget and its children since otherwise containers like
+  // gtk_box don't compute the correct size.
+  gtk_widget_show_all(widget_);
+  GtkRequisition requisition = { 0, 0 };
+  gtk_widget_size_request(GTK_WIDGET(widget_), &requisition);
+  GtkRequisition& size(widget_->requisition);
+  return gfx::Size(size.width, size.height);
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView
 //
 //  The contents of the Options dialog window.
 //
 class OptionsWindowView : public views::View,
                           public views::DialogDelegate,
                           public views::TabbedPane::Listener {
  public:
   static const int kDialogPadding;
   static const SkColor kDialogBackground;
@@ skipping 159 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView, views::View overrides:
 
 void OptionsWindowView::Layout() {
   tabs_->SetBounds(kDialogPadding, kDialogPadding,
                    width() - (2 * kDialogPadding),
                    height() - (2 * kDialogPadding));
 }
 
 gfx::Size OptionsWindowView::GetPreferredSize() {
-  return gfx::Size(views::Window::GetLocalizedContentsSize(
-      IDS_OPTIONS_DIALOG_WIDTH_CHARS,
-      IDS_OPTIONS_DIALOG_HEIGHT_LINES));
+  gfx::Size size(tabs_->GetPreferredSize());
+  size.Enlarge(2 * kDialogPadding, 2 * kDialogPadding);
+  return size;
 }
 
 void OptionsWindowView::ViewHierarchyChanged(bool is_add,
                                              views::View* parent,
                                              views::View* child) {
   // Can't init before we're inserted into a Container, because we require a
   // HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
 }
@@ skipping 26 matching lines @@
                        l10n_util::GetString(IDS_OPTIONS_SYSTEM_TAB_LABEL),
                        system_page, false);
 
   InternetPageView* internet_page = new InternetPageView(profile_);
   internet_page->set_background(views::Background::CreateSolidBackground(
       SK_ColorWHITE));
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_OPTIONS_INTERNET_TAB_LABEL),
                        internet_page, false);
 
-  views::NativeViewHost* general_page_view = new views::NativeViewHost();
-  general_page_view->set_background(views::Background::CreateSolidBackground(
-      SK_ColorWHITE));
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_OPTIONS_GENERAL_TAB_LABEL),
-                       general_page_view, false);
-  general_page_view->Attach(general_page_.get_page_widget());
+                       new GtkPreferencePageHost(
+                           general_page_.get_page_widget()),
+                       false);
 
-  views::NativeViewHost* content_page_view = new views::NativeViewHost();
-  content_page_view->set_background(views::Background::CreateSolidBackground(
-      SK_ColorWHITE));
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_OPTIONS_CONTENT_TAB_LABEL),
-                       content_page_view, false);
-  content_page_view->Attach(content_page_.get_page_widget());
+                       new GtkPreferencePageHost(
+                           content_page_.get_page_widget()),
+                       false);
 
-  views::NativeViewHost* advanced_page_view = new views::NativeViewHost();
-  advanced_page_view->set_background(views::Background::CreateSolidBackground(
-      SK_ColorWHITE));
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_OPTIONS_ADVANCED_TAB_LABEL),
-                       advanced_page_view, false);
-  advanced_page_view->Attach(advanced_page_.get_page_widget());
+                       new GtkPreferencePageHost(
+                           advanced_page_.get_page_widget()),
+                       false);
 
   DCHECK(tabs_->GetTabCount() == OPTIONS_PAGE_COUNT);
 
   initialized_ = true;
 }
 
 OptionsPageView* OptionsWindowView::GetCurrentOptionsPageView() const {
   int selected_option_page = tabs_->GetSelectedTabIndex();
   if (selected_option_page < OPTIONS_PAGE_GENERAL) {
     return static_cast<OptionsPageView*>(tabs_->GetSelectedTab());
@@ skipping 38 matching lines @@
   // a new one for the current active browser.
   chromeos::CloseOptionsWindow();
 
   OptionsWindowView::instance_ = new OptionsWindowView(profile);
   views::Window::CreateChromeWindow(chromeos::GetOptionsViewParent(),
                                     gfx::Rect(),
                                     OptionsWindowView::instance_);
 
   OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group);
 }
-