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

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

Issue 6004003: Introduce a separate preference for 'proxy server mode' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Eric's comments Created 10 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
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/policy_constants.h" 5 #include "chrome/common/policy_constants.h"
6 6
7 namespace policy { 7 namespace policy {
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #if defined(GOOGLE_CHROME_BUILD) 10 #if defined(GOOGLE_CHROME_BUILD)
(...skipping 14 matching lines...) Expand all
25 const char kDefaultSearchProviderKeyword[] = "DefaultSearchProviderKeyword"; 25 const char kDefaultSearchProviderKeyword[] = "DefaultSearchProviderKeyword";
26 const char kDefaultSearchProviderSearchURL[] = 26 const char kDefaultSearchProviderSearchURL[] =
27 "DefaultSearchProviderSearchURL"; 27 "DefaultSearchProviderSearchURL";
28 const char kDefaultSearchProviderSuggestURL[] = 28 const char kDefaultSearchProviderSuggestURL[] =
29 "DefaultSearchProviderSuggestURL"; 29 "DefaultSearchProviderSuggestURL";
30 const char kDefaultSearchProviderIconURL[] = 30 const char kDefaultSearchProviderIconURL[] =
31 "DefaultSearchProviderIconURL"; 31 "DefaultSearchProviderIconURL";
32 const char kDefaultSearchProviderEncodings[] = 32 const char kDefaultSearchProviderEncodings[] =
33 "DefaultSearchProviderEncodings"; 33 "DefaultSearchProviderEncodings";
34 const char kDisableSpdy[] = "DisableSpdy"; 34 const char kDisableSpdy[] = "DisableSpdy";
35 const char kProxyServerMode[] = "ProxyServerMode"; 35 // We consider the name ProxyMode more apt than ProxyServerMode but could
36 // not change it after publishing the policy API.
Mattias Nissler (ping if slow) 2010/12/22 10:22:12 It is not the API, but the naming in the win regis
battre 2010/12/22 14:41:16 Done.
37 const char kProxyMode[] = "ProxyServerMode";
36 const char kProxyServer[] = "ProxyServer"; 38 const char kProxyServer[] = "ProxyServer";
37 const char kProxyPacUrl[] = "ProxyPacUrl"; 39 const char kProxyPacUrl[] = "ProxyPacUrl";
38 const char kProxyBypassList[] = "ProxyBypassList"; 40 const char kProxyBypassList[] = "ProxyBypassList";
39 const char kAlternateErrorPagesEnabled[] = "AlternateErrorPagesEnabled"; 41 const char kAlternateErrorPagesEnabled[] = "AlternateErrorPagesEnabled";
40 const char kSearchSuggestEnabled[] = "SearchSuggestEnabled"; 42 const char kSearchSuggestEnabled[] = "SearchSuggestEnabled";
41 const char kDnsPrefetchingEnabled[] = "DnsPrefetchingEnabled"; 43 const char kDnsPrefetchingEnabled[] = "DnsPrefetchingEnabled";
42 const char kSafeBrowsingEnabled[] = "SafeBrowsingEnabled"; 44 const char kSafeBrowsingEnabled[] = "SafeBrowsingEnabled";
43 const char kMetricsReportingEnabled[] = "MetricsReportingEnabled"; 45 const char kMetricsReportingEnabled[] = "MetricsReportingEnabled";
44 const char kPasswordManagerEnabled[] = "PasswordManagerEnabled"; 46 const char kPasswordManagerEnabled[] = "PasswordManagerEnabled";
45 const char kPasswordManagerAllowShowPasswords[] = 47 const char kPasswordManagerAllowShowPasswords[] =
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const char kChromeFrameContentTypes[] = "ChromeFrameContentTypes"; 82 const char kChromeFrameContentTypes[] = "ChromeFrameContentTypes";
81 83
82 #if defined(OS_CHROMEOS) 84 #if defined(OS_CHROMEOS)
83 // ChromeOS policy constants 85 // ChromeOS policy constants
84 const char kChromeOsLockOnIdleSuspend[] = "ChromeOsLockOnIdleSuspend"; 86 const char kChromeOsLockOnIdleSuspend[] = "ChromeOsLockOnIdleSuspend";
85 #endif 87 #endif
86 88
87 } // namespace key 89 } // namespace key
88 90
89 } // namespace policy 91 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698