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

Side by Side Diff: chrome/app/chrome_dll.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/BUILD.gn ('k') | chrome/app/chrome_dll_resource.h » ('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_dll_resource.h" 3 #include "chrome_dll_resource.h"
4 #include "chrome_command_ids.h" 4 #include "chrome_command_ids.h"
5 5
6 #define APSTUDIO_READONLY_SYMBOLS 6 #define APSTUDIO_READONLY_SYMBOLS
7 ///////////////////////////////////////////////////////////////////////////// 7 /////////////////////////////////////////////////////////////////////////////
8 // 8 //
9 // Generated from the TEXTINCLUDE 2 resource. 9 // Generated from the TEXTINCLUDE 2 resource.
10 // 10 //
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // 160 //
161 // Icons 161 // Icons
162 // 162 //
163 // This is duplicated from the .exe file to make ATL happy (it tries to load 163 // This is duplicated from the .exe file to make ATL happy (it tries to load
164 // the icon from the current module). We can perhaps work around this in the 164 // the icon from the current module). We can perhaps work around this in the
165 // future to get the icon from the .exe, which would save a copy. 165 // future to get the icon from the .exe, which would save a copy.
166 166
167 #if defined(GOOGLE_CHROME_BUILD) 167 #if defined(GOOGLE_CHROME_BUILD)
168 IDR_MAINFRAME ICON "theme\google_chrome\win\chrome. ico" 168 IDR_MAINFRAME ICON "theme\google_chrome\win\chrome. ico"
169 IDR_SXS ICON "theme\google_chrome\win\chrome_ sxs.ico" 169 IDR_SXS ICON "theme\google_chrome\win\chrome_ sxs.ico"
170 IDR_X004_DEV ICON "theme\google_chrome\win\chrome_ dev.ico"
171 IDR_X005_BETA ICON "theme\google_chrome\win\chrome_ beta.ico"
170 #else 172 #else
171 IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico " 173 IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico "
172 #endif 174 #endif
173 175
174 // We include these resources because all ICON types need to be in the 176 // We include these resources because all ICON types need to be in the
175 // same .rc file. See: 177 // same .rc file. See:
176 // http://www.technewsgroups.net/group/microsoft.public.dotnet.general/topic2111 .aspx 178 // http://www.technewsgroups.net/group/microsoft.public.dotnet.general/topic2111 .aspx
177 IDI_THROBBER_01 ICON "theme\vista_frame_throbber_01.i co" 179 IDI_THROBBER_01 ICON "theme\vista_frame_throbber_01.i co"
178 IDI_THROBBER_02 ICON "theme\vista_frame_throbber_02.i co" 180 IDI_THROBBER_02 ICON "theme\vista_frame_throbber_02.i co"
179 IDI_THROBBER_03 ICON "theme\vista_frame_throbber_03.i co" 181 IDI_THROBBER_03 ICON "theme\vista_frame_throbber_03.i co"
(...skipping 27 matching lines...) Expand all
207 // 209 //
208 // Generated from the TEXTINCLUDE 3 resource. 210 // Generated from the TEXTINCLUDE 3 resource.
209 // 211 //
210 212
211 213
212 ///////////////////////////////////////////////////////////////////////////// 214 /////////////////////////////////////////////////////////////////////////////
213 #endif // not APSTUDIO_INVOKED 215 #endif // not APSTUDIO_INVOKED
214 216
215 // (temp change to touch this file or incremental builds may break now 217 // (temp change to touch this file or incremental builds may break now
216 // that we removed chrome_dll_version.rc from it) 218 // that we removed chrome_dll_version.rc from it)
OLDNEW
« no previous file with comments | « chrome/BUILD.gn ('k') | chrome/app/chrome_dll_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698