corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1963137 - Enable extensions.ml.enabled browser pref on all channels a=dmeehan

Browse Source 
Original Revision: https://phabricator.services.mozilla.com/D249936

Differential Revision: https://phabricator.services.mozilla.com/D251547
This commit is contained in:
Tarek Ziadé
2025-05-28 17:37:52 +00:00
committed by dmeehan@mozilla.com
parent c9c133ce00
commit 70a04a58e9
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/libpref/init/all.js
View File

@@ -1796,11 +1796,10 @@ pref("extensions.browser_style_mv3.supported", false);
pref("extensions.browser_style_mv3.same_as_mv2", false); pref("extensions.browser_style_mv3.same_as_mv2", false);
// Experimental Inference API // Experimental Inference API
#ifdef NIGHTLY_BUILD pref("extensions.ml.enabled", true);
pref("extensions.ml.enabled", true);
#else // Local model management page enabled
pref("extensions.ml.enabled", false); pref("extensions.htmlaboutaddons.local_model_management", true);
#endif
// Middle-mouse handling // Middle-mouse handling
pref("middlemouse.paste", false); pref("middlemouse.paste", false);

10
toolkit/mozapps/extensions/internal/ModelHubProvider.sys.mjs
View File

@@ -17,8 +17,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyPreferenceGetter( XPCOMUtils.defineLazyPreferenceGetter(
lazy, lazy,
"MODELHUB_PROVIDER_ENABLED", "LOCAL_MODEL_MANAGEMENT_ENABLED",
"browser.ml.modelHubProvider", "extensions.htmlaboutaddons.local_model_management",
false, false,
(_pref, _old, val) => ModelHubProvider[val ? "init" : "shutdown"]() (_pref, _old, val) => ModelHubProvider[val ? "init" : "shutdown"]()
); );
@@ -116,7 +116,7 @@ export const ModelHubProvider = {
}, },
async getAddonsByTypes(types) { async getAddonsByTypes(types) {
if (!lazy.MODELHUB_PROVIDER_ENABLED) { if (!lazy.LOCAL_MODEL_MANAGEMENT_ENABLED) {
return []; return [];
} }
@@ -153,7 +153,7 @@ export const ModelHubProvider = {
}, },
init() { init() {
if (!lazy.MODELHUB_PROVIDER_ENABLED || this.initialized) { if (!lazy.LOCAL_MODEL_MANAGEMENT_ENABLED || this.initialized) {
return; return;
} }
@@ -184,7 +184,7 @@ export const ModelHubProvider = {
async refreshAddonCache() { async refreshAddonCache() {
// Return earlier if the model hub provider was disabled. // Return earlier if the model hub provider was disabled.
// by the time it was being called. // by the time it was being called.
if (!lazy.MODELHUB_PROVIDER_ENABLED) { if (!lazy.LOCAL_MODEL_MANAGEMENT_ENABLED) {
return; return;
} }

11
toolkit/mozapps/extensions/test/xpcshell/test_ModelHubProvider.js
View File

@@ -14,7 +14,8 @@ ChromeUtils.defineESModuleGetters(this, {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1"); createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
AddonTestUtils.init(this); AddonTestUtils.init(this);
const MODELHUBPROVIDER_PREF = "browser.ml.modelHubProvider"; const LOCAL_MODEL_MANAGEMENT_ENABLED_PREF =
"extensions.htmlaboutaddons.local_model_management";
function ensureBrowserDelayedStartupFinished() { function ensureBrowserDelayedStartupFinished() {
// ModelHubProvider does not register itself until the application startup // ModelHubProvider does not register itself until the application startup
@@ -28,7 +29,7 @@ add_setup(async () => {
add_task( add_task(
{ {
pref_set: [[MODELHUBPROVIDER_PREF, false]], pref_set: [[LOCAL_MODEL_MANAGEMENT_ENABLED_PREF, false]],
}, },
async function test_modelhub_provider_disabled() { async function test_modelhub_provider_disabled() {
ensureBrowserDelayedStartupFinished(); ensureBrowserDelayedStartupFinished();
@@ -41,7 +42,7 @@ add_task(
add_task( add_task(
{ {
pref_set: [[MODELHUBPROVIDER_PREF, true]], pref_set: [[LOCAL_MODEL_MANAGEMENT_ENABLED_PREF, true]],
}, },
async function test_modelhub_provider_enabled() { async function test_modelhub_provider_enabled() {
ensureBrowserDelayedStartupFinished(); ensureBrowserDelayedStartupFinished();
@@ -54,7 +55,7 @@ add_task(
add_task( add_task(
{ {
pref_set: [[MODELHUBPROVIDER_PREF, true]], pref_set: [[LOCAL_MODEL_MANAGEMENT_ENABLED_PREF, true]],
}, },
async function test_modelhub_provider_addon_wrappers() { async function test_modelhub_provider_addon_wrappers() {
let sandbox = sinon.createSandbox(); let sandbox = sinon.createSandbox();
@@ -354,7 +355,7 @@ add_task(
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() { async function test_modelhub_resets_cache_on_refresh() {
let sandbox = sinon.createSandbox(); let sandbox = sinon.createSandbox();