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

Unified Diff: device/bluetooth/dbus/bluetooth_agent_service_provider.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/dbus/bluetooth_agent_service_provider.h
diff --git a/device/bluetooth/dbus/bluetooth_agent_service_provider.h b/device/bluetooth/dbus/bluetooth_agent_service_provider.h
index 162cf7ec242126705ae5e2234cfb6c0d806bfb91..5248a55e560083ed4161e1f601c2f07112cae5a5 100644
--- a/device/bluetooth/dbus/bluetooth_agent_service_provider.h
+++ b/device/bluetooth/dbus/bluetooth_agent_service_provider.h
@@ -5,10 +5,12 @@
#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
+#include <stdint.h>
+
#include <string>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "dbus/bus.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
@@ -51,7 +53,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAgentServiceProvider {
// be called with two arguments, the |status| of the request (success,
// rejected or cancelled) and the |passkey| requested, a numeric in the
// range 0-999999,
- typedef base::Callback<void(Status, uint32)> PasskeyCallback;
+ typedef base::Callback<void(Status, uint32_t)> PasskeyCallback;
// The ConfirmationCallback is used for methods which request confirmation
// or authorization, it should be called with one argument, the |status|
@@ -113,8 +115,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAgentServiceProvider {
// As the user enters the passkey onto the device, |entered| will be
// updated to reflect the number of digits entered so far.
virtual void DisplayPasskey(const dbus::ObjectPath& device_path,
- uint32 passkey,
- uint16 entered) = 0;
+ uint32_t passkey,
+ uint16_t entered) = 0;
// This method will be called when the Bluetooth daemon requires that the
// user confirm that the Passkey |passkey| is displayed on the screen
@@ -128,7 +130,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAgentServiceProvider {
// range 0-999999 and should be always present zero-padded to six
// digits.
virtual void RequestConfirmation(const dbus::ObjectPath& device_path,
- uint32 passkey,
+ uint32_t passkey,
const ConfirmationCallback& callback) = 0;
// This method will be called when the Bluetooth daemon requires
« no previous file with comments | « device/bluetooth/dbus/bluetooth_agent_manager_client.cc ('k') | device/bluetooth/dbus/bluetooth_agent_service_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698