| 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_MODEL_H_ | 5 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ |
| 6 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ | 6 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 BookmarkNode root_; | 409 BookmarkNode root_; |
| 410 | 410 |
| 411 BookmarkPermanentNode* bookmark_bar_node_; | 411 BookmarkPermanentNode* bookmark_bar_node_; |
| 412 BookmarkPermanentNode* other_node_; | 412 BookmarkPermanentNode* other_node_; |
| 413 BookmarkPermanentNode* mobile_node_; | 413 BookmarkPermanentNode* mobile_node_; |
| 414 | 414 |
| 415 // The maximum ID assigned to the bookmark nodes in the model. | 415 // The maximum ID assigned to the bookmark nodes in the model. |
| 416 int64 next_node_id_; | 416 int64 next_node_id_; |
| 417 | 417 |
| 418 // The observers. | 418 // The observers. |
| 419 ObserverList<BookmarkModelObserver> observers_; | 419 base::ObserverList<BookmarkModelObserver> observers_; |
| 420 | 420 |
| 421 // Set of nodes ordered by URL. This is not a map to avoid copying the | 421 // Set of nodes ordered by URL. This is not a map to avoid copying the |
| 422 // urls. | 422 // urls. |
| 423 // WARNING: |nodes_ordered_by_url_set_| is accessed on multiple threads. As | 423 // WARNING: |nodes_ordered_by_url_set_| is accessed on multiple threads. As |
| 424 // such, be sure and wrap all usage of it around |url_lock_|. | 424 // such, be sure and wrap all usage of it around |url_lock_|. |
| 425 typedef std::multiset<BookmarkNode*, NodeURLComparator> NodesOrderedByURLSet; | 425 typedef std::multiset<BookmarkNode*, NodeURLComparator> NodesOrderedByURLSet; |
| 426 NodesOrderedByURLSet nodes_ordered_by_url_set_; | 426 NodesOrderedByURLSet nodes_ordered_by_url_set_; |
| 427 base::Lock url_lock_; | 427 base::Lock url_lock_; |
| 428 | 428 |
| 429 // Used for loading favicons. | 429 // Used for loading favicons. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 442 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_; | 442 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_; |
| 443 | 443 |
| 444 std::set<std::string> non_cloned_keys_; | 444 std::set<std::string> non_cloned_keys_; |
| 445 | 445 |
| 446 DISALLOW_COPY_AND_ASSIGN(BookmarkModel); | 446 DISALLOW_COPY_AND_ASSIGN(BookmarkModel); |
| 447 }; | 447 }; |
| 448 | 448 |
| 449 } // namespace bookmarks | 449 } // namespace bookmarks |
| 450 | 450 |
| 451 #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ | 451 #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ |
| OLD | NEW |