Bug 1461047 - Added Policy: Customize Layout r?felipe draft
authorKanika Saini
Sat, 16 Jun 2018 00:28:13 +0530
changeset 807788 1abe1dd560e184b5421a6303f770f2638664eb9f
parent 807714 0b5495dc100dd3bfda0886a4ad563a3c729c9b72
push id113216
push userbmo:ksaini@mozilla.com
push dateFri, 15 Jun 2018 18:59:19 +0000
reviewersfelipe
bugs1461047
milestone62.0a1
Bug 1461047 - Added Policy: Customize Layout r?felipe MozReview-Commit-ID: I9ZbzVuUjiO
browser/base/content/browser.js
browser/components/enterprisepolicies/Policies.jsm
browser/components/enterprisepolicies/schemas/policies-schema.json
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1390,16 +1390,20 @@ var gBrowserInit = {
 
     if (!PrivateBrowsingUtils.enabled) {
       document.getElementById("Tools:PrivateBrowsing").hidden = true;
       // Setting disabled doesn't disable the shortcut, so we just remove
       // the keybinding.
       document.getElementById("key_privatebrowsing").remove();
     }
 
+    if (!Services.policies.isAllowed("customize")) {
+      document.getElementById("cmd_CustomizeToolbars").hidden = true;
+    }
+
     this._loadHandled = true;
   },
 
   _cancelDelayedStartup() {
     window.removeEventListener("MozAfterPaint", this._boundDelayedStartup);
     this._boundDelayedStartup = null;
   },
 
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -174,16 +174,24 @@ var Policies = {
           setAndLockPref("network.cookie.lifetimePolicy", newLifetimePolicy);
         } else {
           setDefaultPref("network.cookie.lifetimePolicy", newLifetimePolicy);
         }
       }
     }
   },
 
+  "CustomizeLayout": {
+    onBeforeUIStartup(manager, param) {
+      if (param) {
+        manager.disallowFeature("customize");
+      }
+    }
+  },
+
   "DisableAppUpdate": {
     onBeforeAddons(manager, param) {
       if (param) {
         manager.disallowFeature("appUpdate");
       }
     }
   },
 
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -137,16 +137,23 @@
         },
 
         "Locked": {
           "type": "boolean"
         }
       }
     },
 
+    "CustomizeLayout": {
+      "description": "Allows/prevents the user from customizing the browser layout.",
+      "first_available": "60.0",
+
+      "type": "boolean"
+    },
+
     "DisableAppUpdate": {
       "description": "Prevent the browser from updating.",
       "first_available": "60.0",
       "enterprise_only": true,
 
       "type": "boolean"
     },