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

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

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 years, 11 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/oobe_screen.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_screen.cc b/chrome/browser/ui/webui/chromeos/login/oobe_screen.cc
deleted file mode 100644
index 46f966016aa84e18aecd59317935b73c0b6f69c5..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/chromeos/login/oobe_screen.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
-
-#include "base/logging.h"
-#include "base/macros.h"
-
-namespace chromeos {
-namespace {
-
-// These get mapped by the Screen enum ordinal values, so this has to be defined
-// in the same order as the Screen enum.
-const char* kScreenNames[] = {
- "hid-detection", // SCREEN_OOBE_HID_DETECTION,
- "connect", // SCREEN_OOBE_NETWORK
- "eula", // SCREEN_OOBE_EULA
- "update", // SCREEN_OOBE_UPDATE
- "debugging", // SCREEN_OOBE_ENABLE_DEBUGGING
- "oauth-enrollment", // SCREEN_OOBE_ENROLLMENT
- "reset", // SCREEN_OOBE_RESET
- "gaia-signin", // SCREEN_GAIA_SIGNIN
- "account-picker", // SCREEN_ACCOUNT_PICKER
- "autolaunch", // SCREEN_KIOSK_AUTOLAUNCH
- "kiosk-enable", // SCREEN_KIOSK_ENABLE
- "error-message", // SCREEN_ERROR_MESSAGE
- "user-image", // SCREEN_USER_IMAGE_PICKER
- "tpm-error-message", // SCREEN_TPM_ERROR
- "password-changed", // SCREEN_PASSWORD_CHANGED
- "supervised-user-creation", // SCREEN_CREATE_SUPERVISED_USER_FLOW
- "terms-of-service", // SCREEN_TERMS_OF_SERVICE
- "arc-tos", // SCREEN_ARC_TERMS_OF_SERVICE
- "wrong-hwid", // SCREEN_WRONG_HWID
- "auto-enrollment-check", // SCREEN_AUTO_ENROLLMENT_CHECK
- "app-launch-splash", // SCREEN_APP_LAUNCH_SPLASH
- "confirm-password", // SCREEN_CONFIRM_PASSWORD
- "fatal-error", // SCREEN_FATAL_ERROR
- "controller-pairing", // SCREEN_OOBE_CONTROLLER_PAIRING
- "host-pairing", // SCREEN_OOBE_HOST_PAIRING
- "device-disabled", // SCREEN_DEVICE_DISABLED
- "unrecoverable-cryptohome-error", // SCREEN_UNRECOVERABLE_CRYPTOHOME_ERROR
- "unknown", // SCREEN_UNKNOWN
-};
-
-static_assert(static_cast<size_t>(OobeScreen::SCREEN_UNKNOWN) ==
- arraysize(kScreenNames) - 1,
- "Missing element in OobeScreen or kScreenNames");
-
-} // namespace
-
-std::string GetOobeScreenName(OobeScreen screen) {
- DCHECK(screen <= OobeScreen::SCREEN_UNKNOWN);
- return kScreenNames[static_cast<size_t>(screen)];
-}
-
-OobeScreen GetOobeScreenFromName(const std::string& name) {
- for (size_t i = 0; i < arraysize(kScreenNames); ++i) {
- if (name == kScreenNames[i])
- return static_cast<OobeScreen>(i);
- }
-
- return OobeScreen::SCREEN_UNKNOWN;
-}
-
-} // namespace chromeos
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_screen.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698