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 1171 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();

[Jered, 2012/11/27 18:19:53]

I am mildly terrified by GetText(). It's platform dependent and has a vague
comment. Is it what we want here? (Do we not need DisplayTextFromUserText()?)

[sreeram, 2012/11/29 07:33:19]

Yeah. user_text_ (and things derived from it, such as DisplayTextFromUserText())
will return a blank string if the user is not typing. As you can see from the
table in InstantController::Update(), there are situations where
user_input_in_progress is false, yet we need to know what the omnibox is
showing.

 
   // 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());
 }
@@ skipping 58 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);
 }