From 2d328e12a18d2eacf54bd9ad9bbc692cf607895a Mon Sep 17 00:00:00 2001 From: Tanvi Vyas Date: Sat, 16 Feb 2013 20:08:53 -0800 Subject: [PATCH] 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 --- browser/base/content/browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 3638d2f9079..11d6685754f 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6889,7 +6889,8 @@ var gIdentityHandler = { } else if (state & nsIWebProgressListener.STATE_IS_SECURE) { this.setMode(this.IDENTITY_MODE_DOMAIN_VERIFIED); } 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); } else { this.setMode(this.IDENTITY_MODE_MIXED_CONTENT);