Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1161)

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 12385064: Introduce 'connecting' field to bluetooth device info for system tray (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 9d9791c7a79f4161bf2c744a76d08afba5041e4b..e2801f4b0b87c2a24ae07822f5fca624f48eea6d 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -534,6 +534,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);
}
@@ -559,7 +560,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
device->Disconnect(
base::Bind(&base::DoNothing),
base::Bind(&BluetoothDeviceDisconnectError));
- } else if (device->IsPaired()) {
+ } else if (device->IsPaired() || device->IsConnecting()) {
device->Connect(
NULL,
base::Bind(&base::DoNothing),
« ash/system/bluetooth/tray_bluetooth.cc ('K') | « ash/system/tray/system_tray_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698