From a2384c2234f4672cba21520c73454217628bacb8 Mon Sep 17 00:00:00 2001 From: Brian Grinstead Date: Mon, 16 Jul 2018 11:47:58 -0700 Subject: [PATCH 01/28] Bug 1475304 - Remove broadcasters that only have one observer;r=Gijs,johannh MozReview-Commit-ID: KbYBy2RjK1i --HG-- extra : rebase_source : 285700446cd9c183fbf6589d461c88b755d4af8c --- browser/base/content/browser-feeds.js | 4 +-- browser/base/content/browser-menubar.inc | 19 +++++++----- browser/base/content/browser-safebrowsing.js | 18 +++++------ browser/base/content/browser-sets.inc | 30 ------------------- .../content/browser-trackingprotection.js | 14 ++++----- browser/base/content/browser.js | 2 +- browser/base/content/browser.xul | 20 ++++++++++--- .../test/popups/browser_popup_blocker.js | 2 +- .../customizableui/content/panelUI.inc.xul | 2 +- .../pki/resources/content/clientauthask.xul | 3 +- 10 files changed, 49 insertions(+), 65 deletions(-) diff --git a/browser/base/content/browser-feeds.js b/browser/base/content/browser-feeds.js index f0c3c26c270b..b9655c006b65 100644 --- a/browser/base/content/browser-feeds.js +++ b/browser/base/content/browser-feeds.js @@ -227,12 +227,12 @@ var FeedHandler = { get _feedMenuitem() { delete this._feedMenuitem; - return this._feedMenuitem = document.getElementById("singleFeedMenuitemState"); + return this._feedMenuitem = document.getElementById("subscribeToPageMenuitem"); }, get _feedMenupopup() { delete this._feedMenupopup; - return this._feedMenupopup = document.getElementById("multipleFeedsMenuState"); + return this._feedMenupopup = document.getElementById("subscribeToPageMenupopup"); }, /** diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index 3426d9b29182..0b7c8d762069 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -399,19 +399,20 @@ observes="bookmarkThisPageBroadcaster" key="addBookmarkAsKb"/> + />