diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 0592fb91b035..84fd9f22a97a 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -1185,7 +1185,7 @@ toolbar[iconsize="small"] #webrtc-status-button { } .popup-notification-icon[popupid="webapps-install"] { - list-style-image: url(chrome://browser/skin/webapps-64.png); + list-style-image: url(chrome://global/skin/icons/webapps-64.png); } .popup-notification-icon[popupid="mixed-content-blocked"] { @@ -1265,7 +1265,7 @@ toolbar[iconsize="small"] #webrtc-status-button { } #webapps-notification-icon { - list-style-image: url(chrome://browser/skin/webapps-16.png); + list-style-image: url(chrome://global/skin/icons/webapps-16.png); } #plugins-notification-icon { diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 8145b2ed9e69..6ad49fac6b17 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -233,8 +233,6 @@ browser.jar: skin/classic/browser/syncQuota.css skin/classic/browser/syncProgress.css #endif - skin/classic/browser/webapps-16.png - skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png) skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png) diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 1096dab58138..c30e2f80a6eb 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -3150,12 +3150,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { .webapps-notification-icon, #webapps-notification-icon { - list-style-image: url(chrome://browser/skin/webapps-16.png); + list-style-image: url(chrome://global/skin/icons/webapps-16.png); } @media (min-resolution: 2dppx) { .webapps-notification-icon, #webapps-notification-icon { - list-style-image: url(chrome://browser/skin/webapps-16@2x.png); + list-style-image: url(chrome://global/skin/icons/webapps-16@2x.png); } } @@ -3403,7 +3403,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { } .popup-notification-icon[popupid="webapps-install"] { - list-style-image: url(chrome://browser/skin/webapps-64.png); + list-style-image: url(chrome://global/skin/icons/webapps-64.png); } .popup-notification-icon[popupid="mixed-content-blocked"] { diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 3997879911cb..1e9beaace65b 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -331,9 +331,6 @@ browser.jar: skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png (tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png) skin/classic/browser/lion/tabview/tabview.png (tabview/tabview-lion.png) skin/classic/browser/lion/places/toolbar.png (places/toolbar-lion.png) - skin/classic/browser/webapps-16.png - skin/classic/browser/webapps-16@2x.png - skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png) skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png) diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 85c488853ebf..c2174d16674a 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -2455,7 +2455,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="webapps-install"] { - list-style-image: url(chrome://browser/skin/webapps-64.png); + list-style-image: url(chrome://global/skin/icons/webapps-64.png); } .popup-notification-icon[popupid="mixed-content-blocked"] { @@ -2533,7 +2533,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } #webapps-notification-icon { - list-style-image: url(chrome://browser/skin/webapps-16.png); + list-style-image: url(chrome://global/skin/icons/webapps-16.png); } #plugins-notification-icon { diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index c0a8c75b67a0..75886ce2aa45 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -70,8 +70,6 @@ browser.jar: skin/classic/browser/urlbar-arrow.png skin/classic/browser/urlbar-popup-blocked.png skin/classic/browser/urlbar-history-dropmarker.png - skin/classic/browser/webapps-16.png - skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png) skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png) @@ -327,8 +325,6 @@ browser.jar: skin/classic/aero/browser/urlbar-arrow.png skin/classic/aero/browser/urlbar-popup-blocked.png skin/classic/aero/browser/urlbar-history-dropmarker.png - skin/classic/aero/browser/webapps-16.png - skin/classic/aero/browser/webapps-64.png skin/classic/aero/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) skin/classic/aero/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png) skin/classic/aero/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png) diff --git a/browser/themes/linux/webapps-16.png b/toolkit/themes/linux/global/icons/webapps-16.png similarity index 100% rename from browser/themes/linux/webapps-16.png rename to toolkit/themes/linux/global/icons/webapps-16.png diff --git a/browser/themes/linux/webapps-64.png b/toolkit/themes/linux/global/icons/webapps-64.png similarity index 100% rename from browser/themes/linux/webapps-64.png rename to toolkit/themes/linux/global/icons/webapps-64.png diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn index 3558cc261cb0..5bd2732e6691 100644 --- a/toolkit/themes/linux/global/jar.mn +++ b/toolkit/themes/linux/global/jar.mn @@ -51,4 +51,6 @@ toolkit.jar: + skin/classic/global/icons/resizer.png (icons/resizer.png) + skin/classic/global/icons/sslWarning.png (icons/sslWarning.png) + skin/classic/global/icons/wrap.png (icons/wrap.png) ++ skin/classic/global/icons/webapps-16.png (icons/webapps-16.png) ++ skin/classic/global/icons/webapps-64.png (icons/webapps-64.png) + skin/classic/global/toolbar/spring.png (toolbar/spring.png) diff --git a/browser/themes/osx/webapps-16.png b/toolkit/themes/osx/global/icons/webapps-16.png similarity index 100% rename from browser/themes/osx/webapps-16.png rename to toolkit/themes/osx/global/icons/webapps-16.png diff --git a/browser/themes/osx/webapps-16@2x.png b/toolkit/themes/osx/global/icons/webapps-16@2x.png similarity index 100% rename from browser/themes/osx/webapps-16@2x.png rename to toolkit/themes/osx/global/icons/webapps-16@2x.png diff --git a/browser/themes/osx/webapps-64.png b/toolkit/themes/osx/global/icons/webapps-64.png similarity index 100% rename from browser/themes/osx/webapps-64.png rename to toolkit/themes/osx/global/icons/webapps-64.png diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index 92005b718975..a83da864a69e 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -142,6 +142,9 @@ toolkit.jar: skin/classic/global/icons/question-64.png (icons/question-64.png) skin/classic/global/icons/question-large.png (icons/question-large.png) skin/classic/global/icons/sslWarning.png (icons/sslWarning.png) + skin/classic/global/icons/webapps-16.png (icons/webapps-16.png) + skin/classic/global/icons/webapps-16@2x.png (icons/webapps-16@2x.png) + skin/classic/global/icons/webapps-64.png (icons/webapps-64.png) skin/classic/global/inContentUI/background-texture.png (inContentUI/background-texture.png) skin/classic/global/notification/close.png (notification/close.png) skin/classic/global/notification/critical-bar-background.png (notification/critical-bar-background.png) diff --git a/browser/themes/windows/webapps-16.png b/toolkit/themes/windows/global/icons/webapps-16.png similarity index 100% rename from browser/themes/windows/webapps-16.png rename to toolkit/themes/windows/global/icons/webapps-16.png diff --git a/browser/themes/windows/webapps-64.png b/toolkit/themes/windows/global/icons/webapps-64.png similarity index 100% rename from browser/themes/windows/webapps-64.png rename to toolkit/themes/windows/global/icons/webapps-64.png diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index d31f22694400..be2369e3cc99 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -143,6 +143,8 @@ toolkit.jar: skin/classic/global/icons/warning-64.png (icons/warning-64.png) skin/classic/global/icons/windowControls.png (icons/windowControls.png) skin/classic/global/icons/wrap.png (icons/wrap.png) + skin/classic/global/icons/webapps-16.png (icons/webapps-16.png) + skin/classic/global/icons/webapps-64.png (icons/webapps-64.png) skin/classic/global/inContentUI/background-texture.png (inContentUI/background-texture.png) skin/classic/global/media/TopLevelImageDocument.css (media/TopLevelImageDocument.css) skin/classic/global/media/TopLevelVideoDocument.css (media/TopLevelVideoDocument.css) @@ -323,6 +325,8 @@ toolkit.jar: skin/classic/aero/global/icons/warning-64.png (icons/warning-64-aero.png) skin/classic/aero/global/icons/windowControls.png (icons/windowControls-aero.png) skin/classic/aero/global/icons/wrap.png (icons/wrap-aero.png) + skin/classic/aero/global/icons/webapps-16.png (icons/webapps-16.png) + skin/classic/aero/global/icons/webapps-64.png (icons/webapps-64.png) skin/classic/aero/global/inContentUI/background-texture.png (inContentUI/background-texture.png) skin/classic/aero/global/media/TopLevelImageDocument.css (media/TopLevelImageDocument.css) skin/classic/aero/global/media/TopLevelVideoDocument.css (media/TopLevelVideoDocument.css) diff --git a/toolkit/webapps/WebappsIconHelpers.js b/toolkit/webapps/WebappsIconHelpers.js index 4e3f7bcd9e56..a49bca0d918e 100644 --- a/toolkit/webapps/WebappsIconHelpers.js +++ b/toolkit/webapps/WebappsIconHelpers.js @@ -17,12 +17,12 @@ */ function getBiggestIconURL(aIcons) { if (!aIcons) { - return "chrome://browser/skin/webapps-64.png"; + return "chrome://global/skin/icons/webapps-64.png"; } let iconSizes = Object.keys(aIcons); if (iconSizes.length == 0) { - return "chrome://browser/skin/webapps-64.png"; + return "chrome://global/skin/icons/webapps-64.png"; } iconSizes.sort(function(a, b) a - b); return aIcons[iconSizes.pop()];