Chooser spinner should disappear as soon as one device shows up

chrome/browser/ui/views/chooser_content_view.cc

 // Copyright 2016 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/chooser_content_view.h"
 
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
@@ skipping 70 matching lines @@
 void ChooserContentView::SetObserver(ui::TableModelObserver* observer) {}
 
 void ChooserContentView::OnOptionsInitialized() {
   table_view_->OnModelChanged();
   UpdateTableView();
 }
 
 void ChooserContentView::OnOptionAdded(size_t index) {
   table_view_->OnItemsAdded(static_cast<int>(index), 1);
   UpdateTableView();
+  table_view_->SetVisible(true);
+  throbber_->SetVisible(false);
+  throbber_->Stop();
 }
 
 void ChooserContentView::OnOptionRemoved(size_t index) {
   table_view_->OnItemsRemoved(static_cast<int>(index), 1);
   UpdateTableView();
 }
 
 void ChooserContentView::OnAdapterEnabledChanged(bool enabled) {
   // No row is selected since the adapter status has changed.
   // This will also disable the OK button if it was enabled because
   // of a previously selected row.
   table_view_->Select(-1);
   UpdateTableView();
   table_view_->SetVisible(true);
 
   throbber_->Stop();
   throbber_->SetVisible(false);
 
   discovery_state_->SetText(chooser_controller_->GetStatus());
   discovery_state_->SetEnabled(enabled);
 }
 
 void ChooserContentView::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_->Select(-1);
-  UpdateTableView();
-  // When refreshing, hide |table_view_|. When complete, show |table_view_|.
-  table_view_->SetVisible(!refreshing);
+  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_->Select(-1);
+    UpdateTableView();
+  }
 
-  if (refreshing)
+  // When refreshing and no option available yet, hide |table_view_| and show
+  // |throbber_|. Otherwise show |table_view_| and hide |throbber_|.
+  bool throbber_visible =
+      refreshing && (chooser_controller_->NumOptions() == 0);
+  table_view_->SetVisible(!throbber_visible);
+  throbber_->SetVisible(throbber_visible);
+  if (throbber_visible)
     throbber_->Start();
   else
     throbber_->Stop();
-  // When refreshing, show |throbber_|. When complete, hide |throbber_|.
-  throbber_->SetVisible(refreshing);
 
   discovery_state_->SetText(chooser_controller_->GetStatus());
   // When refreshing, disable |discovery_state_| to show it as a text label.
   // When complete, enable |discovery_state_| to show it as a link.
   discovery_state_->SetEnabled(!refreshing);
 }
 
 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) {
   chooser_controller_->RefreshOptions();
 }
@@ skipping 54 matching lines @@
 }
 
 void ChooserContentView::UpdateTableView() {
   if (chooser_controller_->NumOptions() == 0) {
     table_view_->OnModelChanged();
     table_view_->SetEnabled(false);
   } else {
     table_view_->SetEnabled(true);
   }
 }