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

Side by Side 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 4 years, 12 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_CONTROLLER_H_ 5 #ifndef COMPONENTS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_CONTROLLER_H_
6 #define COMPONENTS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_CONTROLLER_H_ 6 #define COMPONENTS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_CONTROLLER_H_
7 7
8 #include <stdint.h>
9
8 #include <set> 10 #include <set>
9 11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
12 #include "base/observer_list.h" 14 #include "base/observer_list.h"
13 #include "base/threading/thread_checker.h" 15 #include "base/threading/thread_checker.h"
14 #include "components/pairing/controller_pairing_controller.h" 16 #include "components/pairing/controller_pairing_controller.h"
15 #include "components/pairing/proto_decoder.h" 17 #include "components/pairing/proto_decoder.h"
16 #include "device/bluetooth/bluetooth_adapter.h" 18 #include "device/bluetooth/bluetooth_adapter.h"
17 #include "device/bluetooth/bluetooth_device.h" 19 #include "device/bluetooth/bluetooth_device.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void DeviceAdded(device::BluetoothAdapter* adapter, 92 void DeviceAdded(device::BluetoothAdapter* adapter,
91 device::BluetoothDevice* device) override; 93 device::BluetoothDevice* device) override;
92 void DeviceRemoved(device::BluetoothAdapter* adapter, 94 void DeviceRemoved(device::BluetoothAdapter* adapter,
93 device::BluetoothDevice* device) override; 95 device::BluetoothDevice* device) override;
94 96
95 // device::BluetoothDevice::PairingDelegate: 97 // device::BluetoothDevice::PairingDelegate:
96 void RequestPinCode(device::BluetoothDevice* device) override; 98 void RequestPinCode(device::BluetoothDevice* device) override;
97 void RequestPasskey(device::BluetoothDevice* device) override; 99 void RequestPasskey(device::BluetoothDevice* device) override;
98 void DisplayPinCode(device::BluetoothDevice* device, 100 void DisplayPinCode(device::BluetoothDevice* device,
99 const std::string& pincode) override; 101 const std::string& pincode) override;
100 void DisplayPasskey(device::BluetoothDevice* device, uint32 passkey) override; 102 void DisplayPasskey(device::BluetoothDevice* device,
101 void KeysEntered(device::BluetoothDevice* device, uint32 entered) override; 103 uint32_t passkey) override;
102 void ConfirmPasskey(device::BluetoothDevice* device, uint32 passkey) override; 104 void KeysEntered(device::BluetoothDevice* device, uint32_t entered) override;
105 void ConfirmPasskey(device::BluetoothDevice* device,
106 uint32_t passkey) override;
103 void AuthorizePairing(device::BluetoothDevice* device) override; 107 void AuthorizePairing(device::BluetoothDevice* device) override;
104 108
105 Stage current_stage_; 109 Stage current_stage_;
106 scoped_refptr<device::BluetoothAdapter> adapter_; 110 scoped_refptr<device::BluetoothAdapter> adapter_;
107 scoped_ptr<device::BluetoothDiscoverySession> discovery_session_; 111 scoped_ptr<device::BluetoothDiscoverySession> discovery_session_;
108 scoped_refptr<device::BluetoothSocket> socket_; 112 scoped_refptr<device::BluetoothSocket> socket_;
109 std::string controller_device_id_; 113 std::string controller_device_id_;
110 114
111 std::string confirmation_code_; 115 std::string confirmation_code_;
112 std::set<std::string> discovered_devices_; 116 std::set<std::string> discovered_devices_;
113 117
114 scoped_ptr<ProtoDecoder> proto_decoder_; 118 scoped_ptr<ProtoDecoder> proto_decoder_;
115 119
116 base::ThreadChecker thread_checker_; 120 base::ThreadChecker thread_checker_;
117 base::ObserverList<ControllerPairingController::Observer> observers_; 121 base::ObserverList<ControllerPairingController::Observer> observers_;
118 base::WeakPtrFactory<BluetoothControllerPairingController> ptr_factory_; 122 base::WeakPtrFactory<BluetoothControllerPairingController> ptr_factory_;
119 123
120 DISALLOW_COPY_AND_ASSIGN(BluetoothControllerPairingController); 124 DISALLOW_COPY_AND_ASSIGN(BluetoothControllerPairingController);
121 }; 125 };
122 126
123 } // namespace pairing_chromeos 127 } // namespace pairing_chromeos
124 128
125 #endif // COMPONENTS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_CONTROLLER_H_ 129 #endif // COMPONENTS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698