ui/wm/core/window_util.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/wm/core/window_util.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/wm/core/window_util.h

diff --git a/ui/wm/core/window_util.h b/ui/wm/core/window_util.h

index 3f2495c8f53776f4253b86c252c9ca4a5ac91765..8189a2f68fcd431eb7e2ab7c3320667b16b3830c 100644

--- a/ui/wm/core/window_util.h

+++ b/ui/wm/core/window_util.h

@@ -5,10 +5,10 @@

#ifndef UI_WM_CORE_WINDOW_UTIL_H_

#define UI_WM_CORE_WINDOW_UTIL_H_

+#include <memory>

#include <vector>

#include "base/compiler_specific.h"

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

#include "ui/wm/wm_export.h"

namespace aura {

@@ -42,7 +42,7 @@ WM_EXPORT aura::Window* GetToplevelWindow(aura::Window* window);

// As a result of this |root| has freshly created layers, meaning the layers

// have not yet been painted to.

-WM_EXPORT scoped_ptr<ui::LayerTreeOwner> RecreateLayers(

+WM_EXPORT std::unique_ptr<ui::LayerTreeOwner> RecreateLayers(

ui::LayerOwner* root);

// Convenience functions that get the TransientWindowManager for the window and

« no previous file with comments | « ui/wm/core/window_animations_unittest.cc ('k') | ui/wm/core/window_util.cc » ('j') | no next file with comments »