| Index: ash/launcher/tabbed_launcher_button.cc
|
| diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc
|
| index d6f4d5bec2a199a3bade493951c6650c49070123..7add7cf105c5dacd48a71f5b575db5b9c80bff84 100644
|
| --- a/ash/launcher/tabbed_launcher_button.cc
|
| +++ b/ash/launcher/tabbed_launcher_button.cc
|
| @@ -58,8 +58,8 @@ void TabbedLauncherButton::IconView::AnimationProgressed(
|
| }
|
|
|
| void TabbedLauncherButton::IconView::SetTabImage(const gfx::ImageSkia& image) {
|
| - if (image.empty()) {
|
| - if (!image_.empty()) {
|
| + if (image.isNull()) {
|
| + if (!image_.isNull()) {
|
| // Pause for 500ms, then ease out for 200ms.
|
| ui::MultiAnimation::Parts animation_parts;
|
| animation_parts.push_back(ui::MultiAnimation::Part(500, ui::Tween::ZERO));
|
|
|