diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 00:20:44 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 00:20:44 +0000 |
| commit | f7be2197bdd73fa0249a005c72112e982a6520d5 (patch) | |
| tree | 9aed6a5c6839017a1bf466914c2f97b91a180801 /chrome/browser/task_manager_resource_providers.cc | |
| parent | c9f8a4f1c96ffa319698778e53aa08d9ea39a91d (diff) | |
| download | chromium_src-f7be2197bdd73fa0249a005c72112e982a6520d5.zip chromium_src-f7be2197bdd73fa0249a005c72112e982a6520d5.tar.gz chromium_src-f7be2197bdd73fa0249a005c72112e982a6520d5.tar.bz2 | |
Win: Use different icon for SxS
BUG=37119
TEST=build official exe, run with --chrome-sxs
Review URL: http://codereview.chromium.org/1727006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_resource_providers.cc')
| -rw-r--r-- | chrome/browser/task_manager_resource_providers.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index e9219a3..369a2dd 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -42,7 +42,7 @@ #include "skia/ext/skia_utils_mac.h" #endif #if defined(OS_WIN) -#include <atlbase.h> +#include "chrome/browser/app_icon_win.h" #include "gfx/icon_util.h" #endif // defined(OS_WIN) @@ -834,8 +834,7 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserProcessResource() DCHECK(success); #if defined(OS_WIN) if (!default_icon_) { - HICON icon = LoadIcon(_AtlBaseModule.GetResourceInstance(), - MAKEINTRESOURCE(IDR_MAINFRAME)); + HICON icon = GetAppIcon(); if (icon) { ICONINFO icon_info = {0}; BITMAP bitmap_info = {0}; |