--- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1525,8 +1525,6 @@ pref("browser.migrate.chrome.history.maxAgeInDays", 0); // Enable browser frames for use on desktop. Only exposed to chrome callers. pref("dom.mozBrowserFramesEnabled", true); -pref("extensions.pocket.enabled", true); - pref("signon.schemeUpgrades", true); // "Simplify Page" feature in Print Preview. This feature is disabled by default --- a/browser/base/content/test/general/browser_contextmenu.js +++ b/browser/base/content/test/general/browser_contextmenu.js @@ -10,7 +10,6 @@ let LOGIN_FILL_ITEMS = [ "fill-login-saved-passwords", true ], null, ]; -let hasPocket = Services.prefs.getBoolPref("extensions.pocket.enabled"); let hasContainers = Services.prefs.getBoolPref("privacy.userContext.enabled"); const example_base = "http://example.com/browser/browser/base/content/test/general/"; @@ -35,7 +34,6 @@ add_task(function* test_xul_text_link_label() { "---", null, "context-bookmarklink", true, "context-savelink", true, - ...(hasPocket ? ["context-savelinktopocket", true] : []), "context-copylink", true, "context-searchselect", true ] @@ -79,7 +77,6 @@ add_task(function* test_plaintext() { "context-bookmarkpage", true], null, "---", null, "context-savepage", true, - ...(hasPocket ? ["context-pocket", true] : []), "---", null, "context-viewbgimage", false, "context-selectall", true, @@ -102,7 +99,6 @@ add_task(function* test_link() { "---", null, "context-bookmarklink", true, "context-savelink", true, - ...(hasPocket ? ["context-savelinktopocket", true] : []), "context-copylink", true, "context-searchselect", true ] @@ -248,7 +244,6 @@ add_task(function* test_iframe() { "context-bookmarkpage", true], null, "---", null, "context-savepage", true, - ...(hasPocket ? ["context-pocket", true] : []), "---", null, "context-viewbgimage", false, "context-selectall", true, @@ -554,7 +549,6 @@ add_task(function* test_pagemenu() { "+Checkbox", {type: "checkbox", icon: "", checked: false, disabled: false}], null, "---", null, "context-savepage", true, - ...(hasPocket ? ["context-pocket", true] : []), "---", null, "context-viewbgimage", false, "context-selectall", true, @@ -585,7 +579,6 @@ add_task(function* test_dom_full_screen() { "context-leave-dom-fullscreen", true, "---", null, "context-savepage", true, - ...(hasPocket ? ["context-pocket", true] : []), "---", null, "context-viewbgimage", false, "context-selectall", true, @@ -631,7 +624,6 @@ add_task(function* test_pagemenu2() { "context-bookmarkpage", true], null, "---", null, "context-savepage", true, - ...(hasPocket ? ["context-pocket", true] : []), "---", null, "context-viewbgimage", false, "context-selectall", true, @@ -708,7 +700,6 @@ add_task(function* test_imagelink() { "---", null, "context-bookmarklink", true, "context-savelink", true, - ...(hasPocket ? ["context-savelinktopocket", true] : []), "context-copylink", true, "---", null, "context-viewimage", true, @@ -811,7 +802,6 @@ add_task(function* test_click_to_play_blocked_plugin() { "context-ctp-hide", true, "---", null, "context-savepage", true, - ...(hasPocket ? ["context-pocket", true] : []), "---", null, "context-viewbgimage", false, "context-selectall", true, @@ -855,7 +845,6 @@ add_task(function* test_srcdoc() { "context-bookmarkpage", true], null, "---", null, "context-savepage", true, - ...(hasPocket ? ["context-pocket", true] : []), "---", null, "context-viewbgimage", false, "context-selectall", true, --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -64,7 +64,6 @@ var kVersion = 6; * version the button is removed in as the value. e.g. "pocket-button": 5 */ var ObsoleteBuiltinButtons = { - "pocket-button": 6 }; /** @@ -247,13 +246,6 @@ var CustomizableUIInternal = { navbarPlacements.push("webide-button"); } - // Place this last, when createWidget is called for pocket, it will - // append to the toolbar. - if (Services.prefs.getPrefType("extensions.pocket.enabled") != Services.prefs.PREF_INVALID && - Services.prefs.getBoolPref("extensions.pocket.enabled")) { - navbarPlacements.push("pocket-button"); - } - this.registerArea(CustomizableUI.AREA_NAVBAR, { legacy: true, type: CustomizableUI.TYPE_TOOLBAR, --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -148,11 +148,6 @@ this.UITour = { query: "#panic-button", widgetName: "panic-button", }], - ["pocket", { - allowAdd: true, - query: "#pocket-button", - widgetName: "pocket-button", - }], ["privateWindow", {query: "#privatebrowsing-button"}], ["quit", {query: "#PanelUI-quit"}], ["search", { @@ -1662,46 +1657,6 @@ this.UITour = { popup.addEventListener("popupshown", onPopupShown); } aWindow.document.getElementById("identity-box").click(); - } else if (aMenuName == "pocket") { - this.getTarget(aWindow, "pocket").then(Task.async(function* onPocketTarget(target) { - let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName); - if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) { - log.error("Can't open the pocket menu without a view"); - return; - } - let placement = CustomizableUI.getPlacementOfWidget(target.widgetName); - if (!placement || !placement.area) { - log.error("Can't open the pocket menu without a placement"); - return; - } - - if (placement.area == CustomizableUI.AREA_PANEL) { - // Open the appMenu and wait for it if it's not already opened or showing a subview. - yield new Promise((resolve, reject) => { - if (aWindow.PanelUI.panel.state != "closed") { - if (aWindow.PanelUI.multiView.showingSubView) { - reject("A subview is already showing"); - return; - } - - resolve(); - return; - } - - aWindow.PanelUI.panel.addEventListener("popupshown", function onShown() { - aWindow.PanelUI.panel.removeEventListener("popupshown", onShown); - resolve(); - }); - - aWindow.PanelUI.show(); - }); - } - - let widgetWrapper = widgetGroupWrapper.forWindow(aWindow); - aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId, - widgetWrapper.anchor, - placement.area); - })).catch(log.error); } }, --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -8,7 +8,6 @@ DIRS += [ 'aushelper', 'e10srollout', 'pdfjs', - 'pocket', 'webcompat', ]