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

Unified Diff: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

Issue 12310048: Bluetooth: Add a "connectable" property to the BluetoothDevice. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 10 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: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc
index 25a36b52c97d2c3f3165c6ff7e9a184875fa35fe..07196d3ae89525ae54d3a7e346061c223e27d6a5 100644
--- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc
@@ -136,6 +136,8 @@ void BluetoothOptionsHandler::GetLocalizedValues(
IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_TIMEOUT },
{ "bluetoothConnectUnsupportedDevice",
IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_UNSUPPORTED_DEVICE },
+ { "bluetoothConnectSdpFailed",
+ IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_SDP_FAILED },
{ "bluetoothDisconnectFailed",
IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT_FAILED },
{ "bluetoothForgetFailed",
@@ -360,6 +362,9 @@ void BluetoothOptionsHandler::ConnectError(
case device::BluetoothDevice::ERROR_UNSUPPORTED_DEVICE:
error_name = "bluetoothConnectUnsupportedDevice";
break;
+ case device::BluetoothDevice::ERROR_SDP_FAILED:
+ error_name = "bluetoothConnectSdpFailed";
Dan Beam 2013/02/21 22:42:40 what does SDP mean?
deymo 2013/02/22 23:09:09 SDP = Service Discovery Protocol BTW, I'll remove
+ break;
}
// Report an error only if there's an error to report.
if (error_name)
@@ -410,6 +415,7 @@ void BluetoothOptionsHandler::SendDeviceNotification(
js_properties.SetBoolean("paired", device->IsPaired());
js_properties.SetBoolean("bonded", device->IsBonded());
js_properties.SetBoolean("connected", device->IsConnected());
+ js_properties.SetBoolean("connectable", device->IsConnectable());
Dan Beam 2013/02/21 22:42:40 also, I have no idea what "connectable" means.
deymo 2013/02/22 23:09:09 I chose the term "Connectable" from the "HIDNormal
if (params)
js_properties.MergeDictionary(params);
web_ui()->CallJavascriptFunction(

Powered by Google App Engine
This is Rietveld 408576698