Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1631)

Unified Diff: ash/launcher/tabbed_launcher_button.h

Issue 10827368: ash: Avoid implicit conversion from ImageSkia into SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/launcher/tabbed_launcher_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/tabbed_launcher_button.h
diff --git a/ash/launcher/tabbed_launcher_button.h b/ash/launcher/tabbed_launcher_button.h
index 7d0717ada6a7d7ddfed1c17aa1955dcbbf78362a..2cc864d5a89f1dd679cf30898c9197e6686f93d6 100644
--- a/ash/launcher/tabbed_launcher_button.h
+++ b/ash/launcher/tabbed_launcher_button.h
@@ -37,7 +37,7 @@ class TabbedLauncherButton : public LauncherButton {
virtual ~TabbedLauncherButton();
// Sets the images to display for this entry.
- void SetTabImage(const SkBitmap& image);
+ void SetTabImage(const gfx::ImageSkia& image);
// This only defines how the icon is drawn. Do not use it for other purposes.
IncognitoState is_incognito() const { return is_incognito_; }
@@ -65,7 +65,7 @@ class TabbedLauncherButton : public LauncherButton {
virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
// Sets the image to display for this entry.
- void SetTabImage(const SkBitmap& image);
+ void SetTabImage(const gfx::ImageSkia& image);
protected:
// View override.
@@ -73,8 +73,8 @@ class TabbedLauncherButton : public LauncherButton {
private:
TabbedLauncherButton* host_;
- SkBitmap image_;
- SkBitmap animating_image_;
+ gfx::ImageSkia image_;
+ gfx::ImageSkia animating_image_;
// Used to animate image.
scoped_ptr<ui::MultiAnimation> animation_;
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/launcher/tabbed_launcher_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698