| Index: chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h
|
| diff --git a/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h b/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h
|
| index e2a294d8bd3dbc4ada72ce03e2e60cc06b8988b8..df9df6ee9410a08a7621f9ce32593d4a8af6e015 100644
|
| --- a/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h
|
| +++ b/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h
|
| @@ -66,20 +66,21 @@ class ManagedUserCreationControllerNew
|
| const std::string& master_key) OVERRIDE;
|
|
|
| // Configures and initiates importing existing supervised user to this device.
|
| - // Existing user is identified by |sync_id|, has |display_name|, |password|,
|
| - // |avatar_index|. The master key for cryptohome is a |master_key|.
|
| - // The user has password specified in |password_data| and |encryption_key|/
|
| - // |signature_key| for cryptohome.
|
| + // Existing user is identified by |sync_id|, has |display_name|,
|
| + // |avatar_index|. The master key for cryptohome is a |master_key|. The user
|
| + // has password specified in |password_data| and
|
| + // |encryption_key|/|signature_key| for cryptohome.
|
| virtual void StartImport(const base::string16& display_name,
|
| - const std::string& password,
|
| int avatar_index,
|
| const std::string& sync_id,
|
| const std::string& master_key,
|
| const base::DictionaryValue* password_data,
|
| const std::string& encryption_key,
|
| - const std::string& signature_key);
|
| + const std::string& signature_key) OVERRIDE;
|
|
|
| virtual void SetManagerProfile(Profile* manager_profile) OVERRIDE;
|
| + virtual Profile* GetManagerProfile() OVERRIDE;
|
| +
|
| virtual void CancelCreation() OVERRIDE;
|
| virtual void FinishCreation() OVERRIDE;
|
| virtual std::string GetManagedUserId() OVERRIDE;
|
|
|