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

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

Issue 5023001: Handful of related instant changes: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux build Created 10 years, 1 month 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/common/pref_names.h ('k') | chrome/test/testing_profile.h » ('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) 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 #include "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 namespace prefs { 7 namespace prefs {
8 8
9 // *************** PROFILE PREFS *************** 9 // *************** PROFILE PREFS ***************
10 // These are attached to the user profile 10 // These are attached to the user profile
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 // Is the cookie prompt expanded? 206 // Is the cookie prompt expanded?
207 const char kCookiePromptExpanded[] = "cookieprompt.expanded"; 207 const char kCookiePromptExpanded[] = "cookieprompt.expanded";
208 208
209 // Boolean pref indicating whether the instant confirm dialog has been shown. 209 // Boolean pref indicating whether the instant confirm dialog has been shown.
210 const char kInstantConfirmDialogShown[] = "instant.confirm_dialog_shown"; 210 const char kInstantConfirmDialogShown[] = "instant.confirm_dialog_shown";
211 211
212 // Boolean pref indicating if instant is enabled. 212 // Boolean pref indicating if instant is enabled.
213 const char kInstantEnabled[] = "instant.enabled"; 213 const char kInstantEnabled[] = "instant.enabled";
214 214
215 // Boolean pref indicating if instant was ever enabled.
216 const char kInstantEnabledOnce[] = "instant.enabled_once";
217
218 // Time when instant was last enabled.
219 const char kInstantEnabledTime[] = "instant.enabled_time";
220
221 // Used to maintain instant promo keys. See PromoCounter for details of subkeys
222 // that are used.
223 const char kInstantPromo[] = "instant.promo";
224
225 // Type of instant. This is one of the enums defined in InstantController::TYPE.
226 const char kInstantType[] = "instant.type";
227
215 #if defined(USE_NSS) || defined(USE_OPENSSL) 228 #if defined(USE_NSS) || defined(USE_OPENSSL)
216 // Prefs for SSLConfigServicePref. Currently, these are only present on 229 // Prefs for SSLConfigServicePref. Currently, these are only present on
217 // and used by NSS/OpenSSL using OSes. 230 // and used by NSS/OpenSSL using OSes.
218 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled"; 231 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled";
219 const char kSSL2Enabled[] = "ssl.ssl2.enabled"; 232 const char kSSL2Enabled[] = "ssl.ssl2.enabled";
220 const char kSSL3Enabled[] = "ssl.ssl3.enabled"; 233 const char kSSL3Enabled[] = "ssl.ssl3.enabled";
221 const char kTLS1Enabled[] = "ssl.tls1.enabled"; 234 const char kTLS1Enabled[] = "ssl.tls1.enabled";
222 #endif 235 #endif
223 236
224 #if defined(OS_CHROMEOS) 237 #if defined(OS_CHROMEOS)
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 // String specifying the proxy server. For a specification of the expected 1092 // String specifying the proxy server. For a specification of the expected
1080 // syntax see net::ProxyConfig::ProxyRules::ParseFromString(). 1093 // syntax see net::ProxyConfig::ProxyRules::ParseFromString().
1081 const char kProxyServer[] = "proxy.server"; 1094 const char kProxyServer[] = "proxy.server";
1082 // URL to the proxy .pac file. 1095 // URL to the proxy .pac file.
1083 const char kProxyPacUrl[] = "proxy.pac_url"; 1096 const char kProxyPacUrl[] = "proxy.pac_url";
1084 // String containing proxy bypass rules. For a specification of the 1097 // String containing proxy bypass rules. For a specification of the
1085 // expected syntax see net::ProxyBypassRules::ParseFromString(). 1098 // expected syntax see net::ProxyBypassRules::ParseFromString().
1086 const char kProxyBypassList[] = "proxy.bypass_list"; 1099 const char kProxyBypassList[] = "proxy.bypass_list";
1087 1100
1088 } // namespace prefs 1101 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/test/testing_profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698