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

Side by Side Diff: components/proximity_auth/proximity_auth_system.h

Issue 1912433002: Convert //components/proximity_auth from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 8 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_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H 5 #ifndef COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H
6 #define COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H 6 #define COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "components/proximity_auth/remote_device.h" 13 #include "components/proximity_auth/remote_device.h"
14 #include "components/proximity_auth/remote_device_life_cycle.h" 14 #include "components/proximity_auth/remote_device_life_cycle.h"
15 #include "components/proximity_auth/screenlock_bridge.h" 15 #include "components/proximity_auth/screenlock_bridge.h"
16 #include "components/signin/core/account_id/account_id.h" 16 #include "components/signin/core/account_id/account_id.h"
17 17
18 namespace proximity_auth { 18 namespace proximity_auth {
19 19
20 class ProximityAuthClient; 20 class ProximityAuthClient;
21 class RemoteDeviceLifeCycle; 21 class RemoteDeviceLifeCycle;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void ResumeAfterWakeUpTimeout(); 79 void ResumeAfterWakeUpTimeout();
80 80
81 // Lists of remote devices, keyed by user account id. 81 // Lists of remote devices, keyed by user account id.
82 std::map<AccountId, RemoteDeviceList> remote_devices_map_; 82 std::map<AccountId, RemoteDeviceList> remote_devices_map_;
83 83
84 // Delegate for Chrome dependent functionality. 84 // Delegate for Chrome dependent functionality.
85 ProximityAuthClient* proximity_auth_client_; 85 ProximityAuthClient* proximity_auth_client_;
86 86
87 // Responsible for the life cycle of connecting and authenticating to 87 // Responsible for the life cycle of connecting and authenticating to
88 // the RemoteDevice of the currently focused user. 88 // the RemoteDevice of the currently focused user.
89 scoped_ptr<RemoteDeviceLifeCycle> remote_device_life_cycle_; 89 std::unique_ptr<RemoteDeviceLifeCycle> remote_device_life_cycle_;
90 90
91 // Handles the interaction with the lock screen UI. 91 // Handles the interaction with the lock screen UI.
92 scoped_ptr<UnlockManager> unlock_manager_; 92 std::unique_ptr<UnlockManager> unlock_manager_;
93 93
94 // True if the system is suspended. 94 // True if the system is suspended.
95 bool suspended_; 95 bool suspended_;
96 96
97 // True if the system is started_. 97 // True if the system is started_.
98 bool started_; 98 bool started_;
99 99
100 base::WeakPtrFactory<ProximityAuthSystem> weak_ptr_factory_; 100 base::WeakPtrFactory<ProximityAuthSystem> weak_ptr_factory_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(ProximityAuthSystem); 102 DISALLOW_COPY_AND_ASSIGN(ProximityAuthSystem);
103 }; 103 };
104 104
105 } // namespace proximity_auth 105 } // namespace proximity_auth
106 106
107 #endif // COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H 107 #endif // COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H
OLDNEW
« no previous file with comments | « components/proximity_auth/proximity_auth_pref_manager_unittest.cc ('k') | components/proximity_auth/proximity_monitor_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698