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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 2856683002: cros: Replace "TPM" with "secure module" for machines without TPM. (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" 31 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
32 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_fac tory.h" 32 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_fac tory.h"
33 #include "chrome/browser/supervised_user/supervised_user_constants.h" 33 #include "chrome/browser/supervised_user/supervised_user_constants.h"
34 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 34 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
35 #include "chrome/grit/generated_resources.h" 35 #include "chrome/grit/generated_resources.h"
36 #include "chromeos/dbus/dbus_thread_manager.h" 36 #include "chromeos/dbus/dbus_thread_manager.h"
37 #include "chromeos/dbus/session_manager_client.h" 37 #include "chromeos/dbus/session_manager_client.h"
38 #include "chromeos/login/auth/key.h" 38 #include "chromeos/login/auth/key.h"
39 #include "chromeos/login/auth/user_context.h" 39 #include "chromeos/login/auth/user_context.h"
40 #include "chromeos/network/network_state.h" 40 #include "chromeos/network/network_state.h"
41 #include "chromeos/tpm/tpm_token_info_getter.h"
41 #include "components/user_manager/user.h" 42 #include "components/user_manager/user.h"
42 #include "components/user_manager/user_image/user_image.h" 43 #include "components/user_manager/user_image/user_image.h"
43 #include "content/public/browser/browser_thread.h" 44 #include "content/public/browser/browser_thread.h"
44 #include "third_party/skia/include/core/SkBitmap.h" 45 #include "third_party/skia/include/core/SkBitmap.h"
45 #include "ui/base/l10n/l10n_util.h" 46 #include "ui/base/l10n/l10n_util.h"
46 #include "ui/gfx/image/image_skia.h" 47 #include "ui/gfx/image/image_skia.h"
47 48
48 namespace chromeos { 49 namespace chromeos {
49 50
50 namespace { 51 namespace {
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 404
404 base::string16 title; 405 base::string16 title;
405 base::string16 message; 406 base::string16 message;
406 base::string16 button; 407 base::string16 button;
407 // TODO(antrim) : find out which errors do we really have. 408 // TODO(antrim) : find out which errors do we really have.
408 // We might reuse some error messages from ordinary user flow. 409 // We might reuse some error messages from ordinary user flow.
409 switch (code) { 410 switch (code) {
410 case SupervisedUserCreationController::CRYPTOHOME_NO_MOUNT: 411 case SupervisedUserCreationController::CRYPTOHOME_NO_MOUNT:
411 case SupervisedUserCreationController::CRYPTOHOME_FAILED_MOUNT: 412 case SupervisedUserCreationController::CRYPTOHOME_FAILED_MOUNT:
412 case SupervisedUserCreationController::CRYPTOHOME_FAILED_TPM: 413 case SupervisedUserCreationController::CRYPTOHOME_FAILED_TPM:
413 title = l10n_util::GetStringUTF16( 414 if (TPMTokenInfoGetter::DoesTPMExist()) {
414 IDS_CREATE_SUPERVISED_USER_TPM_ERROR_TITLE); 415 title = l10n_util::GetStringUTF16(
415 message = l10n_util::GetStringUTF16( 416 IDS_CREATE_SUPERVISED_USER_TPM_ERROR_TITLE);
416 IDS_CREATE_SUPERVISED_USER_TPM_ERROR); 417 message =
417 button = l10n_util::GetStringUTF16( 418 l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_TPM_ERROR);
418 IDS_CREATE_SUPERVISED_USER_TPM_ERROR_BUTTON); 419 button = l10n_util::GetStringUTF16(
420 IDS_CREATE_SUPERVISED_USER_TPM_ERROR_BUTTON);
421 } else {
422 title = l10n_util::GetStringUTF16(
423 IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR_TITLE);
424 message = l10n_util::GetStringUTF16(
425 IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR);
426 button = l10n_util::GetStringUTF16(
427 IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR_BUTTON);
428 }
419 break; 429 break;
420 case SupervisedUserCreationController::CLOUD_SERVER_ERROR: 430 case SupervisedUserCreationController::CLOUD_SERVER_ERROR:
421 case SupervisedUserCreationController::TOKEN_WRITE_FAILED: 431 case SupervisedUserCreationController::TOKEN_WRITE_FAILED:
422 title = l10n_util::GetStringUTF16( 432 title = l10n_util::GetStringUTF16(
423 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE); 433 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE);
424 message = l10n_util::GetStringUTF16( 434 message = l10n_util::GetStringUTF16(
425 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR); 435 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR);
426 button = l10n_util::GetStringUTF16( 436 button = l10n_util::GetStringUTF16(
427 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON); 437 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON);
428 break; 438 break;
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 629 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
620 } else { 630 } else {
621 NOTREACHED() << "Unexpected image type: " << image_type; 631 NOTREACHED() << "Unexpected image type: " << image_type;
622 } 632 }
623 } 633 }
624 634
625 void SupervisedUserCreationScreen::OnImageAccepted() { 635 void SupervisedUserCreationScreen::OnImageAccepted() {
626 } 636 }
627 637
628 } // namespace chromeos 638 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698