corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1146677 - A user disabling mixed content blocking should not affect the site identity icon or messages. r=dolske

Browse Source
This commit is contained in:
Tanvi Vyas
2015-04-15 10:12:36 -07:00
parent 9299a3b105
commit cc9a164cbb
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/base/content/browser.js
View File

@@ -6837,11 +6837,9 @@ 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) &&
gPrefService.getBoolPref("security.mixed_content.block_active_content")) {
if (state & nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT) {
this.setMode(this.IDENTITY_MODE_MIXED_ACTIVE_LOADED);
} else if ((state & nsIWebProgressListener.STATE_BLOCKED_MIXED_ACTIVE_CONTENT) &&
gPrefService.getBoolPref("security.mixed_content.block_active_content")) {
} else if (state & nsIWebProgressListener.STATE_BLOCKED_MIXED_ACTIVE_CONTENT) {
this.setMode(this.IDENTITY_MODE_MIXED_DISPLAY_LOADED_ACTIVE_BLOCKED);
} else {
this.setMode(this.IDENTITY_MODE_MIXED_DISPLAY_LOADED);