Commit 6a6b5899 authored by felt@chromium.org's avatar felt@chromium.org

Always show SSL error code at bottom of interstitial

Previously, the SSL interstitial only displayed this for the non-overridable pages. Now it displays it for all SSL errors.

BUG=

Review URL: https://codereview.chromium.org/407693003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284528 0039d316-1c4b-4281-b951-d872f2087c98
parent 71c63dc7
...@@ -14,6 +14,8 @@ function setupEvents() { ...@@ -14,6 +14,8 @@ function setupEvents() {
if (ssl) { if (ssl) {
$('body').classList.add('ssl'); $('body').classList.add('ssl');
setupSSLFinchTrial(); /* From ssl_errors_common.js. */ setupSSLFinchTrial(); /* From ssl_errors_common.js. */
$('error-code').textContent = loadTimeData.getString('errorCode');
$('error-code').classList.remove('hidden');
} else { } else {
$('body').classList.add('safe-browsing'); $('body').classList.add('safe-browsing');
setupMalwareFinchExperiment(); /* From safe_browsing_v3.js. */ setupMalwareFinchExperiment(); /* From safe_browsing_v3.js. */
...@@ -50,11 +52,6 @@ function setupEvents() { ...@@ -50,11 +52,6 @@ function setupEvents() {
}); });
} }
if (ssl && !overridable) {
$('error-code').textContent = loadTimeData.getString('errorCode');
$('error-code').classList.remove('hidden');
}
if (ssl && $('clock-link')) { if (ssl && $('clock-link')) {
$('clock-link').addEventListener('click', function(event) { $('clock-link').addEventListener('click', function(event) {
sendCommand(CMD_CLOCK); sendCommand(CMD_CLOCK);
......
...@@ -511,6 +511,7 @@ std::string SSLBlockingPage::GetHTMLContentsV2() { ...@@ -511,6 +511,7 @@ std::string SSLBlockingPage::GetHTMLContentsV2() {
load_time_data.SetString( load_time_data.SetString(
"closeDetails", "closeDetails",
l10n_util::GetStringUTF16(IDS_SSL_V2_CLOSE_DETAILS_BUTTON)); l10n_util::GetStringUTF16(IDS_SSL_V2_CLOSE_DETAILS_BUTTON));
load_time_data.SetString("errorCode", net::ErrorToString(cert_error_));
if (overridable_ && !strict_enforcement_) { // Overridable. if (overridable_ && !strict_enforcement_) { // Overridable.
SSLErrorInfo error_info = SSLErrorInfo error_info =
...@@ -557,7 +558,6 @@ std::string SSLBlockingPage::GetHTMLContentsV2() { ...@@ -557,7 +558,6 @@ std::string SSLBlockingPage::GetHTMLContentsV2() {
} }
load_time_data.SetString( load_time_data.SetString(
"finalParagraph", l10n_util::GetStringFUTF16(help_string, url)); "finalParagraph", l10n_util::GetStringFUTF16(help_string, url));
load_time_data.SetString("errorCode", net::ErrorToString(cert_error_));
} }
base::StringPiece html( base::StringPiece html(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment