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

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 679 matching lines @@
     info.address = device->GetAddress();
     info.display_name = device->GetName();
     info.connected = device->IsConnected();
     info.connecting = device->IsConnecting();
     info.paired = device->IsPaired();
     list->push_back(info);
   }
 }
 
 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() {
-  if (bluetooth_discovery_session_.get() &&
-      bluetooth_discovery_session_->IsActive()) {
+  if (GetBluetoothDiscovering()) {
     LOG(WARNING) << "Already have active Bluetooth device discovery session.";
     return;
   }
   VLOG(1) << "Requesting new Bluetooth device discovery session.";
   should_run_bluetooth_discovery_ = true;
   bluetooth_adapter_->StartDiscoverySession(
       base::Bind(&SystemTrayDelegateChromeOS::OnStartBluetoothDiscoverySession,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&BluetoothSetDiscoveringError));
 }
 
 void SystemTrayDelegateChromeOS::BluetoothStopDiscovering() {
   should_run_bluetooth_discovery_ = false;
-  if (!bluetooth_discovery_session_.get() ||
-      !bluetooth_discovery_session_->IsActive()) {
+  if (!GetBluetoothDiscovering()) {
     LOG(WARNING) << "No active Bluetooth device discovery session.";
     return;
   }
   VLOG(1) << "Stopping Bluetooth device discovery session.";
   bluetooth_discovery_session_->Stop(
       base::Bind(&base::DoNothing), base::Bind(&BluetoothSetDiscoveringError));
 }
 
 void SystemTrayDelegateChromeOS::ConnectToBluetoothDevice(
     const std::string& address) {
@@ skipping 135 matching lines @@
 }
 
 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() {
   return bluetooth_adapter_->IsPresent();
 }
 
 bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() {
   return bluetooth_adapter_->IsPowered();
 }
 
+bool SystemTrayDelegateChromeOS::GetBluetoothDiscovering() {
+  return (bluetooth_discovery_session_.get() &&
+      bluetooth_discovery_session_->IsActive());
+}
+
 void SystemTrayDelegateChromeOS::ChangeProxySettings() {
   CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE);
   LoginDisplayHostImpl::default_host()->OpenProxySettings();
 }
 
 ash::VolumeControlDelegate*
 SystemTrayDelegateChromeOS::GetVolumeControlDelegate() const {
   return volume_control_delegate_.get();
 }
 
@@ skipping 459 matching lines @@
 
 void SystemTrayDelegateChromeOS::OnStartBluetoothDiscoverySession(
     scoped_ptr<device::BluetoothDiscoverySession> discovery_session) {
   // If the discovery session was returned after a request to stop discovery
   // (e.g. the user dismissed the Bluetooth detailed view before the call
   // returned), don't claim the discovery session and let it clean up.
   if (!should_run_bluetooth_discovery_)
     return;
   VLOG(1) << "Claiming new Bluetooth device discovery session.";
   bluetooth_discovery_session_ = discovery_session.Pass();
+  GetSystemTrayNotifier()->NotifyBluetoothDiscoveringChanged();
 }
 
 void SystemTrayDelegateChromeOS::UpdateEnterpriseDomain() {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   std::string enterprise_domain = connector->GetEnterpriseDomain();
   if (enterprise_domain_ != enterprise_domain) {
     enterprise_domain_ = enterprise_domain;
     GetSystemTrayNotifier()->NotifyEnterpriseDomainChanged();
   }
@@ skipping 38 matching lines @@
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos