Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1253)

Unified Diff: content/browser/speech/speech_recognition_dispatcher_host.cc

Issue 291403002: Remove some RenderProcessHost::IsGuest call sites (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Android build Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/speech/speech_recognition_dispatcher_host.cc
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc
index 7f62ae8a1d412b552a7c31578012e421d3350314..0197bcf4acc72b6c110958f1508e078dc36740cd 100644
--- a/content/browser/speech/speech_recognition_dispatcher_host.cc
+++ b/content/browser/speech/speech_recognition_dispatcher_host.cc
@@ -21,11 +21,9 @@
namespace content {
SpeechRecognitionDispatcherHost::SpeechRecognitionDispatcherHost(
- bool is_guest,
int render_process_id,
net::URLRequestContextGetter* context_getter)
: BrowserMessageFilter(SpeechRecognitionMsgStart),
- is_guest_(is_guest),
render_process_id_(render_process_id),
context_getter_(context_getter),
weak_factory_(this) {
@@ -86,15 +84,14 @@ void SpeechRecognitionDispatcherHost::OnStartRequest(
int embedder_render_process_id = 0;
int embedder_render_view_id = MSG_ROUTING_NONE;
- if (is_guest_) {
+ RenderViewHostImpl* render_view_host =
+ RenderViewHostImpl::FromID(render_process_id_, params.render_view_id);
+ WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
+ WebContents::FromRenderViewHost(render_view_host));
+ BrowserPluginGuest* guest = web_contents->GetBrowserPluginGuest();
+ if (guest) {
// If the speech API request was from a guest, save the context of the
// embedder since we will use it to decide permission.
- RenderViewHostImpl* render_view_host =
- RenderViewHostImpl::FromID(render_process_id_, params.render_view_id);
- WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
- WebContents::FromRenderViewHost(render_view_host));
- BrowserPluginGuest* guest = web_contents->GetBrowserPluginGuest();
-
embedder_render_process_id =
guest->embedder_web_contents()->GetRenderProcessHost()->GetID();
DCHECK_NE(embedder_render_process_id, 0);
« no previous file with comments | « content/browser/speech/speech_recognition_dispatcher_host.h ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698