| 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 <stddef.h> |
| 8 |
| 7 #include "net/android/network_library.h" | 9 #include "net/android/network_library.h" |
| 8 | 10 |
| 9 namespace chrome { | 11 namespace chrome { |
| 10 | 12 |
| 11 // Special case for Android here for several reasons: | 13 // Special case for Android here for several reasons: |
| 12 // | 14 // |
| 13 // - The SSLAddCertHandler implementation currently only supports | 15 // - The SSLAddCertHandler implementation currently only supports |
| 14 // CERTIFICATE_TYPE_X509_USER_CERT, but not other types, like | 16 // CERTIFICATE_TYPE_X509_USER_CERT, but not other types, like |
| 15 // CERTIFICATE_TYPE_PKCS12_ARCHIVE which are required on this | 17 // CERTIFICATE_TYPE_PKCS12_ARCHIVE which are required on this |
| 16 // platform. | 18 // platform. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 32 int /* render_view_id */) { | 34 int /* render_view_id */) { |
| 33 if (cert_size > 0) { | 35 if (cert_size > 0) { |
| 34 // This launches a new activity which will run in a different process. | 36 // This launches a new activity which will run in a different process. |
| 35 // It handles all user interaction, so no need to do anything in the | 37 // It handles all user interaction, so no need to do anything in the |
| 36 // browser UI thread here. | 38 // browser UI thread here. |
| 37 net::android::StoreCertificate(cert_type, cert_data, cert_size); | 39 net::android::StoreCertificate(cert_type, cert_data, cert_size); |
| 38 } | 40 } |
| 39 } | 41 } |
| 40 | 42 |
| 41 } // namespace chrome | 43 } // namespace chrome |
| OLD | NEW |