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

Side by Side Diff: chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERAT ION_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERAT ION_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERAT ION_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERAT ION_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 12
12 #include "base/callback.h" 13 #include "base/callback.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h" 16 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h"
17 #include "chromeos/login/auth/user_context.h" 17 #include "chromeos/login/auth/user_context.h"
18 #include "third_party/cros_system_api/dbus/service_constants.h" 18 #include "third_party/cros_system_api/dbus/service_constants.h"
19 19
20 namespace chromeos { 20 namespace chromeos {
21 21
22 class UserContext; 22 class UserContext;
23 23
24 // A class to create Easy unlock cryptohome keys for the given user and devices. 24 // A class to create Easy unlock cryptohome keys for the given user and devices.
(...skipping 26 matching lines...) Expand all
51 cryptohome::MountError return_code); 51 cryptohome::MountError return_code);
52 52
53 UserContext user_context_; 53 UserContext user_context_;
54 std::string tpm_public_key_; 54 std::string tpm_public_key_;
55 EasyUnlockDeviceKeyDataList devices_; 55 EasyUnlockDeviceKeyDataList devices_;
56 CreateKeysCallback callback_; 56 CreateKeysCallback callback_;
57 57
58 // Index of the key to be created. 58 // Index of the key to be created.
59 size_t key_creation_index_; 59 size_t key_creation_index_;
60 60
61 scoped_ptr<ChallengeCreator> challenge_creator_; 61 std::unique_ptr<ChallengeCreator> challenge_creator_;
62 62
63 base::WeakPtrFactory<EasyUnlockCreateKeysOperation> weak_ptr_factory_; 63 base::WeakPtrFactory<EasyUnlockCreateKeysOperation> weak_ptr_factory_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(EasyUnlockCreateKeysOperation); 65 DISALLOW_COPY_AND_ASSIGN(EasyUnlockCreateKeysOperation);
66 }; 66 };
67 67
68 } // namespace chromeos 68 } // namespace chromeos
69 69
70 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPE RATION_H_ 70 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPE RATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698