summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher_button.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/launcher/launcher_button.cc')
-rw-r--r--ash/launcher/launcher_button.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index 8701f30..acc6a31 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -109,7 +109,7 @@ void LauncherButton::SetShadowedImage(const SkBitmap& bitmap) {
void LauncherButton::SetImage(const SkBitmap& image) {
if (image.empty()) {
// TODO: need an empty image.
- icon_view_->SetImage(&image);
+ icon_view_->SetImage(image);
return;
}
@@ -264,7 +264,7 @@ void LauncherButton::UpdateState() {
else
bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING;
- bar_->SetImage(rb.GetImageNamed(bar_id).ToSkBitmap());
+ bar_->SetImage(rb.GetImageNamed(bar_id).ToImageSkia());
}
Layout();