Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Side by Side Diff: chrome/browser/prefs/pref_value_store.h

Issue 8896023: Fixed the value of "controlledBy" for preferences when they're set by the user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/prefs/pref_service.cc ('k') | chrome/browser/prefs/pref_value_store.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // a higher-priority source. 87 // a higher-priority source.
88 bool PrefValueInManagedStore(const char* name) const; 88 bool PrefValueInManagedStore(const char* name) const;
89 bool PrefValueInExtensionStore(const char* name) const; 89 bool PrefValueInExtensionStore(const char* name) const;
90 bool PrefValueInUserStore(const char* name) const; 90 bool PrefValueInUserStore(const char* name) const;
91 91
92 // These methods return true if a preference with the given name is actually 92 // These methods return true if a preference with the given name is actually
93 // being controlled by the indicated pref store and not being overridden by 93 // being controlled by the indicated pref store and not being overridden by
94 // a higher-priority source. 94 // a higher-priority source.
95 bool PrefValueFromExtensionStore(const char* name) const; 95 bool PrefValueFromExtensionStore(const char* name) const;
96 bool PrefValueFromUserStore(const char* name) const; 96 bool PrefValueFromUserStore(const char* name) const;
97 bool PrefValueFromRecommendedStore(const char* name) const;
97 bool PrefValueFromDefaultStore(const char* name) const; 98 bool PrefValueFromDefaultStore(const char* name) const;
98 99
99 // Check whether a Preference value is modifiable by the user, i.e. whether 100 // Check whether a Preference value is modifiable by the user, i.e. whether
100 // there is no higher-priority source controlling it. 101 // there is no higher-priority source controlling it.
101 bool PrefValueUserModifiable(const char* name) const; 102 bool PrefValueUserModifiable(const char* name) const;
102 103
103 // Check whether a Preference value is modifiable by an extension, i.e. 104 // Check whether a Preference value is modifiable by an extension, i.e.
104 // whether there is no higher-priority source controlling it. 105 // whether there is no higher-priority source controlling it.
105 bool PrefValueExtensionModifiable(const char* name) const; 106 bool PrefValueExtensionModifiable(const char* name) const;
106 107
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 // A mapping of preference names to their registered types. 247 // A mapping of preference names to their registered types.
247 PrefTypeMap pref_types_; 248 PrefTypeMap pref_types_;
248 249
249 // True if not all of the PrefStores were initialized successfully. 250 // True if not all of the PrefStores were initialized successfully.
250 bool initialization_failed_; 251 bool initialization_failed_;
251 252
252 DISALLOW_COPY_AND_ASSIGN(PrefValueStore); 253 DISALLOW_COPY_AND_ASSIGN(PrefValueStore);
253 }; 254 };
254 255
255 #endif // CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ 256 #endif // CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_service.cc ('k') | chrome/browser/prefs/pref_value_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698