diff -Naur firefox-45.0esr.bak/browser/app/profile/firefox.js firefox-45.0esr/browser/app/profile/firefox.js --- firefox-45.0esr.bak/browser/app/profile/firefox.js 2016-03-13 +++ firefox-45.0esr/browser/app/profile/firefox.js 2016-03-13 @@ -1617,13 +1617,6 @@ // and because (normally) these errors are not persisted anywhere. pref("reader.errors.includeURLs", true); -pref("browser.pocket.enabled", true); -pref("browser.pocket.api", "api.getpocket.com"); -pref("browser.pocket.site", "getpocket.com"); -pref("browser.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4"); -pref("browser.pocket.useLocaleList", true); -pref("browser.pocket.enabledLocales", "cs de en-GB en-US en-ZA es-ES es-MX fr hu it ja ja-JP-mac ko nl pl pt-BR pt-PT ru zh-CN zh-TW"); - pref("view_source.tab", true); pref("dom.webnotifications.serviceworker.enabled", true); diff -Naur firefox-45.0esr.bak/browser/base/content/browser-context.inc firefox-45.0esr/browser/base/content/browser-context.inc --- firefox-45.0esr.bak/browser/base/content/browser-context.inc 2016-03-13 +++ firefox-45.0esr/browser/base/content/browser-context.inc 2016-03-13 @@ -79,10 +79,6 @@ label="&saveLinkCmd.label;" accesskey="&saveLinkCmd.accesskey;" oncommand="gContextMenu.saveLink();"/> - @@ -270,10 +266,6 @@ label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey2;" oncommand="gContextMenu.savePageAs();"/> - diff -Naur firefox-45.0esr.bak/browser/base/content/browser.css firefox-45.0esr/browser/base/content/browser.css --- firefox-45.0esr.bak/browser/base/content/browser.css 2016-03-13 +++ firefox-45.0esr/browser/base/content/browser.css 2016-03-13 @@ -18,30 +18,6 @@ %endif } -/* These values are chosen to keep the Loop detached chat window from - * getting too small. When it's too small, three bad things happen: - * - * - It looks terrible - * - It's not really usable - * - It's possible for the user to be transmitting video that's cropped by the - * the edge of the window, so that they're not aware of it, which is a - * privacy problem - * - * Note that if the chat window grows more users than Loop who want this - * ability, we'll need to generalize. A partial patch for this is in - * bug 1112264. - */ - -#chat-window { - /* - * In some ideal world, we'd have a simple way to express "block resizing - * along any dimension beyond the point at which an overflow event would - * occur". But none of -moz-{fit,max,min}-content do what we want here. So.. - */ - min-width: 260px; - min-height: 315px; -} - #main-window[customize-entered] { min-width: -moz-fit-content; } @@ -897,68 +873,6 @@ -moz-binding: url("chrome://browser/content/translation-infobar.xml#translationbar"); } -/* Social */ -/* Note the chatbox 'width' values are duplicated in socialchat.xml */ -chatbox { - -moz-binding: url("chrome://browser/content/socialchat.xml#chatbox"); - transition: height 150ms ease-out, width 150ms ease-out; - height: 290px; - width: 300px; /* CHAT_WIDTH_OPEN in socialchat.xml */ -} - -chatbox[customSize] { - width: 350px; /* CHAT_WIDTH_OPEN_ALT in socialchat.xml */ -} - -#chat-window[customSize] { - min-width: 350px; -} - -chatbox[customSize="loopChatEnabled"] { - /* 430px as defined per UX */ - height: 430px; -} - -#chat-window[customSize="loopChatEnabled"] { - /* 325px + 30px top bar height. */ - min-height: calc(325px + 30px); -} - -chatbox[customSize="loopChatMessageAppended"] { - /* 430px as defined per UX */ - height: 430px; -} - -chatbox[customSize="loopChatDisabledMessageAppended"] { - /* 388px as defined per UX */ - height: 388px; -} - -#chat-window[customSize="loopChatMessageAppended"] { - /* 445px + 30px top bar height. */ - min-height: calc(400px + 30px); -} - -chatbox[minimized="true"] { - width: 160px; - height: 20px; /* CHAT_WIDTH_MINIMIZED in socialchat.xml */ -} - -chatbar { - -moz-binding: url("chrome://browser/content/socialchat.xml#chatbar"); - height: 0; - max-height: 0; -} - -.chatbar-innerbox { - margin: -285px 0 0; -} - -chatbar[customSize] > .chatbar-innerbox { - /* 450px to make room for the maximum custom-size chatbox; currently 'loopChatMessageAppended'. */ - margin-top: -450px; -} - /* Apply crisp rendering for favicons at exactly 2dppx resolution */ @media (resolution: 2dppx) { #social-sidebar-favico, diff -Naur firefox-45.0esr.bak/browser/base/content/browser.js firefox-45.0esr/browser/base/content/browser.js --- firefox-45.0esr.bak/browser/base/content/browser.js 2016-03-13 +++ firefox-45.0esr/browser/base/content/browser.js 2016-03-13 @@ -53,37 +53,6 @@ "@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"); XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager", "resource://gre/modules/LightweightThemeManager.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "Pocket", - "resource:///modules/Pocket.jsm"); - -// Can't use XPCOMUtils for these because the scripts try to define the variables -// on window, and so the defineProperty inside defineLazyGetter fails. -Object.defineProperty(window, "pktApi", { - get: function() { - // Avoid this getter running again: - delete window.pktApi; - Services.scriptloader.loadSubScript("chrome://browser/content/pocket/pktApi.js", window); - return window.pktApi; - }, - configurable: true, - enumerable: true -}); - -function pktUIGetter(prop) { - return { - get: function() { - // Avoid either of these getters running again: - delete window.pktUI; - delete window.pktUIMessaging; - Services.scriptloader.loadSubScript("chrome://browser/content/pocket/main.js", window); - return window[prop]; - }, - configurable: true, - enumerable: true - }; -} -Object.defineProperty(window, "pktUI", pktUIGetter("pktUI")); -Object.defineProperty(window, "pktUIMessaging", pktUIGetter("pktUIMessaging")); XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", function() { return Services.strings.createBundle('chrome://browser/locale/browser.properties'); diff -Naur firefox-45.0esr.bak/browser/base/content/browser-menubar.inc firefox-45.0esr/browser/base/content/browser-menubar.inc --- firefox-45.0esr.bak/browser/base/content/browser-menubar.inc 2016-03-13 +++ firefox-45.0esr/browser/base/content/browser-menubar.inc 2016-03-13 @@ -413,7 +413,6 @@ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" onpopupshowing="BookmarkingUI.onMainMenuPopupShowing(event); - BookmarkingUI.updatePocketItemVisibility('menu_'); if (!this.parentNode._placesView) new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" tooltip="bhTooltip" popupsinherittooltip="true"> @@ -422,12 +421,6 @@ command="Browser:ShowAllBookmarks" key="manBookmarkKb"/> - -