Chromium Code Reviews| Index: public/platform/WebBluetoothDevice.h |
| diff --git a/public/platform/WebBluetoothDevice.h b/public/platform/WebBluetoothDevice.h |
| index adbff14bb72d6f8e614d8abcfee746ff90289405..714b9d1fe4ea960c0428be9ff604596307cbad27 100644 |
| --- a/public/platform/WebBluetoothDevice.h |
| +++ b/public/platform/WebBluetoothDevice.h |
| @@ -2,58 +2,4 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef WebBluetoothDevice_h |
| -#define WebBluetoothDevice_h |
| - |
| -#include "WebString.h" |
| -#include "WebVector.h" |
| - |
| -namespace blink { |
| - |
| -// Information describing a Bluetooth device provided by the platform. |
| -struct WebBluetoothDevice { |
| - enum class VendorIDSource { |
| - Unknown, |
| - Bluetooth, |
| - USB |
| - }; |
| - |
| - WebBluetoothDevice(const WebString& instanceID, |
| - const WebString& name, |
| - int32_t deviceClass, |
| - VendorIDSource vendorIDSource, |
| - uint16_t vendorID, |
| - uint16_t productID, |
| - uint16_t productVersion, |
| - bool paired, |
| - bool connected, |
| - const WebVector<WebString>& uuids) |
| - : instanceID(instanceID) |
| - , name(name) |
| - , deviceClass(deviceClass) |
| - , vendorIDSource(vendorIDSource) |
| - , vendorID(vendorID) |
| - , productID(productID) |
| - , productVersion(productVersion) |
| - , paired(paired) |
| - , connected(connected) |
| - , uuids(uuids) |
| - { |
| - } |
| - |
| - // Members corresponding to BluetoothDevice attributes as specified in IDL. |
| - const WebString instanceID; |
| - const WebString name; |
| - const int32_t deviceClass; |
| - const VendorIDSource vendorIDSource; |
| - const uint16_t vendorID; |
| - const uint16_t productID; |
| - const uint16_t productVersion; |
| - const bool paired; |
| - const bool connected; |
| - const WebVector<WebString> uuids; |
| -}; |
| - |
| -} // namespace blink |
| - |
| -#endif // WebBluetoothDevice_h |
| +#include "public/platform/modules/bluetooth/WebBluetoothDevice.h" |
|
scheib
2015/04/13 17:46:34
ditto
|