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

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: Addressed next set of comments from gab@. 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
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 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 const char kDefaultSupervisedUserFilteringBehavior[] = 1179 const char kDefaultSupervisedUserFilteringBehavior[] =
1180 "profile.managed.default_filtering_behavior"; 1180 "profile.managed.default_filtering_behavior";
1181 1181
1182 // Whether this user is permitted to create supervised users. 1182 // Whether this user is permitted to create supervised users.
1183 const char kSupervisedUserCreationAllowed[] = 1183 const char kSupervisedUserCreationAllowed[] =
1184 "profile.managed_user_creation_allowed"; 1184 "profile.managed_user_creation_allowed";
1185 1185
1186 // List pref containing the users supervised by this user. 1186 // List pref containing the users supervised by this user.
1187 const char kSupervisedUsers[] = "profile.managed_users"; 1187 const char kSupervisedUsers[] = "profile.managed_users";
1188 1188
1189 // String that indicates that the profile reset prompt has already been shown to
1190 // the user (profile).
1191 const char kProfileResetPromptMementoInProfilePrefs[] =
1192 "profile.reset_prompt_memento";
1193
1189 // List pref containing the extension ids which are not allowed to send 1194 // List pref containing the extension ids which are not allowed to send
1190 // notifications to the message center. 1195 // notifications to the message center.
1191 const char kMessageCenterDisabledExtensionIds[] = 1196 const char kMessageCenterDisabledExtensionIds[] =
1192 "message_center.disabled_extension_ids"; 1197 "message_center.disabled_extension_ids";
1193 1198
1194 // List pref containing the system component ids which are not allowed to send 1199 // List pref containing the system component ids which are not allowed to send
1195 // notifications to the message center. 1200 // notifications to the message center.
1196 const char kMessageCenterDisabledSystemComponentIds[] = 1201 const char kMessageCenterDisabledSystemComponentIds[] =
1197 "message_center.disabled_system_component_ids"; 1202 "message_center.disabled_system_component_ids";
1198 1203
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 // String containing the version of Chrome that the profile was created by. 1280 // String containing the version of Chrome that the profile was created by.
1276 // If profile was created before this feature was added, this pref will default 1281 // If profile was created before this feature was added, this pref will default
1277 // to "1.0.0.0". 1282 // to "1.0.0.0".
1278 const char kProfileCreatedByVersion[] = "profile.created_by_version"; 1283 const char kProfileCreatedByVersion[] = "profile.created_by_version";
1279 1284
1280 // A map of profile data directory to cached information. This cache can be 1285 // A map of profile data directory to cached information. This cache can be
1281 // used to display information about profiles without actually having to load 1286 // used to display information about profiles without actually having to load
1282 // them. 1287 // them.
1283 const char kProfileInfoCache[] = "profile.info_cache"; 1288 const char kProfileInfoCache[] = "profile.info_cache";
1284 1289
1290 // Dictionary that maps profile keys to strings that indicate that the profile
1291 // reset prompt has already been shown to the corresponding user (profile).
1292 // This is semantically similar to kProfileResetPromptMementoInProfilePrefs, see
1293 // chrome/browser/profile_resetter/automatic_profile_resetter_mementos.h for an
1294 // explanation of why this redundancy is needed.
1295 const char kProfileResetPromptMementosInLocalState[] =
1296 "profile.reset_prompt_mementos";
1297
1285 // Prefs for SSLConfigServicePref. 1298 // Prefs for SSLConfigServicePref.
1286 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled"; 1299 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled";
1287 const char kCertRevocationCheckingRequiredLocalAnchors[] = 1300 const char kCertRevocationCheckingRequiredLocalAnchors[] =
1288 "ssl.rev_checking.required_for_local_anchors"; 1301 "ssl.rev_checking.required_for_local_anchors";
1289 const char kSSLVersionMin[] = "ssl.version_min"; 1302 const char kSSLVersionMin[] = "ssl.version_min";
1290 const char kSSLVersionMax[] = "ssl.version_max"; 1303 const char kSSLVersionMax[] = "ssl.version_max";
1291 const char kCipherSuiteBlacklist[] = "ssl.cipher_suites.blacklist"; 1304 const char kCipherSuiteBlacklist[] = "ssl.cipher_suites.blacklist";
1292 const char kDisableSSLRecordSplitting[] = "ssl.ssl_record_splitting.disabled"; 1305 const char kDisableSSLRecordSplitting[] = "ssl.ssl_record_splitting.disabled";
1293 1306
1294 // Dictionary of dates when a site's SSL blocking interstitial was proceeded 1307 // Dictionary of dates when a site's SSL blocking interstitial was proceeded
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
2328 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2341 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2329 #endif 2342 #endif
2330 2343
2331 // Whether DNS Quick Check is disabled in proxy resolution. 2344 // Whether DNS Quick Check is disabled in proxy resolution.
2332 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2345 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2333 2346
2334 // Whether Guest Mode is enabled within the browser. 2347 // Whether Guest Mode is enabled within the browser.
2335 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled"; 2348 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled";
2336 2349
2337 } // namespace prefs 2350 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698