Refactoring of tabbed-pane component so it can be ported to Linux toolkit_view.

BUG=None
TEST=Make sure the Options dialog still works as expected (tab selection, focus traversal...)
Review URL: http://codereview.chromium.org/155668

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

7 files changed, 15 insertions, 10 deletions

diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index ed038bb..eeb6081 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -24,6 +24,7 @@
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc
index a9fb957..7d7f38f 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.cc
+++ b/chrome/browser/views/options/fonts_languages_window_view.cc
@@ -15,6 +15,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/window/window.h"
 
 // static
diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h
index 46ec91b..55a4405 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.h
+++ b/chrome/browser/views/options/fonts_languages_window_view.h
@@ -6,15 +6,17 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_LANGUAGES_WINDOW_VIEW_H_
 
 #include "chrome/browser/fonts_languages_window.h"
-#include "views/controls/tabbed_pane.h"
 #include "views/view.h"
 #include "views/window/dialog_delegate.h"
-#include "views/window/window.h"
 
 class Profile;
 class FontsPageView;
 class LanguagesPageView;
 
+namespace views {
+class TabbedPane;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // FontsLanguagesWindowView
 //
@@ -65,7 +67,7 @@ class FontsLanguagesWindowView : public views::View,
   // The Profile associated with these options.
   Profile* profile_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(FontsLanguagesWindowView);
+  DISALLOW_COPY_AND_ASSIGN(FontsLanguagesWindowView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_FONTS_LANGUAGES_WINDOW_VIEW_H_
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 207142d..47d58b5 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -33,7 +33,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "unicode/uloc.h"
 #include "views/controls/button/radio_button.h"
-#include "views/controls/tabbed_pane.h"
+#include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/controls/table/table_view.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index b3cbe66..ad77aa9 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -21,7 +21,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "views/controls/tabbed_pane.h"
+#include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/widget/root_view.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
@@ -220,9 +220,7 @@ void OptionsWindowView::Init() {
 }
 
 OptionsPageView* OptionsWindowView::GetCurrentOptionsPageView() const {
-  views::RootView* contents_root_view = tabs_->GetContentsRootView();
-  DCHECK(contents_root_view->GetChildViewCount() == 1);
-  return static_cast<OptionsPageView*>(contents_root_view->GetChildViewAt(0));
+  return static_cast<OptionsPageView*>(tabs_->GetSelectedTab());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/views/options/passwords_exceptions_window_view.cc b/chrome/browser/views/options/passwords_exceptions_window_view.cc
index 8dfd250..dae07b3 100644
--- a/chrome/browser/views/options/passwords_exceptions_window_view.cc
+++ b/chrome/browser/views/options/passwords_exceptions_window_view.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/views/options/passwords_page_view.h"
 #include "chrome/browser/views/options/exceptions_page_view.h"
 #include "grit/generated_resources.h"
+#include "views/controls/tabbed_pane/tabbed_pane.h"
 
 // static
 PasswordsExceptionsWindowView* PasswordsExceptionsWindowView::instance_ = NULL;
diff --git a/chrome/browser/views/options/passwords_exceptions_window_view.h b/chrome/browser/views/options/passwords_exceptions_window_view.h
index 8170f90..fc6a49c 100644
--- a/chrome/browser/views/options/passwords_exceptions_window_view.h
+++ b/chrome/browser/views/options/passwords_exceptions_window_view.h
@@ -5,15 +5,17 @@
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_
 
-#include "views/controls/tabbed_pane.h"
 #include "views/view.h"
 #include "views/window/dialog_delegate.h"
-#include "views/window/window.h"
 
 class Profile;
 class PasswordsPageView;
 class ExceptionsPageView;
 
+namespace views {
+class TabbedPane;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // PasswordsExceptionsWindowView
 //