| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/prefs/pref_value_map.h" | 5 #include "chrome/browser/prefs/pref_value_map.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/stl_util-inl.h" | 9 #include "base/stl_util.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 | 11 |
| 12 PrefValueMap::PrefValueMap() {} | 12 PrefValueMap::PrefValueMap() {} |
| 13 | 13 |
| 14 PrefValueMap::~PrefValueMap() { | 14 PrefValueMap::~PrefValueMap() { |
| 15 Clear(); | 15 Clear(); |
| 16 } | 16 } |
| 17 | 17 |
| 18 bool PrefValueMap::GetValue(const std::string& key, const Value** value) const { | 18 bool PrefValueMap::GetValue(const std::string& key, const Value** value) const { |
| 19 const Map::const_iterator entry = prefs_.find(key); | 19 const Map::const_iterator entry = prefs_.find(key); |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 ++other_pref; | 125 ++other_pref; |
| 126 } | 126 } |
| 127 } | 127 } |
| 128 | 128 |
| 129 // Add the remaining entries. | 129 // Add the remaining entries. |
| 130 for ( ; this_pref != prefs_.end(); ++this_pref) | 130 for ( ; this_pref != prefs_.end(); ++this_pref) |
| 131 differing_keys->push_back(this_pref->first); | 131 differing_keys->push_back(this_pref->first); |
| 132 for ( ; other_pref != other->prefs_.end(); ++other_pref) | 132 for ( ; other_pref != other->prefs_.end(); ++other_pref) |
| 133 differing_keys->push_back(other_pref->first); | 133 differing_keys->push_back(other_pref->first); |
| 134 } | 134 } |
| OLD | NEW |