Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/avatar_menu_bubble_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/avatar_menu_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 145 matching lines @@
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
 
   virtual void OnHighlightStateChanged() OVERRIDE;
   virtual void OnFocusStateChanged(bool has_focus) OVERRIDE;
 
   EditProfileLink* edit_link() { return edit_link_; }
   const AvatarMenuModel::Item& item() { return item_; }
 
  private:
-  static SkBitmap GetBadgedIcon(const SkBitmap& icon);
+  static gfx::ImageSkia GetBadgedIcon(const gfx::ImageSkia& icon);
 
   bool IsHighlighted();
 
   EditProfileLink* edit_link_;
   views::ImageView* image_view_;
   AvatarMenuModel::Item item_;
   views::Label* name_label_;
   views::Label* sync_state_label_;
 };
 
 ProfileItemView::ProfileItemView(const AvatarMenuModel::Item& item,
                                  views::ButtonListener* switch_profile_listener,
                                  views::LinkListener* edit_profile_listener)
     : views::CustomButton(switch_profile_listener),
       item_(item) {
   image_view_ = new ProfileImageView();
-  SkBitmap profile_icon = *item_.icon.ToSkBitmap();
+  gfx::ImageSkia profile_icon = *item_.icon.ToImageSkia();
   if (item_.active) {
-    SkBitmap badged_icon(GetBadgedIcon(profile_icon));
+    gfx::ImageSkia badged_icon(GetBadgedIcon(profile_icon));
     image_view_->SetImage(badged_icon);
   } else {
     image_view_->SetImage(profile_icon);
   }
   AddChildView(image_view_);
 
   // Add a label to show the profile name.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::Font base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
   const int style = item_.active ? gfx::Font::BOLD : 0;
@@ skipping 38 matching lines @@
 
 void ProfileItemView::Layout() {
   // Profile icon.
   gfx::Rect icon_rect;
   if (item_.active) {
     // If this is the active item then the icon is already scaled and so
     // just use the preferred size.
     icon_rect.set_size(image_view_->GetPreferredSize());
     icon_rect.set_y((height() - icon_rect.height()) / 2);
   } else {
-    const SkBitmap& icon = image_view_->GetImage();
+    const gfx::ImageSkia& icon = image_view_->GetImage();
     icon_rect = GetCenteredAndScaledRect(icon.width(), icon.height(), 0, 0,
         profiles::kAvatarIconWidth, height());
   }
   image_view_->SetBoundsRect(icon_rect);
 
   int label_x = profiles::kAvatarIconWidth + kIconMarginX;
   int max_label_width = std::max(width() - label_x, 0);
   gfx::Size name_size = name_label_->GetPreferredSize();
   name_size.set_width(std::min(name_size.width(), max_label_width));
   gfx::Size state_size = sync_state_label_->GetPreferredSize();
@@ skipping 50 matching lines @@
   SchedulePaint();
 }
 
 void ProfileItemView::OnFocusStateChanged(bool has_focus) {
   if (!has_focus && state() != views::CustomButton::BS_DISABLED)
     SetState(views::CustomButton::BS_NORMAL);
   OnHighlightStateChanged();
 }
 
 // static
-SkBitmap ProfileItemView::GetBadgedIcon(const SkBitmap& icon) {
+gfx::ImageSkia ProfileItemView::GetBadgedIcon(const gfx::ImageSkia& icon) {
   gfx::Rect icon_rect = GetCenteredAndScaledRect(icon.width(), icon.height(),
       0, 0, profiles::kAvatarIconWidth, kItemHeight);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  const SkBitmap* badge = rb.GetImageNamed(IDR_PROFILE_SELECTED).ToSkBitmap();
+  const gfx::ImageSkia* badge = rb.GetImageNamed(
+      IDR_PROFILE_SELECTED).ToImageSkia();
   const float kBadgeOverlapRatioX = 1.0f / 5.0f;
   int width = icon_rect.width() + badge->width() * kBadgeOverlapRatioX;
   const float kBadgeOverlapRatioY = 1.0f / 3.0f;
   int height = icon_rect.height() + badge->height() * kBadgeOverlapRatioY;
 
   gfx::Canvas canvas(gfx::Size(width, height), false);
   canvas.DrawBitmapInt(icon, 0, 0, icon.width(), icon.height(), 0, 0,
                        icon_rect.width(), icon_rect.height(), true);
   canvas.DrawBitmapInt(*badge, width - badge->width(),
                        height - badge->height());
@@ skipping 174 matching lines @@
   add_profile_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   add_profile_link_->SetBackgroundColor(color());
   add_profile_link_->SetEnabledColor(SkColorSetRGB(0xe3, 0xed, 0xf6));
   AddChildView(add_profile_link_);
 
   // If the bubble has already been shown then resize and reposition the bubble.
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }