diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-10 20:13:43 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-10 20:13:43 +0000 |
| commit | bafcf6f0634c5bb455db506ed70a979a3c9955e6 (patch) | |
| tree | d30f9052044a033a9a4a05c32695fbea698dca5b | |
| parent | e5a131ce40277e58996ea7a983fb49316ff94843 (diff) | |
| download | chromium_src-bafcf6f0634c5bb455db506ed70a979a3c9955e6.zip chromium_src-bafcf6f0634c5bb455db506ed70a979a3c9955e6.tar.gz chromium_src-bafcf6f0634c5bb455db506ed70a979a3c9955e6.tar.bz2 | |
Merge r249979: Enable DefaultPopupSetting policy on Android.
BUG=340704
Review URL: https://codereview.chromium.org/131643006
Conflicts:
components/policy/resources/policy_templates.json
Review URL: https://codereview.chromium.org/156963004
git-svn-id: svn://svn.chromium.org/chrome/branches/1750_77/src@250189 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | components/policy/resources/policy_templates.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json index ffb91d5..eba5ac7 100644 --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json @@ -2143,7 +2143,11 @@ 'caption': '''Do not allow any site to show popups''', }, ], - 'supported_on': ['chrome.*:10-', 'chrome_os:11-'], + 'supported_on': [ + 'chrome.*:10-', + 'chrome_os:11-', + 'android:33-', + ], 'features': { 'dynamic_refresh': True, 'per_profile': True, |