| Index: chrome/browser/ui/views/download/download_shelf_view.cc
|
| diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc
|
| index 0d5474265692966eae9cca0a8a1e0f210232f3c8..f310962519784392bdd3d51132341d0915c00452 100644
|
| --- a/chrome/browser/ui/views/download/download_shelf_view.cc
|
| +++ b/chrome/browser/ui/views/download/download_shelf_view.cc
|
| @@ -403,7 +403,7 @@ void DownloadShelfView::DoShow() {
|
| void DownloadShelfView::DoClose(CloseReason reason) {
|
| int num_in_progress = 0;
|
| for (size_t i = 0; i < download_views_.size(); ++i) {
|
| - if (download_views_[i]->download()->IsInProgress())
|
| + if (download_views_[i]->download()->GetState() == DownloadItem::IN_PROGRESS)
|
| ++num_in_progress;
|
| }
|
| download_util::RecordShelfClose(download_views_.size(),
|
| @@ -426,9 +426,10 @@ void DownloadShelfView::Closed() {
|
| size_t i = 0;
|
| while (i < download_views_.size()) {
|
| DownloadItem* download = download_views_[i]->download();
|
| - bool is_transfer_done = download->IsComplete() ||
|
| - download->IsCancelled() ||
|
| - download->IsInterrupted();
|
| + DownloadItem::DownloadState state = download->GetState();
|
| + bool is_transfer_done = state == DownloadItem::COMPLETE ||
|
| + state == DownloadItem::CANCELLED ||
|
| + state == DownloadItem::INTERRUPTED;
|
| if (is_transfer_done && !download->IsDangerous()) {
|
| RemoveDownloadView(download_views_[i]);
|
| } else {
|
|
|