chrome/browser/safe_browsing/safe_browsing_blocking_page.cc - Issue 2241673002: Make UnsafeResource hold a WebContents getter instead of RenderFrame ids

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

Issue 2241673002: Make UnsafeResource hold a WebContents getter instead of RenderFrame ids (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 4 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/safe_browsing/client_side_detection_host_unittest.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

index a66b844bd1530dc7353dc4be476e4f513469c701..1858c36a9ea5eb864ca632d3b7bc39015222c8e3 100644

--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

@@ -27,7 +27,6 @@

#include "chrome/browser/renderer_preferences_util.h"

#include "chrome/browser/safe_browsing/threat_details.h"

#include "chrome/browser/safe_browsing/ui_manager.h"

-#include "chrome/browser/tab_contents/tab_util.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

@@ -496,8 +495,7 @@ void SafeBrowsingBlockingPage::ShowBlockingPage(

SafeBrowsingUIManager* ui_manager,

const UnsafeResource& unsafe_resource) {

DVLOG(1) << __func__ << " " << unsafe_resource.url.spec();

- WebContents* web_contents = tab_util::GetWebContentsByFrameID(

- unsafe_resource.render_process_host_id, unsafe_resource.render_frame_id);

+ WebContents* web_contents = unsafe_resource.web_contents_getter.Run();

InterstitialPage* interstitial =

InterstitialPage::GetInterstitialPage(web_contents);