Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2610)

Unified Diff: device/bluetooth/bluetooth_service_record_win.h

Issue 1542163002: Switch to standard integer types in device/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_rfcomm_channel_mac.h ('k') | device/bluetooth/bluetooth_service_record_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_service_record_win.h
diff --git a/device/bluetooth/bluetooth_service_record_win.h b/device/bluetooth/bluetooth_service_record_win.h
index cedc67efc0b9e7fc716f823dde6f8ed2a6bd9bd8..b7662a23c77646822eaec3cab91a4c32ef570685 100644
--- a/device/bluetooth/bluetooth_service_record_win.h
+++ b/device/bluetooth/bluetooth_service_record_win.h
@@ -5,10 +5,12 @@
#ifndef DEVICE_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_WIN_H_
#define DEVICE_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_WIN_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_init_win.h"
#include "device/bluetooth/bluetooth_uuid.h"
@@ -19,7 +21,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothServiceRecordWin {
public:
BluetoothServiceRecordWin(const std::string& device_address,
const std::string& name,
- const std::vector<uint8>& sdp_bytes,
+ const std::vector<uint8_t>& sdp_bytes,
const BluetoothUUID& gatt_uuid);
bool IsEqual(const BluetoothServiceRecordWin& other);
@@ -42,7 +44,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothServiceRecordWin {
// The RFCOMM channel to use, if this service supports RFCOMM communication.
// The return value is undefined if SupportsRfcomm() returns false.
- uint8 rfcomm_channel() const { return rfcomm_channel_; }
+ uint8_t rfcomm_channel() const { return rfcomm_channel_; }
private:
BTH_ADDR device_bth_addr_;
@@ -51,7 +53,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothServiceRecordWin {
BluetoothUUID uuid_;
bool supports_rfcomm_;
- uint8 rfcomm_channel_;
+ uint8_t rfcomm_channel_;
DISALLOW_COPY_AND_ASSIGN(BluetoothServiceRecordWin);
};
« no previous file with comments | « device/bluetooth/bluetooth_rfcomm_channel_mac.h ('k') | device/bluetooth/bluetooth_service_record_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698