chrome/browser/ui/views/frame/taskbar_decorator_win.cc - Issue 1865213004: Convert //chrome/browser/ui 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/ui/views/frame/taskbar_decorator_win.cc

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

Patch Set: rebase 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/ui/views/frame/system_menu_model_builder.h ('k') | chrome/browser/ui/views/frame/test_with_browser_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/taskbar_decorator_win.cc

diff --git a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc

index 00a3c2e8e77bd8caab01220d0097dd8fa9978505..5d7563ad1cc81fcbbeb576dd1eabd249a49988ba 100644

--- a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc

+++ b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc

@@ -30,7 +30,7 @@ namespace {

// Docs for TaskbarList::SetOverlayIcon() say it does nothing if the HWND is not

// valid.

-void SetOverlayIcon(HWND hwnd, scoped_ptr<SkBitmap> bitmap) {

+void SetOverlayIcon(HWND hwnd, std::unique_ptr<SkBitmap> bitmap) {

base::win::ScopedComPtr<ITaskbarList3> taskbar;

HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, nullptr,

CLSCTX_INPROC_SERVER);

@@ -80,7 +80,7 @@ void DrawTaskbarDecoration(gfx::NativeWindow window, const gfx::Image* image) {

// Copy the image since we're going to use it on a separate thread and

// gfx::Image isn't thread safe.

- scoped_ptr<SkBitmap> bitmap;

+ std::unique_ptr<SkBitmap> bitmap;

if (image) {

bitmap.reset(new SkBitmap(

profiles::GetAvatarIconAsSquare(*image->ToSkBitmap(), 1)));