| Index: device/bluetooth/bluetooth_service_record.h
|
| diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_service_record.h b/device/bluetooth/bluetooth_service_record.h
|
| similarity index 80%
|
| rename from chrome/browser/chromeos/bluetooth/bluetooth_service_record.h
|
| rename to device/bluetooth/bluetooth_service_record.h
|
| index 2e43d72a732a39347ecd6d2a38075a6c46467d7a..e04d73a632f86fa4be5bcbbc9f494f7ae2bf03f4 100644
|
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_service_record.h
|
| +++ b/device/bluetooth/bluetooth_service_record.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
|
| -#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
|
| +#ifndef DEVICE_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
|
| +#define DEVICE_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
|
|
|
| #include <string>
|
|
|
| @@ -11,7 +11,7 @@
|
|
|
| class XmlReader;
|
|
|
| -namespace chromeos {
|
| +namespace device {
|
|
|
| // BluetoothServiceRecord represents an SDP service record.
|
| //
|
| @@ -38,7 +38,7 @@ class BluetoothServiceRecord {
|
|
|
| // The RFCOMM channel to use, if this service supports RFCOMM communication.
|
| // The return value is undefined if SupportsRfcomm() returns false.
|
| - uint8_t rfcomm_channel() const { return rfcomm_channel_; }
|
| + uint8 rfcomm_channel() const { return rfcomm_channel_; }
|
|
|
| private:
|
| void ExtractChannels(XmlReader* reader);
|
| @@ -49,11 +49,11 @@ class BluetoothServiceRecord {
|
| std::string uuid_;
|
|
|
| bool supports_rfcomm_;
|
| - uint8_t rfcomm_channel_;
|
| + uint8 rfcomm_channel_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothServiceRecord);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace device
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
|
| +#endif // DEVICE_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
|
|
|