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: components/prefs/pref_registry.cc

Issue 2784513002: Move PrefRegistrySimple to use unique_ptr<Value> (Closed)
Patch Set: Android Created 3 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
« no previous file with comments | « components/prefs/pref_registry.h ('k') | components/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 "components/prefs/pref_registry.h" 5 #include "components/prefs/pref_registry.h"
6 6
7 #include <utility>
8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
9 #include "base/stl_util.h" 11 #include "base/stl_util.h"
10 #include "base/values.h" 12 #include "base/values.h"
11 #include "components/prefs/default_pref_store.h" 13 #include "components/prefs/default_pref_store.h"
12 #include "components/prefs/pref_store.h" 14 #include "components/prefs/pref_store.h"
13 15
14 PrefRegistry::PrefRegistry() 16 PrefRegistry::PrefRegistry()
15 : defaults_(new DefaultPrefStore()) { 17 : defaults_(new DefaultPrefStore()) {
16 } 18 }
(...skipping 26 matching lines...) Expand all
43 DCHECK(value); 45 DCHECK(value);
44 const base::Value* current_value = NULL; 46 const base::Value* current_value = NULL;
45 DCHECK(defaults_->GetValue(pref_name, &current_value)) 47 DCHECK(defaults_->GetValue(pref_name, &current_value))
46 << "Setting default for unregistered pref: " << pref_name; 48 << "Setting default for unregistered pref: " << pref_name;
47 DCHECK(value->IsType(current_value->GetType())) 49 DCHECK(value->IsType(current_value->GetType()))
48 << "Wrong type for new default: " << pref_name; 50 << "Wrong type for new default: " << pref_name;
49 51
50 defaults_->ReplaceDefaultValue(pref_name, base::WrapUnique(value)); 52 defaults_->ReplaceDefaultValue(pref_name, base::WrapUnique(value));
51 } 53 }
52 54
53 void PrefRegistry::RegisterPreference(const std::string& path, 55 void PrefRegistry::RegisterPreference(
54 base::Value* default_value, 56 const std::string& path,
55 uint32_t flags) { 57 std::unique_ptr<base::Value> default_value,
58 uint32_t flags) {
56 base::Value::Type orig_type = default_value->GetType(); 59 base::Value::Type orig_type = default_value->GetType();
57 DCHECK(orig_type != base::Value::Type::NONE && 60 DCHECK(orig_type != base::Value::Type::NONE &&
58 orig_type != base::Value::Type::BINARY) << 61 orig_type != base::Value::Type::BINARY) <<
59 "invalid preference type: " << orig_type; 62 "invalid preference type: " << orig_type;
60 DCHECK(!defaults_->GetValue(path, NULL)) << 63 DCHECK(!defaults_->GetValue(path, NULL)) <<
61 "Trying to register a previously registered pref: " << path; 64 "Trying to register a previously registered pref: " << path;
62 DCHECK(!base::ContainsKey(registration_flags_, path)) 65 DCHECK(!base::ContainsKey(registration_flags_, path))
63 << "Trying to register a previously registered pref: " << path; 66 << "Trying to register a previously registered pref: " << path;
64 67
65 defaults_->SetDefaultValue(path, base::WrapUnique(default_value)); 68 defaults_->SetDefaultValue(path, std::move(default_value));
66 if (flags != NO_REGISTRATION_FLAGS) 69 if (flags != NO_REGISTRATION_FLAGS)
67 registration_flags_[path] = flags; 70 registration_flags_[path] = flags;
68 } 71 }
OLDNEW
« no previous file with comments | « components/prefs/pref_registry.h ('k') | components/prefs/pref_registry_simple.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698