| 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 "components/prefs/pref_value_store.h" | 5 #include "components/prefs/pref_value_store.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "components/prefs/pref_notifier.h" | 10 #include "components/prefs/pref_notifier.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 pref_value_store_->OnInitializationCompleted(type_, succeeded); | 48 pref_value_store_->OnInitializationCompleted(type_, succeeded); |
| 49 } | 49 } |
| 50 | 50 |
| 51 PrefValueStore::PrefValueStore(PrefStore* managed_prefs, | 51 PrefValueStore::PrefValueStore(PrefStore* managed_prefs, |
| 52 PrefStore* supervised_user_prefs, | 52 PrefStore* supervised_user_prefs, |
| 53 PrefStore* extension_prefs, | 53 PrefStore* extension_prefs, |
| 54 PrefStore* command_line_prefs, | 54 PrefStore* command_line_prefs, |
| 55 PrefStore* user_prefs, | 55 PrefStore* user_prefs, |
| 56 PrefStore* recommended_prefs, | 56 PrefStore* recommended_prefs, |
| 57 PrefStore* default_prefs, | 57 PrefStore* default_prefs, |
| 58 PrefNotifier* pref_notifier) | 58 PrefNotifier* pref_notifier, |
| 59 : pref_notifier_(pref_notifier), | 59 PrefStore* incognito_prefs) |
| 60 initialization_failed_(false) { | 60 : pref_notifier_(pref_notifier), initialization_failed_(false) { |
| 61 InitPrefStore(MANAGED_STORE, managed_prefs); | 61 InitPrefStore(MANAGED_STORE, managed_prefs); |
| 62 InitPrefStore(SUPERVISED_USER_STORE, supervised_user_prefs); | 62 InitPrefStore(SUPERVISED_USER_STORE, supervised_user_prefs); |
| 63 InitPrefStore(EXTENSION_STORE, extension_prefs); | 63 InitPrefStore(EXTENSION_STORE, extension_prefs); |
| 64 InitPrefStore(COMMAND_LINE_STORE, command_line_prefs); | 64 InitPrefStore(COMMAND_LINE_STORE, command_line_prefs); |
| 65 InitPrefStore(USER_STORE, user_prefs); | 65 InitPrefStore(USER_STORE, user_prefs); |
| 66 InitPrefStore(RECOMMENDED_STORE, recommended_prefs); | 66 InitPrefStore(RECOMMENDED_STORE, recommended_prefs); |
| 67 InitPrefStore(DEFAULT_STORE, default_prefs); | 67 InitPrefStore(DEFAULT_STORE, default_prefs); |
| 68 InitPrefStore(INCOGNITO_STORE, incognito_prefs); |
| 68 | 69 |
| 69 CheckInitializationCompleted(); | 70 CheckInitializationCompleted(); |
| 70 } | 71 } |
| 71 | 72 |
| 72 PrefValueStore::~PrefValueStore() {} | 73 PrefValueStore::~PrefValueStore() {} |
| 73 | 74 |
| 74 PrefValueStore* PrefValueStore::CloneAndSpecialize( | 75 PrefValueStore* PrefValueStore::CloneAndSpecialize( |
| 75 PrefStore* managed_prefs, | 76 PrefStore* managed_prefs, |
| 76 PrefStore* supervised_user_prefs, | 77 PrefStore* supervised_user_prefs, |
| 77 PrefStore* extension_prefs, | 78 PrefStore* extension_prefs, |
| 78 PrefStore* command_line_prefs, | 79 PrefStore* command_line_prefs, |
| 79 PrefStore* user_prefs, | 80 PrefStore* user_prefs, |
| 80 PrefStore* recommended_prefs, | 81 PrefStore* recommended_prefs, |
| 81 PrefStore* default_prefs, | 82 PrefStore* default_prefs, |
| 82 PrefNotifier* pref_notifier) { | 83 PrefNotifier* pref_notifier, |
| 84 PrefStore* incognito_prefs) { |
| 83 DCHECK(pref_notifier); | 85 DCHECK(pref_notifier); |
| 84 if (!managed_prefs) | 86 if (!managed_prefs) |
| 85 managed_prefs = GetPrefStore(MANAGED_STORE); | 87 managed_prefs = GetPrefStore(MANAGED_STORE); |
| 86 if (!supervised_user_prefs) | 88 if (!supervised_user_prefs) |
| 87 supervised_user_prefs = GetPrefStore(SUPERVISED_USER_STORE); | 89 supervised_user_prefs = GetPrefStore(SUPERVISED_USER_STORE); |
| 88 if (!extension_prefs) | 90 if (!extension_prefs) |
| 89 extension_prefs = GetPrefStore(EXTENSION_STORE); | 91 extension_prefs = GetPrefStore(EXTENSION_STORE); |
| 90 if (!command_line_prefs) | 92 if (!command_line_prefs) |
| 91 command_line_prefs = GetPrefStore(COMMAND_LINE_STORE); | 93 command_line_prefs = GetPrefStore(COMMAND_LINE_STORE); |
| 92 if (!user_prefs) | 94 if (!user_prefs) |
| 93 user_prefs = GetPrefStore(USER_STORE); | 95 user_prefs = GetPrefStore(USER_STORE); |
| 94 if (!recommended_prefs) | 96 if (!recommended_prefs) |
| 95 recommended_prefs = GetPrefStore(RECOMMENDED_STORE); | 97 recommended_prefs = GetPrefStore(RECOMMENDED_STORE); |
| 96 if (!default_prefs) | 98 if (!default_prefs) |
| 97 default_prefs = GetPrefStore(DEFAULT_STORE); | 99 default_prefs = GetPrefStore(DEFAULT_STORE); |
| 100 if (!incognito_prefs) |
| 101 incognito_prefs = GetPrefStore(INCOGNITO_STORE); |
| 98 | 102 |
| 99 return new PrefValueStore( | 103 return new PrefValueStore(managed_prefs, supervised_user_prefs, |
| 100 managed_prefs, supervised_user_prefs, extension_prefs, command_line_prefs, | 104 extension_prefs, command_line_prefs, user_prefs, |
| 101 user_prefs, recommended_prefs, default_prefs, pref_notifier); | 105 recommended_prefs, default_prefs, pref_notifier, |
| 106 incognito_prefs); |
| 102 } | 107 } |
| 103 | 108 |
| 104 void PrefValueStore::set_callback(const PrefChangedCallback& callback) { | 109 void PrefValueStore::set_callback(const PrefChangedCallback& callback) { |
| 105 pref_changed_callback_ = callback; | 110 pref_changed_callback_ = callback; |
| 106 } | 111 } |
| 107 | 112 |
| 108 bool PrefValueStore::GetValue(const std::string& name, | 113 bool PrefValueStore::GetValue(const std::string& name, |
| 109 base::Value::Type type, | 114 base::Value::Type type, |
| 110 const base::Value** out_value) const { | 115 const base::Value** out_value) const { |
| 111 // Check the |PrefStore|s in order of their priority from highest to lowest, | 116 // Check the |PrefStore|s in order of their priority from highest to lowest, |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 if (initialization_failed_) | 286 if (initialization_failed_) |
| 282 return; | 287 return; |
| 283 for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) { | 288 for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) { |
| 284 scoped_refptr<PrefStore> store = | 289 scoped_refptr<PrefStore> store = |
| 285 GetPrefStore(static_cast<PrefStoreType>(i)); | 290 GetPrefStore(static_cast<PrefStoreType>(i)); |
| 286 if (store.get() && !store->IsInitializationComplete()) | 291 if (store.get() && !store->IsInitializationComplete()) |
| 287 return; | 292 return; |
| 288 } | 293 } |
| 289 pref_notifier_->OnInitializationCompleted(true); | 294 pref_notifier_->OnInitializationCompleted(true); |
| 290 } | 295 } |
| OLD | NEW |