| Index: components/security_interstitials/core/bad_clock_ui.cc
|
| diff --git a/components/security_interstitials/core/bad_clock_ui.cc b/components/security_interstitials/core/bad_clock_ui.cc
|
| index 7b39de7574d2a77bd92df3ed93bd7c7f978d3584..2b724a126ff9232d0681a1a50b95ec9a2462cf19 100644
|
| --- a/components/security_interstitials/core/bad_clock_ui.cc
|
| +++ b/components/security_interstitials/core/bad_clock_ui.cc
|
| @@ -10,12 +10,17 @@
|
| #include "grit/components_strings.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| +namespace network_time {
|
| +class NetworkTimeTracker;
|
| +}
|
| +
|
| namespace security_interstitials {
|
|
|
| BadClockUI::BadClockUI(const GURL& request_url,
|
| int cert_error,
|
| const net::SSLInfo& ssl_info,
|
| const base::Time& time_triggered,
|
| + const network_time::NetworkTimeTracker* network_time,
|
| const std::string& languages,
|
| ControllerClient* controller)
|
| : request_url_(request_url),
|
| @@ -23,13 +28,15 @@ BadClockUI::BadClockUI(const GURL& request_url,
|
| ssl_info_(ssl_info),
|
| time_triggered_(time_triggered),
|
| languages_(languages),
|
| - controller_(controller) {
|
| + controller_(controller),
|
| + network_time_(network_time) {
|
| controller_->metrics_helper()->RecordUserInteraction(
|
| security_interstitials::MetricsHelper::TOTAL_VISITS);
|
|
|
| // TODO(felt): Separate the clock statistics from the main ssl statistics.
|
| - ssl_errors::RecordUMAStatistics(false, time_triggered_, request_url_,
|
| - cert_error_, *ssl_info_.cert.get());
|
| + ssl_errors::RecordUMAStatistics(false, time_triggered_, network_time_,
|
| + request_url_, cert_error_,
|
| + *ssl_info_.cert.get());
|
| }
|
|
|
| BadClockUI::~BadClockUI() {
|
| @@ -54,9 +61,9 @@ void BadClockUI::PopulateClockStrings(base::DictionaryValue* load_time_data) {
|
| load_time_data->SetBoolean("overridable", false);
|
| load_time_data->SetBoolean("hide_primary_button",
|
| !controller_->CanLaunchDateAndTimeSettings());
|
| - int heading_string = ssl_errors::IsUserClockInTheFuture(time_triggered_)
|
| - ? IDS_CLOCK_ERROR_AHEAD_HEADING
|
| - : IDS_CLOCK_ERROR_BEHIND_HEADING;
|
| + int heading_string = ssl_errors::IsUserClockAhead(time_triggered_,
|
| + network_time_)
|
| + ? IDS_CLOCK_ERROR_AHEAD_HEADING : IDS_CLOCK_ERROR_BEHIND_HEADING;
|
| load_time_data->SetString("tabTitle",
|
| l10n_util::GetStringUTF16(IDS_CLOCK_ERROR_TITLE));
|
| load_time_data->SetString("heading",
|
|
|