Download code cleanup:

chrome/browser/download/download_shelf.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_shelf.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/dom_ui/downloads_ui.h"
@@ skipping 11 matching lines @@
     BaseDownloadItemModel* download_model)
     : download_(download_model->download()),
       model_(download_model) {
 }
 
 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;
 }
 
 string16 DownloadShelfContextMenu::GetLabelForCommandId(int command_id) const {
   switch (command_id) {
     case SHOW_IN_FOLDER:
       return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_SHOW);
     case OPEN_WHEN_COMPLETE:
       if (download_->state() == DownloadItem::IN_PROGRESS)
@@ skipping 14 matching lines @@
   }
   return string16();
 }
 
 bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case SHOW_IN_FOLDER:
     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:
       return download_->state() == DownloadItem::IN_PROGRESS;
     default:
       return command_id > 0 && command_id < MENU_LAST;
   }
 }
 
 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:
       model_->CancelTask();
       break;
     case TOGGLE_PAUSE:
       // It is possible for the download to complete before the user clicks the
       // menu item, recheck if the download is in progress state before toggling
       // pause.
       if (download_->state() == DownloadItem::IN_PROGRESS)
@@ skipping 48 matching lines @@
       ALWAYS_OPEN_TYPE, IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE);
   finished_download_menu_model_->AddSeparator();
   finished_download_menu_model_->AddItemWithStringId(
       SHOW_IN_FOLDER, IDS_DOWNLOAD_MENU_SHOW);
   finished_download_menu_model_->AddSeparator();
   finished_download_menu_model_->AddItemWithStringId(
       CANCEL, IDS_DOWNLOAD_MENU_CANCEL);
 
   return finished_download_menu_model_.get();
 }