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

Side by Side Diff: chrome/browser/chromeos/login/managed/managed_user_creation_controller_old.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_O LD_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_O LD_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_O LD_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_O LD_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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 // Configures and initiates importing existing supervised user to this device. 52 // Configures and initiates importing existing supervised user to this device.
53 // Existing user is identified by |sync_id|, has |display_name|, |password|, 53 // Existing user is identified by |sync_id|, has |display_name|, |password|,
54 // |avatar_index|. The master key for cryptohome is a |master_key|. 54 // |avatar_index|. The master key for cryptohome is a |master_key|.
55 virtual void StartImport(const base::string16& display_name, 55 virtual void StartImport(const base::string16& display_name,
56 const std::string& password, 56 const std::string& password,
57 int avatar_index, 57 int avatar_index,
58 const std::string& sync_id, 58 const std::string& sync_id,
59 const std::string& master_key) OVERRIDE; 59 const std::string& master_key) OVERRIDE;
60 60
61 // Not implemented in this class.
62 virtual void StartImport(const base::string16& display_name,
63 int avatar_index,
64 const std::string& sync_id,
65 const std::string& master_key,
66 const base::DictionaryValue* password_data,
67 const std::string& encryption_key,
68 const std::string& signature_key) OVERRIDE;
69
61 virtual void SetManagerProfile(Profile* manager_profile) OVERRIDE; 70 virtual void SetManagerProfile(Profile* manager_profile) OVERRIDE;
71 virtual Profile* GetManagerProfile() OVERRIDE;
62 72
63 virtual void CancelCreation() OVERRIDE; 73 virtual void CancelCreation() OVERRIDE;
64 virtual void FinishCreation() OVERRIDE; 74 virtual void FinishCreation() OVERRIDE;
65 virtual std::string GetManagedUserId() OVERRIDE; 75 virtual std::string GetManagedUserId() OVERRIDE;
66 76
67 private: 77 private:
68 // Indicates if we create new user, or import an existing one. 78 // Indicates if we create new user, or import an existing one.
69 enum CreationType { NEW_USER, USER_IMPORT, }; 79 enum CreationType { NEW_USER, USER_IMPORT, };
70 80
71 // Contains information necessary for new user creation. 81 // Contains information necessary for new user creation.
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 128
119 // Factory of callbacks. 129 // Factory of callbacks.
120 base::WeakPtrFactory<ManagedUserCreationControllerOld> weak_factory_; 130 base::WeakPtrFactory<ManagedUserCreationControllerOld> weak_factory_;
121 131
122 DISALLOW_COPY_AND_ASSIGN(ManagedUserCreationControllerOld); 132 DISALLOW_COPY_AND_ASSIGN(ManagedUserCreationControllerOld);
123 }; 133 };
124 134
125 } // namespace chromeos 135 } // namespace chromeos
126 136
127 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLE R_OLD_H_ 137 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLE R_OLD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698