diff options
| author | bryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 00:15:22 +0000 |
|---|---|---|
| committer | bryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 00:15:22 +0000 |
| commit | fea7d1019ec93d3b42fe66938a0d14020c7872d6 (patch) | |
| tree | b8feb9ec34f8bb5893d89f33ddba78b3b31a7293 | |
| parent | be5a8de070e9cf57cc84fedb952a819ffcd782d0 (diff) | |
| download | chromium_src-fea7d1019ec93d3b42fe66938a0d14020c7872d6.zip chromium_src-fea7d1019ec93d3b42fe66938a0d14020c7872d6.tar.gz chromium_src-fea7d1019ec93d3b42fe66938a0d14020c7872d6.tar.bz2 | |
Merge 86524 - Also enable client-side phishing detection for multi-user installs
on Windows.
BUG=83803
TEST=None
Review URL: http://codereview.chromium.org/6992045
TBR=noelutz@google.com
Review URL: http://codereview.chromium.org/6966045
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86529 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index ecd1e67..0ffe62c 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -963,7 +963,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 } |