diff options
author | dhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 15:45:06 +0000 |
---|---|---|
committer | dhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 15:45:06 +0000 |
commit | f7e9fd67522e66bc9cf3aab6e17a77d35e2b22e2 (patch) | |
tree | 102a453a7aa77fa9fc3efd208828b24d57c6ade8 /chrome/browser/download | |
parent | 951fac0d12e92b74a94d1ddcce9f217aab34175c (diff) | |
download | chromium_src-f7e9fd67522e66bc9cf3aab6e17a77d35e2b22e2.zip chromium_src-f7e9fd67522e66bc9cf3aab6e17a77d35e2b22e2.tar.gz chromium_src-f7e9fd67522e66bc9cf3aab6e17a77d35e2b22e2.tar.bz2 |
Fixing downloading when off the record.
BUG=chromium-os:6974
TEST=download off the record
Review URL: http://codereview.chromium.org/3441035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r-- | chrome/browser/download/download_manager.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 155df46..88743f0 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -175,6 +175,13 @@ void DownloadManager::GetCurrentDownloads( (dir_path.empty() || it->second->full_path().DirName() == dir_path)) result->push_back(it->second); } + + // If we have a parent profile, let it add its downloads to the results. + Profile* original_profile = profile_->GetOriginalProfile(); + if (original_profile != profile_) + original_profile->GetDownloadManager()->GetCurrentDownloads(dir_path, + result); + } void DownloadManager::SearchDownloads(const string16& query, |