Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java |
index ac84f0a90b9a080998e5bbd96352a7eb8e2cb125..cb4c14b345527428e0bf76a0ccd6efa22e34fd9d 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java |
@@ -54,9 +54,8 @@ import org.chromium.chrome.browser.preferences.Preferences; |
import org.chromium.chrome.browser.preferences.PreferencesLauncher; |
import org.chromium.chrome.browser.preferences.website.SingleWebsitePreferences; |
import org.chromium.chrome.browser.profiles.Profile; |
-import org.chromium.chrome.browser.ssl.ConnectionSecurity; |
import org.chromium.chrome.browser.ssl.ConnectionSecurityLevel; |
-import org.chromium.chrome.browser.toolbar.ToolbarModel; |
+import org.chromium.chrome.browser.ssl.SecurityStateModel; |
import org.chromium.content.browser.ContentViewCore; |
import org.chromium.content_public.browser.WebContents; |
import org.chromium.content_public.browser.WebContentsObserver; |
@@ -266,9 +265,12 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList |
// The security level of the page (a valid ConnectionSecurityLevel). |
private int mSecurityLevel; |
- // Whether the security level of the page was deprecated due to SHA-1. |
+ // Whether the security level of the page was downgraded due to SHA-1. |
private boolean mDeprecatedSHA1Present; |
+ // Whether the security level of the page was downgraded due to passive mixed content. |
+ private boolean mPassiveMixedContentPresent; |
+ |
// Whether to use the read-only permissions list. |
private boolean mIsReadOnlyDialog; |
@@ -422,8 +424,9 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList |
mParsedUrl = null; |
mIsInternalPage = false; |
} |
- mSecurityLevel = ConnectionSecurity.getSecurityLevelForWebContents(mWebContents); |
- mDeprecatedSHA1Present = ToolbarModel.isDeprecatedSHA1Present(mWebContents); |
+ mSecurityLevel = SecurityStateModel.getSecurityLevelForWebContents(mWebContents); |
+ mDeprecatedSHA1Present = SecurityStateModel.isDeprecatedSHA1Present(mWebContents); |
+ mPassiveMixedContentPresent = SecurityStateModel.isPassiveMixedContentPresent(mWebContents); |
SpannableStringBuilder urlBuilder = new SpannableStringBuilder(mFullUrl); |
OmniboxUrlEmphasizer.emphasizeUrl(urlBuilder, mContext.getResources(), mProfile, |
@@ -506,9 +509,6 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList |
case ConnectionSecurityLevel.SECURE: |
case ConnectionSecurityLevel.EV_SECURE: |
return R.string.page_info_connection_https; |
- case ConnectionSecurityLevel.SECURITY_WARNING: |
- case ConnectionSecurityLevel.SECURITY_POLICY_WARNING: |
- return R.string.page_info_connection_mixed; |
default: |
assert false : "Invalid security level specified: " + securityLevel; |
return R.string.page_info_connection_http; |
@@ -532,7 +532,12 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList |
if (mDeprecatedSHA1Present) { |
messageBuilder.append( |
mContext.getResources().getString(R.string.page_info_connection_sha1)); |
- } else if (mSecurityLevel != ConnectionSecurityLevel.SECURITY_ERROR) { |
+ } else if (mPassiveMixedContentPresent) { |
+ messageBuilder.append( |
+ mContext.getResources().getString(R.string.page_info_connection_mixed)); |
+ } else if (mSecurityLevel != ConnectionSecurityLevel.SECURITY_ERROR |
+ && mSecurityLevel != ConnectionSecurityLevel.SECURITY_WARNING |
+ && mSecurityLevel != ConnectionSecurityLevel.SECURITY_POLICY_WARNING) { |
messageBuilder.append(mContext.getResources().getString( |
getConnectionMessageId(mSecurityLevel, mIsInternalPage))); |
} else { |