| 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 <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 | 408 |
| 409 // Identity section. | 409 // Identity section. |
| 410 base::string16 subject_name(UTF8ToUTF16(url.host())); | 410 base::string16 subject_name(UTF8ToUTF16(url.host())); |
| 411 if (subject_name.empty()) { | 411 if (subject_name.empty()) { |
| 412 subject_name.assign( | 412 subject_name.assign( |
| 413 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY)); | 413 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY)); |
| 414 } | 414 } |
| 415 | 415 |
| 416 cert_id_ = ssl.cert_id; | 416 cert_id_ = ssl.cert_id; |
| 417 | 417 |
| 418 if (ssl.cert_id && !ssl.signed_certificate_timestamp_ids.empty()) { | |
| 419 signed_certificate_timestamp_ids_.assign( | |
| 420 ssl.signed_certificate_timestamp_ids.begin(), | |
| 421 ssl.signed_certificate_timestamp_ids.end()); | |
| 422 } | |
| 423 | |
| 424 if (ssl.cert_id && | 418 if (ssl.cert_id && |
| 425 cert_store_->RetrieveCert(ssl.cert_id, &cert) && | 419 cert_store_->RetrieveCert(ssl.cert_id, &cert) && |
| 426 (!net::IsCertStatusError(ssl.cert_status) || | 420 (!net::IsCertStatusError(ssl.cert_status) || |
| 427 net::IsCertStatusMinorError(ssl.cert_status))) { | 421 net::IsCertStatusMinorError(ssl.cert_status))) { |
| 428 // There are no major errors. Check for minor errors. | 422 // There are no major errors. Check for minor errors. |
| 429 #if defined(OS_CHROMEOS) | 423 #if defined(OS_CHROMEOS) |
| 430 policy::PolicyCertService* service = | 424 policy::PolicyCertService* service = |
| 431 policy::PolicyCertServiceFactory::GetForProfile(profile); | 425 policy::PolicyCertServiceFactory::GetForProfile(profile); |
| 432 const bool used_policy_certs = service && service->UsedPolicyCertificates(); | 426 const bool used_policy_certs = service && service->UsedPolicyCertificates(); |
| 433 #else | 427 #else |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 772 else | 766 else |
| 773 info.site_identity = site_url_.host(); | 767 info.site_identity = site_url_.host(); |
| 774 | 768 |
| 775 info.connection_status = site_connection_status_; | 769 info.connection_status = site_connection_status_; |
| 776 info.connection_status_description = | 770 info.connection_status_description = |
| 777 UTF16ToUTF8(site_connection_details_); | 771 UTF16ToUTF8(site_connection_details_); |
| 778 info.identity_status = site_identity_status_; | 772 info.identity_status = site_identity_status_; |
| 779 info.identity_status_description = | 773 info.identity_status_description = |
| 780 UTF16ToUTF8(site_identity_details_); | 774 UTF16ToUTF8(site_identity_details_); |
| 781 info.cert_id = cert_id_; | 775 info.cert_id = cert_id_; |
| 782 info.signed_certificate_timestamp_ids.assign( | |
| 783 signed_certificate_timestamp_ids_.begin(), | |
| 784 signed_certificate_timestamp_ids_.end()); | |
| 785 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 776 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
| 786 ui_->SetIdentityInfo(info); | 777 ui_->SetIdentityInfo(info); |
| 787 } | 778 } |
| 788 | 779 |
| 789 void WebsiteSettings::PresentHistoryInfo(base::Time first_visit) { | 780 void WebsiteSettings::PresentHistoryInfo(base::Time first_visit) { |
| 790 if (first_visit == base::Time()) { | 781 if (first_visit == base::Time()) { |
| 791 ui_->SetFirstVisit(base::string16()); | 782 ui_->SetFirstVisit(base::string16()); |
| 792 return; | 783 return; |
| 793 } | 784 } |
| 794 | 785 |
| 795 bool visited_before_today = false; | 786 bool visited_before_today = false; |
| 796 base::Time today = base::Time::Now().LocalMidnight(); | 787 base::Time today = base::Time::Now().LocalMidnight(); |
| 797 base::Time first_visit_midnight = first_visit.LocalMidnight(); | 788 base::Time first_visit_midnight = first_visit.LocalMidnight(); |
| 798 visited_before_today = (first_visit_midnight < today); | 789 visited_before_today = (first_visit_midnight < today); |
| 799 | 790 |
| 800 base::string16 first_visit_text; | 791 base::string16 first_visit_text; |
| 801 if (visited_before_today) { | 792 if (visited_before_today) { |
| 802 first_visit_text = l10n_util::GetStringFUTF16( | 793 first_visit_text = l10n_util::GetStringFUTF16( |
| 803 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, | 794 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, |
| 804 base::TimeFormatShortDate(first_visit)); | 795 base::TimeFormatShortDate(first_visit)); |
| 805 } else { | 796 } else { |
| 806 first_visit_text = l10n_util::GetStringUTF16( | 797 first_visit_text = l10n_util::GetStringUTF16( |
| 807 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); | 798 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); |
| 808 } | 799 } |
| 809 ui_->SetFirstVisit(first_visit_text); | 800 ui_->SetFirstVisit(first_visit_text); |
| 810 } | 801 } |
| OLD | NEW |