From 795a861aad4879d046a16024d6aee32215a055a0 Mon Sep 17 00:00:00 2001 From: Collin Wing Date: Fri, 19 Oct 2018 21:52:20 +0000 Subject: [PATCH] Bug 1497087 Remove eula support from addons manager r=Gijs,aswan Differential Revision: https://phabricator.services.mozilla.com/D8149 --HG-- extra : rebase_source : 906a5e7e38ba1293002579e699425c7410601d92 extra : source : 2d0174d68cec998537cb529f688c96cfa729a892 --- caps/tests/mochitest/test_bug292789.html | 8 ++-- .../chrome/mozapps/extensions/extensions.dtd | 5 --- .../mozapps/extensions/extensions.properties | 3 -- toolkit/mozapps/extensions/content/eula.js | 26 ----------- toolkit/mozapps/extensions/content/eula.xul | 35 --------------- .../mozapps/extensions/content/extensions.xml | 11 ----- toolkit/mozapps/extensions/jar.mn | 2 - .../themes/osx/mozapps/extensions/eula.css | 43 ------------------- toolkit/themes/osx/mozapps/jar.mn | 1 - toolkit/themes/shared/non-mac.jar.inc.mn | 1 - .../windows/mozapps/extensions/eula.css | 43 ------------------- 11 files changed, 4 insertions(+), 174 deletions(-) delete mode 100644 toolkit/mozapps/extensions/content/eula.js delete mode 100644 toolkit/mozapps/extensions/content/eula.xul delete mode 100644 toolkit/themes/osx/mozapps/extensions/eula.css delete mode 100644 toolkit/themes/windows/mozapps/extensions/eula.css diff --git a/caps/tests/mochitest/test_bug292789.html b/caps/tests/mochitest/test_bug292789.html index 75bb1692b1e8..3d6c778ae386 100644 --- a/caps/tests/mochitest/test_bug292789.html +++ b/caps/tests/mochitest/test_bug292789.html @@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=292789 

@@ -45,12 +45,12 @@ function testScriptSrc(aCallback) {
      **/
     var resjs = document.getElementById("resjs");
     resjs.onload = scriptOnload;
-    resjs.src = "resource://gre/chrome/toolkit/content/mozapps/extensions/eula.js";
+    resjs.src = "resource://gre/chrome/toolkit/content/mozapps/extensions/blocklist.js";
     document.getElementById("content").appendChild(resjs);
 
     function scriptOnload() {
-      is(typeof Startup, "function",
-         "extensions.js has not moved unexpectedly");
+      is(typeof init, "function",
+         "blocklist.js has not moved unexpectedly");
 
       // trigger the callback
       if (aCallback)
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
index f31a4b55ad06..29294001058d 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -128,11 +128,6 @@
 
 
 
-
-
-
-
-
 
 
 
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
index 0f2b59dbb261..b123ef131f18 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
@@ -91,9 +91,6 @@ uninstallAddonTooltip=Uninstall this add-on
 enableAddonTooltip=Enable this add-on
 disableAddonTooltip=Disable this add-on
 
-#LOCALIZATION NOTE (eulaHeader) %S is name of the add-on asking the user to agree to the EULA
-eulaHeader=%S requires that you accept the following End User License Agreement before installation can proceed:
-
 type.extension.name=Extensions
 type.themes.name=Themes
 type.locale.name=Languages
diff --git a/toolkit/mozapps/extensions/content/eula.js b/toolkit/mozapps/extensions/content/eula.js
deleted file mode 100644
index ed2e31d2d078..000000000000
--- a/toolkit/mozapps/extensions/content/eula.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-"use strict";
-
-/* exported Startup */
-
-ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
-
-function Startup() {
-  var bundle = document.getElementById("extensionsStrings");
-  var addon = window.arguments[0].addon;
-
-  document.documentElement.setAttribute("addontype", addon.type);
-
-  var iconURL = AddonManager.getPreferredIconURL(addon, 48, window);
-  if (iconURL)
-    document.getElementById("icon").src = iconURL;
-
-  var label = document.createTextNode(bundle.getFormattedString("eulaHeader", [addon.name]));
-  document.getElementById("heading").appendChild(label);
-  document.getElementById("eula").value = addon.eula;
-}
diff --git a/toolkit/mozapps/extensions/content/eula.xul b/toolkit/mozapps/extensions/content/eula.xul
deleted file mode 100644
index 10e657951915..000000000000
--- a/toolkit/mozapps/extensions/content/eula.xul
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-%brandDTD;
-
-%extensionsDTD;
-]>
-
-
-
-