Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1365706: Use a special set of startup data when running in safe mode. r=rhelmer

Browse Source 
MozReview-Commit-ID: DcRnYu3rNot

--HG--
extra : rebase_source : d72ad915b93733cb8f7e19cca4312ffbc3fd7660
This commit is contained in:
Kris Maglione 2017-05-17 12:55:42 -07:00
parent 8adfa773bb
commit cdcfb4139e
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
toolkit/mozapps/extensions/internal/XPIProvider.jsm
View File

@ -252,6 +252,8 @@ const FILE_RDF_MANIFEST = "install.rdf";
const FILE_WEB_MANIFEST = "manifest.json";
const FILE_XPI_ADDONS_LIST = "extensions.ini";
const ADDON_ID_DEFAULT_THEME = "{972ce4c6-7e08-4474-a285-3208198ce6fd}";
const KEY_PROFILEDIR = "ProfD";
const KEY_ADDON_APP_DIR = "XREAddonAppDir";
const KEY_TEMPDIR = "TmpD";
@ -4079,6 +4081,30 @@ this.XPIProvider = {
.filter(addon => addon.dependencies.includes(aAddon.id));
},
/**
* Returns the add-on state data for the restartful extensions which
* should be available in safe mode. In particular, this means the
* default theme, and only the default theme.
*
* @returns {object}
*/
getSafeModeExtensions() {
let loc = XPIStates.getLocation(KEY_APP_GLOBAL);
let state = loc.get(ADDON_ID_DEFAULT_THEME);
// Use the default state data for the default theme, but always mark
// it enabled, in case another theme is enabled in normal mode.
let addonData = state.toJSON();
addonData.enabled = true;
return {
[KEY_APP_GLOBAL]: {
path: loc.path,
addons: { [ADDON_ID_DEFAULT_THEME]: addonData },
},
};
},
/**
* Checks for any changes that have occurred since the last time the
* application was launched.
@ -4198,6 +4224,12 @@ this.XPIProvider = {
}
}
if (Services.appinfo.inSafeMode) {
aomStartup.initializeExtensions(this.getSafeModeExtensions());
logger.debug("Initialized safe mode add-ons");
return false;
}
// If the application crashed before completing any pending operations then
// we should perform them now.
if (extensionListChanged || hasPendingChanges) {