Omnibox refactor, moved OnResultChanged to OmniboxController

chrome/browser/ui/omnibox/omnibox_controller.h

Index: chrome/browser/ui/omnibox/omnibox_controller.h
diff --git a/chrome/browser/ui/omnibox/omnibox_controller.h b/chrome/browser/ui/omnibox/omnibox_controller.h
index 13f223fb75ba8302126b9b77863c353d61a3822c..c5cb725875dfed2399e2e20d304ba7f43ab72ea3 100644
--- a/chrome/browser/ui/omnibox/omnibox_controller.h
+++ b/chrome/browser/ui/omnibox/omnibox_controller.h
@@ -10,7 +10,11 @@
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
 
 class AutocompleteController;
+struct AutocompleteMatch;
+class AutocompleteResult;
+class GURL;
 class OmniboxEditModel;
+class OmniboxPopupModel;
 class Profile;
 
 // This class sits between the OmniboxEditModel and AutocompleteController.
@@ -31,12 +35,34 @@ class OmniboxController : public AutocompleteControllerDelegate {
   // AutocompleteControllerDelegate:
   virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
 
+  void set_popup_model(OmniboxPopupModel* popup_model) {
+    popup_ = popup_model;
+  }
+
+  // TODO: The edit and popup should be siblings owned by the LocationBarView,
+  // making this accessor unnecessary.
+  OmniboxPopupModel* popup_model() const { return popup_; }
+
+  void ClearPopupKeywordMode() const;
+
+  void InfoForCurrentSelection(AutocompleteMatch* match,
+                               GURL* alternate_nav_url) const;
+
+  const AutocompleteResult& result() const;
+
+  // TODO(beaudoin): Make private once OmniboxEditModel no longer refers to it.
+  void DoPreconnect(const AutocompleteMatch& match);
+
  private:
   // Weak, it owns us.
   // TODO(beaudoin): When we have a clearer picture of the interface between
   //     this and OmniboxEditModel define and use a Delegate interface instead.
   OmniboxEditModel* omnibox_edit_model_;
 
+  Profile* profile_;
+
+  OmniboxPopupModel* popup_;
+
   scoped_ptr<AutocompleteController> autocomplete_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxController);