From da760bfc3f686ea4fbc139c30096535d643cbbc3 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 4 Nov 2016 11:52:30 +0100
Subject: [PATCH] Bug 1300376 - fix bustage on a CLOSED TREE

---
 browser/base/content/browser.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index b0923a9c1358..d128d0f9733b 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -50,7 +50,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
   ["TelemetryStopwatch", "resource://gre/modules/TelemetryStopwatch.jsm"],
   ["Translation", "resource:///modules/translation/Translation.jsm"],
   ["UITour", "resource:///modules/UITour.jsm"],
-  ["URLBarZoom", "resource:///modules/URLBarZoom.jsm"],
   ["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"],
   ["Weave", "resource://services-sync/main.js"],
   ["fxAccounts", "resource://gre/modules/FxAccounts.jsm"],
@@ -4483,13 +4482,16 @@ var XULBrowserWindow = {
       }
 
       URLBarSetURI(aLocationURI);
+
       BookmarkingUI.onLocationChange();
+
       gIdentityHandler.onLocationChange();
+
       SocialUI.updateState();
+
       UITour.onLocationChange(location);
+
       gTabletModePageCounter.inc();
-      ReaderParent.updateReaderButton(gBrowser.selectedBrowser);
-      URLBarZoom.updateZoomButton(gBrowser.selectedBrowser, "browser-fullZoom:location-change");
 
       // Utility functions for disabling find
       var shouldDisableFind = function shouldDisableFind(aDocument) {
@@ -4543,6 +4545,7 @@ var XULBrowserWindow = {
       }
     }
     UpdateBackForwardCommands(gBrowser.webNavigation);
+    ReaderParent.updateReaderButton(gBrowser.selectedBrowser);
 
     gGestureSupport.restoreRotationState();