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

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: Created 7 years, 10 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 5d9041afd4a147dd0097891a5f29c6898063633d..3035b6b9e5057917c9c3f117bbd58d3d49690c30 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -503,6 +503,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
info.address = device->address();
info.display_name = device->GetName();
info.connected = device->IsConnected();
+ info.connecting = device->IsConnecting();
info.paired = device->IsPaired();
info.visible = device->IsVisible();
list->push_back(info);
@@ -525,7 +526,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
device::BluetoothDevice* device = bluetooth_adapter_->GetDevice(address);
if (!device)
return;
- if (device->IsConnected()) {
+ if (device->IsConnected() || device->IsConnecting()) {
jennyz 2013/03/02 01:12:16 If the bluetooth is connecting, it could be one of
deymo 2013/03/02 02:31:13 If IsConnecting is true, means that a connection i
Jun Mukai 2013/04/09 03:15:08 moved the conditions. now it attempts to connect.
device->Disconnect(
base::Bind(&base::DoNothing),
base::Bind(&BluetoothDeviceDisconnectError));
« 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