chrome/browser/safe_browsing/local_database_manager.cc - Issue 2450993003: Componentize safe_browsing [1]: create component, move messages, constants and switches.

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 2450993003: Componentize safe_browsing [1]: create component, move messages, constants and switches. (Closed)

Patch Set: fix compile Created 4 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/incident_reporting/last_download_finder_unittest.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service.cc » ('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 47a05bb68697aa7c75d0ce9a05ebcfab4359fb19..615a7b60dfb8bc2bedc2e6d02f8ff1d20ad5fb1e 100644

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

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

@@ -28,11 +28,11 @@

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

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

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

-#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "components/prefs/pref_service.h"

+#include "components/safe_browsing/common/safebrowsing_switches.h"

#include "components/safe_browsing_db/safe_browsing_prefs.h"

#include "components/safe_browsing_db/util.h"

#include "components/safe_browsing_db/v4_protocol_manager_util.h"

@@ -287,20 +287,20 @@ LocalSafeBrowsingDatabaseManager::LocalSafeBrowsingDatabaseManager(

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

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

- enable_download_protection_ =

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

+ enable_download_protection_ = !cmdline->HasSwitch(

+ safe_browsing::switches::kSbDisableDownloadProtection);

// We only download the csd-whitelist if client-side phishing detection is

// enabled.

enable_csd_whitelist_ =

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

+ !cmdline->HasSwitch(::switches::kDisableClientSidePhishingDetection);

// We download the download-whitelist if download protection is enabled.

enable_download_whitelist_ = enable_download_protection_;

// TODO(kalman): there really shouldn't be a flag for this.

- enable_extension_blacklist_ =

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

+ enable_extension_blacklist_ = !cmdline->HasSwitch(

+ safe_browsing::switches::kSbDisableExtensionBlacklist);

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

// phishing protection for now.