Bug 1466349 part 2 - Pass addonData to embedded Screenshots WE, add permissions
MozReview-Commit-ID: GLwjp32sj2i
--- a/browser/extensions/screenshots/bootstrap.js
+++ b/browser/extensions/screenshots/bootstrap.js
@@ -116,19 +116,20 @@ const LibraryButton = {
item.setAttribute("label", this.LABEL);
parent.insertBefore(item, nextSibling);
},
};
const APP_STARTUP = 1;
const APP_SHUTDOWN = 2;
-let startupReason;
+let addonData, startupReason;
function startup(data, reason) { // eslint-disable-line no-unused-vars
+ addonData = data;
startupReason = reason;
if (reason === APP_STARTUP) {
appStartupObserver.register();
} else {
appStartupDone();
}
prefObserver.register();
addonResourceURI = data.resourceURI;
@@ -172,17 +173,17 @@ function handleStartup() {
if (!shouldDisable() && !webExtension.started) {
start(webExtension);
} else if (shouldDisable()) {
stop(webExtension, ADDON_DISABLE);
}
}
function start(webExtension) {
- return webExtension.startup(startupReason).then((api) => {
+ return webExtension.startup(startupReason, addonData).then((api) => {
api.browser.runtime.onMessage.addListener(handleMessage);
LibraryButton.init(webExtension);
initPhotonPageAction(api, webExtension);
}).catch((err) => {
// The startup() promise will be rejected if the webExtension was
// already started (a harmless error), or if initializing the
// WebExtension failed and threw (an important error).
console.error(err);
--- a/browser/extensions/screenshots/webextension/manifest.json
+++ b/browser/extensions/screenshots/webextension/manifest.json
@@ -58,11 +58,13 @@
"downloads",
"tabs",
"storage",
"notifications",
"clipboardWrite",
"contextMenus",
"mozillaAddons",
"<all_urls>",
- "https://screenshots.firefox.com/"
+ "https://screenshots.firefox.com/",
+ "resource://pdf.js/",
+ "about:reader*"
]
}