| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/download/save_package.h" | 5 #include "content/browser/download/save_package.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1350 | 1350 |
| 1351 void SavePackage::StopObservation() { | 1351 void SavePackage::StopObservation() { |
| 1352 DCHECK(download_); | 1352 DCHECK(download_); |
| 1353 DCHECK(download_manager_); | 1353 DCHECK(download_manager_); |
| 1354 | 1354 |
| 1355 download_->RemoveObserver(this); | 1355 download_->RemoveObserver(this); |
| 1356 download_ = NULL; | 1356 download_ = NULL; |
| 1357 download_manager_ = NULL; | 1357 download_manager_ = NULL; |
| 1358 } | 1358 } |
| 1359 | 1359 |
| 1360 void SavePackage::OnDownloadUpdated(DownloadItem* download) { | 1360 void SavePackage::OnDownloadDestructed(DownloadItem* download) { |
| 1361 DCHECK(download_); | 1361 StopObservation(); |
| 1362 DCHECK(download_ == download); | |
| 1363 DCHECK(download_manager_); | |
| 1364 | |
| 1365 // Check for removal. | |
| 1366 if (download_->GetState() == DownloadItem::REMOVING) { | |
| 1367 StopObservation(); | |
| 1368 } | |
| 1369 } | 1362 } |
| 1370 | 1363 |
| 1371 void SavePackage::FinalizeDownloadEntry() { | 1364 void SavePackage::FinalizeDownloadEntry() { |
| 1372 DCHECK(download_); | 1365 DCHECK(download_); |
| 1373 DCHECK(download_manager_); | 1366 DCHECK(download_manager_); |
| 1374 | 1367 |
| 1375 download_manager_->SavePageDownloadFinished(download_); | 1368 download_manager_->SavePageDownloadFinished(download_); |
| 1376 StopObservation(); | 1369 StopObservation(); |
| 1377 } | 1370 } |
| OLD | NEW |