Persist the Instant API to committed search result pages.

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 295 matching lines @@
 
 bool OmniboxEditModel::UseVerbatimInstant() {
 #if defined(OS_MACOSX)
   // TODO(suzhe): Fix Mac port to display Instant suggest in a separated NSView,
   // so that we can display Instant suggest along with composition text.
   const AutocompleteInput& input = autocomplete_controller_->input();
   if (input.prevent_inline_autocomplete())
     return true;
 #endif
 
-  // The value of input.prevent_inline_autocomplete() is determined by
+  // The value of input.prevent_inline_autocomplete() is determined by the
   // following conditions:
-  // 1. If the caret is at the end of the text (checked below).
+  // 1. If the caret is at the end of the text.
   // 2. If it's in IME composition mode.
-  // As we use a separated widget for displaying the Instant suggest, it won't
-  // interfere with IME composition, so we don't need to care about the value of
+  // We send the caret position to Instant (so it can determine #1 itself), and
+  // we use a separated widget for displaying the Instant suggest (so it doesn't
+  // interfere with #2). So, we don't need to care about the value of
   // input.prevent_inline_autocomplete() here.
-  if (view_->DeleteAtEndPressed() || (popup_->selected_line() != 0) ||
-      just_deleted_text_ || !inline_autocomplete_text_.empty())
-    return true;
-
-  size_t start, end;
-  view_->GetSelectionBounds(&start, &end);
-  return (start != end) || (start != view_->GetText().length());
+  return view_->DeleteAtEndPressed() || popup_->selected_line() != 0 ||
+         just_deleted_text_;
 }
 
 string16 OmniboxEditModel::GetDesiredTLD() const {
   // Tricky corner case: The user has typed "foo" and currently sees an inline
   // autocomplete suggestion of "foo.net".  He now presses ctrl-a (e.g. to
   // select all, on Windows).  If we treat the ctrl press as potentially for the
   // sake of ctrl-enter, then we risk "www.foo.com" being promoted as the best
   // match.  This would make the autocompleted text disappear, leaving our user
   // feeling very confused when the wrong text gets highlighted.
   //
@@ skipping 842 matching lines @@
   }
 }
 
 bool OmniboxEditModel::DoInstant(const AutocompleteMatch& match) {
   InstantController* instant = controller_->GetInstant();
   if (!instant || in_revert_)
     return false;
 
   // The two pieces of text we want to send Instant, viz., what the user has
   // typed, and the full omnibox text including any inline autocompletion.
-  string16 user_text = user_text_;
-  string16 full_text = user_text_ + inline_autocomplete_text_;
-
-  // If there's temporary text, that overrides the user_text. In this case, we
-  // should ignore any inline_autocomplete_text_, because it won't be visible.
-  if (has_temporary_text_)
-    user_text = full_text = CurrentMatch().fill_into_edit;
-
-  // Remove keyword if we're in keyword mode.
-  user_text = DisplayTextFromUserText(user_text);
-  full_text = DisplayTextFromUserText(full_text);
+  string16 user_text = has_temporary_text_ ?
+      match.fill_into_edit : DisplayTextFromUserText(user_text_);
+  string16 full_text = view_->GetText();
 
   // Remove "?" if we're in forced query mode.
   AutocompleteInput::RemoveForcedQueryStringIfNecessary(
       autocomplete_controller_->input().type(), &user_text);
   AutocompleteInput::RemoveForcedQueryStringIfNecessary(
       autocomplete_controller_->input().type(), &full_text);
 
-  return instant->Update(match, user_text, full_text, UseVerbatimInstant(),
-                         user_input_in_progress_, popup_->IsOpen());
+  size_t start, end;
+  view_->GetSelectionBounds(&start, &end);
+
+  return instant->Update(match, user_text, full_text, start, end,
+      UseVerbatimInstant(), user_input_in_progress_, popup_->IsOpen());
 }
 
 void OmniboxEditModel::DoPrerender(const AutocompleteMatch& match) {
   // Do not prerender if the destination URL is the same as the current URL.
   if (match.destination_url == PermanentURL())
     return;
   // It's possible the tab strip does not have an active tab contents, for
   // instance if the tab has been closed or on return from a sleep state
   // (http://crbug.com/105689)
   content::WebContents* tab = controller_->GetWebContents();
@@ skipping 49 matching lines @@
 }
 
 void OmniboxEditModel::ClassifyStringForPasteAndGo(
     const string16& text,
     AutocompleteMatch* match,
     GURL* alternate_nav_url) const {
   DCHECK(match);
   AutocompleteClassifierFactory::GetForProfile(profile_)->Classify(text,
       string16(), false, false, match, alternate_nav_url);
 }