Bug 1208020 - Fix gUM sharing icons not being shown in mac toolbar when making a call. webRTC-indicator.css is only shared across Windows and Linux, not Mac as well. r=dao,a=lhenry
authorMark Banner <standard8@mozilla.com>
Thu, 01 Oct 2015 19:38:56 +0100
changeset 297959 b32c31942ba21f389f5c641c2c36480e9b6bebeb
parent 297958 c8c2cbe97fb2da2408b17e71cf6347deca1d192e
child 297960 32551122be1c6499c1b4a8a2542e3f4e41da7967
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao, lhenry
bugs1208020
milestone43.0a2
Bug 1208020 - Fix gUM sharing icons not being shown in mac toolbar when making a call. webRTC-indicator.css is only shared across Windows and Linux, not Mac as well. r=dao,a=lhenry
browser/themes/linux/jar.mn
browser/themes/linux/webRTC-indicator.css
browser/themes/shared/jar.inc.mn
browser/themes/shared/webrtc/indicator.css
browser/themes/windows/jar.mn
browser/themes/windows/webRTC-indicator.css
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -84,16 +84,17 @@ browser.jar:
   skin/classic/browser/Toolbar.png
   skin/classic/browser/Toolbar-inverted.png
   skin/classic/browser/Toolbar-small.png
   skin/classic/browser/undoCloseTab.png                        (../shared/undoCloseTab.png)
   skin/classic/browser/update-badge.svg                        (../shared/update-badge.svg)
   skin/classic/browser/update-badge-failed.svg                 (../shared/update-badge-failed.svg)
   skin/classic/browser/urlbar-arrow.png                     (../shared/urlbar-arrow.png)
   skin/classic/browser/urlbar-arrow@2x.png                  (../shared/urlbar-arrow@2x.png)
+  skin/classic/browser/webRTC-indicator.css
   skin/classic/browser/loop/menuPanel.png             (loop/menuPanel.png)
   skin/classic/browser/loop/menuPanel@2x.png          (loop/menuPanel@2x.png)
   skin/classic/browser/loop/toolbar.png               (loop/toolbar.png)
   skin/classic/browser/loop/toolbar@2x.png            (loop/toolbar@2x.png)
   skin/classic/browser/loop/toolbar-inverted.png      (loop/toolbar-inverted.png)
   skin/classic/browser/loop/toolbar-inverted@2x.png   (loop/toolbar-inverted@2x.png)
 * skin/classic/browser/controlcenter/panel.css        (controlcenter/panel.css)
   skin/classic/browser/controlcenter/arrow-subview.svg  (../shared/controlcenter/arrow-subview.svg)
rename from browser/themes/shared/webrtc/indicator.css
rename to browser/themes/linux/webRTC-indicator.css
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -45,17 +45,16 @@
   skin/classic/browser/webRTC-sharingMicrophone-16.png         (../shared/webrtc/webRTC-sharingMicrophone-16.png)
   skin/classic/browser/webRTC-sharingMicrophone-16@2x.png      (../shared/webrtc/webRTC-sharingMicrophone-16@2x.png)
   skin/classic/browser/webRTC-shareScreen-16.png               (../shared/webrtc/webRTC-shareScreen-16.png)
   skin/classic/browser/webRTC-shareScreen-16@2x.png            (../shared/webrtc/webRTC-shareScreen-16@2x.png)
   skin/classic/browser/webRTC-shareScreen-64.png               (../shared/webrtc/webRTC-shareScreen-64.png)
   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-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/panic-panel/header.png                  (../shared/panic-panel/header.png)
   skin/classic/browser/panic-panel/header@2x.png               (../shared/panic-panel/header@2x.png)
   skin/classic/browser/panic-panel/header-small.png            (../shared/panic-panel/header-small.png)
   skin/classic/browser/panic-panel/header-small@2x.png         (../shared/panic-panel/header-small@2x.png)
   skin/classic/browser/panic-panel/icons.png                   (../shared/panic-panel/icons.png)
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -125,16 +125,17 @@ browser.jar:
         skin/classic/browser/update-badge-failed.svg                 (../shared/update-badge-failed.svg)
         skin/classic/browser/urlbar-arrow.png                        (../shared/urlbar-arrow.png)
         skin/classic/browser/urlbar-arrow@2x.png                     (../shared/urlbar-arrow@2x.png)
         skin/classic/browser/urlbar-popup-blocked.png
         skin/classic/browser/urlbar-history-dropmarker.png
         skin/classic/browser/urlbar-history-dropmarker@2x.png
         skin/classic/browser/urlbar-history-dropmarker-preWin10.png
         skin/classic/browser/urlbar-history-dropmarker-preWin10@2x.png
+        skin/classic/browser/webRTC-indicator.css
         skin/classic/browser/loop/menuPanel.png                      (loop/menuPanel.png)
         skin/classic/browser/loop/menuPanel@2x.png                   (loop/menuPanel@2x.png)
         skin/classic/browser/loop/menuPanel-aero.png                 (loop/menuPanel-aero.png)
         skin/classic/browser/loop/menuPanel-aero@2x.png              (loop/menuPanel-aero@2x.png)
         skin/classic/browser/loop/toolbar.png                        (loop/toolbar.png)
         skin/classic/browser/loop/toolbar@2x.png                     (loop/toolbar@2x.png)
         skin/classic/browser/loop/toolbar-aero.png                   (loop/toolbar-aero.png)
         skin/classic/browser/loop/toolbar-aero@2x.png                (loop/toolbar-aero@2x.png)
copy from browser/themes/shared/webrtc/indicator.css
copy to browser/themes/windows/webRTC-indicator.css