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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_exe.rc
diff --git a/chrome/app/chrome_exe.rc b/chrome/app/chrome_exe.rc
index d055458d737dcd0c46aa244eebf981d3026cf2a9..4c6be186f3cbff3c610790e1c8f2954dc2e02dd2 100644
--- a/chrome/app/chrome_exe.rc
+++ b/chrome/app/chrome_exe.rc
@@ -36,17 +36,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// icons. To avoid breaking existing shortcuts, add new icons at the end
// (following the ordering described above).
#if defined(GOOGLE_CHROME_BUILD)
-IDR_MAINFRAME ICON "theme\\google_chrome\\win\\chrome.ico"
+IDR_MAINFRAME ICON "theme\\google_chrome\\win\\chrome.ico"
// These three are no longer used, but remain as placeholders. (They cannot be
// removed, or existing shortcuts to the later resources will break.)
-IDR_MAINFRAME_2 ICON "theme\\google_chrome\\win\\placeholder.ico"
-IDR_MAINFRAME_3 ICON "theme\\google_chrome\\win\\placeholder.ico"
-IDR_MAINFRAME_4 ICON "theme\\google_chrome\\win\\placeholder.ico"
+IDR_MAINFRAME_2 ICON "theme\\google_chrome\\win\\placeholder.ico"
+IDR_MAINFRAME_3 ICON "theme\\google_chrome\\win\\placeholder.ico"
+IDR_MAINFRAME_4 ICON "theme\\google_chrome\\win\\placeholder.ico"
// The SXS icon must have an index of 4, the constant is used in Chrome code to
// identify it.
-IDR_SXS ICON "theme\\google_chrome\\win\\chrome_sxs.ico"
+IDR_SXS ICON "theme\\google_chrome\\win\\chrome_sxs.ico"
#else
-IDR_MAINFRAME ICON "theme\\chromium\\win\\chromium.ico"
+IDR_MAINFRAME ICON "theme\\chromium\\win\\chromium.ico"
#endif
// Start a naming scheme to keep icons in order. A leading X is used to keep
@@ -55,12 +55,14 @@ IDR_MAINFRAME ICON "theme\\chromium\\win\\chromium.
// chrome_icon_resources_win.h should also be updated.
#if defined(GOOGLE_CHROME_BUILD)
-IDR_X001_APP_LIST ICON "theme\\google_chrome\\win\\app_list.ico"
-IDR_X002_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_list_sxs.ico"
-IDR_X003_INCOGNITO ICON "theme\\google_chrome\\win\\incognito.ico"
+IDR_X001_APP_LIST ICON "theme\\google_chrome\\win\\app_list.ico"
+IDR_X002_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_list_sxs.ico"
+IDR_X003_INCOGNITO ICON "theme\\google_chrome\\win\\incognito.ico"
+IDR_X004_DEV ICON "theme\\google_chrome\\win\\chrome_dev.ico"
+IDR_X005_BETA ICON "theme\\google_chrome\\win\\chrome_beta.ico"
#else
-IDR_X001_APP_LIST ICON "theme\\chromium\\win\\app_list.ico"
-IDR_X003_INCOGNITO ICON "theme\\chromium\\win\\incognito.ico"
+IDR_X001_APP_LIST ICON "theme\\chromium\\win\\app_list.ico"
+IDR_X003_INCOGNITO ICON "theme\\chromium\\win\\incognito.ico"
#endif
« 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