Actualizar windows_mozconfig

Fixed the license link

.github/workflows/src/windows_mozconfig

@@ -7,11 +7,9 @@ export WINEDEBUG=-all
 
 #? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
 #? https://phabricator.services.mozilla.com/D170170
-ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --target=x86_64-pc-windows-msvc
 
 export MOZ_STUB_INSTALLER=1
-export MOZ_MAINTENANCE_SERVICE=
-
 export MOZ_PKG_FORMAT=TAR
 
 export CROSS_BUILD=1
@@ -24,10 +22,6 @@ export MOZ_STUB_INSTALLER=1
 export WINEDEBUG=-all
 export WINE="$TOOLS/wine/bin/wine64"
 
-ac_add_options --enable-release
-ac_add_options --enable-rust-simd
-ac_add_options RUSTC_OPT_LEVEL=3
-export MOZILLA_OFFICIAL=1
 export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64"
 
 ac_add_options --enable-default-browser-agent

LICENSE

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  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/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

README.md

@@ -53,5 +53,5 @@ Please adhere to this project's `code of conduct`.
 
 ## License
 
-[MPL LICENSE](https://choosealicense.com/licenses/mit/)
+[MPL LICENSE](/LICENSE)
 

configs/branding/alpha/MacOSInstaller.svg

@@ -1,4 +1,4 @@
 <svg width="320" height="130" xmlns="http://www.w3.org/2000/svg">
-  <rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />
+ <rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />
   Sorry, your browser does not support inline SVG.  
 </svg>

configs/common/mozconfig

@@ -3,9 +3,11 @@
 ac_add_options --enable-update-channel=release
 ac_add_options --without-wasm-sandboxed-libraries
 
-# ac_add_options --with-branding=beta
+ac_add_options --with-branding=${brandingDir}
 
 ac_add_options --with-app-name=${binName}
+ac_add_options --with-app-basename=Zen
+
 export MOZ_USER_DIR="${name}"
 export MOZ_APP_VENDOR="${vendor}"
 export MOZ_APP_BASENAME=Zen
@@ -15,6 +17,7 @@ export MOZ_BRANDING_DIRECTORY=${brandingDir}
 export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}
 export MOZ_MACBUNDLE_ID=${appId}
 export MOZ_DISTRIBUTION_ID=${appId}
+export MOZ_MACBUNDLE_NAME="Zen Browser.app"
 
 # Uncomment if builds are too resource hungry
 # mk_add_options MOZ_MAKE_FLAGS="-j4"
@@ -22,33 +25,72 @@ export MOZ_DISTRIBUTION_ID=${appId}
 
 # Misc
 export MOZ_STUB_INSTALLER=1
-export MOZ_INCLUDE_SOURCE_INFO=1
 export MOZ_SOURCE_REPO=https://github.com/zen-browser/desktop
 export MOZ_SOURCE_CHANGESET=${changeset}
+export MOZ_INCLUDE_SOURCE_INFO=1
 
 ac_add_options --enable-bootstrap
 
 ac_add_options --enable-application=browser
 
 if test "$ZEN_RELEASE"; then
-  ac_add_options --enable-hardening
-  ac_add_options --enable-rust-simd
-  ac_add_options --enable-release
   ac_add_options --enable-optimize
-  ac_add_options --with-ccache=sccache
+  ac_add_options --enable-release
   ac_add_options --disable-debug
+  ac_add_options --disable-debug-symbols
+  ac_add_options --disable-debug-js-modules
+  ac_add_options --disable-tests
+  ac_add_options --enable-strip
+  ac_add_options --enable-install-strip
+  ac_add_options --enable-lto=full
+  
+  ac_add_options --enable-rust-simd
+  ac_add_options --disable-parental-controls
+  ac_add_options --disable-crashreporter
+  ac_add_options --enable-jemalloc
+  mk_add_options MOZ_PARALLEL_COMPILE=1
+  mk_add_options MOZ_CRASHREPORTER=0
+  mk_add_options MOZ_DATA_REPORTING=0
+  mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+  mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+  
+  ac_add_options --enable-hardening
+  ac_add_options --enable-sandbox
 
   ac_add_options --disable-crashreporter
   ac_add_options --disable-dmd
   ac_add_options --disable-geckodriver
-  ac_add_options --disable-parental-controls
   ac_add_options --disable-profiling
-  ac_add_options --disable-tests
+
+  ac_add_options --enable-lto
+
+  mk_add_options MOZILLA_OFFICIAL=1
+
+  MOZILLA_OFFICIAL=1
+  export MOZILLA_OFFICIAL=1
+  mk_add_options MOZ_OPTIMIZE=1
+  MOZ_OPTIMIZE=1
+  export MOZ_OPTIMIZE=1
+
+  export OPT_LEVEL="3"
+  ac_add_options OPT_LEVEL="3"
+  export RUSTC_OPT_LEVEL="3"
+  ac_add_options RUSTC_OPT_LEVEL="3"
+
+  export MOZ_LTO=1
+  ac_add_options MOZ_LTO=1
 fi
 
 ac_add_options --enable-unverified-updates
 ac_add_options --enable-updater
 
+ac_add_options --enable-raw
+ac_add_options --enable-webrtc
+ac_add_options --enable-jxl
+ac_add_options --enable-av1
+ac_add_options --enable-eme=widevine
+
 ac_add_options --without-wasm-sandboxed-libraries
 
 export MOZ_REQUIRE_SIGNING=
@@ -58,5 +100,7 @@ if test "$ZEN_CROSS_COMPILING"; then
   ac_add_options --target=x86_64-pc-linux-gnu
 fi
 
+export MOZ_APP_UA_NAME="Firefox"
+
 # ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
 

configs/linux/mozconfig

@@ -1,3 +1,4 @@
+ac_add_options --enable-wasm-avx
 
 # not when cross compiling
 if ! test "$ZEN_CROSS_COMPILING"; then
@@ -5,6 +6,7 @@ if ! test "$ZEN_CROSS_COMPILING"; then
         ac_add_options --enable-optimize="-march=x86-64 -msse3 -mtune=haswell -O3 -w"
         ac_add_options --enable-release
         ac_add_options --enable-rust-simd
+        ac_add_options --disable-elf-hack
         ac_add_options RUSTC_OPT_LEVEL=3
         export MOZILLA_OFFICIAL=1
         export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64"
@@ -20,7 +22,7 @@ if ! test "$ZEN_CROSS_COMPILING"; then
 
     ac_add_options --enable-linker=lld
     ac_add_options --enable-strip
-
+    export STRIP_FLAGS="--strip-debug --strip-unneeded"
 fi
 
 # Disable telemetry and tracking

src/browser/app/profile/zen-browser.js

@@ -105,6 +105,15 @@ pref('layout.css.backdrop-filter.enabled', true);
 pref("alerts.showFavicons", true);
 pref('browser.toolbars.bookmarks.visibility', 'never');
 
+// Enable Do Not Track and GPC by default.
+pref("privacy.donottrackheader.enabled", true);
+pref("privacy.globalprivacycontrol.enabled", true);
+// Disable more telemetry
+pref("toolkit.telemetry.enabled", false);
+pref("browser.ping-centre.telemetry", false);
+pref("browser.attribution.enabled", false);
+pref("toolkit.telemetry.pioneer-new-studies-available", false);
+
 // CUSTOM ZEN PREFS
 
 pref('zen.welcomeScreen.enabled', true);
@@ -141,6 +150,8 @@ pref('dom.enable_web_task_scheduling', true);
 pref('layout.css.has-selector.enabled', true);
 pref('dom.security.sanitizer.enabled', true);
 
+pref('layers.acceleration.force-enabled', true);
+
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
 
@@ -153,4 +164,4 @@ pref('zen.sidebar.floating', true);
 pref('zen.splitView.working', false);
 
 // Zen Workspaces
-pref('zen.workspaces.enabled', false);
+pref('zen.workspaces.enabled', true);

src/browser/base/content/ZenWorkspaces.mjs

@@ -88,13 +88,11 @@ var ZenWorkspaces = {
   },
 
   async removeWorkspace(windowID) {
-    let json = await IOUtils.readJSON(this._storeFile);
-    if (!json.workspaces) {
-      return;
-    }
+    let json = await this._workspaces();
+    await this.changeWorkspace(json.workspaces.find(workspace => workspace.uuid !== windowID));
+    this._deleteAllTabsInWorkspace(windowID);
     json.workspaces = json.workspaces.filter(workspace => workspace.uuid !== windowID);
-    await IOUtils.writeJSON(this._storeFile, json);
-    this._workspaceCache = null;
+    await this.unsafeSaveWorkspaces(json);
     await this._propagateWorkspaceData();
   },
 
@@ -124,10 +122,11 @@ var ZenWorkspaces = {
     let currentContainer = document.getElementById("PanelUI-zen-workspaces-current-info");
     let workspaceList = document.getElementById("PanelUI-zen-workspaces-list");
     const createWorkspaceElement = (workspace) => {
-      let element = document.createElement("toolbarbutton");
+      let element = document.createXULElement("toolbarbutton");
       element.className = "subviewbutton";
       element.setAttribute("tooltiptext", workspace.name);
       element.setAttribute("zen-workspace-id", workspace.uuid);
+      element.setAttribute("context", "zenWorkspaceActionsMenu");
       let childs = window.MozXULElement.parseXULToFragment(`
         <div class="zen-workspace-icon">
           ${workspace.name[0].toUpperCase()}
@@ -140,19 +139,17 @@ var ZenWorkspaces = {
         </toolbarbutton>
       `);
       childs.querySelector(".zen-workspace-actions").addEventListener("command", (event) => {
-        event.stopPropagation();
         let button = event.target;
         const popup = button.ownerDocument.getElementById(
           "zenWorkspaceActionsMenu"
         );
-        popup.openPopup(button, "after_end", 0,
-          0,
-          true /* isContextMenu */,
-          false /* attributesOverride */,
-          event);
+        popup.openPopup(button, "after_end");
       });
       element.appendChild(childs);
       element.onclick = (async () => {
+        if (event.target.closest(".zen-workspace-actions")) {
+          return; // Ignore clicks on the actions button
+        }
         await this.changeWorkspace(workspace)
         let panel = document.getElementById("PanelUI-zen-workspaces");
         PanelMultiView.hidePopup(panel);
@@ -228,9 +225,26 @@ var ZenWorkspaces = {
     return document.getElementById("PanelUI-zen-workspaces-create-input");
   },
 
+  _deleteAllTabsInWorkspace(workspaceID) {
+    for (let tab of gBrowser.tabs) {
+      if (tab.getAttribute("zen-workspace-id") === workspaceID) {
+        gBrowser.removeTab(tab);
+      }
+    }
+  },
+
   _prepareNewWorkspace(window) {
     document.documentElement.setAttribute("zen-workspace-id", window.uuid);
-    this._createNewTabForWorkspace(window);
+    let tabCount = 0;
+    for (let tab of gBrowser.tabs) {
+      if (!tab.hasAttribute("zen-workspace-id")) {
+        tab.setAttribute("zen-workspace-id", window.uuid);
+        tabCount++;
+      }
+    }
+    if (tabCount === 0) {
+      this._createNewTabForWorkspace(window);
+    }
   },
 
   _createNewTabForWorkspace(window) {
@@ -333,18 +347,33 @@ var ZenWorkspaces = {
   // Context menu management
 
   _contextMenuId: null,
-  updateContextMenu(event) {
-    event.preventDefault();
+  async updateContextMenu(event) {
     let target = event.target;
     let workspace = target.closest("[zen-workspace-id]");
     if (!workspace) {
       return;
     }
     _contextMenuId = workspace.getAttribute("zen-workspace-id");
+    document.querySelector(`#PanelUI-zen-workspaces [zen-workspace-id="${_contextMenuId}"] .zen-workspace-actions`).setAttribute("active", "true");
+    const workspaces = await this._workspaces();
+    let deleteMenuItem = document.getElementById("context_zenDeleteWorkspace");
+    if (workspaces.workspaces.length <= 1) {
+      deleteMenuItem.setAttribute("disabled", "true");
+    } else {
+      deleteMenuItem.removeAttribute("disabled");
+    }
   },
 
-  contextDelete() {
-    this.removeWorkspace(_contextMenuId);
+  onContextMenuClose() {
+    let target = document.querySelector(`#PanelUI-zen-workspaces [zen-workspace-id="${_contextMenuId}"] .zen-workspace-actions`);
+    if (target) {
+      target.removeAttribute("active");
+    }
+    this._contextMenuId = null;
+  },
+
+  async contextDelete() {
+    await this.removeWorkspace(_contextMenuId);
   }
 };
 

src/browser/base/content/zen-popupset.inc.xhtml

@@ -76,7 +76,7 @@
   </vbox>
 </panelview>
 
-<panel type="arrow" role="alertdialog" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
+<panel type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
   <panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view">
     <panelview id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
       <vbox>
@@ -115,7 +115,6 @@
 
 <menupopup id="zenWorkspaceActionsMenu"
             onpopupshowing="ZenWorkspaces.updateContextMenu(event);"
-            onpopuphidden="ZenWorkspaces._contextMenuId = null;">
-  <menuseparator/>
+            onpopuphidden="ZenWorkspaces.onContextMenuClose();">
   <menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete();" data-l10n-id="zen-workspaces-panel-context-delete"/>
 </menupopup>

src/browser/themes/shared/zen-panel-ui.css

@@ -317,9 +317,15 @@
   }
 
   & .zen-workspace-actions {
+    display: none;
     margin: 0;
     margin-left: auto !important;
   }
+
+  &:hover .zen-workspace-actions,
+  & .zen-workspace-actions[active="true"] {
+    display: flex;
+  }
 }
 
 #PanelUI-zen-workspaces-current-info toolbarbutton:first-child {

surfer.json

@@ -27,7 +27,7 @@
       "brandShortName": "Zen Browser",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.0.0-a.3",
+        "displayVersion": "1.0.0-a.4",
         "github": {
           "repo": "zen-browser/desktop"
         },