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

Unified Diff: chrome/browser/win/app_icon.cc

Issue 2689233005: Move brand- and mode-specific app icon resource id into InstallConstants. (Closed)
Patch Set: sync to position 453103 Created 3 years, 10 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 | « no previous file | chrome/install_static/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/win/app_icon.cc
diff --git a/chrome/browser/win/app_icon.cc b/chrome/browser/win/app_icon.cc
index 3da44d46aa21f3698bb1680b3f60b93d4b24d968..ab3d600a5ffaaca6019972c1cf7f69b11f782fd9 100644
--- a/chrome/browser/win/app_icon.cc
+++ b/chrome/browser/win/app_icon.cc
@@ -4,27 +4,18 @@
#include "chrome/browser/win/app_icon.h"
-#include "chrome/app/chrome_dll_resource.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/install_static/install_details.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/icon_util.h"
#include "ui/gfx/image/image_family.h"
-#if defined(GOOGLE_CHROME_BUILD)
-#include "chrome/installer/util/install_util.h"
-#endif
-
namespace {
// Returns the resource id of the application icon.
int GetAppIconResourceId() {
- int icon_id = IDR_MAINFRAME;
-#if defined(GOOGLE_CHROME_BUILD)
- if (InstallUtil::IsChromeSxSProcess())
- icon_id = IDR_SXS;
-#endif
- return icon_id;
+ return install_static::InstallDetails::Get().app_icon_resource_id();
}
} // namespace
« no previous file with comments | « no previous file | chrome/install_static/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698