Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

Issue 2415633002: TabbedPane: refactor away manual layout and selected_tab_index_ (Closed)
Patch Set: nits for msw Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/controls/tabbed_pane/tabbed_pane.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
index 66aa2136ef13b2e258ccd87ee372cce39eb347f5..d5bd2410732945710162e963ed0da03b3de58447 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
@@ -290,7 +290,7 @@ base::string16 DesktopMediaPickerDialogView::GetWindowTitle() const {
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;
}
@@ -315,7 +315,7 @@ views::View* DesktopMediaPickerDialogView::CreateExtraView() {
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);
@@ -373,16 +373,16 @@ void DesktopMediaPickerDialogView::OnMediaListRowsChanged() {
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 {
« no previous file with comments | « no previous file | ui/views/controls/tabbed_pane/tabbed_pane.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698