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

Unified Diff: components/bookmarks/managed/managed_bookmark_service.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
Index: components/bookmarks/managed/managed_bookmark_service.h
diff --git a/components/bookmarks/managed/managed_bookmark_service.h b/components/bookmarks/managed/managed_bookmark_service.h
index db24b2bf5e32a54d49f6bb310e05e6c6c0a06ab3..d02a8128c4aff967bfb6d945c94d7e1456f358e1 100644
--- a/components/bookmarks/managed/managed_bookmark_service.h
+++ b/components/bookmarks/managed/managed_bookmark_service.h
@@ -5,11 +5,11 @@
#ifndef COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARK_SERVICE_H_
#define COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARK_SERVICE_H_
+#include <memory>
#include <string>
#include "base/callback_forward.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/bookmarks/browser/base_bookmark_model_observer.h"
#include "components/bookmarks/browser/bookmark_node.h"
#include "components/bookmarks/browser/bookmark_storage.h"
@@ -85,13 +85,13 @@ class ManagedBookmarkService : public KeyedService,
// Managed bookmarks are defined by an enterprise policy. The lifetime of the
// BookmarkPermanentNode is controlled by BookmarkModel.
- scoped_ptr<ManagedBookmarksTracker> managed_bookmarks_tracker_;
+ std::unique_ptr<ManagedBookmarksTracker> managed_bookmarks_tracker_;
GetManagementDomainCallback managed_domain_callback_;
BookmarkPermanentNode* managed_node_;
// Supervised bookmarks are defined by the custodian of a supervised user. The
// lifetime of the BookmarkPermanentNode is controlled by BookmarkModel.
- scoped_ptr<ManagedBookmarksTracker> supervised_bookmarks_tracker_;
+ std::unique_ptr<ManagedBookmarksTracker> supervised_bookmarks_tracker_;
BookmarkPermanentNode* supervised_node_;
DISALLOW_COPY_AND_ASSIGN(ManagedBookmarkService);
« no previous file with comments | « components/bookmarks/browser/bookmark_utils_unittest.cc ('k') | components/bookmarks/managed/managed_bookmark_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698