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

Unified Diff: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

Issue 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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/extensions/extension_install_dialog_view.cc
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index 6b348bd2ff061bd050a92b7a5708b0eedf82ba14..9b515125ecc9306eb3c174c06174bd13252be17d 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -62,7 +62,7 @@ const int kHeadingFontSizeDelta = 1;
const int kRatingFontSizeDelta = -1;
-void AddResourceIcon(const SkBitmap* skia_image, void* data) {
+void AddResourceIcon(const gfx::ImageSkia* skia_image, void* data) {
views::View* parent = static_cast<views::View*>(data);
views::ImageView* image_view = new views::ImageView();
image_view->SetImage(*skia_image);
@@ -184,13 +184,13 @@ ExtensionInstallDialogView::ExtensionInstallDialogView(
if (!is_bundle_install()) {
// Scale down to icon size, but allow smaller icons (don't scale up).
- const SkBitmap* bitmap = prompt.icon().ToSkBitmap();
- gfx::Size size(bitmap->width(), bitmap->height());
+ const gfx::ImageSkia* image = prompt.icon().ToImageSkia();
+ gfx::Size size(image->width(), image->height());
if (size.width() > kIconSize || size.height() > kIconSize)
size = gfx::Size(kIconSize, kIconSize);
views::ImageView* icon = new views::ImageView();
icon->SetImageSize(size);
- icon->SetImage(*bitmap);
+ icon->SetImage(*image);
icon->SetHorizontalAlignment(views::ImageView::CENTER);
icon->SetVerticalAlignment(views::ImageView::CENTER);
int icon_row_span = 1;
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_view.cc ('k') | chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698