summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/nibs/DownloadShelf.xib10
-rw-r--r--chrome/browser/cocoa/download_shelf_controller.mm3
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/app/nibs/DownloadShelf.xib b/chrome/app/nibs/DownloadShelf.xib
index fd17c97f..9d05154 100644
--- a/chrome/app/nibs/DownloadShelf.xib
+++ b/chrome/app/nibs/DownloadShelf.xib
@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9J61</string>
+ <string key="IBDocument.SystemVersion">9L31a</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
- <string key="IBDocument.AppKitVersion">949.46</string>
+ <string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -84,7 +84,7 @@
<object class="NSTextView" id="550190606">
<reference key="NSNextResponder" ref="581923208"/>
<int key="NSvFlags">2322</int>
- <string key="NSFrameSize">{182, 12}</string>
+ <string key="NSFrameSize">{182, 14}</string>
<reference key="NSSuperview" ref="581923208"/>
<object class="NSTextContainer" key="NSTextContainer" id="526453298">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -284,7 +284,7 @@
<nil key="NSDelegate"/>
</object>
</object>
- <string key="NSFrameSize">{182, 14}</string>
+ <string key="NSFrameSize">{182, 16}</string>
<reference key="NSSuperview" ref="433009119"/>
<reference key="NSNextKeyView" ref="550190606"/>
<reference key="NSDocView" ref="550190606"/>
@@ -316,7 +316,7 @@
<double key="NSPercent">9.456522e-01</double>
</object>
</object>
- <string key="NSFrame">{{266, 15}, {182, 14}}</string>
+ <string key="NSFrame">{{266, 14}, {182, 16}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSNextKeyView" ref="581923208"/>
<int key="NSsFlags">0</int>
diff --git a/chrome/browser/cocoa/download_shelf_controller.mm b/chrome/browser/cocoa/download_shelf_controller.mm
index a2fba89..16fc0c7 100644
--- a/chrome/browser/cocoa/download_shelf_controller.mm
+++ b/chrome/browser/cocoa/download_shelf_controller.mm
@@ -71,10 +71,13 @@ const NSTimeInterval kDownloadItemOpenDuration = 0.8;
[[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
[paragraphStyle.get() setAlignment:NSRightTextAlignment];
+ NSFont* font = [NSFont systemFontOfSize:
+ [NSFont systemFontSizeForControlSize:NSRegularControlSize]];
NSDictionary* linkAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
@"", NSLinkAttributeName,
[NSCursor pointingHandCursor], NSCursorAttributeName,
paragraphStyle.get(), NSParagraphStyleAttributeName,
+ font, NSFontAttributeName,
nil];
NSString* text =
base::SysWideToNSString(l10n_util::GetString(IDS_SHOW_ALL_DOWNLOADS));