Pass user_text and full_text explicitly to Instant.

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // 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.
 
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 165 matching lines @@
     view_->OnAfterPossibleChange();
   } else if (popup_->IsOpen()) {
     SearchProvider* search_provider =
         autocomplete_controller_->search_provider();
     // There may be no providers during testing; guard against that.
     if (search_provider)
       search_provider->FinalizeInstantQuery(input_text, suggest_text);
   }
 }
 
 void OmniboxEditModel::SetSuggestedText(const string16& text,

[Peter Kasting, 2012/08/24 23:13:08]

Is this function now only called from OnWillKillFocus()?  Maybe it can be
simplified/inlined?

[sreeram, 2012/08/24 23:22:33]

No, it's called from the UI code as well. When Instant calls
delegate_->SetSuggestedText, that call goes to Browser -> LocationBar (each
platform variant) -> OmniboxEditModel.

                                         InstantCompleteBehavior behavior) {
   if (behavior == INSTANT_COMPLETE_NOW) {
     if (!text.empty())
       FinalizeInstantQuery(view_->GetText(), text, false);
     else
       view_->SetInstantSuggestion(text, false);
   } else {
     DCHECK((behavior == INSTANT_COMPLETE_DELAYED) ||
            (behavior == INSTANT_COMPLETE_NEVER));
     view_->SetInstantSuggestion(text, behavior == INSTANT_COMPLETE_DELAYED);
@@ skipping 39 matching lines @@
     // before it's needed. Note: This event is triggered as part of startup when
     // the initial tab transitions to the start page.
     recommended_action =
         action_predictor->RecommendAction(user_text_, current_match);
   }
 
   UMA_HISTOGRAM_ENUMERATION("AutocompleteActionPredictor.Action",
                             recommended_action,
                             AutocompleteActionPredictor::LAST_PREDICT_ACTION);
 
-  string16 suggested_text;
-  InstantCompleteBehavior complete_behavior = INSTANT_COMPLETE_NOW;
-
-  if (DoInstant(current_match, &suggested_text, &complete_behavior)) {
-    SetSuggestedText(suggested_text, complete_behavior);
-  } else {
+  if (!DoInstant(current_match)) {
     switch (recommended_action) {
       case AutocompleteActionPredictor::ACTION_PRERENDER:
         DoPrerender(current_match);
         break;
       case AutocompleteActionPredictor::ACTION_PRECONNECT:
         DoPreconnect(current_match);
         break;
       case AutocompleteActionPredictor::ACTION_NONE:
         break;
       default:
@@ skipping 840 matching lines @@
           GetKeywordForText(keyword).empty();
 }
 
 void OmniboxEditModel::NotifySearchTabHelper() {
   if (controller_->GetTabContents()) {
     controller_->GetTabContents()->search_tab_helper()->
         OmniboxEditModelChanged(user_input_in_progress_, !in_revert_);
   }
 }
 
-bool OmniboxEditModel::DoInstant(
-    const AutocompleteMatch& match,
-    string16* suggested_text,
-    InstantCompleteBehavior* complete_behavior) {
-  DCHECK(suggested_text);
-  DCHECK(complete_behavior);
-
+bool OmniboxEditModel::DoInstant(const AutocompleteMatch& match) {
   if (in_revert_)
     return false;
 
   InstantController* instant = controller_->GetInstant();
 
   if (!instant)
     return false;
 
   if (user_input_in_progress_ && popup_->IsOpen()) {
     // The two pieces of text we want to send Instant, viz., what the user has
-    // typed, and any inline autocomplete suggestion.
+    // typed, and the full omnibox text including any inline autocompletion.
     string16 user_text = user_text_;
-    *suggested_text = inline_autocomplete_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 = CurrentMatch().fill_into_edit;
-      suggested_text->clear();
-    }
+    if (has_temporary_text_)
+      user_text = full_text = CurrentMatch().fill_into_edit;
 
-    // Remove any keywords and "?" prefix.
+    // Remove keyword if we're in keyword mode.
     user_text = DisplayTextFromUserText(user_text);
+    full_text = DisplayTextFromUserText(full_text);
+
+    // 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, UseVerbatimInstant(),
-                           suggested_text, complete_behavior);
+    return instant->Update(match, user_text, full_text, UseVerbatimInstant());
   }
 
   // It's possible DoInstant() was called due to an OnChanged() event from the
   // omnibox view if the user clicked the renderer while IME composition was
   // active. In that case we still want to commit on mouse up, so don't call
   // Hide().
   if (!instant->commit_on_pointer_release())
     instant->Hide();
   return false;
 }
@@ skipping 59 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);
 }