Bug 1478168 - Port 1476333: Replace use of pref browser.chromeURL. rs=bustage-fix, f=bgrins DONTBUILD
authorJorg K <jorgk@jorgk.com>
Wed, 25 Jul 2018 00:57:28 +0200
changeset 24349 3d1872a693cf87538d50c35eda62183497e18e26
parent 24348 a08367c1e5464a339016807c5553067b67e0cb2a
child 24350 077e984d3157f81a1ae4496c7e3f1e6f4a891487
push id14661
push usermozilla@jorgk.com
push dateWed, 25 Jul 2018 08:04:44 +0000
treeherdercomm-central@3d1872a693cf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1478168, 1476333
Bug 1478168 - Port 1476333: Replace use of pref browser.chromeURL. rs=bustage-fix, f=bgrins DONTBUILD
mail/app/profile/all-thunderbird.js
mail/base/content/utilityOverlay.js
mail/confvars.sh
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -9,17 +9,16 @@
 #ifndef XP_MACOSX
 #define UNIX_BUT_NOT_MAC
 #endif
 #endif
 
 pref("general.skins.selectedSkin", "classic/1.0");
 
 #ifdef XP_MACOSX
-pref("browser.chromeURL", "chrome://messenger/content/messengercompose/messengercompose.xul");
 pref("mail.biff.animate_dock_icon", false);
 #endif
 
 pref("mail.rights.version", 0);
 
 // Don't show the about:rights notification in debug or non-official builds.
 #ifdef DEBUG
 pref("mail.rights.override", true);
--- a/mail/base/content/utilityOverlay.js
+++ b/mail/base/content/utilityOverlay.js
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var gShowBiDi = false;
 
 function getBrowserURL() {
-  return Services.prefs.getCharPref("browser.chromeURL");
+  return AppConstants.BROWSER_CHROME_URL;
 }
 
 // update menu items that rely on focus
 function goUpdateGlobalEditMenuItems()
 {
   goUpdateCommand('cmd_undo');
   goUpdateCommand('cmd_redo');
   goUpdateCommand('cmd_cut');
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -22,16 +22,18 @@ if test "$OS_ARCH" = "WINNT"; then
 fi
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 MOZ_APP_VERSION_DISPLAY_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt
 MOZ_APP_VERSION_DISPLAY=`cat $MOZ_APP_VERSION_DISPLAY_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
+BROWSER_CHROME_URL=chrome://messenger/content/messengercompose/messengercompose.xul
+
 MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
 
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-central