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

Unified Diff: chrome/browser/ui/cocoa/download/download_shelf_controller.mm

Issue 16018005: Use DownloadItem::GetState() in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Stopping complete_animation_ when download is cancelled Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/download/download_shelf_controller.mm
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm
index 41566daaad7f666e3a2584d6fafd00f8caf5c849..e0b8eaea5ab6c22682b2d8dee1e7813e7be9f7f2 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm
+++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm
@@ -239,7 +239,8 @@ const NSSize kHoverCloseButtonDefaultSize = { 18, 18 };
if (!show) {
int numInProgress = 0;
for (NSUInteger i = 0; i < [downloadItemControllers_ count]; ++i) {
- if ([[downloadItemControllers_ objectAtIndex:i]download]->IsInProgress())
+ DownloadItem* item = [[downloadItemControllers_ objectAtIndex:i]download];
+ if (item->GetState() == DownloadItem::IN_PROGRESS)
++numInProgress;
}
download_util::RecordShelfClose(
@@ -371,9 +372,10 @@ const NSSize kHoverCloseButtonDefaultSize = { 18, 18 };
DownloadItemController* itemController =
[downloadItemControllers_ objectAtIndex:i];
DownloadItem* download = [itemController download];
- bool isTransferDone = download->IsComplete() ||
- download->IsCancelled() ||
- download->IsInterrupted();
+ DownloadItem::DownloadState state = download->GetState();
+ bool isTransferDone = state == DownloadItem::COMPLETE ||
+ state == DownloadItem::CANCELLED ||
+ state == DownloadItem::INTERRUPTED;
if (isTransferDone && !download->IsDangerous()) {
[self removeDownload:itemController
isShelfClosing:YES];

Powered by Google App Engine
This is Rietveld 408576698