diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 5ed9914f066e..47d6db278b1f 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -729,6 +729,8 @@ + + diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index fc4296ccf7b2..10b3f3f0d166 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -1231,6 +1231,11 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-64.png); } +.popup-notification-icon[popupid="webRTC-sharingScreen"], +.popup-notification-icon[popupid="webRTC-shareScreen"] { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png); +} + .popup-notification-icon[popupid="pointerLock"] { list-style-image: url(chrome://browser/skin/pointerLock-64.png); } @@ -1377,6 +1382,16 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16.png); } +.webRTC-shareScreen-notification-icon, +#webRTC-shareScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); +} + +.webRTC-sharingScreen-notification-icon, +#webRTC-sharingScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png); +} + .web-notifications-notification-icon, #web-notifications-notification-icon { list-style-image: url(chrome://browser/skin/notification-16.png); diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index c3c0607aefc2..f00b232b544b 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -74,6 +74,9 @@ browser.jar: skin/classic/browser/webRTC-shareMicrophone-16.png skin/classic/browser/webRTC-shareMicrophone-64.png skin/classic/browser/webRTC-sharingMicrophone-16.png + 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/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/browser.css b/browser/themes/osx/browser.css index 6f4256c78d77..7190cb1e8115 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -3570,6 +3570,28 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { } } +.webRTC-shareScreen-notification-icon, +#webRTC-shareScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); +} +@media (min-resolution: 2dppx) { + .webRTC-shareScreen-notification-icon, + #webRTC-shareScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png); + } +} + +.webRTC-sharingScreen-notification-icon, +#webRTC-sharingScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png); +} +@media (min-resolution: 2dppx) { + .webRTC-sharingScreen-notification-icon, + #webRTC-sharingScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png); + } +} + .web-notifications-notification-icon, #web-notifications-notification-icon { list-style-image: url(chrome://browser/skin/notification-16.png); @@ -3892,6 +3914,17 @@ menulist.translate-infobar-element > .menulist-dropmarker { } } +.popup-notification-icon[popupid="webRTC-sharingScreen"], +.popup-notification-icon[popupid="webRTC-shareScreen"] { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png); +} +@media (min-resolution: 2dppx) { + .popup-notification-icon[popupid="webRTC-sharingScreen"], + .popup-notification-icon[popupid="webRTC-shareScreen"] { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64@2x.png); + } +} + /* Popup Buttons */ #identity-popup-more-info-button { @hudButton@ diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index f0153f776539..568450aff5f1 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -125,6 +125,12 @@ browser.jar: skin/classic/browser/webRTC-shareMicrophone-64@2x.png skin/classic/browser/webRTC-sharingMicrophone-16.png skin/classic/browser/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/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/webRTC-shareScreen-16.png b/browser/themes/shared/webrtc/webRTC-shareScreen-16.png new file mode 100644 index 000000000000..577904736675 Binary files /dev/null and b/browser/themes/shared/webrtc/webRTC-shareScreen-16.png differ diff --git a/browser/themes/shared/webrtc/webRTC-shareScreen-16@2x.png b/browser/themes/shared/webrtc/webRTC-shareScreen-16@2x.png new file mode 100644 index 000000000000..6c8bd361383a Binary files /dev/null and b/browser/themes/shared/webrtc/webRTC-shareScreen-16@2x.png differ diff --git a/browser/themes/shared/webrtc/webRTC-shareScreen-64.png b/browser/themes/shared/webrtc/webRTC-shareScreen-64.png new file mode 100644 index 000000000000..3a2daa3eacbf Binary files /dev/null and b/browser/themes/shared/webrtc/webRTC-shareScreen-64.png differ diff --git a/browser/themes/shared/webrtc/webRTC-shareScreen-64@2x.png b/browser/themes/shared/webrtc/webRTC-shareScreen-64@2x.png new file mode 100644 index 000000000000..caeedeb80e77 Binary files /dev/null and b/browser/themes/shared/webrtc/webRTC-shareScreen-64@2x.png differ diff --git a/browser/themes/shared/webrtc/webRTC-sharingScreen-16.png b/browser/themes/shared/webrtc/webRTC-sharingScreen-16.png new file mode 100644 index 000000000000..6011caf90748 Binary files /dev/null and b/browser/themes/shared/webrtc/webRTC-sharingScreen-16.png differ diff --git a/browser/themes/shared/webrtc/webRTC-sharingScreen-16@2x.png b/browser/themes/shared/webrtc/webRTC-sharingScreen-16@2x.png new file mode 100644 index 000000000000..bac3900bcddf Binary files /dev/null and b/browser/themes/shared/webrtc/webRTC-sharingScreen-16@2x.png differ diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 778e4b7d631e..9c08d839000b 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -2213,6 +2213,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-64.png); } +.popup-notification-icon[popupid="webRTC-sharingScreen"], +.popup-notification-icon[popupid="webRTC-shareScreen"] { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png); +} + .popup-notification-icon[popupid="pointerLock"] { list-style-image: url(chrome://browser/skin/pointerLock-64.png); } @@ -2353,6 +2358,16 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16.png); } +.webRTC-shareScreen-notification-icon, +#webRTC-shareScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); +} + +.webRTC-sharingScreen-notification-icon, +#webRTC-sharingScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png); +} + .web-notifications-notification-icon, #web-notifications-notification-icon { list-style-image: url(chrome://browser/skin/notification-16.png); diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 330183b4f380..c60e2b320a44 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -95,6 +95,9 @@ browser.jar: skin/classic/browser/webRTC-shareMicrophone-16.png skin/classic/browser/webRTC-shareMicrophone-64.png skin/classic/browser/webRTC-sharingMicrophone-16.png + 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/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) @@ -504,6 +507,9 @@ browser.jar: skin/classic/aero/browser/webRTC-shareMicrophone-16.png skin/classic/aero/browser/webRTC-shareMicrophone-64.png skin/classic/aero/browser/webRTC-sharingMicrophone-16.png + 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/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)