[Autofill] Move functions from the AutofillPopupController to AutofillPopupLayoutModel

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_view_helper.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/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 
 using autofill::AutofillPopupView;
+using autofill::AutofillPopupViewHelper;
 
 @interface AutofillPopupViewCocoa ()
 
 #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.
@@ skipping 33 matching lines @@
 
 @end
 
 @implementation AutofillPopupViewCocoa
 
 #pragma mark -
 #pragma mark Initialisers
 
 - (id)initWithFrame:(NSRect)frame {
   NOTREACHED();
-  return [self initWithController:NULL frame:frame];
+  return [self initWithController:NULL frame:frame delegate:NULL];
 }
 
 - (id)initWithController:(autofill::AutofillPopupController*)controller
-                   frame:(NSRect)frame {
+                   frame:(NSRect)frame
+                delegate:(autofill::AutofillPopupViewCocoaDelegate*)delegate {
   self = [super initWithDelegate:controller frame:frame];
-  if (self)
+  if (self) {
     controller_ = controller;
+    delegate_ = delegate;
+  }
 
   return self;
 }
 
 #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) {
     // Skip rows outside of the dirty rect.
-    NSRect rowBounds =
-        NSRectFromCGRect(controller_->GetRowBounds(i).ToCGRect());
+    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.
@@ skipping 15 matching lines @@
 #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 {
-  NSRect dirty_rect =
-      NSRectFromCGRect(controller_->GetRowBounds(row).ToCGRect());
+  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
                         bounds:(NSRect)bounds
                       selected:(BOOL)isSelected
                    textYOffset:(CGFloat)textYOffset {
   // If this row is selected, highlight it.
   if (isSelected) {
     [[self highlightColor] set];
     [NSBezierPath fillRect:bounds];
   }
 
   BOOL isRTL = controller_->IsRTL();
 
   // The X values of the left and right borders of the autofill widget.
-  CGFloat leftX = NSMinX(bounds) + AutofillPopupView::kEndPadding;
-  CGFloat rightX = NSMaxX(bounds) - AutofillPopupView::kEndPadding;
+  CGFloat leftX = NSMinX(bounds) + AutofillPopupViewHelper::kEndPadding;
+  CGFloat rightX = NSMaxX(bounds) - AutofillPopupViewHelper::kEndPadding;
 
   // Draw left side if isRTL == NO, right side if isRTL == YES.
   CGFloat x = isRTL ? rightX : leftX;
   [self drawName:name
               atX:x
             index:index
        rightAlign:isRTL
            bounds:bounds
       textYOffset:textYOffset];
 
@@ skipping 42 matching lines @@
   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 ? -AutofillPopupView::kIconPadding
-                    : iconSize.width + AutofillPopupView::kIconPadding;
+    x += rightAlign ? -AutofillPopupViewHelper::kIconPadding
+                    : iconSize.width + AutofillPopupViewHelper::kIconPadding;
     return x;
 }
 
 - (CGFloat)drawSubtext:(NSString*)subtext
                    atX:(CGFloat)x
             rightAlign:(BOOL)rightAlign
                 bounds:(NSRect)bounds
            textYOffset:(CGFloat)textYOffset {
   NSDictionary* subtextAttributes =
       [NSDictionary dictionaryWithObjectsAndKeys:
@@ skipping 10 matching lines @@
   [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 = controller_->GetIconResourceID(icon);
+  int iconId = delegate_->GetIconResourceID(icon);
   DCHECK_NE(-1, iconId);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(iconId).ToNSImage();
 }
 
 @end