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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 707223004: Don't report blocked web contents from already navigated render views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 66ccc01d7f86825f5dd5d75dcd2d1e6eb9ea2b47..40e8f9438589d739f3d561620799de6e21fe7595 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -515,9 +515,13 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
}
void HandleBlockedPopupOnUIThread(const BlockedWindowParams& params) {
- WebContents* tab = tab_util::GetWebContentsByID(params.render_process_id(),
- params.opener_id());
- if (!tab)
+ RenderViewHost* render_view_host =
Charlie Reis 2014/11/10 17:41:26 RenderViewHost is going away, and there can be mor
jochen (gone - plz use gerrit) 2014/11/10 19:39:13 done
+ RenderViewHost::FromID(params.render_process_id(), params.opener_id());
+ if (!render_view_host)
+ return;
+ WebContents* tab = WebContents::FromRenderViewHost(render_view_host);
+ // The tab might already have navigated away.
+ if (!tab || tab->GetRenderViewHost() != render_view_host)
return;
prerender::PrerenderContents* prerender_contents =

Powered by Google App Engine
This is Rietveld 408576698