diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 16:49:59 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 16:49:59 +0000 |
| commit | 1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd (patch) | |
| tree | 6696875095afa91e8159e6c8afb9c6c64516d639 /ash/launcher | |
| parent | 0802253de60a80eddbe0d3627dda42747c9054cd (diff) | |
| download | chromium_src-1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd.zip chromium_src-1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd.tar.gz chromium_src-1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd.tar.bz2 | |
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
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/tabbed_launcher_button.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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( |