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

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

Issue 1907043002: Convert //components/prefs from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixes Created 4 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
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/prefs/pref_registry.h" 5 #include "components/prefs/pref_registry.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h"
8 #include "base/stl_util.h" 9 #include "base/stl_util.h"
9 #include "base/values.h" 10 #include "base/values.h"
10 #include "components/prefs/default_pref_store.h" 11 #include "components/prefs/default_pref_store.h"
11 #include "components/prefs/pref_store.h" 12 #include "components/prefs/pref_store.h"
12 13
13 PrefRegistry::PrefRegistry() 14 PrefRegistry::PrefRegistry()
14 : defaults_(new DefaultPrefStore()) { 15 : defaults_(new DefaultPrefStore()) {
15 } 16 }
16 17
17 PrefRegistry::~PrefRegistry() { 18 PrefRegistry::~PrefRegistry() {
(...skipping 21 matching lines...) Expand all
39 40
40 void PrefRegistry::SetDefaultPrefValue(const std::string& pref_name, 41 void PrefRegistry::SetDefaultPrefValue(const std::string& pref_name,
41 base::Value* value) { 42 base::Value* value) {
42 DCHECK(value); 43 DCHECK(value);
43 const base::Value* current_value = NULL; 44 const base::Value* current_value = NULL;
44 DCHECK(defaults_->GetValue(pref_name, &current_value)) 45 DCHECK(defaults_->GetValue(pref_name, &current_value))
45 << "Setting default for unregistered pref: " << pref_name; 46 << "Setting default for unregistered pref: " << pref_name;
46 DCHECK(value->IsType(current_value->GetType())) 47 DCHECK(value->IsType(current_value->GetType()))
47 << "Wrong type for new default: " << pref_name; 48 << "Wrong type for new default: " << pref_name;
48 49
49 defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value)); 50 defaults_->ReplaceDefaultValue(pref_name, base::WrapUnique(value));
50 } 51 }
51 52
52 void PrefRegistry::RegisterPreference(const std::string& path, 53 void PrefRegistry::RegisterPreference(const std::string& path,
53 base::Value* default_value, 54 base::Value* default_value,
54 uint32_t flags) { 55 uint32_t flags) {
55 base::Value::Type orig_type = default_value->GetType(); 56 base::Value::Type orig_type = default_value->GetType();
56 DCHECK(orig_type != base::Value::TYPE_NULL && 57 DCHECK(orig_type != base::Value::TYPE_NULL &&
57 orig_type != base::Value::TYPE_BINARY) << 58 orig_type != base::Value::TYPE_BINARY) <<
58 "invalid preference type: " << orig_type; 59 "invalid preference type: " << orig_type;
59 DCHECK(!defaults_->GetValue(path, NULL)) << 60 DCHECK(!defaults_->GetValue(path, NULL)) <<
60 "Trying to register a previously registered pref: " << path; 61 "Trying to register a previously registered pref: " << path;
61 DCHECK(!ContainsKey(registration_flags_, path)) << 62 DCHECK(!ContainsKey(registration_flags_, path)) <<
62 "Trying to register a previously registered pref: " << path; 63 "Trying to register a previously registered pref: " << path;
63 64
64 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value)); 65 defaults_->SetDefaultValue(path, base::WrapUnique(default_value));
65 if (flags != NO_REGISTRATION_FLAGS) 66 if (flags != NO_REGISTRATION_FLAGS)
66 registration_flags_[path] = flags; 67 registration_flags_[path] = flags;
67 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698