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 #include "components/bookmarks/browser/bookmark_model.h" | 5 #include "components/bookmarks/browser/bookmark_model.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "grit/components_strings.h" | 24 #include "grit/components_strings.h" |
25 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
26 #include "ui/gfx/favicon_size.h" | 26 #include "ui/gfx/favicon_size.h" |
27 | 27 |
28 using base::Time; | 28 using base::Time; |
29 using bookmarks::BookmarkClient; | 29 using bookmarks::BookmarkClient; |
30 using bookmarks::BookmarkExpandedStateTracker; | 30 using bookmarks::BookmarkExpandedStateTracker; |
31 using bookmarks::BookmarkIndex; | 31 using bookmarks::BookmarkIndex; |
32 using bookmarks::BookmarkLoadDetails; | 32 using bookmarks::BookmarkLoadDetails; |
33 using bookmarks::BookmarkMatch; | 33 using bookmarks::BookmarkMatch; |
| 34 using bookmarks::BookmarkNodeData; |
34 using bookmarks::BookmarkStorage; | 35 using bookmarks::BookmarkStorage; |
35 | 36 |
36 namespace { | 37 namespace { |
37 | 38 |
38 // Helper to get a mutable bookmark node. | 39 // Helper to get a mutable bookmark node. |
39 BookmarkNode* AsMutable(const BookmarkNode* node) { | 40 BookmarkNode* AsMutable(const BookmarkNode* node) { |
40 return const_cast<BookmarkNode*>(node); | 41 return const_cast<BookmarkNode*>(node); |
41 } | 42 } |
42 | 43 |
43 // Helper to get a mutable permanent bookmark node. | 44 // Helper to get a mutable permanent bookmark node. |
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1007 BookmarkPermanentNode* mobile_node = | 1008 BookmarkPermanentNode* mobile_node = |
1008 CreatePermanentNode(BookmarkNode::MOBILE); | 1009 CreatePermanentNode(BookmarkNode::MOBILE); |
1009 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails( | 1010 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails( |
1010 bb_node, | 1011 bb_node, |
1011 other_node, | 1012 other_node, |
1012 mobile_node, | 1013 mobile_node, |
1013 client_->GetLoadExtraNodesCallback(), | 1014 client_->GetLoadExtraNodesCallback(), |
1014 new BookmarkIndex(client_, index_urls_, accept_languages), | 1015 new BookmarkIndex(client_, index_urls_, accept_languages), |
1015 next_node_id_)); | 1016 next_node_id_)); |
1016 } | 1017 } |
OLD | NEW |