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 "base/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.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(); |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 ++other_pref; | 142 ++other_pref; |
143 } | 143 } |
144 } | 144 } |
145 | 145 |
146 // Add the remaining entries. | 146 // Add the remaining entries. |
147 for ( ; this_pref != prefs_.end(); ++this_pref) | 147 for ( ; this_pref != prefs_.end(); ++this_pref) |
148 differing_keys->push_back(this_pref->first); | 148 differing_keys->push_back(this_pref->first); |
149 for ( ; other_pref != other->prefs_.end(); ++other_pref) | 149 for ( ; other_pref != other->prefs_.end(); ++other_pref) |
150 differing_keys->push_back(other_pref->first); | 150 differing_keys->push_back(other_pref->first); |
151 } | 151 } |
OLD | NEW |