From ee4ae8a0b1e1ea3cdafc62fd20351bd034f7a39c Mon Sep 17 00:00:00 2001
From: Michael Kaply <mozilla@kaply.com>
Date: Mon, 3 Jun 2019 21:30:57 +0000
Subject: [PATCH] Bug 1553290 - Get support menu href direct from policy.
 r=jaws

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

--HG--
extra : moz-landing-system : lando
---
 browser/base/content/browser-menubar.inc                      | 2 +-
 browser/base/content/utilityOverlay.js                        | 1 -
 .../tests/browser/browser_policy_support_menu.js              | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 1e7662ee674a..629b0517ea2e 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -614,7 +614,7 @@
                           hidden="true"/>
                 <menuitem id="helpPolicySupport"
                           hidden="true"
-                          oncommand="openUILink(this.getAttribute('href'), event, {triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({})});"
+                          oncommand="openUILinkIn(Services.policies.getSupportMenu().URL.href, 'tab', {triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({})});"
                           onclick="checkForMiddleClick(this, event);"/>
                 <menuseparator id="aboutSeparator"/>
                 <menuitem id="aboutName"
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 1a0c241564a6..813d9423ba05 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -926,7 +926,6 @@ function buildHelpMenu() {
     let menuitem = document.getElementById("helpPolicySupport");
     menuitem.hidden = false;
     menuitem.setAttribute("label", supportMenu.Title);
-    menuitem.setAttribute("href", supportMenu.URL);
     if ("AccessKey" in supportMenu) {
       menuitem.setAttribute("accesskey", supportMenu.AccessKey);
     }
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_support_menu.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_support_menu.js
index ae268e2756c5..1b7bed66d6c7 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_support_menu.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_support_menu.js
@@ -15,14 +15,14 @@ add_task(async function setup() {
 });
 
 add_task(async function test_help_menu() {
+  is(Services.policies.getSupportMenu().URL.href, "https://example.com/",
+     "The policy should have the correct URL.");
   buildHelpMenu();
   let supportMenu = document.getElementById("helpPolicySupport");
   is(supportMenu.hidden, false,
      "The policy menu should be visible.");
   is(supportMenu.getAttribute("label"), "Title",
      "The policy menu should have the correct title.");
-  is(supportMenu.getAttribute("href"), "https://example.com/",
-     "The policy menu should have the correct URL.");
   is(supportMenu.getAttribute("accesskey"), "T",
      "The policy menu should have the correct access key.");
 });