Download code cleanup:

- make the code more object-oriented, make the object expose less accessors
- make some parts of code look more obvious, use existing helpers
- make the public interfaces slightly better (less ctor parameters)
- make some names slightly better

TEST=unit_tests, browser_tests, ui_tests
BUG=48913

Review URL: http://codereview.chromium.org/3029025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53808 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 6 deletions

diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 348c86d..bc5f0c5 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -433,7 +433,7 @@ void DownloadItemView::ButtonPressed(
     UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download",
                              base::Time::Now() - creation_time_);
     // This will change the state and notify us.
-    download_->manager()->DangerousDownloadValidated(download_);
+    download_->DangerousDownloadValidated();
   }
 }
 
@@ -907,11 +907,7 @@ void DownloadItemView::OpenDownload() {
   // open downloads super quickly, we should be concerned about clickjacking.
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
                            base::Time::Now() - creation_time_);
-  if (download_->state() == DownloadItem::IN_PROGRESS) {
-    download_->set_open_when_complete(!download_->open_when_complete());
-  } else if (download_->state() == DownloadItem::COMPLETE) {
-    download_util::OpenDownload(download_);
-  }
+  download_->OpenDownload();
 }
 
 void DownloadItemView::OnExtractIconComplete(IconManager::Handle handle,