Bug 571812 - Remove setIcon (followup fix) [r=vingtetun]
--- a/mobile/chrome/content/bindings/browser.xml
+++ b/mobile/chrome/content/bindings/browser.xml
@@ -73,29 +73,25 @@
<field name="_ios">
Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
</field>
<method name="receiveMessage">
<parameter name="aMessage"/>
<body><![CDATA[
switch (aMessage.name) {
- case "DOMContentLoaded":
- let data = aMessage.json;
- if (this.mIconURL == "") {
- this.mIconURL = this.documentURI.prePath + "/favicon.ico";
- }
- break;
-
case "DOMPopupBlocked":
this.onPopupBlocked(aMessage);
break;
case "pageshow":
this.onPageShow(aMessage);
+
+ if (this.mIconURL == "")
+ this.mIconURL = this.documentURI.prePath + "/favicon.ico";
break;
case "pagehide":
this.onPageHide(aMessage);
break;
case "DOMTitleChanged":
this._contentTitle = aMessage.json.title;
@@ -368,17 +364,16 @@
}
try {
var securityUI = this.securityUI;
}
catch (e) {
}
messageManager.loadFrameScript("chrome://browser/content/bindings/browser.js", true);
- messageManager.addMessageListener("DOMContentLoaded", this);
messageManager.addMessageListener("DOMTitleChanged", this);
messageManager.addMessageListener("DOMLinkAdded", this);
// Listen for first load for lazy attachment to form fill controller
messageManager.addMessageListener("pageshow", this);
messageManager.addMessageListener("pagehide", this);
messageManager.addMessageListener("DOMPopupBlocked", this);