Omnibox refactor. OmniboxController now holds an AutocompleteMatch.

chrome/browser/ui/omnibox/omnibox_edit_model.h

 // Copyright 2012 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_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 78 matching lines @@
 
   // Returns the current state.  This assumes we are switching tabs, and changes
   // the internal state appropriately.
   const State GetStateForTabSwitch();
 
   // Restores local state from the saved |state|.
   void RestoreState(const State& state);
 
   // Returns the match for the current text. If the user has not edited the text
   // this is the match corresponding to the permanent text.
-  AutocompleteMatch CurrentMatch();
+  AutocompleteMatch CurrentMatch() const;
 
   // Called when the user wants to export the entire current text as a URL.
   // Sets the url, and if known, the title and favicon.
   void GetDataForURLExport(GURL* url, string16* title, gfx::Image* favicon);
 
   // Returns true if the current edit contents will be treated as a
   // URL/navigation, as opposed to a search.
   bool CurrentTextIsURL() const;
 
   // Returns the match type for the current edit contents.
@@ skipping 21 matching lines @@
   // change should be immediately user-visible, because either the user is not
   // editing or the edit does not have focus.
   bool UpdatePermanentText(const string16& new_permanent_text);
 
   // Returns the URL corresponding to the permanent text.
   GURL PermanentURL();
 
   // Sets the user_text_ to |text|.  Only the View should call this.
   void SetUserText(const string16& text);
 
-  // Calls through to SearchProvider::FinalizeInstantQuery.
-  void FinalizeInstantQuery(const string16& input_text,
-                            const InstantSuggestion& suggestion);
-
   // Sets the suggestion text.
   void SetInstantSuggestion(const InstantSuggestion& suggestion);
 
   // Commits the gray suggested text as if it's been input by the user.
   // Returns true if the text was committed.
   // TODO: can the return type be void?
   bool CommitSuggestedText();
 
   // Invoked any time the text may have changed in the edit. Updates Instant and
   // notifies the controller.
@@ skipping 145 matching lines @@
                              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) {
     omnibox_controller_->OnPopupBoundsChanged(bounds);
   }
 
-  // Called when the results have changed in the OmniboxController.
-  void OnResultChanged(bool default_match_changed);
+  // Called when the current match has changed in the OmniboxController.
+  void OnCurrentMatchChanged(bool is_temporary_set_by_instant);
+
+  // Access the current view text.
+  string16 GetViewText() const;
+
+  string16 user_text() const { return user_text_; }

[Peter Kasting, 2013/06/11 22:42:55]

Musing: It seems like we have some accessors above, and some here, and in
general the order of functions is fairly random.  It would be nice if the order
of function declarations here followed some sort of logical grouping.

[beaudoin, 2013/06/14 21:39:38]

I agree. Let's push that back to a future CL if you don't mind. Want me to add a
TODO?

 
   // TODO(beaudoin): We need this to allow OmniboxController access the
   // InstantController via OmniboxEditController, because the only valid pointer
   // to InstantController is kept in Browser. We should try to get rid of this,
   // maybe by ensuring InstantController lives as long as Browser.
   InstantController* GetInstantController() const;
 
  private:
   friend class InstantTestBase;
   friend class OmniboxControllerTest;
@@ skipping 233 matching lines @@
   // an exact keyword match.  If this is true then keyword mode will be
   // triggered automatically if the input is "<keyword> <search string>".  We
   // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true.
   // This has no effect if we're already in keyword mode.
   bool allow_exact_keyword_match_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_