Cleanup a bunch of TODO(shess).

chrome/browser/autocomplete/autocomplete_edit_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_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
@@ skipping 142 matching lines @@
     } else {
       NOTREACHED()
           << "Missing image for " << base::SysNSStringToUTF8(image_name);
     }
   }
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNSImageNamed(resource_id);
 }
 
-// TODO(shess): AutocompletePopupViewMac doesn't really need an
-// NSTextField.  It wants to know where the position the popup, what
-// font to use, and it also needs to be able to attach the popup to
-// the window |field_| is in.
 AutocompleteEditViewMac::AutocompleteEditViewMac(
     AutocompleteEditController* controller,
     ToolbarModel* toolbar_model,
     Profile* profile,
     CommandUpdater* command_updater,
     AutocompleteTextField* field)
     : model_(new AutocompleteEditModel(this, controller, profile)),
       popup_view_(new AutocompletePopupViewMac(this, model_.get(), profile,
                                                field)),
       controller_(controller),
       toolbar_model_(toolbar_model),
       command_updater_(command_updater),
       field_(field),
       line_height_(0) {
   DCHECK(controller);
   DCHECK(toolbar_model);
   DCHECK(profile);
   DCHECK(command_updater);
   DCHECK(field);
   [field_ setObserver:this];
 
   // Needed so that editing doesn't lose the styling.
   [field_ setAllowsEditingTextAttributes:YES];
 
   // Get the appropriate line height for the font that we use.
-  NSFont* font = ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont).nativeFont();
   scoped_nsobject<NSLayoutManager>
       layoutManager([[NSLayoutManager alloc] init]);
   [layoutManager setUsesScreenFonts:YES];
-  line_height_ = [layoutManager defaultLineHeightForFont:font];
+  line_height_ = [layoutManager defaultLineHeightForFont:GetFieldFont()];
   DCHECK(line_height_ > 0);
 }
 
 AutocompleteEditViewMac::~AutocompleteEditViewMac() {
-  // TODO(shess): Having to be aware of destructor ordering in this
-  // way seems brittle.  There must be a better way.
-
   // Destroy popup view before this object in case it tries to call us
   // back in the destructor.  Likewise for destroying the model before
   // this object.
   popup_view_.reset();
   model_.reset();
 
   // Disconnect from |field_|, it outlives this object.
   [field_ setObserver:NULL];
 }
 
@@ skipping 265 matching lines @@
     ApplyTextAttributes(GetText(), storage);
 
     [storage endEditing];
   } else {
     SetText(GetText());
   }
 }
 
 void AutocompleteEditViewMac::ApplyTextAttributes(
     const std::wstring& display_text, NSMutableAttributedString* as) {
-  NSFont* font = ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont).nativeFont();
-  [as addAttribute:NSFontAttributeName value:font
+  [as addAttribute:NSFontAttributeName value:GetFieldFont()
              range:NSMakeRange(0, [as length])];
 
   // Make a paragraph style locking in the standard line height as the maximum,
   // otherwise the baseline may shift "downwards".
   scoped_nsobject<NSMutableParagraphStyle>
       paragraph_style([[NSMutableParagraphStyle alloc] init]);
   [paragraph_style setMaximumLineHeight:line_height_];
   [as addAttribute:NSParagraphStyleAttributeName value:paragraph_style
              range:NSMakeRange(0, [as length])];
 
@@ skipping 176 matching lines @@
 
   if (cmd == @selector(scrollPageUp:)) {
     model_->OnUpOrDownKeyPressed(-model_->result().size());
     return true;
   }
 
   if (cmd == @selector(cancelOperation:)) {
     return model_->OnEscapeKeyPressed();
   }
 
-  if (cmd == @selector(insertTab:)) {
+  if (cmd == @selector(insertTab:) ||
+      cmd == @selector(insertTabIgnoringFieldEditor:)) {
     if (model_->is_keyword_hint() && !model_->keyword().empty()) {
       model_->AcceptKeyword();
       return true;
     }
   }
 
-  // TODO(shess): Option-tab, would normally insert a literal tab
-  // character.  Consider combining with -insertTab:
-  if (cmd == @selector(insertTabIgnoringFieldEditor:)) {
-    return true;
-  }
-
   // |-noop:| is sent when the user presses Cmd+Return. Override the no-op
   // behavior with the proper WindowOpenDisposition.
   NSEvent* event = [NSApp currentEvent];
   if (cmd == @selector(insertNewline:) ||
      (cmd == @selector(noop:) && [event keyCode] == kVK_Return)) {
     WindowOpenDisposition disposition =
         event_utils::WindowOpenDispositionFromNSEvent(event);
     model_->AcceptInput(disposition, false);
     // Opening a URL in a background tab should also revert the omnibox contents
     // to their original state.  We cannot do a blanket revert in OpenURL()
@@ skipping 220 matching lines @@
     clipboard->ReadBookmark(NULL, &url_str);
     // pass resulting url string through GURL to normalize
     GURL url(url_str);
     if (url.is_valid()) {
       return UTF8ToWide(url.spec());
     }
   }
 
   return std::wstring();
 }
+
+// static
+NSFont* AutocompleteEditViewMac::GetFieldFont() {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  return rb.GetFont(ResourceBundle::BaseFont).nativeFont();
+}