Upstream rewrite of Instant.

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 197 matching lines @@
   // Returns the current autocomplete result.  This logic should in the future
   // live in AutocompleteController but resides here for now.  This method is
   // used by AutomationProvider::AutocompleteEditGetMatches.
   const AutocompleteResult& result() const;
 
   // Called when the view is gaining focus.  |control_down| is whether the
   // control key is down (at the time we're gaining focus).
   void OnSetFocus(bool control_down);
 
   // Sent before |OnKillFocus| and before the popup is closed.
-  void OnWillKillFocus(gfx::NativeView view_gaining_focus);
+  void OnWillKillFocus();
 
   // Called when the view is losing focus.  Resets some state.
   void OnKillFocus();
 
   // Called when the user presses the escape key.  Decides what, if anything, to
   // revert about any current edits.  Returns whether the key was handled.
   bool OnEscapeKeyPressed();
 
   // Called when the user presses or releases the control key.  Changes state as
   // necessary.
@@ skipping 137 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 to 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 113 matching lines @@
   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_;

[sreeram, 2012/07/24 14:08:32]

We can get rid of this member now.

[Jered, 2012/07/24 15:24:34]

It's referenced in instant_browsertest and seems appropriate in context there.
I've updated this comment. Let me know if you can think of a better way.

 
   DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_