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

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

Issue 2858043004: Support interstitials with no primary button (Closed)
Patch Set: Fix iOS CanGoBack implementation Created 3 years, 7 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
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 69
70 // Shared values for both the overridable and non-overridable versions. 70 // Shared values for both the overridable and non-overridable versions.
71 load_time_data->SetBoolean("bad_clock", false); 71 load_time_data->SetBoolean("bad_clock", false);
72 load_time_data->SetBoolean("hide_primary_button", 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(
79 IDS_SSL_V2_PRIMARY_PARAGRAPH, 80 IDS_SSL_V2_PRIMARY_PARAGRAPH,
80 common_string_util::GetFormattedHostName(request_url_))); 81 common_string_util::GetFormattedHostName(request_url_)));
81 82
82 if (soft_override_enabled_) 83 if (soft_override_enabled_)
83 PopulateOverridableStrings(load_time_data); 84 PopulateOverridableStrings(load_time_data);
84 else 85 else
85 PopulateNonOverridableStrings(load_time_data); 86 PopulateNonOverridableStrings(load_time_data);
86 } 87 }
87 88
88 void SSLErrorUI::PopulateOverridableStrings( 89 void SSLErrorUI::PopulateOverridableStrings(
89 base::DictionaryValue* load_time_data) { 90 base::DictionaryValue* load_time_data) {
90 DCHECK(soft_override_enabled_); 91 DCHECK(soft_override_enabled_);
91 92
92 base::string16 url(common_string_util::GetFormattedHostName(request_url_)); 93 base::string16 url(common_string_util::GetFormattedHostName(request_url_));
93 ssl_errors::ErrorInfo error_info = ssl_errors::ErrorInfo::CreateError( 94 ssl_errors::ErrorInfo error_info = ssl_errors::ErrorInfo::CreateError(
94 ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_), 95 ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_),
95 ssl_info_.cert.get(), request_url_); 96 ssl_info_.cert.get(), request_url_);
96 97
97 load_time_data->SetBoolean("overridable", true); 98 load_time_data->SetBoolean("overridable", true);
99 load_time_data->SetBoolean("hide_primary_button", false);
98 load_time_data->SetString("explanationParagraph", error_info.details()); 100 load_time_data->SetString("explanationParagraph", error_info.details());
99 load_time_data->SetString( 101 load_time_data->SetString(
100 "primaryButtonText", 102 "primaryButtonText",
101 l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON)); 103 l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON));
102 load_time_data->SetString( 104 load_time_data->SetString(
103 "finalParagraph", 105 "finalParagraph",
104 l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH, url)); 106 l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH, url));
105 } 107 }
106 108
107 void SSLErrorUI::PopulateNonOverridableStrings( 109 void SSLErrorUI::PopulateNonOverridableStrings(
108 base::DictionaryValue* load_time_data) { 110 base::DictionaryValue* load_time_data) {
109 DCHECK(!soft_override_enabled_); 111 DCHECK(!soft_override_enabled_);
110 112
111 base::string16 url(common_string_util::GetFormattedHostName(request_url_)); 113 base::string16 url(common_string_util::GetFormattedHostName(request_url_));
112 ssl_errors::ErrorInfo::ErrorType type = 114 ssl_errors::ErrorInfo::ErrorType type =
113 ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_); 115 ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_);
114 116
115 load_time_data->SetBoolean("overridable", false); 117 load_time_data->SetBoolean("overridable", false);
118 load_time_data->SetBoolean("hide_primary_button", false);
116 load_time_data->SetString( 119 load_time_data->SetString(
117 "explanationParagraph", 120 "explanationParagraph",
118 l10n_util::GetStringFUTF16(IDS_SSL_NONOVERRIDABLE_MORE, url)); 121 l10n_util::GetStringFUTF16(IDS_SSL_NONOVERRIDABLE_MORE, url));
119 load_time_data->SetString("primaryButtonText", 122 load_time_data->SetString("primaryButtonText",
120 l10n_util::GetStringUTF16(IDS_SSL_RELOAD)); 123 l10n_util::GetStringUTF16(IDS_SSL_RELOAD));
121 124
122 // Customize the help link depending on the specific error type. 125 // Customize the help link depending on the specific error type.
123 // Only mark as HSTS if none of the more specific error types apply, 126 // Only mark as HSTS if none of the more specific error types apply,
124 // and use INVALID as a fallback if no other string is appropriate. 127 // and use INVALID as a fallback if no other string is appropriate.
125 load_time_data->SetInteger("errorType", type); 128 load_time_data->SetInteger("errorType", type);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 NOTREACHED() << "Unsupported command: " << command; 195 NOTREACHED() << "Unsupported command: " << command;
193 case CMD_ERROR: 196 case CMD_ERROR:
194 case CMD_TEXT_FOUND: 197 case CMD_TEXT_FOUND:
195 case CMD_TEXT_NOT_FOUND: 198 case CMD_TEXT_NOT_FOUND:
196 // Commands are for testing. 199 // Commands are for testing.
197 break; 200 break;
198 } 201 }
199 } 202 }
200 203
201 } // security_interstitials 204 } // security_interstitials
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698