diff --git a/mobile/chrome/content/bindings/browser.xml b/mobile/chrome/content/bindings/browser.xml index d9212fdca574..41e9257ffe38 100644 --- a/mobile/chrome/content/bindings/browser.xml +++ b/mobile/chrome/content/bindings/browser.xml @@ -103,13 +103,17 @@ this.onPageShow(aMessage); if (this.mIconURL == "" && this._documentURI) { - // Use documentURIObject in the favicon construction so that we - // do the right thing with about:-style error pages. Bug 515188 - let iconURI = Services.io.newURI(this.documentURI.prePath + "/favicon.ico", null, null); - if (!iconURI.schemeIs("javascript") && !gFaviconService.isFailedFavicon(iconURI)) { - gFaviconService.setAndLoadFaviconForPage(this.currentURI, iconURI, true); - this.mIconURL = iconURI.spec; + // newURI call is throwing for chrome URI + try { + // Use documentURIObject in the favicon construction so that we + // do the right thing with about:-style error pages. Bug 515188 + let iconURI = Services.io.newURI(this.documentURI.prePath + "/favicon.ico", null, null); + if (!iconURI.schemeIs("javascript") && !gFaviconService.isFailedFavicon(iconURI)) { + gFaviconService.setAndLoadFaviconForPage(this.currentURI, iconURI, true); + this.mIconURL = iconURI.spec; + } } + catch(e) {} } break; @@ -449,7 +453,7 @@ LOAD_FLAGS_ALLOW_POPUPS: 32768, LOAD_FLAGS_BYPASS_CLASSIFIER: 65536, LOAD_FLAGS_FORCE_ALLOW_COOKIES: 131072, - + STOP_NETWORK: 1, STOP_CONTENT: 2, STOP_ALL: 3, diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js index 09d15a562942..a7b28420374a 100644 --- a/mobile/chrome/content/browser-ui.js +++ b/mobile/chrome/content/browser-ui.js @@ -943,7 +943,7 @@ var BrowserUI = { this._edit.blur(); MenuListHelperUI.show({ - title: "TTTTTTTTTTTTTTTTTTTTTTTTTTEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEESSSSSSSSSSSSSSSSSTTTTTTTTTTTT" || Elements.browserBundle.getString("opensearch.searchWith"), + title: Elements.browserBundle.getString("opensearch.searchWith"), menupopup: { children: BrowserSearch.engines }, set selectedIndex(aIndex) { let name = this.menupopup.children[aIndex].label;