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

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

Issue 8503018: Split DownloadItem into an ABC, an Impl, and a Mock. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: merge Created 9 years, 1 month 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_item_controller.mm
diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm
index 90a297e74ee58819dea93d2549d16ee2d329770d..9b11222ff124678e78764e4b01322da6805beb5f 100644
--- a/chrome/browser/ui/cocoa/download/download_item_controller.mm
+++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm
@@ -163,7 +163,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
DCHECK_EQ(bridge_->download_model(), downloadModel);
// Handle dangerous downloads.
- if (downloadModel->download()->safety_state() == DownloadItem::DANGEROUS) {
+ if (downloadModel->download()->GetSafetyState() == DownloadItem::DANGEROUS) {
[self setState:kDangerous];
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -196,7 +196,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
// This basic fixup copies Windows DownloadItemView::DownloadItemView().
// Extract the file extension (if any).
- FilePath filename(downloadModel->download()->target_name());
+ FilePath filename(downloadModel->download()->GetTargetName());
FilePath::StringType extension = filename.Extension();
// Remove leading '.' from the extension
@@ -237,7 +237,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
// Set correct popup menu. Also, set draggable download on completion.
if (downloadModel->download()->IsComplete()) {
[progressView_ setMenu:completeDownloadMenu_];
- [progressView_ setDownload:downloadModel->download()->full_path()];
+ [progressView_ setDownload:downloadModel->download()->GetFullPath()];
} else {
[progressView_ setMenu:activeDownloadMenu_];
}
« no previous file with comments | « chrome/browser/ui/cocoa/download/download_item_cell.mm ('k') | chrome/browser/ui/cocoa/download/download_item_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698