components/bookmarks/browser/bookmark_node.h - Issue 1906973002: Convert //components/bookmarks 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: components/bookmarks/browser/bookmark_node.h

Issue 1906973002: Convert //components/bookmarks from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « components/bookmarks/browser/bookmark_model_unittest.cc ('k') | components/bookmarks/browser/bookmark_node_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/bookmarks/browser/bookmark_node.h

diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks/browser/bookmark_node.h

index bfd83026b7e4389d637beb948475d8a121a22685..84cea2b07d1467e8b65915181ad7321af70e4345 100644

--- a/components/bookmarks/browser/bookmark_node.h

+++ b/components/bookmarks/browser/bookmark_node.h

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

#include <stdint.h>

+#include <memory>

#include "base/macros.h"

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

#include "base/task/cancelable_task_tracker.h"

#include "base/time/time.h"

#include "components/favicon_base/favicon_types.h"

@@ -184,7 +185,7 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> {

base::CancelableTaskTracker::TaskId favicon_load_task_id_;

// A map that stores arbitrary meta information about the node.

- scoped_ptr<MetaInfoMap> meta_info_map_;

+ std::unique_ptr<MetaInfoMap> meta_info_map_;

// The sync transaction version. Defaults to kInvalidSyncTransactionVersion.

int64_t sync_transaction_version_;