| 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/default_pref_store.h" | 5 #include "base/prefs/default_pref_store.h" | 
|  | 6 | 
|  | 7 #include <utility> | 
|  | 8 | 
| 6 #include "base/logging.h" | 9 #include "base/logging.h" | 
| 7 | 10 | 
| 8 using base::Value; | 11 using base::Value; | 
| 9 | 12 | 
| 10 DefaultPrefStore::DefaultPrefStore() {} | 13 DefaultPrefStore::DefaultPrefStore() {} | 
| 11 | 14 | 
| 12 bool DefaultPrefStore::GetValue(const std::string& key, | 15 bool DefaultPrefStore::GetValue(const std::string& key, | 
| 13                                 const Value** result) const { | 16                                 const Value** result) const { | 
| 14   return prefs_.GetValue(key, result); | 17   return prefs_.GetValue(key, result); | 
| 15 } | 18 } | 
| 16 | 19 | 
| 17 void DefaultPrefStore::AddObserver(PrefStore::Observer* observer) { | 20 void DefaultPrefStore::AddObserver(PrefStore::Observer* observer) { | 
| 18   observers_.AddObserver(observer); | 21   observers_.AddObserver(observer); | 
| 19 } | 22 } | 
| 20 | 23 | 
| 21 void DefaultPrefStore::RemoveObserver(PrefStore::Observer* observer) { | 24 void DefaultPrefStore::RemoveObserver(PrefStore::Observer* observer) { | 
| 22   observers_.RemoveObserver(observer); | 25   observers_.RemoveObserver(observer); | 
| 23 } | 26 } | 
| 24 | 27 | 
| 25 bool DefaultPrefStore::HasObservers() const { | 28 bool DefaultPrefStore::HasObservers() const { | 
| 26   return observers_.might_have_observers(); | 29   return observers_.might_have_observers(); | 
| 27 } | 30 } | 
| 28 | 31 | 
| 29 void DefaultPrefStore::SetDefaultValue(const std::string& key, | 32 void DefaultPrefStore::SetDefaultValue(const std::string& key, | 
| 30                                        scoped_ptr<Value> value) { | 33                                        scoped_ptr<Value> value) { | 
| 31   DCHECK(!GetValue(key, NULL)); | 34   DCHECK(!GetValue(key, NULL)); | 
| 32   prefs_.SetValue(key, value.Pass()); | 35   prefs_.SetValue(key, std::move(value)); | 
| 33 } | 36 } | 
| 34 | 37 | 
| 35 void DefaultPrefStore::ReplaceDefaultValue(const std::string& key, | 38 void DefaultPrefStore::ReplaceDefaultValue(const std::string& key, | 
| 36                                            scoped_ptr<Value> value) { | 39                                            scoped_ptr<Value> value) { | 
| 37   const Value* old_value = NULL; | 40   const Value* old_value = NULL; | 
| 38   GetValue(key, &old_value); | 41   GetValue(key, &old_value); | 
| 39   bool notify = !old_value->Equals(value.get()); | 42   bool notify = !old_value->Equals(value.get()); | 
| 40   prefs_.SetValue(key, value.Pass()); | 43   prefs_.SetValue(key, std::move(value)); | 
| 41   if (notify) | 44   if (notify) | 
| 42     FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); | 45     FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key)); | 
| 43 } | 46 } | 
| 44 | 47 | 
| 45 DefaultPrefStore::const_iterator DefaultPrefStore::begin() const { | 48 DefaultPrefStore::const_iterator DefaultPrefStore::begin() const { | 
| 46   return prefs_.begin(); | 49   return prefs_.begin(); | 
| 47 } | 50 } | 
| 48 | 51 | 
| 49 DefaultPrefStore::const_iterator DefaultPrefStore::end() const { | 52 DefaultPrefStore::const_iterator DefaultPrefStore::end() const { | 
| 50   return prefs_.end(); | 53   return prefs_.end(); | 
| 51 } | 54 } | 
| 52 | 55 | 
| 53 DefaultPrefStore::~DefaultPrefStore() {} | 56 DefaultPrefStore::~DefaultPrefStore() {} | 
| OLD | NEW | 
|---|