views: Cleanup TabbedPane class.

BUG=None
TEST=views_examples, and existing views_unittests

R=sky@chromium.org

Review URL: http://codereview.chromium.org/6685039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78775 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 36 insertions, 24 deletions

diff --git a/views/examples/example_base.cc b/views/examples/example_base.cc
index c73caf9..af1271c 100644
--- a/views/examples/example_base.cc
+++ b/views/examples/example_base.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -10,7 +10,6 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/examples/examples_main.h"
 
 #if defined(OS_CHROMEOS)
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index 7346abc..0ab98f6 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -11,24 +11,17 @@
 #include "base/process_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "views/controls/label.h"
 #include "views/controls/button/text_button.h"
+#include "views/controls/label.h"
+#include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/examples/button_example.h"
 #include "views/examples/combobox_example.h"
-#include "views/examples/message_box_example.h"
 #include "views/examples/menu_example.h"
+#include "views/examples/message_box_example.h"
 #include "views/examples/radio_button_example.h"
 #include "views/examples/scroll_view_example.h"
 #include "views/examples/single_split_view_example.h"
-// Slider is not yet ported to Windows.
-#if defined(OS_LINUX)
-#include "views/examples/slider_example.h"
-#endif
 #include "views/examples/tabbed_pane_example.h"
-#if defined(OS_WIN)
-// TableView is not yet ported to Linux.
-#include "views/examples/table_example.h"
-#endif
 #include "views/examples/table2_example.h"
 #include "views/examples/textfield_example.h"
 #include "views/examples/throbber_example.h"
@@ -37,10 +30,18 @@
 #include "views/layout/grid_layout.h"
 #include "views/window/window.h"
 
+#if defined(OS_LINUX)
+// Slider is not yet ported to Windows.
+#include "views/examples/slider_example.h"
+#endif
+#if defined(OS_WIN)
+// TableView is not yet ported to Linux.
+#include "views/examples/table_example.h"
+#endif
+
 namespace examples {
 
-ExamplesMain::ExamplesMain()
-    : contents_(NULL), status_label_(NULL) {}
+ExamplesMain::ExamplesMain() : contents_(NULL), status_label_(NULL) {}
 
 ExamplesMain::~ExamplesMain() {}
 
diff --git a/views/examples/tabbed_pane_example.cc b/views/examples/tabbed_pane_example.cc
index 15516a8..fd290a9 100644
--- a/views/examples/tabbed_pane_example.cc
+++ b/views/examples/tabbed_pane_example.cc
@@ -4,6 +4,7 @@
 
 #include "views/examples/tabbed_pane_example.h"
 
+#include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/layout/grid_layout.h"
 
 namespace examples {
@@ -21,6 +22,7 @@ std::wstring TabbedPaneExample::GetExampleTitle() {
 
 void TabbedPaneExample::CreateExampleView(views::View* container) {
   tabbed_pane_ = new views::TabbedPane();
+  tabbed_pane_->set_listener(this);
   add_ = new views::TextButton(this, L"Add");
   add_at_ = new views::TextButton(this, L"Add At 1");
   remove_at_ = new views::TextButton(this, L"Remove At 1");
diff --git a/views/examples/tabbed_pane_example.h b/views/examples/tabbed_pane_example.h
index 649c2b72..aa50c48 100644
--- a/views/examples/tabbed_pane_example.h
+++ b/views/examples/tabbed_pane_example.h
@@ -6,30 +6,37 @@
 #define VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
 #pragma once
 
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "views/controls/button/text_button.h"
+#include "views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "views/examples/example_base.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
+
+namespace views {
+class TabbedPane;
+}
 
 namespace examples {
 
 // A TabbedPane example tests adding/removing/selecting tabs.
 class TabbedPaneExample : public ExampleBase,
                           public views::ButtonListener,
-                          public views::TabbedPane::Listener {
+                          public views::TabbedPaneListener {
  public:
   explicit TabbedPaneExample(ExamplesMain* main);
   virtual ~TabbedPaneExample();
 
-  // Overridden from ExampleBase:
-  virtual std::wstring GetExampleTitle();
-  virtual void CreateExampleView(views::View* container);
+  // ExampleBase:
+  virtual std::wstring GetExampleTitle() OVERRIDE;
+  virtual void CreateExampleView(views::View* container) OVERRIDE;
 
  private:
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  // views::ButtonListener:
+  virtual void ButtonPressed(views::Button* sender,
+                             const views::Event& event) OVERRIDE;
 
-  // Overridden from views::TabbedPane::Listener:
-  virtual void TabSelectedAt(int index);
+  // views::TabbedPaneListener:
+  virtual void TabSelectedAt(int index) OVERRIDE;
 
   // Print the status of the tab in the status area.
   void PrintStatus();
@@ -40,7 +47,10 @@ class TabbedPaneExample : public ExampleBase,
   views::TabbedPane* tabbed_pane_;
 
   // Control buttons to add, remove or select tabs.
-  views::Button* add_, *add_at_, *remove_at_, *select_at_;
+  views::Button* add_;
+  views::Button* add_at_;
+  views::Button* remove_at_;
+  views::Button* select_at_;
 
   DISALLOW_COPY_AND_ASSIGN(TabbedPaneExample);
 };