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

Unified Diff: chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm

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: address comments Created 4 years, 5 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
Index: chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm b/chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm
index 9986f0c47cfa1d215dad38e3bc1233bb1b158e0e..4fd9b09bdce7352a565e83187249681afd0501dd 100644
--- a/chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm
+++ b/chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm
@@ -101,6 +101,8 @@ void ChooserContentViewController::OnOptionsInitialized() {
void ChooserContentViewController::OnOptionAdded(size_t index) {
UpdateTableView();
+ [table_view_ setHidden:NO];
+ [spinner_ setHidden:YES];
}
void ChooserContentViewController::OnOptionRemoved(size_t index) {
@@ -137,16 +139,20 @@ void ChooserContentViewController::OnAdapterEnabledChanged(bool enabled) {
}
void ChooserContentViewController::OnRefreshStateChanged(bool refreshing) {
- // No row is selected since the chooser is refreshing or just refreshed.
- // This will also disable the OK button if it was enabled because
- // of a previously selected row.
- [table_view_ deselectAll:nil];
- UpdateTableView();
- // When refreshing, hide |table_view_|. When complete, show |table_view_|.
- [table_view_ setHidden:refreshing ? YES : NO];
+ if (refreshing) {
+ // No row is selected since the chooser is refreshing.
+ // This will also disable the OK button if it was enabled because
+ // of a previously selected row.
+ [table_view_ deselectAll:nil];
+ UpdateTableView();
+ }
- // When refreshing, show |spinner_|. When complete, hide |spinner_|.
- [spinner_ setHidden:refreshing ? NO : YES];
+ // When refreshing and no option available yet, hide |table_view_| and show
+ // |spinner_|. Otherwise show |table_view_| and hide |spinner_|.
+ bool table_view_hidden =
+ refreshing && (chooser_controller_->NumOptions() == 0);
+ [table_view_ setHidden:table_view_hidden ? YES : NO];
+ [spinner_ setHidden:table_view_hidden ? NO : YES];
// When refreshing, show |status_| and hide |rescan_button_|.
// When complete, show |rescan_button_| and hide |status_|.

Powered by Google App Engine
This is Rietveld 408576698