| 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/chromeos/login/supervised/supervised_user_creation_scre
en.h" | 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre
en.h" |
| 6 | 6 |
| 7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/rand_util.h" | 9 #include "base/rand_util.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 screen->SetUIState(ErrorScreen::UI_STATE_SUPERVISED); | 150 screen->SetUIState(ErrorScreen::UI_STATE_SUPERVISED); |
| 151 get_screen_observer()->ShowErrorScreen(); | 151 get_screen_observer()->ShowErrorScreen(); |
| 152 } | 152 } |
| 153 } | 153 } |
| 154 | 154 |
| 155 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() { | 155 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() { |
| 156 if (!actor_) | 156 if (!actor_) |
| 157 return; | 157 return; |
| 158 actor_->ShowErrorPage( | 158 actor_->ShowErrorPage( |
| 159 l10n_util::GetStringUTF16( | 159 l10n_util::GetStringUTF16( |
| 160 IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE_TITLE), | 160 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE), |
| 161 l10n_util::GetStringUTF16( | 161 l10n_util::GetStringUTF16( |
| 162 IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE), | 162 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE), |
| 163 l10n_util::GetStringUTF16( | 163 l10n_util::GetStringUTF16( |
| 164 IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE_BUTTON)); | 164 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_BUTTON)); |
| 165 } | 165 } |
| 166 | 166 |
| 167 void SupervisedUserCreationScreen::ShowInitialScreen() { | 167 void SupervisedUserCreationScreen::ShowInitialScreen() { |
| 168 if (actor_) | 168 if (actor_) |
| 169 actor_->ShowIntroPage(); | 169 actor_->ShowIntroPage(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 void SupervisedUserCreationScreen::Hide() { | 172 void SupervisedUserCreationScreen::Hide() { |
| 173 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); | 173 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); |
| 174 if (actor_) | 174 if (actor_) |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 &signature_key); | 239 &signature_key); |
| 240 user_info->GetString(SupervisedUserSyncService::kPasswordEncryptionKey, | 240 user_info->GetString(SupervisedUserSyncService::kPasswordEncryptionKey, |
| 241 &encryption_key); | 241 &encryption_key); |
| 242 user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar); | 242 user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar); |
| 243 user_info->GetBoolean(kUserExists, &exists); | 243 user_info->GetBoolean(kUserExists, &exists); |
| 244 | 244 |
| 245 // We should not get here with existing user selected, so just display error. | 245 // We should not get here with existing user selected, so just display error. |
| 246 if (exists) { | 246 if (exists) { |
| 247 actor_->ShowErrorPage( | 247 actor_->ShowErrorPage( |
| 248 l10n_util::GetStringUTF16( | 248 l10n_util::GetStringUTF16( |
| 249 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_TITLE), | 249 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE), |
| 250 l10n_util::GetStringUTF16( | 250 l10n_util::GetStringUTF16( |
| 251 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR), | 251 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR), |
| 252 l10n_util::GetStringUTF16( | 252 l10n_util::GetStringUTF16( |
| 253 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_BUTTON)); | 253 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON)); |
| 254 return; | 254 return; |
| 255 } | 255 } |
| 256 | 256 |
| 257 SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index); | 257 SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index); |
| 258 | 258 |
| 259 const base::DictionaryValue* password_data = NULL; | 259 const base::DictionaryValue* password_data = NULL; |
| 260 SupervisedUserSharedSettingsService* shared_settings_service = | 260 SupervisedUserSharedSettingsService* shared_settings_service = |
| 261 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext( | 261 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext( |
| 262 controller_->GetManagerProfile()); | 262 controller_->GetManagerProfile()); |
| 263 const base::Value* value = shared_settings_service->GetValue( | 263 const base::Value* value = shared_settings_service->GetValue( |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 int avatar_index = SupervisedUserCreationController::kDummyAvatarIndex; | 299 int avatar_index = SupervisedUserCreationController::kDummyAvatarIndex; |
| 300 user_info->GetString(SupervisedUserSyncService::kName, &display_name); | 300 user_info->GetString(SupervisedUserSyncService::kName, &display_name); |
| 301 user_info->GetString(SupervisedUserSyncService::kMasterKey, &master_key); | 301 user_info->GetString(SupervisedUserSyncService::kMasterKey, &master_key); |
| 302 user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar); | 302 user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar); |
| 303 user_info->GetBoolean(kUserExists, &exists); | 303 user_info->GetBoolean(kUserExists, &exists); |
| 304 | 304 |
| 305 // We should not get here with existing user selected, so just display error. | 305 // We should not get here with existing user selected, so just display error. |
| 306 if (exists) { | 306 if (exists) { |
| 307 actor_->ShowErrorPage( | 307 actor_->ShowErrorPage( |
| 308 l10n_util::GetStringUTF16( | 308 l10n_util::GetStringUTF16( |
| 309 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_TITLE), | 309 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE), |
| 310 l10n_util::GetStringUTF16( | 310 l10n_util::GetStringUTF16( |
| 311 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR), | 311 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR), |
| 312 l10n_util::GetStringUTF16( | 312 l10n_util::GetStringUTF16( |
| 313 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_BUTTON)); | 313 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON)); |
| 314 return; | 314 return; |
| 315 } | 315 } |
| 316 | 316 |
| 317 SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index); | 317 SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index); |
| 318 | 318 |
| 319 controller_->StartImport(display_name, | 319 controller_->StartImport(display_name, |
| 320 password, | 320 password, |
| 321 avatar_index, | 321 avatar_index, |
| 322 user_id, | 322 user_id, |
| 323 master_key); | 323 master_key); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 351 void SupervisedUserCreationScreen::OnSupervisedUsersChanged() { | 351 void SupervisedUserCreationScreen::OnSupervisedUsersChanged() { |
| 352 CHECK(sync_service_); | 352 CHECK(sync_service_); |
| 353 sync_service_->GetSupervisedUsersAsync( | 353 sync_service_->GetSupervisedUsersAsync( |
| 354 base::Bind(&SupervisedUserCreationScreen::OnGetSupervisedUsers, | 354 base::Bind(&SupervisedUserCreationScreen::OnGetSupervisedUsers, |
| 355 weak_factory_.GetWeakPtr())); | 355 weak_factory_.GetWeakPtr())); |
| 356 } | 356 } |
| 357 | 357 |
| 358 void SupervisedUserCreationScreen::OnManagerCryptohomeAuthenticated() { | 358 void SupervisedUserCreationScreen::OnManagerCryptohomeAuthenticated() { |
| 359 if (actor_) { | 359 if (actor_) { |
| 360 actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16( | 360 actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16( |
| 361 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_AUTH_PROGRESS_MESSAGE)); | 361 IDS_CREATE_SUPERVISED_USER_CREATION_AUTH_PROGRESS_MESSAGE)); |
| 362 } | 362 } |
| 363 } | 363 } |
| 364 | 364 |
| 365 void SupervisedUserCreationScreen::OnActorDestroyed( | 365 void SupervisedUserCreationScreen::OnActorDestroyed( |
| 366 SupervisedUserCreationScreenHandler* actor) { | 366 SupervisedUserCreationScreenHandler* actor) { |
| 367 if (actor_ == actor) | 367 if (actor_ == actor) |
| 368 actor_ = NULL; | 368 actor_ = NULL; |
| 369 } | 369 } |
| 370 | 370 |
| 371 void SupervisedUserCreationScreen::OnCreationError( | 371 void SupervisedUserCreationScreen::OnCreationError( |
| 372 SupervisedUserCreationController::ErrorCode code) { | 372 SupervisedUserCreationController::ErrorCode code) { |
| 373 base::string16 title; | 373 base::string16 title; |
| 374 base::string16 message; | 374 base::string16 message; |
| 375 base::string16 button; | 375 base::string16 button; |
| 376 // TODO(antrim) : find out which errors do we really have. | 376 // TODO(antrim) : find out which errors do we really have. |
| 377 // We might reuse some error messages from ordinary user flow. | 377 // We might reuse some error messages from ordinary user flow. |
| 378 switch (code) { | 378 switch (code) { |
| 379 case SupervisedUserCreationController::CRYPTOHOME_NO_MOUNT: | 379 case SupervisedUserCreationController::CRYPTOHOME_NO_MOUNT: |
| 380 case SupervisedUserCreationController::CRYPTOHOME_FAILED_MOUNT: | 380 case SupervisedUserCreationController::CRYPTOHOME_FAILED_MOUNT: |
| 381 case SupervisedUserCreationController::CRYPTOHOME_FAILED_TPM: | 381 case SupervisedUserCreationController::CRYPTOHOME_FAILED_TPM: |
| 382 title = l10n_util::GetStringUTF16( | 382 title = l10n_util::GetStringUTF16( |
| 383 IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_TITLE); | 383 IDS_CREATE_SUPERVISED_USER_TPM_ERROR_TITLE); |
| 384 message = l10n_util::GetStringUTF16( | 384 message = l10n_util::GetStringUTF16( |
| 385 IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR); | 385 IDS_CREATE_SUPERVISED_USER_TPM_ERROR); |
| 386 button = l10n_util::GetStringUTF16( | 386 button = l10n_util::GetStringUTF16( |
| 387 IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_BUTTON); | 387 IDS_CREATE_SUPERVISED_USER_TPM_ERROR_BUTTON); |
| 388 break; | 388 break; |
| 389 case SupervisedUserCreationController::CLOUD_SERVER_ERROR: | 389 case SupervisedUserCreationController::CLOUD_SERVER_ERROR: |
| 390 case SupervisedUserCreationController::TOKEN_WRITE_FAILED: | 390 case SupervisedUserCreationController::TOKEN_WRITE_FAILED: |
| 391 title = l10n_util::GetStringUTF16( | 391 title = l10n_util::GetStringUTF16( |
| 392 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_TITLE); | 392 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE); |
| 393 message = l10n_util::GetStringUTF16( | 393 message = l10n_util::GetStringUTF16( |
| 394 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR); | 394 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR); |
| 395 button = l10n_util::GetStringUTF16( | 395 button = l10n_util::GetStringUTF16( |
| 396 IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_BUTTON); | 396 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON); |
| 397 break; | 397 break; |
| 398 case SupervisedUserCreationController::NO_ERROR: | 398 case SupervisedUserCreationController::NO_ERROR: |
| 399 NOTREACHED(); | 399 NOTREACHED(); |
| 400 } | 400 } |
| 401 if (actor_) | 401 if (actor_) |
| 402 actor_->ShowErrorPage(title, message, button); | 402 actor_->ShowErrorPage(title, message, button); |
| 403 } | 403 } |
| 404 | 404 |
| 405 void SupervisedUserCreationScreen::OnCreationTimeout() { | 405 void SupervisedUserCreationScreen::OnCreationTimeout() { |
| 406 if (actor_) { | 406 if (actor_) { |
| 407 actor_->ShowStatusMessage(false /* error */, l10n_util::GetStringUTF16( | 407 actor_->ShowStatusMessage(false /* error */, l10n_util::GetStringUTF16( |
| 408 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_TIMEOUT_MESSAGE)); | 408 IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_TIMEOUT_MESSAGE)); |
| 409 } | 409 } |
| 410 } | 410 } |
| 411 | 411 |
| 412 void SupervisedUserCreationScreen::OnLongCreationWarning() { | 412 void SupervisedUserCreationScreen::OnLongCreationWarning() { |
| 413 if (actor_) { | 413 if (actor_) { |
| 414 actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16( | 414 actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16( |
| 415 IDS_PROFILES_CREATE_SUPERVISED_JUST_SIGNED_IN)); | 415 IDS_PROFILES_CREATE_SUPERVISED_JUST_SIGNED_IN)); |
| 416 } | 416 } |
| 417 } | 417 } |
| 418 | 418 |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; | 591 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
| 592 } else { | 592 } else { |
| 593 NOTREACHED() << "Unexpected image type: " << image_type; | 593 NOTREACHED() << "Unexpected image type: " << image_type; |
| 594 } | 594 } |
| 595 } | 595 } |
| 596 | 596 |
| 597 void SupervisedUserCreationScreen::OnImageAccepted() { | 597 void SupervisedUserCreationScreen::OnImageAccepted() { |
| 598 } | 598 } |
| 599 | 599 |
| 600 } // namespace chromeos | 600 } // namespace chromeos |
| OLD | NEW |