Merge branch 'master' into bookmark-context

This commit is contained in:
Maxx Crawford
2019-10-24 14:33:15 -05:00
committed by GitHub
6 changed files with 27 additions and 37 deletions
+1 -4
View File
@@ -143,7 +143,6 @@ const assignManager = {
const userContextId = this.getUserContextIdFromCookieStore(tab);
if (!siteSettings
|| userContextId === siteSettings.userContextId
|| tab.incognito
|| this.storageArea.isExempted(options.url, tab.id)) {
return {};
}
@@ -351,11 +350,9 @@ const assignManager = {
isTabPermittedAssign(tab) {
// Ensure we are not an important about url
// Ensure we are not in incognito mode
const url = new URL(tab.url);
if (url.protocol === "about:"
|| url.protocol === "moz-extension:"
|| tab.incognito) {
|| url.protocol === "moz-extension:") {
return false;
}
return true;