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

Side by Side Diff: components/pairing/bluetooth_host_pairing_controller.h

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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_HOST_PAIRING_CONTROLLER_H_ 5 #ifndef COMPONENTS_PAIRING_BLUETOOTH_HOST_PAIRING_CONTROLLER_H_
6 #define COMPONENTS_PAIRING_BLUETOOTH_HOST_PAIRING_CONTROLLER_H_ 6 #define COMPONENTS_PAIRING_BLUETOOTH_HOST_PAIRING_CONTROLLER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
12 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
13 #include "base/observer_list.h" 15 #include "base/observer_list.h"
14 #include "base/threading/thread_checker.h" 16 #include "base/threading/thread_checker.h"
15 #include "components/pairing/host_pairing_controller.h" 17 #include "components/pairing/host_pairing_controller.h"
16 #include "components/pairing/proto_decoder.h" 18 #include "components/pairing/proto_decoder.h"
17 #include "device/bluetooth/bluetooth_adapter.h" 19 #include "device/bluetooth/bluetooth_adapter.h"
18 #include "device/bluetooth/bluetooth_device.h" 20 #include "device/bluetooth/bluetooth_device.h"
19 #include "device/bluetooth/bluetooth_socket.h" 21 #include "device/bluetooth/bluetooth_socket.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 std::string enrollment_domain_; 109 std::string enrollment_domain_;
108 Connectivity connectivity_status_; 110 Connectivity connectivity_status_;
109 UpdateStatus update_status_; 111 UpdateStatus update_status_;
110 EnrollmentStatus enrollment_status_; 112 EnrollmentStatus enrollment_status_;
111 std::string permanent_id_; 113 std::string permanent_id_;
112 bool was_powered_ = false; 114 bool was_powered_ = false;
113 115
114 scoped_refptr<device::BluetoothAdapter> adapter_; 116 scoped_refptr<device::BluetoothAdapter> adapter_;
115 scoped_refptr<device::BluetoothSocket> service_socket_; 117 scoped_refptr<device::BluetoothSocket> service_socket_;
116 scoped_refptr<device::BluetoothSocket> controller_socket_; 118 scoped_refptr<device::BluetoothSocket> controller_socket_;
117 scoped_ptr<ProtoDecoder> proto_decoder_; 119 std::unique_ptr<ProtoDecoder> proto_decoder_;
118 120
119 base::ThreadChecker thread_checker_; 121 base::ThreadChecker thread_checker_;
120 base::ObserverList<Observer> observers_; 122 base::ObserverList<Observer> observers_;
121 base::WeakPtrFactory<BluetoothHostPairingController> ptr_factory_; 123 base::WeakPtrFactory<BluetoothHostPairingController> ptr_factory_;
122 124
123 DISALLOW_COPY_AND_ASSIGN(BluetoothHostPairingController); 125 DISALLOW_COPY_AND_ASSIGN(BluetoothHostPairingController);
124 }; 126 };
125 127
126 } // namespace pairing_chromeos 128 } // namespace pairing_chromeos
127 129
128 #endif // COMPONENTS_PAIRING_BLUETOOTH_HOST_PAIRING_CONTROLLER_H_ 130 #endif // COMPONENTS_PAIRING_BLUETOOTH_HOST_PAIRING_CONTROLLER_H_
OLDNEW
« no previous file with comments | « components/pairing/bluetooth_controller_pairing_controller.cc ('k') | components/pairing/proto_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698