Bug 571895 - Stop using nsILoadGroup to get URI [r=vingtetun]
authorMark Finkle <mfinkle@mozilla.com>
Mon, 14 Jun 2010 12:59:09 -0400
changeset 66285 319f17290cd59cb58b53418396aca17036f31b4b
parent 66284 4d0e90b743161f0a47a3425d33ce9de3fa6ddefb
child 66286 d20643c6f46343b89dbb8430605e804ba780e346
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvingtetun
bugs571895
Bug 571895 - Stop using nsILoadGroup to get URI [r=vingtetun]
mobile/chrome/content/browser-ui.js
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -473,24 +473,16 @@ var BrowserUI = {
     else {
       this._favicon.hidden = false;
       this._throbber.hidden = true;
       this._throbber.removeAttribute("loading");
     }
   },
 
   getDisplayURI : function(browser) {
-    let loadGroup = browser.webNavigation.QueryInterface(Ci.nsIDocumentLoader).loadGroup;
-    if (loadGroup.activeCount && loadGroup.defaultLoadRequest) {
-      // browser.currentURI may not be valid if the request is still active.
-      // For chrome URIs especially, we want the urlbar during loading to use the
-      // "original" URI (about:home), not a rewritten one (jar:file:///...).
-      return loadGroup.defaultLoadRequest.QueryInterface(Ci.nsIChannel).originalURI.spec;
-    }
-
     if (!this._URIFixup)
       this._URIFixup = Cc["@mozilla.org/docshell/urifixup;1"].getService(Ci.nsIURIFixup);
 
     let uri = browser.currentURI;
     try {
       uri = this._URIFixup.createExposableURI(uri);
     } catch (ex) {}