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

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

Issue 13933012: Bluetooth: Don't attempt a pairing for devices not supporting it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: aura shell impl 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 59a6b43db3dfa638ccec9d6704bd2d2553927a62..d2b3d7d5d1974672970c74678dec88847980520f 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -614,7 +614,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
device->Disconnect(
base::Bind(&base::DoNothing),
base::Bind(&BluetoothDeviceDisconnectError));
- } else if (device->IsPaired()) {
+ } else if (device->IsPaired() || !device->IsPairable()) {
device->Connect(
NULL,
base::Bind(&base::DoNothing),
keybuk 2013/04/17 17:53:09 In the BluetoothOptionsHandler patch, you change t
deymo 2013/04/17 17:57:55 The Aura shell doesn't use a pairing window in thi

Powered by Google App Engine
This is Rietveld 408576698