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

Side by Side Diff: base/prefs/pref_registry.cc

Issue 1544033003: Switch to standard integer types in base/prefs/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « base/prefs/pref_registry.h ('k') | base/prefs/pref_registry_simple.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 "base/prefs/pref_registry.h" 5 #include "base/prefs/pref_registry.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/default_pref_store.h" 8 #include "base/prefs/default_pref_store.h"
9 #include "base/prefs/pref_store.h" 9 #include "base/prefs/pref_store.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 12
13 PrefRegistry::PrefRegistry() 13 PrefRegistry::PrefRegistry()
14 : defaults_(new DefaultPrefStore()) { 14 : defaults_(new DefaultPrefStore()) {
15 } 15 }
16 16
17 PrefRegistry::~PrefRegistry() { 17 PrefRegistry::~PrefRegistry() {
18 } 18 }
19 19
20 uint32 PrefRegistry::GetRegistrationFlags(const std::string& pref_name) const { 20 uint32_t PrefRegistry::GetRegistrationFlags(
21 const std::string& pref_name) const {
21 const auto& it = registration_flags_.find(pref_name); 22 const auto& it = registration_flags_.find(pref_name);
22 if (it == registration_flags_.end()) 23 if (it == registration_flags_.end())
23 return NO_REGISTRATION_FLAGS; 24 return NO_REGISTRATION_FLAGS;
24 return it->second; 25 return it->second;
25 } 26 }
26 27
27 scoped_refptr<PrefStore> PrefRegistry::defaults() { 28 scoped_refptr<PrefStore> PrefRegistry::defaults() {
28 return defaults_.get(); 29 return defaults_.get();
29 } 30 }
30 31
(...skipping 12 matching lines...) Expand all
43 DCHECK(defaults_->GetValue(pref_name, &current_value)) 44 DCHECK(defaults_->GetValue(pref_name, &current_value))
44 << "Setting default for unregistered pref: " << pref_name; 45 << "Setting default for unregistered pref: " << pref_name;
45 DCHECK(value->IsType(current_value->GetType())) 46 DCHECK(value->IsType(current_value->GetType()))
46 << "Wrong type for new default: " << pref_name; 47 << "Wrong type for new default: " << pref_name;
47 48
48 defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value)); 49 defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value));
49 } 50 }
50 51
51 void PrefRegistry::RegisterPreference(const std::string& path, 52 void PrefRegistry::RegisterPreference(const std::string& path,
52 base::Value* default_value, 53 base::Value* default_value,
53 uint32 flags) { 54 uint32_t flags) {
54 base::Value::Type orig_type = default_value->GetType(); 55 base::Value::Type orig_type = default_value->GetType();
55 DCHECK(orig_type != base::Value::TYPE_NULL && 56 DCHECK(orig_type != base::Value::TYPE_NULL &&
56 orig_type != base::Value::TYPE_BINARY) << 57 orig_type != base::Value::TYPE_BINARY) <<
57 "invalid preference type: " << orig_type; 58 "invalid preference type: " << orig_type;
58 DCHECK(!defaults_->GetValue(path, NULL)) << 59 DCHECK(!defaults_->GetValue(path, NULL)) <<
59 "Trying to register a previously registered pref: " << path; 60 "Trying to register a previously registered pref: " << path;
60 DCHECK(!ContainsKey(registration_flags_, path)) << 61 DCHECK(!ContainsKey(registration_flags_, path)) <<
61 "Trying to register a previously registered pref: " << path; 62 "Trying to register a previously registered pref: " << path;
62 63
63 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value)); 64 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value));
64 if (flags != NO_REGISTRATION_FLAGS) 65 if (flags != NO_REGISTRATION_FLAGS)
65 registration_flags_[path] = flags; 66 registration_flags_[path] = flags;
66 } 67 }
OLDNEW
« no previous file with comments | « base/prefs/pref_registry.h ('k') | base/prefs/pref_registry_simple.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698