diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 11:20:57 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 11:20:57 +0000 |
| commit | 7edbfe40420637bf5cde9e6b20a96dcd28d0dd94 (patch) | |
| tree | 1f62e408931b6e1d5fc3b798a3b8e0525a928d59 /chrome/app | |
| parent | 8d04c19736f5c4b324675777721d439a46974290 (diff) | |
| download | chromium_src-7edbfe40420637bf5cde9e6b20a96dcd28d0dd94.zip chromium_src-7edbfe40420637bf5cde9e6b20a96dcd28d0dd94.tar.gz chromium_src-7edbfe40420637bf5cde9e6b20a96dcd28d0dd94.tar.bz2 | |
Fix setting a proxy configuration via policy that specifies a .pac file.
BUG=68099
TEST=manual testing of proxy policy
Review URL: http://codereview.chromium.org/6021010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/policy/policy_templates.grd | 6 | ||||
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd index 341c57d..ab256d5 100644 --- a/chrome/app/policy/policy_templates.grd +++ b/chrome/app/policy/policy_templates.grd @@ -857,12 +857,6 @@ templates and will be translated for each locale. --> It starts with <ph name="CHROMIUM_KEY">Software\Policies\Chromium</ph> for Chromium policies and with <ph name="GOOGLE_CHROME_KEY">Software\Policies\Google\Chrome</ph> for Google Chrome policies. </message> - <message name="IDS_POLICY_DOC_NOTE" - desc="Warning notice for policies in the generated policy documentation"> - NOTE: there are some issues about this policy, visit - <ph name="POLICY_TEMPLATE_DOWNLOAD_URL">$6<ex> - http://www.chromium.org/administrators/policy-list-3/serious-problem</ex></ph> for more details. - </message> <message name="IDS_POLICY_DOC_BACK_TO_TOP" desc="Text of a link in the generated policy documentation, that takes the user to the top of the page"> Back to top diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 7b352aa..e7a4463 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -194,9 +194,6 @@ 'annotations': { 'features': {'dynamic_refresh': 0}, 'example_value': True, - 'problem_href': - 'http://www.chromium.org/administrators/' - 'policy-list-3/metrics-reporting-enabled', } }, { |