Change SetImage, SetBackground, and SetToggledImage to take in a gfx::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 165 matching lines @@
 
 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();
   if (item_.active) {
     SkBitmap badged_icon(GetBadgedIcon(profile_icon));
-    image_view_->SetImage(&badged_icon);
+    image_view_->SetImage(badged_icon);
   } else {
-    image_view_->SetImage(&profile_icon);
+    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;
   const int kNameFontDelta = 1;
   name_label_ = new views::Label(item_.name,
                                  base_font.DeriveFont(kNameFontDelta, style));
@@ skipping 306 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();
 }