Chromium Code Reviews| Index: components/offline_pages/offline_page_model_impl.cc |
| diff --git a/components/offline_pages/offline_page_model_impl.cc b/components/offline_pages/offline_page_model_impl.cc |
| index 8642ab137cadd30b0c337de6a28463c82e85c2d6..7625d1e5b13b90df1245146093458e0a8b22499f 100644 |
| --- a/components/offline_pages/offline_page_model_impl.cc |
| +++ b/components/offline_pages/offline_page_model_impl.cc |
| @@ -450,16 +450,23 @@ void OfflinePageModelImpl::CheckPagesExistOfflineAfterLoadDone( |
| void OfflinePageModelImpl::GetAllPages( |
| const MultipleOfflinePageItemCallback& callback) { |
| RunWhenLoaded(base::Bind(&OfflinePageModelImpl::GetAllPagesAfterLoadDone, |
| - weak_ptr_factory_.GetWeakPtr(), callback)); |
| + weak_ptr_factory_.GetWeakPtr(), false, callback)); |
|
dewittj
2016/07/12 21:57:20
I slightly prefer an enum class or a bitfield here
romax
2016/07/13 20:01:08
Done.
|
| +} |
| + |
| +void OfflinePageModelImpl::GetAllPagesWithExpired( |
| + const MultipleOfflinePageItemCallback& callback) { |
| + RunWhenLoaded(base::Bind(&OfflinePageModelImpl::GetAllPagesAfterLoadDone, |
| + weak_ptr_factory_.GetWeakPtr(), true, callback)); |
| } |
| void OfflinePageModelImpl::GetAllPagesAfterLoadDone( |
| + bool with_expired, |
| const MultipleOfflinePageItemCallback& callback) const { |
| DCHECK(is_loaded_); |
| MultipleOfflinePageItemResult offline_pages; |
| for (const auto& id_page_pair : offline_pages_) { |
| - if (!id_page_pair.second.IsExpired()) |
| + if (with_expired || !id_page_pair.second.IsExpired()) |
| offline_pages.push_back(id_page_pair.second); |
| } |