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 "components/history/core/browser/history_backend.h" | 5 #include "components/history/core/browser/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 1826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1837 const GURL* page_url, | 1837 const GURL* page_url, |
1838 const std::vector<GURL>& icon_urls, | 1838 const std::vector<GURL>& icon_urls, |
1839 int icon_types, | 1839 int icon_types, |
1840 const std::vector<int>& desired_sizes, | 1840 const std::vector<int>& desired_sizes, |
1841 std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) { | 1841 std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) { |
1842 // If |page_url| is specified, |icon_types| must be either a single icon | 1842 // If |page_url| is specified, |icon_types| must be either a single icon |
1843 // type or icon types which are equivalent. | 1843 // type or icon types which are equivalent. |
1844 DCHECK(!page_url || icon_types == favicon_base::FAVICON || | 1844 DCHECK(!page_url || icon_types == favicon_base::FAVICON || |
1845 icon_types == favicon_base::TOUCH_ICON || | 1845 icon_types == favicon_base::TOUCH_ICON || |
1846 icon_types == favicon_base::TOUCH_PRECOMPOSED_ICON || | 1846 icon_types == favicon_base::TOUCH_PRECOMPOSED_ICON || |
| 1847 icon_types == favicon_base::LARGE_ICON || |
1847 icon_types == | 1848 icon_types == |
1848 (favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON)); | 1849 (favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON)); |
1849 bitmap_results->clear(); | 1850 bitmap_results->clear(); |
1850 | 1851 |
1851 if (!thumbnail_db_) { | 1852 if (!thumbnail_db_) { |
1852 return; | 1853 return; |
1853 } | 1854 } |
1854 | 1855 |
1855 std::vector<favicon_base::FaviconID> favicon_ids; | 1856 std::vector<favicon_base::FaviconID> favicon_ids; |
1856 | 1857 |
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2639 return true; | 2640 return true; |
2640 } | 2641 } |
2641 | 2642 |
2642 HistoryClient* HistoryBackend::GetHistoryClient() { | 2643 HistoryClient* HistoryBackend::GetHistoryClient() { |
2643 if (history_client_) | 2644 if (history_client_) |
2644 history_client_->BlockUntilBookmarksLoaded(); | 2645 history_client_->BlockUntilBookmarksLoaded(); |
2645 return history_client_; | 2646 return history_client_; |
2646 } | 2647 } |
2647 | 2648 |
2648 } // namespace history | 2649 } // namespace history |
OLD | NEW |