Allow verbatim to be passed in OnSearchBoxChange.

BUG=None
TEST=None

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65433 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 9 insertions, 3 deletions

diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index aec5134..2510cbc 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -445,7 +445,7 @@ void InstantLoader::Update(TabContents* tab_contents,
         return;
       }
       preview_contents_->render_view_host()->SearchBoxChange(
-          user_text_, 0, 0);
+          user_text_, false, 0, 0);
 
       string16 complete_suggested_text_lower = l10n_util::ToLower(
           complete_suggested_text_);
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 23d233c..134274e 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -2056,10 +2056,11 @@ void RenderViewHost::DidCancelPopupMenu() {
 #endif
 
 void RenderViewHost::SearchBoxChange(const string16& value,
+                                     bool verbatim,
                                      int selection_start,
                                      int selection_end) {
   Send(new ViewMsg_SearchBoxChange(
-      routing_id(), value, selection_start, selection_end));
+      routing_id(), value, verbatim, selection_start, selection_end));
 }
 
 void RenderViewHost::SearchBoxSubmit(const string16& value,
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index b821e7a..efcf56c 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -504,6 +504,7 @@ class RenderViewHost : public RenderWidgetHost {
 
   // SearchBox notifications.
   void SearchBoxChange(const string16& value,
+                       bool verbatim,
                        int selection_start,
                        int selection_end);
   void SearchBoxSubmit(const string16& value,
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 2c5ca31..f00c806 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -822,8 +822,9 @@ IPC_BEGIN_MESSAGES(View)
   // Used to instruct the RenderView to send back updates to the preferred size.
   IPC_MESSAGE_ROUTED1(ViewMsg_EnablePreferredSizeChangedMode, int /*flags*/)
 
-  IPC_MESSAGE_ROUTED3(ViewMsg_SearchBoxChange,
+  IPC_MESSAGE_ROUTED4(ViewMsg_SearchBoxChange,
                       string16 /*value*/,
+                      bool /*verbatim*/,
                       int /*selection_start*/,
                       int /*selection_end*/)
   IPC_MESSAGE_ROUTED2(ViewMsg_SearchBoxSubmit,
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 912042b..2378d9e 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -4572,9 +4572,11 @@ void RenderView::OnEnablePreferredSizeChangedMode(int flags) {
 }
 
 void RenderView::OnSearchBoxChange(const string16& value,
+                                   bool verbatim,
                                    int selection_start,
                                    int selection_end) {
   search_box_.value = value;
+  search_box_.verbatim = verbatim;
   search_box_.selection_start = selection_start;
   search_box_.selection_end = selection_end;
   if (!webview() || !webview()->mainFrame())
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index a6593f9..f4bbc17 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -833,6 +833,7 @@ class RenderView : public RenderWidget,
                             WebKit::WebDragOperationsMask operations_allowed);
   void OnEnablePreferredSizeChangedMode(int flags);
   void OnSearchBoxChange(const string16& value,
+                         bool verbatim,
                          int selection_start,
                          int selection_end);
   void OnSearchBoxSubmit(const string16& value, bool verbatim);