Bug 1368920. Part 4 - Enable Report Site Issue button for DevEdition and Nightly builds only. r=gijs draft
authorMike Taylor <miket@mozilla.com>
Tue, 06 Jun 2017 15:50:53 -0500
changeset 591701 733c681dcce5416b24701c6a25e5b5d6e700dd06
parent 591700 606af1b08cf574c3dc086aa4e0d216134f9429c5
child 632589 c097cfe7d393c4d763f955f567f9d8bbf9e01193
push id63137
push userbmo:miket@mozilla.com
push dateFri, 09 Jun 2017 13:07:25 +0000
reviewersgijs
bugs1368920
milestone55.0a1
Bug 1368920. Part 4 - Enable Report Site Issue button for DevEdition and Nightly builds only. r=gijs MozReview-Commit-ID: Fu1oGBulbLT
browser/components/customizableui/CustomizableUI.jsm
browser/modules/BrowserUITelemetry.jsm
modules/libpref/init/all.js
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -224,17 +224,17 @@ var CustomizableUIInternal = {
     let showCharacterEncoding = Services.prefs.getComplexValue(
       "browser.menu.showCharacterEncoding",
       Ci.nsIPrefLocalizedString
     ).data;
     if (showCharacterEncoding == "true") {
       panelPlacements.push("characterencoding-button");
     }
 
-    if (!AppConstants.RELEASE_OR_BETA) {
+    if (AppConstants.MOZ_DEV_EDITION || AppConstants.NIGHTLY_BUILD) {
       if (Services.prefs.getBoolPref("extensions.webcompat-reporter.enabled")) {
         panelPlacements.push("webcompat-reporter-button");
       }
     }
 
     gDefaultPanelPlacements = panelPlacements;
     this._updateAreasForPhoton();
 
--- a/browser/modules/BrowserUITelemetry.jsm
+++ b/browser/modules/BrowserUITelemetry.jsm
@@ -83,17 +83,17 @@ XPCOMUtils.defineLazyGetter(this, "DEFAU
     let showCharacterEncoding = Services.prefs.getComplexValue(
       "browser.menu.showCharacterEncoding",
       Ci.nsIPrefLocalizedString
     ).data;
     if (showCharacterEncoding == "true") {
       result["PanelUI-contents"].push("characterencoding-button");
     }
 
-    if (!AppConstants.RELEASE_OR_BETA) {
+    if (AppConstants.MOZ_DEV_EDITION || AppConstants.NIGHTLY_BUILD) {
       if (Services.prefs.getBoolPref("extensions.webcompat-reporter.enabled")) {
         result["PanelUI-contents"].push("webcompat-reporter-button");
       }
     }
   }
 
   return result;
 });
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4862,17 +4862,17 @@ pref("extensions.webextensions.identity.
 pref("extensions.webextensions.themes.enabled", false);
 pref("extensions.webextensions.themes.icons.enabled", false);
 pref("extensions.webextensions.remote", false);
 
 pref("layers.popups.compositing.enabled", false);
 
 // Report Site Issue button
 pref("extensions.webcompat-reporter.newIssueEndpoint", "https://webcompat.com/issues/new");
-#ifndef RELEASE_OR_BETA
+#if defined(MOZ_DEV_EDITION) || defined(NIGHTLY_BUILD)
 pref("extensions.webcompat-reporter.enabled", true);
 #else
 pref("extensions.webcompat-reporter.enabled", false);
 #endif
 
 pref("network.buffer.cache.count", 24);
 pref("network.buffer.cache.size",  32768);