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

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

Issue 753603002: Change preference APIs to take std::string instead of const char*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed all calls to c_str() in prefs. Created 6 years 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/values.h" 10 #include "base/values.h"
(...skipping 10 matching lines...) Expand all
21 } 21 }
22 22
23 PrefRegistry::const_iterator PrefRegistry::begin() const { 23 PrefRegistry::const_iterator PrefRegistry::begin() const {
24 return defaults_->begin(); 24 return defaults_->begin();
25 } 25 }
26 26
27 PrefRegistry::const_iterator PrefRegistry::end() const { 27 PrefRegistry::const_iterator PrefRegistry::end() const {
28 return defaults_->end(); 28 return defaults_->end();
29 } 29 }
30 30
31 void PrefRegistry::SetDefaultPrefValue(const char* pref_name, 31 void PrefRegistry::SetDefaultPrefValue(const std::string& pref_name,
32 base::Value* value) { 32 base::Value* value) {
33 DCHECK(value); 33 DCHECK(value);
34 const base::Value* current_value = NULL; 34 const base::Value* current_value = NULL;
35 DCHECK(defaults_->GetValue(pref_name, &current_value)) 35 DCHECK(defaults_->GetValue(pref_name, &current_value))
36 << "Setting default for unregistered pref: " << pref_name; 36 << "Setting default for unregistered pref: " << pref_name;
37 DCHECK(value->IsType(current_value->GetType())) 37 DCHECK(value->IsType(current_value->GetType()))
38 << "Wrong type for new default: " << pref_name; 38 << "Wrong type for new default: " << pref_name;
39 39
40 defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value)); 40 defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value));
41 } 41 }
42 42
43 void PrefRegistry::RegisterPreference(const char* path, 43 void PrefRegistry::RegisterPreference(const std::string& path,
44 base::Value* default_value) { 44 base::Value* default_value) {
45 base::Value::Type orig_type = default_value->GetType(); 45 base::Value::Type orig_type = default_value->GetType();
46 DCHECK(orig_type != base::Value::TYPE_NULL && 46 DCHECK(orig_type != base::Value::TYPE_NULL &&
47 orig_type != base::Value::TYPE_BINARY) << 47 orig_type != base::Value::TYPE_BINARY) <<
48 "invalid preference type: " << orig_type; 48 "invalid preference type: " << orig_type;
49 DCHECK(!defaults_->GetValue(path, NULL)) << 49 DCHECK(!defaults_->GetValue(path, NULL)) <<
50 "Trying to register a previously registered pref: " << path; 50 "Trying to register a previously registered pref: " << path;
51 51
52 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value)); 52 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value));
53 } 53 }
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