Win: Use different icon for SxS

BUG=37119
TEST=build official exe, run with --chrome-sxs

Review URL: http://codereview.chromium.org/1727006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45388 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 12 deletions

diff --git a/chrome/browser/views/chrome_views_delegate.cc b/chrome/browser/views/chrome_views_delegate.cc
index 2e49aee..b0f8028 100644
--- a/chrome/browser/views/chrome_views_delegate.cc
+++ b/chrome/browser/views/chrome_views_delegate.cc
@@ -6,13 +6,15 @@
 
 #include "app/clipboard/clipboard.h"
 #include "base/scoped_ptr.h"
-#include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/window_sizer.h"
-#include "chrome/common/chrome_constants.h"
 #include "gfx/rect.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/app_icon_win.h"
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // ChromeViewsDelegate, views::ViewsDelegate implementation:
 
@@ -77,8 +79,7 @@ bool ChromeViewsDelegate::GetSavedMaximizedState(
 
 #if defined(OS_WIN)
 HICON ChromeViewsDelegate::GetDefaultWindowIcon() const {
-  return LoadIcon(GetModuleHandle(chrome::kBrowserResourcesDll),
-                  MAKEINTRESOURCE(IDR_MAINFRAME));
+  return GetAppIcon();
 }
 #endif
 
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index 7c02b14a..a43e0ac 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -12,16 +12,15 @@
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/chrome_constants.h"
 #include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
 #if defined(OS_WIN)
+#include "chrome/browser/app_icon_win.h"
 #include "gfx/icon_util.h"
 #endif
 
@@ -39,12 +38,7 @@ void TabIconView::InitializeIfNeeded() {
 #if defined(OS_WIN)
     // The default window icon is the application icon, not the default
     // favicon.
-    std::wstring exe_path;
-    PathService::Get(base::DIR_EXE, &exe_path);
-    file_util::AppendToPath(&exe_path,
-        chrome::kBrowserProcessExecutableName);
-
-    HICON app_icon = ExtractIcon(NULL, exe_path.c_str(), 0);
+    HICON app_icon = GetAppIcon();
     g_default_fav_icon =
         IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16));
     DestroyIcon(app_icon);