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

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

Issue 2801173002: arc: Provide API to control Play Store state from autotests (Closed)
Patch Set: nits Created 3 years, 8 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_util.cc
diff --git a/chrome/browser/chromeos/arc/arc_util.cc b/chrome/browser/chromeos/arc/arc_util.cc
index 7723792c34c6f22bc5eecadd693adb496c8f206d..a25e5d437c98074780dd7d9c90370dca11a9f587 100644
--- a/chrome/browser/chromeos/arc/arc_util.cc
+++ b/chrome/browser/chromeos/arc/arc_util.cc
@@ -160,9 +160,13 @@ bool IsArcPlayStoreEnabledPreferenceManagedForProfile(const Profile* profile) {
return profile->GetPrefs()->IsManagedPreference(prefs::kArcEnabled);
}
-void SetArcPlayStoreEnabledForProfile(Profile* profile, bool enabled) {
+bool SetArcPlayStoreEnabledForProfile(Profile* profile, bool enabled) {
DCHECK(IsArcAllowedForProfile(profile));
if (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile)) {
+ if (enabled && !IsArcPlayStoreEnabledForProfile(profile)) {
+ LOG(WARNING) << "Attempt to enable disabled by policy ARC.";
+ return false;
+ }
VLOG(1) << "Google-Play-Store-enabled pref is managed. Request to "
<< (enabled ? "enable" : "disable") << " Play Store is not stored";
// Need update ARC session manager manually for managed case in order to
@@ -172,14 +176,15 @@ void SetArcPlayStoreEnabledForProfile(Profile* profile, bool enabled) {
ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
// |arc_session_manager| can be nullptr in unit_tests.
if (!arc_session_manager)
- return;
+ return false;
if (enabled)
arc_session_manager->RequestEnable();
else
arc_session_manager->RequestDisable();
- return;
+ return true;
}
profile->GetPrefs()->SetBoolean(prefs::kArcEnabled, enabled);
+ return true;
}
bool AreArcAllOptInPreferencesManagedForProfile(const Profile* profile) {
« no previous file with comments | « chrome/browser/chromeos/arc/arc_util.h ('k') | chrome/browser/extensions/api/autotest_private/autotest_private_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698