| Index: ash/launcher/launcher_button.cc
|
| diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
|
| index 7c41621bcd4cb52ffccf50226f636edbc66eef81..8130110a86debceb5681e7a1cc18130ee956a39c 100644
|
| --- a/ash/launcher/launcher_button.cc
|
| +++ b/ash/launcher/launcher_button.cc
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "ash/launcher/launcher_button_host.h"
|
| #include "grit/ui_resources.h"
|
| -#include "skia/ext/image_operations.h"
|
| #include "ui/base/accessibility/accessible_view_state.h"
|
| #include "ui/base/animation/animation_delegate.h"
|
| #include "ui/base/animation/throb_animation.h"
|
| @@ -22,7 +21,6 @@
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/image/image.h"
|
| #include "ui/gfx/shadow_value.h"
|
| -#include "ui/gfx/skbitmap_operations.h"
|
| #include "ui/gfx/transform_util.h"
|
| #include "ui/views/controls/image_view.h"
|
|
|
| @@ -235,19 +233,19 @@ LauncherButton::LauncherButton(views::ButtonListener* listener,
|
| LauncherButton::~LauncherButton() {
|
| }
|
|
|
| -void LauncherButton::SetShadowedImage(const SkBitmap& bitmap) {
|
| +void LauncherButton::SetShadowedImage(const gfx::ImageSkia& image) {
|
| const gfx::ShadowValue kShadows[] = {
|
| gfx::ShadowValue(gfx::Point(0, 2), 0, SkColorSetARGB(0x1A, 0, 0, 0)),
|
| gfx::ShadowValue(gfx::Point(0, 3), 1, SkColorSetARGB(0x1A, 0, 0, 0)),
|
| gfx::ShadowValue(gfx::Point(0, 0), 1, SkColorSetARGB(0x54, 0, 0, 0)),
|
| };
|
|
|
| - SkBitmap shadowed_bitmap = SkBitmapOperations::CreateDropShadow(
|
| - bitmap, gfx::ShadowValues(kShadows, kShadows + arraysize(kShadows)));
|
| + gfx::ImageSkia shadowed_bitmap = image.CreateDropShadow(
|
| + gfx::ShadowValues(kShadows, kShadows + arraysize(kShadows)));
|
| icon_view_->SetImage(shadowed_bitmap);
|
| }
|
|
|
| -void LauncherButton::SetImage(const SkBitmap& image) {
|
| +void LauncherButton::SetImage(const gfx::ImageSkia& image) {
|
| if (image.empty()) {
|
| // TODO: need an empty image.
|
| icon_view_->SetImage(image);
|
| @@ -275,8 +273,7 @@ void LauncherButton::SetImage(const SkBitmap& image) {
|
| return;
|
| }
|
|
|
| - SkBitmap resized_image = skia::ImageOperations::Resize(
|
| - image, skia::ImageOperations::RESIZE_BEST, width, height);
|
| + gfx::ImageSkia resized_image = image.Resize(gfx::Size(width, height));
|
| SetShadowedImage(resized_image);
|
| }
|
|
|
|
|