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

Unified Diff: chrome/browser/chromeos/extensions/bluetooth_event_router.cc

Issue 10790148: BluetoothAPI: ignore events for other adapters (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/bluetooth_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc b/chrome/browser/chromeos/extensions/bluetooth_event_router.cc
index a5195b949f5a86c569af7b35c58b105e60b71801..8cd0b0c61442555914aec47feb195201aec83228 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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698