diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index f7ac345e10ec..8f641c3331a2 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(); diff --git a/browser/base/content/test/general/browser_bug1299667.js b/browser/base/content/test/general/browser_bug1299667.js index 50289f9faf87..1c1042c82f54 100644 --- a/browser/base/content/test/general/browser_bug1299667.js +++ b/browser/base/content/test/general/browser_bug1299667.js @@ -35,6 +35,7 @@ add_task(function* () { var backButton = document.getElementById("back-button"); var contextMenu = document.getElementById("backForwardMenu"); + var rect = backButton.getBoundingClientRect(); info("waiting for the history menu to open");