Auto-size the views version of the options dialog.

views/controls/tabbed_pane/native_tabbed_pane_win.h

Index: views/controls/tabbed_pane/native_tabbed_pane_win.h
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.h b/views/controls/tabbed_pane/native_tabbed_pane_win.h
index c3dcaedef8eed466cb7ba0af7920e1e79daa5036..4e4cc2ad611f8eaf0ab873db2b8be09d431fc3d4 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.h
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.h
@@ -13,6 +13,7 @@
 namespace views {
 
 class WidgetWin;
+class TabLayout;
 
 class NativeTabbedPaneWin : public NativeControlWin,
                             public NativeTabbedPaneWrapper {
@@ -33,6 +34,7 @@ class NativeTabbedPaneWin : public NativeControlWin,
   virtual View* GetSelectedTab();
   virtual View* GetView();
   virtual void SetFocus();
+  virtual gfx::Size GetPreferredSize();
   virtual gfx::NativeView GetTestingHandle() const;
 
   // NativeControlWin overrides.
@@ -57,7 +59,7 @@ class NativeTabbedPaneWin : public NativeControlWin,
   void InitializeTabs();
 
   // Adds a tab with the given content to native control at the given index.
-  void AddNativeTab(int index, const std::wstring& title, View* contents);
+  void AddNativeTab(int index, const std::wstring& title);
 
   // Changes the contents view to the view associated with the tab at |index|.
   // |invoke_listener| controls if this methold should invoke the
@@ -70,6 +72,9 @@ class NativeTabbedPaneWin : public NativeControlWin,
   // The tabbed-pane we are bound to.
   TabbedPane* tabbed_pane_;
 
+  // The layout manager we use for managing our tabs.
+  TabLayout* tab_layout_manager_;
+
   // The views associated with the different tabs.
   std::vector<View*> tab_views_;