| 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_error_info.h" | 5 #include "chrome/browser/ssl/ssl_error_info.h" |
| 6 | 6 |
| 7 #include "base/i18n/time_formatting.h" | 7 #include "base/i18n/time_formatting.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "content/public/browser/cert_store.h" | 9 #include "content/public/browser/cert_store.h" |
| 10 #include "grit/chromium_strings.h" | 10 #include "grit/chromium_strings.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 #endif | 123 #endif |
| 124 break; | 124 break; |
| 125 case CERT_CONTAINS_ERRORS: | 125 case CERT_CONTAINS_ERRORS: |
| 126 title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_CONTAINS_ERRORS_TITLE); | 126 title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_CONTAINS_ERRORS_TITLE); |
| 127 details = l10n_util::GetStringFUTF16( | 127 details = l10n_util::GetStringFUTF16( |
| 128 IDS_CERT_ERROR_CONTAINS_ERRORS_DETAILS, | 128 IDS_CERT_ERROR_CONTAINS_ERRORS_DETAILS, |
| 129 UTF8ToUTF16(request_url.host())); | 129 UTF8ToUTF16(request_url.host())); |
| 130 short_description = | 130 short_description = |
| 131 l10n_util::GetStringUTF16(IDS_CERT_ERROR_CONTAINS_ERRORS_DESCRIPTION); | 131 l10n_util::GetStringUTF16(IDS_CERT_ERROR_CONTAINS_ERRORS_DESCRIPTION); |
| 132 extra_info.push_back( | 132 extra_info.push_back( |
| 133 l10n_util::GetStringFUTF16(IDS_CERT_ERROR_EXTRA_INFO_1, | 133 l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXTRA_INFO_1)); |
| 134 UTF8ToUTF16(request_url.host()))); | |
| 135 extra_info.push_back(l10n_util::GetStringUTF16( | 134 extra_info.push_back(l10n_util::GetStringUTF16( |
| 136 IDS_CERT_ERROR_CONTAINS_ERRORS_EXTRA_INFO_2)); | 135 IDS_CERT_ERROR_CONTAINS_ERRORS_EXTRA_INFO_2)); |
| 137 break; | 136 break; |
| 138 case CERT_NO_REVOCATION_MECHANISM: | 137 case CERT_NO_REVOCATION_MECHANISM: |
| 139 title = l10n_util::GetStringUTF16( | 138 title = l10n_util::GetStringUTF16( |
| 140 IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_TITLE); | 139 IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_TITLE); |
| 141 details = l10n_util::GetStringUTF16( | 140 details = l10n_util::GetStringUTF16( |
| 142 IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DETAILS); | 141 IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DETAILS); |
| 143 short_description = l10n_util::GetStringUTF16( | 142 short_description = l10n_util::GetStringUTF16( |
| 144 IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DESCRIPTION); | 143 IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DESCRIPTION); |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 cert_id, &cert); | 317 cert_id, &cert); |
| 319 DCHECK(r); | 318 DCHECK(r); |
| 320 } | 319 } |
| 321 if (errors) | 320 if (errors) |
| 322 errors->push_back( | 321 errors->push_back( |
| 323 SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url)); | 322 SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url)); |
| 324 } | 323 } |
| 325 } | 324 } |
| 326 return count; | 325 return count; |
| 327 } | 326 } |
| OLD | NEW |