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

Unified Diff: chrome/browser/ui/views/hung_renderer_view.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/hung_renderer_view.cc
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index a3d6b4bd2a187790e9440c00c09dcbc952381088..bcd3e916ce575fd96b230a70c34dab3f7037d295 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -300,13 +300,13 @@ class HungRendererDialogView : public views::DialogDelegateView,
bool initialized_;
// An amusing icon image.
- static SkBitmap* frozen_icon_;
+ static gfx::ImageSkia* frozen_icon_;
DISALLOW_COPY_AND_ASSIGN(HungRendererDialogView);
};
// static
-SkBitmap* HungRendererDialogView::frozen_icon_ = NULL;
+gfx::ImageSkia* HungRendererDialogView::frozen_icon_ = NULL;
// The distance in pixels from the top of the relevant contents to place the
// warning window.
@@ -556,7 +556,7 @@ void HungRendererDialogView::InitClass() {
static bool initialized = false;
if (!initialized) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- frozen_icon_ = rb.GetBitmapNamed(IDR_FROZEN_TAB_ICON);
+ frozen_icon_ = rb.GetImageSkiaNamed(IDR_FROZEN_TAB_ICON);
initialized = true;
}
}
« no previous file with comments | « chrome/browser/ui/views/global_error_bubble_view.cc ('k') | chrome/browser/ui/views/infobars/infobar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698