diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 3d99c169b060..95bcd7179309 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1796,11 +1796,10 @@ pref("extensions.browser_style_mv3.supported", false); pref("extensions.browser_style_mv3.same_as_mv2", false); // Experimental Inference API -#ifdef NIGHTLY_BUILD - pref("extensions.ml.enabled", true); -#else - pref("extensions.ml.enabled", false); -#endif +pref("extensions.ml.enabled", true); + +// Local model management page enabled +pref("extensions.htmlaboutaddons.local_model_management", true); // Middle-mouse handling pref("middlemouse.paste", false); diff --git a/toolkit/mozapps/extensions/internal/ModelHubProvider.sys.mjs b/toolkit/mozapps/extensions/internal/ModelHubProvider.sys.mjs index 630ee292f6c2..36d0e5f301e1 100644 --- a/toolkit/mozapps/extensions/internal/ModelHubProvider.sys.mjs +++ b/toolkit/mozapps/extensions/internal/ModelHubProvider.sys.mjs @@ -17,8 +17,8 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyPreferenceGetter( lazy, - "MODELHUB_PROVIDER_ENABLED", - "browser.ml.modelHubProvider", + "LOCAL_MODEL_MANAGEMENT_ENABLED", + "extensions.htmlaboutaddons.local_model_management", false, (_pref, _old, val) => ModelHubProvider[val ? "init" : "shutdown"]() ); @@ -116,7 +116,7 @@ export const ModelHubProvider = { }, async getAddonsByTypes(types) { - if (!lazy.MODELHUB_PROVIDER_ENABLED) { + if (!lazy.LOCAL_MODEL_MANAGEMENT_ENABLED) { return []; } @@ -153,7 +153,7 @@ export const ModelHubProvider = { }, init() { - if (!lazy.MODELHUB_PROVIDER_ENABLED || this.initialized) { + if (!lazy.LOCAL_MODEL_MANAGEMENT_ENABLED || this.initialized) { return; } @@ -184,7 +184,7 @@ export const ModelHubProvider = { async refreshAddonCache() { // Return earlier if the model hub provider was disabled. // by the time it was being called. - if (!lazy.MODELHUB_PROVIDER_ENABLED) { + if (!lazy.LOCAL_MODEL_MANAGEMENT_ENABLED) { return; } diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ModelHubProvider.js b/toolkit/mozapps/extensions/test/xpcshell/test_ModelHubProvider.js index a87432f2d1fd..eb2a2cf35d63 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/test_ModelHubProvider.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_ModelHubProvider.js @@ -14,7 +14,8 @@ ChromeUtils.defineESModuleGetters(this, { createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1"); AddonTestUtils.init(this); -const MODELHUBPROVIDER_PREF = "browser.ml.modelHubProvider"; +const LOCAL_MODEL_MANAGEMENT_ENABLED_PREF = + "extensions.htmlaboutaddons.local_model_management"; function ensureBrowserDelayedStartupFinished() { // ModelHubProvider does not register itself until the application startup @@ -28,7 +29,7 @@ add_setup(async () => { add_task( { - pref_set: [[MODELHUBPROVIDER_PREF, false]], + pref_set: [[LOCAL_MODEL_MANAGEMENT_ENABLED_PREF, false]], }, async function test_modelhub_provider_disabled() { ensureBrowserDelayedStartupFinished(); @@ -41,7 +42,7 @@ add_task( add_task( { - pref_set: [[MODELHUBPROVIDER_PREF, true]], + pref_set: [[LOCAL_MODEL_MANAGEMENT_ENABLED_PREF, true]], }, async function test_modelhub_provider_enabled() { ensureBrowserDelayedStartupFinished(); @@ -54,7 +55,7 @@ add_task( add_task( { - pref_set: [[MODELHUBPROVIDER_PREF, true]], + pref_set: [[LOCAL_MODEL_MANAGEMENT_ENABLED_PREF, true]], }, async function test_modelhub_provider_addon_wrappers() { let sandbox = sinon.createSandbox(); @@ -354,7 +355,7 @@ add_task( add_task( { - pref_set: [[MODELHUBPROVIDER_PREF, true]], + pref_set: [[LOCAL_MODEL_MANAGEMENT_ENABLED_PREF, true]], }, async function test_modelhub_resets_cache_on_refresh() { let sandbox = sinon.createSandbox();