| 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 COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_ | 5 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_ |
| 6 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_ | 6 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> |
| 11 |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "base/task/cancelable_task_tracker.h" | 13 #include "base/task/cancelable_task_tracker.h" |
| 13 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 14 #include "components/favicon_base/favicon_types.h" | 15 #include "components/favicon_base/favicon_types.h" |
| 15 #include "ui/base/models/tree_node_model.h" | 16 #include "ui/base/models/tree_node_model.h" |
| 16 #include "ui/gfx/image/image.h" | 17 #include "ui/gfx/image/image.h" |
| 17 #include "url/gurl.h" | 18 #include "url/gurl.h" |
| 18 | 19 |
| 19 namespace bookmarks { | 20 namespace bookmarks { |
| 20 | 21 |
| 21 class BookmarkModel; | 22 class BookmarkModel; |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 178 |
| 178 // The loading state of the favicon. | 179 // The loading state of the favicon. |
| 179 FaviconState favicon_state_; | 180 FaviconState favicon_state_; |
| 180 | 181 |
| 181 // If not base::CancelableTaskTracker::kBadTaskId, it indicates | 182 // If not base::CancelableTaskTracker::kBadTaskId, it indicates |
| 182 // we're loading the | 183 // we're loading the |
| 183 // favicon and the task is tracked by CancelabelTaskTracker. | 184 // favicon and the task is tracked by CancelabelTaskTracker. |
| 184 base::CancelableTaskTracker::TaskId favicon_load_task_id_; | 185 base::CancelableTaskTracker::TaskId favicon_load_task_id_; |
| 185 | 186 |
| 186 // A map that stores arbitrary meta information about the node. | 187 // A map that stores arbitrary meta information about the node. |
| 187 scoped_ptr<MetaInfoMap> meta_info_map_; | 188 std::unique_ptr<MetaInfoMap> meta_info_map_; |
| 188 | 189 |
| 189 // The sync transaction version. Defaults to kInvalidSyncTransactionVersion. | 190 // The sync transaction version. Defaults to kInvalidSyncTransactionVersion. |
| 190 int64_t sync_transaction_version_; | 191 int64_t sync_transaction_version_; |
| 191 | 192 |
| 192 DISALLOW_COPY_AND_ASSIGN(BookmarkNode); | 193 DISALLOW_COPY_AND_ASSIGN(BookmarkNode); |
| 193 }; | 194 }; |
| 194 | 195 |
| 195 // BookmarkPermanentNode ------------------------------------------------------- | 196 // BookmarkPermanentNode ------------------------------------------------------- |
| 196 | 197 |
| 197 // Node used for the permanent folders (excluding the root). | 198 // Node used for the permanent folders (excluding the root). |
| (...skipping 10 matching lines...) Expand all Loading... |
| 208 | 209 |
| 209 private: | 210 private: |
| 210 bool visible_; | 211 bool visible_; |
| 211 | 212 |
| 212 DISALLOW_COPY_AND_ASSIGN(BookmarkPermanentNode); | 213 DISALLOW_COPY_AND_ASSIGN(BookmarkPermanentNode); |
| 213 }; | 214 }; |
| 214 | 215 |
| 215 } // namespace bookmarks | 216 } // namespace bookmarks |
| 216 | 217 |
| 217 #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_ | 218 #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_ |
| OLD | NEW |