Index: chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc |
index a1751d15c53cc6b12f776e74b190fb84dea06764..4ca0b633a99b5150aa600c63730e44b654344acd 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc |
@@ -9,6 +9,7 @@ |
#include "base/values.h" |
#include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.h" |
#include "chrome/browser/chromeos/login/user_manager.h" |
+#include "chrome/browser/chromeos/login/wallpaper_manager.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
@@ -39,18 +40,6 @@ void LocallyManagedUserCreationScreenHandler::GetLocalizedStrings( |
l10n_util::GetStringUTF16( |
IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_TITLE)); |
localized_strings->SetString( |
- "managedUserCreationSuccessTitle", |
- l10n_util::GetStringUTF16( |
- IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_SUCCESS_TITLE)); |
- localized_strings->SetString( |
- "managedUserCreationSuccessImageText", |
- l10n_util::GetStringUTF16( |
- IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_SUCCESS_IMAGE_TEXT)); |
- localized_strings->SetString( |
- "managedUserCreationSuccessSendEmailInstructionsText", |
- l10n_util::GetStringUTF16( |
- IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_SUCCESS_EMAIL_INSTRUCTIONS)); |
- localized_strings->SetString( |
"managedUserCreationFlowRetryButtonTitle", |
l10n_util::GetStringUTF16( |
IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_RETRY_BUTTON_TITLE)); |
@@ -77,10 +66,28 @@ void LocallyManagedUserCreationScreenHandler::GetLocalizedStrings( |
localized_strings->SetString("managedUserCreationFlowProceedButtonTitle", |
l10n_util::GetStringUTF16( |
IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_CONTINUE_BUTTON_TEXT)); |
+ |
+ localized_strings->SetString("managedUserCreationFlowStartButtonTitle", |
+ l10n_util::GetStringUTF16( |
+ IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_START_BUTTON_TEXT)); |
+ localized_strings->SetString("managedUserCreationFlowPreviousButtonTitle", |
+ l10n_util::GetStringUTF16( |
+ IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PREVIOUS_BUTTON_TEXT)); |
+ localized_strings->SetString("managedUserCreationFlowNextButtonTitle", |
+ l10n_util::GetStringUTF16( |
+ IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_NEXT_BUTTON_TEXT)); |
+ |
localized_strings->SetString("createManagedUserPasswordMismatchError", |
l10n_util::GetStringUTF16( |
IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_MISMATCH_ERROR)); |
+ localized_strings->SetString("managedUserProfileCreatedMessageTemplate", |
+ l10n_util::GetStringUTF16( |
+ IDS_CREATE_LOCALLY_MANAGED_USER_PROFILE_CREATED_TEXT)); |
+ localized_strings->SetString("managedUserInstructionTemplate", |
+ l10n_util::GetStringUTF16( |
+ IDS_CREATE_LOCALLY_MANAGED_USER_INSTRUCTIONS_TEXT)); |
+ |
localized_strings->SetString("createManagedUserSelectManagerTitle", |
l10n_util::GetStringUTF16( |
IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_SELECT_MANAGER_TEXT)); |
@@ -105,19 +112,24 @@ void LocallyManagedUserCreationScreenHandler::RegisterMessages() { |
base::Bind(&LocallyManagedUserCreationScreenHandler:: |
HandleAbortLocalManagedUserCreation, |
base::Unretained(this))); |
+ web_ui()->RegisterMessageCallback("checkLocallyManagedUserName", |
+ base::Bind(&LocallyManagedUserCreationScreenHandler:: |
+ HandleCheckLocallyManagedUserName, |
+ base::Unretained(this))); |
web_ui()->RegisterMessageCallback( |
- "retryLocalManagedUserCreation", |
+ "authenticateManagerInLocallyManagedUserCreationFlow", |
base::Bind(&LocallyManagedUserCreationScreenHandler:: |
- HandleRetryLocalManagedUserCreation, |
+ HandleAuthenticateManager, |
base::Unretained(this))); |
- |
- web_ui()->RegisterMessageCallback("checkLocallyManagedUserName", |
+ web_ui()->RegisterMessageCallback( |
+ "specifyLocallyManagedUserCreationFlowUserData", |
base::Bind(&LocallyManagedUserCreationScreenHandler:: |
- HandleCheckLocallyManagedUserName, |
+ HandleCreateManagedUser, |
base::Unretained(this))); |
- web_ui()->RegisterMessageCallback("runLocallyManagedUserCreationFlow", |
+ web_ui()->RegisterMessageCallback( |
+ "managerSelectedOnLocallyManagedUserCreationFlow", |
base::Bind(&LocallyManagedUserCreationScreenHandler:: |
- HandleRunLocallyManagedUserCreationFlow, |
+ HandleManagerSelected, |
base::Unretained(this))); |
} |
@@ -144,33 +156,37 @@ void LocallyManagedUserCreationScreenHandler::Show() { |
void LocallyManagedUserCreationScreenHandler::Hide() {} |
-void LocallyManagedUserCreationScreenHandler::ShowInitialScreen() { |
- web_ui()->CallJavascriptFunction( |
- "login.LocallyManagedUserCreationScreen.showIntialScreen"); |
-} |
- |
- |
void LocallyManagedUserCreationScreenHandler:: |
- ShowManagerInconsistentStateErrorScreen() { |
- ShowErrorMessage( |
+ ShowManagerInconsistentStateErrorPage() { |
+ ShowErrorPage( |
l10n_util::GetStringUTF16( |
IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE), |
false); |
} |
+void LocallyManagedUserCreationScreenHandler::ShowIntroPage() { |
+ web_ui()->CallJavascriptFunction( |
+ "login.LocallyManagedUserCreationScreen.showIntroPage"); |
+} |
+ |
void LocallyManagedUserCreationScreenHandler::ShowManagerPasswordError() { |
web_ui()->CallJavascriptFunction( |
"login.LocallyManagedUserCreationScreen.showManagerPasswordError"); |
} |
-void LocallyManagedUserCreationScreenHandler::ShowProgressScreen() { |
+void LocallyManagedUserCreationScreenHandler::ShowProgressPage() { |
web_ui()->CallJavascriptFunction( |
- "login.LocallyManagedUserCreationScreen.showProgressScreen"); |
+ "login.LocallyManagedUserCreationScreen.showProgressPage"); |
} |
-void LocallyManagedUserCreationScreenHandler::ShowPostImageSelectionScreen() { |
+void LocallyManagedUserCreationScreenHandler::ShowUsernamePage() { |
web_ui()->CallJavascriptFunction( |
- "login.LocallyManagedUserCreationScreen.showPostImageSelectionScreen"); |
+ "login.LocallyManagedUserCreationScreen.showUsernamePage"); |
+} |
+ |
+void LocallyManagedUserCreationScreenHandler::ShowTutorialPage() { |
+ web_ui()->CallJavascriptFunction( |
+ "login.LocallyManagedUserCreationScreen.showTutorialPage"); |
} |
void LocallyManagedUserCreationScreenHandler::ShowSuccessMessage() { |
@@ -178,11 +194,11 @@ void LocallyManagedUserCreationScreenHandler::ShowSuccessMessage() { |
"login.LocallyManagedUserCreationScreen.showFinishedMessage"); |
} |
-void LocallyManagedUserCreationScreenHandler::ShowErrorMessage( |
- string16 message, |
+void LocallyManagedUserCreationScreenHandler::ShowErrorPage( |
+ const string16& message, |
bool recoverable) { |
web_ui()->CallJavascriptFunction( |
- "login.LocallyManagedUserCreationScreen.showErrorMessage", |
+ "login.LocallyManagedUserCreationScreen.showErrorPage", |
base::StringValue(message), |
base::FundamentalValue(recoverable)); |
} |
@@ -197,15 +213,25 @@ void LocallyManagedUserCreationScreenHandler:: |
} |
void LocallyManagedUserCreationScreenHandler:: |
- HandleRetryLocalManagedUserCreation(const base::ListValue* args) { |
- delegate_->RetryLastStep(); |
-} |
- |
-void LocallyManagedUserCreationScreenHandler:: |
HandleAbortLocalManagedUserCreation(const base::ListValue* args) { |
delegate_->AbortFlow(); |
} |
+void LocallyManagedUserCreationScreenHandler::HandleManagerSelected( |
+ const base::ListValue* args) { |
+ if (!delegate_) |
+ return; |
+ DCHECK(args && args->GetSize() == 1); |
+ |
+ std::string manager_id; |
+ if (!args->GetString(0, &manager_id)) { |
+ NOTREACHED(); |
+ return; |
+ } |
+ |
+ WallpaperManager::Get()->SetUserWallpaper(manager_id); |
+} |
+ |
void LocallyManagedUserCreationScreenHandler::HandleCheckLocallyManagedUserName( |
const base::ListValue* args) { |
DCHECK(args && args->GetSize() == 1); |
@@ -230,20 +256,16 @@ void LocallyManagedUserCreationScreenHandler::HandleCheckLocallyManagedUserName( |
} |
} |
-void LocallyManagedUserCreationScreenHandler:: |
- HandleRunLocallyManagedUserCreationFlow(const base::ListValue* args) { |
+void LocallyManagedUserCreationScreenHandler::HandleCreateManagedUser( |
+ const base::ListValue* args) { |
if (!delegate_) |
return; |
- DCHECK(args && args->GetSize() == 4); |
+ DCHECK(args && args->GetSize() == 2); |
string16 new_user_name; |
std::string new_user_password; |
- std::string manager_username; |
- std::string manager_password; |
if (!args->GetString(0, &new_user_name) || |
- !args->GetString(1, &new_user_password) || |
- !args->GetString(2, &manager_username) || |
- !args->GetString(3, &manager_password)) { |
+ !args->GetString(1, &new_user_password)) { |
NOTREACHED(); |
return; |
} |
@@ -268,16 +290,29 @@ void LocallyManagedUserCreationScreenHandler:: |
return; |
} |
+ delegate_->CreateManagedUser(new_user_name, new_user_password); |
+} |
+ |
+void LocallyManagedUserCreationScreenHandler::HandleAuthenticateManager( |
+ const base::ListValue* args) { |
+ if (!delegate_) |
+ return; |
+ DCHECK(args && args->GetSize() == 2); |
+ |
+ std::string manager_username; |
+ std::string manager_password; |
+ if (!args->GetString(0, &manager_username) || |
+ !args->GetString(1, &manager_password)) { |
+ NOTREACHED(); |
+ return; |
+ } |
+ |
manager_username = gaia::SanitizeEmail(manager_username); |
- UserFlow* flow = |
- new LocallyManagedUserCreationFlow(manager_username, |
- new_user_name, |
- new_user_password); |
+ UserFlow* flow = new LocallyManagedUserCreationFlow(manager_username); |
UserManager::Get()->SetUserFlow(manager_username, flow); |
- delegate_->RunFlow(new_user_name, new_user_password, |
- manager_username, manager_password); |
+ delegate_->AuthenticateManager(manager_username, manager_password); |
} |
} // namespace chromeos |