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

Side by Side Diff: chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h

Issue 220913003: Make supervised user ChromeOS import aware of new password schema. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
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_MANAGED_MANAGED_USER_CREATION_CONTROLLER_N EW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_N EW_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_N EW_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_N EW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // Configures and initiates importing existing supervised user to this device. 59 // Configures and initiates importing existing supervised user to this device.
60 // Existing user is identified by |sync_id|, has |display_name|, |password|, 60 // Existing user is identified by |sync_id|, has |display_name|, |password|,
61 // |avatar_index|. The master key for cryptohome is a |master_key|. 61 // |avatar_index|. The master key for cryptohome is a |master_key|.
62 virtual void StartImport(const base::string16& display_name, 62 virtual void StartImport(const base::string16& display_name,
63 const std::string& password, 63 const std::string& password,
64 int avatar_index, 64 int avatar_index,
65 const std::string& sync_id, 65 const std::string& sync_id,
66 const std::string& master_key) OVERRIDE; 66 const std::string& master_key) OVERRIDE;
67 67
68 // Configures and initiates importing existing supervised user to this device. 68 // Configures and initiates importing existing supervised user to this device.
69 // Existing user is identified by |sync_id|, has |display_name|, |password|, 69 // Existing user is identified by |sync_id|, has |display_name|,
70 // |avatar_index|. The master key for cryptohome is a |master_key|. 70 // |avatar_index|. The master key for cryptohome is a |master_key|. The user
71 // The user has password specified in |password_data| and |encryption_key|/ 71 // has password specified in |password_data| and
72 // |signature_key| for cryptohome. 72 // |encryption_key|/|signature_key| for cryptohome.
73 virtual void StartImport(const base::string16& display_name, 73 virtual void StartImport(const base::string16& display_name,
74 const std::string& password,
75 int avatar_index, 74 int avatar_index,
76 const std::string& sync_id, 75 const std::string& sync_id,
77 const std::string& master_key, 76 const std::string& master_key,
78 const base::DictionaryValue* password_data, 77 const base::DictionaryValue* password_data,
79 const std::string& encryption_key, 78 const std::string& encryption_key,
80 const std::string& signature_key); 79 const std::string& signature_key) OVERRIDE;
81 80
82 virtual void SetManagerProfile(Profile* manager_profile) OVERRIDE; 81 virtual void SetManagerProfile(Profile* manager_profile) OVERRIDE;
82 virtual Profile* GetManagerProfile() OVERRIDE;
83
83 virtual void CancelCreation() OVERRIDE; 84 virtual void CancelCreation() OVERRIDE;
84 virtual void FinishCreation() OVERRIDE; 85 virtual void FinishCreation() OVERRIDE;
85 virtual std::string GetManagedUserId() OVERRIDE; 86 virtual std::string GetManagedUserId() OVERRIDE;
86 87
87 private: 88 private:
88 enum Stage { 89 enum Stage {
89 // Just initial stage. 90 // Just initial stage.
90 STAGE_INITIAL, 91 STAGE_INITIAL,
91 92
92 // Creation attempt is recoreded to allow cleanup in case of failure. 93 // Creation attempt is recoreded to allow cleanup in case of failure.
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 182
182 // Factory of callbacks. 183 // Factory of callbacks.
183 base::WeakPtrFactory<ManagedUserCreationControllerNew> weak_factory_; 184 base::WeakPtrFactory<ManagedUserCreationControllerNew> weak_factory_;
184 185
185 DISALLOW_COPY_AND_ASSIGN(ManagedUserCreationControllerNew); 186 DISALLOW_COPY_AND_ASSIGN(ManagedUserCreationControllerNew);
186 }; 187 };
187 188
188 } // namespace chromeos 189 } // namespace chromeos
189 190
190 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLE R_NEW_H_ 191 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLE R_NEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698