Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2046)

Unified Diff: components/bookmarks/managed/managed_bookmark_service.cc

Issue 2645003002: Remove ScopedVector in //components/bookmarks (Closed)
Patch Set: Remove ScopedVector in //components/bookmarks Created 3 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks/managed/managed_bookmark_service.cc
diff --git a/components/bookmarks/managed/managed_bookmark_service.cc b/components/bookmarks/managed/managed_bookmark_service.cc
index b6f9cc76c10a9e13b42cf2f98d04bf22ddb0cfbe..af10156110a33b4a4a89337f2393231903cad921 100644
--- a/components/bookmarks/managed/managed_bookmark_service.cc
+++ b/components/bookmarks/managed/managed_bookmark_service.cc
@@ -14,7 +14,7 @@
#include "base/callback.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
#include "base/values.h"
#include "components/bookmarks/browser/bookmark_model.h"
@@ -66,10 +66,10 @@ class BookmarkPermanentNodeLoader {
// start assigning id. |next_node_id| is updated as a side effect of calling
// this method.
BookmarkPermanentNodeList LoadExtraNodes(
- ScopedVector<BookmarkPermanentNodeLoader> loaders,
+ std::vector<std::unique_ptr<BookmarkPermanentNodeLoader>> loaders,
int64_t* next_node_id) {
BookmarkPermanentNodeList extra_nodes;
- for (auto* loader : loaders)
+ for (auto& loader : loaders)
extra_nodes.push_back(loader->Load(next_node_id));
return extra_nodes;
}
@@ -116,12 +116,12 @@ LoadExtraCallback ManagedBookmarkService::GetLoadExtraNodesCallback() {
managed_node_ = managed.get();
supervised_node_ = supervised.get();
- ScopedVector<BookmarkPermanentNodeLoader> loaders;
- loaders.push_back(new BookmarkPermanentNodeLoader(
+ std::vector<std::unique_ptr<BookmarkPermanentNodeLoader>> loaders;
+ loaders.push_back(base::MakeUnique<BookmarkPermanentNodeLoader>(
std::move(managed),
managed_bookmarks_tracker_->GetInitialManagedBookmarks(),
IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
- loaders.push_back(new BookmarkPermanentNodeLoader(
+ loaders.push_back(base::MakeUnique<BookmarkPermanentNodeLoader>(
std::move(supervised),
supervised_bookmarks_tracker_->GetInitialManagedBookmarks(),
IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698