| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ | 5 #ifndef CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ |
| 6 #define CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ | 6 #define CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 // |callback|. |callback| is called with the set of preferences changed by the | 165 // |callback|. |callback| is called with the set of preferences changed by the |
| 166 // policy refresh. |callback| is called on the caller's thread as a Task | 166 // policy refresh. |callback| is called on the caller's thread as a Task |
| 167 // after RefreshPolicyPrefs has returned. | 167 // after RefreshPolicyPrefs has returned. |
| 168 void RefreshPolicyPrefs(AfterRefreshCallback* callback); | 168 void RefreshPolicyPrefs(AfterRefreshCallback* callback); |
| 169 | 169 |
| 170 // Returns true if there are proxy preferences in user-modifiable | 170 // Returns true if there are proxy preferences in user-modifiable |
| 171 // preference stores (e.g. CommandLinePrefStore, ExtensionPrefStore) | 171 // preference stores (e.g. CommandLinePrefStore, ExtensionPrefStore) |
| 172 // that conflict with proxy settings specified by proxy policy. | 172 // that conflict with proxy settings specified by proxy policy. |
| 173 bool HasPolicyConflictingUserProxySettings(); | 173 bool HasPolicyConflictingUserProxySettings(); |
| 174 | 174 |
| 175 // TODO(mnissler) delete after applying your patch. |
| 176 // This is only called only by PrefService. |
| 177 PrefStore* GetExtensionPrefStore() const; |
| 178 |
| 175 protected: | 179 protected: |
| 176 // In decreasing order of precedence: | 180 // In decreasing order of precedence: |
| 177 // |managed_platform_prefs| contains all managed platform (non-cloud policy) | 181 // |managed_platform_prefs| contains all managed platform (non-cloud policy) |
| 178 // preference values. | 182 // preference values. |
| 179 // |device_management_prefs| contains all device management (cloud policy) | 183 // |device_management_prefs| contains all device management (cloud policy) |
| 180 // preference values. | 184 // preference values. |
| 181 // |extension_prefs| contains preference values set by extensions. | 185 // |extension_prefs| contains preference values set by extensions. |
| 182 // |command_line_prefs| contains preference values set by command-line | 186 // |command_line_prefs| contains preference values set by command-line |
| 183 // switches. | 187 // switches. |
| 184 // |user_prefs| contains all user-set preference values. | 188 // |user_prefs| contains all user-set preference values. |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 | 255 |
| 252 // The associated profile, in case this value store is associated with a | 256 // The associated profile, in case this value store is associated with a |
| 253 // profile pref service. Used for recreating the device management pref store | 257 // profile pref service. Used for recreating the device management pref store |
| 254 // upon policy refresh. | 258 // upon policy refresh. |
| 255 Profile* profile_; | 259 Profile* profile_; |
| 256 | 260 |
| 257 DISALLOW_COPY_AND_ASSIGN(PrefValueStore); | 261 DISALLOW_COPY_AND_ASSIGN(PrefValueStore); |
| 258 }; | 262 }; |
| 259 | 263 |
| 260 #endif // CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ | 264 #endif // CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ |
| OLD | NEW |