Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout bug 1185173 for accidental landing. r=bustage DONTBUILD

Browse Source 
--HG--
extra : commitid : ruW5wmDxF6
This commit is contained in:
Chenxia Liu 2015-08-03 18:34:58 -07:00
parent a59a9d6068
commit 36fcd19a2d
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/base/SiteIdentity.java
View File

@ -150,7 +150,6 @@ public class SiteIdentity {
try {
JSONObject mode = identityData.getJSONObject("mode");
// TODO: Switch to "display" and "active"
try {
mMixedMode = MixedMode.fromString(mode.getString("mixed"));
} catch (Exception e) {

34
mobile/android/chrome/content/browser.js
View File

@ -7087,11 +7087,11 @@ var IdentityHandler = {
// No mixed content information. No mixed content icon is shown.
MIXED_MODE_UNKNOWN: "unknown",
// Blocked active mixed content.
MIXED_MODE_CONTENT_BLOCKED: "blocked",
// Blocked active mixed content. Shield icon is shown, with a popup option to load content.
MIXED_MODE_CONTENT_BLOCKED: "mixed_content_blocked",
// Loaded active mixed content.
MIXED_MODE_CONTENT_LOADED: "loaded",
// Loaded active mixed content. Yellow triangle icon is shown.
MIXED_MODE_CONTENT_LOADED: "mixed_content_loaded",
// The following tracking content modes are only used if tracking protection
// is enabled. Our Java frontend coalesces them into one indicator.
@ -7157,29 +7157,17 @@ var IdentityHandler = {
return this.IDENTITY_MODE_UNKNOWN;
},
getMixedDisplayMode: function getMixedDisplayMode(aState) {
if ((aState & Ci.nsIWebProgressListener.STATE_LOADED_MIXED_DISPLAY_CONTENT)) {
return this.MIXED_MODE_CONTENT_LOADED;
getMixedMode: function getMixedMode(aState) {
if (aState & Ci.nsIWebProgressListener.STATE_BLOCKED_MIXED_ACTIVE_CONTENT) {
return this.MIXED_MODE_CONTENT_BLOCKED;
}
if (aState & Ci.nsIWebProgressListener.STATE_BLOCKED_MIXED_DISPLAY_CONTENT) {
return this.MIXED_MODE_CONTENT_BLOCKED;
}
return this.MIXED_MODE_UNKNOWN;
},
getMixedActiveMode: function getActiveDisplayMode(aState) {
// Only show an indicator for loaded mixed content if the pref to block it is enabled
if ((aState & Ci.nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT) &&
!Services.prefs.getBoolPref("security.mixed_content.block_active_content")) {
return this.MIXED_MODE_CONTENT_LOADED;
}
if (aState & Ci.nsIWebProgressListener.STATE_BLOCKED_MIXED_ACTIVE_CONTENT) {
return this.MIXED_MODE_CONTENT_BLOCKED;
}
return this.MIXED_MODE_UNKNOWN;
},
@ -7230,17 +7218,13 @@ var IdentityHandler = {
this._lastLocation = locationObj;
let identityMode = this.getIdentityMode(aState);
let mixedDisplay = this.getMixedDisplayMode(aState);
let mixedActive = this.getMixedActiveMode(aState);
// let mixedMode = this.getMixedMode(aState);
let mixedMode = this.getMixedMode(aState);
let trackingMode = this.getTrackingMode(aState, aBrowser);
let result = {
origin: locationObj.origin,
mode: {
identity: identityMode,
mixed_display: mixedDisplay,
mixed_active: mixedActive,
// mixed: mixedMode,
mixed: mixedMode,
tracking: trackingMode
}
};