Fix icon on Windows XP taskbar

chrome/browser/ui/views/frame/glass_browser_frame_view.cc

 // Copyright (c) 2012 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/ui/views/frame/glass_browser_frame_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/theme_resources.h"
+#include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle_win.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/win/dpi.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/win/hwnd_util.h"
@@ skipping 31 matching lines @@
 // so we stop it when the gap between the two is down to 5 px.
 const int kNewTabCaptionRestoredSpacing = 5;
 // In maximized mode, where the New Tab button and the caption buttons are at
 // similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid
 // looking too cluttered.
 const int kNewTabCaptionMaximizedSpacing = 16;
 // How far to indent the tabstrip from the left side of the screen when there
 // is no avatar icon.
 const int kTabStripIndent = -6;
 
+HICON CreateHICONFromSkBitmap(const gfx::ImageSkia& image, int width,

[sky, 2014/12/11 15:51:23]

Make sure to run git cl format.

[sky, 2014/12/11 15:51:23]

Add description of this. Also, it should be renamed to better indicate what it
does. Maybe something like CreateHICONFromSkBitmapSizedTo.

[Tomasz Moniuszko, 2014/12/12 11:47:07]

Done.

[Tomasz Moniuszko, 2014/12/12 11:47:07]

Done.

+                              int height) {
+  if (width == image.width() && height == image.height()) {

[sky, 2014/12/11 15:51:23]

nit: no {}

[Tomasz Moniuszko, 2014/12/12 11:47:07]

Done.

+    return IconUtil::CreateHICONFromSkBitmap(*image.bitmap());
+  }
+  return IconUtil::CreateHICONFromSkBitmap(skia::ImageOperations::Resize(
+      *image.bitmap(), skia::ImageOperations::RESIZE_BEST, width, height));
+}
+
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, public:
 
 GlassBrowserFrameView::GlassBrowserFrameView(BrowserFrame* frame,
                                              BrowserView* browser_view)
     : BrowserNonClientFrameView(frame, browser_view),
       throbber_running_(false),
       throbber_frame_(0) {
@@ skipping 447 matching lines @@
     SendMessage(views::HWNDForWidget(frame()), WM_SETICON,
                 static_cast<WPARAM>(ICON_SMALL),
                 reinterpret_cast<LPARAM>(throbber_icons_[throbber_frame_]));
   }
 }
 
 void GlassBrowserFrameView::StopThrobber() {
   if (throbber_running_) {
     throbber_running_ = false;
 
-    HICON frame_icon = nullptr;
+    HICON small_icon = nullptr;
+    HICON big_icon = nullptr;
 
     // Check if hosted BrowserView has a window icon to use.
     if (browser_view()->ShouldShowWindowIcon()) {
       gfx::ImageSkia icon = browser_view()->GetWindowIcon();
-      if (!icon.isNull())
-        frame_icon = IconUtil::CreateHICONFromSkBitmap(*icon.bitmap());
+      if (!icon.isNull()) {
+        small_icon = CreateHICONFromSkBitmap(
+            icon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
+        big_icon = CreateHICONFromSkBitmap(
+            icon, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
+      }
     }
 
     // Fallback to class icon.
-    if (!frame_icon) {
-      frame_icon = reinterpret_cast<HICON>(GetClassLongPtr(
+    if (!small_icon) {
+      small_icon = reinterpret_cast<HICON>(GetClassLongPtr(
           views::HWNDForWidget(frame()), GCLP_HICONSM));
     }
+    if (!big_icon) {
+      big_icon = reinterpret_cast<HICON>(GetClassLongPtr(
+          views::HWNDForWidget(frame()), GCLP_HICON));
+    }
 
-    // This will reset the small icon which we set in the throbber code.
+    // This will reset the icon which we set in the throbber code.
     // WM_SETICON with null icon restores the icon for title bar but not
     // for taskbar. See http://crbug.com/29996
     SendMessage(views::HWNDForWidget(frame()), WM_SETICON,
                 static_cast<WPARAM>(ICON_SMALL),
-                reinterpret_cast<LPARAM>(frame_icon));
+                reinterpret_cast<LPARAM>(small_icon));
+    SendMessage(views::HWNDForWidget(frame()), WM_SETICON,
+                static_cast<WPARAM>(ICON_BIG),
+                reinterpret_cast<LPARAM>(big_icon));
   }
 }
 
 void GlassBrowserFrameView::DisplayNextThrobberFrame() {
   throbber_frame_ = (throbber_frame_ + 1) % kThrobberIconCount;
   SendMessage(views::HWNDForWidget(frame()), WM_SETICON,
               static_cast<WPARAM>(ICON_SMALL),
               reinterpret_cast<LPARAM>(throbber_icons_[throbber_frame_]));
 }
 
@@ skipping 21 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] =
           ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }