| Index: chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc
|
| diff --git a/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc b/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc
|
| index 06cf6f43d577930f00880470fe476c7875c868a5..09a7aa34485449cbe73e4a2e069db4f7a3b6659e 100644
|
| --- a/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc
|
| +++ b/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc
|
| @@ -72,6 +72,10 @@ void ManagedUserCreationControllerNew::SetManagerProfile(
|
| creation_context_->manager_profile = manager_profile;
|
| }
|
|
|
| +Profile* ManagedUserCreationControllerNew::GetManagerProfile() {
|
| + return creation_context_->manager_profile;
|
| +}
|
| +
|
| void ManagedUserCreationControllerNew::StartCreation(
|
| const base::string16& display_name,
|
| const std::string& password,
|
| @@ -105,7 +109,6 @@ void ManagedUserCreationControllerNew::StartImport(
|
|
|
| void ManagedUserCreationControllerNew::StartImport(
|
| const base::string16& display_name,
|
| - const std::string& password,
|
| int avatar_index,
|
| const std::string& sync_id,
|
| const std::string& master_key,
|
| @@ -113,10 +116,10 @@ void ManagedUserCreationControllerNew::StartImport(
|
| const std::string& encryption_key,
|
| const std::string& signature_key) {
|
| DCHECK(creation_context_);
|
| - creation_context_->creation_type = USER_IMPORT_OLD;
|
| + creation_context_->creation_type = USER_IMPORT_NEW;
|
|
|
| creation_context_->display_name = display_name;
|
| - creation_context_->password = password;
|
| +
|
| creation_context_->avatar_index = avatar_index;
|
|
|
| creation_context_->sync_user_id = sync_id;
|
|
|