chrome/browser/extensions/extension_icon_manager.cc - Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

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/extensions/extension_icon_manager.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and fix header Created 4 years, 8 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

« no previous file with comments | « chrome/browser/extensions/extension_gcm_app_handler_unittest.cc ('k') | chrome/browser/extensions/extension_icon_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_icon_manager.cc

diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc

index 2202cd087d808c66d2dc658058749846d65e791e..cec9a5bda615b201c4eb7a486b35b7111a3cf05e 100644

--- a/chrome/browser/extensions/extension_icon_manager.cc

+++ b/chrome/browser/extensions/extension_icon_manager.cc

@@ -34,11 +34,10 @@ namespace {

// around the original bitmap.

static SkBitmap ApplyPadding(const SkBitmap& source,

const gfx::Insets& padding) {

- scoped_ptr<gfx::Canvas> result(

+ std::unique_ptr<gfx::Canvas> result(

new gfx::Canvas(gfx::Size(source.width() + padding.width(),

source.height() + padding.height()),

- 1.0f,

- false));

+ 1.0f, false));

result->DrawImageInt(

gfx::ImageSkia::CreateFrom1xBitmap(source),

0, 0, source.width(), source.height(),