Auto-size the views version of the options dialog.

views/controls/tabbed_pane/tabbed_pane.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/tabbed_pane.h"
 
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
@@ skipping 84 matching lines @@
 }
 
 void TabbedPane::LoadAccelerators() {
   // Ctrl+Shift+Tab
   AddAccelerator(views::Accelerator(base::VKEY_TAB, true, true, false));
   // Ctrl+Tab
   AddAccelerator(views::Accelerator(base::VKEY_TAB, false, true, false));
 }
 
 void TabbedPane::Layout() {
-  if (native_tabbed_pane_) {
+  if (native_tabbed_pane_)
     native_tabbed_pane_->GetView()->SetBounds(0, 0, width(), height());
-    native_tabbed_pane_->GetView()->Layout();
-  }
 }
 
 void TabbedPane::Focus() {
   // Forward the focus to the wrapper.
   if (native_tabbed_pane_)
     native_tabbed_pane_->SetFocus();
   else
     View::Focus();  // Will focus the RootView window (so we still get keyboard
                     // messages).
 }
 
 void TabbedPane::PaintFocusBorder(gfx::Canvas* canvas) {
   if (NativeViewHost::kRenderNativeControlFocus)
     View::PaintFocusBorder(canvas);
 }
 
 bool TabbedPane::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
 
   *role = AccessibilityTypes::ROLE_PAGETABLIST;
   return true;
 }
 
+gfx::Size TabbedPane::GetPreferredSize() {
+  return native_tabbed_pane_ ?
+      native_tabbed_pane_->GetPreferredSize() : gfx::Size();
+}
+
 }  // namespace views