Chooser spinner should disappear as soon as one device shows up

chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 41 matching lines @@
                                NSTextField* status,
                                NSButton* rescan_button);
   ~ChooserContentViewController() override;
 
   // ChooserController::View:
   void OnOptionsInitialized() override;
   void OnOptionAdded(size_t index) override;
   void OnOptionRemoved(size_t index) override;
   void OnAdapterEnabledChanged(bool enabled) override;
   void OnRefreshStateChanged(bool refreshing) override;
+  void OnOptionAvailableDuringRefresh() override;
 
   void UpdateTableView();
 
  private:
   ChooserController* chooser_controller_;
   NSTableView* table_view_;
   SpinnerView* spinner_;
   NSTextField* status_;
   NSButton* rescan_button_;
 
@@ skipping 58 matching lines @@
   [table_view_ setHidden:NO];
 
   [spinner_ setHidden:YES];
 
   [status_ setHidden:YES];
   // When adapter is enabled, show |rescan_button_|; otherwise hide it.
   [rescan_button_ setHidden:enabled ? NO : YES];
 }
 
 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_|.
   [status_ setHidden:refreshing ? NO : YES];
   [rescan_button_ setHidden:refreshing ? YES : NO];
 }
 
+void ChooserContentViewController::OnOptionAvailableDuringRefresh() {
+  [table_view_ setHidden:NO];
+  [spinner_ setHidden:YES];
+}
+
 void ChooserContentViewController::UpdateTableView() {
   [table_view_ setEnabled:chooser_controller_->NumOptions() > 0];
   [table_view_ reloadData];
 }
 
 @implementation ChooserContentViewCocoa
 
 - (instancetype)initWithChooserTitle:(NSString*)chooserTitle
                    chooserController:
                        (std::unique_ptr<ChooserController>)chooserController {
@@ skipping 305 matching lines @@
 
 - (void)onRescan:(id)sender {
   chooserController_->RefreshOptions();
 }
 
 - (void)onHelpPressed:(id)sender {
   chooserController_->OpenHelpCenterUrl();
 }
 
 @end