Commit ba9f1e0d authored by Sam Foster's avatar Sam Foster
Browse files

Bug 1719463 - Part 10: Remove the devtools button from the pre-proton appMenu... 

Bug 1719463 - Part 10: Remove the devtools button from the pre-proton appMenu view. r=jdescottes,Gijs,mkaply

Differential Revision: https://phabricator.services.mozilla.com/D121810
parent d59eb94c

browser/base/content/appmenu-viewcache.inc.xhtml

+0 −9
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ 
  <panelview id="appMenu-mainView" class="PanelUI-subView"

             descriptionheightworkaround="true">

    <vbox class="panel-subview-body">

      <toolbarbutton id="appMenu-developer-button"

                     class="subviewbutton subviewbutton-nav"

                     label="&webDeveloperMenu.label;"

                     closemenu="none"

                     oncommand="PanelUI.showSubView('PanelUI-developer', this)"/>

      <toolbarbutton id="appMenu-whatsnew-button"

                     class="subviewbutton subviewbutton-iconic subviewbutton-nav"

                     hidden="true"
@@ -233,10 +228,6 @@ 
    <vbox id="PanelUI-helpItems" class="panel-subview-body"/>

  </panelview>



  <panelview id="PanelUI-developer" flex="1">

    <vbox id="PanelUI-developerItems" class="panel-subview-body"/>

  </panelview>



  <panelview id="PanelUI-bookmarks" flex="1" class="PanelUI-subView">

    <vbox class="panel-subview-body">

      <toolbarbutton id="panelMenuBookmarkThisPage"

browser/components/enterprisepolicies/tests/browser/disable_developer_tools/browser_policy_disable_developer_tools.js

+0 −12
Original line number Diff line number Diff line
@@ -38,18 +38,6 @@ add_task(async function test_updates_post_policy() { 
    false

  );



  info("Check that devtools menu items are hidden");

  let toolsMenu = window.document.getElementById("webDeveloperMenu");

  ok(toolsMenu.hidden, "The Web Developer item of the tools menu is hidden");

  let hamburgerMenu = window.document.getElementById(

    "appMenu-developer-button"

  );

  is(

    hamburgerMenu,

    null,

    "The Web Developer item of the hamburger menu should not be available."

  );



  let menuButton = document.getElementById("PanelUI-menu-button");

  menuButton.click();

  await BrowserTestUtils.waitForEvent(window.PanelUI.mainView, "ViewShown");

browser/components/uitour/UITour-lib.js

+1 −6
Original line number Diff line number Diff line
@@ -105,20 +105,15 @@ if (typeof Mozilla == "undefined") { 
   * - appMenu

   * - backForward

   * - bookmarks

   * - devtools

   * - forget

   * - help

   * - home

   * - library

   * - logins

   * - pageAction-bookmark

   * - pageAction-copyURL

   * - pageAction-emailLink

   * - pageAction-sendToDevice

   * - pocket

   * - privateWindow

   * - quit

   * - readerMode-urlBar

   * - screenshots

   * - search

   * - searchIcon

   * - selectedTabIcon

browser/components/uitour/UITour.jsm

+0 −7
Original line number Diff line number Diff line
@@ -142,13 +142,6 @@ var UITour = { 
    ],

    ["backForward", { query: "#back-button" }],

    ["bookmarks", { query: "#bookmarks-menu-button" }],

    [

      "devtools",

      {

        query: "#appMenu-developer-button",

        widgetName: "appMenu-developer-button",

      },

    ],

    [

      "forget",

      {

browser/components/uitour/test/browser_UITour_availableTargets.js

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ function getExpectedTargets() { 
    "addons",

    "appMenu",

    "backForward",

    "devtools",

    "help",

    "logins",

    "pageAction-bookmark",