Http Bad: Put icon on the left of http warning message on Views

chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.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/autofill/autofill_popup_view_cocoa.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
@@ skipping 41 matching lines @@
               index:(size_t)index
          rightAlign:(BOOL)rightAlign
              bounds:(NSRect)bounds
         textYOffset:(CGFloat)textYOffset;
 - (CGFloat)drawIconAtIndex:(size_t)index
                        atX:(CGFloat)x
                 rightAlign:(BOOL)rightAlign
                     bounds:(NSRect)bounds;
 - (CGFloat)drawSubtext:(NSString*)subtext
                    atX:(CGFloat)x
+                 index:(size_t)index
             rightAlign:(BOOL)rightAlign
                 bounds:(NSRect)bounds
            textYOffset:(CGFloat)textYOffset;
 
 // Returns the icon for the row with the given |index|, or |nil| if there is
 // none.
 - (NSImage*)iconAtIndex:(size_t)index;
 
 @end
 
@@ skipping 105 matching lines @@
             index:index
        rightAlign:isRTL
            bounds:bounds
       textYOffset:textYOffset];
 
   // Draw right side if isRTL == NO, left side if isRTL == YES.
   x = isRTL ? leftX : rightX;
   x = [self drawIconAtIndex:index atX:x rightAlign:!isRTL bounds:bounds];
   [self drawSubtext:subtext
                 atX:x
+              index:index
          rightAlign:!isRTL
              bounds:bounds
         textYOffset:textYOffset];
 }
 
 - (CGFloat)drawName:(NSString*)name
                 atX:(CGFloat)x
               index:(size_t)index
          rightAlign:(BOOL)rightAlign
              bounds:(NSRect)bounds
@@ skipping 38 matching lines @@
       respectFlipped:YES
                hints:nil];
 
     x += rightAlign ? -AutofillPopupLayoutModel::kIconPadding
                     : iconSize.width + AutofillPopupLayoutModel::kIconPadding;
     return x;
 }
 
 - (CGFloat)drawSubtext:(NSString*)subtext
                    atX:(CGFloat)x
+                 index:(size_t)index
             rightAlign:(BOOL)rightAlign
                 bounds:(NSRect)bounds
            textYOffset:(CGFloat)textYOffset {
   NSDictionary* subtextAttributes = [NSDictionary
       dictionaryWithObjectsAndKeys:controller_->layout_model()
-                                       .GetLabelFontList()
+                                       .GetLabelFontListForRow(index)
                                        .GetPrimaryFont()
                                        .GetNativeFont(),
                                    NSFontAttributeName, [self subtextColor],
                                    NSForegroundColorAttributeName, nil];
   NSSize subtextSize = [subtext sizeWithAttributes:subtextAttributes];
   x -= rightAlign ? subtextSize.width : 0;
   CGFloat y = bounds.origin.y + (bounds.size.height - subtextSize.height) / 2;
   y += textYOffset;
 
   [subtext drawAtPoint:NSMakePoint(x, y) withAttributes:subtextAttributes];
   x += rightAlign ? 0 : subtextSize.width;
   return x;
 }
 
 - (NSImage*)iconAtIndex:(size_t)index {
   const base::string16& icon = controller_->GetSuggestionAt(index).icon;
   if (icon.empty())
     return nil;
 
   int iconId = delegate_->GetIconResourceID(icon);
   DCHECK_NE(-1, iconId);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(iconId).ToNSImage();
 }
 
 @end