Adding Javascript support for the Extended Searchbox API.

chrome/browser/instant/instant_loader.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_loader.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 255 matching lines @@
       const string16& error_description,
       content::RenderViewHost* render_view_host) OVERRIDE;
 
  private:
   typedef std::vector<scoped_refptr<history::HistoryAddPageArgs> >
       AddPageVector;
 
   // Message from renderer indicating the page has suggestions.
   void OnSetSuggestions(
       int32 page_id,
-      const std::vector<std::string>& suggestions,
-      InstantCompleteBehavior behavior);
+      const std::vector<InstantSuggestion>& suggestions);
 
   // Messages from the renderer when we've determined whether the page supports
   // instant.
   void OnInstantSupportDetermined(int32 page_id, bool result);
 
   // Commits, if applicable, on mouse is released, or a gesture ends.
   void CommitOnPointerReleaseIfNecessary();
 
   InstantLoader* loader_;
 
@@ skipping 303 matching lines @@
   if (validated_url == loader_->url_) {
     // This typically happens with downloads (which are disabled with
     // instant active). To ensure the download happens when the user presses
     // enter we set needs_reload_ to true, which triggers a reload.
     loader_->needs_reload_ = true;
   }
 }
 
 void InstantLoader::WebContentsDelegateImpl::OnSetSuggestions(
     int32 page_id,
-    const std::vector<std::string>& suggestions,
-    InstantCompleteBehavior behavior) {
+    const std::vector<InstantSuggestion>& suggestions) {
   TabContents* source = loader_->preview_contents();
   NavigationEntry* entry =
       source->web_contents()->GetController().GetActiveEntry();
   if (!entry || page_id != entry->GetPageID())
     return;
 
   if (suggestions.empty())
-    loader_->SetCompleteSuggestedText(string16(), behavior);
+    loader_->SetCompleteSuggestedText(string16(), INSTANT_COMPLETE_NOW);
   else
-    loader_->SetCompleteSuggestedText(UTF8ToUTF16(suggestions[0]), behavior);
+    loader_->SetCompleteSuggestedText(UTF8ToUTF16(suggestions[0].text),
+                                      suggestions[0].behavior);
 }
 
 void InstantLoader::WebContentsDelegateImpl::OnInstantSupportDetermined(
     int32 page_id,
     bool result) {
   WebContents* source = loader_->preview_contents()->web_contents();
   if (!source->GetController().GetActiveEntry() ||
       page_id != source->GetController().GetActiveEntry()->GetPageID())
     return;
 
@@ skipping 570 matching lines @@
     host->Send(new ChromeViewMsg_SearchBoxResize(
         host->GetRoutingID(), GetOmniboxBoundsInTermsOfPreview()));
   } else {
     host->Send(new ChromeViewMsg_SearchBoxChange(
         host->GetRoutingID(), user_text, verbatim, 0, 0));
   }
 
   frame_load_observer_.reset(new FrameLoadObserver(
       this, preview_contents()->web_contents(), user_text, verbatim));
 }