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

Unified Diff: chrome/browser/ui/views/confirm_bubble_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/confirm_bubble_view.cc
diff --git a/chrome/browser/ui/views/confirm_bubble_view.cc b/chrome/browser/ui/views/confirm_bubble_view.cc
index 59338b48114bc70b83648c8c3c4acd5b247f18b5..21655cbbfe5fde9f2feeb04d1d686f461aa2775d 100644
--- a/chrome/browser/ui/views/confirm_bubble_view.cc
+++ b/chrome/browser/ui/views/confirm_bubble_view.cc
@@ -80,7 +80,7 @@ void ConfirmBubbleView::Init() {
gfx::Image* icon_image = model_->GetIcon();
DCHECK(icon_image);
views::ImageView* icon_view = new views::ImageView;
- icon_view->SetImage(icon_image->ToSkBitmap());
+ icon_view->SetImage(icon_image->ToImageSkia());
layout->AddView(icon_view);
const string16 title_text = model_->GetTitle();
@@ -90,8 +90,8 @@ void ConfirmBubbleView::Init() {
layout->AddView(title_label);
views::ImageButton* close_button = new views::ImageButton(this);
- const SkBitmap* close_image =
- bundle.GetImageNamed(IDR_INFO_BUBBLE_CLOSE).ToSkBitmap();
+ const gfx::ImageSkia* close_image =
+ bundle.GetImageNamed(IDR_INFO_BUBBLE_CLOSE).ToImageSkia();
close_button->SetImage(views::CustomButton::BS_NORMAL, close_image);
close_button->set_tag(ConfirmBubbleModel::BUTTON_NONE);
layout->AddView(close_button);
« no previous file with comments | « chrome/browser/ui/views/collected_cookies_views.cc ('k') | chrome/browser/ui/views/constrained_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698