Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

2 changed files:

Changes:

  • browser/components/BrowserGlue.jsm
    ... ... @@ -2011,7 +2011,13 @@ BrowserGlue.prototype = {
    2011 2011
           () => PageDataService.uninit(),
    
    2012 2012
           () => PageThumbs.uninit(),
    
    2013 2013
           () => NewTabUtils.uninit(),
    
    2014
    -      () => Normandy.uninit(),
    
    2014
    +
    
    2015
    +      () => {
    
    2016
    +        if (AppConstants.MOZ_NORMANDY) {
    
    2017
    +          Normandy.uninit();
    
    2018
    +        }
    
    2019
    +      },
    
    2020
    +
    
    2015 2021
           () => RFPHelper.uninit(),
    
    2016 2022
           () => UpdateListener.reset(),
    
    2017 2023
           () => OnionAliasStore.uninit(),
    

  • toolkit/components/moz.build
    ... ... @@ -124,7 +124,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
    124 124
         ]
    
    125 125
     
    
    126 126
     if CONFIG["MOZ_BUILD_APP"] == "browser":
    
    127
    -    DIRS += ["normandy", "messaging-system"]
    
    127
    +    if CONFIG["MOZ_NORMANDY"]:
    
    128
    +        DIRS += ["normandy"]
    
    129
    +    DIRS += ["messaging-system"]
    
    128 130
     
    
    129 131
     DIRS += ["nimbus"]
    
    130 132