From 38631c5e07523644af316de739db99e28d454b2b Mon Sep 17 00:00:00 2001 From: Shane Caraveo Date: Mon, 3 Jun 2013 14:37:02 -0700 Subject: [PATCH] bug 878905 use document title for menuitem label in camera menu, r=dao --- browser/base/content/browser-webrtcUI.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/browser/base/content/browser-webrtcUI.js b/browser/base/content/browser-webrtcUI.js index a6c9008ca9cd..fb1ea0b7d4fc 100644 --- a/browser/base/content/browser-webrtcUI.js +++ b/browser/base/content/browser-webrtcUI.js @@ -24,9 +24,17 @@ let WebrtcIndicator = { fillPopup: function (aPopup) { this._menuitemData = new WeakMap; for (let streamData of this.UIModule.activeStreams) { + let pageURI = Services.io.newURI(streamData.uri, null, null); let menuitem = document.createElement("menuitem"); - menuitem.setAttribute("label", streamData.uri); + menuitem.setAttribute("class", "menuitem-iconic"); + menuitem.setAttribute("label", streamData.browser.contentTitle || streamData.uri); menuitem.setAttribute("tooltiptext", streamData.uri); + PlacesUtils.favicons.getFaviconURLForPage(pageURI, function (aURI) { + if (aURI) { + let iconURL = PlacesUtils.favicons.getFaviconLinkForIcon(aURI).spec; + menuitem.setAttribute("image", iconURL); + } + }); this._menuitemData.set(menuitem, streamData);