OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/app_icon_win.h" | 5 #include "chrome/browser/app_icon_win.h" |
6 | 6 |
7 #include "chrome/app/chrome_dll_resource.h" | 7 #include "chrome/app/chrome_dll_resource.h" |
8 #include "chrome/common/chrome_constants.h" | 8 #include "chrome/common/chrome_constants.h" |
9 | 9 |
10 #if defined(GOOGLE_CHROME_BUILD) | 10 #if defined(GOOGLE_CHROME_BUILD) |
11 #include "chrome/installer/util/browser_distribution.h" | 11 #include "chrome/installer/util/browser_distribution.h" |
12 #endif | 12 #endif |
13 | 13 |
14 HICON GetAppIcon() { | 14 HICON GetAppIcon() { |
15 int icon_id = IDR_MAINFRAME; | 15 int icon_id = IDR_MAINFRAME; |
16 #if defined(GOOGLE_CHROME_BUILD) | 16 #if defined(GOOGLE_CHROME_BUILD) |
17 if (BrowserDistribution::GetDistribution()->GetIconIndex()) | 17 if (BrowserDistribution::GetDistribution()->GetIconIndex()) |
18 icon_id = IDR_SXS; | 18 icon_id = IDR_SXS; |
19 #endif | 19 #endif |
20 return LoadIcon(GetModuleHandle(chrome::kBrowserResourcesDll), | 20 return LoadIcon(GetModuleHandle(chrome::kBrowserResourcesDll), |
21 MAKEINTRESOURCE(icon_id)); | 21 MAKEINTRESOURCE(icon_id)); |
22 } | 22 } |
23 | |
24 HICON GetAppIconForSize(int size) { | |
25 int icon_id = IDR_MAINFRAME; | |
26 #if defined(GOOGLE_CHROME_BUILD) | |
27 if (BrowserDistribution::GetDistribution()->GetIconIndex()) | |
robertshield
2011/12/03 02:42:31
The more correct way to check for the canary build
SteveT
2011/12/03 03:19:15
Done, and above.
| |
28 icon_id = IDR_SXS; | |
29 #endif | |
30 return (HICON)LoadImage(GetModuleHandle(chrome::kBrowserResourcesDll), | |
robertshield
2011/12/03 02:42:31
no c-style casts
SteveT
2011/12/03 03:19:15
Oops. Fixed.
| |
31 MAKEINTRESOURCE(icon_id), | |
32 IMAGE_ICON, | |
33 size, | |
34 size, | |
35 LR_DEFAULTCOLOR | LR_DEFAULTSIZE); | |
36 } | |
OLD | NEW |