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

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

Issue 10970023: Enable safe browsing download check on ChromeOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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 | « no previous file | no next file » | 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 a85f688967be6e3d59626039820eac635c603c1b..9dce147f8f5063965143d8e84ec1db517b78888a 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -272,7 +272,6 @@ void SafeBrowsingService::Initialize() {
base::Bind(
&SafeBrowsingService::InitURLRequestContextOnIOThread, this,
make_scoped_refptr(g_browser_process->system_request_context())));
-#if !defined(OS_CHROMEOS)
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableClientSidePhishingDetection)) {
csd_service_.reset(
@@ -282,7 +281,6 @@ void SafeBrowsingService::Initialize() {
download_service_.reset(new safe_browsing::DownloadProtectionService(
this,
url_request_context_getter_));
-#endif
// Track the safe browsing preference of existing profiles.
// The SafeBrowsingService will be started if any existing profile has the
@@ -1004,14 +1002,8 @@ void SafeBrowsingService::Start() {
// We only download the csd-whitelist if client-side phishing detection is
// enabled.
-#ifdef OS_CHROMEOS
- // Client-side detection is disabled on ChromeOS for now, so don't bother
- // downloading the whitelist.
- enable_csd_whitelist_ = false;
-#else
enable_csd_whitelist_ =
!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection);
-#endif
// TODO(noelutz): remove this boolean variable since it should always be true
// if SafeBrowsing is enabled. Unfortunately, we have no test data for this
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698