Merge: Propagate the search request params from the browser to the Instant search base page to fix …

chrome/renderer/searchbox/searchbox_extension.cc

 // Copyright 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/searchbox_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/json/string_escape.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 365 matching lines @@
   // chrome-search://most-visited can call this function.
   static void GetMostVisitedItemData(
     const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // Gets the submitted value of the user's search query.
   static void GetQuery(const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // Returns true if the Searchbox itself is oriented right-to-left.
   static void GetRightToLeft(const v8::FunctionCallbackInfo<v8::Value>& args);
 
+  // Gets the Embedded Search request params. Used for logging purposes.
+  static void GetSearchRequestParams(
+      const v8::FunctionCallbackInfo<v8::Value>& args);
+
   // Gets the start-edge margin to use with extended Instant.
   static void GetStartMargin(const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // Gets the current top suggestion to prefetch search results.
   static void GetSuggestionToPrefetch(
       const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // Gets the background info of the theme currently adopted by browser.
   // Call only when overlay is showing NTP page.
   static void GetThemeBackgroundInfo(
@@ skipping 158 matching lines @@
   if (name->Equals(v8::String::NewFromUtf8(isolate, "GetDispositionFromClick")))
     return v8::FunctionTemplate::New(isolate, GetDispositionFromClick);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "GetMostVisitedItems")))
     return v8::FunctionTemplate::New(isolate, GetMostVisitedItems);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "GetMostVisitedItemData")))
     return v8::FunctionTemplate::New(isolate, GetMostVisitedItemData);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "GetQuery")))
     return v8::FunctionTemplate::New(isolate, GetQuery);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "GetRightToLeft")))
     return v8::FunctionTemplate::New(isolate, GetRightToLeft);
+  if (name->Equals(v8::String::NewFromUtf8(isolate, "GetSearchRequestParams")))
+    return v8::FunctionTemplate::New(isolate, GetSearchRequestParams);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "GetStartMargin")))
     return v8::FunctionTemplate::New(isolate, GetStartMargin);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "GetSuggestionToPrefetch")))
     return v8::FunctionTemplate::New(isolate, GetSuggestionToPrefetch);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "GetThemeBackgroundInfo")))
     return v8::FunctionTemplate::New(isolate, GetThemeBackgroundInfo);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "IsFocused")))
     return v8::FunctionTemplate::New(isolate, IsFocused);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "IsInputInProgress")))
     return v8::FunctionTemplate::New(isolate, IsInputInProgress);
@@ skipping 165 matching lines @@
   args.GetReturnValue().Set(UTF16ToV8String(isolate, query));
 }
 
 // static
 void SearchBoxExtensionWrapper::GetRightToLeft(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   args.GetReturnValue().Set(base::i18n::IsRTL());
 }
 
 // static
+void SearchBoxExtensionWrapper::GetSearchRequestParams(
+    const v8::FunctionCallbackInfo<v8::Value>& args) {
+  content::RenderView* render_view = GetRenderView();
+  if (!render_view) return;
+
+  const EmbeddedSearchRequestParams& params =
+      SearchBox::Get(render_view)->GetEmbeddedSearchRequestParams();
+  v8::Isolate* isolate = args.GetIsolate();
+  v8::Handle<v8::Object> data = v8::Object::New(isolate);
+  if (!params.search_query.empty()) {
+    data->Set(v8::String::NewFromUtf8(isolate, kSearchQueryKey),
+              UTF16ToV8String(isolate, params.search_query));
+  }
+  if (!params.original_query.empty()) {
+    data->Set(v8::String::NewFromUtf8(isolate, kOriginalQueryKey),
+              UTF16ToV8String(isolate, params.original_query));
+  }
+  if (!params.rlz_parameter_value.empty()) {
+    data->Set(v8::String::NewFromUtf8(isolate, kRLZParameterKey),
+              UTF16ToV8String(isolate, params.rlz_parameter_value));
+  }
+  if (!params.input_encoding.empty()) {
+    data->Set(v8::String::NewFromUtf8(isolate, kInputEncodingKey),
+              UTF16ToV8String(isolate, params.input_encoding));
+  }
+  if (!params.assisted_query_stats.empty()) {
+    data->Set(v8::String::NewFromUtf8(isolate, kAssistedQueryStatsKey),
+              UTF16ToV8String(isolate, params.assisted_query_stats));
+  }
+  args.GetReturnValue().Set(data);
+}
+
+// static
 void SearchBoxExtensionWrapper::GetStartMargin(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return;
   args.GetReturnValue().Set(static_cast<int32_t>(
       SearchBox::Get(render_view)->start_margin()));
 }
 
 // static
 void SearchBoxExtensionWrapper::GetSuggestionToPrefetch(
@@ skipping 359 matching lines @@
   if (!render_view) return;
 
   bool display_instant_results =
       SearchBox::Get(render_view)->display_instant_results();
   DVLOG(1) << render_view << " GetDisplayInstantResults" <<
       display_instant_results;
   args.GetReturnValue().Set(display_instant_results);
 }
 
 }  // namespace extensions_v8