chrome/browser/page_info_model.cc - Issue 2126005: Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/page_info_model.cc

Issue 2126005: Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/page_info_model.cc

===================================================================

--- chrome/browser/page_info_model.cc (revision 47426)

+++ chrome/browser/page_info_model.cc (working copy)

@@ -138,13 +138,14 @@

IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,

subject_name,

IntToString16(ssl.security_bits())));

- if (ssl.has_mixed_content()) {

+ if (ssl.displayed_mixed_content() || ssl.ran_mixed_content()) {

state = false;

description.assign(

l10n_util::GetStringFUTF16(

IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK,

description,

- l10n_util::GetStringUTF16(

+ l10n_util::GetStringUTF16(ssl.ran_mixed_content() ?

+ IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_ERROR :

IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_WARNING)));

}

« no previous file with comments | « chrome/browser/external_tab_container.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | chrome/browser/ssl/ssl_browser_tests.cc » ('J')