Reland of "Remove setVoiceSearchSupported part of EmbeddedSearch SearchBox API." (patchset #4 id:60…

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/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/json/string_escape.h"
 #include "base/metrics/field_trial.h"
@@ skipping 386 matching lines @@
     "if (window.chrome &&"
     "    window.chrome.embeddedSearch &&"
     "    window.chrome.embeddedSearch.newTabPage &&"
     "    window.chrome.embeddedSearch.newTabPage.onthemechange &&"
     "    typeof window.chrome.embeddedSearch.newTabPage.onthemechange =="
     "        'function') {"
     "  window.chrome.embeddedSearch.newTabPage.onthemechange();"
     "  true;"
     "}";
 
-static const char kDispatchToggleVoiceSearchScript[] =
-    "if (window.chrome &&"
-    "    window.chrome.embeddedSearch &&"
-    "    window.chrome.embeddedSearch.searchBox &&"
-    "    window.chrome.embeddedSearch.searchBox.ontogglevoicesearch &&"
-    "    typeof window.chrome.embeddedSearch.searchBox.ontogglevoicesearch =="
-    "         'function') {"
-    "  window.chrome.embeddedSearch.searchBox.ontogglevoicesearch();"
-    "  true;"
-    "}";
-
 // ----------------------------------------------------------------------------
 
 class SearchBoxExtensionWrapper : public v8::Extension {
  public:
   explicit SearchBoxExtensionWrapper(const base::StringPiece& code);
 
   // Allows v8's javascript code to call the native functions defined
   // in this class for window.chrome.
   v8::Local<v8::FunctionTemplate> GetNativeFunctionTemplate(
       v8::Isolate*,
@@ skipping 80 matching lines @@
       const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // Navigates the window to a URL represented by either a URL string or a
   // restricted ID.
   static void NavigateContentWindow(
       const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // Pastes provided value or clipboard's content into the omnibox.
   static void Paste(const v8::FunctionCallbackInfo<v8::Value>& args);
 
-  // Indicates whether the page supports voice search.
-  static void SetVoiceSearchSupported(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-
   // Start capturing user key strokes.
   static void StartCapturingKeyStrokes(
       const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // Stop capturing user key strokes.
   static void StopCapturingKeyStrokes(
       const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // Undoes the deletion of all Most Visited itens.
   static void UndoAllMostVisitedDeletions(
@@ skipping 88 matching lines @@
 // static
 void SearchBoxExtension::DispatchSuggestionChange(blink::WebFrame* frame) {
   Dispatch(frame, kDispatchSuggestionChangeEventScript);
 }
 
 // static
 void SearchBoxExtension::DispatchThemeChange(blink::WebFrame* frame) {
   Dispatch(frame, kDispatchThemeChangeEventScript);
 }
 
-// static
-void SearchBoxExtension::DispatchToggleVoiceSearch(
-    blink::WebFrame* frame) {
-  Dispatch(frame, kDispatchToggleVoiceSearchScript);
-}
-
 SearchBoxExtensionWrapper::SearchBoxExtensionWrapper(
     const base::StringPiece& code)
     : v8::Extension(kSearchBoxExtensionName, code.data(), 0, 0, code.size()) {
 }
 
 v8::Local<v8::FunctionTemplate>
 SearchBoxExtensionWrapper::GetNativeFunctionTemplate(
     v8::Isolate* isolate,
     v8::Local<v8::String> name) {
   if (name->Equals(
@@ skipping 39 matching lines @@
     return v8::FunctionTemplate::New(isolate, LogMostVisitedImpression);
   }
   if (name->Equals(
           v8::String::NewFromUtf8(isolate, "LogMostVisitedNavigation"))) {
     return v8::FunctionTemplate::New(isolate, LogMostVisitedNavigation);
   }
   if (name->Equals(v8::String::NewFromUtf8(isolate, "NavigateContentWindow")))
     return v8::FunctionTemplate::New(isolate, NavigateContentWindow);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "Paste")))
     return v8::FunctionTemplate::New(isolate, Paste);
-  if (name->Equals(v8::String::NewFromUtf8(isolate, "SetVoiceSearchSupported")))
-    return v8::FunctionTemplate::New(isolate, SetVoiceSearchSupported);
   if (name->Equals(
           v8::String::NewFromUtf8(isolate, "StartCapturingKeyStrokes")))
     return v8::FunctionTemplate::New(isolate, StartCapturingKeyStrokes);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "StopCapturingKeyStrokes")))
     return v8::FunctionTemplate::New(isolate, StopCapturingKeyStrokes);
   if (name->Equals(
           v8::String::NewFromUtf8(isolate, "UndoAllMostVisitedDeletions")))
     return v8::FunctionTemplate::New(isolate, UndoAllMostVisitedDeletions);
   if (name->Equals(v8::String::NewFromUtf8(isolate, "UndoMostVisitedDeletion")))
     return v8::FunctionTemplate::New(isolate, UndoMostVisitedDeletion);
@@ skipping 546 matching lines @@
 void SearchBoxExtensionWrapper::StopCapturingKeyStrokes(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return;
 
   DVLOG(1) << render_view << " StopCapturingKeyStrokes";
   SearchBox::Get(render_view)->StopCapturingKeyStrokes();
 }
 
 // static
-void SearchBoxExtensionWrapper::SetVoiceSearchSupported(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  content::RenderView* render_view = GetRenderView();
-  if (!render_view) {
-    return;
-  }
-  if (!args.Length()) {
-    ThrowInvalidParameters(args);
-    return;
-  }
-
-  DVLOG(1) << render_view << " SetVoiceSearchSupported";
-  SearchBox::Get(render_view)->SetVoiceSearchSupported(args[0]->BooleanValue());
-}
-
-// static
 void SearchBoxExtensionWrapper::UndoAllMostVisitedDeletions(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return;
 
   DVLOG(1) << render_view << " UndoAllMostVisitedDeletions";
   SearchBox::Get(render_view)->UndoAllMostVisitedDeletions();
 }
 
 // static
@@ skipping 20 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