ui/gfx/win/direct_manipulation.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/gfx/win/direct_manipulation.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/gfx/win/direct_manipulation.h

diff --git a/ui/gfx/win/direct_manipulation.h b/ui/gfx/win/direct_manipulation.h

index 43423b2798025029927ff4718188fc947df9def5..3a2ccfeafee7844038c9adf4a4d3b74609660eaf 100644

--- a/ui/gfx/win/direct_manipulation.h

+++ b/ui/gfx/win/direct_manipulation.h

@@ -7,8 +7,9 @@

#include <directmanipulation.h>

+#include <memory>

#include "base/macros.h"

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

#include "base/win/scoped_comptr.h"

#include "ui/gfx/geometry/rect.h"

#include "ui/gfx/gfx_export.h"

@@ -42,7 +43,7 @@ class GFX_EXPORT DirectManipulationHelper {

public:

// Creates an instance of this class if Direct Manipulation is enabled on

// the platform. If not returns NULL.

- static scoped_ptr<DirectManipulationHelper> CreateInstance();

+ static std::unique_ptr<DirectManipulationHelper> CreateInstance();

// This function instantiates Direct Manipulation and creates a viewport for

// the passed in |window|.

« no previous file with comments | « ui/gfx/text_elider_unittest.cc ('k') | ui/gfx/win/direct_manipulation.cc » ('j') | no next file with comments »