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 "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/instant/instant_loader_delegate.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 56 matching lines @@
   virtual void DidFinishLoad(
       int64 frame_id,
       const GURL& validated_url,
       bool is_main_frame,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   // Message from renderer indicating the page has suggestions.
   void OnSetSuggestions(int page_id,
-                        const std::vector<string16>& suggestions,
-                        InstantCompleteBehavior behavior);
+                        const std::vector<InstantSuggestion>& suggestions);
 
   // Message from the renderer determining whether it supports the Instant API.
   void OnInstantSupportDetermined(int page_id, bool result);
 
   void CommitFromPointerReleaseIfNecessary();
   void MaybeSetAndNotifyInstantSupportDetermined(bool supports_instant);
 
   InstantLoader* const loader_;
 
   // True if the mouse or a touch pointer is down from an activate.
@@ skipping 102 matching lines @@
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetSuggestions, OnSetSuggestions)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantSupportDetermined,
                         OnInstantSupportDetermined)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void InstantLoader::WebContentsDelegateImpl::OnSetSuggestions(
     int page_id,
-    const std::vector<string16>& suggestions,
-    InstantCompleteBehavior behavior) {
+    const std::vector<InstantSuggestion>& suggestions) {
   DCHECK(loader_->preview_contents() &&
          loader_->preview_contents_->web_contents());
   // TODO(sreeram): Remove this 'if' bandaid once bug 141875 is confirmed fixed.
   if (!loader_->preview_contents() ||
       !loader_->preview_contents_->web_contents()) {
     return;
   }
   content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
                                         GetController().GetActiveEntry();
   if (entry && page_id == entry->GetPageID()) {
     MaybeSetAndNotifyInstantSupportDetermined(true);
-    loader_->loader_delegate_->SetSuggestions(loader_, suggestions, behavior);
+    loader_->loader_delegate_->SetSuggestions(loader_, suggestions);
   }
 }
 
 void InstantLoader::WebContentsDelegateImpl::OnInstantSupportDetermined(
     int page_id,
     bool result) {
   DCHECK(loader_->preview_contents() &&
          loader_->preview_contents_->web_contents());
   // TODO(sreeram): Remove this 'if' bandaid once bug 141875 is confirmed fixed.
   if (!loader_->preview_contents() ||
@@ skipping 168 matching lines @@
                                            TabContents* new_tc) {
   DCHECK(old_tc == preview_contents_);
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the TabContents.
   ignore_result(preview_contents_.release());
   preview_contents_.reset(new_tc);
   SetupPreviewContents();
   loader_delegate_->SwappedTabContents(this);
 }