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

Unified Diff: chrome/browser/chromeos/arc/arc_session_manager.cc

Issue 2625833002: arc: Closing LSO page shoud disable ARC. (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698