Bug 1395990 - remove Services.appinfo.isOfficial;r=mossop draft
authorJulian Descottes <jdescottes@mozilla.com>
Fri, 01 Sep 2017 18:57:43 +0200
changeset 657598 5503da20cf80e8c16960bd93d916128e8e1e5d2b
parent 657597 aa6f33da65c308d0eab511c36f60fa6aa0464830
child 729471 7c7e7289d9c0bbc287210cbd7f1d7b1be82dad8b
push id77571
push userjdescottes@mozilla.com
push dateFri, 01 Sep 2017 17:35:31 +0000
reviewersmossop
bugs1395990
milestone57.0a1
Bug 1395990 - remove Services.appinfo.isOfficial;r=mossop MozReview-Commit-ID: 1hohMqK7K90
toolkit/xre/nsAppRunner.cpp
xpcom/system/nsIXULRuntime.idl
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1101,27 +1101,16 @@ nsXULAppInfo::GetDefaultUpdateChannel(ns
 NS_IMETHODIMP
 nsXULAppInfo::GetDistributionID(nsACString& aResult)
 {
   aResult.AssignLiteral(MOZ_DISTRIBUTION_ID);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsXULAppInfo::GetIsOfficial(bool* aResult)
-{
-#ifdef MOZILLA_OFFICIAL
-  *aResult = true;
-#else
-  *aResult = false;
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsXULAppInfo::GetWindowsDLLBlocklistStatus(bool* aResult)
 {
 #if defined(HAS_DLL_BLOCKLIST)
   *aResult = DllBlocklist_CheckStatus();
 #else
   *aResult = false;
 #endif
   return NS_OK;
--- a/xpcom/system/nsIXULRuntime.idl
+++ b/xpcom/system/nsIXULRuntime.idl
@@ -191,18 +191,13 @@ interface nsIXULRuntime : nsISupports
   readonly attribute AUTF8String defaultUpdateChannel;
 
   /**
    * The distribution ID for this build (MOZ_DISTRIBUTION_ID).
    */
   readonly attribute AUTF8String distributionID;
 
   /**
-   * True if this is an official build (MOZILLA_OFFICIAL).
-   */
-  readonly attribute boolean isOfficial;
-
-  /**
    * True if Windows DLL blocklist initialized correctly. This is
    * primarily for automated testing purposes.
    */
   readonly attribute boolean windowsDLLBlocklistStatus;
 };