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

Bug 294815 - Possible to create a <browser> with no securityUI by accident, r=bz, a=brendan

Browse Source
This commit is contained in:
mconnor@steelgryphon.com
2005-05-20 02:09:09 +00:00
parent f58463f144
commit 281df22269
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3352,16 +3352,9 @@ nsBrowserStatusHandler.prototype =
}
var securityUI = gBrowser.securityUI;
if (securityUI) {
this.securityButton.setAttribute("tooltiptext", securityUI.tooltipText);
if (this.urlBar)
this.urlBar.setAttribute("infotext", securityUI.tooltipText);
}
else {
this.securityButton.setAttribute("tooltiptext", securityUI.tooltipText);
if (this.urlBar)
this.urlBar.removeAttribute("infotext");
}
this.securityButton.setAttribute("tooltiptext", securityUI.tooltipText);
if (this.urlBar)
this.urlBar.setAttribute("infotext", securityUI.tooltipText);
},
startDocumentLoad : function(aRequest)

35
toolkit/content/widgets/browser.xml
View File

@@ -484,9 +484,28 @@
null
</field>
<property name="securityUI"
onget="return this.docShell.securityUI;"
onset="this.docShell.securityUI = val;"/>
<property name="securityUI">
<getter>
<![CDATA[
if (!this.docShell.securityUI) {
const SECUREBROWSERUI_CONTRACTID = "@mozilla.org/secure_browser_ui;1";
if (!this.hasAttribute("disablesecurity") &&
SECUREBROWSERUI_CONTRACTID in Components.classes) {
var securityUI = Components.classes[SECUREBROWSERUI_CONTRACTID]
.createInstance(Components.interfaces.nsISecureBrowserUI);
securityUI.init(this.contentWindow);
}
}
return this.docShell.securityUI;
]]>
</getter>
<setter>
<![CDATA[
this.docShell.securityUI = val;
]]>
</setter>
</property>
<field name="userTypedClear">
true
@@ -540,16 +559,6 @@
}
catch (e) {
}
try {
const SECUREBROWSERUI_CONTRACTID = "@mozilla.org/secure_browser_ui;1";
if (!this.hasAttribute("disablesecurity") &&
SECUREBROWSERUI_CONTRACTID in Components.classes) {
var securityUI = Components.classes[SECUREBROWSERUI_CONTRACTID].createInstance(Components.interfaces.nsISecureBrowserUI);
securityUI.init(this.contentWindow);
}
}
catch (e) {
}
// Listen for first load for lazy attachment to form fill controller
this.addEventListener("load", this.onLoad, true);