Move brand- and mode-specific app icon resource id into InstallConstants.

chrome/browser/win/app_icon.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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
 
 HICON GetAppIcon() {
   // TODO(mgiuca): Use GetAppIconImageFamily/CreateExact instead of LoadIcon, to
   // get correct scaling. (See http://crbug.com/551256)
   const int icon_id = GetAppIconResourceId();
   // HICON returned from LoadIcon do not leak and do not have to be destroyed.
   return LoadIcon(GetModuleHandle(chrome::kBrowserResourcesDll),
@@ skipping 26 matching lines @@
   // IDs). If chrome.dll is not loaded, we are probably in a unit test, so fall
   // back to getting the icon from the current module (assuming it is
   // unit_tests.exe, that has the same resource IDs as chrome.dll).
   HMODULE module = GetModuleHandle(chrome::kBrowserResourcesDll);
   if (!module)
     module = GetModuleHandle(nullptr);
   DCHECK(module);
 
   return IconUtil::CreateImageFamilyFromIconResource(module, icon_id);
 }