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
authorMark Banner <standard8@mozilla.com>
Thu, 01 Oct 2015 19:38:56 +0100
changeset 265697 53483ede42c2830a3a3af02b4d902fd4c1b2e83d
parent 265696 fb8314962fa2b1c3f3d910f17c53a6a0ef616969
child 265698 41880e71001e93af35018ff0dfaa5c4e5006480d
push id66003
push usercbook@mozilla.com
push dateFri, 02 Oct 2015 11:37:40 +0000
treeherdermozilla-inbound@3fd732d24f46 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1208020
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
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
@@ -51,16 +51,17 @@ browser.jar:
   skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/Security-broken.png
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/slowStartup-16.png
   skin/classic/browser/Toolbar.png
   skin/classic/browser/Toolbar-inverted.png
   skin/classic/browser/Toolbar-small.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/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
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
@@ -140,17 +140,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
@@ -87,16 +87,17 @@ browser.jar:
   skin/classic/browser/toolbarbutton-dropdown-arrow.png
   skin/classic/browser/toolbarbutton-dropdown-arrow-XPVista7.png
   skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.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