diff options
| author | ortuno <ortuno@chromium.org> | 2016-02-11 12:06:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-11 20:08:16 +0000 |
| commit | 6c3fd3ccf5925c7d52d886cdcb308b4862ad690b (patch) | |
| tree | 4f358c50fbfb53aa146e895a17aab134bfcdf40b /content/browser/bluetooth/bluetooth_dispatcher_host.cc | |
| parent | f4ac65f49a25025e54c0daa2097852f0d8c48277 (diff) | |
| download | chromium_src-6c3fd3ccf5925c7d52d886cdcb308b4862ad690b.zip chromium_src-6c3fd3ccf5925c7d52d886cdcb308b4862ad690b.tar.gz chromium_src-6c3fd3ccf5925c7d52d886cdcb308b4862ad690b.tar.bz2 | |
bluetooth: Enable Web Bluetooth through experimental framework
This enables Web Bluetooth through experimental frameworks in supported platforms.
Intent to Experiment: https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/coyvHj1u2Z8
Adds the APIExperimentEnabled extended binding so that the bindings are visible
to domains specified by the Experimental Framework.
Also adds WebBluetooth to frames and BluetoothDispatcherHost to processes' filters for supported platforms.
TEST=Manual testing required:
Launch chrome with the following command line flag:
--enable-blink-features=ExperimentalFramework and perform the following tests:
On a Chrome OS device and an Android device:
1. Visit: https://g-ortuno.github.io/web-bluetooth-sandbox/allowed.html
2. Press the "Run Test" button.
3. "Web Bluetooth bindings" should be "Present" and "Use Web Bluetooth" should
be "Bluetooth Works".
1. Visit: https://g-ortuno.github.io/web-bluetooth-sandbox/not-allowed.html
2. Press the "Run Test" button.
3. "Web Bluetooth bindings" should be "Present" and "Use Web Bluetooth" should
be "Bluetooth Unavailable".
On a Linux, OSX and Windows devices:
1. Visit: https://g-ortuno.github.io/web-bluetooth-sandbox/allowed.html
2. Press the "Run Test" button.
3. "Web Bluetooth bindings" should be "Present" and "Use Web Bluetooth" should
be "Bluetooth blocked".
1. Visit: https://g-ortuno.github.io/web-bluetooth-sandbox/not-allowed.html
2. Press the "Run Test" button.
3. "Web Bluetooth bindings" should be "Present" and "Use Web Bluetooth" should
be "Bluetooth Unavailable".
Launch Chrome with the following command line flags:
--enable-blink-features=ExperimentalFramework --enable-web-bluetooth
On a Chrome OS, Android, Linux, OSX, and Windows devices:
1. Visit: https://g-ortuno.github.io/web-bluetooth-sandbox/allowed.html
2. Press the "Run Test" button.
3. "Web Bluetooth bindings" should be "Present" and "Use Web Bluetooth" should
be "Bluetooth Works".
On a Chrome OS, Android, Linux, OSX, and Windows devices:
1. Visit: https://g-ortuno.github.io/web-bluetooth-sandbox/not-allowed.html
2. Press the "Run Test" button.
3. "Web Bluetooth bindings" should be "Present" and "Use Web Bluetooth" should
be "Bluetooth Works".
BUG=584113
Review URL: https://codereview.chromium.org/1662183002
Cr-Commit-Position: refs/heads/master@{#374954}
Diffstat (limited to 'content/browser/bluetooth/bluetooth_dispatcher_host.cc')
| -rw-r--r-- | content/browser/bluetooth/bluetooth_dispatcher_host.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/content/browser/bluetooth/bluetooth_dispatcher_host.cc b/content/browser/bluetooth/bluetooth_dispatcher_host.cc index 69a7376..c5fca31 100644 --- a/content/browser/bluetooth/bluetooth_dispatcher_host.cc +++ b/content/browser/bluetooth/bluetooth_dispatcher_host.cc @@ -254,11 +254,6 @@ BluetoothDispatcherHost::BluetoothDispatcherHost(int render_process_id) // Bind all future weak pointers to the UI thread. weak_ptr_on_ui_thread_ = weak_ptr_factory_.GetWeakPtr(); weak_ptr_on_ui_thread_.get(); // Associates with UI thread. - - if (BluetoothAdapterFactory::IsBluetoothAdapterAvailable()) - BluetoothAdapterFactory::GetAdapter( - base::Bind(&BluetoothDispatcherHost::set_adapter, - weak_ptr_factory_.GetWeakPtr())); } void BluetoothDispatcherHost::OnDestruct() const { |