OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ssl/ssl_add_certificate.h" | 5 #include "chrome/browser/ssl/ssl_add_certificate.h" |
6 | 6 |
7 #include "chrome/browser/ssl/ssl_add_cert_handler.h" | 7 #include "chrome/browser/ssl/ssl_add_cert_handler.h" |
8 #include "net/cert/x509_certificate.h" | 8 #include "net/cert/x509_certificate.h" |
9 | 9 |
10 namespace chrome { | 10 namespace chrome { |
(...skipping 13 matching lines...) Expand all Loading... |
24 | 24 |
25 scoped_refptr<net::X509Certificate> cert; | 25 scoped_refptr<net::X509Certificate> cert; |
26 if (cert_data != NULL) { | 26 if (cert_data != NULL) { |
27 cert = net::X509Certificate::CreateFromBytes( | 27 cert = net::X509Certificate::CreateFromBytes( |
28 reinterpret_cast<const char*>(cert_data), cert_size); | 28 reinterpret_cast<const char*>(cert_data), cert_size); |
29 } | 29 } |
30 // NOTE: Passing a NULL cert pointer if |cert_data| was NULL is | 30 // NOTE: Passing a NULL cert pointer if |cert_data| was NULL is |
31 // intentional here. | 31 // intentional here. |
32 | 32 |
33 // The handler will run the UI and delete itself when it's finished. | 33 // The handler will run the UI and delete itself when it's finished. |
34 new SSLAddCertHandler(request, cert, render_process_id, render_view_id); | 34 new SSLAddCertHandler(request, cert.get(), render_process_id, render_view_id); |
35 } | 35 } |
36 | 36 |
37 } // namespace chrome | 37 } // namespace chrome |
OLD | NEW |