chrome/app/chrome_exe.rc - 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/chrome_exe.rc

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

Patch Set: rebase 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

Index: chrome/app/chrome_exe.rc

diff --git a/chrome/app/chrome_exe.rc b/chrome/app/chrome_exe.rc

index abd4734018633a3cb59b0a0270bc208a166cff2d..5c512003a1f442c7a1de20609ea1c630cf8c0369 100644

--- a/chrome/app/chrome_exe.rc

+++ b/chrome/app/chrome_exe.rc

@@ -46,11 +46,17 @@ IDR_SXS ICON "theme\google_chrome\chrome_sxs.

#else

IDR_MAINFRAME ICON "theme\chromium\chromium.ico"

#endif

// Icon for the App Lancher. Named with a leading X to keep the name

// alphabetically after IDR_SXS.

-// The SXS icon must have an index of 5 for Chrome and 1 for Chromium, these

-// constants are used in Chrome code to identify it.

-IDR_X_APP_LIST ICON "theme\\app_list.ico"

+#if defined(GOOGLE_CHROME_BUILD)

+// The App Launcher icon must have an index of 5 in Chrome, and 6 for SXS.

+IDR_X_APP_LIST ICON "theme\\google_chrome\\app_list.ico"

+IDR_X_APP_LIST_SXS ICON "theme\\google_chrome\\app_list_sxs.ico"

+#else

+// The App Launcher icon must have an index of 1 for Chromium.

+IDR_X_APP_LIST ICON "theme\\chromium\\app_list.ico"

+#endif

/////////////////////////////////////////////////////////////////////////////

« no previous file with comments | « apps/app_host/app_host.rc ('k') | chrome/app/theme/app_list.ico » ('j') | no next file with comments »