diff options
| author | scheib <scheib@chromium.org> | 2015-01-20 11:19:44 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-20 19:20:30 +0000 |
| commit | 87f458906d9fb18e31ab051cd2e182550f1e15af (patch) | |
| tree | 51d33585cf7476332183266c92bfe43d0bd125c3 /device | |
| parent | 828734f4ebd5873f7ce2d5dec12409ab4d31d6b1 (diff) | |
| download | chromium_src-87f458906d9fb18e31ab051cd2e182550f1e15af.zip chromium_src-87f458906d9fb18e31ab051cd2e182550f1e15af.tar.gz chromium_src-87f458906d9fb18e31ab051cd2e182550f1e15af.tar.bz2 | |
bluetooth: Use BluetoothAdapter in BluetoothDispatcherHost.
Previously only simple mock responses were supported in
BluetoothDispatcherHost. This change adds use of an actual adapter,
and enables the first actual bluetooth.requestDevices responses
to function in the browser (with the experimental-web-platform-features
flag).
BUG=420284
Review URL: https://codereview.chromium.org/787953004
Cr-Commit-Position: refs/heads/master@{#312241}
Diffstat (limited to 'device')
| -rw-r--r-- | device/bluetooth/bluetooth_adapter.h | 2 | ||||
| -rw-r--r-- | device/bluetooth/bluetooth_adapter_chromeos.h | 2 | ||||
| -rw-r--r-- | device/bluetooth/test/mock_bluetooth_adapter.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/device/bluetooth/bluetooth_adapter.h b/device/bluetooth/bluetooth_adapter.h index f7b760b..77c64ee 100644 --- a/device/bluetooth/bluetooth_adapter.h +++ b/device/bluetooth/bluetooth_adapter.h @@ -197,7 +197,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapter // BluetoothAdapter. After this call, the BluetoothAdapter will behave as if // no Bluetooth controller exists in the local system. |IsPresent| will return // false. - void Shutdown(); + virtual void Shutdown(); #endif // Adds and removes observers for events on this bluetooth adapter. If diff --git a/device/bluetooth/bluetooth_adapter_chromeos.h b/device/bluetooth/bluetooth_adapter_chromeos.h index af466f2..5ee633f 100644 --- a/device/bluetooth/bluetooth_adapter_chromeos.h +++ b/device/bluetooth/bluetooth_adapter_chromeos.h @@ -47,7 +47,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS static base::WeakPtr<BluetoothAdapter> CreateAdapter(); // BluetoothAdapter: - void Shutdown(); + void Shutdown() override; void DeleteOnCorrectThread() const override; void AddObserver(device::BluetoothAdapter::Observer* observer) override; void RemoveObserver(device::BluetoothAdapter::Observer* observer) override; diff --git a/device/bluetooth/test/mock_bluetooth_adapter.h b/device/bluetooth/test/mock_bluetooth_adapter.h index af4f053..fd67936 100644 --- a/device/bluetooth/test/mock_bluetooth_adapter.h +++ b/device/bluetooth/test/mock_bluetooth_adapter.h @@ -35,7 +35,7 @@ class MockBluetoothAdapter : public BluetoothAdapter { virtual bool IsInitialized() const { return true; } #if defined(OS_CHROMEOS) - void Shutdown(); + void Shutdown() override; #endif MOCK_METHOD1(AddObserver, void(BluetoothAdapter::Observer*)); MOCK_METHOD1(RemoveObserver, void(BluetoothAdapter::Observer*)); |