← Back to branch summary

~chrisccoulson/oxide/lp1504853

« back to all changes in this revision

Viewing changes to qt/core/api/oxideqcertificateerror.cc

  • Committer: Chris Coulson
  • Date: 2015-10-15 08:32:01 UTC
  • Revision ID: chris.coulson@canonical.com-20151015083201-r9m505zjdm3g605c
https://launchpad.net/bugs/1504853
Navigate to a placeholder transitional page for main frame certificate errors whilst waiting for a response

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/core/api/oxideqcertificateerror.cc
27
27
#include "base/macros.h"
28
28
#include "net/cert/x509_certificate.h"
29
29
 
30
 
#include "shared/browser/oxide_certificate_error.h"
31
30
#include "shared/browser/oxide_security_types.h"
 
31
#include "shared/browser/ssl/oxide_certificate_error.h"
32
32
 
33
33
#include "oxideqsslcertificate_p.h"
34
34
 
42
42
void OxideQCertificateErrorPrivate::OnCancel() {
43
43
  Q_Q(OxideQCertificateError);
44
44
 
 
45
  printf("CANCELLED\n");
45
46
  DCHECK(!did_respond_);
46
47
 
47
48
  Q_EMIT q->cancelled();
58
59
    return;
59
60
  }
60
61
 
61
 
  if (error_->is_cancelled()) {
 
62
  if (error_->IsCancelled()) {
62
63
    qWarning() << "Cannot respond to a CertificateError that has been cancelled";
63
64
    return;
64
65
  }
138
139
bool OxideQCertificateError::isCancelled() const {
139
140
  Q_D(const OxideQCertificateError);
140
141
 
141
 
  return d->error_->is_cancelled();
 
142
  return d->error_->IsCancelled();
142
143
}
143
144
 
144
145
bool OxideQCertificateError::isMainFrame() const {