Adding Javascript support for the Extended Searchbox API.

chrome/browser/instant/instant_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 110 matching lines @@
   // Returns whether the preview will be committed when the mouse or touch
   // pointer is released.
   bool commit_on_pointer_release() const;
 
   // Returns the transition type of the last AutocompleteMatch passed to Update.
   content::PageTransition last_transition_type() const {
     return last_transition_type_;
   }
 
   // InstantLoaderDelegate:
-  virtual void SetSuggestions(InstantLoader* loader,
-                              const std::vector<string16>& suggestions,
-                              InstantCompleteBehavior behavior) OVERRIDE;
+  virtual void SetSuggestions(
+      InstantLoader* loader,
+      const std::vector<InstantSuggestion>& suggestions) OVERRIDE;
   virtual void CommitInstantLoader(InstantLoader* loader) OVERRIDE;
   virtual void InstantLoaderPreviewLoaded(InstantLoader* loader) OVERRIDE;
   virtual void InstantSupportDetermined(InstantLoader* loader,
                                         bool supports_instant) OVERRIDE;
   virtual void SwappedTabContents(InstantLoader* loader) OVERRIDE;
   virtual void InstantLoaderContentsFocused(InstantLoader* loader) OVERRIDE;
 
 #if defined(UNIT_TEST)
   // Accessors used only in tests.
   bool is_showing() const { return is_showing_; }
@@ skipping 45 matching lines @@
   string16 last_full_text_;
 
   // The most recent user_text passed to Update().
   string16 last_user_text_;
 
   // The most recent verbatim passed to Update().
   bool last_verbatim_;
 
   // The most recent suggestion received from the page, minus any prefix that
   // the user has typed.
-  string16 last_suggestion_;
-
-  // The most recent autocomplete behavior for |last_suggestion_|.
-  InstantCompleteBehavior last_complete_behavior_;
+  InstantSuggestion last_suggestion_;
 
   // See comments on the getter above.
   content::PageTransition last_transition_type_;
 
   // True if the preview is currently being displayed. Guaranteed to be false
   // if IsOutOfDate() is true.
   bool is_showing_;
 
   // True if we've received a response from the loader for the last Update(),
   // thus indicating that the page is ready to be shown.
@@ skipping 18 matching lines @@
   // Search terms extraction (for autocomplete history matches) doesn't work
   // on Instant URLs. So, whenever the user commits an Instant search, we add
   // an equivalent non-Instant search URL to history, so that the search shows
   // up in autocomplete history matches.
   GURL url_for_history_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_