chrome/app/chrome_exe.rc - Issue 164390: Merge 22314 - Use alternate icon for Chrome shortcuts if specified in master ...

Side by Side Diff

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

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

Side by Side Diff: chrome/app/chrome_exe.rc

Issue 164390: Merge 22314 - Use alternate icon for Chrome shortcuts if specified in master ... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/

Patch Set: Created 11 years, 4 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 unified diff | Download patch | Annotate | Revision Log

Property Changes:

Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/chrome/app/chrome_exe.rc:r69-2775
Merged /trunk/src/chrome/app/chrome_exe.rc:r22314

OLD	NEW
1 // Microsoft Visual C++ generated resource script.	1 // Microsoft Visual C++ generated resource script.

2 //	2 //

3 #include "chrome_exe_resource.h"	3 #include "chrome_exe_resource.h"

4	4

5 #define APSTUDIO_READONLY_SYMBOLS	5 #define APSTUDIO_READONLY_SYMBOLS

6 /////////////////////////////////////////////////////////////////////////////	6 /////////////////////////////////////////////////////////////////////////////

7 //	7 //

8 // Generated from the TEXTINCLUDE 2 resource.	8 // Generated from the TEXTINCLUDE 2 resource.

9 //	9 //

10 #define APSTUDIO_HIDDEN_SYMBOLS	10 #define APSTUDIO_HIDDEN_SYMBOLS

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56	56

57 /////////////////////////////////////////////////////////////////////////////	57 /////////////////////////////////////////////////////////////////////////////

58 //	58 //

59 // Icon	59 // Icon

60 //	60 //

61	61

62 // Icon with lowest ID value placed first to ensure application icon	62 // Icon with lowest ID value placed first to ensure application icon

63 // remains consistent on all systems.	63 // remains consistent on all systems.

64 #if defined(GOOGLE_CHROME_BUILD)	64 #if defined(GOOGLE_CHROME_BUILD)

65 IDR_MAINFRAME ICON "theme\google_chrome\chrome.ico"	65 IDR_MAINFRAME ICON "theme\google_chrome\chrome.ico"

	66 IDR_MAINFRAME_2 ICON "theme\google_chrome\chrome2.ico "

66 #else	67 #else

67 IDR_MAINFRAME ICON "theme\chromium\chromium.ico"	68 IDR_MAINFRAME ICON "theme\chromium\chromium.ico"

68 #endif	69 #endif

69	70

70 #endif // English (U.S.) resources	71 #endif // English (U.S.) resources

71 /////////////////////////////////////////////////////////////////////////////	72 /////////////////////////////////////////////////////////////////////////////

72	73

73	74

74 #ifndef APSTUDIO_INVOKED	75 #ifndef APSTUDIO_INVOKED

75 /////////////////////////////////////////////////////////////////////////////	76 /////////////////////////////////////////////////////////////////////////////

76 //	77 //

77 // Generated from the TEXTINCLUDE 3 resource.	78 // Generated from the TEXTINCLUDE 3 resource.

78 //	79 //

79	80

80	81

81 /////////////////////////////////////////////////////////////////////////////	82 /////////////////////////////////////////////////////////////////////////////

82 #endif // not APSTUDIO_INVOKED	83 #endif // not APSTUDIO_INVOKED

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/first_run_win.cc » ('j') | no next file with comments »