Commit 293f4eec authored by khmel's avatar khmel Committed by Commit bot

arc: Closing LSO page shoud disable ARC.

This fix regression compared M55 build.

TEST=Manually, close LSO page and observe that Play Store checkbox
     in settings turns off.
BUG=b/34199954

Review-Url: https://codereview.chromium.org/2625833002
Cr-Commit-Position: refs/heads/master@{#442819}
parent d6a80917
...@@ -733,13 +733,15 @@ void ArcSessionManager::CancelAuthCode() { ...@@ -733,13 +733,15 @@ void ArcSessionManager::CancelAuthCode() {
return; return;
} }
// In case |state_| is ACTIVE, UI page can be ARC_LOADING (which means normal // If ARC failed to boot normally, stop ARC. Similarly, if the current page is
// ARC booting) or ERROR (in case ARC can not be started). If ARC is booting // LSO, closing the window should stop ARC since the user activity chooses to
// normally don't stop it on progress close. // not sign in. In any other case, ARC is booting normally and the instance
// should not be stopped.
if ((state_ != State::SHOWING_TERMS_OF_SERVICE && if ((state_ != State::SHOWING_TERMS_OF_SERVICE &&
state_ != State::CHECKING_ANDROID_MANAGEMENT) && state_ != State::CHECKING_ANDROID_MANAGEMENT) &&
(!support_host_ || (!support_host_ ||
support_host_->ui_page() != ArcSupportHost::UIPage::ERROR)) { (support_host_->ui_page() != ArcSupportHost::UIPage::ERROR &&
support_host_->ui_page() != ArcSupportHost::UIPage::LSO))) {
return; return;
} }
......
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