diff options
| author | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 05:12:47 +0000 |
|---|---|---|
| committer | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 05:12:47 +0000 |
| commit | 09581d136b18b40ba6220587c355b3488cd5b6eb (patch) | |
| tree | e0ae195368c2637b476eaf5a962b5e22f9be107e /chrome/browser/ssl | |
| parent | 5b300db2d57a342011f945706b48691683aaefbf (diff) | |
| download | chromium_src-09581d136b18b40ba6220587c355b3488cd5b6eb.zip chromium_src-09581d136b18b40ba6220587c355b3488cd5b6eb.tar.gz chromium_src-09581d136b18b40ba6220587c355b3488cd5b6eb.tar.bz2 | |
Adding the computer's current date to invalid cert error.
BUG=115652
TEST=
Review URL: http://codereview.chromium.org/9447060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_error_info.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index 2859e4d..116cb78 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -1,9 +1,10 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/ssl/ssl_error_info.h" +#include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" #include "chrome/common/time_format.h" #include "content/browser/cert_store.h" @@ -72,9 +73,11 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type, l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXTRA_INFO_1)); if (cert->HasExpired()) { title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXPIRED_TITLE); - details = l10n_util::GetStringFUTF16(IDS_CERT_ERROR_EXPIRED_DETAILS, - UTF8ToUTF16(request_url.host()), - UTF8ToUTF16(request_url.host())); + details = l10n_util::GetStringFUTF16( + IDS_CERT_ERROR_EXPIRED_DETAILS, + UTF8ToUTF16(request_url.host()), + UTF8ToUTF16(request_url.host()), + base::TimeFormatFriendlyDateAndTime(base::Time::Now())); short_description = l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXPIRED_DESCRIPTION); extra_info.push_back(l10n_util::GetStringUTF16( @@ -87,7 +90,8 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type, details = l10n_util::GetStringFUTF16( IDS_CERT_ERROR_NOT_YET_VALID_DETAILS, UTF8ToUTF16(request_url.host()), - UTF8ToUTF16(request_url.host())); + UTF8ToUTF16(request_url.host()), + base::TimeFormatFriendlyDateAndTime(base::Time::Now())); short_description = l10n_util::GetStringUTF16(IDS_CERT_ERROR_NOT_YET_VALID_DESCRIPTION); extra_info.push_back( |