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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7635010: Add support for client-side phishing detection for non-UMA users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 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
« chrome/browser/safe_browsing/client_side_detection_service.cc ('K') | « 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
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index cac584c5a29534107b6cd36011a7a0750ba3c38f..a8deb0d2575d5aa6ab86ad844d8c4f1f00a6f97c 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -886,8 +886,11 @@ void SafeBrowsingService::Start() {
enable_csd_whitelist_ = false;
#else
enable_csd_whitelist_ =
- (!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection) &&
- local_state && local_state->GetBoolean(prefs::kMetricsReportingEnabled));
+ (cmdline->HasSwitch(
+ switches::kEnableSanitizedClientSidePhishingDetection) ||
+ (!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection) &&
+ local_state &&
+ local_state->GetBoolean(prefs::kMetricsReportingEnabled)));
#endif
BrowserThread::PostTask(
« chrome/browser/safe_browsing/client_side_detection_service.cc ('K') | « 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