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

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

Issue 1237233002: Reland #1: mac: Migrate xibs to OSX 10.9.5, Xcode 5.1.1. (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 | « chrome/app/nibs/WrenchMenu.xib ('k') | content/shell/app/English.lproj/HttpAuth.xib » ('j') | 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 d9bf7b8e65126def02f823e98b9a3eac87dde6bd..e038e1d806f58d59d6033f479ec60e8d59e4f1d7 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
@@ -329,6 +329,19 @@ class ContentSettingBubbleWebContentsObserverBridge
const ContentSettingBubbleModel::RadioGroup& radio_group =
contentSettingBubbleModel_->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
+ // the font for each of the cells in a NSMatrix is identical, and is the font
+ // of the NSMatrix. This logic sets the font of NSMatrix to be that of its
+ // cells.
+ NSFont* font = nil;
+ for (NSCell* cell in [allowBlockRadioGroup_ cells]) {
+ if (!font)
+ font = [cell font];
+ DCHECK([font isEqual:[cell font]]);
+ }
+ [allowBlockRadioGroup_ setFont:font];
+
// Select appropriate radio button.
[allowBlockRadioGroup_ selectCellWithTag: radio_group.default_item + 1];
« no previous file with comments | « chrome/app/nibs/WrenchMenu.xib ('k') | content/shell/app/English.lproj/HttpAuth.xib » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698