| 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 10 matching lines...) Expand all Loading... |
| 21 #include "components/bookmarks/browser/bookmark_storage.h" | 21 #include "components/bookmarks/browser/bookmark_storage.h" |
| 22 #include "components/bookmarks/browser/bookmark_utils.h" | 22 #include "components/bookmarks/browser/bookmark_utils.h" |
| 23 #include "components/favicon_base/favicon_types.h" | 23 #include "components/favicon_base/favicon_types.h" |
| 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::BookmarkIndex; | 29 using bookmarks::BookmarkIndex; |
| 30 using bookmarks::BookmarkLoadDetails; | 30 using bookmarks::BookmarkLoadDetails; |
| 31 using bookmarks::BookmarkMatch; |
| 31 using bookmarks::BookmarkStorage; | 32 using bookmarks::BookmarkStorage; |
| 32 | 33 |
| 33 namespace { | 34 namespace { |
| 34 | 35 |
| 35 // Helper to get a mutable bookmark node. | 36 // Helper to get a mutable bookmark node. |
| 36 BookmarkNode* AsMutable(const BookmarkNode* node) { | 37 BookmarkNode* AsMutable(const BookmarkNode* node) { |
| 37 return const_cast<BookmarkNode*>(node); | 38 return const_cast<BookmarkNode*>(node); |
| 38 } | 39 } |
| 39 | 40 |
| 40 // Helper to get a mutable permanent bookmark node. | 41 // Helper to get a mutable permanent bookmark node. |
| (...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1005 BookmarkPermanentNode* mobile_node = | 1006 BookmarkPermanentNode* mobile_node = |
| 1006 CreatePermanentNode(BookmarkNode::MOBILE); | 1007 CreatePermanentNode(BookmarkNode::MOBILE); |
| 1007 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails( | 1008 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails( |
| 1008 bb_node, | 1009 bb_node, |
| 1009 other_node, | 1010 other_node, |
| 1010 mobile_node, | 1011 mobile_node, |
| 1011 client_->GetLoadExtraNodesCallback(), | 1012 client_->GetLoadExtraNodesCallback(), |
| 1012 new BookmarkIndex(client_, index_urls_, accept_languages), | 1013 new BookmarkIndex(client_, index_urls_, accept_languages), |
| 1013 next_node_id_)); | 1014 next_node_id_)); |
| 1014 } | 1015 } |
| OLD | NEW |