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

Unified Diff: chrome/browser/download/download_shelf.cc

Issue 3029025: Download code cleanup: (Closed)
Patch Set: rebase'n'final Created 10 years, 5 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
« no previous file with comments | « chrome/browser/download/download_manager.cc ('k') | chrome/browser/download/download_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_shelf.cc
diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc
index fa6ab09f330b843472799fc83d5bb5b5f05c31a8..dc69d02c4f029000180e3a49fea680e723f76f25 100644
--- a/chrome/browser/download/download_shelf.cc
+++ b/chrome/browser/download/download_shelf.cc
@@ -29,13 +29,10 @@ DownloadShelfContextMenu::~DownloadShelfContextMenu() {
bool DownloadShelfContextMenu::IsCommandIdChecked(int command_id) const {
switch (command_id) {
- case OPEN_WHEN_COMPLETE: {
+ case OPEN_WHEN_COMPLETE:
return download_->open_when_complete();
- }
- case ALWAYS_OPEN_TYPE: {
- return download_->manager()->ShouldOpenFileBasedOnExtension(
- download_->full_path());
- }
+ case ALWAYS_OPEN_TYPE:
+ return download_->ShouldOpenFileBasedOnExtension();
}
return false;
}
@@ -70,7 +67,7 @@ bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const {
case OPEN_WHEN_COMPLETE:
return download_->state() != DownloadItem::CANCELLED;
case ALWAYS_OPEN_TYPE:
- return download_util::CanOpenDownload(download_);
+ return download_->CanOpenDownload();
case CANCEL:
return download_->state() == DownloadItem::IN_PROGRESS;
case TOGGLE_PAUSE:
@@ -83,14 +80,14 @@ bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const {
void DownloadShelfContextMenu::ExecuteCommand(int command_id) {
switch (command_id) {
case SHOW_IN_FOLDER:
- download_->manager()->ShowDownloadInShell(download_);
+ download_->ShowDownloadInShell();
break;
case OPEN_WHEN_COMPLETE:
- download_util::OpenDownload(download_);
+ download_->OpenDownload();
break;
case ALWAYS_OPEN_TYPE: {
- download_->manager()->OpenFilesBasedOnExtension(
- download_->full_path(), !IsCommandIdChecked(ALWAYS_OPEN_TYPE));
+ download_->OpenFilesBasedOnExtension(
+ !IsCommandIdChecked(ALWAYS_OPEN_TYPE));
break;
}
case CANCEL:
« no previous file with comments | « chrome/browser/download/download_manager.cc ('k') | chrome/browser/download/download_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698