Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

ash/launcher/launcher_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 "ash/launcher/launcher_button.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_button_host.h"
 #include "grit/ui_resources.h"
@@ skipping 132 matching lines @@
       arraysize(kShadowColor) - 1,
       kShadowColor,
       kShadowOffset,
       kShadowRadius);
   icon_view_->SetImage(shadowed_bitmap);
 }
 
 void LauncherButton::SetImage(const SkBitmap& image) {
   if (image.empty()) {
     // TODO: need an empty image.
-    icon_view_->SetImage(&image);
+    icon_view_->SetImage(image);
     return;
   }
 
   if (icon_view_->icon_size() == 0) {
     SetShadowedImage(image);
     return;
   }
 
   // Resize the image maintaining our aspect ratio.
   int pref = icon_view_->icon_size();
@@ skipping 138 matching lines @@
     int bar_id;
     bar_->SetVisible(true);
 
     if (state_ & STATE_ACTIVE || state_ & STATE_ATTENTION)
       bar_id = IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE;
     else if (state_ & STATE_HOVERED)
       bar_id = IDR_AURA_LAUNCHER_UNDERLINE_HOVER;
     else
       bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING;
 
-    bar_->SetImage(rb.GetImageNamed(bar_id).ToSkBitmap());
+    bar_->SetImage(rb.GetImageNamed(bar_id).ToImageSkia());
   }
 
   Layout();
   SchedulePaint();
 }
 }  // namespace internal
 }  // namespace ash