Chromium Code Reviews| Index: chrome/browser/chromeos/bluetooth/bluetooth_device.cc |
| diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc |
| index 3fd8969876718d5f0b4b16bbbc1ff1431c214a4a..39fce947c3fc961120a14aed0e963c3e994fdeed 100644 |
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc |
| +++ b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc |
| @@ -249,9 +249,13 @@ void BluetoothDevice::Connect(PairingDelegate* pairing_delegate, |
| agent_path_basename); |
| dbus::Bus* system_bus = DBusThreadManager::Get()->GetSystemBus(); |
| - agent_.reset(BluetoothAgentServiceProvider::Create(system_bus, |
| - agent_path, |
| - this)); |
| + if (system_bus) { |
| + agent_.reset(BluetoothAgentServiceProvider::Create(system_bus, |
| + agent_path, |
| + this)); |
| + } else { |
| + agent_.reset(NULL); |
|
satorux1
2012/08/11 23:00:07
nit: you could do agent_.reset();
|
| + } |
| DVLOG(1) << "Pairing: " << address_; |
| DBusThreadManager::Get()->GetBluetoothAdapterClient()-> |