Remove NativeTabbedPane[Win|Wrapper]; promote Views impl.

ui/views/controls/tabbed_pane/tabbed_pane.h

Index: ui/views/controls/tabbed_pane/tabbed_pane.h
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.h b/ui/views/controls/tabbed_pane/tabbed_pane.h
index 31a6b1f316f8d8992190c3051a1e2c9cf3f24d3f..ab98d93f26137778e2ac4dd693094136f10927aa 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.h
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.h
@@ -12,8 +12,9 @@
 
 namespace views {
 
-class NativeTabbedPaneWrapper;
 class TabbedPaneListener;
+class TabLayout;
+class TabStrip;
 
 // TabbedPane is a view that shows tabs. When the user clicks on a tab, the
 // associated view is displayed.
@@ -24,12 +25,6 @@ class VIEWS_EXPORT TabbedPane : public View {
 
   TabbedPaneListener* listener() const { return listener_; }
   void set_listener(TabbedPaneListener* listener) { listener_ = listener; }
-#if defined(OS_WIN) && !defined(USE_AURA)
-  bool use_native_win_control() { return use_native_win_control_; }
-  void set_use_native_win_control(bool use_native_win_control) {
-    use_native_win_control_ = use_native_win_control;
-  }
-#endif
 
   // Returns the number of tabs.
   int GetTabCount();
@@ -40,6 +35,9 @@ class VIEWS_EXPORT TabbedPane : public View {
   // Returns the contents of the selected tab.
   View* GetSelectedTab();
 
+  // Called by the TabStrip when its selected tab has changed.
+  void TabSelectionChanged(View* selected);

[sky, 2013/02/06 17:29:55]

Cant this be implemented in terms of SelectTabAt?

[msw, 2013/02/07 00:29:37]

Moot.

+
   // Adds a new tab at the end of this TabbedPane with the specified |title|.
   // |contents| is the view displayed when the tab is selected and is owned by
   // the TabbedPane.
@@ -68,11 +66,6 @@ class VIEWS_EXPORT TabbedPane : public View {
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
- protected:
-  // The object that actually implements the tabbed-pane.
-  // Protected for tests access.
-  NativeTabbedPaneWrapper* native_tabbed_pane_;
-
  private:
   // The tabbed-pane's class name.
   static const char kViewClassName[];
@@ -89,19 +82,23 @@ class VIEWS_EXPORT TabbedPane : public View {
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
   virtual void OnFocus() OVERRIDE;
-  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-  bool use_native_win_control_;
-#endif
-
   // Our listener. Not owned. Notified when tab selection changes.
   TabbedPaneListener* listener_;
 
   // The accessible name of this tabbed pane.
   string16 accessible_name_;
 
+  // The layout manager we use for managing our tabs.
+  TabLayout* tab_layout_manager_;
+
+  // TabStrip.
+  TabStrip* tab_strip_;
+
+  // The content displayed in the tab.
+  View* content_view_;
+
   DISALLOW_COPY_AND_ASSIGN(TabbedPane);
 };