Bug 1390260 - make customize mode work in popup windows, r?mkaply
MozReview-Commit-ID: 7lokGRuqNHv
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -198,16 +198,31 @@ CustomizeMode.prototype = {
win.addEventListener("unload", unregisterGlobalTab);
if (gTab.selected) {
win.gCustomizeMode.enter();
}
},
enter() {
+ if (!this.window.toolbar.visible) {
+ let w = this.window.getTopWin(true);
+ if (w) {
+ w.gCustomizeMode.enter();
+ return;
+ }
+ let obs = () => {
+ Services.obs.removeObserver(obs, "browser-delayed-startup-finished");
+ w = this.window.getTopWin(true);
+ w.gCustomizeMode.enter();
+ };
+ Services.obs.addObserver(obs, "browser-delayed-startup-finished");
+ this.window.openUILinkIn("about:newtab", "window");
+ return;
+ }
this._wantToBeInCustomizeMode = true;
if (this._customizing || this._handler.isEnteringCustomizeMode) {
return;
}
// Exiting; want to re-enter once we've done that.
if (this._handler.isExitingCustomizeMode) {