summaryrefslogtreecommitdiffstats
path: root/apps/app_host
diff options
context:
space:
mode:
authortapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-22 05:50:23 +0000
committertapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-22 05:50:23 +0000
commit5b11e3db8f9193d6bbabb48c9dc46e0088d2214a (patch)
tree828af7196c74c5e8352f65ff0dd20782f880d055 /apps/app_host
parent1669647624d84083ab735b6c331de743d8694a65 (diff)
downloadchromium_src-5b11e3db8f9193d6bbabb48c9dc46e0088d2214a.zip
chromium_src-5b11e3db8f9193d6bbabb48c9dc46e0088d2214a.tar.gz
chromium_src-5b11e3db8f9193d6bbabb48c9dc46e0088d2214a.tar.bz2
Update App Launcher icons, splitting for Chromium, Chrome, Canary.
More binaries at http://go/chromerev/7719014/ . theme/app_list.ico | Bin 43766 -> 0 bytes theme/chromium/app_list.ico | Bin 0 -> 26489 bytes theme/chromium/app_list_48.png | Bin 0 -> 1142 bytes theme/default_100_percent/win/app_list.png | Bin 1279 -> 0 bytes src-internal binaries: http://go/viewvc/chrome-internal?view=rev&revision=36431 src-internal DEPS roll: http://go/viewvc/chrome-internal?view=rev&revision=36446 BUG=180700 TEST=official Chrome installer built and icons checked with and without --chrome-sxs. App Launcher enabled via chrome://flags to verify icons used in taskbar. Review URL: https://codereview.chromium.org/13947002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_host')
-rw-r--r--apps/app_host/app_host.rc6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/app_host/app_host.rc b/apps/app_host/app_host.rc
index f4fedec..8f4fed3 100644
--- a/apps/app_host/app_host.rc
+++ b/apps/app_host/app_host.rc
@@ -30,7 +30,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_APP_HOST_MAIN ICON "..\\..\\chrome\\app\\theme\\app_list.ico"
+#if defined(GOOGLE_CHROME_BUILD)
+IDI_APP_HOST_MAIN ICON "..\\..\\chrome\\app\\theme\\google_chrome\\app_list.ico"
+#else
+IDI_APP_HOST_MAIN ICON "..\\..\\chrome\\app\\theme\\chromium\\app_list.ico"
+#endif
/////////////////////////////////////////////////////////////////////////////
//