Bug 838359 - Don't show the triangle icon for mixed active content unless the preference to disable mixed active content is turned on. r=dolske

This commit is contained in:
Tanvi Vyas 2013-02-16 20:08:53 -08:00
parent f24935200f
commit 2d328e12a1

View File

@ -6889,7 +6889,8 @@ var gIdentityHandler = {
} else if (state & nsIWebProgressListener.STATE_IS_SECURE) { } else if (state & nsIWebProgressListener.STATE_IS_SECURE) {
this.setMode(this.IDENTITY_MODE_DOMAIN_VERIFIED); this.setMode(this.IDENTITY_MODE_DOMAIN_VERIFIED);
} else if (state & nsIWebProgressListener.STATE_IS_BROKEN) { } else if (state & nsIWebProgressListener.STATE_IS_BROKEN) {
if (state & nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT) { if ((state & nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT) &&
gPrefService.getBoolPref("security.mixed_content.block_active_content")) {
this.setMode(this.IDENTITY_MODE_MIXED_ACTIVE_CONTENT); this.setMode(this.IDENTITY_MODE_MIXED_ACTIVE_CONTENT);
} else { } else {
this.setMode(this.IDENTITY_MODE_MIXED_CONTENT); this.setMode(this.IDENTITY_MODE_MIXED_CONTENT);