components/pairing/bluetooth_controller_pairing_controller.cc - 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.cc

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/pairing/bluetooth_controller_pairing_controller.h ('k') | components/pairing/bluetooth_host_pairing_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/pairing/bluetooth_controller_pairing_controller.cc

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

index 2f2553a6db2a13ad0e0f6f2f079e4412b656a479..1a6fe8085247806ee6e2b2439b736d49853507d1 100644

--- a/components/pairing/bluetooth_controller_pairing_controller.cc

+++ b/components/pairing/bluetooth_controller_pairing_controller.cc

@@ -471,21 +471,21 @@ void BluetoothControllerPairingController::DisplayPinCode(

void BluetoothControllerPairingController::DisplayPasskey(

device::BluetoothDevice* device,

- uint32 passkey) {

+ uint32_t passkey) {

// Disallow unknown device.

device->RejectPairing();

}

void BluetoothControllerPairingController::KeysEntered(

device::BluetoothDevice* device,

- uint32 entered) {

+ uint32_t entered) {

// Disallow unknown device.

device->RejectPairing();

}

void BluetoothControllerPairingController::ConfirmPasskey(

device::BluetoothDevice* device,

- uint32 passkey) {

+ uint32_t passkey) {

confirmation_code_ = base::StringPrintf("%06d", passkey);

ChangeStage(STAGE_WAITING_FOR_CODE_CONFIRMATION);

}