1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 0a22805..d0d1db4 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -443,6 +443,10 @@ void AutocompleteEditViewMac::OnSetFocus(bool f) {
   model_->OnSetFocus(f);
 }
 void AutocompleteEditViewMac::OnKillFocus() {
+  // TODO(shess): This would seem to be a job for |model_|.
+  ClosePopup();
+
+  // Tell the model to reset itself.
   model_->OnKillFocus();
 }
 void AutocompleteEditViewMac::AcceptInput(
@@ -524,9 +528,11 @@ void AutocompleteEditViewMac::FocusLocation() {
   edit_view_->OnBeforePossibleChange();
 }
 
-- (void)controlTextDidEndEditing:(NSNotification*)aNotification {
+- (BOOL)control:(NSControl*)control textShouldEndEditing:(NSText*)fieldEditor {
   edit_view_->OnKillFocus();
 
+  return YES;
+
   // TODO(shess): Figure out where the selection belongs.  On GTK,
   // it's set to the start of the text.
 }