Commit a4f4265d authored by henry's avatar henry
Browse files

fixup! BB 44045: Disable ML features. 

TB 44045: Moved changes to the correct target.
parent 655796df

docshell/base/nsAboutRedirector.cpp

+6 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ static const RedirEntry kRedirMap[] = { 
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |

         nsIAboutModule::HIDE_FROM_ABOUTABOUT},

#if defined(NIGHTLY_BUILD)

#if defined(NIGHTLY_BUILD) && !defined(BASE_BROWSER_VERSION)

    // Do not include about:inference since "ml" is excluded. tor-browser#44045.

    {"inference", "chrome://global/content/aboutInference.html",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

#endif
@@ -208,12 +209,16 @@ static const RedirEntry kRedirMap[] = { 
    {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

#endif

#ifndef BASE_BROWSER_VERSION

    // Remove about:translations since translations are disabled.

    // See tor-browser#44045 and tor-browser#42872.

    {"translations", "chrome://global/content/translations/translations.html",

     nsIAboutModule::ALLOW_SCRIPT |

         nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::URI_MUST_LOAD_IN_CHILD |

         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |

         nsIAboutModule::HIDE_FROM_ABOUTABOUT},

#endif

#ifndef BASE_BROWSER_VERSION

    {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",

     nsIAboutModule::ALLOW_SCRIPT},

docshell/build/components.conf

+4 −3
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ about_pages = [ 
    'serviceworkers',

    'srcdoc',

    'support',

    'translations',

    # Remove about:translations since translations are disabled.

    # See tor-browser#44045 and tor-browser#42872.

    'telemetry',

    # Removed 'url-classifier'. tor-browser#42831.

]
@@ -51,8 +52,8 @@ if defined('MOZ_TELEMETRY_REPORTING') and not defined('MOZ_GLEAN_ANDROID'): 
    about_pages.append('glean')

if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android' and buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'windows':

    about_pages.append('webauthn')

if defined('NIGHTLY_BUILD'):

    about_pages.append('inference')

# Do not include about:inference since "ml" component is missing.

# tor-browser#44045.



Headers = ['/docshell/build/nsDocShellModule.h']