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

Unified Diff: chrome/browser/ui/views/frame/taskbar_decorator_win.cc

Issue 212603011: Newly created profiles should have the grey silhouette as avatar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase reviewed Created 6 years, 8 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
Index: chrome/browser/ui/views/frame/taskbar_decorator_win.cc
diff --git a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc
index 9333fd16581d5f2ebe68fec52958f898d1a5593a..e9a5ad883b99f1bd435042a06d3c3824fb16805b 100644
--- a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc
+++ b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc
@@ -41,32 +41,15 @@ void SetOverlayIcon(HWND hwnd, scoped_ptr<SkBitmap> bitmap) {
base::win::ScopedGDIObject<HICON> icon;
if (bitmap.get()) {
- const SkBitmap* source_bitmap = NULL;
- SkBitmap squarer_bitmap;
- if ((bitmap->width() == profiles::kAvatarIconWidth) &&
- (bitmap->height() == profiles::kAvatarIconHeight)) {
- // Shave a couple of columns so the bitmap is more square. So when
- // resized to a square aspect ratio it looks pretty.
- int x = 2;
- bitmap->extractSubset(&squarer_bitmap, SkIRect::MakeXYWH(x, 0,
- profiles::kAvatarIconWidth - x * 2, profiles::kAvatarIconHeight));
- source_bitmap = &squarer_bitmap;
- } else {
- // The image's size has changed. Resize what we have.
- source_bitmap = bitmap.get();
- }
-
- // Maintain aspect ratio on resize. It is assumed that the image is wider
- // than it is tall.
const size_t kOverlayIconSize = 16;
- size_t resized_height =
- source_bitmap->height() * kOverlayIconSize / source_bitmap->width();
- DCHECK_GE(kOverlayIconSize, resized_height);
+ const SkBitmap* source_bitmap = bitmap.get();
+
+ // Maintain aspect ratio on resize. Image is assumed to be square.
// Since the target size is so small, we use our best resizer.
SkBitmap sk_icon = skia::ImageOperations::Resize(
*source_bitmap,
skia::ImageOperations::RESIZE_LANCZOS3,
- kOverlayIconSize, resized_height);
+ kOverlayIconSize, kOverlayIconSize);
// Paint the resized icon onto a 16x16 canvas otherwise Windows will badly
// hammer it to 16x16.
@@ -74,7 +57,7 @@ void SetOverlayIcon(HWND hwnd, scoped_ptr<SkBitmap> bitmap) {
offscreen_bitmap.allocN32Pixels(kOverlayIconSize, kOverlayIconSize);
SkCanvas offscreen_canvas(offscreen_bitmap);
offscreen_canvas.clear(SK_ColorTRANSPARENT);
- offscreen_canvas.drawBitmap(sk_icon, 0, kOverlayIconSize - resized_height);
+ offscreen_canvas.drawBitmap(sk_icon, 0, 0);
icon.Set(IconUtil::CreateHICONFromSkBitmap(offscreen_bitmap));
if (!icon.Get())
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/profiles/profile_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698