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

chrome/browser/views/options/options_window_view.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/options_window.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/options/advanced_page_view.h"
 #include "chrome/browser/views/options/content_page_view.h"
 #include "chrome/browser/views/options/general_page_view.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #include "chrome/personalization/views/user_data_page_view.h"
 #endif
 #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"
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView
 //
 //  The contents of the Options dialog window.
 //
 class OptionsWindowView : public views::View,
@@ skipping 178 matching lines @@
 
   AdvancedPageView* advanced_page = new AdvancedPageView(profile_);
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_OPTIONS_ADVANCED_TAB_LABEL),
                        advanced_page, false);
 
   DCHECK(tabs_->GetTabCount() == OPTIONS_PAGE_COUNT);
 }
 
 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());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Factory/finder method:
 
 void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile) {
   DCHECK(profile);
   // If there's already an existing options window, activate it and switch to
   // the specified page.
   // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care
   //             about this case this will have to be fixed.
   if (!instance_) {
     instance_ = new OptionsWindowView(profile);
     views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);
     // The window is alive by itself now...
   }
   instance_->ShowOptionsPage(page, highlight_group);
 }