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

Unified Diff: chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

Issue 10701063: Cleanup gfx::Canvas now that 10562027 has landed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/cocoa/infobars/extension_infobar_controller.mm
diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
index 14dc647135e63458262ad4ccb9393f54d9ccfc9e..2ca46d08ba60857685f29c45c588266fa48c0e88 100644
--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
@@ -104,7 +104,7 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,
scoped_ptr<gfx::Canvas> canvas(
new gfx::Canvas(
gfx::Size(image_size + kDropArrowLeftMarginPx + drop_image->width(),
- image_size), false));
+ image_size), ui::SCALE_FACTOR_100P, false));
canvas->DrawImageInt(*icon,
0, 0, icon->width(), icon->height(),
0, 0, image_size, image_size,
@@ -112,7 +112,8 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,
canvas->DrawImageInt(*drop_image,
image_size + kDropArrowLeftMarginPx,
image_size / 2);
- [owner_ setButtonImage:gfx::SkBitmapToNSImage(canvas->ExtractBitmap())];
+ [owner_ setButtonImage:gfx::SkBitmapToNSImage(
+ canvas->ExtractImageRep().sk_bitmap())];
}
// Overridden from ExtensionInfoBarDelegate::DelegateObserver:

Powered by Google App Engine
This is Rietveld 408576698