Auto-size the views version of the options dialog.

chrome/browser/views/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 "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 165 matching lines @@
   return true;
 }
 
 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 41 matching lines @@
   // If there's already an existing options window, activate it and switch to
   // the specified page.
   // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care
   //             about this case this will have to be fixed.
   if (!instance_) {
     instance_ = new OptionsWindowView(profile);
     views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);
   }
   instance_->ShowOptionsPage(page, highlight_group);
 }