Upstream rewrite of Instant.

chrome/renderer/searchbox.h

Index: chrome/renderer/searchbox.h
diff --git a/chrome/renderer/searchbox.h b/chrome/renderer/searchbox.h
index 9f3c10443effe2d2ec45613c3615ac61c2d03865..45eff3fc657eb812c305681fd577e4ad2bf28ab1 100644
--- a/chrome/renderer/searchbox.h
+++ b/chrome/renderer/searchbox.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_RENDERER_SEARCHBOX_H_
 #define CHROME_RENDERER_SEARCHBOX_H_
 
-#include <string>
 #include <vector>
 
 #include "base/string16.h"
@@ -21,13 +20,13 @@ class SearchBox : public content::RenderViewObserver,
   virtual ~SearchBox();
 
   // Sends ViewHostMsg_SetSuggestions to the browser.
-  void SetSuggestions(const std::vector<std::string>& suggestions,
+  void SetSuggestions(const std::vector<string16>& suggestions,
                       InstantCompleteBehavior behavior);
 
   const string16& value() const { return value_; }
   bool verbatim() const { return verbatim_; }
-  uint32 selection_start() const { return selection_start_; }
-  uint32 selection_end() const { return selection_end_; }
+  size_t selection_start() const { return selection_start_; }
+  size_t selection_end() const { return selection_end_; }
   gfx::Rect GetRect();
 
  private:
@@ -36,15 +35,12 @@ class SearchBox : public content::RenderViewObserver,
 
   void OnChange(const string16& value,
                 bool verbatim,
-                int selection_start,
-                int selection_end);
-  void OnSubmit(const string16& value, bool verbatim);
-  void OnCancel();
+                size_t selection_start,
+                size_t selection_end);
+  void OnSubmit(const string16& value);
+  void OnCancel(const string16& value);
   void OnResize(const gfx::Rect& bounds);
-  void OnDetermineIfPageSupportsInstant(const string16& value,
-                                        bool verbatim,
-                                        int selection_start,
-                                        int selection_end);
+  void OnDetermineIfPageSupportsInstant();
 
   // Sets the searchbox values to their initial value.
   void Reset();