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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARK_SERVICE_H_ 5 #ifndef COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARK_SERVICE_H_
6 #define COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARK_SERVICE_H_ 6 #define COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARK_SERVICE_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/callback_forward.h" 11 #include "base/callback_forward.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "components/bookmarks/browser/base_bookmark_model_observer.h" 13 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
14 #include "components/bookmarks/browser/bookmark_node.h" 14 #include "components/bookmarks/browser/bookmark_node.h"
15 #include "components/bookmarks/browser/bookmark_storage.h" 15 #include "components/bookmarks/browser/bookmark_storage.h"
16 #include "components/keyed_service/core/keyed_service.h" 16 #include "components/keyed_service/core/keyed_service.h"
17 17
18 class PrefService; 18 class PrefService;
19 19
20 namespace bookmarks { 20 namespace bookmarks {
21 21
22 class BookmarkModel; 22 class BookmarkModel;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 // Pointer to the PrefService. Must outlive ManagedBookmarkService. 79 // Pointer to the PrefService. Must outlive ManagedBookmarkService.
80 PrefService* prefs_; 80 PrefService* prefs_;
81 81
82 // Pointer to the BookmarkModel; may be null. Only valid between the calls to 82 // Pointer to the BookmarkModel; may be null. Only valid between the calls to
83 // BookmarkModelCreated() and to BookmarkModelBeingDestroyed(). 83 // BookmarkModelCreated() and to BookmarkModelBeingDestroyed().
84 BookmarkModel* bookmark_model_; 84 BookmarkModel* bookmark_model_;
85 85
86 // Managed bookmarks are defined by an enterprise policy. The lifetime of the 86 // Managed bookmarks are defined by an enterprise policy. The lifetime of the
87 // BookmarkPermanentNode is controlled by BookmarkModel. 87 // BookmarkPermanentNode is controlled by BookmarkModel.
88 scoped_ptr<ManagedBookmarksTracker> managed_bookmarks_tracker_; 88 std::unique_ptr<ManagedBookmarksTracker> managed_bookmarks_tracker_;
89 GetManagementDomainCallback managed_domain_callback_; 89 GetManagementDomainCallback managed_domain_callback_;
90 BookmarkPermanentNode* managed_node_; 90 BookmarkPermanentNode* managed_node_;
91 91
92 // Supervised bookmarks are defined by the custodian of a supervised user. The 92 // Supervised bookmarks are defined by the custodian of a supervised user. The
93 // lifetime of the BookmarkPermanentNode is controlled by BookmarkModel. 93 // lifetime of the BookmarkPermanentNode is controlled by BookmarkModel.
94 scoped_ptr<ManagedBookmarksTracker> supervised_bookmarks_tracker_; 94 std::unique_ptr<ManagedBookmarksTracker> supervised_bookmarks_tracker_;
95 BookmarkPermanentNode* supervised_node_; 95 BookmarkPermanentNode* supervised_node_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(ManagedBookmarkService); 97 DISALLOW_COPY_AND_ASSIGN(ManagedBookmarkService);
98 }; 98 };
99 99
100 } // namespace bookmarks 100 } // namespace bookmarks
101 101
102 #endif // COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARK_SERVICE_H_ 102 #endif // COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARK_SERVICE_H_
OLDNEW
« 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