[Mac] Polish the infobars.

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

 // Copyright (c) 2011 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 <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/gfx/image/image.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace {
 // Durations set to match the default SlideAnimation duration.
 const float kAnimateOpenDuration = 0.12;
 const float kAnimateCloseDuration = 0.12;
+
+// The baseline shift for text in the NSTextView.
+const float kTextBaselineShift = -1.0;
 }
 
 // This simple subclass of |NSTextView| just doesn't show the (text) cursor
 // (|NSTextView| displays the cursor with full keyboard accessibility enabled).
 @interface InfoBarTextView : NSTextView
 - (void)fixupCursor;
 @end
 
 @implementation InfoBarTextView
 
@@ skipping 187 matching lines @@
 }
 
 - (void)setLabelToMessage:(NSString*)message {
   NSMutableDictionary* attributes = [NSMutableDictionary dictionary];
   NSFont* font = [NSFont labelFontOfSize:
       [NSFont systemFontSizeForControlSize:NSRegularControlSize]];
   [attributes setObject:font
                  forKey:NSFontAttributeName];
   [attributes setObject:[NSCursor arrowCursor]
                  forKey:NSCursorAttributeName];
+  [attributes setObject:[NSNumber numberWithFloat:kTextBaselineShift]
+                 forKey:NSBaselineOffsetAttributeName];
   scoped_nsobject<NSAttributedString> attributedString(
       [[NSAttributedString alloc] initWithString:message
                                       attributes:attributes]);
   [[label_.get() textStorage] setAttributedString:attributedString];
 }
 
 - (void)removeButtons {
   // Extend the label all the way across.
   NSRect labelFrame = [label_.get() frame];
   labelFrame.size.width = NSMaxX([cancelButton_ frame]) - NSMinX(labelFrame);
@@ skipping 68 matching lines @@
 - (void)setLabelToMessage:(NSString*)message
                  withLink:(NSString*)link
                  atOffset:(NSUInteger)linkOffset {
   if (linkOffset == std::wstring::npos) {
     // linkOffset == std::wstring::npos means the link should be right-aligned,
     // which is not supported on Mac (http://crbug.com/47728).
     NOTIMPLEMENTED();
     linkOffset = [message length];
   }
   // Create an attributes dictionary for the entire message.  We have
-  // to expicitly set the font the control's font.  We also override
-  // the cursor to give us the normal cursor rather than the text
-  // insertion cursor.
+  // to expicitly set the control's font.  We also override the cursor to give

[rohitrao (ping after 24h), 2011/08/09 17:10:09]

While you're here, s/expicitly/explicitly/

[Robert Sesek, 2011/08/09 17:48:33]

Done.

+  // us the normal cursor rather than the text insertion cursor.
   NSMutableDictionary* linkAttributes = [NSMutableDictionary dictionary];
   [linkAttributes setObject:[NSCursor arrowCursor]
                      forKey:NSCursorAttributeName];
   NSFont* font = [NSFont labelFontOfSize:
       [NSFont systemFontSizeForControlSize:NSRegularControlSize]];
   [linkAttributes setObject:font
                      forKey:NSFontAttributeName];
 
   // Create the attributed string for the main message text.
   scoped_nsobject<NSMutableAttributedString> infoText(
@@ skipping 12 matching lines @@
                      forKey:NSUnderlineStyleAttributeName];
   [linkAttributes setObject:[NSString string]  // dummy value
                      forKey:NSLinkAttributeName];
 
   // Insert the link text into the string at the appropriate offset.
   scoped_nsobject<NSAttributedString> attributedString(
       [[NSAttributedString alloc] initWithString:link
                                       attributes:linkAttributes]);
   [infoText.get() insertAttributedString:attributedString.get()
                                  atIndex:linkOffset];
+  // The entire text needs a baseline shift.
+  [infoText addAttribute:NSBaselineOffsetAttributeName
+                   value:[NSNumber numberWithDouble:kTextBaselineShift]
+                   range:NSMakeRange(0, [infoText length])];
+
   // Update the label view with the new text.
   [[label_.get() textStorage] setAttributedString:infoText];
 }
 
 - (NSPoint)pointForTipApex {
   BrowserWindowController* windowController =
       [containerController_ browserWindowController];
   if (!windowController) {
     // This should only happen in unit tests.
     return NSZeroPoint;
@@ skipping 184 matching lines @@
   LinkInfoBarController* controller =
       [[LinkInfoBarController alloc] initWithDelegate:this owner:owner];
   return new InfoBar(controller, this);
 }
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
   ConfirmInfoBarController* controller =
       [[ConfirmInfoBarController alloc] initWithDelegate:this owner:owner];
   return new InfoBar(controller, this);
 }