Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Side by Side Diff: components/history/core/browser/history_service.h

Issue 2823093002: Make FaviconService::GetRawFaviconForPageURL() select the best candidate among all the icon types (Closed)
Patch Set: Merge branch 'master' into icon_type Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_ 5 #ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
6 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_ 6 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 const std::vector<int>& desired_sizes, 656 const std::vector<int>& desired_sizes,
657 const favicon_base::FaviconResultsCallback& callback, 657 const favicon_base::FaviconResultsCallback& callback,
658 base::CancelableTaskTracker* tracker); 658 base::CancelableTaskTracker* tracker);
659 659
660 // Used by the FaviconService to get favicons mapped to |page_url| for 660 // Used by the FaviconService to get favicons mapped to |page_url| for
661 // |icon_types| whose edge sizes most closely match |desired_sizes|. If 661 // |icon_types| whose edge sizes most closely match |desired_sizes|. If
662 // |desired_sizes| has a '0' entry, the largest favicon bitmap for 662 // |desired_sizes| has a '0' entry, the largest favicon bitmap for
663 // |icon_types| is returned. The returned FaviconBitmapResults will have at 663 // |icon_types| is returned. The returned FaviconBitmapResults will have at
664 // most one result for each entry in |desired_sizes|. If a favicon bitmap is 664 // most one result for each entry in |desired_sizes|. If a favicon bitmap is
665 // determined to be the best candidate for multiple |desired_sizes| there 665 // determined to be the best candidate for multiple |desired_sizes| there
666 // will be fewer results. If |icon_types| has several types, results for only 666 // will be fewer results.
667 // a single type will be returned in the priority of TOUCH_PRECOMPOSED_ICON,
668 // TOUCH_ICON, and FAVICON.
669 base::CancelableTaskTracker::TaskId GetFaviconsForURL( 667 base::CancelableTaskTracker::TaskId GetFaviconsForURL(
670 const GURL& page_url, 668 const GURL& page_url,
671 int icon_types, 669 int icon_types,
672 const std::vector<int>& desired_sizes, 670 const std::vector<int>& desired_sizes,
673 const favicon_base::FaviconResultsCallback& callback, 671 const favicon_base::FaviconResultsCallback& callback,
674 base::CancelableTaskTracker* tracker); 672 base::CancelableTaskTracker* tracker);
675 673
676 // Used by FaviconService to find the first favicon bitmap whose width and 674 // Used by FaviconService to find the first favicon bitmap whose width and
677 // height are greater than that of |minimum_size_in_pixels|. This searches 675 // height are greater than that of |minimum_size_in_pixels|. This searches
678 // for icons by IconType. Each element of |icon_types| is a bitmask of 676 // for icons by IconType. Each element of |icon_types| is a bitmask of
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 839
842 // All vended weak pointers are invalidated in Cleanup(). 840 // All vended weak pointers are invalidated in Cleanup().
843 base::WeakPtrFactory<HistoryService> weak_ptr_factory_; 841 base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
844 842
845 DISALLOW_COPY_AND_ASSIGN(HistoryService); 843 DISALLOW_COPY_AND_ASSIGN(HistoryService);
846 }; 844 };
847 845
848 } // namespace history 846 } // namespace history
849 847
850 #endif // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_ 848 #endif // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
OLDNEW
« no previous file with comments | « components/history/core/browser/history_backend_unittest.cc ('k') | components/history/core/browser/thumbnail_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698