[Mac] Refactor location-bar autocomplete cell classes.

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2009 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 "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
+#include "chrome/browser/cocoa/autocomplete_text_field.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 // Focus-handling between |field_| and |model_| is a bit subtle.
 // Other platforms detect change of focus, which is inconvenient
 // without subclassing NSTextField (even with a subclass, the use of a
 // field editor may complicate things).
 //
 // |model_| doesn't actually do anything when it gains focus, it just
 // initializes.  Visible activity happens only after the user edits.
 // NSTextField delegate receives messages around starting and ending
@@ skipping 97 matching lines @@
 // the edit view.
 
 @interface AutocompleteFieldDelegate : NSObject {
  @private
   AutocompleteEditViewMac* edit_view_;  // weak, owns us.
 }
 - initWithEditView:(AutocompleteEditViewMac*)view;
 - (void)windowDidResignKey:(NSNotification*)notification;
 @end
 
+// 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,
-    NSTextField* field)
+    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),
       edit_helper_([[AutocompleteFieldDelegate alloc] initWithEditView:this]) {
   DCHECK(controller);
   DCHECK(toolbar_model);
@@ skipping 371 matching lines @@
   // We should only arrive here when the field is focussed.
   DCHECK(IsFirstResponder());
 
   model_->OnEscapeKeyPressed();
 }
 
 void AutocompleteEditViewMac::OnWillBeginEditing() {
   // We should only arrive here when the field is focussed.
   DCHECK([field_ currentEditor]);
 
-  // TODO(shess): Having the control key depressed changes the desired
-  // TLD for autocomplete, which changes the results.  Not sure if we
-  // can detect that without subclassing NSTextField.
+  // TODO(shess): Detect control-key situation.  Since this code is
+  // called on first edit, not on receipt of focus, it may be that we
+  // cannot correctly handle this without refactoring.
   const bool controlDown = false;
   model_->OnSetFocus(controlDown);
 
   // Capture the current state.
   OnBeforePossibleChange();
 }
 
 void AutocompleteEditViewMac::OnDidEndEditing() {
   ClosePopup();
 
@@ skipping 84 matching lines @@
   // TODO(shess): Figure out where the selection belongs.  On GTK,
   // it's set to the start of the text.
 }
 
 // Signal that we've lost focus when the window resigns key.
 - (void)windowDidResignKey:(NSNotification*)notification {
   edit_view_->OnDidResignKey();
 }
 
 @end