| 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/ui/website_settings/website_settings.h" | 5 #include "chrome/browser/ui/website_settings/website_settings.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 #endif | 65 #endif |
| 66 | 66 |
| 67 #if !defined(OS_ANDROID) | 67 #if !defined(OS_ANDROID) |
| 68 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h
" | 68 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h
" |
| 69 #endif | 69 #endif |
| 70 | 70 |
| 71 using base::ASCIIToUTF16; | 71 using base::ASCIIToUTF16; |
| 72 using base::UTF8ToUTF16; | 72 using base::UTF8ToUTF16; |
| 73 using base::UTF16ToUTF8; | 73 using base::UTF16ToUTF8; |
| 74 using content::BrowserThread; | 74 using content::BrowserThread; |
| 75 using security_state::SecurityStateModel; |
| 75 | 76 |
| 76 namespace { | 77 namespace { |
| 77 | 78 |
| 78 // Events for UMA. Do not reorder or change! | 79 // Events for UMA. Do not reorder or change! |
| 79 enum SSLCertificateDecisionsDidRevoke { | 80 enum SSLCertificateDecisionsDidRevoke { |
| 80 USER_CERT_DECISIONS_NOT_REVOKED = 0, | 81 USER_CERT_DECISIONS_NOT_REVOKED = 0, |
| 81 USER_CERT_DECISIONS_REVOKED, | 82 USER_CERT_DECISIONS_REVOKED, |
| 82 END_OF_SSL_CERTIFICATE_DECISIONS_DID_REVOKE_ENUM | 83 END_OF_SSL_CERTIFICATE_DECISIONS_DID_REVOKE_ENUM |
| 83 }; | 84 }; |
| 84 | 85 |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 info.connection_status = site_connection_status_; | 706 info.connection_status = site_connection_status_; |
| 706 info.connection_status_description = | 707 info.connection_status_description = |
| 707 UTF16ToUTF8(site_connection_details_); | 708 UTF16ToUTF8(site_connection_details_); |
| 708 info.identity_status = site_identity_status_; | 709 info.identity_status = site_identity_status_; |
| 709 info.identity_status_description = | 710 info.identity_status_description = |
| 710 UTF16ToUTF8(site_identity_details_); | 711 UTF16ToUTF8(site_identity_details_); |
| 711 info.cert_id = cert_id_; | 712 info.cert_id = cert_id_; |
| 712 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 713 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
| 713 ui_->SetIdentityInfo(info); | 714 ui_->SetIdentityInfo(info); |
| 714 } | 715 } |
| OLD | NEW |