Multi-profile: Fix the avatar menu button on the windows taskbar

chrome/browser/ui/views/avatar_menu_button.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/ui/views/avatar_menu_button.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/gfx/canvas_skia.h"
@@ skipping 29 matching lines @@
   if (!window)
     return;
 
   base::win::ScopedComPtr<ITaskbarList3> taskbar;
   HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL,
                                           CLSCTX_INPROC_SERVER);
   if (FAILED(result) || FAILED(taskbar->HrInit()))
     return;
   HICON icon = NULL;
   if (bitmap) {
-    // Since the target size is so small, we use our best resizer.
+    const SkBitmap* source_bitmap = NULL;
+    SkBitmap squarer_bitmap;
+    if ((bitmap->width() == 38) && (bitmap->height() == 31)) {
+      // Shave a couple of columns so the bitmap is more square. So when
+      // resized to a square aspect ratio it looks pretty.
+      bitmap->extractSubset(&squarer_bitmap, SkIRect::MakeXYWH(2, 0, 34, 31));
+      source_bitmap = &squarer_bitmap;
+    } else {
+      // The bitmaps size has changed. Resize what we have.
+      source_bitmap = bitmap;
+    }
+    // Since the target size is so small, we use our best resizer. Never pass
+    // windows a different size because it will badly hammer it to 16x16.
     SkBitmap sk_icon = skia::ImageOperations::Resize(
-        *bitmap,
+        *source_bitmap,
         skia::ImageOperations::RESIZE_LANCZOS3,
         16, 16);
     icon = IconUtil::CreateHICONFromSkBitmap(sk_icon);
     if (!icon)
       return;
   }
   taskbar->SetOverlayIcon(window, icon, L"");
   if (icon)
     DestroyIcon(icon);
 #endif
@@ skipping 80 matching lines @@
   // Bubble::Show() takes ownership of the view.
   bubble_ = Bubble::Show(browser_view->GetWidget(), bounds,
       views::BubbleBorder::TOP_LEFT, bubble_view, bubble_view);
   bubble_->AddObserver(this);
 }
 
 void AvatarMenuButton::OnBubbleClosing() {
   bubble_->RemoveObserver(this);
   bubble_ = NULL;
 }