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

Unified Diff: chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc

Issue 14208014: Simplify adding callbacks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
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 7e45f07e951d5f76a83493ee3c81b5468c3d829d..534fd3de7f31393b2aefb18c4811466f12530d0c 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
@@ -157,29 +157,22 @@ void LocallyManagedUserCreationScreenHandler::SetDelegate(Delegate* delegate) {
}
void LocallyManagedUserCreationScreenHandler::
- HandleFinishLocalManagedUserCreation(const base::ListValue* args) {
+HandleFinishLocalManagedUserCreation() {
delegate_->FinishFlow();
}
void LocallyManagedUserCreationScreenHandler::
- HandleRetryLocalManagedUserCreation(const base::ListValue* args) {
+HandleRetryLocalManagedUserCreation() {
delegate_->RetryLastStep();
}
void LocallyManagedUserCreationScreenHandler::
- HandleAbortLocalManagedUserCreation(const base::ListValue* args) {
+HandleAbortLocalManagedUserCreation() {
delegate_->AbortFlow();
}
void LocallyManagedUserCreationScreenHandler::HandleCheckLocallyManagedUserName(
- const base::ListValue* args) {
- DCHECK(args && args->GetSize() == 1);
-
- string16 name;
- if (!args->GetString(0, &name)) {
- NOTREACHED();
- return;
- }
+ const string16& name) {
if (NULL != UserManager::Get()->
FindLocallyManagedUser(CollapseWhitespace(name, true))) {
CallJS("login.LocallyManagedUserCreationScreen.managedUserNameError",
@@ -194,24 +187,13 @@ void LocallyManagedUserCreationScreenHandler::HandleCheckLocallyManagedUserName(
}
void LocallyManagedUserCreationScreenHandler::
- HandleRunLocallyManagedUserCreationFlow(const base::ListValue* args) {
+HandleRunLocallyManagedUserCreationFlow(const string16& new_raw_user_name,
+ const std::string& new_user_password,
+ const std::string& raw_manager_username,
+ const std::string& manager_password) {
if (!delegate_)
return;
- DCHECK(args && args->GetSize() == 4);
-
- 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)) {
- NOTREACHED();
- return;
- }
-
- new_user_name = CollapseWhitespace(new_user_name, true);
+ string16 new_user_name = CollapseWhitespace(new_raw_user_name, true);
if (NULL != UserManager::Get()->FindLocallyManagedUser(new_user_name)) {
CallJS("login.LocallyManagedUserCreationScreen.managedUserNameError",
base::StringValue(new_user_name),
@@ -229,7 +211,7 @@ void LocallyManagedUserCreationScreenHandler::
return;
}
- manager_username = gaia::SanitizeEmail(manager_username);
+ std::string manager_username = gaia::SanitizeEmail(raw_manager_username);
bartfab (slow) 2013/04/16 17:04:35 Nit: const
ygorshenin1 2013/04/16 17:52:43 Done.
UserFlow* flow =
new LocallyManagedUserCreationFlow(manager_username,

Powered by Google App Engine
This is Rietveld 408576698