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

Commits:

2 changed files:

Changes:

  • browser/components/BrowserGlue.jsm
    ... ... @@ -1934,7 +1934,13 @@ BrowserGlue.prototype = {
    1934 1934
           () => PageDataService.uninit(),
    
    1935 1935
           () => PageThumbs.uninit(),
    
    1936 1936
           () => NewTabUtils.uninit(),
    
    1937
    -      () => Normandy.uninit(),
    
    1937
    +
    
    1938
    +      () => {
    
    1939
    +        if (AppConstants.MOZ_NORMANDY) {
    
    1940
    +          Normandy.uninit();
    
    1941
    +        }
    
    1942
    +      },
    
    1943
    +
    
    1938 1944
           () => RFPHelper.uninit(),
    
    1939 1945
           () => UpdateListener.reset(),
    
    1940 1946
         ];
    

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