Commit f1b4b8bb authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

cros: Nuke SCREEN_SPECIAL_OOBE

not used anymore.

Bug: 958905
Change-Id: Ief1d248d19a571283a08320c472cb8f976a4d4d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2230460
Auto-Submit: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775018}
parent ffb3d3d9
......@@ -50,7 +50,6 @@ constexpr StaticOobeScreenId OobeScreen::SCREEN_CONFIRM_PASSWORD;
constexpr StaticOobeScreenId OobeScreen::SCREEN_FATAL_ERROR;
constexpr StaticOobeScreenId
OobeScreen::SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE;
constexpr StaticOobeScreenId OobeScreen::SCREEN_SPECIAL_OOBE;
constexpr StaticOobeScreenId OobeScreen::SCREEN_UNKNOWN;
} // namespace chromeos
......@@ -64,9 +64,6 @@ struct OobeScreen {
constexpr static StaticOobeScreenId SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE{
"ad-password-change"};
// Special "first screen" that initiates full OOBE flow.
constexpr static StaticOobeScreenId SCREEN_SPECIAL_OOBE{"oobe"};
constexpr static StaticOobeScreenId SCREEN_UNKNOWN{"unknown"};
};
......
......@@ -372,10 +372,10 @@ void WizardController::Init(OobeScreenId first_screen) {
first_screen_ = first_screen;
bool oobe_complete = StartupUtils::IsOobeCompleted();
if (!oobe_complete)
if (!oobe_complete) {
UpdateOobeConfiguration();
if (!oobe_complete || first_screen == OobeScreen::SCREEN_SPECIAL_OOBE)
is_out_of_box_ = true;
}
// This is a hacky way to check for local state corruption, because
// it depends on the fact that the local state is loaded
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment