Index: chrome/browser/chromeos/arc/arc_session_manager.cc |
diff --git a/chrome/browser/chromeos/arc/arc_session_manager.cc b/chrome/browser/chromeos/arc/arc_session_manager.cc |
index 3544f007a7645d368c16cdb8ec58aa1cd3f15a64..8d6a45639a452d8ccb480ee0bdfbbfdac9a0a5bd 100644 |
--- a/chrome/browser/chromeos/arc/arc_session_manager.cc |
+++ b/chrome/browser/chromeos/arc/arc_session_manager.cc |
@@ -724,11 +724,14 @@ void ArcSessionManager::CancelAuthCode() { |
// In case |state_| is ACTIVE, UI page can be ARC_LOADING (which means normal |
// ARC booting) or ERROR (in case ARC can not be started). If ARC is booting |
- // normally don't stop it on progress close. |
+ // normally don't stop it on progress close. If current page is LSO then |
+ // closing UI means no auth code and sign-in failure. Stop ARC in that case |
Luis Héctor Chávez
2017/01/11 00:23:52
nit: I'd probably reword it as
"If ARC failed to
khmel
2017/01/11 05:36:43
That is nice, thanks!
|
+ // too. |
if ((state_ != State::SHOWING_TERMS_OF_SERVICE && |
state_ != State::CHECKING_ANDROID_MANAGEMENT) && |
(!support_host_ || |
- support_host_->ui_page() != ArcSupportHost::UIPage::ERROR)) { |
+ (support_host_->ui_page() != ArcSupportHost::UIPage::ERROR && |
+ support_host_->ui_page() != ArcSupportHost::UIPage::LSO))) { |
return; |
} |