| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/preferences/tracked/segregated_pref_store.h" | 5 #include "services/preferences/tracked/segregated_pref_store.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 } | 44 } |
| 45 | 45 |
| 46 for (auto& observer : outer_->observers_) | 46 for (auto& observer : outer_->observers_) |
| 47 observer.OnInitializationCompleted(successful_sub_initializations_ == 2); | 47 observer.OnInitializationCompleted(successful_sub_initializations_ == 2); |
| 48 } | 48 } |
| 49 } | 49 } |
| 50 | 50 |
| 51 SegregatedPrefStore::SegregatedPrefStore( | 51 SegregatedPrefStore::SegregatedPrefStore( |
| 52 const scoped_refptr<PersistentPrefStore>& default_pref_store, | 52 const scoped_refptr<PersistentPrefStore>& default_pref_store, |
| 53 const scoped_refptr<PersistentPrefStore>& selected_pref_store, | 53 const scoped_refptr<PersistentPrefStore>& selected_pref_store, |
| 54 const std::set<std::string>& selected_pref_names, | 54 const std::set<std::string>& selected_pref_names) |
| 55 prefs::mojom::TrackedPreferenceValidationDelegatePtr validation_delegate) | 55 : default_pref_store_(default_pref_store), |
| 56 : validation_delegate_(std::move(validation_delegate)), | |
| 57 default_pref_store_(default_pref_store), | |
| 58 selected_pref_store_(selected_pref_store), | 56 selected_pref_store_(selected_pref_store), |
| 59 selected_preference_names_(selected_pref_names), | 57 selected_preference_names_(selected_pref_names), |
| 60 aggregating_observer_(this) { | 58 aggregating_observer_(this) { |
| 61 default_pref_store_->AddObserver(&aggregating_observer_); | 59 default_pref_store_->AddObserver(&aggregating_observer_); |
| 62 selected_pref_store_->AddObserver(&aggregating_observer_); | 60 selected_pref_store_->AddObserver(&aggregating_observer_); |
| 63 } | 61 } |
| 64 | 62 |
| 65 void SegregatedPrefStore::AddObserver(Observer* observer) { | 63 void SegregatedPrefStore::AddObserver(Observer* observer) { |
| 66 observers_.AddObserver(observer); | 64 observers_.AddObserver(observer); |
| 67 } | 65 } |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 .get(); | 184 .get(); |
| 187 } | 185 } |
| 188 | 186 |
| 189 const PersistentPrefStore* SegregatedPrefStore::StoreForKey( | 187 const PersistentPrefStore* SegregatedPrefStore::StoreForKey( |
| 190 const std::string& key) const { | 188 const std::string& key) const { |
| 191 return (base::ContainsKey(selected_preference_names_, key) | 189 return (base::ContainsKey(selected_preference_names_, key) |
| 192 ? selected_pref_store_ | 190 ? selected_pref_store_ |
| 193 : default_pref_store_) | 191 : default_pref_store_) |
| 194 .get(); | 192 .get(); |
| 195 } | 193 } |
| OLD | NEW |