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

Side by Side Diff: components/sync/base/sync_prefs.cc

Issue 2427803002: [Sync] Replacing NULL with nullptr in code and null in comments for components/sync/ (Closed)
Patch Set: Fixing start of sentence capitlization. Created 4 years, 2 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
« no previous file with comments | « components/sync/base/sync_prefs.h ('k') | components/sync/base/weak_handle.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/base/sync_prefs.h" 5 #include "components/sync/base/sync_prefs.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "components/pref_registry/pref_registry_syncable.h" 11 #include "components/pref_registry/pref_registry_syncable.h"
12 #include "components/prefs/pref_service.h" 12 #include "components/prefs/pref_service.h"
13 #include "components/sync/base/pref_names.h" 13 #include "components/sync/base/pref_names.h"
14 14
15 namespace syncer { 15 namespace syncer {
16 16
17 SyncPrefObserver::~SyncPrefObserver() {} 17 SyncPrefObserver::~SyncPrefObserver() {}
18 18
19 SyncPrefs::SyncPrefs(PrefService* pref_service) : pref_service_(pref_service) { 19 SyncPrefs::SyncPrefs(PrefService* pref_service) : pref_service_(pref_service) {
20 DCHECK(pref_service); 20 DCHECK(pref_service);
21 RegisterPrefGroups(); 21 RegisterPrefGroups();
22 // Watch the preference that indicates sync is managed so we can take 22 // Watch the preference that indicates sync is managed so we can take
23 // appropriate action. 23 // appropriate action.
24 pref_sync_managed_.Init( 24 pref_sync_managed_.Init(
25 prefs::kSyncManaged, pref_service_, 25 prefs::kSyncManaged, pref_service_,
26 base::Bind(&SyncPrefs::OnSyncManagedPrefChanged, base::Unretained(this))); 26 base::Bind(&SyncPrefs::OnSyncManagedPrefChanged, base::Unretained(this)));
27 } 27 }
28 28
29 SyncPrefs::SyncPrefs() : pref_service_(NULL) {} 29 SyncPrefs::SyncPrefs() : pref_service_(nullptr) {}
30 30
31 SyncPrefs::~SyncPrefs() { 31 SyncPrefs::~SyncPrefs() {
32 DCHECK(CalledOnValidThread()); 32 DCHECK(CalledOnValidThread());
33 } 33 }
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::kSyncFirstSetupComplete, false); 38 registry->RegisterBooleanPref(prefs::kSyncFirstSetupComplete, false);
39 registry->RegisterBooleanPref(prefs::kSyncSuppressStart, false); 39 registry->RegisterBooleanPref(prefs::kSyncSuppressStart, false);
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 case ARC_PACKAGE: 317 case ARC_PACKAGE:
318 return prefs::kSyncArcPackage; 318 return prefs::kSyncArcPackage;
319 case PRINTERS: 319 case PRINTERS:
320 return prefs::kSyncPrinters; 320 return prefs::kSyncPrinters;
321 case READING_LIST: 321 case READING_LIST:
322 return prefs::kSyncReadingList; 322 return prefs::kSyncReadingList;
323 default: 323 default:
324 break; 324 break;
325 } 325 }
326 NOTREACHED() << "Type is " << data_type; 326 NOTREACHED() << "Type is " << data_type;
327 return NULL; 327 return nullptr;
328 } 328 }
329 329
330 #if defined(OS_CHROMEOS) 330 #if defined(OS_CHROMEOS)
331 std::string SyncPrefs::GetSpareBootstrapToken() const { 331 std::string SyncPrefs::GetSpareBootstrapToken() const {
332 DCHECK(CalledOnValidThread()); 332 DCHECK(CalledOnValidThread());
333 return pref_service_->GetString(prefs::kSyncSpareBootstrapToken); 333 return pref_service_->GetString(prefs::kSyncSpareBootstrapToken);
334 } 334 }
335 335
336 void SyncPrefs::SetSpareBootstrapToken(const std::string& token) { 336 void SyncPrefs::SetSpareBootstrapToken(const std::string& token) {
337 DCHECK(CalledOnValidThread()); 337 DCHECK(CalledOnValidThread());
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 if (!pref_name) { 399 if (!pref_name) {
400 NOTREACHED(); 400 NOTREACHED();
401 return false; 401 return false;
402 } 402 }
403 403
404 // Device info is always enabled. 404 // Device info is always enabled.
405 if (pref_name == prefs::kSyncDeviceInfo) 405 if (pref_name == prefs::kSyncDeviceInfo)
406 return true; 406 return true;
407 407
408 if (type == PROXY_TABS && 408 if (type == PROXY_TABS &&
409 pref_service_->GetUserPrefValue(pref_name) == NULL && 409 pref_service_->GetUserPrefValue(pref_name) == nullptr &&
410 pref_service_->IsUserModifiablePreference(pref_name)) { 410 pref_service_->IsUserModifiablePreference(pref_name)) {
411 // If there is no tab sync preference yet (i.e. newly enabled type), 411 // If there is no tab sync preference yet (i.e. newly enabled type),
412 // default to the session sync preference value. 412 // default to the session sync preference value.
413 pref_name = GetPrefNameForDataType(SESSIONS); 413 pref_name = GetPrefNameForDataType(SESSIONS);
414 } 414 }
415 415
416 return pref_service_->GetBoolean(pref_name); 416 return pref_service_->GetBoolean(pref_name);
417 } 417 }
418 418
419 void SyncPrefs::SetDataTypePreferred(ModelType type, bool is_preferred) { 419 void SyncPrefs::SetDataTypePreferred(ModelType type, bool is_preferred) {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 sync_pb::NigoriSpecifics* nigori_specifics) const { 540 sync_pb::NigoriSpecifics* nigori_specifics) const {
541 const std::string encoded = 541 const std::string encoded =
542 pref_service_->GetString(prefs::kSyncNigoriStateForPassphraseTransition); 542 pref_service_->GetString(prefs::kSyncNigoriStateForPassphraseTransition);
543 std::string decoded; 543 std::string decoded;
544 if (base::Base64Decode(encoded, &decoded)) { 544 if (base::Base64Decode(encoded, &decoded)) {
545 nigori_specifics->ParseFromString(decoded); 545 nigori_specifics->ParseFromString(decoded);
546 } 546 }
547 } 547 }
548 548
549 } // namespace syncer 549 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/base/sync_prefs.h ('k') | components/sync/base/weak_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698