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/common/pref_names.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/common/pref_names.h')
| -rw-r--r-- | chrome/common/pref_names.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 2346981..0e91b2b 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -329,6 +329,12 @@ extern const wchar_t kCloudPrintAuthToken[]; extern const wchar_t kCloudPrintXMPPAuthToken[]; extern const wchar_t kCloudPrintEmail[]; +extern const wchar_t kNoProxyServer[]; +extern const wchar_t kProxyAutoDetect[]; +extern const wchar_t kProxyServer[]; +extern const wchar_t kProxyPacUrl[]; +extern const wchar_t kProxyBypassList[]; + } // namespace prefs #endif // CHROME_COMMON_PREF_NAMES_H_ |