diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 08:40:58 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 08:40:58 +0000 |
| commit | ce1850e90e8472a05fd9efdb8379c0d399d0be78 (patch) | |
| tree | 4d1c28169195a01381d23fac5b07187f0ef7ab25 /chrome/chrome_common.gypi | |
| parent | 817b6121b50d77b2eacc5ce594cc20fe4fddef6d (diff) | |
| download | chromium_src-ce1850e90e8472a05fd9efdb8379c0d399d0be78.zip chromium_src-ce1850e90e8472a05fd9efdb8379c0d399d0be78.tar.gz chromium_src-ce1850e90e8472a05fd9efdb8379c0d399d0be78.tar.bz2 | |
When a proxy command line switches are specified, policy admin warning shouldn't be shown
Removed the logic from the ConfigurationPolicyPrefStore that sets managed preferences, it's now completely handled by CommandLinePrefStore. Moved the detection of conflicting proxy settings between the managed and other stores into the PrefValueStore. Implemented a sentinel value that can be used by stores to signal that they are returning the default value. Changed managed store to use this sentinel to hide non-managed proxy settings proxy settings when proxy policy is specified.
BUG=54792
TEST=manual
Review URL: http://codereview.chromium.org/3367021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 00b42b6..463752c 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -273,6 +273,8 @@ 'common/plugin_messages.cc', 'common/plugin_messages.h', 'common/plugin_messages_internal.h', + 'common/pref_store.cc', + 'common/pref_store.h', 'common/render_messages.cc', 'common/render_messages.h', 'common/render_messages_params.cc', |