| 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::BookmarkModelObserver; |
| 34 using bookmarks::BookmarkNodeData; | 35 using bookmarks::BookmarkNodeData; |
| 35 using bookmarks::BookmarkStorage; | 36 using bookmarks::BookmarkStorage; |
| 36 | 37 |
| 37 namespace { | 38 namespace { |
| 38 | 39 |
| 39 // Helper to get a mutable bookmark node. | 40 // Helper to get a mutable bookmark node. |
| 40 BookmarkNode* AsMutable(const BookmarkNode* node) { | 41 BookmarkNode* AsMutable(const BookmarkNode* node) { |
| 41 return const_cast<BookmarkNode*>(node); | 42 return const_cast<BookmarkNode*>(node); |
| 42 } | 43 } |
| 43 | 44 |
| (...skipping 975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 BookmarkPermanentNode* mobile_node = | 1020 BookmarkPermanentNode* mobile_node = |
| 1020 CreatePermanentNode(BookmarkNode::MOBILE); | 1021 CreatePermanentNode(BookmarkNode::MOBILE); |
| 1021 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails( | 1022 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails( |
| 1022 bb_node, | 1023 bb_node, |
| 1023 other_node, | 1024 other_node, |
| 1024 mobile_node, | 1025 mobile_node, |
| 1025 client_->GetLoadExtraNodesCallback(), | 1026 client_->GetLoadExtraNodesCallback(), |
| 1026 new BookmarkIndex(client_, accept_languages), | 1027 new BookmarkIndex(client_, accept_languages), |
| 1027 next_node_id_)); | 1028 next_node_id_)); |
| 1028 } | 1029 } |
| OLD | NEW |