Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(729)

Side by Side Diff: components/security_interstitials/core/ssl_error_ui.cc

Issue 2158113002: Update interstitials to match the new security indicators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows test fix Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/security_interstitials/core/common_string_util.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/security_interstitials/core/ssl_error_ui.h" 5 #include "components/security_interstitials/core/ssl_error_ui.h"
6 6
7 #include "base/i18n/time_formatting.h" 7 #include "base/i18n/time_formatting.h"
8 #include "components/security_interstitials/core/common_string_util.h" 8 #include "components/security_interstitials/core/common_string_util.h"
9 #include "components/security_interstitials/core/metrics_helper.h" 9 #include "components/security_interstitials/core/metrics_helper.h"
10 #include "components/ssl_errors/error_classification.h" 10 #include "components/ssl_errors/error_classification.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 controller_->metrics_helper()->RecordShutdownMetrics(); 59 controller_->metrics_helper()->RecordShutdownMetrics();
60 } 60 }
61 61
62 void SSLErrorUI::PopulateStringsForHTML(base::DictionaryValue* load_time_data) { 62 void SSLErrorUI::PopulateStringsForHTML(base::DictionaryValue* load_time_data) {
63 DCHECK(load_time_data); 63 DCHECK(load_time_data);
64 64
65 // Shared with other errors. 65 // Shared with other errors.
66 common_string_util::PopulateSSLLayoutStrings(cert_error_, load_time_data); 66 common_string_util::PopulateSSLLayoutStrings(cert_error_, load_time_data);
67 common_string_util::PopulateSSLDebuggingStrings(ssl_info_, time_triggered_, 67 common_string_util::PopulateSSLDebuggingStrings(ssl_info_, time_triggered_,
68 load_time_data); 68 load_time_data);
69 common_string_util::PopulateNewIconStrings(load_time_data);
69 70
70 // Shared values for both the overridable and non-overridable versions. 71 // Shared values for both the overridable and non-overridable versions.
71 load_time_data->SetBoolean("bad_clock", false); 72 load_time_data->SetBoolean("bad_clock", false);
72 load_time_data->SetString("tabTitle", 73 load_time_data->SetString("tabTitle",
73 l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE)); 74 l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE));
74 load_time_data->SetString("heading", 75 load_time_data->SetString("heading",
75 l10n_util::GetStringUTF16(IDS_SSL_V2_HEADING)); 76 l10n_util::GetStringUTF16(IDS_SSL_V2_HEADING));
76 load_time_data->SetString( 77 load_time_data->SetString(
77 "primaryParagraph", 78 "primaryParagraph",
78 l10n_util::GetStringFUTF16( 79 l10n_util::GetStringFUTF16(
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 NOTREACHED() << "Unsupported command: " << command; 190 NOTREACHED() << "Unsupported command: " << command;
190 case CMD_ERROR: 191 case CMD_ERROR:
191 case CMD_TEXT_FOUND: 192 case CMD_TEXT_FOUND:
192 case CMD_TEXT_NOT_FOUND: 193 case CMD_TEXT_NOT_FOUND:
193 // Commands are for testing. 194 // Commands are for testing.
194 break; 195 break;
195 } 196 }
196 } 197 }
197 198
198 } // security_interstitials 199 } // security_interstitials
OLDNEW
« no previous file with comments | « components/security_interstitials/core/common_string_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698