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

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

Issue 2707133006: Start ARC and sign in after Chrome OS login (Closed)
Patch Set: minimize test diff Created 3 years, 9 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
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 f82e67c428a728954a8bffa79a62274fdc35d1e6..4ead196b6735379abd2b383ed6f7dd0b5306ecd4 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -444,7 +444,6 @@ void ArcSessionManager::Shutdown() {
SetState(State::NOT_INITIALIZED);
}
-
void ArcSessionManager::ShutdownSession() {
arc_sign_in_timer_.Stop();
playstore_launcher_.reset();
@@ -580,12 +579,12 @@ void ArcSessionManager::RequestEnableImpl() {
if (AreArcAllOptInPreferencesManaged())
prefs->SetBoolean(prefs::kArcTermsAccepted, true);
- // If it is marked that sign in has been successfully done, then directly
- // start ARC.
+ // If it is marked that sign in has been successfully done, if ARC has been
+ // set up to always start, then directly start ARC.
// For testing, and for Kiosk mode, we also skip ToS negotiation procedure.
// For backward compatibility, this check needs to be prior to the
// kArcTermsAccepted check below.
- if (prefs->GetBoolean(prefs::kArcSignedIn) ||
+ if (prefs->GetBoolean(prefs::kArcSignedIn) || ShouldArcAlwaysStart() ||
IsArcOptInVerificationDisabled() || IsArcKioskMode()) {
StartArc();

Powered by Google App Engine
This is Rietveld 408576698