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

Unified Diff: content/browser/download/download_manager_impl.cc

Issue 11941015: Move OpenItem/ShowItemInFolder from ContentBrowserClient to DownloadManagerDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ Created 7 years, 11 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
Index: content/browser/download/download_manager_impl.cc
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
index 4b40c27b59bbf70bbfb7e079b5562299835b0261..35b43cf24901c445edc5d84456f0918408e4c8b7 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc
@@ -223,7 +223,8 @@ DownloadManagerImpl::DownloadManagerImpl(
shutdown_needed_(false),
browser_context_(NULL),
delegate_(NULL),
- net_log_(net_log) {
+ net_log_(net_log),
+ open_enabled_(true) {
}
DownloadManagerImpl::~DownloadManagerImpl() {
@@ -659,7 +660,11 @@ void DownloadManagerImpl::GetAllDownloads(DownloadVector* downloads) {
}
}
-void DownloadManagerImpl::DownloadOpened(DownloadItemImpl* download) {
+void DownloadManagerImpl::MockDownloadOpenForTesting() {
+ open_enabled_ = false;
+}
+
+void DownloadManagerImpl::OpenDownload(DownloadItemImpl* download) {
int num_unopened = 0;
for (DownloadMap::iterator it = downloads_.begin();
it != downloads_.end(); ++it) {
@@ -669,6 +674,14 @@ void DownloadManagerImpl::DownloadOpened(DownloadItemImpl* download) {
++num_unopened;
}
RecordOpensOutstanding(num_unopened);
+
+ if (delegate_ && open_enabled_) // Some tests disable OpenDownload().
+ delegate_->OpenDownload(download);
+}
+
+void DownloadManagerImpl::ShowDownloadInShell(DownloadItemImpl* download) {
+ if (delegate_)
+ delegate_->ShowDownloadInShell(download);
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698