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 "base/prefs/pref_value_map.h" | 5 #include "base/prefs/pref_value_map.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 ++other_pref; | 135 ++other_pref; |
136 } | 136 } |
137 } | 137 } |
138 | 138 |
139 // Add the remaining entries. | 139 // Add the remaining entries. |
140 for ( ; this_pref != this_prefs.end(); ++this_pref) | 140 for ( ; this_pref != this_prefs.end(); ++this_pref) |
141 differing_keys->push_back(this_pref->first); | 141 differing_keys->push_back(this_pref->first); |
142 for ( ; other_pref != other_prefs.end(); ++other_pref) | 142 for ( ; other_pref != other_prefs.end(); ++other_pref) |
143 differing_keys->push_back(other_pref->first); | 143 differing_keys->push_back(other_pref->first); |
144 } | 144 } |
OLD | NEW |