| 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/ui/cocoa/download/download_item_mac.h" | 5 #include "chrome/browser/ui/cocoa/download/download_item_mac.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/download/download_item_model.h" | 9 #include "chrome/browser/download/download_item_model.h" |
| 10 #import "chrome/browser/ui/cocoa/download/download_item_controller.h" | 10 #import "chrome/browser/ui/cocoa/download/download_item_controller.h" |
| 11 #include "chrome/browser/ui/cocoa/download/download_util_mac.h" | |
| 12 #include "content/public/browser/download_item.h" | 11 #include "content/public/browser/download_item.h" |
| 13 #include "ui/gfx/image/image.h" | 12 #include "ui/gfx/image/image.h" |
| 14 | 13 |
| 15 using content::DownloadItem; | 14 using content::DownloadItem; |
| 16 | 15 |
| 17 // DownloadItemMac ------------------------------------------------------------- | 16 // DownloadItemMac ------------------------------------------------------------- |
| 18 | 17 |
| 19 DownloadItemMac::DownloadItemMac(BaseDownloadItemModel* download_model, | 18 DownloadItemMac::DownloadItemMac(BaseDownloadItemModel* download_model, |
| 20 DownloadItemController* controller) | 19 DownloadItemController* controller) |
| 21 : download_model_(download_model), item_controller_(controller) { | 20 : download_model_(download_model), item_controller_(controller) { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 44 | 43 |
| 45 [item_controller_ updateToolTip]; | 44 [item_controller_ updateToolTip]; |
| 46 } | 45 } |
| 47 | 46 |
| 48 switch (download->GetState()) { | 47 switch (download->GetState()) { |
| 49 case DownloadItem::COMPLETE: | 48 case DownloadItem::COMPLETE: |
| 50 if (download->GetAutoOpened()) { | 49 if (download->GetAutoOpened()) { |
| 51 [item_controller_ remove]; // We're deleted now! | 50 [item_controller_ remove]; // We're deleted now! |
| 52 return; | 51 return; |
| 53 } | 52 } |
| 54 download_util::NotifySystemOfDownloadComplete(download->GetFullPath()); | |
| 55 // fall through | 53 // fall through |
| 56 case DownloadItem::IN_PROGRESS: | 54 case DownloadItem::IN_PROGRESS: |
| 57 case DownloadItem::CANCELLED: | 55 case DownloadItem::CANCELLED: |
| 58 [item_controller_ setStateFromDownload:download_model_.get()]; | 56 [item_controller_ setStateFromDownload:download_model_.get()]; |
| 59 break; | 57 break; |
| 60 case DownloadItem::INTERRUPTED: | 58 case DownloadItem::INTERRUPTED: |
| 61 [item_controller_ updateToolTip]; | 59 [item_controller_ updateToolTip]; |
| 62 [item_controller_ setStateFromDownload:download_model_.get()]; | 60 [item_controller_ setStateFromDownload:download_model_.get()]; |
| 63 break; | 61 break; |
| 64 default: | 62 default: |
| (...skipping 30 matching lines...) Expand all Loading... |
| 95 base::Bind(&DownloadItemMac::OnExtractIconComplete, | 93 base::Bind(&DownloadItemMac::OnExtractIconComplete, |
| 96 base::Unretained(this))); | 94 base::Unretained(this))); |
| 97 } | 95 } |
| 98 | 96 |
| 99 void DownloadItemMac::OnExtractIconComplete(IconManager::Handle handle, | 97 void DownloadItemMac::OnExtractIconComplete(IconManager::Handle handle, |
| 100 gfx::Image* icon) { | 98 gfx::Image* icon) { |
| 101 if (!icon) | 99 if (!icon) |
| 102 return; | 100 return; |
| 103 [item_controller_ setIcon:*icon]; | 101 [item_controller_ setIcon:*icon]; |
| 104 } | 102 } |
| OLD | NEW |