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

Unified Diff: chrome/browser/plugin_installer.cc

Issue 10837125: Revert 149794 - DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1228/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « chrome/browser/plugin_installer.h ('k') | chrome/browser/ui/cocoa/download/download_item_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugin_installer.cc
===================================================================
--- chrome/browser/plugin_installer.cc (revision 150095)
+++ chrome/browser/plugin_installer.cc (working copy)
@@ -150,6 +150,11 @@
DownloadCancelled();
break;
}
+ case DownloadItem::REMOVING: {
+ DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
+ state_ = INSTALLER_STATE_IDLE;
+ break;
+ }
case DownloadItem::INTERRUPTED: {
content::DownloadInterruptReason reason = download->GetLastReason();
DownloadError(content::InterruptReasonDebugString(reason));
@@ -163,10 +168,7 @@
download->RemoveObserver(this);
}
-void PluginInstaller::OnDownloadDestroyed(DownloadItem* download) {
- DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
- state_ = INSTALLER_STATE_IDLE;
- download->RemoveObserver(this);
+void PluginInstaller::OnDownloadOpened(DownloadItem* download) {
}
void PluginInstaller::AddObserver(PluginInstallerObserver* observer) {
« no previous file with comments | « chrome/browser/plugin_installer.h ('k') | chrome/browser/ui/cocoa/download/download_item_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698