Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7746011: Revert 98168, it caused compile errors on mac: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_service.cc
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_service.cc (revision 98169)
+++ chrome/browser/safe_browsing/safe_browsing_service.cc (working copy)
@@ -169,9 +169,7 @@
#if !defined(OS_CHROMEOS)
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableClientSidePhishingDetection) &&
- (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableSanitizedClientSidePhishingDetection) ||
- CanReportStats())) {
+ CanReportStats()) {
csd_service_.reset(
safe_browsing::ClientSideDetectionService::Create(
g_browser_process->system_request_context()));
@@ -901,10 +899,7 @@
#else
enable_csd_whitelist_ =
(!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection) &&
- (cmdline->HasSwitch(
- switches::kEnableSanitizedClientSidePhishingDetection) ||
- (local_state &&
- local_state->GetBoolean(prefs::kMetricsReportingEnabled))));
+ local_state && local_state->GetBoolean(prefs::kMetricsReportingEnabled));
#endif
BrowserThread::PostTask(
« no previous file with comments | « chrome/browser/safe_browsing/client_side_detection_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698