diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 11:32:54 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 11:32:54 +0000 |
| commit | aa4dc5e2e6917e9f3848adef838755e728c647e7 (patch) | |
| tree | bbb70f33ce42ed94c24d6d017d3685d23df2238b /chrome/browser/configuration_policy_store.h | |
| parent | 2ab5be46a52588cc0bd69bdd89de693bbac96f92 (diff) | |
| download | chromium_src-aa4dc5e2e6917e9f3848adef838755e728c647e7.zip chromium_src-aa4dc5e2e6917e9f3848adef838755e728c647e7.tar.gz chromium_src-aa4dc5e2e6917e9f3848adef838755e728c647e7.tar.bz2 | |
Add policy code for proxy configuration
Augment ProxyConfig to fetch its configuration from preferences that are initialized by settings and policy (rather than getting its config directly from settings). Add policies for everything that is needed to configure a ProxyConfig and wire the policies up to the corresponding preferences.
Also remove CookieMode policy, it's harder to get right than we naively thought.
BUG=43458
TEST=ChromeUrlRequestContextTest*:ConfigurationPolicyPrefStoreTest*
Review URL: http://codereview.chromium.org/2459001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/configuration_policy_store.h')
| -rw-r--r-- | chrome/browser/configuration_policy_store.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/configuration_policy_store.h b/chrome/browser/configuration_policy_store.h index 6b6461e..20d0b36 100644 --- a/chrome/browser/configuration_policy_store.h +++ b/chrome/browser/configuration_policy_store.h @@ -17,14 +17,22 @@ class ConfigurationPolicyStore { enum PolicyType { kPolicyHomePage, kPolicyHomepageIsNewTabPage, + kPolicyProxyServerMode, + kPolicyProxyServer, + kPolicyProxyPacUrl, + kPolicyProxyBypassList, kPolicyAlternateErrorPagesEnabled, kPolicySearchSuggestEnabled, kPolicyDnsPrefetchingEnabled, kPolicySafeBrowsingEnabled, kPolicyMetricsReportingEnabled, - kPolicyCookiesMode }; + static const int kPolicyNoProxyServerMode = 0; + static const int kPolicyAutoDetectProxyMode = 1; + static const int kPolicyManuallyConfiguredProxyMode = 2; + static const int kPolicyUseSystemProxyMode = 3; + // A |ConfigurationPolicyProvider| specifes the value of a policy setting // through a call to |Apply|. // The configuration policy pref store takes over the ownership of |value|. |