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

Side by Side Diff: chrome/browser/chromeos/login/oobe_screen.cc

Issue 2779933002: Add a screen to migrate filesystem encryption from eCryptfs to ext4 crypto. (Closed)
Patch Set: Address review comments. Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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/oobe_screen.h" 5 #include "chrome/browser/chromeos/login/oobe_screen.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace chromeos { 10 namespace chromeos {
(...skipping 26 matching lines...) Expand all
37 "arc-kiosk-splash", // SCREEN_ARC_KIOSK_SPLASH 37 "arc-kiosk-splash", // SCREEN_ARC_KIOSK_SPLASH
38 "confirm-password", // SCREEN_CONFIRM_PASSWORD 38 "confirm-password", // SCREEN_CONFIRM_PASSWORD
39 "fatal-error", // SCREEN_FATAL_ERROR 39 "fatal-error", // SCREEN_FATAL_ERROR
40 "controller-pairing", // SCREEN_OOBE_CONTROLLER_PAIRING 40 "controller-pairing", // SCREEN_OOBE_CONTROLLER_PAIRING
41 "host-pairing", // SCREEN_OOBE_HOST_PAIRING 41 "host-pairing", // SCREEN_OOBE_HOST_PAIRING
42 "device-disabled", // SCREEN_DEVICE_DISABLED 42 "device-disabled", // SCREEN_DEVICE_DISABLED
43 "unrecoverable-cryptohome-error", // SCREEN_UNRECOVERABLE_CRYPTOHOME_ERROR 43 "unrecoverable-cryptohome-error", // SCREEN_UNRECOVERABLE_CRYPTOHOME_ERROR
44 "userBoard", // SCREEN_USER_SELECTION 44 "userBoard", // SCREEN_USER_SELECTION
45 // SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE 45 // SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE
46 "ad-password-change", 46 "ad-password-change",
47 "login", // SCREEN_SPECIAL_LOGIN 47 "encryption-migration", // SCREEN_ENCRYPTION_MIGRATION
48 "oobe", // SCREEN_SPECIAL_OOBE 48 "login", // SCREEN_SPECIAL_LOGIN
49 "test:nowindow", // SCREEN_TEST_NO_WINDOW 49 "oobe", // SCREEN_SPECIAL_OOBE
50 "unknown", // SCREEN_UNKNOWN 50 "test:nowindow", // SCREEN_TEST_NO_WINDOW
51 "unknown", // SCREEN_UNKNOWN
51 }; 52 };
52 53
53 static_assert(static_cast<size_t>(OobeScreen::SCREEN_UNKNOWN) == 54 static_assert(static_cast<size_t>(OobeScreen::SCREEN_UNKNOWN) ==
54 arraysize(kScreenNames) - 1, 55 arraysize(kScreenNames) - 1,
55 "Missing element in OobeScreen or kScreenNames"); 56 "Missing element in OobeScreen or kScreenNames");
56 57
57 } // namespace 58 } // namespace
58 59
59 std::string GetOobeScreenName(OobeScreen screen) { 60 std::string GetOobeScreenName(OobeScreen screen) {
60 DCHECK(screen <= OobeScreen::SCREEN_UNKNOWN); 61 DCHECK(screen <= OobeScreen::SCREEN_UNKNOWN);
61 return kScreenNames[static_cast<size_t>(screen)]; 62 return kScreenNames[static_cast<size_t>(screen)];
62 } 63 }
63 64
64 OobeScreen GetOobeScreenFromName(const std::string& name) { 65 OobeScreen GetOobeScreenFromName(const std::string& name) {
65 for (size_t i = 0; i < arraysize(kScreenNames); ++i) { 66 for (size_t i = 0; i < arraysize(kScreenNames); ++i) {
66 if (name == kScreenNames[i]) 67 if (name == kScreenNames[i])
67 return static_cast<OobeScreen>(i); 68 return static_cast<OobeScreen>(i);
68 } 69 }
69 70
70 return OobeScreen::SCREEN_UNKNOWN; 71 return OobeScreen::SCREEN_UNKNOWN;
71 } 72 }
72 73
73 } // namespace chromeos 74 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/oobe_screen.h ('k') | chrome/browser/chromeos/login/screens/encryption_migration_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698