chrome/browser/safe_browsing/client_side_detection_host.cc - Issue 8956050: Rename TabContents::controller() to GetController and put it into the WebContents interface.

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/client_side_detection_host.cc

Issue 8956050: Rename TabContents::controller() to GetController and put it into the WebContents interface. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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

Index: chrome/browser/safe_browsing/client_side_detection_host.cc

===================================================================

--- chrome/browser/safe_browsing/client_side_detection_host.cc (revision 115228)

+++ chrome/browser/safe_browsing/client_side_detection_host.cc (working copy)

@@ -347,9 +347,9 @@

resource.render_view_id &&

(resource.threat_type == SafeBrowsingService::URL_PHISHING ||

resource.threat_type == SafeBrowsingService::URL_MALWARE) &&

- tab_contents()->controller().GetActiveEntry()) {

+ tab_contents()->GetController().GetActiveEntry()) {

unsafe_unique_page_id_ =

- tab_contents()->controller().GetActiveEntry()->unique_id();

+ tab_contents()->GetController().GetActiveEntry()->unique_id();

// We also keep the resource around in order to be able to send the

// malicious URL to the server.

unsafe_resource_.reset(new SafeBrowsingService::UnsafeResource(resource));

@@ -426,7 +426,7 @@

if (!sb_service_->IsWhitelisted(resource)) {

// We need to stop any pending navigations, otherwise the interstital

// might not get created properly.

- tab_contents()->controller().DiscardNonCommittedEntries();

+ tab_contents()->GetController().DiscardNonCommittedEntries();

resource.client = new CsdClient(); // Will delete itself

sb_service_->DoDisplayBlockingPage(resource);

}

@@ -474,7 +474,7 @@

return false;

}

const NavigationEntry* nav_entry =

- tab_contents()->controller().GetActiveEntry();

+ tab_contents()->GetController().GetActiveEntry();

return (nav_entry && nav_entry->unique_id() == unsafe_unique_page_id_);

}