TabbedPane: refactor away manual layout and selected_tab_index_

chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

 // Copyright 2013 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/ui/views/desktop_capture/desktop_media_picker_views.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/media/webrtc/desktop_media_list.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 272 matching lines @@
   return ui::MODAL_TYPE_CHILD;
 }
 
 base::string16 DesktopMediaPickerDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_DESKTOP_MEDIA_PICKER_TITLE);
 }
 
 bool DesktopMediaPickerDialogView::IsDialogButtonEnabled(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK)
-    return list_views_[pane_->selected_tab_index()]->GetSelection() != nullptr;
+    return list_views_[pane_->GetSelectedTabIndex()]->GetSelection() != nullptr;
   return true;
 }
 
 views::View* DesktopMediaPickerDialogView::GetInitiallyFocusedView() {
   return list_views_[0];
 }
 
 base::string16 DesktopMediaPickerDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16(button == ui::DIALOG_BUTTON_OK
                                        ? IDS_DESKTOP_MEDIA_PICKER_SHARE
                                        : IDS_CANCEL);
 }
 
 bool DesktopMediaPickerDialogView::ShouldDefaultButtonBeBlue() const {
   return true;
 }
 
 views::View* DesktopMediaPickerDialogView::CreateExtraView() {
   return audio_share_checkbox_;
 }
 
 bool DesktopMediaPickerDialogView::Accept() {
   DesktopMediaSourceView* selection =
-      list_views_[pane_->selected_tab_index()]->GetSelection();
+      list_views_[pane_->GetSelectedTabIndex()]->GetSelection();
 
   // Ok button should only be enabled when a source is selected.
   DCHECK(selection);
   DesktopMediaID source = selection->source_id();
   source.audio_share = audio_share_checkbox_ &&
                        audio_share_checkbox_->visible() &&
                        audio_share_checkbox_->checked();
 
   if (source.type == DesktopMediaID::TYPE_WEB_CONTENTS) {
     // Activate the selected tab and bring the browser window for the selected
@@ skipping 37 matching lines @@
   gfx::Rect widget_bound = GetWidget()->GetWindowBoundsInScreen();
 
   int new_height = widget_bound.height() - pane_->height() +
                    pane_->GetPreferredSize().height();
 
   GetWidget()->CenterWindow(gfx::Size(widget_bound.width(), new_height));
 }
 
 DesktopMediaListView* DesktopMediaPickerDialogView::GetMediaListViewForTesting()
     const {
-  return list_views_[pane_->selected_tab_index()];
+  return list_views_[pane_->GetSelectedTabIndex()];
 }
 
 DesktopMediaSourceView*
 DesktopMediaPickerDialogView::GetMediaSourceViewForTesting(int index) const {
-  if (list_views_[pane_->selected_tab_index()]->child_count() <= index)
+  if (list_views_[pane_->GetSelectedTabIndex()]->child_count() <= index)
     return nullptr;
 
   return reinterpret_cast<DesktopMediaSourceView*>(
-      list_views_[pane_->selected_tab_index()]->child_at(index));
+      list_views_[pane_->GetSelectedTabIndex()]->child_at(index));
 }
 
 views::Checkbox* DesktopMediaPickerDialogView::GetCheckboxForTesting() const {
   return audio_share_checkbox_;
 }
 
 int DesktopMediaPickerDialogView::GetIndexOfSourceTypeForTesting(
     DesktopMediaID::Type source_type) const {
   for (size_t i = 0; i < source_types_.size(); i++) {
     if (source_types_[i] == source_type)
@@ skipping 49 matching lines @@
 
 // static
 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           extensions::switches::kDisableDesktopCapturePickerNewUI)) {
     return std::unique_ptr<DesktopMediaPicker>(
         new deprecated::DesktopMediaPickerViews());
   }
   return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }