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

Side by Side Diff: chrome/browser/sync/sync_prefs.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 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 unified diff | Download patch | Annotate | Revision Log
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
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->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken, 89 registry->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
90 "", 90 std::string(),
91 PrefRegistrySyncable::UNSYNCABLE_PREF); 91 PrefRegistrySyncable::UNSYNCABLE_PREF);
92 registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken, 92 registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken,
93 "", 93 std::string(),
94 PrefRegistrySyncable::UNSYNCABLE_PREF); 94 PrefRegistrySyncable::UNSYNCABLE_PREF);
95 #if defined(OS_CHROMEOS) 95 #if defined(OS_CHROMEOS)
96 registry->RegisterStringPref(prefs::kSyncSpareBootstrapToken, 96 registry->RegisterStringPref(prefs::kSyncSpareBootstrapToken,
97 "", 97 "",
98 PrefRegistrySyncable::UNSYNCABLE_PREF); 98 PrefRegistrySyncable::UNSYNCABLE_PREF);
99 #endif 99 #endif
100 100
101 registry->RegisterStringPref(prefs::kSyncSessionsGUID, 101 registry->RegisterStringPref(prefs::kSyncSessionsGUID,
102 "", 102 std::string(),
103 PrefRegistrySyncable::UNSYNCABLE_PREF); 103 PrefRegistrySyncable::UNSYNCABLE_PREF);
104 104
105 // We will start prompting people about new data types after the launch of 105 // We will start prompting people about new data types after the launch of
106 // SESSIONS - all previously launched data types are treated as if they are 106 // SESSIONS - all previously launched data types are treated as if they are
107 // already acknowledged. 107 // already acknowledged.
108 syncer::ModelTypeSet model_set; 108 syncer::ModelTypeSet model_set;
109 model_set.Put(syncer::BOOKMARKS); 109 model_set.Put(syncer::BOOKMARKS);
110 model_set.Put(syncer::PREFERENCES); 110 model_set.Put(syncer::PREFERENCES);
111 model_set.Put(syncer::PASSWORDS); 111 model_set.Put(syncer::PASSWORDS);
112 model_set.Put(syncer::AUTOFILL_PROFILE); 112 model_set.Put(syncer::AUTOFILL_PROFILE);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 174 }
175 175
176 void SyncPrefs::SetStartSuppressed(bool is_suppressed) { 176 void SyncPrefs::SetStartSuppressed(bool is_suppressed) {
177 DCHECK(CalledOnValidThread()); 177 DCHECK(CalledOnValidThread());
178 CHECK(pref_service_); 178 CHECK(pref_service_);
179 pref_service_->SetBoolean(prefs::kSyncSuppressStart, is_suppressed); 179 pref_service_->SetBoolean(prefs::kSyncSuppressStart, is_suppressed);
180 } 180 }
181 181
182 std::string SyncPrefs::GetGoogleServicesUsername() const { 182 std::string SyncPrefs::GetGoogleServicesUsername() const {
183 DCHECK(CalledOnValidThread()); 183 DCHECK(CalledOnValidThread());
184 return 184 return pref_service_
185 pref_service_ ? 185 ? pref_service_->GetString(prefs::kGoogleServicesUsername)
186 pref_service_->GetString(prefs::kGoogleServicesUsername) : ""; 186 : std::string();
187 } 187 }
188 188
189 base::Time SyncPrefs::GetLastSyncedTime() const { 189 base::Time SyncPrefs::GetLastSyncedTime() const {
190 DCHECK(CalledOnValidThread()); 190 DCHECK(CalledOnValidThread());
191 return 191 return
192 base::Time::FromInternalValue( 192 base::Time::FromInternalValue(
193 pref_service_ ? 193 pref_service_ ?
194 pref_service_->GetInt64(prefs::kSyncLastSyncedTime) : 0); 194 pref_service_->GetInt64(prefs::kSyncLastSyncedTime) : 0);
195 } 195 }
196 196
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 } 259 }
260 } 260 }
261 261
262 bool SyncPrefs::IsManaged() const { 262 bool SyncPrefs::IsManaged() const {
263 DCHECK(CalledOnValidThread()); 263 DCHECK(CalledOnValidThread());
264 return pref_service_ && pref_service_->GetBoolean(prefs::kSyncManaged); 264 return pref_service_ && pref_service_->GetBoolean(prefs::kSyncManaged);
265 } 265 }
266 266
267 std::string SyncPrefs::GetEncryptionBootstrapToken() const { 267 std::string SyncPrefs::GetEncryptionBootstrapToken() const {
268 DCHECK(CalledOnValidThread()); 268 DCHECK(CalledOnValidThread());
269 return 269 return pref_service_
270 pref_service_ ? 270 ? pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken)
271 pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken) : ""; 271 : std::string();
272 } 272 }
273 273
274 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) { 274 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) {
275 DCHECK(CalledOnValidThread()); 275 DCHECK(CalledOnValidThread());
276 pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token); 276 pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token);
277 } 277 }
278 278
279 std::string SyncPrefs::GetKeystoreEncryptionBootstrapToken() const { 279 std::string SyncPrefs::GetKeystoreEncryptionBootstrapToken() const {
280 DCHECK(CalledOnValidThread()); 280 DCHECK(CalledOnValidThread());
281 return 281 return pref_service_ ? pref_service_->GetString(
282 pref_service_ ? 282 prefs::kSyncKeystoreEncryptionBootstrapToken)
283 pref_service_->GetString(prefs::kSyncKeystoreEncryptionBootstrapToken) : 283 : std::string();
284 "";
285 } 284 }
286 285
287 void SyncPrefs::SetKeystoreEncryptionBootstrapToken(const std::string& token) { 286 void SyncPrefs::SetKeystoreEncryptionBootstrapToken(const std::string& token) {
288 DCHECK(CalledOnValidThread()); 287 DCHECK(CalledOnValidThread());
289 pref_service_->SetString(prefs::kSyncKeystoreEncryptionBootstrapToken, token); 288 pref_service_->SetString(prefs::kSyncKeystoreEncryptionBootstrapToken, token);
290 } 289 }
291 290
292 std::string SyncPrefs::GetSyncSessionsGUID() const { 291 std::string SyncPrefs::GetSyncSessionsGUID() const {
293 DCHECK(CalledOnValidThread()); 292 DCHECK(CalledOnValidThread());
294 return 293 return pref_service_ ? pref_service_->GetString(prefs::kSyncSessionsGUID)
295 pref_service_ ? 294 : std::string();
296 pref_service_->GetString(prefs::kSyncSessionsGUID) : "";
297 } 295 }
298 296
299 void SyncPrefs::SetSyncSessionsGUID(const std::string& guid) { 297 void SyncPrefs::SetSyncSessionsGUID(const std::string& guid) {
300 DCHECK(CalledOnValidThread()); 298 DCHECK(CalledOnValidThread());
301 pref_service_->SetString(prefs::kSyncSessionsGUID, guid); 299 pref_service_->SetString(prefs::kSyncSessionsGUID, guid);
302 } 300 }
303 301
304 // static 302 // static
305 const char* SyncPrefs::GetPrefNameForDataType(syncer::ModelType data_type) { 303 const char* SyncPrefs::GetPrefNameForDataType(syncer::ModelType data_type) {
306 switch (data_type) { 304 switch (data_type) {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); 482 for (PrefGroupsMap::const_iterator i = pref_groups_.begin();
485 i != pref_groups_.end(); ++i) { 483 i != pref_groups_.end(); ++i) {
486 if (types.Has(i->first)) 484 if (types.Has(i->first))
487 types_with_groups.PutAll(i->second); 485 types_with_groups.PutAll(i->second);
488 } 486 }
489 types_with_groups.RetainAll(registered_types); 487 types_with_groups.RetainAll(registered_types);
490 return types_with_groups; 488 return types_with_groups;
491 } 489 }
492 490
493 } // namespace browser_sync 491 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698