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

Side by Side Diff: components/prefs/default_pref_store.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/default_pref_store.h" 5 #include "components/prefs/default_pref_store.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
(...skipping 12 matching lines...) Expand all
23 23
24 void DefaultPrefStore::RemoveObserver(PrefStore::Observer* observer) { 24 void DefaultPrefStore::RemoveObserver(PrefStore::Observer* observer) {
25 observers_.RemoveObserver(observer); 25 observers_.RemoveObserver(observer);
26 } 26 }
27 27
28 bool DefaultPrefStore::HasObservers() const { 28 bool DefaultPrefStore::HasObservers() const {
29 return observers_.might_have_observers(); 29 return observers_.might_have_observers();
30 } 30 }
31 31
32 void DefaultPrefStore::SetDefaultValue(const std::string& key, 32 void DefaultPrefStore::SetDefaultValue(const std::string& key,
33 scoped_ptr<Value> value) { 33 std::unique_ptr<Value> value) {
34 DCHECK(!GetValue(key, NULL)); 34 DCHECK(!GetValue(key, NULL));
35 prefs_.SetValue(key, std::move(value)); 35 prefs_.SetValue(key, std::move(value));
36 } 36 }
37 37
38 void DefaultPrefStore::ReplaceDefaultValue(const std::string& key, 38 void DefaultPrefStore::ReplaceDefaultValue(const std::string& key,
39 scoped_ptr<Value> value) { 39 std::unique_ptr<Value> value) {
40 const Value* old_value = NULL; 40 const Value* old_value = NULL;
41 GetValue(key, &old_value); 41 GetValue(key, &old_value);
42 bool notify = !old_value->Equals(value.get()); 42 bool notify = !old_value->Equals(value.get());
43 prefs_.SetValue(key, std::move(value)); 43 prefs_.SetValue(key, std::move(value));
44 if (notify) 44 if (notify)
45 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); 45 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key));
46 } 46 }
47 47
48 DefaultPrefStore::const_iterator DefaultPrefStore::begin() const { 48 DefaultPrefStore::const_iterator DefaultPrefStore::begin() const {
49 return prefs_.begin(); 49 return prefs_.begin();
50 } 50 }
51 51
52 DefaultPrefStore::const_iterator DefaultPrefStore::end() const { 52 DefaultPrefStore::const_iterator DefaultPrefStore::end() const {
53 return prefs_.end(); 53 return prefs_.end();
54 } 54 }
55 55
56 DefaultPrefStore::~DefaultPrefStore() {} 56 DefaultPrefStore::~DefaultPrefStore() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698