Remove Instant v1 API.

chrome/browser/ui/omnibox/omnibox_edit_model.h

 // Copyright (c) 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 64 matching lines @@
   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();
 
   // 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, SkBitmap* favicon);
 
-  // Returns true if a verbatim query should be used for instant. A verbatim
+  // 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();
 
   // If the user presses ctrl-enter, it means "add .com to the the end".  The
   // desired TLD is the TLD the user desires to add to the end of the current
   // input, if any, based on their control key state and any other actions
   // they've taken.
   string16 GetDesiredTLD() const;
 
@@ skipping 34 matching lines @@
   void SetUserText(const string16& text);
 
   // Calls through to SearchProvider::FinalizeInstantQuery.
   // If |skip_inline_autocomplete| is true then the |suggest_text| will be
   // turned into final text instead of inline autocomplete suggest.
   void FinalizeInstantQuery(const string16& input_text,
                             const string16& suggest_text,
                             bool skip_inline_autocomplete);
 
   // Sets the suggestion text.
-  void SetSuggestedText(const string16& text,
-                        InstantCompleteBehavior behavior);
+  void SetSuggestedText(const string16& text, InstantCompleteBehavior behavior);
 
   // Commits the suggested text. If |skip_inline_autocomplete| is true then the
   // suggested text will be committed as final text as if it's inputted by the
   // user, rather than as inline autocomplete suggest.
   // Returns true if the text was committed.
   // TODO: can the return type be void?
   bool CommitSuggestedText(bool skip_inline_autocomplete);
 
-  // Accepts the currently showing instant preview, if any, and returns true.
-  // Returns false if there is no instant preview showing.
+  // Accepts the currently showing Instant preview, if any, and returns true.
+  // Returns false if there is no Instant preview showing.
   bool AcceptCurrentInstantPreview();
 
-  // Invoked any time the text may have changed in the edit. Updates instant and
+  // Invoked any time the text may have changed in the edit. Updates Instant and
   // notifies the controller.
   void OnChanged();
 
   // Reverts the edit model back to its unedited state (permanent text showing,
   // no user input in progress).
   void Revert();
 
   // Directs the popup to start autocomplete.
   void StartAutocomplete(bool has_selected_text,
                          bool prevent_inline_autocomplete) const;
@@ skipping 105 matching lines @@
                              size_t selection_start,
                              size_t selection_end,
                              bool selection_differs,
                              bool text_differs,
                              bool just_deleted_text,
                              bool allow_keyword_ui_change);
 
   // Invoked when the popup is going to change its bounds to |bounds|.
   void PopupBoundsChangedTo(const gfx::Rect& bounds);
 
-#if defined(UNIT_TEST)
-  InstantCompleteBehavior instant_complete_behavior() const {
-    return instant_complete_behavior_;
-  }
-#endif
-
  private:
   enum PasteState {
     NONE,           // Most recent edit was not a paste.
     PASTING,        // In the middle of doing a paste. We need this intermediate
                     // state because OnPaste() does the actual detection of
                     // paste, but OnAfterPossibleChange() has to update the
                     // paste state for every edit. If OnPaste() set the state
                     // directly to PASTED, OnAfterPossibleChange() wouldn't know
                     // whether that represented the current edit or a past one.
     PASTED,         // Most recent edit was a paste.
@@ skipping 70 matching lines @@
   // Checks whether the user inserted a space into |old_text| and by doing so
   // created a |new_text| that looks like "<keyword> <search phrase>".
   bool CreatedKeywordSearchByInsertingSpaceInMiddle(
       const string16& old_text,
       const string16& new_text,
       size_t caret_position) const;
 
   // Notifies the SearchTabHelper that autocomplete state has changed.
   void NotifySearchTabHelper();
 
-  // Tries to start an instant preview for |match|. Returns true if instant
-  // processed the match.
-  bool DoInstant(const AutocompleteMatch& match, string16* suggested_text);
+  // Tries to start an Instant preview for |match|. Returns true if Instant
+  // processed the match. |suggested_text| should initially contain the current
+  // inline autocomplete text. Instant will replace it with new suggested text
+  // and set |complete_behavior| accordingly.
+  bool DoInstant(const AutocompleteMatch& match,
+                 string16* suggested_text,
+                 InstantCompleteBehavior* complete_behavior);
 
   // Starts a prerender for the given |match|.
   void DoPrerender(const AutocompleteMatch& match);
 
   // Starts a DNS prefetch for the given |match|.
   void DoPreconnect(const AutocompleteMatch& match);
 
   // Checks if a given character is a valid space character for accepting
   // keyword.
   static bool IsSpaceCharForAcceptingKeyword(wchar_t c);
@@ skipping 101 matching lines @@
   string16 keyword_;
 
   // True if the keyword associated with this match is merely a hint, i.e. the
   // user hasn't actually selected a keyword yet.  When this is true, we can use
   // keyword_ to show a "Press <tab> to search" sort of hint.
   bool is_keyword_hint_;
 
   Profile* profile_;
 
   // This is needed as prior to accepting the current text the model is
-  // reverted, which triggers resetting instant. We don't want to update instant
+  // reverted, which triggers resetting Instant. We don't want to update Instant
   // in this case, so we use the flag to determine if this is happening.
   bool in_revert_;
 
   // Indicates if the upcoming autocomplete search is allowed to be treated as
   // 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_;
 
-  // Last value of InstantCompleteBehavior supplied to |SetSuggestedText|.
-  InstantCompleteBehavior instant_complete_behavior_;
-
   DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_