chrome/app/theme/theme_resources.grd - Issue 13947002: Update App Launcher icons, splitting for Chromium, Chrome, Canary.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/theme/theme_resources.grd

Issue 13947002: Update App Launcher icons, splitting for Chromium, Chrome, Canary. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: selfnits Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/app/chrome_exe.rc ('K') | « chrome/app/theme/default_100_percent/win/app_list.png ('k') | chrome/browser/ui/app_list/app_list_service.h » ('j') | chrome/browser/ui/app_list/app_list_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/app/theme/theme_resources.grd

diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd

index 7bc9a1ca498eb4905ceed60782de7b696aef1b64..bb881ae0143dbcaee314d41b10017cfb26803a9e 100644

--- a/chrome/app/theme/theme_resources.grd

+++ b/chrome/app/theme/theme_resources.grd

@@ -40,8 +40,12 @@

- <if expr="pp_ifdef('enable_app_list') and is_win">

- <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="win/app_list.png" />

+ <if expr="pp_ifdef('enable_app_list') and is_win and not pp_ifdef('_google_chrome')">

+ <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="chromium/app_list_48.png" />

+ </if>

+ <if expr="pp_ifdef('enable_app_list') and is_win and pp_ifdef('_google_chrome')">

+ <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="google_chrome/app_list_48.png" />

+ <structure type="chrome_scaled_image" name="IDR_APP_LIST_SXS" file="google_chrome/app_list_sxs_48.png" />

</if>