Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1068)

Unified Diff: chrome/browser/app_icon_win.cc

Issue 8785006: Badge Windows profile shortcuts with multi-user avatar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Merged to TOT. Fixed cpu's nits. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/app_icon_win.h ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_icon_win.cc
===================================================================
--- chrome/browser/app_icon_win.cc (revision 113013)
+++ 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())
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));
+}
« no previous file with comments | « chrome/browser/app_icon_win.h ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698