Also enable client-side phishing detection for multi-user installs

Also enable client-side phishing detection for multi-user installs
on Windows.

BUG=83803
TEST=None

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86524

[noelutz, 2011-05-24 23:17:05]

Note: I'm not using GetChannel because I'm hoping to merge this CL
with 742 which doesn't have GetChannel yet.

Thanks,
noe.

On Tue, May 24, 2011 at 4:16 PM,  <noelutz@google.com> wrote:
> Reviewers: mattm, Brian Ryner,
>
> Description:
> Also enable client-side phishing detection for multi-user installs
> on Windows.
>
> BUG=83803
> TEST=None
>
>
> Please review this at http://codereview.chromium.org/6992045/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M chrome/browser/browser_process_impl.cc
>
>
> Index: chrome/browser/browser_process_impl.cc
> diff --git a/chrome/browser/browser_process_impl.cc
> b/chrome/browser/browser_process_impl.cc
> index
>
c496bbe299d2f6323959d44ead22e9db6ddcf594..beed4daa30603a54c0891b200892a664c6674203
> 100644
> --- a/chrome/browser/browser_process_impl.cc
> +++ b/chrome/browser/browser_process_impl.cc
> @@ -1011,7 +1011,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
>  }
>
>
>
>



-- 
-|||--

[Brian Ryner, 2011-05-24 23:18:31]

LGTM

On 2011/05/24 23:17:05, noelutz wrote:
> Note: I'm not using GetChannel because I'm hoping to merge this CL
> with 742 which doesn't have GetChannel yet.
> 
> Thanks,
> noe.
> 
> On Tue, May 24, 2011 at 4:16 PM,  <mailto:noelutz@google.com> wrote:
> > Reviewers: mattm, Brian Ryner,
> >
> > Description:
> > Also enable client-side phishing detection for multi-user installs
> > on Windows.
> >
> > BUG=83803
> > TEST=None
> >
> >
> > Please review this at http://codereview.chromium.org/6992045/
> >
> > SVN Base: svn://svn.chromium.org/chrome/trunk/src
> >
> > Affected files:
> > &nbsp;M chrome/browser/browser_process_impl.cc
> >
> >
> > Index: chrome/browser/browser_process_impl.cc
> > diff --git a/chrome/browser/browser_process_impl.cc
> > b/chrome/browser/browser_process_impl.cc
> > index
> >
>
c496bbe299d2f6323959d44ead22e9db6ddcf594..beed4daa30603a54c0891b200892a664c6674203
> > 100644
> > --- a/chrome/browser/browser_process_impl.cc
> > +++ b/chrome/browser/browser_process_impl.cc
> > @@ -1011,7 +1011,11 @@ bool
> > BrowserProcessImpl::IsSafeBrowsingDetectionServiceEnabled() {
> > &nbsp; &nbsp; &nbsp; switches::kDisableClientSidePhishingDetection) &&
> > &nbsp; &nbsp; &nbsp; resource_dispatcher_host()->safe_browsing_service() &&
> > &nbsp; &nbsp; &nbsp;
resource_dispatcher_host()->safe_browsing_service()->CanReportStats()
> > &&
> > - &nbsp; &nbsp; &nbsp;(channel == "beta" || channel == "dev" || channel ==
"canary");
> > + &nbsp; &nbsp; &nbsp;// TODO(noelutz): use platform_util::GetChannel() once
it has been
> > + &nbsp; &nbsp; &nbsp;// pushed to the release branch.
> > + &nbsp; &nbsp; &nbsp;(channel == "beta" || channel == "dev" || channel ==
"canary" ||
> > + &nbsp; &nbsp; &nbsp; channel == "beta-m" || channel == "dev-m" || channel
== "canary-m");
> > +
> > &nbsp;#endif
> > &nbsp;}
> >
> >
> >
> >
> 
> 
> 
> -- 
> -|||--