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

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

Issue 12316144: Merge 183832 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/renderer/page_load_histograms.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) 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 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after
1699 #if defined(OS_ANDROID) 1699 #if defined(OS_ANDROID)
1700 // A boolean specifying whether remote dev tools debugging is enabled. 1700 // A boolean specifying whether remote dev tools debugging is enabled.
1701 const char kDevToolsRemoteEnabled[] = "devtools.remote_enabled"; 1701 const char kDevToolsRemoteEnabled[] = "devtools.remote_enabled";
1702 #endif 1702 #endif
1703 1703
1704 // Integer location of the vertical split bar in the browser view. 1704 // Integer location of the vertical split bar in the browser view.
1705 const char kDevToolsVSplitLocation[] = "devtools.v_split_location"; 1705 const char kDevToolsVSplitLocation[] = "devtools.v_split_location";
1706 1706
1707 #if defined(OS_ANDROID) 1707 #if defined(OS_ANDROID)
1708 // A boolean specifying whether a SPDY proxy is enabled. 1708 // A boolean specifying whether a SPDY proxy is enabled.
1709 const char kSpdyProxyEnabled[] = "spdy_proxy.enabled"; 1709 const char kSpdyProxyAuthEnabled[] = "spdy_proxy.enabled";
1710 #endif 1710 #endif
1711 1711
1712 // 64-bit integer serialization of the base::Time when the last sync occurred. 1712 // 64-bit integer serialization of the base::Time when the last sync occurred.
1713 const char kSyncLastSyncedTime[] = "sync.last_synced_time"; 1713 const char kSyncLastSyncedTime[] = "sync.last_synced_time";
1714 1714
1715 // Boolean specifying whether the user finished setting up sync. 1715 // Boolean specifying whether the user finished setting up sync.
1716 const char kSyncHasSetupCompleted[] = "sync.has_setup_completed"; 1716 const char kSyncHasSetupCompleted[] = "sync.has_setup_completed";
1717 1717
1718 // Boolean specifying whether to automatically sync all data types (including 1718 // Boolean specifying whether to automatically sync all data types (including
1719 // future ones, as they're added). If this is true, the following preferences 1719 // future ones, as they're added). If this is true, the following preferences
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
1919 // Whitelist containing servers Chrome is allowed to do Kerberos delegation 1919 // Whitelist containing servers Chrome is allowed to do Kerberos delegation
1920 // with. 1920 // with.
1921 const char kAuthNegotiateDelegateWhitelist[] = 1921 const char kAuthNegotiateDelegateWhitelist[] =
1922 "auth.negotiate_delegate_whitelist"; 1922 "auth.negotiate_delegate_whitelist";
1923 1923
1924 // String that specifies the name of a custom GSSAPI library to load. 1924 // String that specifies the name of a custom GSSAPI library to load.
1925 const char kGSSAPILibraryName[] = "auth.gssapi_library_name"; 1925 const char kGSSAPILibraryName[] = "auth.gssapi_library_name";
1926 1926
1927 // String that specifies the origin allowed to use SpdyProxy 1927 // String that specifies the origin allowed to use SpdyProxy
1928 // authentication, if any. 1928 // authentication, if any.
1929 const char kSpdyProxyOrigin[] = "auth.spdyproxy.origin"; 1929 const char kSpdyProxyAuthOrigin[] = "auth.spdyproxy.origin";
1930 1930
1931 // Boolean that specifies whether to allow basic auth prompting on cross- 1931 // Boolean that specifies whether to allow basic auth prompting on cross-
1932 // domain sub-content requests. 1932 // domain sub-content requests.
1933 const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt"; 1933 const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt";
1934 1934
1935 // Boolean that specifies whether the built-in asynchronous DNS client is used. 1935 // Boolean that specifies whether the built-in asynchronous DNS client is used.
1936 const char kBuiltInDnsClientEnabled[] = "async_dns.enabled"; 1936 const char kBuiltInDnsClientEnabled[] = "async_dns.enabled";
1937 1937
1938 // An int64 pref that contains the total size of all HTTP content that has been 1938 // An int64 pref that contains the total size of all HTTP content that has been
1939 // received from the network. 1939 // received from the network.
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
2287 const char kRLZDisabled[] = "rlz.disabled"; 2287 const char kRLZDisabled[] = "rlz.disabled";
2288 #endif 2288 #endif
2289 2289
2290 #if defined(ENABLE_APP_LIST) 2290 #if defined(ENABLE_APP_LIST)
2291 // The directory in user data dir that contains the profile to be used with the 2291 // The directory in user data dir that contains the profile to be used with the
2292 // app launcher. 2292 // app launcher.
2293 extern const char kAppListProfile[] = "app_list.profile"; 2293 extern const char kAppListProfile[] = "app_list.profile";
2294 #endif 2294 #endif
2295 2295
2296 } // namespace prefs 2296 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/renderer/page_load_histograms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698