OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 } | 733 } |
734 return node; | 734 return node; |
735 } | 735 } |
736 | 736 |
737 void BookmarkModel::OnFavIconDataAvailable( | 737 void BookmarkModel::OnFavIconDataAvailable( |
738 FaviconService::Handle handle, | 738 FaviconService::Handle handle, |
739 bool know_favicon, | 739 bool know_favicon, |
740 scoped_refptr<RefCountedMemory> data, | 740 scoped_refptr<RefCountedMemory> data, |
741 bool expired, | 741 bool expired, |
742 GURL icon_url) { | 742 GURL icon_url) { |
743 SkBitmap fav_icon; | 743 SkBitmap favicon; |
744 BookmarkNode* node = | 744 BookmarkNode* node = |
745 load_consumer_.GetClientData( | 745 load_consumer_.GetClientData( |
746 profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle); | 746 profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle); |
747 DCHECK(node); | 747 DCHECK(node); |
748 node->set_favicon_load_handle(0); | 748 node->set_favicon_load_handle(0); |
749 if (know_favicon && data.get() && data->size() && | 749 if (know_favicon && data.get() && data->size() && |
750 gfx::PNGCodec::Decode(data->front(), data->size(), &fav_icon)) { | 750 gfx::PNGCodec::Decode(data->front(), data->size(), &favicon)) { |
751 node->set_favicon(fav_icon); | 751 node->set_favicon(favicon); |
752 FavIconLoaded(node); | 752 FavIconLoaded(node); |
753 } | 753 } |
754 } | 754 } |
755 | 755 |
756 void BookmarkModel::LoadFavIcon(BookmarkNode* node) { | 756 void BookmarkModel::LoadFavIcon(BookmarkNode* node) { |
757 if (node->type() != BookmarkNode::URL) | 757 if (node->type() != BookmarkNode::URL) |
758 return; | 758 return; |
759 | 759 |
760 DCHECK(node->GetURL().is_valid()); | 760 DCHECK(node->GetURL().is_valid()); |
761 FaviconService* favicon_service = | 761 FaviconService* favicon_service = |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
824 void BookmarkModel::SetFileChanged() { | 824 void BookmarkModel::SetFileChanged() { |
825 file_changed_ = true; | 825 file_changed_ = true; |
826 } | 826 } |
827 | 827 |
828 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() { | 828 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() { |
829 BookmarkNode* bb_node = CreateBookmarkNode(); | 829 BookmarkNode* bb_node = CreateBookmarkNode(); |
830 BookmarkNode* other_folder_node = CreateOtherBookmarksNode(); | 830 BookmarkNode* other_folder_node = CreateOtherBookmarksNode(); |
831 return new BookmarkLoadDetails( | 831 return new BookmarkLoadDetails( |
832 bb_node, other_folder_node, new BookmarkIndex(profile()), next_node_id_); | 832 bb_node, other_folder_node, new BookmarkIndex(profile()), next_node_id_); |
833 } | 833 } |
OLD | NEW |