| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ |
| 6 #define CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ | 6 #define CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 // or an empty string. | 98 // or an empty string. |
| 99 std::string GetManagedBookmarksDomain(); | 99 std::string GetManagedBookmarksDomain(); |
| 100 | 100 |
| 101 Profile* profile_; | 101 Profile* profile_; |
| 102 | 102 |
| 103 // HistoryService associated to the Profile. Due to circular dependency, this | 103 // HistoryService associated to the Profile. Due to circular dependency, this |
| 104 // cannot be passed to the constructor, nor lazily fetched. Instead the value | 104 // cannot be passed to the constructor, nor lazily fetched. Instead the value |
| 105 // is initialized from HistoryServiceFactory. | 105 // is initialized from HistoryServiceFactory. |
| 106 history::HistoryService* history_service_; | 106 history::HistoryService* history_service_; |
| 107 | 107 |
| 108 scoped_ptr<base::CallbackList<void(const std::set<GURL>&)>::Subscription> | 108 scoped_ptr<base::CallbackList<void(const std::vector<GURL>&, |
| 109 const std::vector<GURL>&)>::Subscription> |
| 109 favicon_changed_subscription_; | 110 favicon_changed_subscription_; |
| 110 | 111 |
| 111 // Pointer to the BookmarkModel. Will be non-NULL from the call to Init to | 112 // Pointer to the BookmarkModel. Will be non-NULL from the call to Init to |
| 112 // the call to Shutdown. Must be valid for the whole interval. | 113 // the call to Shutdown. Must be valid for the whole interval. |
| 113 bookmarks::BookmarkModel* model_; | 114 bookmarks::BookmarkModel* model_; |
| 114 | 115 |
| 115 // Managed bookmarks are defined by an enterprise policy. | 116 // Managed bookmarks are defined by an enterprise policy. |
| 116 scoped_ptr<bookmarks::ManagedBookmarksTracker> managed_bookmarks_tracker_; | 117 scoped_ptr<bookmarks::ManagedBookmarksTracker> managed_bookmarks_tracker_; |
| 117 // The top-level managed bookmarks folder. | 118 // The top-level managed bookmarks folder. |
| 118 bookmarks::BookmarkPermanentNode* managed_node_; | 119 bookmarks::BookmarkPermanentNode* managed_node_; |
| 119 | 120 |
| 120 // Supervised bookmarks are defined by the custodian of a supervised user. | 121 // Supervised bookmarks are defined by the custodian of a supervised user. |
| 121 scoped_ptr<bookmarks::ManagedBookmarksTracker> supervised_bookmarks_tracker_; | 122 scoped_ptr<bookmarks::ManagedBookmarksTracker> supervised_bookmarks_tracker_; |
| 122 // The top-level supervised bookmarks folder. | 123 // The top-level supervised bookmarks folder. |
| 123 bookmarks::BookmarkPermanentNode* supervised_node_; | 124 bookmarks::BookmarkPermanentNode* supervised_node_; |
| 124 | 125 |
| 125 DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient); | 126 DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient); |
| 126 }; | 127 }; |
| 127 | 128 |
| 128 #endif // CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ | 129 #endif // CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ |
| OLD | NEW |