Omnibox refactor, moved OnResultChanged to OmniboxController

chrome/browser/ui/omnibox/omnibox_edit_model.h

Index: chrome/browser/ui/omnibox/omnibox_edit_model.h
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index dcff6e252fcce486f72d77d51f90b2f8eb9c2e99..5535a48311a5888fb370873c171d56c4cfb89414 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -89,12 +89,14 @@ class OmniboxEditModel {
   }
 
   void set_popup_model(OmniboxPopupModel* popup_model) {
-    popup_ = popup_model;
-  }
+    omnibox_controller_->set_popup_model(popup_model);

[Peter Kasting, 2013/05/22 23:56:54]

I have no idea whether this is possible but it'd be cool to nuke this and
instead pass the popup model to the omnibox controller at construction time or
something.

[beaudoin, 2013/05/23 14:16:41]

I'd love this, unfortunately they're on two totally different lifecycles and the
OmniboxController outlives the popup_model. It roughly works like this:
- OmniboxView owns OmniboxEditModel who owns OmniboxController
- OmniboxPopupView owns OmniboxPopupModel

I've been thinking of an OmniboxPopupModel that would outlive the PopupView (ie.
owned by OmniboxView or below) but I'm not sure it would be useful, besides
cleaning-up the lifecycle above.

[sreeram, 2013/05/23 14:18:45]

I wouldn't worry too much about this. One of the goals of this refactor is to
allow us to get to a state where we can get rid of the popup model and view
entirely.

+   }
 
   // TODO: The edit and popup should be siblings owned by the LocationBarView,
   // making this accessor unnecessary.
-  OmniboxPopupModel* popup_model() const { return popup_; }
+  OmniboxPopupModel* popup_model() const {
+    return omnibox_controller_->popup_model();
+  }
 
   OmniboxEditController* controller() const { return controller_; }
 
@@ -229,6 +231,9 @@ class OmniboxEditModel {
   // used to change user-visible behavior.
   bool AcceptKeyword(EnteredKeywordModeMethod entered_method);
 
+  // Accepts the current temporary text as the user text.
+  void AcceptTemporaryTextAsUserText();
+
   // Clears the current keyword.  |visible_text| is the (non-keyword) text
   // currently visible in the edit.
   void ClearKeyword(const string16& visible_text);
@@ -236,7 +241,9 @@ class OmniboxEditModel {
   // Returns the current autocomplete result.  This logic should in the future
   // live in AutocompleteController but resides here for now.  This method is
   // used by AutomationProvider::AutocompleteEditGetMatches.
-  const AutocompleteResult& result() const;
+  const AutocompleteResult& result() const {
+    return omnibox_controller_->result();
+  }
 
   // Called when the view is gaining focus.  |control_down| is whether the
   // control key is down (at the time we're gaining focus).
@@ -274,6 +281,9 @@ class OmniboxEditModel {
   // Returns true if pasting is in progress.
   bool is_pasting() const { return paste_state_ == PASTING; }
 
+  // TODO(beaudoin): Try not to expose this.
+  bool in_revert() const { return in_revert_; }
+
   // Called when the user presses up or down.  |count| is a repeat count,
   // negative for moving up, positive for moving down.
   virtual void OnUpOrDownKeyPressed(int count);
@@ -314,15 +324,20 @@ class OmniboxEditModel {
                              bool just_deleted_text,
                              bool allow_keyword_ui_change);
 
+  // TODO(beaudoin): Mac code still calls this here. We should try to untangle
+  // this.
   // Invoked when the popup has changed its bounds to |bounds|. |bounds| here
   // is in screen coordinates.
-  void OnPopupBoundsChanged(const gfx::Rect& bounds);
+  void OnPopupBoundsChanged(const gfx::Rect& bounds) {
+    omnibox_controller_->OnPopupBoundsChanged(bounds);
+  }
 
   // Called when the results have changed in the OmniboxController.
   void OnResultChanged(bool default_match_changed);
 
  private:
   friend class InstantTestBase;
+  friend class OmniboxControllerTest;
 
   enum PasteState {
     NONE,           // Most recent edit was not a paste.
@@ -361,9 +376,6 @@ class OmniboxEditModel {
   // Returns true if a keyword is selected.
   bool KeywordIsSelected() const;
 
-  // Turns off keyword mode for the current match.
-  void ClearPopupKeywordMode() const;
-
   // Conversion between user text and display text. User text is the text the
   // user has input. Display text is the text being shown in the edit. The
   // two are different if a keyword is selected.
@@ -429,8 +441,6 @@ class OmniboxEditModel {
 
   OmniboxView* view_;
 
-  OmniboxPopupModel* popup_;
-
   OmniboxEditController* controller_;
 
   scoped_ptr<OmniboxCurrentPageDelegate> delegate_;