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

Unified Diff: chrome/browser/prerender/prerender_link_manager.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
« no previous file with comments | « chrome/browser/guest_view/guest_view_base.cc ('k') | chrome/browser/task_manager/extension_information.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_link_manager.cc
diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc
index 1f4d862b556ff95427f17e0d8dea501222fe3a40..d24ccc5844db8b80ecfeff3178606b076f8a4300 100644
--- a/chrome/browser/prerender/prerender_link_manager.cc
+++ b/chrome/browser/prerender/prerender_link_manager.cc
@@ -13,6 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
+#include "chrome/browser/guest_view/guest_view_base.h"
#include "chrome/browser/prerender/prerender_contents.h"
#include "chrome/browser/prerender/prerender_handle.h"
#include "chrome/browser/prerender/prerender_manager.h"
@@ -165,11 +166,13 @@ void PrerenderLinkManager::OnAddPrerender(int launcher_child_id,
DCHECK_EQ(static_cast<LinkPrerender*>(NULL),
FindByLauncherChildIdAndPrerenderId(launcher_child_id,
prerender_id));
- content::RenderProcessHost* rph =
- content::RenderProcessHost::FromID(launcher_child_id);
+ content::RenderViewHost* rvh =
+ content::RenderViewHost::FromID(launcher_child_id, render_view_route_id);
+ content::WebContents* web_contents =
+ rvh ? content::WebContents::FromRenderViewHost(rvh) : NULL;
// Guests inside <webview> do not support cross-process navigation and so we
// do not allow guests to prerender content.
- if (rph && rph->IsGuest())
+ if (GuestViewBase::IsGuest(web_contents))
return;
// Check if the launcher is itself an unswapped prerender.
« no previous file with comments | « chrome/browser/guest_view/guest_view_base.cc ('k') | chrome/browser/task_manager/extension_information.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698