Omnibox refactor. OmniboxController now holds an AutocompleteMatch.

chrome/browser/ui/omnibox/omnibox_controller.h

 // Copyright 2013 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_CONTROLLER_H_
 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
+#include "chrome/browser/autocomplete/autocomplete_match.h"
 
 struct AutocompleteMatch;
 class AutocompleteResult;
 class GURL;
 class InstantController;
+struct InstantSuggestion;
 class OmniboxEditModel;
 class OmniboxPopupModel;
 class Profile;
 
 namespace gfx {
 class Rect;
 }
 
 // This class controls the various services that can modify the content
 // for the omnibox, including AutocompleteController and InstantController. It
@@ skipping 26 matching lines @@
   bool DoInstant(const AutocompleteMatch& match,
                  string16 user_text,
                  string16 full_text,
                  size_t selection_start,
                  size_t selection_end,
                  bool user_input_in_progress,
                  bool in_escape_handler,
                  bool just_deleted_text,
                  bool keyword_is_selected);
 
+  // Calls through to SearchProvider::FinalizeInstantQuery.
+  void FinalizeInstantQuery(const string16& input_text,
+                            const InstantSuggestion& suggestion);
+
+  // Sets the suggestion text.
+  void SetInstantSuggestion(const InstantSuggestion& suggestion);
+
+  // Set |current_match_| to an invalid value, indicating that we do not yet
+  // have a valid match for the current text in the omnibox.
+  void InvalidateCurrentMatch();
+
   void set_popup_model(OmniboxPopupModel* popup_model) {
     popup_ = popup_model;
   }
 
   // TODO(beaudoin): The edit and popup model should be siblings owned by the
   // LocationBarView, making this accessor unnecessary.
   OmniboxPopupModel* popup_model() const { return popup_; }
 
+  const AutocompleteMatch& current_match() const { return current_match_; }
+
   // Turns off keyword mode for the current match.
   void ClearPopupKeywordMode() const;
 
   const AutocompleteResult& result() const {
     return autocomplete_controller_->result();
   }
 
   // TODO(beaudoin): Make private once OmniboxEditModel no longer refers to it.
   void DoPreconnect(const AutocompleteMatch& match);
 
   // TODO(beaudoin): Make private once OmniboxEditModel no longer refers to it.
   // Invoked when the popup has changed its bounds to |bounds|. |bounds| here
   // is in screen coordinates.
   void OnPopupBoundsChanged(const gfx::Rect& bounds);
 
  private:
 
   // Returns true if a verbatim query should be used for Instant. A verbatim
   // query is forced in certain situations, such as pressing delete at the end
   // of the edit.
   bool UseVerbatimInstant(bool just_deleted_text) const;
 
   // Access the instant controller from the OmniboxEditModel. We need to do this
   // because the only valid pointer to InstantController is kept in Browser,
   // which OmniboxEditModel has some ways of reaching.
   InstantController* GetInstantController() const;
 
+  // Creates an AutocompleteMatch for an instant result and sets it into
+  // |current_match_|.
+  void CreateAndSetInstantMatch(string16 query_string,
+                                string16 input_text,
+                                AutocompleteMatchType::Type match_type);
   // Weak, it owns us.
   // TODO(beaudoin): Consider defining a delegate to ease unit testing.
   OmniboxEditModel* omnibox_edit_model_;
 
   Profile* profile_;
 
   OmniboxPopupModel* popup_;
 
+  InstantController* instant_controller_;
+
   scoped_ptr<AutocompleteController> autocomplete_controller_;
 
+  // TODO(beaudoin): This AutocompleteMatch is used to let the OmniboxEditModel
+  // know what it should display. Not every field is required for that purpose,
+  // but the ones specifically needed are unclear. We should therefore spend
+  // some time to extract these fields and use a tighter structure here.
+  AutocompleteMatch current_match_;
+
   DISALLOW_COPY_AND_ASSIGN(OmniboxController);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_