Commit 3279bfda authored by Wenzhao Zang's avatar Wenzhao Zang Committed by Commit Bot

cros: Skip market opt-in screen for non-regular ephemeral users

Bug: 879310
Change-Id: I65ac6b822e1fadd9440189a3e11c6d4fa118ec8f
Reviewed-on: https://chromium-review.googlesource.com/1198762
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587934}
parent 09b4427e
......@@ -680,6 +680,16 @@ void WizardController::ShowFingerprintSetupScreen() {
}
void WizardController::ShowMarketingOptInScreen() {
// Skip the screen for public sessions and non-regular ephemeral users.
const user_manager::UserManager* user_manager =
user_manager::UserManager::Get();
if (user_manager->IsLoggedInAsPublicAccount() ||
(user_manager->IsCurrentUserNonCryptohomeDataEphemeral() &&
user_manager->GetActiveUser()->GetType() !=
user_manager::USER_TYPE_REGULAR)) {
OnMarketingOptInFinished();
return;
}
VLOG(1) << "Showing Marketing Opt-In screen.";
UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_MARKETING_OPT_IN);
SetCurrentScreen(GetScreen(OobeScreen::SCREEN_MARKETING_OPT_IN));
......@@ -1641,7 +1651,7 @@ void WizardController::OnExit(ScreenExitCode exit_code) {
OnFingerprintSetupFinished();
break;
case ScreenExitCode::MARKETING_OPT_IN_FINISHED:
ShowArcTermsOfServiceScreen();
OnMarketingOptInFinished();
break;
default:
NOTREACHED();
......
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