diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 22:41:55 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 22:41:55 +0000 |
| commit | 06c1732ba7d024e0144759597df38289f7cc82da (patch) | |
| tree | dbb764ae23bf12916e5d8094d87602a980971e49 /chrome/app/policy | |
| parent | d4d304a5532717d92098d66bf1063c687d764833 (diff) | |
| download | chromium_src-06c1732ba7d024e0144759597df38289f7cc82da.zip chromium_src-06c1732ba7d024e0144759597df38289f7cc82da.tar.gz chromium_src-06c1732ba7d024e0144759597df38289f7cc82da.tar.bz2 | |
Cloud print proxy enablement under policy control.
Implement policy control of the cloud print policy, in just the UI part for now
(in the service requires some refactoring).
BUG=59769
TEST=Change the policy and verifying that the UI in Under the Hood gets disabled or enabled properly, with the policy notification at the top.
Review URL: http://codereview.chromium.org/6344013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 14 | ||||
| -rw-r--r-- | chrome/app/policy/syntax_check_policy_template_json.py | 5 |
2 files changed, 18 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 3341040..4fc6b18 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -261,6 +261,20 @@ If this setting is disabled, users cannot print from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. Printing is disabled in the wrench menu, extensions, JavaScript applications, etc. It is still possible to print from plugins that bypass <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> while printing. For example certain Flash applications has the print option in their context menu, and that will not be disabled.''', }, { + 'name': 'CloudPrintProxyEnabled', + 'type': 'main', + 'supported_on': [], + 'features': {'dynamic_refresh': 1}, + 'future': True, + 'example_value': True, + 'caption': '''Enable <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> proxy''', + 'desc': ''' Enables <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to act as a proxy between <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> and legacy printers connected to the machine. + + If this setting is enabled or not configured, users can enable the cloud print proxy by authentication with their Google account. + + If this setting is disabled, users cannot enable the proxy, and the machine will not be allowed to share it's printers with <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph>.''', + }, + { 'name': 'SafeBrowsingEnabled', 'type': 'main', 'supported_on': ['chrome.*:8-'], diff --git a/chrome/app/policy/syntax_check_policy_template_json.py b/chrome/app/policy/syntax_check_policy_template_json.py index 04d69c9..d332254 100644 --- a/chrome/app/policy/syntax_check_policy_template_json.py +++ b/chrome/app/policy/syntax_check_policy_template_json.py @@ -90,7 +90,7 @@ class PolicyTemplateChecker(object): for key in policy: if key not in ('name', 'type', 'caption', 'desc', 'supported_on', 'label', 'policies', 'items', 'example_value', 'features', - 'deprecated'): + 'deprecated', 'future'): self.warning_count += 1 print ('In policy %s: Warning: Unknown key: %s' % (policy.get('name'), key)) @@ -118,6 +118,9 @@ class PolicyTemplateChecker(object): # If 'deprecated' is present, it must be a bool. self._CheckContains(policy, 'deprecated', bool, True) + # If 'future' is present, it must be a bool. + self._CheckContains(policy, 'future', bool, True) + if policy_type == 'group': # Groups must not be nested. |