Overhaul omnibox focus detection on Mac.

chrome/browser/autocomplete/autocomplete_edit_view_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_MAC_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
@@ skipping 62 matching lines @@
   virtual void UpdatePopup();
   virtual void ClosePopup();
   virtual void OnTemporaryTextMaybeChanged(const std::wstring& display_text,
                                            bool save_original_selection);
   virtual bool OnInlineAutocompleteTextMaybeChanged(
       const std::wstring& display_text, size_t user_text_length);
   virtual void OnRevertTemporaryText();
   virtual void OnBeforePossibleChange();
   virtual bool OnAfterPossibleChange();
 
-  // Helper functions which forward to |model_|, for use from
-  // AutocompleteEditHelper Objective-C class.
+  // Helper functions for use from AutocompleteEditHelper Objective-C
+  // class.
   void OnUpOrDownKeyPressed(bool up, bool by_page);
   void OnEscapeKeyPressed();
-  // Only forwards to |model_| if the field_ has focus.
-  void OnSetFocus(bool f);
-  void OnKillFocus();
+
+  // Called when editing begins in the field, and before the results
+  // of any editing are communicated to |model_|.
+  void OnWillBeginEditing();
+
+  // Called when editing ends in the field.
+  void OnDidEndEditing();
+
+  // Called when the window |field_| is in loses key to clean up
+  // visual state (such as closing the popup).
+  void OnDidResignKey();
+
   void AcceptInput(WindowOpenDisposition disposition, bool for_drop);
 
   // Helper for LocationBarBridge.
   void FocusLocation();
 
  private:
   // Returns the field's currently selected range.  Only valid if the
   // field has focus.
   NSRange GetSelectedRange() const;
 
+  // Returns true if |field_| is first-responder in the window.  Used
+  // in various DCHECKS to make sure code is running in appropriate
+  // situations.
+  bool IsFirstResponder() const;
+
   // Grab focus if needed and set the selection to |range|.
   void SetSelectedRange(const NSRange range);
 
   // Update the field with |display_text| and highlight the host and
   // scheme (if it's an URL or URL-fragment).
   void UpdateAndStyleText(const std::wstring& display_text);
 
   scoped_ptr<AutocompleteEditModel> model_;
   scoped_ptr<AutocompletePopupViewMac> popup_view_;
 
@@ skipping 16 matching lines @@
 
   // Tracking state before and after a possible change for reporting
   // to model_.
   NSRange selection_before_change_;
   std::wstring text_before_change_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewMac);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_MAC_H_