OLD | NEW |
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 #include "chrome/browser/history/history_backend.h" | 5 #include "chrome/browser/history/history_backend.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 #include <list> | 9 #include <list> |
10 #include <map> | 10 #include <map> |
(...skipping 1681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1692 int desired_size_in_dip, | 1692 int desired_size_in_dip, |
1693 const std::vector<ui::ScaleFactor>& desired_scale_factors, | 1693 const std::vector<ui::ScaleFactor>& desired_scale_factors, |
1694 std::vector<chrome::FaviconBitmapResult>* bitmap_results) { | 1694 std::vector<chrome::FaviconBitmapResult>* bitmap_results) { |
1695 UpdateFaviconMappingsAndFetchImpl(NULL, icon_urls, icon_types, | 1695 UpdateFaviconMappingsAndFetchImpl(NULL, icon_urls, icon_types, |
1696 desired_size_in_dip, desired_scale_factors, | 1696 desired_size_in_dip, desired_scale_factors, |
1697 bitmap_results); | 1697 bitmap_results); |
1698 } | 1698 } |
1699 | 1699 |
1700 void HistoryBackend::GetFaviconsForURL( | 1700 void HistoryBackend::GetFaviconsForURL( |
1701 const GURL& page_url, | 1701 const GURL& page_url, |
1702 int icon_types, | 1702 const std::vector<int>& icon_types_priority, |
1703 int desired_size_in_dip, | 1703 int desired_size_in_dip, |
1704 const std::vector<ui::ScaleFactor>& desired_scale_factors, | 1704 const std::vector<ui::ScaleFactor>& desired_scale_factors, |
| 1705 int threshold_for_next_icon_types, |
1705 std::vector<chrome::FaviconBitmapResult>* bitmap_results) { | 1706 std::vector<chrome::FaviconBitmapResult>* bitmap_results) { |
1706 DCHECK(bitmap_results); | 1707 chrome::FaviconBitmapResult bitmap_result; |
1707 GetFaviconsFromDB(page_url, icon_types, desired_size_in_dip, | 1708 int bitmap_size_in_pixel = 0; |
1708 desired_scale_factors, bitmap_results); | 1709 for (std::vector<int>::const_iterator i = icon_types_priority.begin(); |
| 1710 i != icon_types_priority.end(); i++) { |
| 1711 GetFaviconsFromDB(page_url, *i, desired_size_in_dip, desired_scale_factors, |
| 1712 bitmap_results); |
| 1713 if (icon_types_priority.size() == 1) |
| 1714 return; |
| 1715 |
| 1716 for (std::vector<chrome::FaviconBitmapResult>::const_iterator j = |
| 1717 bitmap_results->begin(); j != bitmap_results->end(); j++) { |
| 1718 if (bitmap_size_in_pixel < j->pixel_size.width() && |
| 1719 bitmap_size_in_pixel < j->pixel_size.height()) { |
| 1720 bitmap_size_in_pixel = std::min(j->pixel_size.width(), |
| 1721 j->pixel_size.height()); |
| 1722 bitmap_result = *j; |
| 1723 } |
| 1724 } |
| 1725 bitmap_results->clear(); |
| 1726 if (bitmap_size_in_pixel > threshold_for_next_icon_types) |
| 1727 break; |
| 1728 } |
| 1729 if (bitmap_size_in_pixel != 0) |
| 1730 bitmap_results->push_back(bitmap_result); |
1709 } | 1731 } |
1710 | 1732 |
1711 void HistoryBackend::GetFaviconForID( | 1733 void HistoryBackend::GetFaviconForID( |
1712 chrome::FaviconID favicon_id, | 1734 chrome::FaviconID favicon_id, |
1713 int desired_size_in_dip, | 1735 int desired_size_in_dip, |
1714 ui::ScaleFactor desired_scale_factor, | 1736 ui::ScaleFactor desired_scale_factor, |
1715 std::vector<chrome::FaviconBitmapResult>* bitmap_results) { | 1737 std::vector<chrome::FaviconBitmapResult>* bitmap_results) { |
1716 std::vector<chrome::FaviconID> favicon_ids; | 1738 std::vector<chrome::FaviconID> favicon_ids; |
1717 favicon_ids.push_back(favicon_id); | 1739 favicon_ids.push_back(favicon_id); |
1718 std::vector<ui::ScaleFactor> desired_scale_factors; | 1740 std::vector<ui::ScaleFactor> desired_scale_factors; |
(...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2883 int rank = kPageVisitStatsMaxTopSites; | 2905 int rank = kPageVisitStatsMaxTopSites; |
2884 std::map<GURL, int>::const_iterator it = most_visited_urls_map_.find(url); | 2906 std::map<GURL, int>::const_iterator it = most_visited_urls_map_.find(url); |
2885 if (it != most_visited_urls_map_.end()) | 2907 if (it != most_visited_urls_map_.end()) |
2886 rank = (*it).second; | 2908 rank = (*it).second; |
2887 UMA_HISTOGRAM_ENUMERATION("History.TopSitesVisitsByRank", | 2909 UMA_HISTOGRAM_ENUMERATION("History.TopSitesVisitsByRank", |
2888 rank, kPageVisitStatsMaxTopSites + 1); | 2910 rank, kPageVisitStatsMaxTopSites + 1); |
2889 } | 2911 } |
2890 #endif | 2912 #endif |
2891 | 2913 |
2892 } // namespace history | 2914 } // namespace history |
OLD | NEW |