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

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

Issue 2742013002: Don't skip ARC ToS due to policies if ArcEnabled is not managed (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_session_manager_unittest.cc » ('j') | 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 98cf2ba90edae8804e6707e34880abf5dd068094..47ff0add114ee1a19252debf7a443e6a60ab3dfa 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -663,7 +663,8 @@ bool ArcSessionManager::IsArcTermsOfServiceNegotiationNeeded() const {
// Skip to show UI asking users to set up ARC OptIn preferences, if all of
// them are managed by the admin policy. Note that the ToS agreement is anyway
// not shown in the case of the managed ARC.
- if (AreArcAllOptInPreferencesManagedForProfile(profile_)) {
+ if (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_) &&
+ AreArcAllOptInPreferencesManagedForProfile(profile_)) {
VLOG(1) << "All opt-in preferences are under managed. "
<< "Skip ARC Terms of Service negotiation.";
return false;
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_session_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698