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

Unified Diff: chrome/browser/ui/views/download/download_started_animation_views.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 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: chrome/browser/ui/views/download/download_started_animation_views.cc
diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc
index fd4d9c31be0a6076fa57cc4aacb5c5699b818a47..f711ca1b217860bbc824f0dfd43bcee79977d160 100644
--- a/chrome/browser/ui/views/download/download_started_animation_views.cc
+++ b/chrome/browser/ui/views/download/download_started_animation_views.cc
@@ -82,9 +82,9 @@ DownloadStartedAnimationWin::DownloadStartedAnimationWin(
: ui::LinearAnimation(kMoveTimeMs, kFrameRateHz, NULL),
popup_(NULL),
web_contents_(web_contents) {
- static SkBitmap* kDownloadImage = NULL;
+ static gfx::ImageSkia* kDownloadImage = NULL;
if (!kDownloadImage) {
- kDownloadImage = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ kDownloadImage = ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_DOWNLOAD_ANIMATION_BEGIN);
}
« no previous file with comments | « chrome/browser/ui/views/download/download_shelf_view.cc ('k') | chrome/browser/ui/views/dropdown_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698