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

Unified Diff: device/bluetooth/bluetooth_device_experimental_chromeos.cc

Issue 13870020: Bluetooth: Add support for pairing display notifications (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: implementation and test 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: device/bluetooth/bluetooth_device_experimental_chromeos.cc
diff --git a/device/bluetooth/bluetooth_device_experimental_chromeos.cc b/device/bluetooth/bluetooth_device_experimental_chromeos.cc
index fb36c8450c43312e928c254f5a19fdd1135a32ea..f45e7d43c8c4bc6a99a6a734eebf4444752c9b3c 100644
--- a/device/bluetooth/bluetooth_device_experimental_chromeos.cc
+++ b/device/bluetooth/bluetooth_device_experimental_chromeos.cc
@@ -327,12 +327,10 @@ void BluetoothDeviceExperimentalChromeOS::DisplayPasskey(
VLOG(1) << object_path_.value() << ": DisplayPasskey: " << passkey
<< " (" << entered << " entered)";
- // TODO(keybuk): disambiguate entered vs display
- if (entered > 0)
- return;
-
DCHECK(pairing_delegate_);
- pairing_delegate_->DisplayPasskey(this, passkey);
+ if (entered == 0)
+ pairing_delegate_->DisplayPasskey(this, passkey);
+ pairing_delegate_->KeysEntered(this, entered);
}
void BluetoothDeviceExperimentalChromeOS::RequestConfirmation(

Powered by Google App Engine
This is Rietveld 408576698