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

Unified Diff: device/bluetooth/bluetooth_low_energy_device_mac.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
Index: device/bluetooth/bluetooth_low_energy_device_mac.h
diff --git a/device/bluetooth/bluetooth_low_energy_device_mac.h b/device/bluetooth/bluetooth_low_energy_device_mac.h
index 863cb1071a01bd6b5d2b212cc952a7aa2e7aedbb..19cbb0187e8f78ba22b36c7b8ef55bad0d1f3cb9 100644
--- a/device/bluetooth/bluetooth_low_energy_device_mac.h
+++ b/device/bluetooth/bluetooth_low_energy_device_mac.h
@@ -11,10 +11,14 @@
#import <IOBluetooth/IOBluetooth.h>
#endif // defined(OS_IOS)
+#include <stdint.h>
+
#include <set>
#include "base/mac/scoped_nsobject.h"
#include "base/mac/sdk_forward_declarations.h"
+#include "base/macros.h"
+#include "build/build_config.h"
#include "crypto/sha2.h"
#include "device/bluetooth/bluetooth_device_mac.h"
@@ -36,20 +40,20 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
// BluetoothDevice overrides.
std::string GetIdentifier() const override;
- uint32 GetBluetoothClass() const override;
+ uint32_t GetBluetoothClass() const override;
std::string GetAddress() const override;
BluetoothDevice::VendorIDSource GetVendorIDSource() const override;
- uint16 GetVendorID() const override;
- uint16 GetProductID() const override;
- uint16 GetDeviceID() const override;
+ uint16_t GetVendorID() const override;
+ uint16_t GetProductID() const override;
+ uint16_t GetDeviceID() const override;
bool IsPaired() const override;
bool IsConnected() const override;
bool IsGattConnected() const override;
bool IsConnectable() const override;
bool IsConnecting() const override;
BluetoothDevice::UUIDList GetUUIDs() const override;
- int16 GetInquiryRSSI() const override;
- int16 GetInquiryTxPower() const override;
+ int16_t GetInquiryRSSI() const override;
+ int16_t GetInquiryTxPower() const override;
bool ExpectingPinCode() const override;
bool ExpectingPasskey() const override;
bool ExpectingConfirmation() const override;
@@ -58,7 +62,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
const base::Closure& callback,
const ConnectErrorCallback& error_callback) override;
void SetPinCode(const std::string& pincode) override;
- void SetPasskey(uint32 passkey) override;
+ void SetPasskey(uint32_t passkey) override;
void ConfirmPairing() override;
void RejectPairing() override;
void CancelPairing() override;
« no previous file with comments | « device/bluetooth/bluetooth_low_energy_central_manager_delegate.h ('k') | device/bluetooth/bluetooth_low_energy_device_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698