| OLD | NEW |
| 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 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen
_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen
_handler.h" |
| 6 | 6 |
| 7 #include "ash/audio/sounds.h" | 7 #include "ash/audio/sounds.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" | 10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" |
| 11 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow
.h" | 11 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow
.h" |
| 12 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 12 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
| 13 #include "chrome/browser/chromeos/login/users/user_manager.h" | 13 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 14 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 14 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 15 #include "chrome/browser/chromeos/settings/cros_settings.h" | 15 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 16 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" | 16 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
| 17 #include "chrome/common/url_constants.h" | 17 #include "chrome/common/url_constants.h" |
| 18 #include "chromeos/audio/chromeos_sounds.h" | 18 #include "chromeos/audio/chromeos_sounds.h" |
| 19 #include "components/user_manager/user_type.h" | 19 #include "components/user_manager/user_type.h" |
| 20 #include "google_apis/gaia/gaia_auth_util.h" | 20 #include "google_apis/gaia/gaia_auth_util.h" |
| 21 #include "grit/browser_resources.h" | 21 #include "grit/browser_resources.h" |
| 22 #include "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
| 23 #include "net/base/data_url.h" | 23 #include "net/base/data_url.h" |
| 24 #include "net/base/escape.h" | 24 #include "net/base/escape.h" |
| 25 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
| 26 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
| 27 | 27 |
| 28 const char kJsScreenPath[] = "login.LocallyManagedUserCreationScreen"; | 28 const char kJsScreenPath[] = "login.SupervisedUserCreationScreen"; |
| 29 | 29 |
| 30 namespace chromeos { | 30 namespace chromeos { |
| 31 | 31 |
| 32 SupervisedUserCreationScreenHandler::SupervisedUserCreationScreenHandler() | 32 SupervisedUserCreationScreenHandler::SupervisedUserCreationScreenHandler() |
| 33 : BaseScreenHandler(kJsScreenPath), | 33 : BaseScreenHandler(kJsScreenPath), |
| 34 delegate_(NULL) { | 34 delegate_(NULL) { |
| 35 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); | 35 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |
| 36 media::SoundsManager* manager = media::SoundsManager::Get(); | 36 media::SoundsManager* manager = media::SoundsManager::Get(); |
| 37 manager->Initialize(SOUND_OBJECT_DELETE, | 37 manager->Initialize(SOUND_OBJECT_DELETE, |
| 38 bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV)); | 38 bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV)); |
| 39 manager->Initialize(SOUND_CAMERA_SNAP, | 39 manager->Initialize(SOUND_CAMERA_SNAP, |
| 40 bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV)); | 40 bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV)); |
| 41 } | 41 } |
| 42 | 42 |
| 43 SupervisedUserCreationScreenHandler::~SupervisedUserCreationScreenHandler() { | 43 SupervisedUserCreationScreenHandler::~SupervisedUserCreationScreenHandler() { |
| 44 if (delegate_) { | 44 if (delegate_) { |
| 45 delegate_->OnActorDestroyed(this); | 45 delegate_->OnActorDestroyed(this); |
| 46 } | 46 } |
| 47 } | 47 } |
| 48 | 48 |
| 49 void SupervisedUserCreationScreenHandler::DeclareLocalizedValues( | 49 void SupervisedUserCreationScreenHandler::DeclareLocalizedValues( |
| 50 LocalizedValuesBuilder* builder) { | 50 LocalizedValuesBuilder* builder) { |
| 51 builder->Add( | 51 builder->Add( |
| 52 "managedUserCreationFlowRetryButtonTitle", | 52 "supervisedUserCreationFlowRetryButtonTitle", |
| 53 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_RETRY_BUTTON_TITLE); | 53 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_RETRY_BUTTON_TITLE); |
| 54 builder->Add( | 54 builder->Add( |
| 55 "managedUserCreationFlowCancelButtonTitle", | 55 "supervisedUserCreationFlowCancelButtonTitle", |
| 56 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_CANCEL_BUTTON_TITLE); | 56 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_CANCEL_BUTTON_TITLE); |
| 57 builder->Add( | 57 builder->Add( |
| 58 "managedUserCreationFlowGotitButtonTitle", | 58 "supervisedUserCreationFlowGotitButtonTitle", |
| 59 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_GOT_IT_BUTTON_TITLE); | 59 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_GOT_IT_BUTTON_TITLE); |
| 60 | 60 |
| 61 builder->Add("createManagedUserIntroTextTitle", | 61 builder->Add("createSupervisedUserIntroTextTitle", |
| 62 IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_TITLE); | 62 IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_TITLE); |
| 63 builder->Add("createManagedUserIntroAlternateText", | 63 builder->Add("createSupervisedUserIntroAlternateText", |
| 64 IDS_CREATE_LOCALLY_MANAGED_INTRO_ALTERNATE_TEXT); | 64 IDS_CREATE_LOCALLY_MANAGED_INTRO_ALTERNATE_TEXT); |
| 65 builder->Add("createManagedUserIntroText1", | 65 builder->Add("createSupervisedUserIntroText1", |
| 66 IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_1); | 66 IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_1); |
| 67 builder->Add("createManagedUserIntroManagerItem1", | 67 builder->Add("createSupervisedUserIntroManagerItem1", |
| 68 IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_1); | 68 IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_1); |
| 69 builder->Add("createManagedUserIntroManagerItem2", | 69 builder->Add("createSupervisedUserIntroManagerItem2", |
| 70 IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_2); | 70 IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_2); |
| 71 builder->Add("createManagedUserIntroManagerItem3", | 71 builder->Add("createSupervisedUserIntroManagerItem3", |
| 72 IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_3); | 72 IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_3); |
| 73 builder->Add("createManagedUserIntroText2", | 73 builder->Add("createSupervisedUserIntroText2", |
| 74 IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_2); | 74 IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_2); |
| 75 builder->AddF("createManagedUserIntroText3", | 75 builder->AddF("createSupervisedUserIntroText3", |
| 76 IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_3, | 76 IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_3, |
| 77 base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); | 77 base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); |
| 78 | 78 |
| 79 builder->Add("createManagedUserPickManagerTitle", | 79 builder->Add("createSupervisedUserPickManagerTitle", |
| 80 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_TITLE); | 80 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_TITLE); |
| 81 builder->AddF("createManagedUserPickManagerTitleExplanation", | 81 builder->AddF("createSupervisedUserPickManagerTitleExplanation", |
| 82 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_EXPLANATION, | 82 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_EXPLANATION, |
| 83 base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); | 83 base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); |
| 84 builder->Add("createManagedUserManagerPasswordHint", | 84 builder->Add("createSupervisedUserManagerPasswordHint", |
| 85 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_MANAGER_PASSWORD_HINT); | 85 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_MANAGER_PASSWORD_HINT); |
| 86 builder->Add("createManagedUserWrongManagerPasswordText", | 86 builder->Add("createSupervisedUserWrongManagerPasswordText", |
| 87 IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_PASSWORD_ERROR); | 87 IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_PASSWORD_ERROR); |
| 88 | 88 |
| 89 builder->Add("createManagedUserNameTitle", | 89 builder->Add("createSupervisedUserNameTitle", |
| 90 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_TITLE); | 90 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_TITLE); |
| 91 builder->Add("createManagedUserNameAccessibleTitle", | 91 builder->Add("createSupervisedUserNameAccessibleTitle", |
| 92 IDS_CREATE_LOCALLY_MANAGED_USER_SETUP_ACCESSIBLE_TITLE); | 92 IDS_CREATE_LOCALLY_MANAGED_USER_SETUP_ACCESSIBLE_TITLE); |
| 93 builder->Add("createManagedUserNameExplanation", | 93 builder->Add("createSupervisedUserNameExplanation", |
| 94 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_EXPLANATION); | 94 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_EXPLANATION); |
| 95 builder->Add("createManagedUserNameHint", | 95 builder->Add("createSupervisedUserNameHint", |
| 96 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_HINT); | 96 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_HINT); |
| 97 builder->Add("createManagedUserPasswordTitle", | 97 builder->Add("createSupervisedUserPasswordTitle", |
| 98 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TITLE); | 98 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TITLE); |
| 99 builder->Add("createManagedUserPasswordExplanation", | 99 builder->Add("createSupervisedUserPasswordExplanation", |
| 100 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_EXPLANATION); | 100 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_EXPLANATION); |
| 101 builder->Add("createManagedUserPasswordHint", | 101 builder->Add("createSupervisedUserPasswordHint", |
| 102 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_HINT); | 102 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_HINT); |
| 103 builder->Add("createManagedUserPasswordConfirmHint", | 103 builder->Add("createSupervisedUserPasswordConfirmHint", |
| 104 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_CONFIRM_HINT); | 104 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_CONFIRM_HINT); |
| 105 builder->Add("managedUserCreationFlowProceedButtonTitle", | 105 builder->Add("supervisedUserCreationFlowProceedButtonTitle", |
| 106 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_CONTINUE_BUTTON_TEXT); | 106 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_CONTINUE_BUTTON_TEXT); |
| 107 builder->Add("managedUserCreationFlowStartButtonTitle", | 107 builder->Add("supervisedUserCreationFlowStartButtonTitle", |
| 108 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_START_BUTTON_TEXT); | 108 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_START_BUTTON_TEXT); |
| 109 builder->Add("managedUserCreationFlowPrevButtonTitle", | 109 builder->Add("supervisedUserCreationFlowPrevButtonTitle", |
| 110 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PREVIOUS_BUTTON_TEXT); | 110 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PREVIOUS_BUTTON_TEXT); |
| 111 builder->Add("managedUserCreationFlowNextButtonTitle", | 111 builder->Add("supervisedUserCreationFlowNextButtonTitle", |
| 112 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_NEXT_BUTTON_TEXT); | 112 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_NEXT_BUTTON_TEXT); |
| 113 builder->Add("managedUserCreationFlowHandleErrorButtonTitle", | 113 builder->Add("supervisedUserCreationFlowHandleErrorButtonTitle", |
| 114 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_HANDLE_ERROR_BUTTON_TEXT); | 114 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_HANDLE_ERROR_BUTTON_TEXT); |
| 115 builder->Add("createManagedUserPasswordMismatchError", | 115 builder->Add("createSupervisedUserPasswordMismatchError", |
| 116 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_MISMATCH_ERROR); | 116 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_MISMATCH_ERROR); |
| 117 | 117 |
| 118 builder->Add("createManagedUserCreatedText1", | 118 builder->Add("createSupervisedUserCreatedText1", |
| 119 IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_1); | 119 IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_1); |
| 120 builder->Add("createManagedUserCreatedText2", | 120 builder->Add("createSupervisedUserCreatedText2", |
| 121 IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_2); | 121 IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_2); |
| 122 builder->Add("createManagedUserCreatedText3", | 122 builder->Add("createSupervisedUserCreatedText3", |
| 123 IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_3); | 123 IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_3); |
| 124 | 124 |
| 125 builder->Add("importExistingSupervisedUserTitle", | 125 builder->Add("importExistingSupervisedUserTitle", |
| 126 IDS_IMPORT_EXISTING_SUPERVISED_USER_TITLE); | 126 IDS_IMPORT_EXISTING_SUPERVISED_USER_TITLE); |
| 127 builder->Add("importExistingSupervisedUserText", | 127 builder->Add("importExistingSupervisedUserText", |
| 128 IDS_IMPORT_EXISTING_SUPERVISED_USER_TEXT); | 128 IDS_IMPORT_EXISTING_SUPERVISED_USER_TEXT); |
| 129 builder->Add("managedUserCreationFlowImportButtonTitle", | 129 builder->Add("supervisedUserCreationFlowImportButtonTitle", |
| 130 IDS_IMPORT_EXISTING_SUPERVISED_USER_OK); | 130 IDS_IMPORT_EXISTING_SUPERVISED_USER_OK); |
| 131 builder->Add("importSupervisedUserLink", | 131 builder->Add("importSupervisedUserLink", |
| 132 IDS_PROFILES_IMPORT_EXISTING_SUPERVISED_USER_LINK); | 132 IDS_PROFILES_IMPORT_EXISTING_SUPERVISED_USER_LINK); |
| 133 builder->Add("createSupervisedUserLink", | 133 builder->Add("createSupervisedUserLink", |
| 134 IDS_CREATE_NEW_USER_LINK); | 134 IDS_CREATE_NEW_USER_LINK); |
| 135 builder->Add("importBubbleText", IDS_SUPERVISED_USER_IMPORT_BUBBLE_TEXT); | 135 builder->Add("importBubbleText", IDS_SUPERVISED_USER_IMPORT_BUBBLE_TEXT); |
| 136 builder->Add("importUserExists", IDS_SUPERVISED_USER_IMPORT_USER_EXIST); | 136 builder->Add("importUserExists", IDS_SUPERVISED_USER_IMPORT_USER_EXIST); |
| 137 builder->Add("importUsernameExists", | 137 builder->Add("importUsernameExists", |
| 138 IDS_SUPERVISED_USER_IMPORT_USERNAME_EXIST); | 138 IDS_SUPERVISED_USER_IMPORT_USERNAME_EXIST); |
| 139 | 139 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 150 IDS_OPTIONS_PHOTO_FLIPBACK_ACCESSIBLE_TEXT); | 150 IDS_OPTIONS_PHOTO_FLIPBACK_ACCESSIBLE_TEXT); |
| 151 builder->Add("photoCaptureAccessibleText", | 151 builder->Add("photoCaptureAccessibleText", |
| 152 IDS_OPTIONS_PHOTO_CAPTURE_ACCESSIBLE_TEXT); | 152 IDS_OPTIONS_PHOTO_CAPTURE_ACCESSIBLE_TEXT); |
| 153 builder->Add("photoDiscardAccessibleText", | 153 builder->Add("photoDiscardAccessibleText", |
| 154 IDS_OPTIONS_PHOTO_DISCARD_ACCESSIBLE_TEXT); | 154 IDS_OPTIONS_PHOTO_DISCARD_ACCESSIBLE_TEXT); |
| 155 } | 155 } |
| 156 | 156 |
| 157 void SupervisedUserCreationScreenHandler::Initialize() {} | 157 void SupervisedUserCreationScreenHandler::Initialize() {} |
| 158 | 158 |
| 159 void SupervisedUserCreationScreenHandler::RegisterMessages() { | 159 void SupervisedUserCreationScreenHandler::RegisterMessages() { |
| 160 AddCallback("finishLocalManagedUserCreation", | 160 AddCallback("finishLocalSupervisedUserCreation", |
| 161 &SupervisedUserCreationScreenHandler:: | 161 &SupervisedUserCreationScreenHandler:: |
| 162 HandleFinishLocalSupervisedUserCreation); | 162 HandleFinishLocalSupervisedUserCreation); |
| 163 AddCallback("abortLocalManagedUserCreation", | 163 AddCallback("abortLocalSupervisedUserCreation", |
| 164 &SupervisedUserCreationScreenHandler:: | 164 &SupervisedUserCreationScreenHandler:: |
| 165 HandleAbortLocalSupervisedUserCreation); | 165 HandleAbortLocalSupervisedUserCreation); |
| 166 AddCallback("checkLocallyManagedUserName", | 166 AddCallback("checkSupervisedUserName", |
| 167 &SupervisedUserCreationScreenHandler:: | 167 &SupervisedUserCreationScreenHandler:: |
| 168 HandleCheckSupervisedUserName); | 168 HandleCheckSupervisedUserName); |
| 169 AddCallback("authenticateManagerInLocallyManagedUserCreationFlow", | 169 AddCallback("authenticateManagerInSupervisedUserCreationFlow", |
| 170 &SupervisedUserCreationScreenHandler:: | 170 &SupervisedUserCreationScreenHandler:: |
| 171 HandleAuthenticateManager); | 171 HandleAuthenticateManager); |
| 172 AddCallback("specifyLocallyManagedUserCreationFlowUserData", | 172 AddCallback("specifySupervisedUserCreationFlowUserData", |
| 173 &SupervisedUserCreationScreenHandler:: | 173 &SupervisedUserCreationScreenHandler:: |
| 174 HandleCreateSupervisedUser); | 174 HandleCreateSupervisedUser); |
| 175 AddCallback("managerSelectedOnLocallyManagedUserCreationFlow", | 175 AddCallback("managerSelectedOnSupervisedUserCreationFlow", |
| 176 &SupervisedUserCreationScreenHandler:: | 176 &SupervisedUserCreationScreenHandler:: |
| 177 HandleManagerSelected); | 177 HandleManagerSelected); |
| 178 AddCallback("userSelectedForImportInManagedUserCreationFlow", | 178 AddCallback("userSelectedForImportInSupervisedUserCreationFlow", |
| 179 &SupervisedUserCreationScreenHandler:: | 179 &SupervisedUserCreationScreenHandler:: |
| 180 HandleImportUserSelected); | 180 HandleImportUserSelected); |
| 181 AddCallback("importSupervisedUser", | 181 AddCallback("importSupervisedUser", |
| 182 &SupervisedUserCreationScreenHandler:: | 182 &SupervisedUserCreationScreenHandler:: |
| 183 HandleImportSupervisedUser); | 183 HandleImportSupervisedUser); |
| 184 AddCallback("importSupervisedUserWithPassword", | 184 AddCallback("importSupervisedUserWithPassword", |
| 185 &SupervisedUserCreationScreenHandler:: | 185 &SupervisedUserCreationScreenHandler:: |
| 186 HandleImportSupervisedUserWithPassword); | 186 HandleImportSupervisedUserWithPassword); |
| 187 | 187 |
| 188 | 188 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 const std::string& user_id) { | 293 const std::string& user_id) { |
| 294 if (!delegate_) | 294 if (!delegate_) |
| 295 return; | 295 return; |
| 296 } | 296 } |
| 297 | 297 |
| 298 void SupervisedUserCreationScreenHandler::HandleCheckSupervisedUserName( | 298 void SupervisedUserCreationScreenHandler::HandleCheckSupervisedUserName( |
| 299 const base::string16& name) { | 299 const base::string16& name) { |
| 300 std::string user_id; | 300 std::string user_id; |
| 301 if (NULL != UserManager::Get()->GetSupervisedUserManager()-> | 301 if (NULL != UserManager::Get()->GetSupervisedUserManager()-> |
| 302 FindByDisplayName(base::CollapseWhitespace(name, true))) { | 302 FindByDisplayName(base::CollapseWhitespace(name, true))) { |
| 303 CallJS("managedUserNameError", name, | 303 CallJS("supervisedUserNameError", name, |
| 304 l10n_util::GetStringUTF16( | 304 l10n_util::GetStringUTF16( |
| 305 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS)); | 305 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS)); |
| 306 } else if (net::EscapeForHTML(name) != name) { | 306 } else if (net::EscapeForHTML(name) != name) { |
| 307 CallJS("managedUserNameError", name, | 307 CallJS("supervisedUserNameError", name, |
| 308 l10n_util::GetStringUTF16( | 308 l10n_util::GetStringUTF16( |
| 309 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ILLEGAL_USERNAME)); | 309 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ILLEGAL_USERNAME)); |
| 310 } else if (delegate_ && delegate_->FindUserByDisplayName( | 310 } else if (delegate_ && delegate_->FindUserByDisplayName( |
| 311 base::CollapseWhitespace(name, true), &user_id)) { | 311 base::CollapseWhitespace(name, true), &user_id)) { |
| 312 CallJS("managedUserSuggestImport", name, user_id); | 312 CallJS("supervisedUserSuggestImport", name, user_id); |
| 313 } else { | 313 } else { |
| 314 CallJS("managedUserNameOk", name); | 314 CallJS("supervisedUserNameOk", name); |
| 315 } | 315 } |
| 316 } | 316 } |
| 317 | 317 |
| 318 void SupervisedUserCreationScreenHandler::HandleCreateSupervisedUser( | 318 void SupervisedUserCreationScreenHandler::HandleCreateSupervisedUser( |
| 319 const base::string16& new_raw_user_name, | 319 const base::string16& new_raw_user_name, |
| 320 const std::string& new_user_password) { | 320 const std::string& new_user_password) { |
| 321 if (!delegate_) | 321 if (!delegate_) |
| 322 return; | 322 return; |
| 323 const base::string16 new_user_name = | 323 const base::string16 new_user_name = |
| 324 base::CollapseWhitespace(new_raw_user_name, true); | 324 base::CollapseWhitespace(new_raw_user_name, true); |
| 325 if (NULL != UserManager::Get()->GetSupervisedUserManager()-> | 325 if (NULL != UserManager::Get()->GetSupervisedUserManager()-> |
| 326 FindByDisplayName(new_user_name)) { | 326 FindByDisplayName(new_user_name)) { |
| 327 CallJS("managedUserNameError", new_user_name, | 327 CallJS("supervisedUserNameError", new_user_name, |
| 328 l10n_util::GetStringFUTF16( | 328 l10n_util::GetStringFUTF16( |
| 329 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS, | 329 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS, |
| 330 new_user_name)); | 330 new_user_name)); |
| 331 return; | 331 return; |
| 332 } | 332 } |
| 333 if (net::EscapeForHTML(new_user_name) != new_user_name) { | 333 if (net::EscapeForHTML(new_user_name) != new_user_name) { |
| 334 CallJS("managedUserNameError", new_user_name, | 334 CallJS("supervisedUserNameError", new_user_name, |
| 335 l10n_util::GetStringUTF16( | 335 l10n_util::GetStringUTF16( |
| 336 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ILLEGAL_USERNAME)); | 336 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ILLEGAL_USERNAME)); |
| 337 return; | 337 return; |
| 338 } | 338 } |
| 339 | 339 |
| 340 if (new_user_password.length() == 0) { | 340 if (new_user_password.length() == 0) { |
| 341 CallJS("showPasswordError", | 341 CallJS("showPasswordError", |
| 342 l10n_util::GetStringUTF16( | 342 l10n_util::GetStringUTF16( |
| 343 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TOO_SHORT)); | 343 IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TOO_SHORT)); |
| 344 return; | 344 return; |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 const std::string& page) { | 443 const std::string& page) { |
| 444 CallJS("showPage", page); | 444 CallJS("showPage", page); |
| 445 } | 445 } |
| 446 | 446 |
| 447 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) { | 447 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) { |
| 448 CallJS("setCameraPresent", present); | 448 CallJS("setCameraPresent", present); |
| 449 } | 449 } |
| 450 | 450 |
| 451 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers( | 451 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers( |
| 452 const base::ListValue* users) { | 452 const base::ListValue* users) { |
| 453 CallJS("setExistingManagedUsers", *users); | 453 CallJS("setExistingSupervisedUsers", *users); |
| 454 } | 454 } |
| 455 | 455 |
| 456 } // namespace chromeos | 456 } // namespace chromeos |
| OLD | NEW |