Merge branch 'master' into Basilisk-releasev2019.03.08

1 files changed, 0 insertions, 194 deletions

diff --git a/toolkit/mozapps/webextensions/content/update.xul b/toolkit/mozapps/webextensions/content/update.xul
deleted file mode 100644
index 745983814..000000000
--- a/toolkit/mozapps/webextensions/content/update.xul
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
-<?xml-stylesheet href="chrome://mozapps/skin/extensions/update.css" type="text/css"?> 
-
-<!DOCTYPE wizard [
-<!ENTITY % updateDTD SYSTEM "chrome://mozapps/locale/extensions/update.dtd">
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%updateDTD;
-%brandDTD;
-]>
-
-<wizard id="updateWizard"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&updateWizard.title;"
-        windowtype="Addons:Compatibility"
-        branded="true"
-        onload="gUpdateWizard.init();"
-        onwizardfinish="gUpdateWizard.onWizardFinish();"
-        onwizardcancel="return gUpdateWizard.onWizardCancel();"
-        onclose="return gUpdateWizard.onWizardClose(event);"
-        buttons="accept,cancel">
-
-  <script type="application/javascript" src="chrome://mozapps/content/extensions/update.js"/>
-  
-  <stringbundleset id="updateSet">
-    <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
-    <stringbundle id="updateStrings" src="chrome://mozapps/locale/extensions/update.properties"/>
-  </stringbundleset>
-  
-  <wizardpage id="dummy" pageid="dummy"/>
-  
-  <wizardpage id="offline" pageid="offline" next="versioninfo"
-              label="&offline.title;"
-              onpageadvanced="return gOfflinePage.onPageAdvanced();">
-    <description>&offline.description;</description>
-    <checkbox id="toggleOffline"
-              checked="true"
-              label="&offline.toggleOffline.label;"
-              accesskey="&offline.toggleOffline.accesskey;"
-              oncommand="gOfflinePage.toggleOffline();"/>
-  </wizardpage>
-  
-  <wizardpage id="versioninfo" pageid="versioninfo" next="mismatch"
-              label="&versioninfo.wizard.title;"
-              onpageshow="gVersionInfoPage.onPageShow();">
-    <label>&versioninfo.top.label;</label>
-    <separator class="thin"/>
-    <progressmeter id="versioninfo.progress" mode="undetermined"/>
-    <hbox align="center">
-      <image id="versioninfo.throbber" class="throbber"/>
-      <label flex="1" id="versioninfo.status" crop="right">&versioninfo.waiting;</label>
-    </hbox>
-    <separator/>
-  </wizardpage>
-
-  <wizardpage id="mismatch" pageid="mismatch" next="checking"
-              label="&mismatch.win.title;"
-              onpageshow="gMismatchPage.onPageShow();">
-    <label>&mismatch.top.label;</label>
-    <separator class="thin"/>
-    <listbox id="mismatch.incompatible" flex="1"/>
-    <separator class="thin"/>
-    <label>&mismatch.bottom.label;</label>
-  </wizardpage>
-  
-  <wizardpage id="checking" pageid="checking" next="noupdates"
-              label="&checking.wizard.title;"
-              onpageshow="gUpdatePage.onPageShow();">
-    <label>&checking.top.label;</label>
-    <separator class="thin"/>
-    <progressmeter id="checking.progress"/>
-    <hbox align="center">
-      <image id="checking.throbber" class="throbber"/>
-      <label id="checking.status" flex="1" crop="right">&checking.status;</label>
-    </hbox>
-  </wizardpage>
-    
-  <wizardpage id="noupdates" pageid="noupdates"
-              label="&noupdates.wizard.title;"
-              onpageshow="gNoUpdatesPage.onPageShow();">
-    <description>&noupdates.intro.desc;</description>
-    <separator class="thin"/>
-    <hbox id="updateCheckErrorNotFound" class="alertBox" hidden="true" align="top">
-      <description flex="1">&noupdates.error.desc;</description>
-    </hbox>
-    <separator class="thin"/>
-    <description id="noupdatesCheckEnabled" hidden="true">
-      &noupdates.checkEnabled.desc;
-    </description>
-    <vbox id="noupdatesCheckDisabled" hidden="true">
-      <description>&finished.checkDisabled.desc;</description>
-      <checkbox label="&enableChecking.label;" checked="true"
-                oncommand="gUpdateWizard.shouldAutoCheck = this.checked;"/>
-    </vbox>
-    <separator flex="1"/>
-#ifndef XP_MACOSX
-    <label>&clickFinish.label;</label>
-#else
-    <label>&clickFinish.labelMac;</label>
-#endif
-    <separator class="thin"/>
-  </wizardpage>
-
-  <wizardpage id="found" pageid="found" next="installing"
-              label="&found.wizard.title;"
-              onpageshow="gFoundPage.onPageShow();">
-    <label>&found.top.label;</label>
-    <separator class="thin"/>
-    <listbox id="found.updates" flex="1" seltype="multiple"
-             onclick="gFoundPage.updateNextButton();"/>
-    <separator class="thin"/>
-    <vbox align="left" id="xpinstallDisabledAlert" hidden="true">
-      <description>&found.disabledXPinstall.label;</description>
-      <checkbox label="&found.enableXPInstall.label;"
-                id="enableXPInstall"
-                accesskey="&found.enableXPInstall.accesskey;"
-                oncommand="gFoundPage.toggleXPInstallEnable(event);"/>
-    </vbox>
-  </wizardpage>
-
-  <wizardpage id="installing" pageid="installing" next="finished"
-              label="&installing.wizard.title;"
-              onpageshow="gInstallingPage.onPageShow();">
-    <label>&installing.top.label;</label>
-    <progressmeter id="downloadProgress"/>
-    <hbox align="center">
-      <image id="installing.throbber" class="throbber"/>
-      <label id="actionItem" flex="1" crop="right"/>
-    </hbox>
-    <separator/>
-  </wizardpage>
-  
-  <wizardpage id="installerrors" pageid="installerrors"
-              label="&installerrors.wizard.title;"
-              onpageshow="gInstallErrorsPage.onPageShow();">
-    <hbox align="top" class="alertBox">
-      <description flex="1">&installerrors.intro.label;</description>
-    </hbox>
-    <separator flex="1"/>
-#ifndef XP_MACOSX
-    <label>&clickFinish.label;</label>
-#else
-    <label>&clickFinish.labelMac;</label>
-#endif
-    <separator class="thin"/>
-  </wizardpage>
-  
-  <wizardpage id="adminDisabled" pageid="adminDisabled"
-              label="&adminDisabled.wizard.title;"
-              onpageshow="gAdminDisabledPage.onPageShow();">
-    <separator/>
-    <hbox class="alertBox" align="top">
-      <description flex="1">&adminDisabled.warning.label;</description>
-    </hbox>
-    <separator flex="1"/>
-#ifndef XP_MACOSX
-    <label>&clickFinish.label;</label>
-#else
-    <label>&clickFinish.labelMac;</label>
-#endif
-    <separator class="thin"/>
-  </wizardpage>
-
-  <wizardpage id="finished" pageid="finished"
-              label="&finished.wizard.title;"
-              onpageshow="gFinishedPage.onPageShow();">
-
-    <label>&finished.top.label;</label>
-    <separator/>
-    <description id="finishedCheckEnabled" hidden="true">
-      &finished.checkEnabled.desc;
-    </description>
-    <vbox id="finishedCheckDisabled" hidden="true">
-      <description>&finished.checkDisabled.desc;</description>
-      <checkbox label="&enableChecking.label;" checked="true"
-                oncommand="gUpdateWizard.shouldAutoCheck = this.checked;"/>
-    </vbox>
-    <separator flex="1"/>
-#ifndef XP_MACOSX
-    <label>&clickFinish.label;</label>
-#else
-    <label>&clickFinish.labelMac;</label>
-#endif
-    <separator class="thin"/>
-  </wizardpage>
-  
-</wizard>
-