Create an autofill Suggestion class

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/popup_constants.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
+#include "components/autofill/core/browser/suggestion.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 using autofill::AutofillPopupView;
 
 @interface AutofillPopupViewCocoa ()
@@ skipping 67 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_->names().size(); ++i) {
+  for (size_t i = 0; i < controller_->GetLineCount(); ++i) {
     // Skip rows outside of the dirty rect.
     NSRect rowBounds =
         NSRectFromCGRect(controller_->GetRowBounds(i).ToCGRect());
     if (!NSIntersectsRect(rowBounds, dirtyRect))
       continue;
+    const autofill::Suggestion& suggestion = controller_->GetSuggestionAt(i);
 
-    if (controller_->identifiers()[i] == autofill::POPUP_ITEM_ID_SEPARATOR) {
+    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;
     BOOL imageFirst = NO;
-    if (controller_->identifiers()[i] ==
-        autofill::POPUP_ITEM_ID_MAC_ACCESS_CONTACTS) {
+    if (suggestion.frontend_id == autofill::POPUP_ITEM_ID_MAC_ACCESS_CONTACTS) {
       // Due to the weighting of the asset used for this autofill entry, the
       // text needs to be bumped up by 1 pt to make it look vertically aligned.
       textYOffset = -1;
       imageFirst = YES;
     }
 
-    NSString* name = SysUTF16ToNSString(controller_->names()[i]);
-    NSString* subtext = SysUTF16ToNSString(controller_->subtexts()[i]);
+    NSString* value = SysUTF16ToNSString(controller_->GetElidedValueAt(i));
+    NSString* label = SysUTF16ToNSString(controller_->GetElidedLabelAt(i));
     BOOL isSelected = static_cast<int>(i) == controller_->selected_line();
-    [self drawSuggestionWithName:name
-                         subtext:subtext
+    [self drawSuggestionWithName:value
+                         subtext:label
                            index:i
                           bounds:rowBounds
                         selected:isSelected
                       imageFirst:imageFirst
                      textYOffset:textYOffset];
   }
 }
 
 #pragma mark -
 #pragma mark Public API:
@@ skipping 58 matching lines @@
 - (CGFloat)drawName:(NSString*)name
                 atX:(CGFloat)x
               index:(size_t)index
          rightAlign:(BOOL)rightAlign
              bounds:(NSRect)bounds
         textYOffset:(CGFloat)textYOffset {
   NSColor* nameColor =
       controller_->IsWarning(index) ? [self warningColor] : [self nameColor];
   NSDictionary* nameAttributes =
       [NSDictionary dictionaryWithObjectsAndKeys:
-           controller_->GetNameFontListForRow(index).GetPrimaryFont().
+           controller_->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];
 
@@ skipping 23 matching lines @@
     return x;
 }
 
 - (CGFloat)drawSubtext:(NSString*)subtext
                    atX:(CGFloat)x
             rightAlign:(BOOL)rightAlign
                 bounds:(NSRect)bounds
            textYOffset:(CGFloat)textYOffset {
   NSDictionary* subtextAttributes =
       [NSDictionary dictionaryWithObjectsAndKeys:
-           controller_->subtext_font_list().GetPrimaryFont().GetNativeFont(),
+           controller_->GetLabelFontList().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 {
-  if (controller_->icons()[index].empty())
+  const base::string16& icon = controller_->GetSuggestionAt(index).icon;
+  if (icon.empty())
     return nil;
 
-  int iconId = controller_->GetIconResourceID(controller_->icons()[index]);
+  int iconId = controller_->GetIconResourceID(icon);
   DCHECK_NE(-1, iconId);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(iconId).ToNSImage();
 }
 
 @end