Autocomplete cleanup patch. Adds AutocompleteControllerDelegate in

addition to the notification. The notification is now only sent out
when done. Also makes the editmodel own the controller.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6519014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75126 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 759de98..5728bfd 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -426,10 +426,10 @@ void AutocompleteEditViewMac::UpdatePopup() {
 }
 
 void AutocompleteEditViewMac::ClosePopup() {
-  if (popup_view_->GetModel()->IsOpen())
+  if (model_->popup_model()->IsOpen())
     controller_->OnAutocompleteWillClosePopup();
 
-  popup_view_->GetModel()->StopAutocomplete();
+  model_->StopAutocomplete();
 }
 
 void AutocompleteEditViewMac::SetFocus() {
@@ -863,8 +863,8 @@ bool AutocompleteEditViewMac::OnDoCommandBySelector(SEL cmd) {
   if (cmd == @selector(deleteForward:)) {
     const NSUInteger modifiers = [[NSApp currentEvent] modifierFlags];
     if ((modifiers & NSShiftKeyMask) != 0) {
-      if (popup_view_->IsOpen()) {
-        popup_view_->GetModel()->TryDeletingCurrentItem();
+      if (model_->popup_model()->IsOpen()) {
+        model_->popup_model()->TryDeletingCurrentItem();
         return true;
       }
     }