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

Side by Side Diff: chrome/common/pref_names.cc

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 3 months 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
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/tools/profile_reset/OWNERS » ('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) 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 "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 const char kDefaultSupervisedUserFilteringBehavior[] = 1169 const char kDefaultSupervisedUserFilteringBehavior[] =
1170 "profile.managed.default_filtering_behavior"; 1170 "profile.managed.default_filtering_behavior";
1171 1171
1172 // Whether this user is permitted to create supervised users. 1172 // Whether this user is permitted to create supervised users.
1173 const char kSupervisedUserCreationAllowed[] = 1173 const char kSupervisedUserCreationAllowed[] =
1174 "profile.managed_user_creation_allowed"; 1174 "profile.managed_user_creation_allowed";
1175 1175
1176 // List pref containing the users supervised by this user. 1176 // List pref containing the users supervised by this user.
1177 const char kSupervisedUsers[] = "profile.managed_users"; 1177 const char kSupervisedUsers[] = "profile.managed_users";
1178 1178
1179 // String that indicates that the profile reset prompt has already been shown to
1180 // the user (profile).
1181 const char kProfileResetPromptMementoInProfilePrefs[] =
1182 "profile.reset_prompt_memento";
1183
1179 // List pref containing the extension ids which are not allowed to send 1184 // List pref containing the extension ids which are not allowed to send
1180 // notifications to the message center. 1185 // notifications to the message center.
1181 const char kMessageCenterDisabledExtensionIds[] = 1186 const char kMessageCenterDisabledExtensionIds[] =
1182 "message_center.disabled_extension_ids"; 1187 "message_center.disabled_extension_ids";
1183 1188
1184 // List pref containing the system component ids which are not allowed to send 1189 // List pref containing the system component ids which are not allowed to send
1185 // notifications to the message center. 1190 // notifications to the message center.
1186 const char kMessageCenterDisabledSystemComponentIds[] = 1191 const char kMessageCenterDisabledSystemComponentIds[] =
1187 "message_center.disabled_system_component_ids"; 1192 "message_center.disabled_system_component_ids";
1188 1193
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 // String containing the version of Chrome that the profile was created by. 1270 // String containing the version of Chrome that the profile was created by.
1266 // If profile was created before this feature was added, this pref will default 1271 // If profile was created before this feature was added, this pref will default
1267 // to "1.0.0.0". 1272 // to "1.0.0.0".
1268 const char kProfileCreatedByVersion[] = "profile.created_by_version"; 1273 const char kProfileCreatedByVersion[] = "profile.created_by_version";
1269 1274
1270 // A map of profile data directory to cached information. This cache can be 1275 // A map of profile data directory to cached information. This cache can be
1271 // used to display information about profiles without actually having to load 1276 // used to display information about profiles without actually having to load
1272 // them. 1277 // them.
1273 const char kProfileInfoCache[] = "profile.info_cache"; 1278 const char kProfileInfoCache[] = "profile.info_cache";
1274 1279
1280 // Dictionary that maps profile keys to strings that indicate that the profile
1281 // reset prompt has already been shown to the corresponding user (profile).
1282 // This is semantically similar to kProfileResetPromptMementoInProfilePrefs, see
1283 // chrome/browser/profile_resetter/automatic_profile_resetter_mementos.h for an
1284 // explanation of why this redundancy is needed.
1285 const char kProfileResetPromptMementosInLocalState[] =
1286 "profile.reset_prompt_mementos";
1287
1275 // Prefs for SSLConfigServicePref. 1288 // Prefs for SSLConfigServicePref.
1276 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled"; 1289 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled";
1277 const char kCertRevocationCheckingRequiredLocalAnchors[] = 1290 const char kCertRevocationCheckingRequiredLocalAnchors[] =
1278 "ssl.rev_checking.required_for_local_anchors"; 1291 "ssl.rev_checking.required_for_local_anchors";
1279 const char kSSLVersionMin[] = "ssl.version_min"; 1292 const char kSSLVersionMin[] = "ssl.version_min";
1280 const char kSSLVersionMax[] = "ssl.version_max"; 1293 const char kSSLVersionMax[] = "ssl.version_max";
1281 const char kCipherSuiteBlacklist[] = "ssl.cipher_suites.blacklist"; 1294 const char kCipherSuiteBlacklist[] = "ssl.cipher_suites.blacklist";
1282 const char kDisableSSLRecordSplitting[] = "ssl.ssl_record_splitting.disabled"; 1295 const char kDisableSSLRecordSplitting[] = "ssl.ssl_record_splitting.disabled";
1283 1296
1284 // Dictionary of dates when a site's SSL blocking interstitial was proceeded 1297 // Dictionary of dates when a site's SSL blocking interstitial was proceeded
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
2321 // Whether DNS Quick Check is disabled in proxy resolution. 2334 // Whether DNS Quick Check is disabled in proxy resolution.
2322 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2335 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2323 2336
2324 // Whether Guest Mode is enabled within the browser. 2337 // Whether Guest Mode is enabled within the browser.
2325 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled"; 2338 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled";
2326 2339
2327 // Whether Adding a new Person is enabled within the user manager. 2340 // Whether Adding a new Person is enabled within the user manager.
2328 const char kBrowserAddPersonEnabled[] = "profile.add_person_enabled"; 2341 const char kBrowserAddPersonEnabled[] = "profile.add_person_enabled";
2329 2342
2330 } // namespace prefs 2343 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/tools/profile_reset/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698