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

Unified Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

Issue 2153393002: Cocoa: Enable controls in the content settings popup based on enterprise settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 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/cocoa/content_settings/content_setting_bubble_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
index 263255625e8a5ac505bd8775d299040e51f90d4e..d22342117b84979dbb9ae8b600294c0caf02bb3f 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
@@ -323,8 +323,10 @@ const ContentTypeToNibPath kNibPaths[] = {
- (void)initializeRadioGroup {
// NOTE! Tags in the xib files must match the order of the radio buttons
// passed in the radio_group and be 1-based, not 0-based.
+ const ContentSettingBubbleModel::BubbleContent& bubble_content =
+ contentSettingBubbleModel_->bubble_content();
const ContentSettingBubbleModel::RadioGroup& radio_group =
- contentSettingBubbleModel_->bubble_content().radio_group;
+ bubble_content.radio_group;
// Xcode 5.1 Interface Builder doesn't allow a font property to be set for
// NSMatrix. The implementation of GTMUILocalizerAndLayoutTweaker assumes that
@@ -338,6 +340,7 @@ const ContentTypeToNibPath kNibPaths[] = {
DCHECK([font isEqual:[cell font]]);
}
[allowBlockRadioGroup_ setFont:font];
+ [allowBlockRadioGroup_ setEnabled:bubble_content.radio_group_enabled];
// Select appropriate radio button.
[allowBlockRadioGroup_ selectCellWithTag: radio_group.default_item + 1];
« 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