Upstream rewrite of Instant.

chrome/renderer/searchbox.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/renderer/searchbox.h"
 
+#include "base/string16.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/searchbox_extension.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 using WebKit::WebView;
 
 SearchBox::SearchBox(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<SearchBox>(render_view),
       verbatim_(false),
       selection_start_(0),
       selection_end_(0) {
 }
 
 SearchBox::~SearchBox() {
 }
 
-void SearchBox::SetSuggestions(const std::vector<std::string>& suggestions,
+void SearchBox::SetSuggestions(const std::vector<string16>& suggestions,
                                InstantCompleteBehavior behavior) {
   // Explicitly allow empty vector to be sent to the browser.
   render_view()->Send(new ChromeViewHostMsg_SetSuggestions(
       render_view()->GetRoutingID(), render_view()->GetPageId(), suggestions,
       behavior));
 }
 
 gfx::Rect SearchBox::GetRect() {
   // Need to adjust for scale.
   if (rect_.IsEmpty())
@@ skipping 19 matching lines @@
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxResize, OnResize)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant,
                         OnDetermineIfPageSupportsInstant)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SearchBox::OnChange(const string16& value,
                          bool verbatim,
-                         int selection_start,
-                         int selection_end) {
+                         size_t selection_start,
+                         size_t selection_end) {
   value_ = value;
   verbatim_ = verbatim;
   selection_start_ = selection_start;
   selection_end_ = selection_end;
-  if (!render_view()->GetWebView() || !render_view()->GetWebView()->mainFrame())
-    return;
-  extensions_v8::SearchBoxExtension::DispatchChange(
-      render_view()->GetWebView()->mainFrame());
+  if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
+    extensions_v8::SearchBoxExtension::DispatchChange(
+        render_view()->GetWebView()->mainFrame());
+  }
 }
 
-void SearchBox::OnSubmit(const string16& value, bool verbatim) {
+void SearchBox::OnSubmit(const string16& value) {
   value_ = value;
-  verbatim_ = verbatim;
+  verbatim_ = true;
+  selection_start_ = selection_end_ = value_.length();
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchSubmit(
         render_view()->GetWebView()->mainFrame());
   }
   Reset();
 }
 
-void SearchBox::OnCancel() {
-  verbatim_ = false;
+void SearchBox::OnCancel(const string16& value) {
+  value_ = value;
+  verbatim_ = true;
+  selection_start_ = selection_end_ = value_.length();
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchCancel(
         render_view()->GetWebView()->mainFrame());
   }
   Reset();
 }
 
 void SearchBox::OnResize(const gfx::Rect& bounds) {
   rect_ = bounds;
   if (!render_view()->GetWebView() || !render_view()->GetWebView()->mainFrame())
     return;
   extensions_v8::SearchBoxExtension::DispatchResize(
       render_view()->GetWebView()->mainFrame());
 }
 
-void SearchBox::OnDetermineIfPageSupportsInstant(const string16& value,
-                                                 bool verbatim,
-                                                 int selection_start,
-                                                 int selection_end) {
-  value_ = value;
-  verbatim_ = verbatim;
-  selection_start_ = selection_start;
-  selection_end_ = selection_end;
-  bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant(
-      render_view()->GetWebView()->mainFrame());
-  render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined(
-      render_view()->GetRoutingID(), render_view()->GetPageId(), result));
+void SearchBox::OnDetermineIfPageSupportsInstant() {
+  if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
+    bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant(
+        render_view()->GetWebView()->mainFrame());
+    render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined(
+        render_view()->GetRoutingID(), render_view()->GetPageId(), result));
+  }
 }
 
 void SearchBox::Reset() {
   verbatim_ = false;
   value_ = string16();
   selection_start_ = selection_end_ = 0;
   rect_ = gfx::Rect();
 }