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

Unified Diff: ash/launcher/tabbed_launcher_button.cc

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
Index: ash/launcher/tabbed_launcher_button.cc
diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc
index 4bee325770bdeee8724ad555e774dd8f076ccddd..d6f4d5bec2a199a3bade493951c6650c49070123 100644
--- a/ash/launcher/tabbed_launcher_button.cc
+++ b/ash/launcher/tabbed_launcher_button.cc
@@ -57,7 +57,7 @@ void TabbedLauncherButton::IconView::AnimationProgressed(
SchedulePaint();
}
-void TabbedLauncherButton::IconView::SetTabImage(const SkBitmap& image) {
+void TabbedLauncherButton::IconView::SetTabImage(const gfx::ImageSkia& image) {
if (image.empty()) {
if (!image_.empty()) {
// Pause for 500ms, then ease out for 200ms.
@@ -127,7 +127,7 @@ TabbedLauncherButton::TabbedLauncherButton(views::ButtonListener* listener,
TabbedLauncherButton::~TabbedLauncherButton() {
}
-void TabbedLauncherButton::SetTabImage(const SkBitmap& image) {
+void TabbedLauncherButton::SetTabImage(const gfx::ImageSkia& image) {
tabbed_icon_view()->SetTabImage(image);
}
« no previous file with comments | « ash/launcher/tabbed_launcher_button.h ('k') | chrome/browser/ui/webui/options2/chromeos/wallpaper_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698