Fix text wrapping problem in the download_item_controller on Yosemite.

chrome/browser/ui/cocoa/download/download_item_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/download/download_item_controller.h"
 
 #include "base/mac/bundle_locations.h"
+#include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_shelf_context_menu.h"
 #include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
 #import "chrome/browser/themes/theme_properties.h"
@@ skipping 104 matching lines @@
   [self updateExperienceSamplingEvent:ExperienceSamplingEvent::kIgnore];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [progressView_ setController:nil];
   [[self view] removeFromSuperview];
   [super dealloc];
 }
 
 - (void)awakeFromNib {
   [progressView_ setController:self];
 
+  // The new system font on Yosemite brings slightly different font metrics.
+  // The |dangerousDownloadLabel_| is 22 points high with two lines of text
+  // in the nib, but on Yosemite it needs 24 points to hold that same text.
+  // See http://crbug.com/454782 .
+  if (base::mac::IsOSYosemite()) {

[Nico, 2015/02/11 03:45:53]

IsOSYosemiteOrLater() probably?

[shrike, 2015/02/11 16:45:35]

Done.

+    NSRect frame = [dangerousDownloadLabel_ frame];
+    frame.origin.y -= 1.0;
+    frame.size.height += 2.0;
+    [dangerousDownloadLabel_ setFrame:frame];
+  }
   GTMUILocalizerAndLayoutTweaker* localizerAndLayoutTweaker =
       [[[GTMUILocalizerAndLayoutTweaker alloc] init] autorelease];
   [localizerAndLayoutTweaker applyLocalizer:localizer_ tweakingUI:[self view]];
 
   [self setStateFromDownload:bridge_->download_model()];
 
   bridge_->LoadIcon();
   [self updateToolTip];
 }
 
@@ skipping 231 matching lines @@
   base::scoped_nsobject<DownloadShelfContextMenuController> menuController(
       [[DownloadShelfContextMenuController alloc]
         initWithItemController:self
                   withDelegate:nil]);
   [NSMenu popUpContextMenu:[menuController menu]
                  withEvent:[NSApp currentEvent]
                    forView:[self view]];
 }
 
 @end