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

Side by Side Diff: chrome/browser/prefs/proxy_prefs.h

Issue 5958014: Policy: Add ProxyMode and deprecate ProxyServerMode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: check final diff Created 9 years, 11 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/browser/prefs/pref_service_unittest.cc ('k') | chrome/browser/prefs/proxy_prefs.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) 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 #ifndef CHROME_BROWSER_PREFS_PROXY_PREFS_H_ 5 #ifndef CHROME_BROWSER_PREFS_PROXY_PREFS_H_
6 #define CHROME_BROWSER_PREFS_PROXY_PREFS_H_ 6 #define CHROME_BROWSER_PREFS_PROXY_PREFS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 18 matching lines...) Expand all
29 // Use the settings specified in kProxyServer and kProxyBypassList. 29 // Use the settings specified in kProxyServer and kProxyBypassList.
30 MODE_FIXED_SERVERS = 3, 30 MODE_FIXED_SERVERS = 3,
31 31
32 // The system's proxy settings are used, other proxy preferences are 32 // The system's proxy settings are used, other proxy preferences are
33 // ignored. 33 // ignored.
34 MODE_SYSTEM = 4, 34 MODE_SYSTEM = 4,
35 35
36 kModeCount 36 kModeCount
37 }; 37 };
38 38
39 // Constants for string values used to specify the proxy mode through externally
40 // visible APIs, e.g. through policy or the proxy extension API.
41 extern const char kDirectProxyModeName[];
42 extern const char kAutoDetectProxyModeName[];
43 extern const char kPacScriptProxyModeName[];
44 extern const char kFixedServersProxyModeName[];
45 extern const char kSystemProxyModeName[];
46
39 bool IntToProxyMode(int in_value, ProxyMode* out_value); 47 bool IntToProxyMode(int in_value, ProxyMode* out_value);
40 bool StringToProxyMode(const std::string& in_value, 48 bool StringToProxyMode(const std::string& in_value,
41 ProxyMode* out_value); 49 ProxyMode* out_value);
42 50
43 } // namespace ProxyPrefs 51 } // namespace ProxyPrefs
44 52
45 #endif // CHROME_BROWSER_PREFS_PROXY_PREFS_H_ 53 #endif // CHROME_BROWSER_PREFS_PROXY_PREFS_H_
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_service_unittest.cc ('k') | chrome/browser/prefs/proxy_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698