Bug 1691140, add Task Manager to browser tools menu for proton r=mconley,fluent-reviewers,flod

Revert changes that added Task Manager to help menu.
With proton disabled, it should remain in the "More" section

Differential Revision: https://phabricator.services.mozilla.com/D108055

browser/base/content/browser-menubar.inc

@@ -414,8 +414,12 @@
                         hidden="true"
                         oncommand="gSync.openSignInAgainPage('menubar');" data-l10n-id="menu-tools-fxa-re-auth"/>
               <menuseparator id="devToolsSeparator"/>
-              <menu id="webDeveloperMenu" data-l10n-id="menu-tools-web-developer">
+              <menu id="webDeveloperMenu" data-l10n-id="menu-tools-browser-tools">
                 <menupopup id="menuWebDeveloperPopup">
+                  <menuitem id="menu_taskManager"
+                            oncommand="switchToTabHavingURI('about:performance', true)"
+                            onclick="checkForMiddleClick(this, event);"
+                            data-l10n-id="menu-tools-task-manager"/>
                   <menuitem id="menu_pageSource"
                             key="key_viewSource"
                             command="View:PageSource" data-l10n-id="menu-tools-page-source"/>
@@ -500,11 +504,6 @@
                           onclick="checkForMiddleClick(this, event);"
                           data-l10n-id="menu-help-more-troubleshooting-info"
                           appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/>
-                <menuitem id="help_taskManager"
-                          oncommand="switchToTabHavingURI('about:performance', true)"
-                          onclick="checkForMiddleClick(this, event);"
-                          data-l10n-id="menu-help-taskmanager"
-                          appmenu-data-l10n-id="appmenu-help-taskmanager"/>
                 <menuitem id="help_reportSiteIssue"
                           oncommand="ReportSiteIssue();"
                           data-l10n-id="menu-help-report-site-issue"

browser/base/content/browser.xhtml

@@ -1332,6 +1332,10 @@
 
     <panelview id="appMenu-moreView" title="&moreMenu.label;" class="PanelUI-subView">
       <vbox class="panel-subview-body">
+        <toolbarbutton id="appMenu-taskmanager-button"
+                       class="subviewbutton subviewbutton-iconic"
+                       data-l10n-id="appmenu-taskmanager"
+                       oncommand="switchToTabHavingURI('about:performance', true)"/>
         <toolbarbutton id="appMenu-characterencoding-button"
                        class="subviewbutton subviewbutton-nav"
                        label="&charsetMenu2.label;"

browser/locales/en-US/browser/appmenu.ftl

@@ -149,8 +149,6 @@ appmenu-get-help =
 appmenu-help-more-troubleshooting-info =
     .label = More Troubleshooting Information
     .accesskey = T
-appmenu-help-taskmanager =
-    .label = Task Manager
 appmenu-help-report-site-issue =
     .label = Report Site Issue…
 appmenu-help-feedback-page =
@@ -181,5 +179,7 @@ appmenu-help-not-deceptive =
 
 appmenu-customizetoolbar =
     .label = Customize Toolbar…
+appmenu-taskmanager =
+    .label = Task Manager
 
 appmenu-developer-tools-subheader = Browser Tools

browser/locales/en-US/browser/menubar.ftl

@@ -255,9 +255,12 @@ menu-tools-sync-now =
 menu-tools-fxa-re-auth =
     .label = Reconnect to { -brand-product-name }…
     .accesskey = R
-menu-tools-web-developer =
+menu-tools-browser-tools =
-    .label = Web Developer
+    .label = Browser Tools
-    .accesskey = W
+    .accesskey = B
+menu-tools-task-manager =
+    .label = Task Manager
+    .accesskey = M
 menu-tools-page-source =
     .label = Page Source
     .accesskey = o
@@ -312,8 +315,6 @@ menu-get-help =
 menu-help-more-troubleshooting-info =
     .label = More Troubleshooting Information
     .accesskey = T
-menu-help-taskmanager =
-    .label = Task Manager
 menu-help-report-site-issue =
     .label = Report Site Issue…
 menu-help-feedback-page =

browser/themes/shared/menupanel.inc.css

@@ -49,7 +49,7 @@
   list-style-image: url(chrome://browser/skin/import.svg);
 }
 
-#appMenu_help_taskManager {
+#appMenu-taskmanager-button {
   list-style-image: url(chrome://global/skin/icons/performance.svg);
 }
 

devtools/client/framework/browser-menus.js

@@ -13,6 +13,7 @@
  */
 
 const { Cu } = require("chrome");
+const Services = require("Services");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const MENUS_L10N = new LocalizationHelper(
   "devtools/client/locales/menus.properties"
@@ -266,14 +267,25 @@ function addTopLevelItems(doc) {
   const menu = doc.getElementById("menuWebDeveloperPopup");
   menu.appendChild(menuItems);
 
-  // There is still "Page Source" menuitem hardcoded into browser.xhtml. Instead
+  // There is still "Page Source" and "Task Manager" menuitems hardcoded
-  // of manually inserting everything around it, move it to the expected
+  // into browser.xhtml. Instead of manually inserting everything around it,
-  // position.
+  // move them to the expected position.
   const pageSourceMenu = doc.getElementById("menu_pageSource");
   const extensionsForDevelopersMenu = doc.getElementById(
     "extensionsForDevelopers"
   );
   menu.insertBefore(pageSourceMenu, extensionsForDevelopersMenu);
+
+  const taskManagerMenu = doc.getElementById("menu_taskManager");
+  if (Services.prefs.getBoolPref("browser.proton.enabled", false)) {
+    const remoteDebuggingMenu = doc.getElementById(
+      "menu_devtools_remotedebugging"
+    );
+    menu.insertBefore(taskManagerMenu, remoteDebuggingMenu);
+  } else {
+    // When proton is preffed off, this is in the "more" section instead.
+    taskManagerMenu.hidden = true;
+  }
 }
 
 /**

python/l10n/fluent_migrations/bug_1691140_task_manager.py

@@ -0,0 +1,22 @@
+# coding=utf8
+
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from __future__ import absolute_import
+from fluent.migrate.helpers import transforms_from
+
+
+def migrate(ctx):
+    """Bug 1691140, add Task Manager to browser tools menu for proton, part {index}."""
+    ctx.add_transforms(
+        "browser/browser/appmenu.ftl",
+        "browser/browser/appmenu.ftl",
+        transforms_from(
+            """
+appmenu-taskmanager =
+    .label = { COPY_PATTERN(from_path, "appmenu-help-taskmanager.label") }
+""",
+            from_path="browser/browser/appmenu.ftl",
+        ),
+    )