| 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())
|
| 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));
|
| +}
|
|
|