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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 6992045: Also enable client-side phishing detection for multi-user installs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 7 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/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 3efa13644d2c498cf86d83b05acdb3c5b0423d87..51dc4524a489b7053a6167fa805b2d4c37a506c6 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1017,7 +1017,11 @@ bool BrowserProcessImpl::IsSafeBrowsingDetectionServiceEnabled() {
switches::kDisableClientSidePhishingDetection) &&
resource_dispatcher_host()->safe_browsing_service() &&
resource_dispatcher_host()->safe_browsing_service()->CanReportStats() &&
- (channel == "beta" || channel == "dev" || channel == "canary");
+ // TODO(noelutz): use platform_util::GetChannel() once it has been
+ // pushed to the release branch.
+ (channel == "beta" || channel == "dev" || channel == "canary" ||
+ channel == "beta-m" || channel == "dev-m" || channel == "canary-m");
+
#endif
}
« 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