Uses child views in Autofill Popup so we can trigger

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/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 24 matching lines @@
 
 #pragma mark -
 #pragma mark Private methods
 
 // Draws an Autofill suggestion in the given |bounds|, labeled with the given
 // |name| and |subtext| hint.  If the suggestion |isSelected|, then it is drawn
 // with a highlight.  |index| determines the font to use, as well as the icon,
 // if the row requires it -- such as for credit cards.
 - (void)drawSuggestionWithName:(NSString*)name
                        subtext:(NSString*)subtext
-                         index:(size_t)index
+                         index:(int)index

[groby-ooo-7-16, 2017/03/20 20:42:55]

If we absolutely must change to int (and if we keep the old API, we don't),
please take it all the way for Cocoa and make the parameter NSInteger

[csashi, 2017/03/20 21:41:51]

Done.

                         bounds:(NSRect)bounds
                       selected:(BOOL)isSelected
                    textYOffset:(CGFloat)textYOffset;
 
 // This comment block applies to all three draw* methods that follow.
 // If |rightAlign| == YES.
 //   Draws the widget with right border aligned to |x|.
 //   Returns the x value of left border of the widget.
 // If |rightAlign| == NO.
 //   Draws the widget with left border aligned to |x|.
 //   Returns the x value of right border of the widget.
 - (CGFloat)drawName:(NSString*)name
                 atX:(CGFloat)x
-              index:(size_t)index
+              index:(int)index
          rightAlign:(BOOL)rightAlign
              bounds:(NSRect)bounds
         textYOffset:(CGFloat)textYOffset;
-- (CGFloat)drawIconAtIndex:(size_t)index
+- (CGFloat)drawIconAtIndex:(int)index
                        atX:(CGFloat)x
                 rightAlign:(BOOL)rightAlign
                     bounds:(NSRect)bounds;
 - (CGFloat)drawSubtext:(NSString*)subtext
                    atX:(CGFloat)x
-                 index:(size_t)index
+                 index:(int)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;
+- (NSImage*)iconAtIndex:(int)index;
 
 @end
 
 @implementation AutofillPopupViewCocoa
 
 #pragma mark -
 #pragma mark Initialisers
 
 - (id)initWithFrame:(NSRect)frame {
   NOTREACHED();
@@ skipping 15 matching lines @@
 #pragma mark -
 #pragma mark NSView implementation:
 
 - (void)drawRect:(NSRect)dirtyRect {
   // If the view is in the process of being destroyed, don't bother drawing.
   if (!controller_)
     return;
 
   [self drawBackgroundAndBorder];
 
-  for (size_t i = 0; i < controller_->GetLineCount(); ++i) {
+  for (int i = 0; i < controller_->GetLineCount(); ++i) {
     // Skip rows outside of the dirty rect.
     NSRect rowBounds = NSRectFromCGRect(delegate_->GetRowBounds(i).ToCGRect());
     if (!NSIntersectsRect(rowBounds, dirtyRect))
       continue;
     const autofill::Suggestion& suggestion = controller_->GetSuggestionAt(i);
 
     if (suggestion.frontend_id == autofill::POPUP_ITEM_ID_SEPARATOR) {
       [self drawSeparatorWithBounds:rowBounds];
       continue;
     }
 
     // Additional offset applied to the text in the vertical direction.
     CGFloat textYOffset = 0;
 
     NSString* value = SysUTF16ToNSString(controller_->GetElidedValueAt(i));
     NSString* label = SysUTF16ToNSString(controller_->GetElidedLabelAt(i));
-    BOOL isSelected = static_cast<int>(i) == controller_->selected_line();
+    BOOL isSelected =
+        controller_->selected_line() && i == *controller_->selected_line();
     [self drawSuggestionWithName:value
                          subtext:label
                            index:i
                           bounds:rowBounds
                         selected:isSelected
                      textYOffset:textYOffset];
   }
 }
 
 #pragma mark -
 #pragma mark Public API:
 
 - (void)controllerDestroyed {
   // Since the |controller_| either already has been destroyed or is about to
   // be, about the only thing we can safely do with it is to null it out.
   controller_ = NULL;
   [super delegateDestroyed];
 }
 
-- (void)invalidateRow:(size_t)row {
+- (void)invalidateRow:(int)row {
   NSRect dirty_rect = NSRectFromCGRect(delegate_->GetRowBounds(row).ToCGRect());
   [self setNeedsDisplayInRect:dirty_rect];
 }
 
 #pragma mark -
 #pragma mark Private API:
 
 - (void)drawSuggestionWithName:(NSString*)name
                        subtext:(NSString*)subtext
-                         index:(size_t)index
+                         index:(int)index
                         bounds:(NSRect)bounds
                       selected:(BOOL)isSelected
                    textYOffset:(CGFloat)textYOffset {
   BOOL isHTTPWarning =
       (controller_->GetSuggestionAt(index).frontend_id ==
        autofill::POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE);
 
   // If this row is selected, highlight it with this mac system color.
   // Otherwise the controller may have a specific background color for this
   // entry.
@@ skipping 34 matching lines @@
   [self drawSubtext:subtext
                 atX:x
               index:index
          rightAlign:!isRTL
              bounds:bounds
         textYOffset:textYOffset];
 }
 
 - (CGFloat)drawName:(NSString*)name
                 atX:(CGFloat)x
-              index:(size_t)index
+              index:(int)index
          rightAlign:(BOOL)rightAlign
              bounds:(NSRect)bounds
         textYOffset:(CGFloat)textYOffset {
   NSColor* nameColor = skia::SkColorToSRGBNSColor(
       ui::NativeTheme::GetInstanceForNativeUi()->GetSystemColor(
           controller_->layout_model().GetValueFontColorIDForRow(index)));
   NSDictionary* nameAttributes = [NSDictionary
       dictionaryWithObjectsAndKeys:controller_->layout_model()
                                        .GetValueFontListForRow(index)
                                        .GetPrimaryFont()
                                        .GetNativeFont(),
                                    NSFontAttributeName, nameColor,
                                    NSForegroundColorAttributeName, nil];
   NSSize nameSize = [name sizeWithAttributes:nameAttributes];
   x -= rightAlign ? nameSize.width : 0;
   CGFloat y = bounds.origin.y + (bounds.size.height - nameSize.height) / 2;
   y += textYOffset;
 
   [name drawAtPoint:NSMakePoint(x, y) withAttributes:nameAttributes];
 
   x += rightAlign ? 0 : nameSize.width;
   return x;
 }
 
-- (CGFloat)drawIconAtIndex:(size_t)index
+- (CGFloat)drawIconAtIndex:(int)index
                        atX:(CGFloat)x
                 rightAlign:(BOOL)rightAlign
                     bounds:(NSRect)bounds {
   NSImage* icon = [self iconAtIndex:index];
   if (!icon)
     return x;
   NSSize iconSize = [icon size];
   x -= rightAlign ? iconSize.width : 0;
   CGFloat y = bounds.origin.y + (bounds.size.height - iconSize.height) / 2;
     [icon drawInRect:NSMakeRect(x, y, iconSize.width, iconSize.height)
             fromRect:NSZeroRect
            operation:NSCompositeSourceOver
             fraction:1.0
       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
+                 index:(int)index
             rightAlign:(BOOL)rightAlign
                 bounds:(NSRect)bounds
            textYOffset:(CGFloat)textYOffset {
   NSDictionary* subtextAttributes = [NSDictionary
       dictionaryWithObjectsAndKeys:controller_->layout_model()
                                        .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 {
+- (NSImage*)iconAtIndex:(int)index {
   const int kHttpWarningIconWidth = 16;
   const base::string16& icon = controller_->GetSuggestionAt(index).icon;
   if (icon.empty())
     return nil;
 
   // For the Form-Not-Secure warning about password/credit card fields on HTTP
   // pages, reuse the omnibox vector icons.
   if (icon == base::ASCIIToUTF16("httpWarning")) {
     return NSImageFromImageSkiaWithColorSpace(
         gfx::CreateVectorIcon(toolbar::kHttpIcon, kHttpWarningIconWidth,
                               gfx::kChromeIconGrey),
         base::mac::GetSRGBColorSpace());
   }
 
   if (icon == base::ASCIIToUTF16("httpsInvalid")) {
     return NSImageFromImageSkiaWithColorSpace(
         gfx::CreateVectorIcon(toolbar::kHttpsInvalidIcon, kHttpWarningIconWidth,
                               gfx::kGoogleRed700),
         base::mac::GetSRGBColorSpace());
   }
 
   int iconId = delegate_->GetIconResourceID(icon);
   DCHECK_NE(-1, iconId);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(iconId).ToNSImage();
 }
 
 @end