diff options
| author | deymo@chromium.org <deymo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 22:09:48 +0000 |
|---|---|---|
| committer | deymo@chromium.org <deymo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 22:09:48 +0000 |
| commit | 874a8467c0eed9b3d2be78dd1175c888ac7bc3cb (patch) | |
| tree | 6e843af714750919c022178a98d5db878e227920 /device | |
| parent | 8c14843b5e2ee88f9d7c090618a75e557b88eef7 (diff) | |
| download | chromium_src-874a8467c0eed9b3d2be78dd1175c888ac7bc3cb.zip chromium_src-874a8467c0eed9b3d2be78dd1175c888ac7bc3cb.tar.gz chromium_src-874a8467c0eed9b3d2be78dd1175c888ac7bc3cb.tar.bz2 | |
Bluetooth: Cache the pairing passkey and pincode in the option handler
This patch persist the value of pairing, pincode, passkey and entered
members of the device object sent to the JS UI while updating the
pairing overlay. The passkey and pincode values are persisted only
when the pairing value implies their existence.
This patch also includes a small bugfix in the DBus agent service
provider to properly parse the "entered" argument.
BUG=233786
TEST=Manual test.
Manual test:
============
Take a 2.1 Bluetooth Keyboard (like the Motorola KZ450) and attempt
a pairing with it. While typing the passkey in the keyboard, the keys
on the screen should change the style as you type them.
Note: Typing the wrong key will also highlight the keys on the screen
and that's ok.
Review URL: https://chromiumcodereview.appspot.com/14036016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
| -rw-r--r-- | device/bluetooth/bluetooth_device_experimental_chromeos.cc | 3 | ||||
| -rw-r--r-- | device/bluetooth/bluetooth_device_experimental_chromeos.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/device/bluetooth/bluetooth_device_experimental_chromeos.cc b/device/bluetooth/bluetooth_device_experimental_chromeos.cc index 4b99dbe..9183803 100644 --- a/device/bluetooth/bluetooth_device_experimental_chromeos.cc +++ b/device/bluetooth/bluetooth_device_experimental_chromeos.cc @@ -341,7 +341,8 @@ void BluetoothDeviceExperimentalChromeOS::RequestPasskey( void BluetoothDeviceExperimentalChromeOS::DisplayPasskey( const dbus::ObjectPath& device_path, - uint32 passkey, int16 entered) { + uint32 passkey, + uint16 entered) { DCHECK(agent_.get()); DCHECK(device_path == object_path_); VLOG(1) << object_path_.value() << ": DisplayPasskey: " << passkey diff --git a/device/bluetooth/bluetooth_device_experimental_chromeos.h b/device/bluetooth/bluetooth_device_experimental_chromeos.h index a6b838c..8433f8e 100644 --- a/device/bluetooth/bluetooth_device_experimental_chromeos.h +++ b/device/bluetooth/bluetooth_device_experimental_chromeos.h @@ -91,7 +91,7 @@ class BluetoothDeviceExperimentalChromeOS virtual void RequestPasskey(const dbus::ObjectPath& device_path, const PasskeyCallback& callback) OVERRIDE; virtual void DisplayPasskey(const dbus::ObjectPath& device_path, - uint32 passkey, int16 entered) OVERRIDE; + uint32 passkey, uint16 entered) OVERRIDE; virtual void RequestConfirmation(const dbus::ObjectPath& device_path, uint32 passkey, const ConfirmationCallback& callback) |