Badge Windows profile shortcuts with multi-user avatar.

chrome/browser/app_icon_win.cc

Index: chrome/browser/app_icon_win.cc
===================================================================
--- chrome/browser/app_icon_win.cc	(revision 112717)
+++ chrome/browser/app_icon_win.cc	(working copy)
@@ -8,15 +8,30 @@
 #include "chrome/common/chrome_constants.h"
 
 #if defined(GOOGLE_CHROME_BUILD)
-#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/install_util.h"
 #endif
 
 HICON GetAppIcon() {
   int icon_id = IDR_MAINFRAME;
 #if defined(GOOGLE_CHROME_BUILD)
-  if (BrowserDistribution::GetDistribution()->GetIconIndex())
+  if (InstallUtil::IsChromeSxSProcess())

[cpu_(ooo_6.6-7.5), 2011/12/05 21:37:34]

sorry I might missed this discussion, why this change?

[robertshield, 2011/12/05 22:55:17]

This was done at my request. It appeared that the previous check's intent was to
do something special for the canary build. The new code is the more canonical
way of checking for canary-ness. It also runs slightly less code.

[SteveT, 2011/12/05 22:58:10]

robertshield suggested this as IsChromeSxSProcess is a much more robust way of
checking if we're a SxS process rather than assuming the Icon index for a SxS
distribution is always non-zero. Does that seem ok?

     icon_id = IDR_SXS;
 #endif
   return LoadIcon(GetModuleHandle(chrome::kBrowserResourcesDll),
                   MAKEINTRESOURCE(icon_id));
 }
+
+HICON GetAppIconForSize(int size) {
+  int icon_id = IDR_MAINFRAME;
+#if defined(GOOGLE_CHROME_BUILD)
+  if (InstallUtil::IsChromeSxSProcess())
+    icon_id = IDR_SXS;
+#endif
+  return static_cast<HICON>(
+      LoadImage(GetModuleHandle(chrome::kBrowserResourcesDll),
+                MAKEINTRESOURCE(icon_id),
+                IMAGE_ICON,
+                size,
+                size,
+                LR_DEFAULTCOLOR | LR_DEFAULTSIZE));
+}