chrome/browser/safe_browsing/local_database_manager.cc - Issue 1402783005: Remove safe_browsing=2 functionality, replace with =3 mode.

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

Issue 1402783005: Remove safe_browsing=2 functionality, replace with =3 mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix up histograms Created 5 years, 2 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/renderer_host/chrome_resource_dispatcher_host_delegate.cc ('k') | chrome/browser/safe_browsing/protocol_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/local_database_manager.cc

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

index fd461dbc7578200464cefa4ea75794e2014a300c..5ac0c50978f73953f30a60aa87f99cd1702f983e 100644

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

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

@@ -273,9 +273,6 @@ LocalSafeBrowsingDatabaseManager::LocalSafeBrowsingDatabaseManager(

DCHECK_CURRENTLY_ON(BrowserThread::UI);

DCHECK(sb_service_.get() != NULL);

- // Android only supports a subset of FULL_SAFE_BROWSING.

- // TODO(shess): This shouldn't be OS-driven <http://crbug.com/394379>

-#if !defined(OS_ANDROID)

base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();

enable_download_protection_ =

!cmdline->HasSwitch(switches::kSbDisableDownloadProtection);

@@ -298,7 +295,6 @@ LocalSafeBrowsingDatabaseManager::LocalSafeBrowsingDatabaseManager(

// The client-side IP blacklist feature is tightly integrated with client-side

// phishing protection for now.

enable_ip_blacklist_ = enable_csd_whitelist_;

-#endif

}

LocalSafeBrowsingDatabaseManager::~LocalSafeBrowsingDatabaseManager() {