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

Unified Diff: chromeos/dbus/fake_bluetooth_input_client.cc

Issue 189753002: Bluetooth: use generic names for fake devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@modalias-device-id
Patch Set: Created 6 years, 9 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 | « chromeos/dbus/fake_bluetooth_device_client.cc ('k') | device/bluetooth/bluetooth_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/fake_bluetooth_input_client.cc
diff --git a/chromeos/dbus/fake_bluetooth_input_client.cc b/chromeos/dbus/fake_bluetooth_input_client.cc
index 9e40f6e715ea5a4ccd5021a055192fb228941a4b..b397d8b17180da8f1cecad8037b48d37b826f640 100644
--- a/chromeos/dbus/fake_bluetooth_input_client.cc
+++ b/chromeos/dbus/fake_bluetooth_input_client.cc
@@ -85,10 +85,14 @@ void FakeBluetoothInputClient::AddInputDevice(
base::Unretained(this),
object_path));
- // Mark Apple mouse and keyboard as ReconnectMode "any" and the Motorola and
- // Microsoft devices as ReconnectMode "device".
- if (object_path.value() == FakeBluetoothDeviceClient::kMotorolaKeyboardPath ||
- object_path.value() == FakeBluetoothDeviceClient::kMicrosoftMousePath) {
+ // The LegacyAutopair and DisplayPinCode devices represent a typical mouse
+ // and keyboard respectively, so mark them as ReconnectMode "any". The
+ // DisplayPasskey device represents a Bluetooth 2.1+ keyboard and the
+ // ConnectUnpairable device represents a pre-standardization mouse, so mark
+ // them as ReconnectMode "device".
+ if (object_path.value() == FakeBluetoothDeviceClient::kDisplayPasskeyPath ||
+ object_path.value() ==
+ FakeBluetoothDeviceClient::kConnectUnpairablePath) {
properties->reconnect_mode.ReplaceValue(
bluetooth_input::kDeviceReconnectModeProperty);
} else {
« no previous file with comments | « chromeos/dbus/fake_bluetooth_device_client.cc ('k') | device/bluetooth/bluetooth_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698