From 4051560face7232d11eade19634a6ca75bb46f1a Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Tue, 10 Nov 2020 00:22:26 +0000
Subject: [PATCH] Bug 1676292 - Stop importing common.css in extensions.xhtml.
 r=robwu

Differential Revision: https://phabricator.services.mozilla.com/D96480
---
 toolkit/mozapps/extensions/content/extensions.js    | 6 ------
 toolkit/mozapps/extensions/content/extensions.xhtml | 2 --
 2 files changed, 8 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index c94a32f01643..e1d9bed2b81b 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -6,7 +6,6 @@
 
 /* import-globals-from ../../../content/customElements.js */
 /* import-globals-from aboutaddonsCommon.js */
-/* globals ProcessingInstruction */
 /* exported loadView */
 
 const { AddonManager } = ChromeUtils.import(
@@ -30,11 +29,6 @@ Object.defineProperty(this, "gIsInitializing", {
 });
 
 function initialize(event) {
-  // XXXbz this listener gets _all_ load events for all nodes in the
-  // document... but relies on not being called "too early".
-  if (event.target instanceof ProcessingInstruction) {
-    return;
-  }
   document.removeEventListener("load", initialize, true);
 
   if (!isDiscoverEnabled()) {
diff --git a/toolkit/mozapps/extensions/content/extensions.xhtml b/toolkit/mozapps/extensions/content/extensions.xhtml
index 786c337b0f3f..cf4dd1db0dc8 100644
--- a/toolkit/mozapps/extensions/content/extensions.xhtml
+++ b/toolkit/mozapps/extensions/content/extensions.xhtml
@@ -3,8 +3,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
-
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:xhtml="http://www.w3.org/1999/xhtml"
         csp="default-src chrome:; frame-src chrome:; object-src 'none'"