summaryrefslogtreecommitdiffstats
path: root/chrome/browser/aeropeek_manager.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 00:20:44 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 00:20:44 +0000
commitf7be2197bdd73fa0249a005c72112e982a6520d5 (patch)
tree9aed6a5c6839017a1bf466914c2f97b91a180801 /chrome/browser/aeropeek_manager.cc
parentc9f8a4f1c96ffa319698778e53aa08d9ea39a91d (diff)
downloadchromium_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/aeropeek_manager.cc')
-rw-r--r--chrome/browser/aeropeek_manager.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc
index f3a8e85..b93f5ad 100644
--- a/chrome/browser/aeropeek_manager.cc
+++ b/chrome/browser/aeropeek_manager.cc
@@ -14,7 +14,7 @@
#include "base/scoped_handle_win.h"
#include "base/scoped_native_library.h"
#include "base/win_util.h"
-#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/app_icon_win.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_thread.h"
@@ -986,8 +986,7 @@ HICON AeroPeekWindow::OnGetIcon(UINT index) {
// We save this application icon to avoid calling LoadIcon() twice or more.
if (favicon_bitmap_.isNull()) {
if (!frame_icon_) {
- frame_icon_ = LoadIcon(GetModuleHandle(chrome::kBrowserResourcesDll),
- MAKEINTRESOURCE(IDR_MAINFRAME));
+ frame_icon_ = GetAppIcon();
}
return frame_icon_;
}