components/bookmarks/managed/managed_bookmarks_tracker.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/managed/managed_bookmarks_tracker.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/managed/managed_bookmark_service.cc ('k') | components/bookmarks/managed/managed_bookmarks_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/bookmarks/managed/managed_bookmarks_tracker.h

diff --git a/components/bookmarks/managed/managed_bookmarks_tracker.h b/components/bookmarks/managed/managed_bookmarks_tracker.h

index 4586aa3c8ff750369312563adfc0b172d9a36fdd..a1ea938d94977631cbf37d75a895d79a9dfc0a42 100644

--- a/components/bookmarks/managed/managed_bookmarks_tracker.h

+++ b/components/bookmarks/managed/managed_bookmarks_tracker.h

@@ -8,9 +8,10 @@

#include <stddef.h>

#include <stdint.h>

+#include <memory>

#include "base/callback_forward.h"

#include "base/macros.h"

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

#include "base/strings/string16.h"

#include "components/prefs/pref_change_registrar.h"

@@ -51,7 +52,7 @@ class ManagedBookmarksTracker {

// Returns the initial list of managed bookmarks, which can be passed to

// LoadInitial() to do the initial load.

- scoped_ptr<base::ListValue> GetInitialManagedBookmarks();

+ std::unique_ptr<base::ListValue> GetInitialManagedBookmarks();

// Loads the initial managed/supervised bookmarks in |list| into |folder|.

// New nodes will be assigned IDs starting at |next_node_id|.