Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

3 changed files:

Changes:

  • browser/base/content/browser.js
    ... ... @@ -68,7 +68,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
    68 68
       RFPHelper: "resource://gre/modules/RFPHelper.jsm",
    
    69 69
       SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
    
    70 70
       Sanitizer: "resource:///modules/Sanitizer.jsm",
    
    71
    -  SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
    
    72 71
       ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.jsm",
    
    73 72
       SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
    
    74 73
       SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
    
    ... ... @@ -5480,8 +5479,6 @@ var XULBrowserWindow = {
    5480 5479
     
    
    5481 5480
         SafeBrowsingNotificationBox.onLocationChange(aLocationURI);
    
    5482 5481
     
    
    5483
    -    SaveToPocket.onLocationChange(window);
    
    5484
    -
    
    5485 5482
         UrlbarProviderSearchTips.onLocationChange(
    
    5486 5483
           window,
    
    5487 5484
           aLocationURI,
    

  • browser/components/BrowserGlue.jsm
    ... ... @@ -75,7 +75,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
    75 75
       RFPHelper: "resource://gre/modules/RFPHelper.jsm",
    
    76 76
       SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
    
    77 77
       Sanitizer: "resource:///modules/Sanitizer.jsm",
    
    78
    -  SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
    
    79 78
       ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.jsm",
    
    80 79
       SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
    
    81 80
       SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
    
    ... ... @@ -1286,8 +1285,6 @@ BrowserGlue.prototype = {
    1286 1285
           Normandy.init();
    
    1287 1286
         }
    
    1288 1287
     
    
    1289
    -    SaveToPocket.init();
    
    1290
    -
    
    1291 1288
         AboutHomeStartupCache.init();
    
    1292 1289
     
    
    1293 1290
         Services.obs.notifyObservers(null, "browser-ui-startup-complete");
    

  • toolkit/components/moz.build
    ... ... @@ -123,9 +123,10 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
    123 123
             "components.conf",
    
    124 124
         ]
    
    125 125
     
    
    126
    -# tor-browser#41628: Disable Normandy and Nimbus at compile time
    
    127 126
     if CONFIG["MOZ_BUILD_APP"] == "browser":
    
    128
    -    DIRS += ["messaging-system"]
    
    127
    +    DIRS += ["normandy", "messaging-system"]
    
    128
    +
    
    129
    +DIRS += ["nimbus"]
    
    129 130
     
    
    130 131
     if CONFIG["MOZ_BACKGROUNDTASKS"]:
    
    131 132
         DIRS += ["backgroundtasks"]