| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/bookmark_bar_model.h" | 5 #include "chrome/browser/bookmarks/bookmark_bar_model.h" |
| 6 | 6 |
| 7 #include "base/gfx/png_decoder.h" | 7 #include "base/gfx/png_decoder.h" |
| 8 #include "chrome/browser/bookmarks/bookmark_storage.h" |
| 8 #include "chrome/browser/history/query_parser.h" | 9 #include "chrome/browser/history/query_parser.h" |
| 9 #include "chrome/browser/profile.h" | 10 #include "chrome/browser/profile.h" |
| 10 #include "chrome/browser/bookmark_storage.h" | |
| 11 #include "chrome/common/scoped_vector.h" | 11 #include "chrome/common/scoped_vector.h" |
| 12 | 12 |
| 13 #include "generated_resources.h" | 13 #include "generated_resources.h" |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 // Functions used for sorting. | 17 // Functions used for sorting. |
| 18 bool MoreRecentlyModified(BookmarkBarNode* n1, BookmarkBarNode* n2) { | 18 bool MoreRecentlyModified(BookmarkBarNode* n1, BookmarkBarNode* n2) { |
| 19 return n1->date_group_modified() > n2->date_group_modified(); | 19 return n1->date_group_modified() > n2->date_group_modified(); |
| 20 } | 20 } |
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 } | 685 } |
| 686 | 686 |
| 687 void BookmarkBarModel::PopulateNodesByURL(BookmarkBarNode* node) { | 687 void BookmarkBarModel::PopulateNodesByURL(BookmarkBarNode* node) { |
| 688 // NOTE: this is called with url_lock_ already held. As such, this doesn't | 688 // NOTE: this is called with url_lock_ already held. As such, this doesn't |
| 689 // explicitly grab the lock. | 689 // explicitly grab the lock. |
| 690 if (node->is_url()) | 690 if (node->is_url()) |
| 691 nodes_ordered_by_url_set_.insert(node); | 691 nodes_ordered_by_url_set_.insert(node); |
| 692 for (int i = 0; i < node->GetChildCount(); ++i) | 692 for (int i = 0; i < node->GetChildCount(); ++i) |
| 693 PopulateNodesByURL(node->GetChild(i)); | 693 PopulateNodesByURL(node->GetChild(i)); |
| 694 } | 694 } |
| OLD | NEW |