Index: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc |
index f9948436888ff525d78156141612bd497a1b3793..695fa2b80e34ac52899addc8808e2f54f9782ad9 100644 |
--- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc |
@@ -289,11 +289,17 @@ void BluetoothOptionsHandler::UpdateDeviceCallback( |
<< ": " << auth_token; |
} |
} else { |
+ // Determine if the device supports pairing: |
+ PairingDelegate* delegate = NULL; |
+ if (device->IsPairable()) |
+ delegate = this; |
+ |
// Connection request. |
VLOG(1) << "Connect: " << address; |
device->Connect( |
- this, |
- base::Bind(&base::DoNothing), |
+ delegate, |
+ base::Bind(&BluetoothOptionsHandler::DismissDisplayOrConfirm, |
+ weak_ptr_factory_.GetWeakPtr()), |
base::Bind(&BluetoothOptionsHandler::ConnectError, |
weak_ptr_factory_.GetWeakPtr(), |
device->GetAddress())); |