diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 16:54:07 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 16:54:07 +0000 |
| commit | 4d7175b499322b70fe72bf17af4b60af2c2fae1d (patch) | |
| tree | f91b875d09053f79eb9aa3224e7923f004b6dfeb | |
| parent | 44c7b85687c2dd74a024b2afa68bb27a173dc9b4 (diff) | |
| download | chromium_src-4d7175b499322b70fe72bf17af4b60af2c2fae1d.zip chromium_src-4d7175b499322b70fe72bf17af4b60af2c2fae1d.tar.gz chromium_src-4d7175b499322b70fe72bf17af4b60af2c2fae1d.tar.bz2 | |
BluetoothAPI: ignore events for other adapters
TEST=api test still passes
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10790148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149429 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/extensions/bluetooth_event_router.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc b/chrome/browser/chromeos/extensions/bluetooth_event_router.cc index a5195b9..8cd0b0c 100644 --- a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc +++ b/chrome/browser/chromeos/extensions/bluetooth_event_router.cc @@ -69,7 +69,11 @@ void ExtensionBluetoothEventRouter::SetSendDiscoveryEvents(bool should_send) { void ExtensionBluetoothEventRouter::AdapterPresentChanged( chromeos::BluetoothAdapter* adapter, bool present) { - DCHECK(adapter == adapter_.get()); + if (adapter != adapter_.get()) { + DVLOG(1) << "Ignoring event for adapter " << adapter->address(); + return; + } + DispatchBooleanValueEvent( extensions::event_names::kBluetoothOnAvailabilityChanged, present); @@ -77,7 +81,11 @@ void ExtensionBluetoothEventRouter::AdapterPresentChanged( void ExtensionBluetoothEventRouter::AdapterPoweredChanged( chromeos::BluetoothAdapter* adapter, bool has_power) { - DCHECK(adapter == adapter_.get()); + if (adapter != adapter_.get()) { + DVLOG(1) << "Ignoring event for adapter " << adapter->address(); + return; + } + DispatchBooleanValueEvent( extensions::event_names::kBluetoothOnPowerChanged, has_power); @@ -85,7 +93,11 @@ void ExtensionBluetoothEventRouter::AdapterPoweredChanged( void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged( chromeos::BluetoothAdapter* adapter, bool discovering) { - DCHECK(adapter == adapter_.get()); + if (adapter != adapter_.get()) { + DVLOG(1) << "Ignoring event for adapter " << adapter->address(); + return; + } + DispatchBooleanValueEvent( extensions::event_names::kBluetoothOnDiscoveringChanged, discovering); |