From 1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd Mon Sep 17 00:00:00 2001 From: "pkotwicz@chromium.org" Date: Wed, 24 Oct 2012 16:49:59 +0000 Subject: Remove implicit conversion from SkBitmap to ImageSkia BUG=154727 Test=None R=rsesek TBR=sky,jam Review URL: https://chromiumcodereview.appspot.com/11099010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163848 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/launcher/tabbed_launcher_button.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ash/launcher') diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc index cb33ca5..9ab491f 100644 --- a/ash/launcher/tabbed_launcher_button.cc +++ b/ash/launcher/tabbed_launcher_button.cc @@ -51,7 +51,7 @@ TabbedLauncherButton::IconView::~IconView() { void TabbedLauncherButton::IconView::AnimationEnded( const ui::Animation* animation) { AnimationProgressed(animation); - animating_image_ = SkBitmap(); + animating_image_ = gfx::ImageSkia(); } void TabbedLauncherButton::IconView::AnimationProgressed( -- cgit v1.1