Omnibox refactor. Move StartAutocomplete and DoInstant to controller.

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"
 
 struct AutocompleteMatch;
 class AutocompleteResult;
 class GURL;
+class InstantController;
 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
 // is responsible of updating the omnibox content.
 // TODO(beaudoin): Keep on expanding this class so that OmniboxEditModel no
 //     longer needs to hold any reference to AutocompleteController. Also make
 //     this the point of contact between InstantController and OmniboxEditModel.
 //     As the refactor progresses, keep the class comment up-to-date to
 //     precisely explain what this class is doing.
 class OmniboxController : public AutocompleteControllerDelegate {
 
  public:
-  OmniboxController(OmniboxEditModel* omnibox_edit_model, Profile* profile);
+  OmniboxController(OmniboxEditModel* omnibox_edit_model,
+                    Profile* profile,
+                    InstantController* instant_controller);
   virtual ~OmniboxController();
 
+  void StartAutocomplete(string16 user_text,
+                         size_t cursor_position,
+                         bool prevent_inline_autocomplete,
+                         bool prefer_keyword,
+                         bool allow_exact_keyword_match) const;
+
   // AutocompleteControllerDelegate:
   virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
 
   AutocompleteController* autocomplete_controller() {
     return autocomplete_controller_.get();
   }
 
+  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);
+
   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_; }
 
   // 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;
+
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxController);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_