Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

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

Issue 2802713002: Enable side-by-side beta and dev channels. (Closed)
Patch Set: add missing test stanza for reland Created 3 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 unified diff | Download patch
« no previous file with comments | « chrome/app/chrome_dll_resource.h ('k') | chrome/app/chromium_strings.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 // Icon 29 // Icon
30 // 30 //
31 31
32 // The application icon should: have the lowest ID, be placed first, and its 32 // The application icon should: have the lowest ID, be placed first, and its
33 // resource name should be alphabetically less than the name of any other icon 33 // resource name should be alphabetically less than the name of any other icon
34 // resource (http://msdn.microsoft.com/en-us/library/ms997538.aspx). 34 // resource (http://msdn.microsoft.com/en-us/library/ms997538.aspx).
35 // Note: chrome/installer/util/shell_util.cc depends on the order and number of 35 // Note: chrome/installer/util/shell_util.cc depends on the order and number of
36 // icons. To avoid breaking existing shortcuts, add new icons at the end 36 // icons. To avoid breaking existing shortcuts, add new icons at the end
37 // (following the ordering described above). 37 // (following the ordering described above).
38 #if defined(GOOGLE_CHROME_BUILD) 38 #if defined(GOOGLE_CHROME_BUILD)
39 IDR_MAINFRAME ICON "theme\\google_chrome\\win\\chro me.ico" 39 IDR_MAINFRAME ICON "theme\\google_chrome\\win\\chrome.ico"
40 // These three are no longer used, but remain as placeholders. (They cannot be 40 // These three are no longer used, but remain as placeholders. (They cannot be
41 // removed, or existing shortcuts to the later resources will break.) 41 // removed, or existing shortcuts to the later resources will break.)
42 IDR_MAINFRAME_2 ICON "theme\\google_chrome\\win\\plac eholder.ico" 42 IDR_MAINFRAME_2 ICON "theme\\google_chrome\\win\\placeholder.ico"
43 IDR_MAINFRAME_3 ICON "theme\\google_chrome\\win\\plac eholder.ico" 43 IDR_MAINFRAME_3 ICON "theme\\google_chrome\\win\\placeholder.ico"
44 IDR_MAINFRAME_4 ICON "theme\\google_chrome\\win\\plac eholder.ico" 44 IDR_MAINFRAME_4 ICON "theme\\google_chrome\\win\\placeholder.ico"
45 // The SXS icon must have an index of 4, the constant is used in Chrome code to 45 // The SXS icon must have an index of 4, the constant is used in Chrome code to
46 // identify it. 46 // identify it.
47 IDR_SXS ICON "theme\\google_chrome\\win\\chro me_sxs.ico" 47 IDR_SXS ICON "theme\\google_chrome\\win\\chrome_sxs.ico"
48 #else 48 #else
49 IDR_MAINFRAME ICON "theme\\chromium\\win\\chromium. ico" 49 IDR_MAINFRAME ICON "theme\\chromium\\win\\chromium.ico"
50 #endif 50 #endif
51 51
52 // Start a naming scheme to keep icons in order. A leading X is used to keep 52 // Start a naming scheme to keep icons in order. A leading X is used to keep
53 // the name alphabetically after IDR_SXS. The maximum of the number that follows 53 // the name alphabetically after IDR_SXS. The maximum of the number that follows
54 // should be incremented when a new icon is added. The icon indices in 54 // should be incremented when a new icon is added. The icon indices in
55 // chrome_icon_resources_win.h should also be updated. 55 // chrome_icon_resources_win.h should also be updated.
56 56
57 #if defined(GOOGLE_CHROME_BUILD) 57 #if defined(GOOGLE_CHROME_BUILD)
58 IDR_X001_APP_LIST ICON "theme\\google_chrome\\win\\app_ list.ico" 58 IDR_X001_APP_LIST ICON "theme\\google_chrome\\win\\app_list.ico"
59 IDR_X002_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_ list_sxs.ico" 59 IDR_X002_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_list_sxs.ico"
60 IDR_X003_INCOGNITO ICON "theme\\google_chrome\\win\\inco gnito.ico" 60 IDR_X003_INCOGNITO ICON "theme\\google_chrome\\win\\incognito.ico"
61 IDR_X004_DEV ICON "theme\\google_chrome\\win\\chrome_dev.ico"
62 IDR_X005_BETA ICON "theme\\google_chrome\\win\\chrome_beta.ico"
61 #else 63 #else
62 IDR_X001_APP_LIST ICON "theme\\chromium\\win\\app_list. ico" 64 IDR_X001_APP_LIST ICON "theme\\chromium\\win\\app_list.ico"
63 IDR_X003_INCOGNITO ICON "theme\\chromium\\win\\incognito .ico" 65 IDR_X003_INCOGNITO ICON "theme\\chromium\\win\\incognito.ico"
64 #endif 66 #endif
65 67
66 68
67 ///////////////////////////////////////////////////////////////////////////// 69 /////////////////////////////////////////////////////////////////////////////
68 // 70 //
69 // GOOGLEUPDATEAPPLICATIONCOMMANDS is a "well-known" marker resource defined 71 // GOOGLEUPDATEAPPLICATIONCOMMANDS is a "well-known" marker resource defined
70 // by Omaha. Executables must both be signed by Google and contain the marker 72 // by Omaha. Executables must both be signed by Google and contain the marker
71 // in order to expose application commands. 73 // in order to expose application commands.
72 // 74 //
73 #define IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP 1 75 #define IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP 1
74 76
75 IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP GOOGLEUPDATEAPPLICATIONCOMMANDS { 1L } 77 IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP GOOGLEUPDATEAPPLICATIONCOMMANDS { 1L }
76 78
77 79
78 #endif // English (U.S.) resources 80 #endif // English (U.S.) resources
79 ///////////////////////////////////////////////////////////////////////////// 81 /////////////////////////////////////////////////////////////////////////////
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll_resource.h ('k') | chrome/app/chromium_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698