Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2038)

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 1230953005: Allow "Run all plugins this time" if managed setting is click to play. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
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 4b1c7c5c32959e7c2e3d233a0d0758c178d64819..6f7dbb145a867813ddf1e69127c84a2d0917355b 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -384,7 +384,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 {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698