diff --git a/addon-sdk/source/lib/sdk/input/browser.js b/addon-sdk/source/lib/sdk/input/browser.js index 8118b73cbf2a..daea875bffbc 100644 --- a/addon-sdk/source/lib/sdk/input/browser.js +++ b/addon-sdk/source/lib/sdk/input/browser.js @@ -17,7 +17,7 @@ const { Sequence, seq, filter, object, pairs } = require("../util/sequence"); // When iterated over belowe sequences items will represent // state of windows at the time of iteration. const opened = seq(function*() { - const items = windows("navigator:browser", {includePrivates: true}); + const items = windows("navigator:browser", {includePrivate: true}); for (let item of items) { yield [getOuterId(item), item]; } diff --git a/addon-sdk/source/lib/sdk/ui/toolbar/view.js b/addon-sdk/source/lib/sdk/ui/toolbar/view.js index 1605ab12a8bd..4ef0c3d46571 100644 --- a/addon-sdk/source/lib/sdk/ui/toolbar/view.js +++ b/addon-sdk/source/lib/sdk/ui/toolbar/view.js @@ -23,6 +23,7 @@ const { curry, flip } = require("../../lang/functional"); const { patch, diff } = require("diffpatcher/index"); const prefs = require("../../preferences/service"); const { getByOuterId } = require("../../window/utils"); +const { ignoreWindow } = require('../../private-browsing/utils'); const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; const PREF_ROOT = "extensions.sdk-toolbar-collapsed."; @@ -85,7 +86,10 @@ const attributesChanged = mutations => { // Utility function creates `toolbar` with a "close" button and returns // it back. In addition it set's up a listener and observer to communicate // state changes. -const addView = curry((options, {document}) => { +const addView = curry((options, {document, window}) => { + if (ignoreWindow(window)) + return; + let view = document.createElementNS(XUL_NS, "toolbar"); view.setAttribute("id", options.id); view.setAttribute("collapsed", options.collapsed); diff --git a/addon-sdk/source/test/test-ui-toolbar.js b/addon-sdk/source/test/test-ui-toolbar.js index 32d21235efa0..30217b3006c9 100644 --- a/addon-sdk/source/test/test-ui-toolbar.js +++ b/addon-sdk/source/test/test-ui-toolbar.js @@ -492,4 +492,20 @@ exports["test button are attached to toolbar"] = function*(assert) { yield cleanUI(); }; +exports["test toolbar are not in private windows"] = function*(assert) { + const w = open(null, {features: {toolbar: true, private: true}}); + + yield ready(w); + + const t = new Toolbar({title: "foo"}); + + yield wait(t, "attach"); + + assert.ok(!isAttached(t), "toolbar wasn't actually attached"); + + t.destroy(); + + yield cleanUI(); +} + require("sdk/test").run(module.exports);