Start removing support for the experimental x-webkit-speech API

chrome/browser/speech/chrome_speech_recognition_manager_delegate.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/browser/speech/chrome_speech_recognition_manager_delegate.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 355 matching lines @@
     render_process_id = context.embedder_render_process_id;
     render_view_id = context.embedder_render_view_id;
   }
 
   // Check that the render view type is appropriate, and whether or not we
   // need to request permission from the user.
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&CheckRenderViewType,
                                      callback,
                                      render_process_id,
-                                     render_view_id,
-                                     !context.requested_by_page_element));
+                                     render_view_id));
 }
 
 content::SpeechRecognitionEventListener*
 ChromeSpeechRecognitionManagerDelegate::GetEventListener() {
   return this;
 }
 
 bool ChromeSpeechRecognitionManagerDelegate::FilterProfanities(
     int render_process_id) {
   content::RenderProcessHost* rph =
       content::RenderProcessHost::FromID(render_process_id);
   if (!rph)  // Guard against race conditions on RPH lifetime.
     return true;
 
   return Profile::FromBrowserContext(rph->GetBrowserContext())->GetPrefs()->
       GetBoolean(prefs::kSpeechRecognitionFilterProfanities);
 }
 
 // static.
 void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType(
     base::Callback<void(bool ask_user, bool is_allowed)> callback,
     int render_process_id,
-    int render_view_id,
-    bool js_api) {
+    int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const content::RenderViewHost* render_view_host =
       content::RenderViewHost::FromID(render_process_id, render_view_id);
 
   bool allowed = false;
   bool check_permission = false;
 
   if (!render_view_host) {
-    if (!js_api) {
-      // If there is no render view, we cannot show the speech bubble, so this
-      // is not allowed.
-      allowed = false;
-      check_permission = false;
-    } else {
-      // This happens for extensions. Manifest should be checked for permission.
-      allowed = true;
-      check_permission = false;
-    }
+    // This happens for extensions. Manifest should be checked for permission.
+    allowed = true;
+    check_permission = false;
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(callback, check_permission, allowed));
     return;
   }
 
   WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host);
 
   // chrome://app-list/ uses speech recognition.
   if (web_contents->GetCommittedWebUI() &&
       web_contents->GetLastCommittedURL().spec() ==
       chrome::kChromeUIAppListStartPageURL) {
     allowed = true;
     check_permission = false;
   }
 
   extensions::ViewType view_type = extensions::GetViewType(web_contents);
 
-  // TODO(kalman): Also enable speech bubble for extension popups
-  // (VIEW_TYPE_EXTENSION_POPUP) once popup-like control UI works properly in
-  // extensions: http://crbug.com/163851.
-  // Right now the extension popup closes and dismisses immediately on user
-  // click.
   if (view_type == extensions::VIEW_TYPE_TAB_CONTENTS ||
       view_type == extensions::VIEW_TYPE_APP_WINDOW ||
       view_type == extensions::VIEW_TYPE_VIRTUAL_KEYBOARD ||
-      // Only allow requests through JavaScript API (|js_api| = true).
-      // Requests originating from html element (|js_api| = false) would want
-      // to show bubble which isn't quite intuitive from a background page. Also
-      // see todo above about issues with rendering such bubbles from extension
-      // popups.
-      (view_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE &&
-       js_api)) {
-    // If it is a tab, we can show the speech input bubble or check for
-    // permission. For apps, this means manifest would be checked for
-    // permission.
-
+      view_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
+    // If it is a tab, we can check for permission. For apps, this means
+    // manifest would be checked for permission.
     allowed = true;
-    if (js_api)
-      check_permission = true;
+    check_permission = true;
   }
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(callback, check_permission, allowed));
 }
 
 }  // namespace speech