diff options
| author | Will Harris <wfh@chromium.org> | 2015-07-13 10:40:24 -0700 |
|---|---|---|
| committer | Will Harris <wfh@chromium.org> | 2015-07-13 17:43:16 +0000 |
| commit | c4380e429c1a0af880d394ce12c8fc4deba4edf0 (patch) | |
| tree | 15b6a99572bc79d453c2b3b855ebbc467fc278bd | |
| parent | 5b3188763b9419ec2c3ab1a87a067ee07bb027e6 (diff) | |
| download | chromium_src-c4380e429c1a0af880d394ce12c8fc4deba4edf0.zip chromium_src-c4380e429c1a0af880d394ce12c8fc4deba4edf0.tar.gz chromium_src-c4380e429c1a0af880d394ce12c8fc4deba4edf0.tar.bz2 | |
Merge M44: Allow "Run all plugins this time" if managed setting is click to play.
BUG=509169
TEST=set DefaultPluginsSetting to 3, visit site with Flash, verify "Run all plugins this time" link is enabled.
Review URL: https://codereview.chromium.org/1230953005
Cr-Commit-Position: refs/heads/master@{#338510}
(cherry picked from commit f71489f2413304bd5e9ff7ac58f96955eec91346)
Review URL: https://codereview.chromium.org/1240473002.
Cr-Commit-Position: refs/branch-heads/2403@{#493}
Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}
| -rw-r--r-- | chrome/browser/ui/content_settings/content_setting_bubble_model.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index bdc7df7..7617ef9 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc @@ -393,7 +393,8 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() { block_setting_ = setting; } - set_setting_is_managed(setting_source != SETTING_SOURCE_USER); + set_setting_is_managed(setting_source != SETTING_SOURCE_USER && + setting != CONTENT_SETTING_ASK); if (setting_source != SETTING_SOURCE_USER) { set_radio_group_enabled(false); } else { |