Adding Javascript support for the Extended Searchbox API.

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 "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 74 matching lines @@
 }
 
 }  // namespace
 
 InstantController::InstantController(InstantControllerDelegate* delegate,
                                      Mode mode)
     : delegate_(delegate),
       mode_(mode),
       last_active_tab_(NULL),
       last_verbatim_(false),
-      last_complete_behavior_(INSTANT_COMPLETE_NOW),
       last_transition_type_(content::PAGE_TRANSITION_LINK),
       is_showing_(false),
       loader_processed_last_update_(false) {
 }
 
 InstantController::~InstantController() {
   if (GetPreviewContents())
     AddPreviewUsageForHistogram(mode_, PREVIEW_DELETED);
 }
 
@@ skipping 58 matching lines @@
 
   last_user_text_ = user_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_;
-    *complete_behavior = last_complete_behavior_;
+    *suggested_text = last_suggestion_.text;
+    *complete_behavior = 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)
       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_.clear();
-  *complete_behavior = last_complete_behavior_ = INSTANT_COMPLETE_NOW;
+  last_suggestion_.Clear();
+  *complete_behavior = INSTANT_COMPLETE_NOW;
 
   if (mode_ != SILENT) {
     loader_->Update(last_full_text_, last_verbatim_);
 
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
         content::Source<InstantController>(this),
         content::NotificationService::NoDetails());
   }
 
@@ skipping 193 matching lines @@
 
   ResetLoader(instant_url, active_tab);
 }
 
 bool InstantController::commit_on_pointer_release() const {
   return GetPreviewContents() && loader_->IsPointerDownFromActivate();
 }
 
 void InstantController::SetSuggestions(
     InstantLoader* loader,
-    const std::vector<string16>& suggestions,
-    InstantCompleteBehavior behavior) {
+    const std::vector<InstantSuggestion>& suggestions) {
   DCHECK_EQ(loader_.get(), loader);
   if (loader_ != loader || IsOutOfDate() || mode_ == SILENT || mode_ == HIDDEN)
     return;
 
   loader_processed_last_update_ = true;
 
-  string16 suggestion;
+  InstantSuggestion suggestion;
   if (!suggestions.empty())
     suggestion = suggestions[0];
 
-  string16 suggestion_lower = base::i18n::ToLower(suggestion);
+  string16 suggestion_lower = base::i18n::ToLower(suggestion.text);
   string16 user_text_lower = base::i18n::ToLower(last_user_text_);
   if (user_text_lower.size() >= suggestion_lower.size() ||
       suggestion_lower.compare(0, user_text_lower.size(), user_text_lower)) {
-    suggestion.clear();
+    suggestion.text.clear();
   } else {
-    suggestion.erase(0, last_user_text_.size());
+    suggestion.text.erase(0, last_user_text_.size());
   }
 
   last_suggestion_ = suggestion;
-  last_complete_behavior_ = behavior;
   if (!last_verbatim_)
-    delegate_->SetSuggestedText(suggestion, behavior);
+    delegate_->SetSuggestedText(suggestion.text, suggestion.behavior);
 
   if (mode_ != SUGGEST)
     Show();
 }
 
 void InstantController::CommitInstantLoader(InstantLoader* loader) {
   DCHECK_EQ(loader_.get(), loader);
   DCHECK(is_showing_ && !IsOutOfDate()) << is_showing_;
   if (loader_ != loader || !is_showing_ || IsOutOfDate())
     return;
@@ skipping 57 matching lines @@
     loader_->Init();
     AddPreviewUsageForHistogram(mode_, PREVIEW_CREATED);
   }
 }
 
 void InstantController::DeleteLoader() {
   Hide();
   last_full_text_.clear();
   last_user_text_.clear();
   last_verbatim_ = false;
-  last_suggestion_.clear();
-  last_complete_behavior_ = INSTANT_COMPLETE_NOW;
+  last_suggestion_.Clear();
   last_transition_type_ = content::PAGE_TRANSITION_LINK;
   last_omnibox_bounds_ = gfx::Rect();
   url_for_history_ = GURL();
   if (GetPreviewContents())
     AddPreviewUsageForHistogram(mode_, PREVIEW_DELETED);
   loader_.reset();
 }
 
 void InstantController::Show() {
   if (!is_showing_) {
@@ skipping 57 matching lines @@
     return false;
   }
 
   return true;
 }
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
          last_active_tab_ != delegate_->GetActiveTabContents();
 }