Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-11-04 11:24:13 +01:00
commit 59d55de411
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
browser/base/content/browser.js
View File

@ -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();

1
browser/base/content/test/general/browser_bug1299667.js
View File

@ -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");