Bug 659407 - Remove duplicate winstripe files. r=dolske

browser/themes/winstripe/browser.css

@@ -621,7 +621,7 @@ menuitem.bookmark-item {
 }
 
 .bookmark-item[query][tagContainer] {
-  list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
+  list-style-image: url("chrome://browser/skin/places/tag.png");
   -moz-image-region: auto;
 }
 

browser/themes/winstripe/jar.mn

@@ -6,7 +6,7 @@ browser.jar:
         skin/classic/browser/sanitizeDialog.css                      (sanitizeDialog.css)
 *       skin/classic/browser/aboutPrivateBrowsing.css                (aboutPrivateBrowsing.css)
 *       skin/classic/browser/aboutSessionRestore.css                 (aboutSessionRestore.css)
-        skin/classic/browser/aboutSessionRestore-window-icon.png     (aboutSessionRestore-window-icon.png)
+        skin/classic/browser/aboutSessionRestore-window-icon.png     (preferences/application.png)
         skin/classic/browser/aboutCertError.css                      (aboutCertError.css)
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/browser/aboutSyncTabs.css
@@ -51,10 +51,10 @@ browser.jar:
         skin/classic/browser/urlbar-history-dropmarker.png
         skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
         skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/audioFeedIcon.png                 (feeds/audioFeedIcon.png)
-        skin/classic/browser/feeds/audioFeedIcon16.png               (feeds/audioFeedIcon16.png)
-        skin/classic/browser/feeds/videoFeedIcon.png                 (feeds/videoFeedIcon.png)
-        skin/classic/browser/feeds/videoFeedIcon16.png               (feeds/videoFeedIcon16.png)
+        skin/classic/browser/feeds/audioFeedIcon.png                 (feeds/feedIcon.png)
+        skin/classic/browser/feeds/audioFeedIcon16.png               (feeds/feedIcon16.png)
+        skin/classic/browser/feeds/videoFeedIcon.png                 (feeds/feedIcon.png)
+        skin/classic/browser/feeds/videoFeedIcon16.png               (feeds/feedIcon16.png)
         skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
         skin/classic/browser/feeds/subscribe-ui.css                  (feeds/subscribe-ui.css)
         skin/classic/browser/inspector.css
@@ -204,10 +204,10 @@ browser.jar:
         skin/classic/aero/browser/urlbar-history-dropmarker.png
         skin/classic/aero/browser/feeds/feedIcon.png                 (feeds/feedIcon-aero.png)
         skin/classic/aero/browser/feeds/feedIcon16.png               (feeds/feedIcon16-aero.png)
-        skin/classic/aero/browser/feeds/audioFeedIcon.png            (feeds/audioFeedIcon-aero.png)
-        skin/classic/aero/browser/feeds/audioFeedIcon16.png          (feeds/audioFeedIcon16-aero.png)
-        skin/classic/aero/browser/feeds/videoFeedIcon.png            (feeds/videoFeedIcon-aero.png)
-        skin/classic/aero/browser/feeds/videoFeedIcon16.png          (feeds/videoFeedIcon16-aero.png)
+        skin/classic/aero/browser/feeds/audioFeedIcon.png            (feeds/feedIcon-aero.png)
+        skin/classic/aero/browser/feeds/audioFeedIcon16.png          (feeds/feedIcon16-aero.png)
+        skin/classic/aero/browser/feeds/videoFeedIcon.png            (feeds/feedIcon-aero.png)
+        skin/classic/aero/browser/feeds/videoFeedIcon16.png          (feeds/feedIcon16-aero.png)
         skin/classic/aero/browser/feeds/subscribe.css                (feeds/subscribe.css)
         skin/classic/aero/browser/feeds/subscribe-ui.css             (feeds/subscribe-ui.css)
         skin/classic/aero/browser/inspector.css
@@ -228,7 +228,7 @@ browser.jar:
         skin/classic/aero/browser/places/history.png                 (places/history-aero.png)
         skin/classic/aero/browser/places/allBookmarks.png            (places/allBookmarks-aero.png)
         skin/classic/aero/browser/places/unsortedBookmarks.png       (places/unsortedBookmarks-aero.png)
-        skin/classic/aero/browser/places/searching_16.png            (places/searching_16-aero.png)
+        skin/classic/aero/browser/places/searching_16.png            (places/searching_16.png)
         skin/classic/aero/browser/places/downloads.png               (places/downloads.png)
         skin/classic/aero/browser/preferences/alwaysAsk.png          (preferences/alwaysAsk-aero.png)
         skin/classic/aero/browser/preferences/application.png        (preferences/application-aero.png)
@@ -237,7 +237,6 @@ browser.jar:
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/aero/browser/preferences/Options-sync.png       (preferences/Options-sync.png)
 #endif
-        skin/classic/aero/browser/preferences/plugin.png             (preferences/plugin-aero.png)
         skin/classic/aero/browser/preferences/saveFile.png           (preferences/saveFile-aero.png)
 *       skin/classic/aero/browser/preferences/preferences.css        (preferences/preferences.css)
         skin/classic/aero/browser/preferences/applications.css       (preferences/applications.css)

browser/themes/winstripe/places/places.css

@@ -81,7 +81,7 @@ treechildren::-moz-tree-image(title, query) {
 
 treechildren::-moz-tree-image(title, query, tagContainer),
 treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
-  list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
+  list-style-image: url("chrome://browser/skin/places/tag.png");
   -moz-image-region: auto;
 }
 

toolkit/themes/winstripe/global/console/console.css

@@ -118,7 +118,7 @@
 
 .console-row[type="error"],
 .console-row[type="exception"] {
-  list-style-image: url("chrome://global/skin/console/bullet-error.png");
+  list-style-image: url("chrome://global/skin/icons/error-16.png");
 }
 
 .console-row[type="error"] .console-row-msg,
@@ -127,11 +127,11 @@
 }
 
 .console-row[type="warning"] {
-  list-style-image: url("chrome://global/skin/console/bullet-warning.png");
+  list-style-image: url("chrome://global/skin/icons/warning-16.png");
 }
 
 .console-row[type="message"] {
-  list-style-image: url("chrome://global/skin/console/bullet-question.png");
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
 }
 
 /* ::::: toolbars ::::: */

toolkit/themes/winstripe/global/findBar.css

@@ -94,7 +94,7 @@ findbar {
 }
 
 .find-status-icon[status="notfound"] {
-  list-style-image: url("chrome://global/skin/icons/notfound.png");
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
 .findbar-textbox[status="notfound"] {

toolkit/themes/winstripe/global/jar.mn

@@ -66,12 +66,12 @@ toolkit.jar:
         skin/classic/global/arrow/arrow-down.png                 (arrow/arrow-down.png)
         skin/classic/global/arrow/arrow-lft.gif                  (arrow/arrow-lft.gif)
         skin/classic/global/arrow/arrow-lft-dis.gif              (arrow/arrow-lft-dis.gif)
-        skin/classic/global/arrow/arrow-lft-hov.gif              (arrow/arrow-lft-hov.gif)
+        skin/classic/global/arrow/arrow-lft-hov.gif              (arrow/arrow-lft.gif)
         skin/classic/global/arrow/arrow-lft-sharp.gif            (arrow/arrow-lft-sharp.gif)
         skin/classic/global/arrow/arrow-lft-sharp-end.gif        (arrow/arrow-lft-sharp-end.gif)
         skin/classic/global/arrow/arrow-rit.gif                  (arrow/arrow-rit.gif) 
         skin/classic/global/arrow/arrow-rit-dis.gif              (arrow/arrow-rit-dis.gif)
-        skin/classic/global/arrow/arrow-rit-hov.gif              (arrow/arrow-rit-hov.gif)
+        skin/classic/global/arrow/arrow-rit-hov.gif              (arrow/arrow-rit.gif)
         skin/classic/global/arrow/arrow-rit-sharp.gif            (arrow/arrow-rit-sharp.gif)
         skin/classic/global/arrow/arrow-rit-sharp-end.gif        (arrow/arrow-rit-sharp-end.gif)
         skin/classic/global/arrow/arrow-up.gif                   (arrow/arrow-up.gif)
@@ -87,9 +87,6 @@ toolkit.jar:
         skin/classic/global/checkbox/cbox-check-dis.gif          (checkbox/cbox-check-dis.gif)
         skin/classic/global/console/console.css                  (console/console.css)
         skin/classic/global/console/console-toolbar.png          (console/console-toolbar.png)
-        skin/classic/global/console/bullet-error.png             (console/bullet-error.png)
-        skin/classic/global/console/bullet-question.png          (console/bullet-question.png)
-        skin/classic/global/console/bullet-warning.png           (console/bullet-warning.png)
         skin/classic/global/console/console-error-caret.gif      (console/console-error-caret.gif)
         skin/classic/global/console/console-error-dash.gif       (console/console-error-dash.gif)
         skin/classic/global/console/itemSelected.png             (console/itemSelected.png)
@@ -122,7 +119,6 @@ toolkit.jar:
         skin/classic/global/icons/loading_16.png                 (icons/loading_16.png)
         skin/classic/global/icons/notloading_16.png              (icons/notloading_16.png)
         skin/classic/global/icons/Minimize.gif                   (icons/Minimize.gif)
-        skin/classic/global/icons/notfound.png                   (icons/notfound.png)
         skin/classic/global/icons/Print-preview.png              (icons/Print-preview.png)
         skin/classic/global/icons/Portrait.png                   (icons/Portrait.png)
         skin/classic/global/icons/Landscape.png                  (icons/Landscape.png)
@@ -247,12 +243,12 @@ toolkit.jar:
         skin/classic/aero/global/arrow/arrow-down.png                    (arrow/arrow-down.png)
         skin/classic/aero/global/arrow/arrow-lft.gif                     (arrow/arrow-lft.gif)
         skin/classic/aero/global/arrow/arrow-lft-dis.gif                 (arrow/arrow-lft-dis.gif)
-        skin/classic/aero/global/arrow/arrow-lft-hov.gif                 (arrow/arrow-lft-hov.gif)
+        skin/classic/aero/global/arrow/arrow-lft-hov.gif                 (arrow/arrow-lft.gif)
         skin/classic/aero/global/arrow/arrow-lft-sharp.gif               (arrow/arrow-lft-sharp.gif)
         skin/classic/aero/global/arrow/arrow-lft-sharp-end.gif           (arrow/arrow-lft-sharp-end.gif)
         skin/classic/aero/global/arrow/arrow-rit.gif                     (arrow/arrow-rit.gif) 
         skin/classic/aero/global/arrow/arrow-rit-dis.gif                 (arrow/arrow-rit-dis.gif)
-        skin/classic/aero/global/arrow/arrow-rit-hov.gif                 (arrow/arrow-rit-hov.gif)
+        skin/classic/aero/global/arrow/arrow-rit-hov.gif                 (arrow/arrow-rit.gif)
         skin/classic/aero/global/arrow/arrow-rit-sharp.gif               (arrow/arrow-rit-sharp.gif)
         skin/classic/aero/global/arrow/arrow-rit-sharp-end.gif           (arrow/arrow-rit-sharp-end.gif)
         skin/classic/aero/global/arrow/arrow-up.gif                      (arrow/arrow-up.gif)
@@ -268,9 +264,6 @@ toolkit.jar:
         skin/classic/aero/global/checkbox/cbox-check-dis.gif             (checkbox/cbox-check-dis.gif)
 *       skin/classic/aero/global/console/console.css                     (console/console-aero.css)
         skin/classic/aero/global/console/console-toolbar.png             (console/console-toolbar-aero.png)
-        skin/classic/aero/global/console/bullet-error.png                (console/bullet-error-aero.png)
-        skin/classic/aero/global/console/bullet-question.png             (console/bullet-question-aero.png)
-        skin/classic/aero/global/console/bullet-warning.png              (console/bullet-warning-aero.png)
         skin/classic/aero/global/console/console-error-caret.gif         (console/console-error-caret.gif)
         skin/classic/aero/global/console/console-error-dash.gif          (console/console-error-dash.gif)
         skin/classic/aero/global/console/itemSelected.png                (console/itemSelected.png)
@@ -300,10 +293,9 @@ toolkit.jar:
         skin/classic/aero/global/icons/information-32.png                (icons/information-32-aero.png)
         skin/classic/aero/global/icons/information-48.png                (icons/information-48-aero.png)
         skin/classic/aero/global/icons/information-64.png                (icons/information-64-aero.png)
-        skin/classic/aero/global/icons/loading_16.png                    (icons/loading_16-aero.png)
-        skin/classic/aero/global/icons/notloading_16.png                 (icons/notloading_16-aero.png)
+        skin/classic/aero/global/icons/loading_16.png                    (icons/loading_16.png)
+        skin/classic/aero/global/icons/notloading_16.png                 (icons/notloading_16.png)
         skin/classic/aero/global/icons/Minimize.gif                      (icons/Minimize.gif)
-        skin/classic/aero/global/icons/notfound.png                      (icons/notfound-aero.png)
         skin/classic/aero/global/icons/Print-preview.png                 (icons/Print-preview-aero.png)
         skin/classic/aero/global/icons/Portrait.png                      (icons/Portrait-aero.png)
         skin/classic/aero/global/icons/Landscape.png                     (icons/Landscape-aero.png)

toolkit/themes/winstripe/mozapps/jar.mn

@@ -15,10 +15,10 @@ toolkit.jar:
         skin/classic/mozapps/extensions/extensions.svg             (extensions/extensions.svg)
         skin/classic/mozapps/extensions/category-search.png        (extensions/category-search.png)
         skin/classic/mozapps/extensions/category-discover.png      (extensions/category-discover.png)
-        skin/classic/mozapps/extensions/category-languages.png     (extensions/category-languages.png)
+        skin/classic/mozapps/extensions/category-languages.png     (extensions/localeGeneric.png)
         skin/classic/mozapps/extensions/category-searchengines.png (extensions/category-searchengines.png)
-        skin/classic/mozapps/extensions/category-extensions.png    (extensions/category-extensions.png)
-        skin/classic/mozapps/extensions/category-themes.png        (extensions/category-themes.png)
+        skin/classic/mozapps/extensions/category-extensions.png    (extensions/extensionGeneric.png)
+        skin/classic/mozapps/extensions/category-themes.png        (extensions/themeGeneric.png)
         skin/classic/mozapps/extensions/category-plugins.png       (extensions/category-plugins.png)
         skin/classic/mozapps/extensions/category-dictionaries.png  (extensions/category-dictionaries.png)
         skin/classic/mozapps/extensions/category-recent.png        (extensions/category-recent.png)
@@ -53,7 +53,6 @@ toolkit.jar:
         skin/classic/mozapps/passwordmgr/key-64.png                (passwordmgr/key-64.png)
 #ifdef MOZ_PLACES
         skin/classic/mozapps/places/defaultFavicon.png             (places/defaultFavicon.png)
-        skin/classic/mozapps/places/tagContainerIcon.png           (places/tagContainerIcon.png)
 #endif
         skin/classic/mozapps/plugins/contentPluginBlocked.png      (plugins/contentPluginBlocked.png)
         skin/classic/mozapps/plugins/contentPluginCrashed.png      (plugins/contentPluginCrashed.png)
@@ -63,7 +62,7 @@ toolkit.jar:
         skin/classic/mozapps/plugins/notifyPluginBlocked.png       (plugins/pluginBlocked-16.png)
         skin/classic/mozapps/plugins/notifyPluginCrashed.png       (plugins/pluginGeneric-16.png)
         skin/classic/mozapps/plugins/notifyPluginGeneric.png       (plugins/pluginGeneric-16.png)
-        skin/classic/mozapps/plugins/notifyPluginOutdated.png      (plugins/pluginOutdated-16.png)
+        skin/classic/mozapps/plugins/notifyPluginOutdated.png      (plugins/pluginBlocked-16.png)
         skin/classic/mozapps/plugins/pluginProblem.css             (plugins/pluginProblem.css)
         skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
         skin/classic/mozapps/plugins/pluginDisabled.png            (plugins/pluginDisabled.png)
@@ -92,13 +91,12 @@ toolkit.jar:
 *       skin/classic/aero/mozapps/extensions/selectAddons.css              (extensions/selectAddons-aero.css)
         skin/classic/aero/mozapps/extensions/update.css                    (extensions/update.css)
         skin/classic/aero/mozapps/extensions/extensions.svg                (extensions/extensions.svg)
-        skin/classic/aero/mozapps/extensions/themeGeneric.png              (extensions/themeGeneric-aero.png)
         skin/classic/aero/mozapps/extensions/category-search.png           (extensions/category-search.png)
         skin/classic/aero/mozapps/extensions/category-discover.png         (extensions/category-discover-aero.png)
-        skin/classic/aero/mozapps/extensions/category-languages.png        (extensions/category-languages-aero.png)
+        skin/classic/aero/mozapps/extensions/category-languages.png        (extensions/localeGeneric-aero.png)
         skin/classic/aero/mozapps/extensions/category-searchengines.png    (extensions/category-searchengines.png)
-        skin/classic/aero/mozapps/extensions/category-extensions.png       (extensions/category-extensions-aero.png)
-        skin/classic/aero/mozapps/extensions/category-themes.png           (extensions/category-themes-aero.png)
+        skin/classic/aero/mozapps/extensions/category-extensions.png       (extensions/extensionGeneric-aero.png)
+        skin/classic/aero/mozapps/extensions/category-themes.png           (extensions/themeGeneric-aero.png)
         skin/classic/aero/mozapps/extensions/category-plugins.png          (extensions/category-plugins-aero.png)
         skin/classic/aero/mozapps/extensions/category-dictionaries.png     (extensions/category-dictionaries-aero.png)
         skin/classic/aero/mozapps/extensions/category-recent.png           (extensions/category-recent-aero.png)
@@ -133,7 +131,6 @@ toolkit.jar:
         skin/classic/aero/mozapps/passwordmgr/key-64.png                   (passwordmgr/key-64.png)
 #ifdef MOZ_PLACES
         skin/classic/aero/mozapps/places/defaultFavicon.png                (places/defaultFavicon.png)
-        skin/classic/aero/mozapps/places/tagContainerIcon.png              (places/tagContainerIcon-aero.png)
 #endif
         skin/classic/aero/mozapps/plugins/contentPluginBlocked.png         (plugins/contentPluginBlocked.png)
         skin/classic/aero/mozapps/plugins/contentPluginCrashed.png         (plugins/contentPluginCrashed.png)
@@ -143,13 +140,13 @@ toolkit.jar:
         skin/classic/aero/mozapps/plugins/notifyPluginBlocked.png          (plugins/pluginBlocked-16-aero.png)
         skin/classic/aero/mozapps/plugins/notifyPluginCrashed.png          (plugins/pluginGeneric-16-aero.png)
         skin/classic/aero/mozapps/plugins/notifyPluginGeneric.png          (plugins/pluginGeneric-16-aero.png)
-        skin/classic/aero/mozapps/plugins/notifyPluginOutdated.png         (plugins/pluginOutdated-16-aero.png)
+        skin/classic/aero/mozapps/plugins/notifyPluginOutdated.png         (plugins/pluginBlocked-16-aero.png)
         skin/classic/aero/mozapps/plugins/pluginProblem.css                (plugins/pluginProblem.css)
         skin/classic/aero/mozapps/plugins/pluginGeneric.png                (plugins/pluginGeneric-aero.png)
         skin/classic/aero/mozapps/plugins/pluginDisabled.png               (plugins/pluginDisabled-aero.png)
         skin/classic/aero/mozapps/plugins/pluginBlocked.png                (plugins/pluginBlocked-aero.png)
         skin/classic/aero/mozapps/plugins/pluginGeneric-16.png             (plugins/pluginGeneric-16-aero.png)
-        skin/classic/aero/mozapps/plugins/pluginHelp-16.png                (plugins/pluginHelp-16-aero.png)
+        skin/classic/aero/mozapps/plugins/pluginHelp-16.png                (plugins/pluginHelp-16.png)
         skin/classic/aero/mozapps/plugins/pluginInstallerWizard.css        (plugins/pluginInstallerWizard.css)
         skin/classic/aero/mozapps/profile/profileicon.png                  (profile/profileicon-aero.png)
         skin/classic/aero/mozapps/profile/profileSelection.css             (profile/profileSelection.css)

toolkit/themes/winstripe/mozapps/plugins/pluginFinderWizard.css

@@ -1,12 +0,0 @@
-#licenseContainer, #pluginList {
-  -moz-appearance: listbox;
-  margin: 2px 4px;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-

toolkit/themes/winstripe/mozapps/update/updates.css

@@ -34,7 +34,7 @@ wizardpage {
 }
 
 .remoteLoadingThrobber[state="error"] {
-  list-style-image: url("chrome://global/skin/icons/notfound.png");
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
 .wizard-buttons-separator {