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

Side by Side Diff: components/security_state/content/content_utils.cc

Issue 2917873004: Implement 'Not secure' warning for non-secure pages in Incognito mode (Closed)
Patch Set: Remove obsolete includes Created 3 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_state/content/content_utils.h" 5 #include "components/security_state/content/content_utils.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 return state; 176 return state;
177 } 177 }
178 178
179 blink::WebSecurityStyle GetSecurityStyle( 179 blink::WebSecurityStyle GetSecurityStyle(
180 const security_state::SecurityInfo& security_info, 180 const security_state::SecurityInfo& security_info,
181 content::SecurityStyleExplanations* security_style_explanations) { 181 content::SecurityStyleExplanations* security_style_explanations) {
182 const blink::WebSecurityStyle security_style = 182 const blink::WebSecurityStyle security_style =
183 SecurityLevelToSecurityStyle(security_info.security_level); 183 SecurityLevelToSecurityStyle(security_info.security_level);
184 184
185 // The HTTP_SHOW_WARNING state may occur if the page is served as a data: URI 185 if (security_info.security_level == security_state::HTTP_SHOW_WARNING) {
186 // or if it is served non-securely AND contains a sensitive form field. 186 if (security_info.displayed_password_field_on_http ||
187 if (security_info.security_level == security_state::HTTP_SHOW_WARNING && 187 security_info.displayed_credit_card_field_on_http) {
188 (security_info.displayed_password_field_on_http || 188 security_style_explanations->neutral_explanations.push_back(
189 security_info.displayed_credit_card_field_on_http)) { 189 content::SecurityStyleExplanation(
190 security_style_explanations->neutral_explanations.push_back( 190 l10n_util::GetStringUTF8(IDS_PRIVATE_USER_DATA_INPUT),
191 content::SecurityStyleExplanation( 191 l10n_util::GetStringUTF8(
192 l10n_util::GetStringUTF8(IDS_PRIVATE_USER_DATA_INPUT), 192 IDS_PRIVATE_USER_DATA_INPUT_DESCRIPTION)));
193 l10n_util::GetStringUTF8(IDS_PRIVATE_USER_DATA_INPUT_DESCRIPTION))); 193 }
194 if (security_info.incognito_downgraded_security_level) {
195 security_style_explanations->neutral_explanations.push_back(
196 content::SecurityStyleExplanation(
197 l10n_util::GetStringUTF8(IDS_INCOGNITO_NONSECURE),
198 l10n_util::GetStringUTF8(IDS_INCOGNITO_NONSECURE_DESCRIPTION)));
199 }
194 } 200 }
201
195 security_style_explanations->ran_insecure_content_style = 202 security_style_explanations->ran_insecure_content_style =
196 SecurityLevelToSecurityStyle(security_state::kRanInsecureContentLevel); 203 SecurityLevelToSecurityStyle(security_state::kRanInsecureContentLevel);
197 security_style_explanations->displayed_insecure_content_style = 204 security_style_explanations->displayed_insecure_content_style =
198 SecurityLevelToSecurityStyle( 205 SecurityLevelToSecurityStyle(
199 security_state::kDisplayedInsecureContentLevel); 206 security_state::kDisplayedInsecureContentLevel);
200 207
201 if (security_info.malicious_content_status != 208 if (security_info.malicious_content_status !=
202 security_state::MALICIOUS_CONTENT_STATUS_NONE) { 209 security_state::MALICIOUS_CONTENT_STATUS_NONE) {
203 security_style_explanations->summary = 210 security_style_explanations->summary =
204 l10n_util::GetStringUTF8(IDS_SAFEBROWSING_WARNING); 211 l10n_util::GetStringUTF8(IDS_SAFEBROWSING_WARNING);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 content::SecurityStyleExplanation( 315 content::SecurityStyleExplanation(
309 l10n_util::GetStringUTF8(IDS_PRIVATE_KEY_PINNING_BYPASSED), 316 l10n_util::GetStringUTF8(IDS_PRIVATE_KEY_PINNING_BYPASSED),
310 l10n_util::GetStringUTF8( 317 l10n_util::GetStringUTF8(
311 IDS_PRIVATE_KEY_PINNING_BYPASSED_DESCRIPTION))); 318 IDS_PRIVATE_KEY_PINNING_BYPASSED_DESCRIPTION)));
312 } 319 }
313 320
314 return security_style; 321 return security_style;
315 } 322 }
316 323
317 } // namespace security_state 324 } // namespace security_state
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698