Cleanup a bunch of TODO(shess).

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
@@ skipping 56 matching lines @@
 NSColor* BackgroundColor() {
   return [[NSColor controlBackgroundColor] colorWithAlphaComponent:kPopupAlpha];
 }
 NSColor* SelectedBackgroundColor() {
   return [[NSColor selectedControlColor] colorWithAlphaComponent:kPopupAlpha];
 }
 NSColor* HoveredBackgroundColor() {
   return [[NSColor controlHighlightColor] colorWithAlphaComponent:kPopupAlpha];
 }
 
-// TODO(shess): These are totally unprincipled.  I experimented with
-// +controlTextColor and the like, but found myself wondering whether
-// that was really appropriate.  Circle back after consulting with
-// someone more knowledgeable about the ins and outs of this.
 static const NSColor* ContentTextColor() {
   return [NSColor blackColor];
 }
 static const NSColor* URLTextColor() {
   return [NSColor colorWithCalibratedRed:0.0 green:0.55 blue:0.0 alpha:1.0];
 }
 static const NSColor* DescriptionTextColor() {
   return [NSColor darkGrayColor];
 }
 
@@ skipping 170 matching lines @@
       edit_view_(edit_view),
       field_(field),
       popup_(nil) {
   DCHECK(edit_view);
   DCHECK(edit_model);
   DCHECK(profile);
   edit_model->SetPopupModel(model_.get());
 }
 
 AutocompletePopupViewMac::~AutocompletePopupViewMac() {
-  // TODO(shess): Having to be aware of destructor ordering in this
-  // way seems brittle.  There must be a better way.
-
   // Destroy the popup model before this object is destroyed, because
   // it can call back to us in the destructor.
   model_.reset();
 
   // Break references to |this| because the popup may not be
   // deallocated immediately.
   AutocompleteMatrix* matrix = [popup_ contentView];
   DCHECK(matrix == nil || [matrix isKindOfClass:[AutocompleteMatrix class]]);
   [matrix setPopupView:NULL];
 }
@@ skipping 81 matching lines @@
     DCHECK(matrix == nil || [matrix isKindOfClass:[AutocompleteMatrix class]]);
     [matrix setPopupView:NULL];
 
     popup_.reset(nil);
 
     return;
   }
 
   CreatePopupIfNeeded();
 
-  // The popup's font is a slightly smaller version of what |field_|
-  // uses.
-  NSFont* fieldFont = [field_ font];
+  // The popup's font is a slightly smaller version of the field's.
+  NSFont* fieldFont = AutocompleteEditViewMac::GetFieldFont();
   const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust;
   gfx::Font resultFont = gfx::Font::CreateFont(
       base::SysNSStringToWide([fieldFont fontName]), (int)resultFontSize);
 
   AutocompleteMatrix* matrix = [popup_ contentView];
 
   // Calculate the width of the matrix based on backing out the
   // popup's border from the width of the field.  Would prefer to use
   // [matrix convertSize:fromView:] for converting from screen size,
   // but that doesn't work until the popup is on-screen (bug?).
@@ skipping 85 matching lines @@
     return SelectedBackgroundColor();
   } else if ([self isHighlighted]) {
     return HoveredBackgroundColor();
   }
   return BackgroundColor();
 }
 
 // The default NSButtonCell drawing leaves the image flush left and
 // the title next to the image.  This spaces things out to line up
 // with the star button and autocomplete field.
-// TODO(shess): Determine if the star button can change size (other
-// than scaling coordinates), in which case this needs to be more
-// dynamic.
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
   [[self backgroundColor] set];
   NSRectFill(cellFrame);
 
   // Put the image centered vertically but in a fixed column.
-  // TODO(shess) Currently, the images are all 16x16 png files, so
-  // left-justified works out fine.  If that changes, it may be
-  // appropriate to align them on their centers instead of their
-  // left-hand sides.
   NSImage* image = [self image];
   if (image) {
     NSRect imageRect = cellFrame;
     imageRect.size = [image size];
     imageRect.origin.y +=
         floor((NSHeight(cellFrame) - NSHeight(imageRect)) / 2);
     imageRect.origin.x += kLeftRightMargin;
     [image setFlipped:[controlView isFlipped]];
     [image drawInRect:imageRect
              fromRect:NSZeroRect  // Entire image
@@ skipping 208 matching lines @@
                        bottomRightCornerRadius:0.0];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end