Make SpeechRecognition per RenderFrame instead of per RenderView.

extensions/shell/browser/shell_speech_recognition_manager_delegate.cc

 // Copyright 2014 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 "extensions/shell/browser/shell_speech_recognition_manager_delegate.h"
 
 #include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/speech_recognition_manager.h"
 #include "content/public/browser/speech_recognition_session_context.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/view_type_utils.h"
 
 using content::BrowserThread;
 using content::SpeechRecognitionManager;
 using content::WebContents;
 
@@ skipping 59 matching lines @@
       SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id);
 
   // Make sure that initiators (extensions/web pages) properly set the
   // |render_process_id| field, which is needed later to retrieve the profile.
   DCHECK_NE(context.render_process_id, 0);
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&CheckRenderViewType,
                                      callback,
                                      context.render_process_id,
-                                     context.render_view_id));
+                                     context.render_frame_id));
 }
 
 content::SpeechRecognitionEventListener*
 ShellSpeechRecognitionManagerDelegate::GetEventListener() {
   return this;
 }
 
 bool ShellSpeechRecognitionManagerDelegate::FilterProfanities(
     int render_process_id) {
   // TODO(zork): Determine where this preference should come from.
   return true;
 }
 
 // static
 void ShellSpeechRecognitionManagerDelegate::CheckRenderViewType(
     base::Callback<void(bool ask_user, bool is_allowed)> callback,
     int render_process_id,
-    int render_view_id) {
+    int render_frame_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const content::RenderViewHost* render_view_host =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
+
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
   bool allowed = false;
   bool check_permission = false;
 
+  const content::RenderViewHost* render_view_host =

[Charlie Reis, 2014/12/09 00:52:33]

We don't need |render_view_host| if we use WebContents::FromRenderFrameHost
below, right?  Same for the #include.

[mlamouri (slow - plz ping), 2015/01/19 11:20:23]

Right ;)

+      render_frame_host ? render_frame_host->GetRenderViewHost() : nullptr;
+
   if (render_view_host) {
     WebContents* web_contents =
         WebContents::FromRenderViewHost(render_view_host);
     extensions::ViewType view_type = extensions::GetViewType(web_contents);
 
     if (view_type == extensions::VIEW_TYPE_APP_WINDOW ||
         view_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
       allowed = true;
       check_permission = true;
     } else {
       LOG(WARNING) << "Speech recognition only supported in Apps.";
     }
   }
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(callback, check_permission, allowed));
 }
 
 }  // namespace speech
 }  // namespace extensions