richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser

Commits:

3 changed files:

Changes:

  • browser/components/urlbar/UrlbarProvidersManager.sys.mjs
    ... ... @@ -51,8 +51,9 @@ var localProviderModules = {
    51 51
         "resource:///modules/UrlbarProviderHistoryUrlHeuristic.sys.mjs",
    
    52 52
       UrlbarProviderInputHistory:
    
    53 53
         "resource:///modules/UrlbarProviderInputHistory.sys.mjs",
    
    54
    -  UrlbarProviderInterventions:
    
    55
    -    "resource:///modules/UrlbarProviderInterventions.sys.mjs",
    
    54
    +  // disable as part of tor-browser#41327
    
    55
    +  // UrlbarProviderInterventions:
    
    56
    +  //   "resource:///modules/UrlbarProviderInterventions.sys.mjs",
    
    56 57
       UrlbarProviderOmnibox: "resource:///modules/UrlbarProviderOmnibox.sys.mjs",
    
    57 58
       UrlbarProviderPlaces: "resource:///modules/UrlbarProviderPlaces.sys.mjs",
    
    58 59
       UrlbarProviderPreloadedSites:
    

  • browser/components/urlbar/UrlbarUtils.sys.mjs
    ... ... @@ -21,8 +21,9 @@ ChromeUtils.defineESModuleGetters(lazy, {
    21 21
       SearchSuggestionController:
    
    22 22
         "resource://gre/modules/SearchSuggestionController.sys.mjs",
    
    23 23
       UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
    
    24
    -  UrlbarProviderInterventions:
    
    25
    -    "resource:///modules/UrlbarProviderInterventions.sys.mjs",
    
    24
    +  // disable as part of tor-browser#41327
    
    25
    +  // UrlbarProviderInterventions:
    
    26
    +  //   "resource:///modules/UrlbarProviderInterventions.sys.mjs",
    
    26 27
       UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
    
    27 28
       UrlbarProviderSearchTips:
    
    28 29
         "resource:///modules/UrlbarProviderSearchTips.sys.mjs",
    
    ... ... @@ -1387,20 +1388,22 @@ export var UrlbarUtils = {
    1387 1388
             return "tab";
    
    1388 1389
           case UrlbarUtils.RESULT_TYPE.TIP:
    
    1389 1390
             if (result.providerName === "UrlbarProviderInterventions") {
    
    1390
    -          switch (result.payload.type) {
    
    1391
    -            case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
    
    1392
    -              return "intervention_clear";
    
    1393
    -            case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
    
    1394
    -              return "intervention_refresh";
    
    1395
    -            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
    
    1396
    -            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
    
    1397
    -            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
    
    1398
    -            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
    
    1399
    -            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
    
    1400
    -              return "intervention_update";
    
    1401
    -            default:
    
    1402
    -              return "intervention_unknown";
    
    1403
    -          }
    
    1391
    +          return "intervention_unknown";
    
    1392
    +        // disable as part of tor-browser#41327
    
    1393
    +        //   switch (result.payload.type) {
    
    1394
    +        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
    
    1395
    +        //       return "intervention_clear";
    
    1396
    +        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
    
    1397
    +        //       return "intervention_refresh";
    
    1398
    +        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
    
    1399
    +        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
    
    1400
    +        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
    
    1401
    +        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
    
    1402
    +        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
    
    1403
    +        //       return "intervention_update";
    
    1404
    +        //     default:
    
    1405
    +        //       return "intervention_unknown";
    
    1406
    +        //   }
    
    1404 1407
             }
    
    1405 1408
     
    
    1406 1409
             switch (result.payload.type) {
    

  • browser/components/urlbar/moz.build
    ... ... @@ -30,7 +30,8 @@ EXTRA_JS_MODULES += [
    30 30
         "UrlbarProviderHeuristicFallback.sys.mjs",
    
    31 31
         "UrlbarProviderHistoryUrlHeuristic.sys.mjs",
    
    32 32
         "UrlbarProviderInputHistory.sys.mjs",
    
    33
    -    "UrlbarProviderInterventions.sys.mjs",
    
    33
    +    # disable as part of tor-browser#41327
    
    34
    +    # "UrlbarProviderInterventions.sys.mjs",
    
    34 35
         "UrlbarProviderOmnibox.sys.mjs",
    
    35 36
         "UrlbarProviderOpenTabs.sys.mjs",
    
    36 37
         "UrlbarProviderPlaces.sys.mjs",