Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
index 9b187a89a42f7d67bc30747821c1b9f0695534cf..89ae73fea1b82357a162e3bd463b914733862d5c 100644 |
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
@@ -588,6 +588,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, |
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); |
} |
@@ -607,7 +608,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, |
virtual void ToggleBluetoothConnection(const std::string& address) OVERRIDE { |
device::BluetoothDevice* device = bluetooth_adapter_->GetDevice(address); |
- if (!device) |
+ if (!device || device->IsConnecting()) |
return; |
if (device->IsConnected()) { |
device->Disconnect( |