summaryrefslogtreecommitdiffstats
path: root/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@wolfbeast.com>2019-03-25 18:03:03 +0100
committerGitHub <noreply@github.com>2019-03-25 18:03:03 +0100
commitaa816b3d848d38c83204c3dd1a1d0b86013978b4 (patch)
treee96cabae4a274f8bf5a53c12a9b200fbf47d74f1 /toolkit/components/thumbnails/BackgroundPageThumbs.jsm
parent24b1f14e0264152242a260dbc7e48b62206d1b17 (diff)
parent1413b3d6fd7297014d35d862abc792dc30c1ec24 (diff)
downloadUXP-aa816b3d848d38c83204c3dd1a1d0b86013978b4.tar
UXP-aa816b3d848d38c83204c3dd1a1d0b86013978b4.tar.gz
UXP-aa816b3d848d38c83204c3dd1a1d0b86013978b4.tar.lz
UXP-aa816b3d848d38c83204c3dd1a1d0b86013978b4.tar.xz
UXP-aa816b3d848d38c83204c3dd1a1d0b86013978b4.zip
Merge pull request #834 from g4jc/remove_contextid
Issue #756 - Remove Contextual Identity
Diffstat (limited to 'toolkit/components/thumbnails/BackgroundPageThumbs.jsm')
-rw-r--r--toolkit/components/thumbnails/BackgroundPageThumbs.jsm40
1 files changed, 1 insertions, 39 deletions
diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
index 3ba0c346c..3ed32665d 100644
--- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
+++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
@@ -15,8 +15,6 @@ const TELEMETRY_HISTOGRAM_ID_PREFIX = "FX_THUMBNAILS_BG_";
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
const HTML_NS = "http://www.w3.org/1999/xhtml";
-const ABOUT_NEWTAB_SEGREGATION_PREF = "privacy.usercontext.about_newtab_segregation.enabled";
-
const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
@@ -37,8 +35,6 @@ XPCOMUtils.defineConstant(this, "TEL_CAPTURE_DONE_TIMEOUT", TEL_CAPTURE_DONE_TIM
XPCOMUtils.defineConstant(this, "TEL_CAPTURE_DONE_CRASHED", TEL_CAPTURE_DONE_CRASHED);
XPCOMUtils.defineConstant(this, "TEL_CAPTURE_DONE_BAD_URI", TEL_CAPTURE_DONE_BAD_URI);
-XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
- "resource://gre/modules/ContextualIdentityService.jsm");
const global = this;
// contains base64 version of a placeholder thumbnail
@@ -139,14 +135,6 @@ const BackgroundPageThumbs = {
}),
/**
- * Tell the service that the thumbnail browser should be recreated at next
- * call of _ensureBrowser().
- */
- renewThumbnailBrowser: function() {
- this._renewThumbBrowser = true;
- },
-
- /**
* Ensures that initialization of the thumbnail browser's parent window has
* begun.
*
@@ -201,12 +189,9 @@ const BackgroundPageThumbs = {
* Creates the thumbnail browser if it doesn't already exist.
*/
_ensureBrowser: function () {
- if (this._thumbBrowser && !this._renewThumbBrowser)
+ if (this._thumbBrowser)
return;
- this._destroyBrowser();
- this._renewThumbBrowser = false;
-
let browser = this._parentWin.document.createElementNS(XUL_NS, "browser");
browser.setAttribute("type", "content");
browser.setAttribute("disableglobalhistory", "true");
@@ -216,13 +201,6 @@ const BackgroundPageThumbs = {
browser.setAttribute("remote", "true");
}
- if (Services.prefs.getBoolPref(ABOUT_NEWTAB_SEGREGATION_PREF)) {
- // Use the private container for thumbnails.
- let privateIdentity =
- ContextualIdentityService.getPrivateIdentity("userContextIdInternal.thumbnail");
- browser.setAttribute("usercontextid", privateIdentity.userContextId);
- }
-
// Size the browser. Make its aspect ratio the same as the canvases' that
// the thumbnails are drawn into; the canvases' aspect ratio is the same as
// the screen's, so use that. Aim for a size in the ballpark of 1024x768.
@@ -325,14 +303,6 @@ const BackgroundPageThumbs = {
_destroyBrowserTimeout: DESTROY_BROWSER_TIMEOUT,
};
-Services.prefs.addObserver(ABOUT_NEWTAB_SEGREGATION_PREF,
- function(aSubject, aTopic, aData) {
- if (aTopic == "nsPref:changed" && aData == ABOUT_NEWTAB_SEGREGATION_PREF) {
- BackgroundPageThumbs.renewThumbnailBrowser();
- }
- },
- false);
-
Object.defineProperty(this, "BackgroundPageThumbs", {
value: BackgroundPageThumbs,
enumerable: true,
@@ -467,14 +437,6 @@ Capture.prototype = {
Cu.reportError(err);
}
}
-
- if (Services.prefs.getBoolPref(ABOUT_NEWTAB_SEGREGATION_PREF)) {
- // Clear the data in the private container for thumbnails.
- let privateIdentity =
- ContextualIdentityService.getPrivateIdentity("userContextIdInternal.thumbnail");
- Services.obs.notifyObservers(null, "clear-origin-attributes-data",
- JSON.stringify({ userContextId: privateIdentity.userContextId }));
- }
};
if (!data) {