OLD | NEW |
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/value_map_pref_store.h" | 5 #include "base/prefs/value_map_pref_store.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
10 #include "base/values.h" | 11 #include "base/values.h" |
11 | 12 |
12 ValueMapPrefStore::ValueMapPrefStore() {} | 13 ValueMapPrefStore::ValueMapPrefStore() {} |
13 | 14 |
14 bool ValueMapPrefStore::GetValue(const std::string& key, | 15 bool ValueMapPrefStore::GetValue(const std::string& key, |
15 const base::Value** value) const { | 16 const base::Value** value) const { |
16 return prefs_.GetValue(key, value); | 17 return prefs_.GetValue(key, value); |
17 } | 18 } |
18 | 19 |
19 void ValueMapPrefStore::AddObserver(PrefStore::Observer* observer) { | 20 void ValueMapPrefStore::AddObserver(PrefStore::Observer* observer) { |
20 observers_.AddObserver(observer); | 21 observers_.AddObserver(observer); |
21 } | 22 } |
22 | 23 |
23 void ValueMapPrefStore::RemoveObserver(PrefStore::Observer* observer) { | 24 void ValueMapPrefStore::RemoveObserver(PrefStore::Observer* observer) { |
24 observers_.RemoveObserver(observer); | 25 observers_.RemoveObserver(observer); |
25 } | 26 } |
26 | 27 |
27 bool ValueMapPrefStore::HasObservers() const { | 28 bool ValueMapPrefStore::HasObservers() const { |
28 return observers_.might_have_observers(); | 29 return observers_.might_have_observers(); |
29 } | 30 } |
30 | 31 |
31 void ValueMapPrefStore::SetValue(const std::string& key, | 32 void ValueMapPrefStore::SetValue(const std::string& key, |
32 scoped_ptr<base::Value> value, | 33 scoped_ptr<base::Value> value, |
33 uint32 flags) { | 34 uint32 flags) { |
34 if (prefs_.SetValue(key, value.Pass())) | 35 if (prefs_.SetValue(key, std::move(value))) |
35 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); | 36 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); |
36 } | 37 } |
37 | 38 |
38 void ValueMapPrefStore::RemoveValue(const std::string& key, uint32 flags) { | 39 void ValueMapPrefStore::RemoveValue(const std::string& key, uint32 flags) { |
39 if (prefs_.RemoveValue(key)) | 40 if (prefs_.RemoveValue(key)) |
40 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); | 41 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); |
41 } | 42 } |
42 | 43 |
43 bool ValueMapPrefStore::GetMutableValue(const std::string& key, | 44 bool ValueMapPrefStore::GetMutableValue(const std::string& key, |
44 base::Value** value) { | 45 base::Value** value) { |
45 return prefs_.GetValue(key, value); | 46 return prefs_.GetValue(key, value); |
46 } | 47 } |
47 | 48 |
48 void ValueMapPrefStore::ReportValueChanged(const std::string& key, | 49 void ValueMapPrefStore::ReportValueChanged(const std::string& key, |
49 uint32 flags) { | 50 uint32 flags) { |
50 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); | 51 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); |
51 } | 52 } |
52 | 53 |
53 void ValueMapPrefStore::SetValueSilently(const std::string& key, | 54 void ValueMapPrefStore::SetValueSilently(const std::string& key, |
54 scoped_ptr<base::Value> value, | 55 scoped_ptr<base::Value> value, |
55 uint32 flags) { | 56 uint32 flags) { |
56 prefs_.SetValue(key, value.Pass()); | 57 prefs_.SetValue(key, std::move(value)); |
57 } | 58 } |
58 | 59 |
59 ValueMapPrefStore::~ValueMapPrefStore() {} | 60 ValueMapPrefStore::~ValueMapPrefStore() {} |
60 | 61 |
61 void ValueMapPrefStore::NotifyInitializationCompleted() { | 62 void ValueMapPrefStore::NotifyInitializationCompleted() { |
62 FOR_EACH_OBSERVER(Observer, observers_, OnInitializationCompleted(true)); | 63 FOR_EACH_OBSERVER(Observer, observers_, OnInitializationCompleted(true)); |
63 } | 64 } |
OLD | NEW |