ui/base/models/tree_node_model.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/base/models/tree_node_model.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/base/models/tree_node_model.h

diff --git a/ui/base/models/tree_node_model.h b/ui/base/models/tree_node_model.h

index 279667b2a406d7f2bbeb507299b9763f3470875c..d860db9dd1e3cdbc9e248bf7a8cce0d012127c91 100644

--- a/ui/base/models/tree_node_model.h

+++ b/ui/base/models/tree_node_model.h

@@ -8,11 +8,11 @@

#include <stddef.h>

#include <algorithm>

+#include <memory>

#include <vector>

#include "base/logging.h"

#include "base/macros.h"

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

#include "base/observer_list.h"

#include "base/stl_util.h"

#include "base/strings/string16.h"

@@ -298,7 +298,7 @@ class TreeNodeModel : public TreeModel {

base::ObserverList<TreeModelObserver> observer_list_;

// The root.

- scoped_ptr<NodeType> root_;

+ std::unique_ptr<NodeType> root_;

DISALLOW_COPY_AND_ASSIGN(TreeNodeModel);

};

« no previous file with comments | « ui/base/models/list_model_unittest.cc ('k') | ui/base/models/tree_node_model_unittest.cc » ('j') | no next file with comments »