Pass user_text and full_text explicitly to Instant.

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
@@ skipping 126 matching lines @@
 }
 
 // static
 bool InstantController::IsEnabled(Profile* profile) {
   const PrefService* prefs = profile ? profile->GetPrefs() : NULL;
   return prefs && prefs->GetBoolean(prefs::kInstantEnabled);
 }
 
 bool InstantController::Update(const AutocompleteMatch& match,
                                const string16& user_text,
-                               bool verbatim,
-                               string16* suggested_text,
-                               InstantCompleteBehavior* complete_behavior) {
+                               const string16& full_text,
+                               bool verbatim) {
   const TabContents* active_tab = delegate_->GetActiveTabContents();
 
   // We could get here with no active tab if the Browser is closing.
   if (!active_tab) {
     Hide();
     return false;
   }
 
   std::string instant_url;
   Profile* profile = active_tab->profile();
 
   // If the match's TemplateURL isn't valid, it is likely not a query.
   if (!GetInstantURL(match.GetTemplateURL(profile), &instant_url)) {
     Hide();
     return false;
   }
 
-  string16 full_text = user_text + *suggested_text;
-
   if (full_text.empty()) {
     Hide();
     return false;
   }
 
-  // The presence of any suggested_text implies verbatim.
-  DCHECK(suggested_text->empty() || verbatim)
-      << user_text << "|" << *suggested_text;
-
   ResetLoader(instant_url, active_tab);
   last_active_tab_ = active_tab;
 
   // Track the non-Instant search URL for this query.
   url_for_history_ = match.destination_url;
   last_transition_type_ = match.transition;
 
+  // In EXTENDED mode, we send only |user_text| as the query text. In all other
+  // modes, we use the entire |full_text|.
+  const string16& query_text = mode_ == EXTENDED ? user_text : full_text;
+  string16 last_query_text =
+      mode_ == EXTENDED ? last_user_text_ : last_full_text_;
   last_user_text_ = user_text;
+  last_full_text_ = full_text;
 
   // Don't send an update to the loader if the query text hasn't changed.
-  if (full_text == last_full_text_ && verbatim == last_verbatim_) {
-    // Since we are updating |suggested_text|, shouldn't we also update
-    // |last_full_text_|? No. There's no guarantee that our suggestion will
-    // actually be inline autocompleted. For example, it may get trumped by
-    // a history suggestion. If our suggestion does make it, the omnibox will
-    // call Update() again, at which time we'll update |last_full_text_|.
-    *suggested_text = last_suggestion_.text;
-    *complete_behavior = last_suggestion_.behavior;
+  if (query_text == last_query_text && verbatim == last_verbatim_) {
+    // Reuse the last suggestion, as it's still valid.
+    delegate_->SetSuggestedText(last_suggestion_.text,
+                                last_suggestion_.behavior);
 
     // We need to call Show() here because of this:
     // 1. User has typed a query (say Q). Instant overlay is showing results.
     // 2. User arrows-down to a URL entry or erases all omnibox text. Both of
     //    these cause the overlay to Hide().
     // 3. User arrows-up to Q or types Q again. The last text we processed is
     //    still Q, so we don't Update() the loader, but we do need to Show().
     if (loader_processed_last_update_ &&
         (mode_ == INSTANT || mode_ == EXTENDED)) {
       Show();
     }
     return true;
   }
 
-  last_full_text_ = full_text;
   last_verbatim_ = verbatim;
   loader_processed_last_update_ = false;
-
-  // Reset the last suggestion, as it's no longer valid.
-  suggested_text->clear();
   last_suggestion_ = InstantSuggestion();
-  *complete_behavior = INSTANT_COMPLETE_NOW;
 
   if (mode_ != SILENT) {
-    loader_->Update(last_full_text_, last_verbatim_);
+    loader_->Update(query_text, verbatim);
 
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
         content::Source<InstantController>(this),
         content::NotificationService::NoDetails());
   }
 
+  // We don't have suggestions yet, but need to reset any existing "gray text".
+  delegate_->SetSuggestedText(string16(), INSTANT_COMPLETE_NOW);
+
   return true;
 }
 
 // TODO(tonyg): This method only fires when the omnibox bounds change. It also
 // needs to fire when the preview bounds change (e.g.: open/close info bar).
 void InstantController::SetOmniboxBounds(const gfx::Rect& bounds) {
   if (omnibox_bounds_ == bounds || (mode_ != INSTANT && mode_ != EXTENDED))
     return;
 
   omnibox_bounds_ = bounds;
@@ skipping 410 matching lines @@
     return false;
   }
 
   return true;
 }
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
          last_active_tab_ != delegate_->GetActiveTabContents();
 }