summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/download_util.cc
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-06 13:06:13 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-06 13:06:13 +0000
commitaa08a18bba6c8ae6a89f21eb9b86685cc9f268e2 (patch)
tree208d53ea5873407902145c38ae33ec5cd80eb633 /chrome/browser/download/download_util.cc
parentdbbe44200d22ef5f7de4c36062f70534416b0da8 (diff)
downloadchromium_src-aa08a18bba6c8ae6a89f21eb9b86685cc9f268e2.zip
chromium_src-aa08a18bba6c8ae6a89f21eb9b86685cc9f268e2.tar.gz
chromium_src-aa08a18bba6c8ae6a89f21eb9b86685cc9f268e2.tar.bz2
Revert 149794 - DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING
Reviewers: Ben Goodger: chrome/browser/ui/views/download/download_item_view.*, chrome/browser/plugin_installer.*, chrome/browser/automation/automation_provider.cc rdsmith, asanka: all Nico (thakis): chrome/browser/ui/cocoa/download/download_item_mac.* Achuith: chrome/browser/chromeos/gdata/gdata_download_observer.* Evan (estade): chrome/browser/ui/gtk/download/download_item_gtk.*, chrome/browser/ui/webui/downloads_dom_handler.* Scott (sky): chrome/browser/history/history_unittest.cc Aaron (aa): chrome/browser/extensions/webstore_installer.* Add DownloadItem::Observer::OnDownloadRemoved() to signal when a download is being removed from history. Make chrome.downloads.onErased trigger from DownloadItem::Observer::OnDownloadRemoved() so that extensions don't think that all downloads are being erased just because the browser is closing. Review URL: https://chromiumcodereview.appspot.com/10704026 BUG=140687 TBR=benjhayden@chromium.org Review URL: https://chromiumcodereview.appspot.com/10831177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_util.cc')
-rw-r--r--chrome/browser/download/download_util.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index b5a6a2e..10f2045 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -506,6 +506,8 @@ DictionaryValue* CreateDownloadItemValue(DownloadItem* download, int id) {
file_value->SetString("state", "DANGEROUS");
else
file_value->SetString("state", "COMPLETE");
+ } else if (download->GetState() == DownloadItem::REMOVING) {
+ file_value->SetString("state", "REMOVING");
} else {
NOTREACHED() << "state undefined";
}