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

Unified Diff: chrome/browser/sync/sync_prefs.cc

Issue 14655009: Client changes for disabled dasher account (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 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/sync/sync_prefs.cc
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 9a2d798893f398564b919e27b08c424a68add0f9..28dd7ee5a039c637172424f58051019ceca315e8 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -86,6 +86,9 @@ void SyncPrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kSyncManaged,
false,
PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(prefs::kSyncDisabledByAdmin,
+ false,
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
std::string(),
PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ -123,13 +126,6 @@ void SyncPrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) {
PrefRegistrySyncable::UNSYNCABLE_PREF);
}
-// static
-bool SyncPrefs::IsSyncAccessibleOnIOThread(ProfileIOData* io_data) {
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
- return ProfileSyncService::IsSyncEnabled() &&
- !io_data->sync_disabled()->GetValue();
-}
-
void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
DCHECK(CalledOnValidThread());
sync_pref_observers_.AddObserver(sync_pref_observer);
@@ -260,6 +256,18 @@ bool SyncPrefs::IsManaged() const {
return pref_service_ && pref_service_->GetBoolean(prefs::kSyncManaged);
}
+bool SyncPrefs::IsSyncDisabledByAdmin() const {
+ DCHECK(CalledOnValidThread());
+ return pref_service_ &&
+ pref_service_->GetBoolean(prefs::kSyncDisabledByAdmin);
+}
+
+void SyncPrefs::SetSyncDisabledByAdmin(bool value) {
+ DCHECK(CalledOnValidThread());
+ CHECK(pref_service_);
+ pref_service_->SetBoolean(prefs::kSyncDisabledByAdmin, value);
+}
+
std::string SyncPrefs::GetEncryptionBootstrapToken() const {
DCHECK(CalledOnValidThread());
return pref_service_

Powered by Google App Engine
This is Rietveld 408576698