chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm - Issue 10790128: Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10790128: Revert 147915 - 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:

Index: chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

===================================================================

--- chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm (revision 147935)

+++ chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm (working copy)

@@ -105,7 +105,7 @@

scoped_ptr<gfx::Canvas> canvas(

new gfx::Canvas(

gfx::Size(image_size + kDropArrowLeftMarginPx + drop_image->width(),

- image_size), ui::SCALE_FACTOR_100P, false));

+ image_size), false));

canvas->DrawImageInt(*icon,

0, 0, icon->width(), icon->height(),

0, 0, image_size, image_size,

@@ -113,8 +113,7 @@

canvas->DrawImageInt(*drop_image,

image_size + kDropArrowLeftMarginPx,

image_size / 2);

- [owner_ setButtonImage:gfx::SkBitmapToNSImage(

- canvas->ExtractImageRep().sk_bitmap())];

+ [owner_ setButtonImage:gfx::SkBitmapToNSImage(canvas->ExtractBitmap())];

}

// Overridden from ExtensionInfoBarDelegate::DelegateObserver: