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

Side by Side Diff: components/sync_driver/sync_prefs.cc

Issue 1132013004: [Sync] Refactoring polling to be reliable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix SyncClient Created 5 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 "components/sync_driver/sync_prefs.h" 5 #include "components/sync_driver/sync_prefs.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/pref_member.h" 8 #include "base/prefs/pref_member.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 20 matching lines...) Expand all
31 SyncPrefs::SyncPrefs() : pref_service_(NULL) {} 31 SyncPrefs::SyncPrefs() : pref_service_(NULL) {}
32 32
33 SyncPrefs::~SyncPrefs() { DCHECK(CalledOnValidThread()); } 33 SyncPrefs::~SyncPrefs() { DCHECK(CalledOnValidThread()); }
34 34
35 // static 35 // static
36 void SyncPrefs::RegisterProfilePrefs( 36 void SyncPrefs::RegisterProfilePrefs(
37 user_prefs::PrefRegistrySyncable* registry) { 37 user_prefs::PrefRegistrySyncable* registry) {
38 registry->RegisterBooleanPref(prefs::kSyncHasSetupCompleted, false); 38 registry->RegisterBooleanPref(prefs::kSyncHasSetupCompleted, false);
39 registry->RegisterBooleanPref(prefs::kSyncSuppressStart, false); 39 registry->RegisterBooleanPref(prefs::kSyncSuppressStart, false);
40 registry->RegisterInt64Pref(prefs::kSyncLastSyncedTime, 0); 40 registry->RegisterInt64Pref(prefs::kSyncLastSyncedTime, 0);
41 registry->RegisterInt64Pref(prefs::kSyncLastPollTime, 0);
41 registry->RegisterInt64Pref(prefs::kSyncFirstSyncTime, 0); 42 registry->RegisterInt64Pref(prefs::kSyncFirstSyncTime, 0);
42 43
43 // All datatypes are on by default, but this gets set explicitly 44 // All datatypes are on by default, but this gets set explicitly
44 // when you configure sync (when turning it on), in 45 // when you configure sync (when turning it on), in
45 // ProfileSyncService::OnUserChoseDatatypes. 46 // ProfileSyncService::OnUserChoseDatatypes.
46 registry->RegisterBooleanPref(prefs::kSyncKeepEverythingSynced, true); 47 registry->RegisterBooleanPref(prefs::kSyncKeepEverythingSynced, true);
47 48
48 syncer::ModelTypeSet user_types = syncer::UserTypes(); 49 syncer::ModelTypeSet user_types = syncer::UserTypes();
49 50
50 // Include proxy types as well, as they can be individually selected, 51 // Include proxy types as well, as they can be individually selected,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 89 }
89 90
90 void SyncPrefs::RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { 91 void SyncPrefs::RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
91 DCHECK(CalledOnValidThread()); 92 DCHECK(CalledOnValidThread());
92 sync_pref_observers_.RemoveObserver(sync_pref_observer); 93 sync_pref_observers_.RemoveObserver(sync_pref_observer);
93 } 94 }
94 95
95 void SyncPrefs::ClearPreferences() { 96 void SyncPrefs::ClearPreferences() {
96 DCHECK(CalledOnValidThread()); 97 DCHECK(CalledOnValidThread());
97 pref_service_->ClearPref(prefs::kSyncLastSyncedTime); 98 pref_service_->ClearPref(prefs::kSyncLastSyncedTime);
99 pref_service_->ClearPref(prefs::kSyncLastPollTime);
98 pref_service_->ClearPref(prefs::kSyncHasSetupCompleted); 100 pref_service_->ClearPref(prefs::kSyncHasSetupCompleted);
99 pref_service_->ClearPref(prefs::kSyncEncryptionBootstrapToken); 101 pref_service_->ClearPref(prefs::kSyncEncryptionBootstrapToken);
100 pref_service_->ClearPref(prefs::kSyncKeystoreEncryptionBootstrapToken); 102 pref_service_->ClearPref(prefs::kSyncKeystoreEncryptionBootstrapToken);
101 103
102 // TODO(nick): The current behavior does not clear 104 // TODO(nick): The current behavior does not clear
103 // e.g. prefs::kSyncBookmarks. Is that really what we want? 105 // e.g. prefs::kSyncBookmarks. Is that really what we want?
104 } 106 }
105 107
106 bool SyncPrefs::HasSyncSetupCompleted() const { 108 bool SyncPrefs::HasSyncSetupCompleted() const {
107 DCHECK(CalledOnValidThread()); 109 DCHECK(CalledOnValidThread());
(...skipping 30 matching lines...) Expand all
138 DCHECK(CalledOnValidThread()); 140 DCHECK(CalledOnValidThread());
139 return base::Time::FromInternalValue( 141 return base::Time::FromInternalValue(
140 pref_service_->GetInt64(prefs::kSyncLastSyncedTime)); 142 pref_service_->GetInt64(prefs::kSyncLastSyncedTime));
141 } 143 }
142 144
143 void SyncPrefs::SetLastSyncedTime(base::Time time) { 145 void SyncPrefs::SetLastSyncedTime(base::Time time) {
144 DCHECK(CalledOnValidThread()); 146 DCHECK(CalledOnValidThread());
145 pref_service_->SetInt64(prefs::kSyncLastSyncedTime, time.ToInternalValue()); 147 pref_service_->SetInt64(prefs::kSyncLastSyncedTime, time.ToInternalValue());
146 } 148 }
147 149
150 base::Time SyncPrefs::GetLastPollTime() const {
151 DCHECK(CalledOnValidThread());
152 return base::Time::FromInternalValue(
153 pref_service_->GetInt64(prefs::kSyncLastSyncedTime));
154 }
155
156 void SyncPrefs::SetLastPollTime(base::Time time) {
157 DCHECK(CalledOnValidThread());
158 pref_service_->SetInt64(prefs::kSyncLastPollTime, time.ToInternalValue());
159 }
160
148 bool SyncPrefs::HasKeepEverythingSynced() const { 161 bool SyncPrefs::HasKeepEverythingSynced() const {
149 DCHECK(CalledOnValidThread()); 162 DCHECK(CalledOnValidThread());
150 return pref_service_->GetBoolean(prefs::kSyncKeepEverythingSynced); 163 return pref_service_->GetBoolean(prefs::kSyncKeepEverythingSynced);
151 } 164 }
152 165
153 void SyncPrefs::SetKeepEverythingSynced(bool keep_everything_synced) { 166 void SyncPrefs::SetKeepEverythingSynced(bool keep_everything_synced) {
154 DCHECK(CalledOnValidThread()); 167 DCHECK(CalledOnValidThread());
155 pref_service_->SetBoolean(prefs::kSyncKeepEverythingSynced, 168 pref_service_->SetBoolean(prefs::kSyncKeepEverythingSynced,
156 keep_everything_synced); 169 keep_everything_synced);
157 } 170 }
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 438
426 void SyncPrefs::SetFirstSyncTime(base::Time time) { 439 void SyncPrefs::SetFirstSyncTime(base::Time time) {
427 pref_service_->SetInt64(prefs::kSyncFirstSyncTime, time.ToInternalValue()); 440 pref_service_->SetInt64(prefs::kSyncFirstSyncTime, time.ToInternalValue());
428 } 441 }
429 442
430 void SyncPrefs::ClearFirstSyncTime() { 443 void SyncPrefs::ClearFirstSyncTime() {
431 pref_service_->ClearPref(prefs::kSyncFirstSyncTime); 444 pref_service_->ClearPref(prefs::kSyncFirstSyncTime);
432 } 445 }
433 446
434 } // namespace sync_driver 447 } // namespace sync_driver
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698