Add EV certificate text to the Mac location bar...

chrome/browser/cocoa/autocomplete_text_field_cell.mm

 // Copyright (c) 2009 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/cocoa/autocomplete_text_field_cell.h"
 
+#include "app/gfx/font.h"
+#include "app/resource_bundle.h"
 #import "base/logging.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 
 namespace {
 
 const NSInteger kBaselineAdjust = 2;
 
 // How far to offset the keyword token into the field.
 const NSInteger kKeywordXOffset = 3;
 
@@ skipping 16 matching lines @@
 // above the lowercase ascender as below the baseline.  A better
 // technique would be nice to have, though.
 const NSInteger kKeywordHintImageBaseline = -6;
 
 // Offset from the bottom of the field for drawing decoration text.
 // TODO(shess): Somehow determine the baseline for the text field and
 // use that.
 const NSInteger kBaselineOffset = 4;
 
 // The amount of padding on either side reserved for drawing the hint icon
-const NSInteger kHintIconHorizontalPad = 5;
+const NSInteger kHintIconHorizontalPad = 3;
+
+// How far to shift bounding box of hint icon label down from top of field.
+const NSInteger kHintIconLabelYOffset = 7;
 
 }  // namespace
 
 @implementation AutocompleteTextFieldCell
 
 @synthesize fieldEditorNeedsReset = fieldEditorNeedsReset_;
 
 // @synthesize doesn't seem to compile for this transition.
 - (NSAttributedString*)keywordString {
   return keywordString_.get();
@@ skipping 98 matching lines @@
 
 - (void)clearKeywordAndHint {
   if (keywordString_ || hintString_) {
     keywordString_.reset();
     hintString_.reset();
 
     fieldEditorNeedsReset_ = YES;
   }
 }
 
-- (void)setHintIcon:(NSImage*)icon {
-  if (icon != hintIcon_) {
+- (void)setHintIcon:(NSImage*)icon
+              label:(NSString*)label
+              color:(NSColor*)color {
+  // Create an attributed string for the label, if a label was given.
+  NSAttributedString* as = nil;
+  if (label) {
+    DCHECK(color);
+    NSFont *baseFont = [self font];
+    NSFont *font = [NSFont fontWithDescriptor:[baseFont fontDescriptor]
+                                         size:[baseFont pointSize] - 2.0];
+    NSDictionary* attributes =
+        [NSDictionary dictionaryWithObjectsAndKeys:
+         color, NSForegroundColorAttributeName,
+         font, NSFontAttributeName,
+         NULL];
+    as = [[[NSAttributedString alloc] initWithString:label
+                                          attributes:attributes] autorelease];
+  }
+
+  // Did the icon change? Is there a label now but there wasn't before,
+  // or vice-versa? Did the label change?
+  if (icon != hintIcon_.get() || (as && !hintIconLabel_.get()) ||
+      (!as && hintIconLabel_.get()) ||
+      (as && ![hintIconLabel_.get() isEqualToAttributedString:as])) {
+    hintIconLabel_.reset([as retain]);
     hintIcon_.reset([icon retain]);
     if (!keywordString_ && !hintString_) {
+      // Redraw if the icon is visible.
       fieldEditorNeedsReset_ = YES;
     }
   }
 }
 
 // TODO(shess): This code is manually drawing the cell's border area,
 // but otherwise the cell assumes -setBordered:YES for purposes of
 // calculating things like the editing area.  This is probably
 // incorrect.  I know that this affects -drawingRectForBounds:.
 
@@ skipping 56 matching lines @@
     // TODO(shess): This could be better.  There's support for a
     // "short" version of the keyword string, work that in in a
     // follow-on pass.
     if (keywordWidth < NSWidth(cellFrame)) {
       textFrame.origin.x += keywordWidth;
       textFrame.size.width = NSMaxX(cellFrame) - NSMinX(textFrame);
     }
   } else if (hintIcon_) {
     CGFloat width = [hintIcon_ size].width;
     width += kHintIconHorizontalPad * 2;
+    if (hintIconLabel_) {
+      width += ceil([hintIconLabel_ size].width) + kHintXOffset;
+    }
     if (width < NSWidth(cellFrame)) {
       textFrame.size.width -= width;
     }
   }
 
   return textFrame;
 }
 
 // For NSTextFieldCell this is the area within the borders.  For our
 // purposes, we count the info decorations as being part of the
 // border.
 - (NSRect)drawingRectForBounds:(NSRect)theRect {
   return [super drawingRectForBounds:[self textFrameForFrame:theRect]];
 }
 
 - (NSRect)hintImageFrameForFrame:(NSRect)cellFrame {
   // We'll draw the entire image
   const NSSize imageRect([hintIcon_ size]);
 
-  // Move the rect that we're drawing into to the far right
+  CGFloat labelWidth = 0;
+  if (hintIconLabel_) {
+    labelWidth = ceil([hintIconLabel_ size].width) + kHintXOffset;
+  }
+
+  // Move the rect that we're drawing into to the far right, minus
+  // enough space for the label (if present)
   cellFrame.origin.x += cellFrame.size.width - imageRect.width;
+  cellFrame.origin.x -= labelWidth;
   // Add back the padding
   cellFrame.origin.x -= kHintIconHorizontalPad;
 
   // Center the image vertically in the frame
   cellFrame.origin.y +=
       floor((cellFrame.size.height - imageRect.height) / 2);
 
   // Set the drawing size to the image size
   cellFrame.size = imageRect;
 
@@ skipping 36 matching lines @@
   [path stroke];
 
   // Draw text w/in the rectangle.
   infoFrame.origin.x += 4.0;
   infoFrame.origin.y += 1.0;
   [keywordString_.get() drawInRect:infoFrame];
 }
 
 - (void)drawHintIconWithFrame:(NSRect)cellFrame
                        inView:(NSView*)controlView {
+  // If there's a label, draw it to the right of the icon.
+  CGFloat labelWidth = 0;
+  if (hintIconLabel_) {
+    labelWidth = ceil([hintIconLabel_ size].width) + kHintXOffset;
+    NSRect textFrame(NSMakeRect(NSMaxX(cellFrame) - labelWidth,
+                                cellFrame.origin.y + kHintIconLabelYOffset,
+                                labelWidth,
+                                cellFrame.size.height - kHintIconLabelYOffset));
+    [hintIconLabel_.get() drawInRect:textFrame];
+  }
+
   // We'll draw the entire image
   NSRect imageRect = NSZeroRect;
   imageRect.size = [hintIcon_ size];
   const NSRect hintFrame([self hintImageFrameForFrame:cellFrame]);
-
   [hintIcon_ setFlipped:[controlView isFlipped]];
   [hintIcon_ drawInRect:hintFrame
                fromRect:imageRect
               operation:NSCompositeSourceOver
                fraction:1.0];
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   if (hintString_) {
     [self drawHintWithFrame:cellFrame inView:controlView];
   } else if (keywordString_) {
     [self drawKeywordWithFrame:cellFrame inView:controlView];
   } else if (hintIcon_) {
     [self drawHintIconWithFrame:cellFrame inView:controlView];
   }
 
   [super drawInteriorWithFrame:cellFrame inView:controlView];
 }
 
 - (void)resetCursorRect:(NSRect)cellFrame inView:(NSView *)controlView {
   [super resetCursorRect:[self textCursorFrameForFrame:cellFrame]
                   inView:controlView];
 }
 
 @end