ui/native_theme/common_theme.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/native_theme/common_theme.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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

Index: ui/native_theme/common_theme.h

diff --git a/ui/native_theme/common_theme.h b/ui/native_theme/common_theme.h

index 48edf85561f18c81e7580cdf9c93ee16f123895b..9a10f8ad04d21e906fc2d692febbf8ceb197cab7 100644

--- a/ui/native_theme/common_theme.h

+++ b/ui/native_theme/common_theme.h

@@ -5,7 +5,8 @@

#ifndef UI_NATIVE_THEME_COMMON_THEME_H_

#define UI_NATIVE_THEME_COMMON_THEME_H_

-#include "base/memory/scoped_ptr.h"

+#include <memory>

#include "ui/native_theme/native_theme.h"

class SkCanvas;

@@ -32,8 +33,8 @@ void NATIVE_THEME_EXPORT CommonThemePaintMenuItemBackground(

const NativeTheme::MenuItemExtraParams& menu_item);

// Creates a gfx::Canvas wrapping an SkCanvas.

-scoped_ptr<gfx::Canvas> NATIVE_THEME_EXPORT CommonThemeCreateCanvas(

- SkCanvas* sk_canvas);

+std::unique_ptr<gfx::Canvas> NATIVE_THEME_EXPORT

+CommonThemeCreateCanvas(SkCanvas* sk_canvas);

} // namespace ui

« no previous file with comments | « ui/mojo/init/ui_init.h ('k') | ui/native_theme/common_theme.cc » ('j') | no next file with comments »