components/pairing/bluetooth_controller_pairing_controller.h - Issue 1551433002: Switch to standard integer types in components/, part 3 of 4.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/pairing/bluetooth_controller_pairing_controller.h

Issue 1551433002: Switch to standard integer types in components/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more 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 | « components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc ('k') | components/pairing/bluetooth_controller_pairing_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/pairing/bluetooth_controller_pairing_controller.h

diff --git a/components/pairing/bluetooth_controller_pairing_controller.h b/components/pairing/bluetooth_controller_pairing_controller.h

index c987563db49e2e8045e746696cd8f29aeba8705a..177211d7ca66e63348f858d96e8b11a306fcea63 100644

--- a/components/pairing/bluetooth_controller_pairing_controller.h

+++ b/components/pairing/bluetooth_controller_pairing_controller.h

@@ -5,6 +5,8 @@

#ifndef COMPONENTS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_CONTROLLER_H_

#define COMPONENTS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_CONTROLLER_H_

+#include <stdint.h>

#include <set>

#include "base/macros.h"

@@ -97,9 +99,11 @@ class BluetoothControllerPairingController

void RequestPasskey(device::BluetoothDevice* device) override;

void DisplayPinCode(device::BluetoothDevice* device,

const std::string& pincode) override;

- void DisplayPasskey(device::BluetoothDevice* device, uint32 passkey) override;

- void KeysEntered(device::BluetoothDevice* device, uint32 entered) override;

- void ConfirmPasskey(device::BluetoothDevice* device, uint32 passkey) override;

+ void DisplayPasskey(device::BluetoothDevice* device,

+ uint32_t passkey) override;

+ void KeysEntered(device::BluetoothDevice* device, uint32_t entered) override;

+ void ConfirmPasskey(device::BluetoothDevice* device,

+ uint32_t passkey) override;

void AuthorizePairing(device::BluetoothDevice* device) override;

Stage current_stage_;