summaryrefslogtreecommitdiffstats
path: root/extensions/common
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-11-20 14:05:17 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-20 22:06:46 +0000
commit502025c2c3802f36e163e320a819e879a3ddf88f (patch)
treecfe77581a30ab630ae14edb355728ad1b9c1f1de /extensions/common
parentde3c7279759c9bf318961371c5454eeecac508a3 (diff)
downloadchromium_src-502025c2c3802f36e163e320a819e879a3ddf88f.zip
chromium_src-502025c2c3802f36e163e320a819e879a3ddf88f.tar.gz
chromium_src-502025c2c3802f36e163e320a819e879a3ddf88f.tar.bz2
Use bluetooth and bluetoothPrivate APIs in Options UI
BUG=543294 For device/bluetooth/dbus/ TBR=armansito@chromium.org Review URL: https://codereview.chromium.org/1434383003 Cr-Commit-Position: refs/heads/master@{#360925}
Diffstat (limited to 'extensions/common')
-rw-r--r--extensions/common/api/_api_features.json2
-rw-r--r--extensions/common/api/bluetooth_private.idl2
2 files changed, 3 insertions, 1 deletions
diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json
index 012d906..878d7ba 100644
--- a/extensions/common/api/_api_features.json
+++ b/extensions/common/api/_api_features.json
@@ -93,6 +93,7 @@
"channel": "stable",
"contexts": ["webui"],
"matches": [
+ "chrome://bluetooth-pairing/*",
"chrome://md-settings/*",
"chrome://settings/*",
"chrome://settings-frame/*"
@@ -109,6 +110,7 @@
"channel": "stable",
"contexts": ["webui"],
"matches": [
+ "chrome://bluetooth-pairing/*",
"chrome://md-settings/*",
"chrome://settings/*",
"chrome://settings-frame/*"
diff --git a/extensions/common/api/bluetooth_private.idl b/extensions/common/api/bluetooth_private.idl
index e3c60fd8..af6e893 100644
--- a/extensions/common/api/bluetooth_private.idl
+++ b/extensions/common/api/bluetooth_private.idl
@@ -91,7 +91,7 @@ namespace bluetoothPrivate {
bluetooth.Device device;
// The response type.
- PairingResponse? response;
+ PairingResponse response;
// A 1-16 character alphanumeric set in response to
// <code>requestPincode</code>.