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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/sync_prefs.h" 5 #include "chrome/browser/sync/sync_prefs.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_member.h" 9 #include "base/prefs/pref_member.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 // implicit types are enabled when their pref group is, or via 79 // implicit types are enabled when their pref group is, or via
80 // KeepEverythingSynced. 80 // KeepEverythingSynced.
81 for (syncer::ModelTypeSet::Iterator it = user_types.First(); 81 for (syncer::ModelTypeSet::Iterator it = user_types.First();
82 it.Good(); it.Inc()) { 82 it.Good(); it.Inc()) {
83 RegisterDataTypePreferredPref(registry, it.Get(), false); 83 RegisterDataTypePreferredPref(registry, it.Get(), false);
84 } 84 }
85 85
86 registry->RegisterBooleanPref(prefs::kSyncManaged, 86 registry->RegisterBooleanPref(prefs::kSyncManaged,
87 false, 87 false,
88 PrefRegistrySyncable::UNSYNCABLE_PREF); 88 PrefRegistrySyncable::UNSYNCABLE_PREF);
89 registry->RegisterBooleanPref(prefs::kSyncDisabledByAdmin,
90 false,
91 PrefRegistrySyncable::UNSYNCABLE_PREF);
89 registry->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken, 92 registry->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
90 std::string(), 93 std::string(),
91 PrefRegistrySyncable::UNSYNCABLE_PREF); 94 PrefRegistrySyncable::UNSYNCABLE_PREF);
92 registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken, 95 registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken,
93 std::string(), 96 std::string(),
94 PrefRegistrySyncable::UNSYNCABLE_PREF); 97 PrefRegistrySyncable::UNSYNCABLE_PREF);
95 #if defined(OS_CHROMEOS) 98 #if defined(OS_CHROMEOS)
96 registry->RegisterStringPref(prefs::kSyncSpareBootstrapToken, 99 registry->RegisterStringPref(prefs::kSyncSpareBootstrapToken,
97 "", 100 "",
98 PrefRegistrySyncable::UNSYNCABLE_PREF); 101 PrefRegistrySyncable::UNSYNCABLE_PREF);
(...skipping 17 matching lines...) Expand all
116 model_set.Put(syncer::NIGORI); 119 model_set.Put(syncer::NIGORI);
117 model_set.Put(syncer::SEARCH_ENGINES); 120 model_set.Put(syncer::SEARCH_ENGINES);
118 model_set.Put(syncer::APPS); 121 model_set.Put(syncer::APPS);
119 model_set.Put(syncer::TYPED_URLS); 122 model_set.Put(syncer::TYPED_URLS);
120 model_set.Put(syncer::SESSIONS); 123 model_set.Put(syncer::SESSIONS);
121 registry->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes, 124 registry->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes,
122 syncer::ModelTypeSetToValue(model_set), 125 syncer::ModelTypeSetToValue(model_set),
123 PrefRegistrySyncable::UNSYNCABLE_PREF); 126 PrefRegistrySyncable::UNSYNCABLE_PREF);
124 } 127 }
125 128
126 // static
127 bool SyncPrefs::IsSyncAccessibleOnIOThread(ProfileIOData* io_data) {
128 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
129 return ProfileSyncService::IsSyncEnabled() &&
130 !io_data->sync_disabled()->GetValue();
131 }
132
133 void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { 129 void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
134 DCHECK(CalledOnValidThread()); 130 DCHECK(CalledOnValidThread());
135 sync_pref_observers_.AddObserver(sync_pref_observer); 131 sync_pref_observers_.AddObserver(sync_pref_observer);
136 } 132 }
137 133
138 void SyncPrefs::RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { 134 void SyncPrefs::RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
139 DCHECK(CalledOnValidThread()); 135 DCHECK(CalledOnValidThread());
140 sync_pref_observers_.RemoveObserver(sync_pref_observer); 136 sync_pref_observers_.RemoveObserver(sync_pref_observer);
141 } 137 }
142 138
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 i.Good(); i.Inc()) { 249 i.Good(); i.Inc()) {
254 SetDataTypePreferred(i.Get(), preferred_types.Has(i.Get())); 250 SetDataTypePreferred(i.Get(), preferred_types.Has(i.Get()));
255 } 251 }
256 } 252 }
257 253
258 bool SyncPrefs::IsManaged() const { 254 bool SyncPrefs::IsManaged() const {
259 DCHECK(CalledOnValidThread()); 255 DCHECK(CalledOnValidThread());
260 return pref_service_ && pref_service_->GetBoolean(prefs::kSyncManaged); 256 return pref_service_ && pref_service_->GetBoolean(prefs::kSyncManaged);
261 } 257 }
262 258
259 bool SyncPrefs::IsSyncDisabledByAdmin() const {
260 DCHECK(CalledOnValidThread());
261 return pref_service_ &&
262 pref_service_->GetBoolean(prefs::kSyncDisabledByAdmin);
263 }
264
265 void SyncPrefs::SetSyncDisabledByAdmin(bool value) {
266 DCHECK(CalledOnValidThread());
267 CHECK(pref_service_);
268 pref_service_->SetBoolean(prefs::kSyncDisabledByAdmin, value);
269 }
270
263 std::string SyncPrefs::GetEncryptionBootstrapToken() const { 271 std::string SyncPrefs::GetEncryptionBootstrapToken() const {
264 DCHECK(CalledOnValidThread()); 272 DCHECK(CalledOnValidThread());
265 return pref_service_ 273 return pref_service_
266 ? pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken) 274 ? pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken)
267 : std::string(); 275 : std::string();
268 } 276 }
269 277
270 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) { 278 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) {
271 DCHECK(CalledOnValidThread()); 279 DCHECK(CalledOnValidThread());
272 pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token); 280 pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token);
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); 488 for (PrefGroupsMap::const_iterator i = pref_groups_.begin();
481 i != pref_groups_.end(); ++i) { 489 i != pref_groups_.end(); ++i) {
482 if (types.Has(i->first)) 490 if (types.Has(i->first))
483 types_with_groups.PutAll(i->second); 491 types_with_groups.PutAll(i->second);
484 } 492 }
485 types_with_groups.RetainAll(registered_types); 493 types_with_groups.RetainAll(registered_types);
486 return types_with_groups; 494 return types_with_groups;
487 } 495 }
488 496
489 } // namespace browser_sync 497 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698