chrome/browser/safe_browsing/safe_browsing_blocking_page.cc - Issue 611603002: Add the goog-unwanted-shavar list to a new SafeBrowsing PrefixSet.

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 611603002: Add the goog-unwanted-shavar list to a new SafeBrowsing PrefixSet. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nits and cl format 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

« no previous file with comments | « chrome/browser/safe_browsing/ping_manager.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc » ('j') | chrome/browser/safe_browsing/safe_browsing_database.h » ('J')
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 1c47c2c4c84b4d70c4a7f3853ff82c05f93c70c1..9c3ca1ef2483d42ddef630a87984b221c79c6a67 100644

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

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

@@ -173,7 +173,7 @@ SafeBrowsingBlockingPage::SafeBrowsingBlockingPage(

if (threat_type == SB_THREAT_TYPE_URL_MALWARE ||

threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL) {

malware = true;

- } else if (threat_type == SB_THREAT_TYPE_URL_HARMFUL) {

+ } else if (threat_type == SB_THREAT_TYPE_URL_UNWANTED) {

harmful = true;

} else {

DCHECK(threat_type == SB_THREAT_TYPE_URL_PHISHING ||

@@ -378,9 +378,11 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) {

diagnostic_url = google_util::AppendGoogleLocaleParam(

diagnostic_url, g_browser_process->GetApplicationLocale());

DCHECK(unsafe_resources_[element_index].threat_type ==

- SB_THREAT_TYPE_URL_MALWARE ||

+ SB_THREAT_TYPE_URL_MALWARE ||

unsafe_resources_[element_index].threat_type ==

- SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL);

+ SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL ||

+ unsafe_resources_[element_index].threat_type ==

+ SB_THREAT_TYPE_URL_UNWANTED);

OpenURLParams params(

diagnostic_url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_LINK,

false);