ash::internal::TrayBluetooth: Hide spinner if discovery session stops.

ash/system/bluetooth/tray_bluetooth.cc

 // Copyright (c) 2012 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 "ash/system/bluetooth/tray_bluetooth.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/fixed_sized_scroll_view.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 16 matching lines @@
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 namespace {
 
 // Updates bluetooth device |device| in the |list|. If it is new, append to the
 // end of the |list|; otherwise, keep it at the same place, but update the data
 // with new device info provided by |device|.
-void UpdateBluetoothDeviceList(BluetoothDeviceList* list,
-                               const BluetoothDeviceInfo& device) {
+void UpdateBluetoothDeviceListHelper(BluetoothDeviceList* list,
+                                     const BluetoothDeviceInfo& device) {
   for (BluetoothDeviceList::iterator it = list->begin(); it != list->end();
        ++it) {
     if ((*it).address == device.address) {
       *it = device;
       return;
     }
   }
 
   list->push_back(device);
 }
@@ skipping 49 matching lines @@
 
 class BluetoothDetailedView : public TrayDetailsView,
                               public ViewClickListener,
                               public views::ButtonListener {
  public:
   BluetoothDetailedView(SystemTrayItem* owner, user::LoginStatus login)
       : TrayDetailsView(owner),
         login_(login),
         manage_devices_(NULL),
         toggle_bluetooth_(NULL),
-        enable_bluetooth_(NULL),
-        bluetooth_discovering_(false) {
+        enable_bluetooth_(NULL) {
     CreateItems();
-    Update();
   }
 
   virtual ~BluetoothDetailedView() {
     // Stop discovering bluetooth devices when exiting BT detailed view.
     BluetoothStopDiscovering();
   }
 
   void Update() {
     BluetoothStartDiscovering();
-    UpdateBlueToothDeviceList();
+    UpdateBluetoothDeviceList();
 
     // Update UI.
     UpdateDeviceScrollList();
     UpdateHeaderEntry();
     Layout();
   }
 
  private:
   void CreateItems() {
     CreateScrollableList();
     AppendSettingsEntries();
     AppendHeaderEntry();
   }
 
   void BluetoothStartDiscovering() {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->system_tray_delegate();
     bool bluetooth_enabled = delegate->GetBluetoothEnabled();
-    if (!bluetooth_discovering_ && bluetooth_enabled) {
-      bluetooth_discovering_ = true;
+    bool bluetooth_discovering = delegate->GetBluetoothDiscovering();
+    if (bluetooth_discovering) {
+      throbber_->Start();
+      return;
+    }
+    throbber_->Stop();
+    if (bluetooth_enabled) {
       delegate->BluetoothStartDiscovering();
-      throbber_->Start();
-    } else if(!bluetooth_enabled) {
-      bluetooth_discovering_ = false;
-      throbber_->Stop();
     }
   }
 
   void BluetoothStopDiscovering() {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->system_tray_delegate();
-    if (delegate && bluetooth_discovering_) {
-      bluetooth_discovering_ = false;
+    if (delegate && delegate->GetBluetoothDiscovering()) {
       delegate->BluetoothStopDiscovering();
       throbber_->Stop();
     }
   }
 
-  void UpdateBlueToothDeviceList() {
+  void UpdateBluetoothDeviceList() {
     std::set<std::string> new_connecting_devices;
     std::set<std::string> new_connected_devices;
     std::set<std::string> new_paired_not_connected_devices;
     std::set<std::string> new_discovered_not_paired_devices;
 
     BluetoothDeviceList list;
     Shell::GetInstance()->system_tray_delegate()->
         GetAvailableBluetoothDevices(&list);
     for (size_t i = 0; i < list.size(); ++i) {
       if (list[i].connecting) {
         list[i].display_name = l10n_util::GetStringFUTF16(
             IDS_ASH_STATUS_TRAY_BLUETOOTH_CONNECTING, list[i].display_name);
         new_connecting_devices.insert(list[i].address);
-        UpdateBluetoothDeviceList(&connecting_devices_, list[i]);
+        UpdateBluetoothDeviceListHelper(&connecting_devices_, list[i]);
       } else if (list[i].connected && list[i].paired) {
         new_connected_devices.insert(list[i].address);
-        UpdateBluetoothDeviceList(&connected_devices_, list[i]);
+        UpdateBluetoothDeviceListHelper(&connected_devices_, list[i]);
       } else if (list[i].paired) {
         new_paired_not_connected_devices.insert(list[i].address);
-        UpdateBluetoothDeviceList(&paired_not_connected_devices_, list[i]);
+        UpdateBluetoothDeviceListHelper(
+            &paired_not_connected_devices_, list[i]);
       } else {
         new_discovered_not_paired_devices.insert(list[i].address);
-        UpdateBluetoothDeviceList(&discovered_not_paired_devices_, list[i]);
+        UpdateBluetoothDeviceListHelper(
+            &discovered_not_paired_devices_, list[i]);
       }
     }
     RemoveObsoleteBluetoothDevicesFromList(&connecting_devices_,
                                            new_connecting_devices);
     RemoveObsoleteBluetoothDevicesFromList(&connected_devices_,
                                            new_connected_devices);
     RemoveObsoleteBluetoothDevicesFromList(&paired_not_connected_devices_,
                                            new_paired_not_connected_devices);
     RemoveObsoleteBluetoothDevicesFromList(&discovered_not_paired_devices_,
                                            new_discovered_not_paired_devices);
@@ skipping 198 matching lines @@
 
   std::map<views::View*, std::string> device_map_;
   views::View* manage_devices_;
   ThrobberView* throbber_;
   TrayPopupHeaderButton* toggle_bluetooth_;
   HoverHighlightView* enable_bluetooth_;
   BluetoothDeviceList connected_devices_;
   BluetoothDeviceList connecting_devices_;
   BluetoothDeviceList paired_not_connected_devices_;
   BluetoothDeviceList discovered_not_paired_devices_;
-  bool bluetooth_discovering_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView);
 };
 
 }  // namespace tray
 
 TrayBluetooth::TrayBluetooth(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       default_(NULL),
       detailed_(NULL) {
@@ skipping 15 matching lines @@
   return default_;
 }
 
 views::View* TrayBluetooth::CreateDetailedView(user::LoginStatus status) {
   if (!Shell::GetInstance()->system_tray_delegate()->GetBluetoothAvailable())
     return NULL;
   Shell::GetInstance()->metrics()->RecordUserMetricsAction(
       ash::UMA_STATUS_AREA_DETAILED_BLUETOOTH_VIEW);
   CHECK(detailed_ == NULL);
   detailed_ = new tray::BluetoothDetailedView(this, status);
+  detailed_->Update();
   return detailed_;
 }
 
 void TrayBluetooth::DestroyTrayView() {
 }
 
 void TrayBluetooth::DestroyDefaultView() {
   default_ = NULL;
 }
 
@@ skipping 12 matching lines @@
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash