Mac: Modify Omnibox to notice when the window loses key, too.

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"
@@ skipping 79 matching lines @@
 
 // Thin Obj-C bridge class that is the delegate of the omnibox field.
 // It intercepts various control delegate methods and vectors them to
 // the edit view.
 
 @interface AutocompleteFieldDelegate : NSObject {
  @private
   AutocompleteEditViewMac* edit_view_;  // weak, owns us.
 }
 - initWithEditView:(AutocompleteEditViewMac*)view;
+- (void)windowDidResignKey:(NSNotification*)notification;
+- (void)windowDidBecomeKey:(NSNotification*)notification;
 @end
 
 AutocompleteEditViewMac::AutocompleteEditViewMac(
     AutocompleteEditController* controller,
     ToolbarModel* toolbar_model,
     Profile* profile,
     CommandUpdater* command_updater,
     NSTextField* 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);
   DCHECK(profile);
   DCHECK(command_updater);
   DCHECK(field);
   [field_ setDelegate:edit_helper_];
 
   // Needed so that editing doesn't lose the styling.
   [field_ setAllowsEditingTextAttributes:YES];
+
+  // Track the window's key status for signalling focus changes to
+  // |model_|.
+  NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
+  [nc addObserver:edit_helper_
+         selector:@selector(windowDidResignKey:) 
+             name:NSWindowDidResignKeyNotification
+           object:[field_ window]];
+  [nc addObserver:edit_helper_
+         selector:@selector(windowDidBecomeKey:) 
+             name:NSWindowDidBecomeKeyNotification
+           object:[field_ window]];
 }
 
 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 field_ from edit_helper_ so that we don't get calls
   // after destruction.
   [field_ setDelegate:nil];
+
+  // Disconnect notifications so they don't signal a dead object.
+  [[NSNotificationCenter defaultCenter] removeObserver:edit_helper_];
 }
 
 void AutocompleteEditViewMac::SaveStateToTab(TabContents* tab) {
   DCHECK(tab);
 
   NSRange range;
   if (model_->has_focus()) {
     range = GetSelectedRange();
   } else {
     // If we are not focussed, there is no selection.  Manufacture
@@ skipping 283 matching lines @@
 }
 
 void AutocompleteEditViewMac::OnUpOrDownKeyPressed(bool up, bool by_page) {
   const int count = by_page ? model_->result().size() : 1;
   model_->OnUpOrDownKeyPressed(up ? -count : count);
 }
 void AutocompleteEditViewMac::OnEscapeKeyPressed() {
   model_->OnEscapeKeyPressed();
 }
 void AutocompleteEditViewMac::OnSetFocus(bool f) {
-  model_->OnSetFocus(f);
+  // Only forward if we actually do have the focus.
+  if ([field_ currentEditor]) {
+    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(
     WindowOpenDisposition disposition, bool for_drop) {
@@ skipping 76 matching lines @@
 
 - (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.
 }
 
+// Signal that we've lost focus when the window resigns key.
+- (void)windowDidResignKey:(NSNotification*)notification {
+  edit_view_->OnKillFocus();
+}
+
+// Signal that we may have regained focus.
+- (void)windowDidBecomeKey:(NSNotification*)notification {
+  edit_view_->OnSetFocus(false);
+}
+
 @end