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

Side by Side Diff: chrome/browser/ui/views/chooser_content_view.cc

Issue 2192953002: Chooser spinner should disappear as soon as one device shows up (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: chooser spinner should disappear as soon as one device shows up Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/chooser_content_view.h" 5 #include "chrome/browser/ui/views/chooser_content_view.h"
6 6
7 #include "chrome/grit/generated_resources.h" 7 #include "chrome/grit/generated_resources.h"
8 #include "ui/base/l10n/l10n_util.h" 8 #include "ui/base/l10n/l10n_util.h"
9 #include "ui/views/controls/link.h" 9 #include "ui/views/controls/link.h"
10 #include "ui/views/controls/styled_label.h" 10 #include "ui/views/controls/styled_label.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 table_view_->SetVisible(true); 104 table_view_->SetVisible(true);
105 105
106 throbber_->Stop(); 106 throbber_->Stop();
107 throbber_->SetVisible(false); 107 throbber_->SetVisible(false);
108 108
109 discovery_state_->SetText(chooser_controller_->GetStatus()); 109 discovery_state_->SetText(chooser_controller_->GetStatus());
110 discovery_state_->SetEnabled(enabled); 110 discovery_state_->SetEnabled(enabled);
111 } 111 }
112 112
113 void ChooserContentView::OnRefreshStateChanged(bool refreshing) { 113 void ChooserContentView::OnRefreshStateChanged(bool refreshing) {
114 // No row is selected since the chooser is refreshing or just refreshed. 114 if (refreshing) {
115 // This will also disable the OK button if it was enabled because 115 // No row is selected since the chooser is refreshing. This will also
116 // of a previously selected row. 116 // disable the OK button if it was enabled because of a previously
117 table_view_->Select(-1); 117 // selected row.
118 UpdateTableView(); 118 table_view_->Select(-1);
119 // When refreshing, hide |table_view_|. When complete, show |table_view_|. 119 UpdateTableView();
120 table_view_->SetVisible(!refreshing); 120 }
121 121
122 if (refreshing) 122 // When refreshing and no option available yet, hide |table_view_| and show
123 // |throbber_|. Otherwise show |table_view_| and hide |throbber_|.
124 bool throbber_visible =
125 refreshing && (chooser_controller_->NumOptions() == 0);
126 table_view_->SetVisible(!throbber_visible);
127 throbber_->SetVisible(throbber_visible);
128 if (throbber_visible)
123 throbber_->Start(); 129 throbber_->Start();
124 else 130 else
125 throbber_->Stop(); 131 throbber_->Stop();
126 // When refreshing, show |throbber_|. When complete, hide |throbber_|.
127 throbber_->SetVisible(refreshing);
128 132
129 discovery_state_->SetText(chooser_controller_->GetStatus()); 133 discovery_state_->SetText(chooser_controller_->GetStatus());
130 // When refreshing, disable |discovery_state_| to show it as a text label. 134 // When refreshing, disable |discovery_state_| to show it as a text label.
131 // When complete, enable |discovery_state_| to show it as a link. 135 // When complete, enable |discovery_state_| to show it as a link.
132 discovery_state_->SetEnabled(!refreshing); 136 discovery_state_->SetEnabled(!refreshing);
133 } 137 }
134 138
139 void ChooserContentView::OnOptionAvailableDuringRefresh() {
140 table_view_->SetVisible(true);
141 throbber_->SetVisible(false);
142 throbber_->Stop();
143 }
144
135 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) { 145 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) {
136 chooser_controller_->RefreshOptions(); 146 chooser_controller_->RefreshOptions();
137 } 147 }
138 148
139 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label, 149 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label,
140 const gfx::Range& range, 150 const gfx::Range& range,
141 int event_flags) { 151 int event_flags) {
142 chooser_controller_->OpenHelpCenterUrl(); 152 chooser_controller_->OpenHelpCenterUrl();
143 } 153 }
144 154
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 } 202 }
193 203
194 void ChooserContentView::UpdateTableView() { 204 void ChooserContentView::UpdateTableView() {
195 if (chooser_controller_->NumOptions() == 0) { 205 if (chooser_controller_->NumOptions() == 0) {
196 table_view_->OnModelChanged(); 206 table_view_->OnModelChanged();
197 table_view_->SetEnabled(false); 207 table_view_->SetEnabled(false);
198 } else { 208 } else {
199 table_view_->SetEnabled(true); 209 table_view_->SetEnabled(true);
200 } 210 }
201 } 211 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698