Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/avatar_menu_button.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/avatar_menu_button.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/managed_mode.h"
@@ skipping 51 matching lines @@
     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 bitmaps size has changed. Resize what we have.
+      // The image's 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(
         *source_bitmap,
         skia::ImageOperations::RESIZE_LANCZOS3,
         16, 16);
     icon = IconUtil::CreateHICONFromSkBitmap(sk_icon);
     if (!icon)
@@ skipping 18 matching lines @@
 AvatarMenuButton::~AvatarMenuButton() {
 }
 
 void AvatarMenuButton::OnPaint(gfx::Canvas* canvas) {
   if (!icon_.get())
     return;
 
   if (old_height_ != height() || button_icon_.isNull()) {
     old_height_ = height();
     button_icon_ = *profiles::GetAvatarIconForTitleBar(
-        *icon_, is_gaia_picture_, width(), height()).ToSkBitmap();
+        *icon_, is_gaia_picture_, width(), height()).ToImageSkia();
   }
 
   // Scale the image to fit the width of the button.
   int dst_width = std::min(button_icon_.width(), width());
   // Truncate rather than rounding, so that for odd widths we put the extra
   // pixel on the left.
   int dst_x = (width() - dst_width) / 2;
 
   // Scale the height and maintain aspect ratio. This means that the
   // icon may not fit in the view. That's ok, we just vertically center it.
@@ skipping 12 matching lines @@
 
 bool AvatarMenuButton::HitTest(const gfx::Point& point) const {
   if (incognito_)
     return false;
   return views::MenuButton::HitTest(point);
 }
 
 void AvatarMenuButton::SetAvatarIcon(const gfx::Image& icon,
                                      bool is_gaia_picture) {
   icon_.reset(new gfx::Image(icon));
-  button_icon_ = SkBitmap();
+  button_icon_ = gfx::ImageSkia();
   is_gaia_picture_ = is_gaia_picture;
   SchedulePaint();
 }
 
 // views::MenuButtonListener implementation
 void AvatarMenuButton::OnMenuButtonClicked(views::View* source,
                                            const gfx::Point& point) {
   if (incognito_)
     return;
 
@@ skipping 10 matching lines @@
   views::View::ConvertPointToScreen(this, &origin);
   gfx::Rect bounds(origin, size());
 
   AvatarMenuBubbleView* bubble = new AvatarMenuBubbleView(this,
       views::BubbleBorder::TOP_LEFT, bounds, browser_);
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->Show();
 
   ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
 }