← Back to branch summary

~abreu-alexandre/oxide/vibrate

« back to all changes in this revision

Viewing changes to shared/browser/ssl/oxide_certificate_error_dispatcher.cc

  • Committer: Chris Coulson
  • Date: 2015-12-19 00:53:56 UTC
  • Revision ID: chris.coulson@canonical.com-20151219005356-cponv5wlxjpannvd
https://launchpad.net/bugs/1520189
Fix OxideQCertificateError::isMainFrame to work with Chromium 49

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/ssl/oxide_certificate_error_dispatcher.cc
100
100
// static
101
101
void CertificateErrorDispatcher::AllowCertificateError(
102
102
    content::WebContents* contents,
 
103
    bool is_main_frame,
103
104
    int cert_error,
104
105
    const net::SSLInfo& ssl_info,
105
106
    const GURL& request_url,
141
142
      new CertificateErrorProxy(
142
143
        overridable ? callback : base::Callback<void(bool)>());
143
144
  scoped_ptr<CertificateError> error(
144
 
      new CertificateError(resource_type == content::RESOURCE_TYPE_MAIN_FRAME,
 
145
      new CertificateError(is_main_frame,
145
146
                           !content::IsResourceTypeFrame(resource_type),
146
147
                           ToCertError(cert_error, ssl_info.cert.get()),
147
148
                           ssl_info.cert.get(),