summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 19:34:51 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 19:34:51 +0000
commit27e88494a3e1e3a509004d31ecd2a0eef0d55179 (patch)
tree6dfa44f7728dd42dac99c304f375cc2f696157b5 /components
parentfe8c59c89dee358251eb147cecf04b8b6dbc28bf (diff)
downloadchromium_src-27e88494a3e1e3a509004d31ecd2a0eef0d55179.zip
chromium_src-27e88494a3e1e3a509004d31ecd2a0eef0d55179.tar.gz
chromium_src-27e88494a3e1e3a509004d31ecd2a0eef0d55179.tar.bz2
Added support for additional popup-blocking policies on Android.
This platform also supports PopupsAllowedForUrls and PopupsBlockedForUrls. If these policies are enabled on the template then they'll be loaded by the cloud policy provider. BUG=341493 Review URL: https://codereview.chromium.org/169443003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/policy/resources/policy_templates.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index 95fbe68..c038b55 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -2562,6 +2562,7 @@
'chrome.*:11-',
'chrome_os:11-',
'ios:34-',
+ 'android:34-',
],
'features': {
'dynamic_refresh': True,
@@ -2585,6 +2586,7 @@
'chrome.*:11-',
'chrome_os:11-',
'ios:34-',
+ 'android:34-',
],
'features': {
'dynamic_refresh': True,