| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/bookmarks/bookmark_model.h" | 5 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 6 | 6 |
| 7 #include <algorithm> |
| 8 #include <functional> |
| 9 |
| 7 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| 8 #include "app/l10n_util_collator.h" | 11 #include "app/l10n_util_collator.h" |
| 9 #include "base/callback.h" | 12 #include "base/callback.h" |
| 10 #include "base/scoped_vector.h" | 13 #include "base/scoped_vector.h" |
| 11 #include "build/build_config.h" | 14 #include "build/build_config.h" |
| 12 #include "chrome/browser/bookmarks/bookmark_index.h" | 15 #include "chrome/browser/bookmarks/bookmark_index.h" |
| 13 #include "chrome/browser/bookmarks/bookmark_utils.h" | 16 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_storage.h" | 17 #include "chrome/browser/bookmarks/bookmark_storage.h" |
| 15 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
| 16 #include "chrome/browser/history/history_notifications.h" | 19 #include "chrome/browser/history/history_notifications.h" |
| 17 #include "chrome/browser/prefs/pref_service.h" | |
| 18 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
| 19 #include "chrome/common/notification_service.h" | 21 #include "chrome/common/notification_service.h" |
| 20 #include "gfx/codec/png_codec.h" | 22 #include "gfx/codec/png_codec.h" |
| 21 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
| 22 | 24 |
| 23 using base::Time; | 25 using base::Time; |
| 24 | 26 |
| 25 namespace { | 27 namespace { |
| 26 | 28 |
| 27 // Helper to get a mutable bookmark node. | 29 // Helper to get a mutable bookmark node. |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 820 void BookmarkModel::SetFileChanged() { | 822 void BookmarkModel::SetFileChanged() { |
| 821 file_changed_ = true; | 823 file_changed_ = true; |
| 822 } | 824 } |
| 823 | 825 |
| 824 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() { | 826 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() { |
| 825 BookmarkNode* bb_node = CreateBookmarkNode(); | 827 BookmarkNode* bb_node = CreateBookmarkNode(); |
| 826 BookmarkNode* other_folder_node = CreateOtherBookmarksNode(); | 828 BookmarkNode* other_folder_node = CreateOtherBookmarksNode(); |
| 827 return new BookmarkLoadDetails( | 829 return new BookmarkLoadDetails( |
| 828 bb_node, other_folder_node, new BookmarkIndex(profile()), next_node_id_); | 830 bb_node, other_folder_node, new BookmarkIndex(profile()), next_node_id_); |
| 829 } | 831 } |
| OLD | NEW |