Bug 515785 - Use new icons for each task in Win7 Jump list tasks. r=bbondy

browser/app/Makefile.in

@@ -62,6 +62,10 @@ DEFINES += \
   -DAPP_VERSION="$(MOZ_APP_VERSION)" \
   -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" \
   -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" \
+  -DNEWWINDOW_ICO=\"$(DIST)/branding/newwindow.ico\" \
+  -DNEWTAB_ICO=\"$(DIST)/branding/newtab.ico\" \
+  -DPBMODE_ICO=\"$(DIST)/branding/pbmode.ico\" \
+
   $(NULL)
 
 ifdef LIBXUL_SDK #{

browser/app/splash.rc

@@ -45,6 +45,9 @@
 IDI_APPICON ICON FIREFOX_ICO
 IDI_DOCUMENT ICON DOCUMENT_ICO
 IDI_APPLICATION ICON FIREFOX_ICO
+IDI_NEWWINDOW ICON NEWWINDOW_ICO
+IDI_NEWTAB ICON NEWTAB_ICO
+IDI_PBMODE ICON PBMODE_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN

browser/branding/aurora/Makefile.in

@@ -58,6 +58,9 @@ WINDOWS_BRANDING_FILES = \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
 
 OSX_BRANDING_FILES = \

browser/branding/nightly/Makefile.in

@@ -58,6 +58,9 @@ WINDOWS_BRANDING_FILES = \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
 
 OSX_BRANDING_FILES = \

browser/branding/official/Makefile.in

@@ -58,6 +58,9 @@ WINDOWS_BRANDING_FILES = \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
 
 OSX_BRANDING_FILES = \

browser/branding/unofficial/Makefile.in

@@ -58,6 +58,9 @@ WINDOWS_BRANDING_FILES = \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
 
 OSX_BRANDING_FILES = \

browser/modules/WindowsJumpLists.jsm

@@ -141,7 +141,7 @@ var tasksCfg = [
     get title()       _getString("taskbar.tasks.newTab.label"),
     get description() _getString("taskbar.tasks.newTab.description"),
     args:             "-new-tab about:blank",
-    iconIndex:        0, // Fx app icon
+    iconIndex:        3, // New window icon
     open:             true,
     close:            true, // The jump list already has an app launch icon, but
                             // we don't always update the list on shutdown.
@@ -153,7 +153,7 @@ var tasksCfg = [
     get title()       _getString("taskbar.tasks.newWindow.label"),
     get description() _getString("taskbar.tasks.newWindow.description"),
     args:             "-browser",
-    iconIndex:        0, // Fx app icon
+    iconIndex:        2, // New tab icon
     open:             true,
     close:            true, // No point, but we don't always update the list on
                             //  shutdown.  Thus true for consistency.
@@ -174,7 +174,7 @@ var tasksCfg = [
         return _getString("taskbar.tasks.enterPrivacyMode.description");
     },
     args:             "-private-toggle",
-    iconIndex:        0, // Fx app icon
+    iconIndex:        4, // Private browsing mode icon
     get open() {
       // Don't show when inside permanent private browsing mode
       return !_privateBrowsingSvc.autoStarted;

toolkit/xre/nsNativeAppSupportWin.h

@@ -59,6 +59,9 @@
 
 #define IDI_APPICON 1
 #define IDI_DOCUMENT 2
+#define IDI_NEWWINDOW 3
+#define IDI_NEWTAB 4
+#define IDI_PBMODE 5
 #ifndef IDI_APPLICATION
 #define IDI_APPLICATION 32512
 #endif