From aaecca5c9ff2ef2f3d902a7b5c90cae3f5a13d67 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Fri, 18 Jul 2014 21:04:00 -0700
Subject: [PATCH] Backed out 3 changesets (bug 1037408) for dt orange on a
 CLOSED TREE

Backed out changeset 8833bb7e90de (bug 1037408)
Backed out changeset c9cfdc0bbfbc (bug 1037408)
Backed out changeset f875dc5e0df7 (bug 1037408)
---
 browser/base/content/browser-webrtcUI.js      |   2 +-
 browser/base/content/webrtcIndicator.js       | 123 -----------------
 browser/base/content/webrtcIndicator.xul      |  35 -----
 browser/base/jar.mn                           |   2 -
 .../chrome/browser/webrtcIndicator.properties |  16 ---
 browser/locales/jar.mn                        |   1 -
 browser/modules/webrtcUI.jsm                  |  74 +---------
 browser/themes/linux/jar.mn                   |   4 -
 browser/themes/osx/jar.mn                     |   7 -
 .../themes/shared/webrtc/camera-white-16.png  | Bin 1138 -> 0 bytes
 .../shared/webrtc/camera-white-16@2x.png      | Bin 1402 -> 0 bytes
 browser/themes/shared/webrtc/indicator.css    | 129 ------------------
 .../shared/webrtc/microphone-white-16.png     | Bin 1268 -> 0 bytes
 .../shared/webrtc/microphone-white-16@2x.png  | Bin 1619 -> 0 bytes
 .../themes/shared/webrtc/screen-white-16.png  | Bin 1131 -> 0 bytes
 .../shared/webrtc/screen-white-16@2x.png      | Bin 1213 -> 0 bytes
 browser/themes/windows/jar.mn                 |   8 --
 17 files changed, 6 insertions(+), 395 deletions(-)
 delete mode 100644 browser/base/content/webrtcIndicator.js
 delete mode 100644 browser/base/content/webrtcIndicator.xul
 delete mode 100644 browser/locales/en-US/chrome/browser/webrtcIndicator.properties
 delete mode 100644 browser/themes/shared/webrtc/camera-white-16.png
 delete mode 100644 browser/themes/shared/webrtc/camera-white-16@2x.png
 delete mode 100644 browser/themes/shared/webrtc/indicator.css
 delete mode 100644 browser/themes/shared/webrtc/microphone-white-16.png
 delete mode 100644 browser/themes/shared/webrtc/microphone-white-16@2x.png
 delete mode 100644 browser/themes/shared/webrtc/screen-white-16.png
 delete mode 100644 browser/themes/shared/webrtc/screen-white-16@2x.png

diff --git a/browser/base/content/browser-webrtcUI.js b/browser/base/content/browser-webrtcUI.js
index 8ec23233fd47..666b030b3c58 100644
--- a/browser/base/content/browser-webrtcUI.js
+++ b/browser/base/content/browser-webrtcUI.js
@@ -23,7 +23,7 @@ let WebrtcIndicator = {
 
   fillPopup: function (aPopup) {
     this._menuitemData = new WeakMap;
-    for (let streamData of this.UIModule.getActiveStreams(true, true, true)) {
+    for (let streamData of this.UIModule.activeStreams) {
       let pageURI = Services.io.newURI(streamData.uri, null, null);
       let menuitem = document.createElement("menuitem");
       menuitem.setAttribute("class", "menuitem-iconic");
diff --git a/browser/base/content/webrtcIndicator.js b/browser/base/content/webrtcIndicator.js
deleted file mode 100644
index 50f150edb7ca..000000000000
--- a/browser/base/content/webrtcIndicator.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cu = Components.utils;
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/webrtcUI.jsm");
-
-const BUNDLE_URL = "chrome://browser/locale/webrtcIndicator.properties";
-let gStringBundle;
-
-function init(event) {
-  gStringBundle = Services.strings.createBundle(BUNDLE_URL);
-
-  let brand = Services.strings.createBundle("chrome://branding/locale/brand.properties");
-  let brandShortName = brand.GetStringFromName("brandShortName");
-  document.title =
-    gStringBundle.formatStringFromName("webrtcIndicator.windowtitle",
-                                       [brandShortName], 1);
-
-  for (let id of ["audioVideoButton", "screenSharePopup"]) {
-    let popup = document.getElementById(id);
-    popup.addEventListener("popupshowing", onPopupMenuShowing);
-    popup.addEventListener("popuphiding", onPopupMenuHiding);
-    popup.addEventListener("command", onPopupMenuCommand);
-  }
-
-  document.getElementById("firefoxButton")
-          .addEventListener("click", onFirefoxButtonClick);
-
-  updateIndicatorState();
-}
-
-function updateIndicatorState() {
-  updateWindowAttr("sharingvideo", webrtcUI.showCameraIndicator);
-  updateWindowAttr("sharingaudio", webrtcUI.showMicrophoneIndicator);
-  updateWindowAttr("sharingscreen", webrtcUI.showScreenSharingIndicator);
-
-  // Camera and microphone button tooltip.
-  let shareTypes = [];
-  if (webrtcUI.showCameraIndicator)
-    shareTypes.push("Camera");
-  if (webrtcUI.showMicrophoneIndicator)
-    shareTypes.push("Microphone");
-
-  let audioVideoButton = document.getElementById("audioVideoButton");
-  if (shareTypes.length) {
-    let stringId = "webrtcIndicator.sharing" + shareTypes.join("And") + ".tooltip";
-    audioVideoButton.setAttribute("tooltiptext",
-                                   gStringBundle.GetStringFromName(stringId));
-  }
-  else {
-    audioVideoButton.removeAttribute("tooltiptext");
-  }
-
-  // Screen sharing button tooltip.
-  let screenShareButton = document.getElementById("screenShareButton");
-  if (webrtcUI.showScreenSharingIndicator) {
-    let stringId = "webrtcIndicator.sharing" +
-                   webrtcUI.showScreenSharingIndicator + ".tooltip";
-    screenShareButton.setAttribute("tooltiptext",
-                                    gStringBundle.GetStringFromName(stringId));
-  }
-  else {
-    screenShareButton.removeAttribute("tooltiptext");
-  }
-
-  // Resize and center the window.
-  window.sizeToContent();
-  window.moveTo((screen.availWidth - document.documentElement.clientWidth) / 2, 0);
-}
-
-function updateWindowAttr(attr, value) {
-  let docEl = document.documentElement;
-  if (value)
-    docEl.setAttribute(attr, "true");
-  else
-    docEl.removeAttribute(attr);
-}
-
-function onPopupMenuShowing(event) {
-  let popup = event.target;
-  let type = popup.getAttribute("type");
-
-  let activeStreams;
-  if (type == "Devices")
-    activeStreams = webrtcUI.getActiveStreams(true, true, false);
-  else
-    activeStreams = webrtcUI.getActiveStreams(false, false, true);
-
-  if (activeStreams.length == 1) {
-    webrtcUI.showSharingDoorhanger(activeStreams[0], type);
-    return false;
-  }
-
-  for (let stream of activeStreams) {
-    let item = document.createElement("menuitem");
-    item.setAttribute("label", stream.browser.contentTitle || stream.uri);
-    item.setAttribute("tooltiptext", stream.uri);
-    item.stream = stream;
-    popup.appendChild(item);
-  }
-
-  return true;
-}
-
-function onPopupMenuHiding(event) {
-  let popup = event.target;
-  while (popup.firstChild)
-    popup.firstChild.remove();
-}
-
-function onPopupMenuCommand(event) {
-  let item = event.target;
-  webrtcUI.showSharingDoorhanger(item.stream,
-                                 item.parentNode.getAttribute("type"));
-}
-
-function onFirefoxButtonClick(event) {
-  event.target.blur();
-  let activeStreams = webrtcUI.getActiveStreams(true, true, true);
-  activeStreams[0].browser.ownerDocument.defaultView.focus();
-}
diff --git a/browser/base/content/webrtcIndicator.xul b/browser/base/content/webrtcIndicator.xul
deleted file mode 100644
index a1158366aba1..000000000000
--- a/browser/base/content/webrtcIndicator.xul
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/webRTC-indicator.css" type="text/css"?>
-
-<!DOCTYPE window>
-
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="webrtcIndicator"
-        html:role="alert"
-        windowtype="Browser:WebRTCGlobalIndicator"
-        onload="init(event);"
-#ifdef XP_MACOSX
-        inwindowmenu="false"
-#endif
-        sizemode="normal"
-        hidechrome="true"
-        orient="horizontal"
-        >
-  <script type="application/javascript" src="chrome://browser/content/webrtcIndicator.js"/>
-
-  <button id="firefoxButton"/>
-  <button id="audioVideoButton" type="menu">
-    <menupopup id="audioVideoPopup" type="Devices"/>
-  </button>
-  <separator id="shareSeparator"/>
-  <button id="screenShareButton" type="menu">
-    <menupopup id="screenSharePopup" type="Screen"/>
-  </button>
-</window>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index be83835070c9..ea01ce530e56 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -135,8 +135,6 @@ browser.jar:
 *       content/browser/softwareUpdateOverlay.xul  (content/softwareUpdateOverlay.xul)
 #endif
 *       content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
-*       content/browser/webrtcIndicator.xul           (content/webrtcIndicator.xul)
-        content/browser/webrtcIndicator.js            (content/webrtcIndicator.js)
 #ifdef XP_WIN
         content/browser/win6BrowserOverlay.xul        (content/win6BrowserOverlay.xul)
 #endif
diff --git a/browser/locales/en-US/chrome/browser/webrtcIndicator.properties b/browser/locales/en-US/chrome/browser/webrtcIndicator.properties
deleted file mode 100644
index 3900e0bb24c1..000000000000
--- a/browser/locales/en-US/chrome/browser/webrtcIndicator.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE : FILE This file contains the webrtc global indicator strings
-
-# LOCALIZATION NOTE (webrtcIndicator.windowtitle): %S is the brand name (e.g. Firefox).
-# This string is used so that the window has a title in tools that enumerate/look for window
-# titles. It is not normally visible anywhere.
-webrtcIndicator.windowtitle = %S - Sharing Indicator
-
-webrtcIndicator.sharingCameraAndMicrophone.tooltip = Your camera and microphone are being shared. Click to control sharing.
-webrtcIndicator.sharingCamera.tooltip              = Your camera is being shared. Click to control sharing.
-webrtcIndicator.sharingMicrophone.tooltip          = Your microphone is being shared. Click to control sharing.
-webrtcIndicator.sharingScreen.tooltip = Your screen is being shared. Click to control sharing.
-webrtcIndicator.sharingWindow.tooltip = A window is being shared. Click to control sharing.
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 6307e527ad0e..f43e673d6ccd 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -85,7 +85,6 @@
     locale/browser/taskbar.properties              (%chrome/browser/taskbar.properties)
     locale/browser/translation.dtd                 (%chrome/browser/translation.dtd)
     locale/browser/translation.properties          (%chrome/browser/translation.properties)
-    locale/browser/webrtcIndicator.properties      (%chrome/browser/webrtcIndicator.properties)
     locale/browser/downloads/downloads.dtd         (%chrome/browser/downloads/downloads.dtd)
     locale/browser/downloads/downloads.properties  (%chrome/browser/downloads/downloads.properties)
     locale/browser/places/places.dtd               (%chrome/browser/places/places.dtd)
diff --git a/browser/modules/webrtcUI.jsm b/browser/modules/webrtcUI.jsm
index 89c1ed33189e..71bc0408204e 100644
--- a/browser/modules/webrtcUI.jsm
+++ b/browser/modules/webrtcUI.jsm
@@ -13,8 +13,6 @@ const Ci = Components.interfaces;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-const INDICATOR_CHROME_URI = "chrome://browser/content/webrtcIndicator.xul";
-
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
                                   "resource://gre/modules/PluralForm.jsm");
 
@@ -36,26 +34,13 @@ this.webrtcUI = {
   },
 
   showGlobalIndicator: false,
-  showCameraIndicator: false,
-  showMicrophoneIndicator: false,
-  showScreenSharingIndicator: "", // either "Screen" or "Window"
 
-  // The boolean parameters indicate which streams should be included in the result.
-  getActiveStreams: function(aCamera, aMicrophone, aScreen) {
+  get activeStreams() {
     let contentWindowSupportsArray = MediaManagerService.activeMediaCaptureWindows;
     let count = contentWindowSupportsArray.Count();
     let activeStreams = [];
     for (let i = 0; i < count; i++) {
       let contentWindow = contentWindowSupportsArray.GetElementAt(i);
-
-      let camera = {}, microphone = {}, screen = {}, window = {};
-      MediaManagerService.mediaCaptureWindowState(contentWindow, camera,
-                                                  microphone, screen, window);
-      if (!(aCamera && camera.value ||
-            aMicrophone && microphone.value ||
-            aScreen && (screen.value || window.value)))
-        continue;
-
       let browser = getBrowserForWindow(contentWindow);
       let browserWindow = browser.ownerDocument.defaultView;
       let tab = browserWindow.gBrowser &&
@@ -69,20 +54,6 @@ this.webrtcUI = {
     return activeStreams;
   },
 
-  showSharingDoorhanger: function(aActiveStream, aType) {
-    let browserWindow = aActiveStream.browser.ownerDocument.defaultView;
-    if (aActiveStream.tab) {
-      browserWindow.gBrowser.selectedTab = aActiveStream.tab;
-    } else {
-      aActiveStream.browser.focus();
-    }
-    browserWindow.focus();
-    let PopupNotifications = browserWindow.PopupNotifications;
-    let notif = PopupNotifications.getNotification("webRTC-sharing" + aType,
-                                                   aActiveStream.browser);
-    notif.reshow();
-  },
-
   updateMainActionLabel: function(aMenuList) {
     let type = aMenuList.selectedItem.getAttribute("devicetype");
     let document = aMenuList.ownerDocument;
@@ -418,51 +389,16 @@ function prompt(aContentWindow, aCallID, aAudio, aVideo, aDevices, aSecure) {
                                     anchorId, mainAction, secondaryActions, options);
 }
 
-var gIndicatorWindow = null;
-
 function updateIndicators() {
-  let contentWindowSupportsArray = MediaManagerService.activeMediaCaptureWindows;
-  let count = contentWindowSupportsArray.Count();
-
-  webrtcUI.showGlobalIndicator = count > 0;
+  webrtcUI.showGlobalIndicator =
+    MediaManagerService.activeMediaCaptureWindows.Count() > 0;
 
   let e = Services.wm.getEnumerator("navigator:browser");
   while (e.hasMoreElements())
     e.getNext().WebrtcIndicator.updateButton();
 
-  webrtcUI.showCameraIndicator = false;
-  webrtcUI.showMicrophoneIndicator = false;
-  webrtcUI.showScreenSharingIndicator = "";
-
-  for (let i = 0; i < count; ++i) {
-    let contentWindow = contentWindowSupportsArray.GetElementAt(i);
-    let camera = {}, microphone = {}, screen = {}, window = {};
-    MediaManagerService.mediaCaptureWindowState(contentWindow, camera,
-                                                microphone, screen, window);
-    if (camera.value)
-      webrtcUI.showCameraIndicator = true;
-    if (microphone.value)
-      webrtcUI.showMicrophoneIndicator = true;
-    if (screen.value)
-      webrtcUI.showScreenSharingIndicator = "Screen";
-    else if (window.value && !webrtcUI.showScreenSharingIndicator)
-      webrtcUI.showScreenSharingIndicator = "Window";
-
-    showBrowserSpecificIndicator(getBrowserForWindow(contentWindow));
-  }
-
-  if (webrtcUI.showGlobalIndicator) {
-    if (!gIndicatorWindow) {
-      const features = "chrome,dialog=yes,titlebar=no,popup=yes";
-      gIndicatorWindow = Services.ww.openWindow(null, INDICATOR_CHROME_URI, "_blank",
-                                                features, []);
-    } else {
-      gIndicatorWindow.updateIndicatorState();
-    }
-  } else if (gIndicatorWindow) {
-    gIndicatorWindow.close();
-    gIndicatorWindow = null;
-  }
+  for (let {browser: browser} of webrtcUI.activeStreams)
+    showBrowserSpecificIndicator(browser);
 }
 
 function showBrowserSpecificIndicator(aBrowser) {
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 60f113e64e4b..f00b232b544b 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -77,10 +77,6 @@ browser.jar:
   skin/classic/browser/webRTC-shareScreen-16.png      (../shared/webrtc/webRTC-shareScreen-16.png)
   skin/classic/browser/webRTC-shareScreen-64.png      (../shared/webrtc/webRTC-shareScreen-64.png)
   skin/classic/browser/webRTC-sharingScreen-16.png    (../shared/webrtc/webRTC-sharingScreen-16.png)
-* skin/classic/browser/webRTC-indicator.css           (../shared/webrtc/indicator.css)
-  skin/classic/browser/webRTC-camera-white-16.png     (../shared/webrtc/camera-white-16.png)
-  skin/classic/browser/webRTC-microphone-white-16.png (../shared/webrtc/microphone-white-16.png)
-  skin/classic/browser/webRTC-screen-white-16.png     (../shared/webrtc/screen-white-16.png)
   skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
   skin/classic/browser/customizableui/customize-illustration.png  (../shared/customizableui/customize-illustration.png)
   skin/classic/browser/customizableui/customize-illustration-rtl.png  (../shared/customizableui/customize-illustration-rtl.png)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 19904ade9164..568450aff5f1 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -131,13 +131,6 @@ browser.jar:
   skin/classic/browser/webRTC-shareScreen-64@2x.png   (../shared/webrtc/webRTC-shareScreen-64@2x.png)
   skin/classic/browser/webRTC-sharingScreen-16.png    (../shared/webrtc/webRTC-sharingScreen-16.png)
   skin/classic/browser/webRTC-sharingScreen-16@2x.png (../shared/webrtc/webRTC-sharingScreen-16@2x.png)
-* skin/classic/browser/webRTC-indicator.css           (../shared/webrtc/indicator.css)
-  skin/classic/browser/webRTC-camera-white-16.png     (../shared/webrtc/camera-white-16.png)
-  skin/classic/browser/webRTC-camera-white-16@2x.png  (../shared/webrtc/camera-white-16@2x.png)
-  skin/classic/browser/webRTC-microphone-white-16.png (../shared/webrtc/microphone-white-16.png)
-  skin/classic/browser/webRTC-microphone-white-16@2x.png (../shared/webrtc/microphone-white-16@2x.png)
-  skin/classic/browser/webRTC-screen-white-16.png     (../shared/webrtc/screen-white-16.png)
-  skin/classic/browser/webRTC-screen-white-16@2x.png  (../shared/webrtc/screen-white-16@2x.png)
   skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
   skin/classic/browser/customizableui/customize-titleBar-toggle.png  (customizableui/customize-titleBar-toggle.png)
   skin/classic/browser/customizableui/customize-titleBar-toggle@2x.png  (customizableui/customize-titleBar-toggle@2x.png)
diff --git a/browser/themes/shared/webrtc/camera-white-16.png b/browser/themes/shared/webrtc/camera-white-16.png
deleted file mode 100644
index 59281ed5becd06ecf3f662e7a04dd32646d6fabe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1138
zcmaJ>&2QX96t^1GmX=7XN>za#7#x8Rs&~e-{#aYtrknMKti*<ByAs=;I=07IE3wD1
zC#)0okdz$K6TS2b5|t1_fW+6S2ZDqI+-Ri;sW<os0QJ&CrDeRE4LwA)WY5f-_kQp9
zzI=Om>7D5_ubz=4X}Y!Obi`UJ-qR<=_qE4EB9>Qpv&XNpfDcGYrMk~t3R)3ap&d&6
z&Gp~ttRzkChTR_TwcoWp7L`e%Q_iDASWD9ET%Hhbm2%+Hl`yW!f8YO62BBY*-`Cry
zoiu1aT--|O)vcwjx3%h7zC3ps%;vTLh$tr@kJjSM&TH}r*B1Li3}rA<;j1-yOsdyj
z1`U={pqF*ULs$i-RaSM~H1Q>Xk*YzYLbal(maS<vLg4U`g}2lX?2fZ==u4bxa-Z|W
zhHx+#ln0eEOIM(3Sr$YXVyp-aCEJWS$(1;pnIJec^U^TkA&WtQNL;qTYqDTE4k1d~
z?IYkgJ4}>F8O%un)iQ!nRKzvX&UlCZPvcnath<>|*r6HQNIg-HU}j=0a`${kg`!|%
zzn6xhC}hoH-bO@Y-g0WPxGDRgZwG;4Xs8k>h8|doW(5_+buC}1Y6eoViA-FnPH>L1
z$Mw2V!A*oT%Tm>*R<{<KRnx%pP1I1UxIVFM#Th5DM<>2R;d^ZBEIilNZlsiOmUbCi
zn{>f)pK+G;Sppi3QPn}4cwt<~iZYF(c4!)YK>dZ3MPQU?J3NL14Gg3sA1l6#14Z+Y
zs#F6XDOwO9Q`52P=_3BIz5h)9#(gRzB93H2$F7<tt#~RCK)z@~)if1?45YYb;8GnE
z&A>#4f+8$h=b2WTh(v!D+oQn{hojM=v6!b+3{L;6y)VVk?Y5kHH-F?l9S-NF-q>E>
zpT2SH;deVvU}^Zv&T#%<UpiI#W9J&UApQHvaQ7$n`SsVq<rmI>c=5`mW$CZg#hdxd
zrHduF-8*5u)Y7Gyb8i{jx1H&alIF}e`{(xHr+ZhtKg|~({Cf81`@i2?w|Bn(=hPP`
oKl}Ln-q}0%)=#gzxh+jecMmQc9Q^S1x5Zze)m(DEp1*PHKc%B<<^TWy

diff --git a/browser/themes/shared/webrtc/camera-white-16@2x.png b/browser/themes/shared/webrtc/camera-white-16@2x.png
deleted file mode 100644
index 035af0119e640c295e83b3fa9c7319432449a3c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1402
zcmaJ>e@q)y96!bn2Ln+C4yTYyanUfY_wIWAbyA_UFsf_EpxIEj*z4UpdiKZNuE$#H
zuN4fNjOdhwfr$>6h-Qk}4}*q928m8*G)Cium?hxU%pXgZCAiH+oUcG}e~?{r_ul)y
z@8|RVeJ?e6HWlQp&%-dRz}4t%Mk}6rSLdK_G?AD?%e`8CtJWfmT8vX6W*1~X#9d*o
z4K_ng=-71@R%2M^i;}lhYjtmCc{!}-Qabv0SV3qEtFDPF93O-l?uTts#HPD^>a-4*
z1e<QV(GA>+0|unVgbG^{9xtB=@>W4t^9WuYXAwadY8)O9hayonZqqIBvS^<YlRA7s
zMGM+=i%zw=n{bD$Lfoh~5<H+O+-%iTMx)tGSK&0E7!pt<WgsXk%P=ee_|l_8)>J`c
zo1G0yw$RC@3uv0cl4L9v)5i>YS#2XJtJO*Znxtt0X%Nwlh{nZ<NVFo&;Dk|Ll@v{q
zBY29D^ULj;O@};P3?Zzz-OI$0=u)Ck%E&mUkdz*f;czOh1?{NT4F7jyMeV4!LxE&7
zjLPjQkLn>-q`@e6w>OkhMBcDlR0$P@3pr)JJq#n7%W2c08@(V2tSFjH3^0g<$tYS0
z#wr>Jzuzhl7RCf9+6>IJ!II`#2~XSYCIjts0LE&isCve3ZK$`HO>|v7a8MT7p2oT&
zQH_i6Fl}2xwwJJVx5cs!6>^%adSyA3?t-R(tjW=Utl$pELe+6M$4ilvELEn(sGU%i
zc0-{-mBaW#o>^%HAE0OgMj+6H;HO1`;Q>WhL;(<tC;~HMq$%Er;$OrIx8!fJPmu)0
zp`_hmEoL(`@DzuL1k{9-*-UW21PH%b^g|=fF(#VRk;p|d)jGGdQd)%iGqqhF40Ko?
zEf_)bq@uxjYT(2Z7?#oNa@xJ|A20QveKga4S9jZMt_yX3edn5<CwEND&wkby@Fea&
zy!miFnK#~**jim`TYX`2-($V&KR-QNQ~cJ>fk9LG*iT)+@cWJ7v9aJkApetXch2Nm
zk~beXmf1a#|67k`#%9U5!?$k7yU&Du<yCvCru+9N6TX2}nRwaOA*|d^2DVRa@DvVU
zeTnA@P;kSab?y4huAJ{4zds}BTie_Dx@+i*?>{Z0H$B*RC05g#{iknmu!GLc%Kc&6
z#IFw}OO9oW=T4L!nkDSX>NTGJBl-Qcd&h42e;)a(H0!?F(dpI}<&~+CJniK0vj_f`
zMnb)Fa;)Xc;1y-n=+m{Ma~t=AYddYzMIUEhJRjNcX7>w~O7_+GFZ~^$L|bRd6^e=v
zyd2M}9Ga|%zk0FjormAPC%&a=X!4^&my>Mp$eH1TQ^!A?DEnHax~2w`g*oF{d;jnr
z+&v#Evg8!{D$l5m69y&ksM~n_oA<wZ?p(pfqkSb6dEUXR!TE0|L+6|H@149f-t)$u
bwbzS%*r_NS`*)Txrv8SmdXMviI$!61!(Zwj

diff --git a/browser/themes/shared/webrtc/indicator.css b/browser/themes/shared/webrtc/indicator.css
deleted file mode 100644
index d9819a35a2f5..000000000000
--- a/browser/themes/shared/webrtc/indicator.css
+++ /dev/null
@@ -1,129 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-window {
-  border: 1px solid #ff9500;
-}
-
-#audioVideoButton,
-#screenShareButton,
-#firefoxButton {
-  height: 29px;
-  margin: 0;
-  -moz-appearance: none;
-  border-style: none;
-}
-
-#firefoxButton {
-  background-image: url("chrome://branding/content/icon48.png");
-  background-repeat: no-repeat;
-  background-size: 22px;
-  background-position: center center;
-  min-width: 29px;
-  background-color: white;
-}
-
-#firefoxButton:hover {
-  background-color: #f2f2f2;
-}
-
-#screenShareButton {
-  background-image: url("webRTC-screen-white-16.png");
-  background-position: center center;
-  background-repeat: no-repeat;
-  background-size: 16px;
-  min-width: 27px;
-  display: none;
-}
-
-window[sharingscreen] > #screenShareButton {
-  display: -moz-box;
-}
-
-#audioVideoButton {
-  display: none;
-  background-repeat: no-repeat;
-}
-
-/* When screen sharing, need to pull in the separator: */
-window[sharingscreen] > #audioVideoButton {
-  margin-right: -1px;
-}
-
-/* Single icon button: */
-window[sharingvideo] > #audioVideoButton,
-window[sharingaudio] > #audioVideoButton {
-  display: -moz-box;
-  background-position: center center;
-  background-size: 16px;
-  min-width: 26px;
-}
-
-window[sharingvideo] > #audioVideoButton {
-  background-image: url("webRTC-camera-white-16.png");
-}
-
-window[sharingaudio] > #audioVideoButton {
-  background-image: url("webRTC-microphone-white-16.png");
-}
-
-/* Multi-icon button: */
-window[sharingaudio][sharingvideo] > #audioVideoButton {
-  background-image: url("webRTC-camera-white-16.png"),
-                    url("webRTC-microphone-white-16.png");
-  background-position: 6px center, 26px center;
-  background-size: 16px, 16px;
-  min-width: 46px;
-}
-
-/* Hover styles */
-#audioVideoButton,
-#screenShareButton {
-  background-color: #ffaa33;
-}
-
-#audioVideoButton:hover,
-#screenShareButton:hover {
-  background-color: #ff9500;
-}
-
-/* Don't show the dropmarker for the type="menu" case */
-#audioVideoButton > .box-inherit > .button-menu-dropmarker,
-#screenShareButton > .box-inherit > .button-menu-dropmarker {
-  display: none;
-}
-
-/* Separator in case of screen sharing + video/audio sharing */
-#shareSeparator {
-  width: 1px;
-  margin: 4px -1px 4px 0;
-  background-color: #FFCA80;
-  /* Separator needs to show above either button when they're hovered: */
-  position: relative;
-  z-index: 1;
-  display: none;
-}
-
-window[sharingscreen][sharingvideo] > #shareSeparator,
-window[sharingscreen][sharingaudio] > #shareSeparator {
-  display: -moz-box;
-}
-
-%ifdef XP_MACOSX
-@media (min-resolution: 2dppx) {
-  window[sharingvideo] > #audioVideoButton {
-    background-image: url("webRTC-camera-white-16@2x.png");
-  }
-
-  window[sharingaudio] > #audioVideoButton {
-    background-image: url("webRTC-microphone-white-16@2x.png");
-  }
-
-  /* Multi-icon button: */
-  window[sharingaudio][sharingvideo] > #audioVideoButton {
-    background-image: url("webRTC-camera-white-16@2x.png"),
-                      url("webRTC-microphone-white-16@2x.png");
-  }
-}
-%endif
diff --git a/browser/themes/shared/webrtc/microphone-white-16.png b/browser/themes/shared/webrtc/microphone-white-16.png
deleted file mode 100644
index 6b5c107d985040019f8233866df74ae5b4d676b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1268
zcmaJ>ZD<>196#CGYO&hUf^A`XUIz}^%e~|-_tM5S%cX17WHHNFzNop}J(r&8y?A$B
z(#k-);uMvw_@%;d6}wH4S~pRrbJViIbYPkDg;5X@-S$Ceogx(+*5{I@?nBwZ-Sa&E
z=l}ct-|wYVaz|5RM<aqDP4NLK4cBJ>y|W&EANX@chD*B_%X+&k%`3?cKq9J@2WZ@o
z3m^?-b>x{ZKre!97}qmdFPnHwR4gMP`#OQLVM8>6^lmHLvQh*dng<2l3}Z{D=P*=P
z!`L1+K_=`d7}N(w9k6ROnNdcIilAcK9!7i1A|x<?C!=L!$aKYW7_0D#aPNx=46Uem
z#V}TNDw{~5QOf}+8(?vTq$!jW0u;+~9Nmr5B*hRUMNmPU5=4d(NfKRsFlfzDH8Cyq
zuiApAFgECUwnz}AQYlah1}vvQP=X*3Bu&sX4mEIh#PsAcZn~W{1_`)|quZWtnW)bw
z=dEEcj6qMUAsBWdu|{mVtBHasBg(Q(Pyv!K3_q@lw(F(A|8A_S?Pf-7K%{|d4Lb^~
zht^pG!`$88kgo{65qCN|EQ&lNS<0{hOfN2lF?bVDbyd`~P>3Oe8XjUb0cQj)i0AWy
zit|i}q-c)h=pbL?Sr5<j2l-f#W=Td6C@RK8g#H-Mh3M@uGD`7uq=t=~t|yxcsM*$`
z?NuyuTdWv$fb3aL#<GTLU62~IJj)%lY&06JR2@yoif;Nczf9GrCE)0Lf!gm_23pCp
zsITJ#&_X0jsx+?VX$@x-lEQgSC2>a6NRDA?N?~FARlIsj{;GWnB`^-V=8nj790)3u
z42e|OgcQf&G8rQAJg4OWOUq1%mN5dlNcgRDODokxus{9n+F-!L+Gqh2&XWTN=j`j>
z972#g>f=%*Q(k=K>ofPvr&=5AzrK>jW0y9)buf}&-njW(?!>^6^F3{o_}G2FHx4xK
zfBx^uE#sNDR}%l8di<l&*Pi<A<A;tPzkYq@DxdsJk@z1nb&-QF|MK3OpPYQ8cmCdZ
zTh9?nTiE^1=-9@#ON+UM<*pY?A0GW+X0c)ShA#^X-}V)fryd>Ibl|eI{B&yU{^?xT
zmDu4I0<C8{&OLbk^ydvf&j%;Kt0(8%_u5x(c06lNPwxDq?#J2sF21jBvH7R(ds6$^
z?v>43T8>>Dzk9l!nELe^+B9|HiKVlLPTbWwcP&@nvbFDx8#njJ*@@zFbvv$hFU-u&
rwp?tTd;jvMTjwqm_f34abfYzg?0a%@<-k8vmH$vYmXzMzo*VlQQGd4G

diff --git a/browser/themes/shared/webrtc/microphone-white-16@2x.png b/browser/themes/shared/webrtc/microphone-white-16@2x.png
deleted file mode 100644
index 8f1cc8e1b848f05303f42f22e7b2ec641bea733b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1619
zcmaJ>c~BE)6ps-VMXgZ~kJ_$5)GC`jvbk1*6B4KagE26I1uL69AkDF1vq(UNN(&{5
z+S0LFDYb)E9mlD3VsR?9p3HclEoxg2rbyJ1c5uL26{n+g1H}4=<Ie1U-}k=vd++zI
z^_er?o-l64IFU#+!MMa=5mq4dMvfM~p0cukgk?IPlEY`R3|~TUv`9y>RvIumi2~X}
z6I5x@IXY1!8u_6uD~Hc9EyYRJDI-EUGOyDuphcp@#a=f-+G!rJ(gik`R@&QgTngAI
ztu$L<f=zBcU1(cU#?hH&8ChhRozzg$#YsS-7Z(gTX`TSQPKV2bd$rO*yST6qi6JR4
zsKVQ|(jihgCNrRCIT}#N6d(zs2%yr)5QRdeLK6TKMlc9QAVdx#8XUuL7zTzPso;&H
z7~En=9rh)hw9-PJcjFLLQc@x-k;_=F075hx4FsbQih_a$=qYvagco#q;=&dTw1?zu
zZr;YafRIJP$`<olslaq71gG0%dT!X|8BUatGRRA~Aw&j4PG=~tL2VCjq5r4xQf*IG
zshfr@w1+L`NTD7~To^3m?$wS$iUJ#a8D|rULO2X8S?r`;ywRYQ3O6#!M&S&jRAR84
z0hJ0y17aFR4qB}m3RGiC7(rFA3YDwFc3y_ZQswFtIf}rTMuQ+Jm`;<LqE;!<<P=zs
zs8L-QYjk;d!bQ?y-!{SbFcy9#7T0q$!LwWz%R0hcU@l~N)>Fv30lj{(>VSzLZLW|k
zRHmV*4K!z4LsO|7>jVb#jN4wqfo7Dj0;W)qvZ4%#kuU<P843n5hJjU>0!2uL5dRRK
zdLe&9eJV(VINV`6xLT#6<s?D~hA5#45tRxgU?mJ%Rg9HZpaiBw2`MB{ghH+JLMw$u
zLVt#~&j&*|JRdFECCn2i49=9@4-6uaSjeR=%X{O__M7%8y6BJm_Q}39=hgROS`UB^
zt0TuPn7@C1Qh%`GRz>#*TPu@wJ?SxQ%GCuAE2W1YR$C9+C;OjGTo<LE-BN$dd~(BU
zb@GCOa=GV^w%XWgf>vx=z4ESQ*3T8k)W9WQR3P%vJZoCVR8OE_rTAB0gEhHFvin*^
zetm53`RJxqUr4%JcaWVIxSb!X0+}nt)va@8m2Fu+q1m`DE$Y<HYfX(0_It1Xay~kL
zZF6j9=jnaeh<9~K-!nkl@`2v?#)R}+clSfo*o}S0hB2wvIydwK&uTJiE5_`)NG-Jw
ztk1KiO>SD97n2@18kFu`J+=>N&psRVTOeW%xZ&&H{ecL7dsTV-fj7JAuN?kFGkP7G
zTYSQM|H<6@EqmgF?h}Xm@5N)mMV;SG>O3bOIo0g6I2!cxf}d{D|K%{-pLFis+$I)x
zJJ`U$J3mZ1p51@3D7yZA(<SZfv;K(AR`KrZ@jte=!+!U)#Vs`*66ks*8JYK$fcb3N
zy%j}Eu;3k;^~>3=H`Z<o9=Ulr8%dw}`KW}A|K?#bZj^swudhBMp}+0CF=EG4N%^MI
zh=fi10<l-{j5?bnsy*23TVLDJ_-vcE_9w2Vt1hrAUvg~u>s3XS2fG~K&N%s~>QX@$
z8TeCq;`ABDenc&k`7WGEt=i(M$qkH9-FCHax7ho@Ongp;Mx1bqIfGreyzuW8J^t~z
z!6sw*p+!l>j^@lYaNI6mLr1zf?$lOE*O==uQxdZp^EWpKJdFdy&d0hN@qJ^D&dn{V
uNr<ISE1Q?sEsML?b@%DxL${BM$BW*Yxu<*j!n5koZ{C=aVfZFFzw$rsCS+Iu

diff --git a/browser/themes/shared/webrtc/screen-white-16.png b/browser/themes/shared/webrtc/screen-white-16.png
deleted file mode 100644
index 2632ac312d99ce763f43a7b9293f9e7bb6077b85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1131
zcmaJ=OK8+U7*1WaA`}EYs2~n03WC|pWb@dB#=7oqb<wS5U9}z*C&{D@Z5~agZdwtG
z6vT_5H&5cxizg3)f}*YBK@q%p5%eM`D0t9AVV&%DtA}DBnMeNb`@jEnV{G*3z}DSc
zIgT5s9ji3hx-EORY-ZoRKiilsyJ&Tso(f&s!ZG1WPG}KO^YH{}5bVs&ye2~&ms|9j
z<8-`!!mvX>k29Nm>PHOCaYMstgzYIpfkh^~z~sL_e#!&SG5NDf9oC~Vne>j$$K=%f
zXw#mbvUP_aJ_LqRgAw?IVvzdNL1LsP-{CdbKD!oq&@rJ?Cf^k`ULOPHFeX6BD}oIr
z1T;O56h+gdgFu2v79kQ*K|s18%LasC_2HSf*l~?UWn|SCJDL0>rI8_utyU}FD&)g>
zLPWZ*i%=3JNnjR2G8a&s3PCd1W2lhCj=hL_VE{5lY=yJb<eAcL2!2$ruMr2yYNA-m
z#1uy&%0tojv$#6e32l(SGS;<DnsX5m8zc#5W1H2(9qfTw?*8v6Gh}Lvld;E&f~PB?
zJ?oQz)+#2?{^T9cF<e(wWms?pRdIDe*4=_&S-K+>WfdYxgPK$*_ITFAYx+n@)r%68
zbseFqT+&CXMNO5CRACtvrBV-D3lfS0oAi8p%=ao5{TFMLV}fZIH^Xqc*9BvfAq|ts
zFaqUrr|O`NZ7;~~vNCm}u8`QfM4XX0^g$=jhPRFe;;K-AjwCpi<O;G4kx+CUD9El0
zHCd66t+4pJc;}z|b^DavusEWg9HXddq+lb=h#c00NYexiRVY}RYY|1lvMOO-WD>=!
zb^d9k-WBW5Y`ZoX?65XkBw+Itv%xX_=U3R!U8z+{&Gdt{(rypu_ASgj8@R~r;+C(s
zKlfi<c(k)-?i_r~Eq&oWDe1S%{Y$@Q=K7Z2<*Wd_-DI5^+Pr7OrvqOuaDC^&g_XPT
zckcbG#bvsmzjpJ^j^(uP^uX`q_xm;-Ub%I9apQ~Q?d|>1%jf6#Ckg%G>|fw=+`W%)
VzV5xf?_oCnwd!c)!I6vC{s8_dYv}+0

diff --git a/browser/themes/shared/webrtc/screen-white-16@2x.png b/browser/themes/shared/webrtc/screen-white-16@2x.png
deleted file mode 100644
index 610ab8fbe701c98d49cf1f21190fabf3bd0b8112..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1213
zcmaJ>TWB0r7@lotlctHb5V0-AjuVhlJ3D9Y7cy>=olU!?n{2lWM)09?Ig=f-bIHuC
zJ6RNB>m_~ELMZ4%>7qqMk=lo<&_-HF1;NWx^|2sGeb8bae2~;LyV=->(1DqA&VT;@
z`@jD-7s}JehX)T1Vi-1DJfT(4il^_uF7%CBt#z~<hzqmv8Q+eZdI+%z%QqliboDt{
zfx5N0@Esh(u)epP>TEn)I;EJto7GdDY~lvU8pFnNNuZnaFvbly=Xfgd=Qp<q+_6;R
zWxfPTK_1qe6Ri-QX-!wn*1RcOMD8VgEKv}E3u7Hm+`1PjiAr>E6|_&q6oGeC;(3+m
zlA0}*@w^{GoX_&42^bm|<t)wfqR1S>89;LspedRqX<6Yo1ps{WA&|GwvXzQ9wdo6;
zRH7EgfkIKuW;5Glvwk>7(XuR4fT0+ML>gqY=*4<MdeLYPL4%PQIzjCC9-boVhTn))
z0x|7|;0C4A7O)p>CJLpDO7wuDvw(8lG_H<z6j$K?G`7`_s*3@nDlqaJp^55YkM@jF
z?w;%@RYYu*nb1K+(d(LTHeBe%MNK8pP1bTO#kK{31FTI7ye*TQY_p_c$QCJa0-zZY
zhzu+BaJIAOrdX-KGBV&~nWhWeggjM{M1h$sfIKZR6Fu9a7sa|~!k%vj`QEgZo@lG&
zL#W4oSoQsSuM5gGKlY=VAK>|Xr|Nh~HytmPrDf_yt-;WF4O&y7@8X?2E6z3?pe+C%
zSPW?yj7@STph?NL0Lj@l5ILTqO&-PHwYMJ2U$;+@1jP~b=qQpXLe`{p1Z1Hmq(za`
zfdEKDv<=8JIwvqXK_QA%+B%Q5Qcr~XGu>_t20Cnw7WB|Og=lbUAAkKB8oD2f+C(+^
z)%f?(qulNB9WT6-+0}k(e*+WxlN}FPd}AiFk-2kmc>x<;sSjLx_5G92UC-Qa|1<K%
z*?s3<*?4yOYUUw*<by+hUAjD29=NRU|NUFyc;owXYwo-6-8(d1AG-75h_<!|zd3no
zWOeoMk>P9WBYXcSKVRZ93+gAo{CMHy%K7mF@^4t~nJ?9~T2Xqibh>|NcmL~$YyIm(
z*ZUqU-P^l7^YiV@jic>7?XR%iV^^-cLET+g-B;`T`^C3cay#!^#=(!;JAb+xV&h90
Z?9Hby<_E}2pQb;QVqseQeDdtM{{W52iXH#}

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 74b60f6c88bd..c60e2b320a44 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -98,10 +98,6 @@ browser.jar:
         skin/classic/browser/webRTC-shareScreen-16.png               (../shared/webrtc/webRTC-shareScreen-16.png)
         skin/classic/browser/webRTC-shareScreen-64.png               (../shared/webrtc/webRTC-shareScreen-64.png)
         skin/classic/browser/webRTC-sharingScreen-16.png             (../shared/webrtc/webRTC-sharingScreen-16.png)
-*       skin/classic/browser/webRTC-indicator.css                    (../shared/webrtc/indicator.css)
-        skin/classic/browser/webRTC-camera-white-16.png              (../shared/webrtc/camera-white-16.png)
-        skin/classic/browser/webRTC-microphone-white-16.png          (../shared/webrtc/microphone-white-16.png)
-        skin/classic/browser/webRTC-screen-white-16.png              (../shared/webrtc/screen-white-16.png)
         skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
         skin/classic/browser/customizableui/customizeFavicon.ico  (../shared/customizableui/customizeFavicon.ico)
         skin/classic/browser/customizableui/customize-illustration.png  (../shared/customizableui/customize-illustration.png)
@@ -514,10 +510,6 @@ browser.jar:
         skin/classic/aero/browser/webRTC-shareScreen-16.png               (../shared/webrtc/webRTC-shareScreen-16.png)
         skin/classic/aero/browser/webRTC-shareScreen-64.png               (../shared/webrtc/webRTC-shareScreen-64.png)
         skin/classic/aero/browser/webRTC-sharingScreen-16.png             (../shared/webrtc/webRTC-sharingScreen-16.png)
-*       skin/classic/aero/browser/webRTC-indicator.css                    (../shared/webrtc/indicator.css)
-        skin/classic/aero/browser/webRTC-camera-white-16.png              (../shared/webrtc/camera-white-16.png)
-        skin/classic/aero/browser/webRTC-microphone-white-16.png          (../shared/webrtc/microphone-white-16.png)
-        skin/classic/aero/browser/webRTC-screen-white-16.png              (../shared/webrtc/screen-white-16.png)
         skin/classic/aero/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
         skin/classic/aero/browser/customizableui/customize-illustration.png  (../shared/customizableui/customize-illustration.png)
         skin/classic/aero/browser/customizableui/customize-illustration-rtl.png  (../shared/customizableui/customize-illustration-rtl.png)