Mario Sanchez Prada
b39991fbf1
It will assumed from now on that all of Brave's own code plus patches to upstream Chromium will always be built and run as part of a Brave build, so we can drop these guards and reduce the patching surface. Note that github.com/brave/brave-browser/wiki/Patching-Chromium should also be updated to reflect the change implemented in this patch. Fix https://github.com/brave/brave-browser/issues/12740
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
|
|
index d299571ac031f4b3ff964fbf2dd865ba31bdd0bf..06eef7187c1c288d1db668b94ed742d538c6b2bf 100644
|
|
--- a/chrome/app/chrome_dll.rc
|
|
+++ b/chrome/app/chrome_dll.rc
|
|
@@ -164,6 +164,15 @@ END
|
|
// the icon from the current module). We can perhaps work around this in the
|
|
// future to get the icon from the .exe, which would save a copy.
|
|
|
|
+#if defined(OFFICIAL_BUILD)
|
|
+IDR_MAINFRAME ICON "theme\brave\win\brave.ico"
|
|
+IDR_SXS ICON "theme\brave\win\brave_canary.ico"
|
|
+IDR_X004_DEV ICON "theme\brave\win\brave_dev.ico"
|
|
+IDR_X005_BETA ICON "theme\brave\win\brave_beta.ico"
|
|
+#else
|
|
+IDR_MAINFRAME ICON "theme\brave\win\brave_development.ico"
|
|
+#endif
|
|
+#if 0
|
|
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
IDR_MAINFRAME ICON "theme\google_chrome\win\chrome.ico"
|
|
IDR_SXS ICON "theme\google_chrome\win\chrome_sxs.ico"
|
|
@@ -172,6 +181,7 @@ IDR_X005_BETA ICON "theme\google_chrome\win\chrome_
|
|
#else
|
|
IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico"
|
|
#endif
|
|
+#endif
|
|
|
|
// We include these resources because all ICON types need to be in the
|
|
// same .rc file. See:
|