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

Unified Diff: chrome/browser/policy/configuration_policy_store_interface.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/configuration_policy_store_interface.h
diff --git a/chrome/browser/policy/configuration_policy_store_interface.h b/chrome/browser/policy/configuration_policy_store_interface.h
index e690242b0366e86f258927dd4b5d1b4b58f8ed35..b7f2f0522e79803dd182325174cdd024b6e31820 100644
--- a/chrome/browser/policy/configuration_policy_store_interface.h
+++ b/chrome/browser/policy/configuration_policy_store_interface.h
@@ -27,6 +27,7 @@ enum ConfigurationPolicyType {
kPolicyDefaultSearchProviderEncodings,
kPolicyDisableSpdy,
kPolicyProxyMode,
+ kPolicyProxyServerMode,
kPolicyProxyServer,
kPolicyProxyPacUrl,
kPolicyProxyBypassList,
@@ -80,11 +81,11 @@ enum PolicyProxyModeType {
// Disable Proxy, connect directly.
kPolicyNoProxyServerMode = 0,
// Auto detect proxy or use specific PAC script if given.
- kPolicyAutoDetectProxyMode = 1,
+ kPolicyAutoDetectProxyServerMode = 1,
// Use manually configured proxy servers (fixed servers).
- kPolicyManuallyConfiguredProxyMode = 2,
+ kPolicyManuallyConfiguredProxyServerMode = 2,
// Use system proxy server.
- kPolicyUseSystemProxyMode = 3,
+ kPolicyUseSystemProxyServerMode = 3,
MODE_COUNT
};
« no previous file with comments | « chrome/browser/policy/configuration_policy_provider_win_unittest.cc ('k') | chrome/browser/prefs/pref_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698