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

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

Issue 2235313003: Do not sync the ARC++ opt-in preference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 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_auth_service.cc
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc b/chrome/browser/chromeos/arc/arc_auth_service.cc
index 625e85dd38825c6674e4e399009c6ea4a5e71e07..476ca3808a905c6d49cc96efc72cf765921277ab 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service.cc
+++ b/chrome/browser/chromeos/arc/arc_auth_service.cc
@@ -155,9 +155,9 @@ ArcAuthService* ArcAuthService::Get() {
// static
void ArcAuthService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterBooleanPref(
- prefs::kArcEnabled, false,
- user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ // TODO(dspaid): Implement a mechanism to allow this to sync on first boot
+ // only.
+ registry->RegisterBooleanPref(prefs::kArcEnabled, false);
registry->RegisterBooleanPref(prefs::kArcSignedIn, false);
registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, true);
registry->RegisterBooleanPref(prefs::kArcLocationServiceEnabled, true);
@@ -520,6 +520,9 @@ void ArcAuthService::OnOptInPreferenceChanged() {
DCHECK(thread_checker.Get().CalledOnValidThread());
DCHECK(profile_);
+ // TODO(dspaid): Move code from OnSyncedPrefChanged into this method.
+ OnSyncedPrefChanged(prefs::kArcEnabled, IsArcManaged());
+
const bool arc_enabled = IsArcEnabled();
FOR_EACH_OBSERVER(Observer, observer_list_, OnOptInEnabled(arc_enabled));
« 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