| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/download_item.h" | 5 #include "content/browser/download/download_item.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
| 10 #include "base/i18n/case_conversion.h" | 10 #include "base/i18n/case_conversion.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 const int kUpdateTimeMs = 1000; | 51 const int kUpdateTimeMs = 1000; |
| 52 | 52 |
| 53 static void DeleteDownloadedFile(const FilePath& path) { | 53 static void DeleteDownloadedFile(const FilePath& path) { |
| 54 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); | 54 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
| 55 | 55 |
| 56 // Make sure we only delete files. | 56 // Make sure we only delete files. |
| 57 if (!file_util::DirectoryExists(path)) | 57 if (!file_util::DirectoryExists(path)) |
| 58 file_util::Delete(path, false); | 58 file_util::Delete(path, false); |
| 59 } | 59 } |
| 60 | 60 |
| 61 const char* DebugSafetyStateString(DownloadItem::SafetyState state) { | 61 const char* DebugSafetyStateString(DownloadItemInterface::SafetyState state) { |
| 62 switch (state) { | 62 switch (state) { |
| 63 case DownloadItem::SAFE: | 63 case DownloadItemInterface::SAFE: |
| 64 return "SAFE"; | 64 return "SAFE"; |
| 65 case DownloadItem::DANGEROUS: | 65 case DownloadItemInterface::DANGEROUS: |
| 66 return "DANGEROUS"; | 66 return "DANGEROUS"; |
| 67 case DownloadItem::DANGEROUS_BUT_VALIDATED: | 67 case DownloadItemInterface::DANGEROUS_BUT_VALIDATED: |
| 68 return "DANGEROUS_BUT_VALIDATED"; | 68 return "DANGEROUS_BUT_VALIDATED"; |
| 69 default: | 69 default: |
| 70 NOTREACHED() << "Unknown safety state " << state; | 70 NOTREACHED() << "Unknown safety state " << state; |
| 71 return "unknown"; | 71 return "unknown"; |
| 72 }; | 72 }; |
| 73 } | 73 } |
| 74 | 74 |
| 75 const char* DebugDownloadStateString(DownloadItem::DownloadState state) { | 75 const char* DebugDownloadStateString( |
| 76 DownloadItemInterface::DownloadState state) { |
| 76 switch (state) { | 77 switch (state) { |
| 77 case DownloadItem::IN_PROGRESS: | 78 case DownloadItemInterface::IN_PROGRESS: |
| 78 return "IN_PROGRESS"; | 79 return "IN_PROGRESS"; |
| 79 case DownloadItem::COMPLETE: | 80 case DownloadItemInterface::COMPLETE: |
| 80 return "COMPLETE"; | 81 return "COMPLETE"; |
| 81 case DownloadItem::CANCELLED: | 82 case DownloadItemInterface::CANCELLED: |
| 82 return "CANCELLED"; | 83 return "CANCELLED"; |
| 83 case DownloadItem::REMOVING: | 84 case DownloadItemInterface::REMOVING: |
| 84 return "REMOVING"; | 85 return "REMOVING"; |
| 85 case DownloadItem::INTERRUPTED: | 86 case DownloadItemInterface::INTERRUPTED: |
| 86 return "INTERRUPTED"; | 87 return "INTERRUPTED"; |
| 87 default: | 88 default: |
| 88 NOTREACHED() << "Unknown download state " << state; | 89 NOTREACHED() << "Unknown download state " << state; |
| 89 return "unknown"; | 90 return "unknown"; |
| 90 }; | 91 }; |
| 91 } | 92 } |
| 92 | 93 |
| 93 DownloadItem::SafetyState GetSafetyState(bool dangerous_file, | 94 DownloadItemInterface::SafetyState GetSafetyState(bool dangerous_file, |
| 94 bool dangerous_url) { | 95 bool dangerous_url) { |
| 95 return (dangerous_url || dangerous_file) ? | 96 return (dangerous_url || dangerous_file) ? |
| 96 DownloadItem::DANGEROUS : DownloadItem::SAFE; | 97 DownloadItemInterface::DANGEROUS : DownloadItemInterface::SAFE; |
| 97 } | 98 } |
| 98 | 99 |
| 99 // Note: When a download has both |dangerous_file| and |dangerous_url| set, | 100 // Note: When a download has both |dangerous_file| and |dangerous_url| set, |
| 100 // danger type is set to DANGEROUS_URL since the risk of dangerous URL | 101 // danger type is set to DANGEROUS_URL since the risk of dangerous URL |
| 101 // overweights that of dangerous file type. | 102 // overweights that of dangerous file type. |
| 102 DownloadItem::DangerType GetDangerType(bool dangerous_file, | 103 DownloadItemInterface::DangerType GetDangerType(bool dangerous_file, |
| 103 bool dangerous_url) { | 104 bool dangerous_url) { |
| 104 if (dangerous_url) { | 105 if (dangerous_url) { |
| 105 // dangerous URL overweights dangerous file. We check dangerous URL first. | 106 // dangerous URL overweights dangerous file. We check dangerous URL first. |
| 106 return DownloadItem::DANGEROUS_URL; | 107 return DownloadItemInterface::DANGEROUS_URL; |
| 107 } | 108 } |
| 108 return dangerous_file ? | 109 return dangerous_file ? DownloadItemInterface::DANGEROUS_FILE |
| 109 DownloadItem::DANGEROUS_FILE : DownloadItem::NOT_DANGEROUS; | 110 : DownloadItemInterface::NOT_DANGEROUS; |
| 110 } | 111 } |
| 111 | 112 |
| 112 } // namespace | 113 } // namespace |
| 113 | 114 |
| 114 // Our download table ID starts at 1, so we use 0 to represent a download that | 115 // Our download table ID starts at 1, so we use 0 to represent a download that |
| 115 // has started, but has not yet had its data persisted in the table. We use fake | 116 // has started, but has not yet had its data persisted in the table. We use fake |
| 116 // database handles in incognito mode starting at -1 and progressively getting | 117 // database handles in incognito mode starting at -1 and progressively getting |
| 117 // more negative. | 118 // more negative. |
| 118 // static | 119 // static |
| 119 const int DownloadItem::kUninitializedHandle = 0; | 120 const int DownloadItem::kUninitializedHandle = 0; |
| 120 | 121 |
| 121 // Constructor for reading from the history service. | 122 // Constructor for reading from the history service. |
| 122 DownloadItem::DownloadItem(DownloadManager* download_manager, | 123 DownloadItem::DownloadItem(DownloadManager* download_manager, |
| 123 const DownloadPersistentStoreInfo& info) | 124 const DownloadPersistentStoreInfo& info, |
| 124 : download_id_(-1), | 125 int id) |
| 126 : download_id_(id), |
| 125 full_path_(info.path), | 127 full_path_(info.path), |
| 126 url_chain_(1, info.url), | 128 url_chain_(1, info.url), |
| 127 referrer_url_(info.referrer_url), | 129 referrer_url_(info.referrer_url), |
| 128 total_bytes_(info.total_bytes), | 130 total_bytes_(info.total_bytes), |
| 129 received_bytes_(info.received_bytes), | 131 received_bytes_(info.received_bytes), |
| 130 start_tick_(base::TimeTicks()), | 132 start_tick_(base::TimeTicks()), |
| 131 state_(static_cast<DownloadState>(info.state)), | 133 state_(static_cast<DownloadItemInterface::DownloadState>(info.state)), |
| 132 start_time_(info.start_time), | 134 start_time_(info.start_time), |
| 133 end_time_(info.end_time), | 135 end_time_(info.end_time), |
| 134 db_handle_(info.db_handle), | 136 db_handle_(info.db_handle), |
| 135 download_manager_(download_manager), | 137 download_manager_(download_manager), |
| 136 is_paused_(false), | 138 is_paused_(false), |
| 137 open_when_complete_(false), | 139 open_when_complete_(false), |
| 138 file_externally_removed_(false), | 140 file_externally_removed_(false), |
| 139 safety_state_(SAFE), | 141 safety_state_(DownloadItemInterface::SAFE), |
| 140 auto_opened_(false), | 142 auto_opened_(false), |
| 141 is_otr_(false), | 143 is_otr_(false), |
| 142 is_temporary_(false), | 144 is_temporary_(false), |
| 143 all_data_saved_(false), | 145 all_data_saved_(false), |
| 144 opened_(info.opened), | 146 opened_(info.opened), |
| 145 open_enabled_(true), | 147 open_enabled_(true), |
| 146 delegate_delayed_complete_(false) { | 148 delegate_delayed_complete_(false) { |
| 147 if (IsInProgress()) | 149 if (IsInProgress()) |
| 148 state_ = CANCELLED; | 150 state_ = DownloadItemInterface::CANCELLED; |
| 149 if (IsComplete()) | 151 if (IsComplete()) |
| 150 all_data_saved_ = true; | 152 all_data_saved_ = true; |
| 151 Init(false /* not actively downloading */); | 153 Init(false /* not actively downloading */); |
| 152 } | 154 } |
| 153 | 155 |
| 154 // Constructing for a regular download: | 156 // Constructing for a regular download: |
| 155 DownloadItem::DownloadItem(DownloadManager* download_manager, | 157 DownloadItem::DownloadItem(DownloadManager* download_manager, |
| 156 const DownloadCreateInfo& info, | 158 const DownloadCreateInfo& info, |
| 157 bool is_otr) | 159 bool is_otr) |
| 158 : state_info_(info.original_name, info.save_info.file_path, | 160 : state_info_(info.original_name, info.save_info.file_path, |
| 159 info.has_user_gesture, info.transition_type, | 161 info.has_user_gesture, info.transition_type, |
| 160 info.prompt_user_for_save_location, info.path_uniquifier, | 162 info.prompt_user_for_save_location, info.path_uniquifier, |
| 161 false, false), | 163 false, false), |
| 162 request_handle_(info.request_handle), | 164 request_handle_(info.request_handle), |
| 163 download_id_(info.download_id), | 165 download_id_(info.download_id), |
| 164 full_path_(info.path), | 166 full_path_(info.path), |
| 165 url_chain_(info.url_chain), | 167 url_chain_(info.url_chain), |
| 166 referrer_url_(info.referrer_url), | 168 referrer_url_(info.referrer_url), |
| 167 suggested_filename_(UTF16ToUTF8(info.save_info.suggested_name)), | 169 suggested_filename_(UTF16ToUTF8(info.save_info.suggested_name)), |
| 168 content_disposition_(info.content_disposition), | 170 content_disposition_(info.content_disposition), |
| 169 mime_type_(info.mime_type), | 171 mime_type_(info.mime_type), |
| 170 original_mime_type_(info.original_mime_type), | 172 original_mime_type_(info.original_mime_type), |
| 171 referrer_charset_(info.referrer_charset), | 173 referrer_charset_(info.referrer_charset), |
| 172 total_bytes_(info.total_bytes), | 174 total_bytes_(info.total_bytes), |
| 173 received_bytes_(0), | 175 received_bytes_(0), |
| 174 last_reason_(DOWNLOAD_INTERRUPT_REASON_NONE), | 176 last_reason_(DOWNLOAD_INTERRUPT_REASON_NONE), |
| 175 start_tick_(base::TimeTicks::Now()), | 177 start_tick_(base::TimeTicks::Now()), |
| 176 state_(IN_PROGRESS), | 178 state_(DownloadItemInterface::IN_PROGRESS), |
| 177 start_time_(info.start_time), | 179 start_time_(info.start_time), |
| 178 db_handle_(DownloadItem::kUninitializedHandle), | 180 db_handle_(DownloadItem::kUninitializedHandle), |
| 179 download_manager_(download_manager), | 181 download_manager_(download_manager), |
| 180 is_paused_(false), | 182 is_paused_(false), |
| 181 open_when_complete_(false), | 183 open_when_complete_(false), |
| 182 file_externally_removed_(false), | 184 file_externally_removed_(false), |
| 183 safety_state_(SAFE), | 185 safety_state_(DownloadItemInterface::SAFE), |
| 184 auto_opened_(false), | 186 auto_opened_(false), |
| 185 is_otr_(is_otr), | 187 is_otr_(is_otr), |
| 186 is_temporary_(!info.save_info.file_path.empty()), | 188 is_temporary_(!info.save_info.file_path.empty()), |
| 187 all_data_saved_(false), | 189 all_data_saved_(false), |
| 188 opened_(false), | 190 opened_(false), |
| 189 open_enabled_(true), | 191 open_enabled_(true), |
| 190 delegate_delayed_complete_(false) { | 192 delegate_delayed_complete_(false) { |
| 191 Init(true /* actively downloading */); | 193 Init(true /* actively downloading */); |
| 192 } | 194 } |
| 193 | 195 |
| 194 // Constructing for the "Save Page As..." feature: | 196 // Constructing for the "Save Page As..." feature: |
| 195 DownloadItem::DownloadItem(DownloadManager* download_manager, | 197 DownloadItem::DownloadItem(DownloadManager* download_manager, |
| 196 const FilePath& path, | 198 const FilePath& path, |
| 197 const GURL& url, | 199 const GURL& url, |
| 198 bool is_otr, | 200 bool is_otr, |
| 199 DownloadId download_id) | 201 DownloadId download_id) |
| 200 : download_id_(download_id.local()), | 202 : download_id_(download_id.local()), |
| 201 full_path_(path), | 203 full_path_(path), |
| 202 url_chain_(1, url), | 204 url_chain_(1, url), |
| 203 referrer_url_(GURL()), | 205 referrer_url_(GURL()), |
| 204 total_bytes_(0), | 206 total_bytes_(0), |
| 205 received_bytes_(0), | 207 received_bytes_(0), |
| 206 last_reason_(DOWNLOAD_INTERRUPT_REASON_NONE), | 208 last_reason_(DOWNLOAD_INTERRUPT_REASON_NONE), |
| 207 start_tick_(base::TimeTicks::Now()), | 209 start_tick_(base::TimeTicks::Now()), |
| 208 state_(IN_PROGRESS), | 210 state_(DownloadItemInterface::IN_PROGRESS), |
| 209 start_time_(base::Time::Now()), | 211 start_time_(base::Time::Now()), |
| 210 db_handle_(DownloadItem::kUninitializedHandle), | 212 db_handle_(DownloadItem::kUninitializedHandle), |
| 211 download_manager_(download_manager), | 213 download_manager_(download_manager), |
| 212 is_paused_(false), | 214 is_paused_(false), |
| 213 open_when_complete_(false), | 215 open_when_complete_(false), |
| 214 file_externally_removed_(false), | 216 file_externally_removed_(false), |
| 215 safety_state_(SAFE), | 217 safety_state_(DownloadItemInterface::SAFE), |
| 216 auto_opened_(false), | 218 auto_opened_(false), |
| 217 is_otr_(is_otr), | 219 is_otr_(is_otr), |
| 218 is_temporary_(false), | 220 is_temporary_(false), |
| 219 all_data_saved_(false), | 221 all_data_saved_(false), |
| 220 opened_(false), | 222 opened_(false), |
| 221 open_enabled_(true), | 223 open_enabled_(true), |
| 222 delegate_delayed_complete_(false) { | 224 delegate_delayed_complete_(false) { |
| 223 Init(true /* actively downloading */); | 225 Init(true /* actively downloading */); |
| 224 } | 226 } |
| 225 | 227 |
| 226 DownloadItem::~DownloadItem() { | 228 DownloadItem::~DownloadItem() { |
| 227 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 229 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 228 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 230 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 229 | 231 |
| 230 TransitionTo(REMOVING); | 232 TransitionTo(DownloadItemInterface::REMOVING); |
| 231 download_manager_->AssertQueueStateConsistent(this); | 233 download_manager_->AssertQueueStateConsistent(this); |
| 232 } | 234 } |
| 233 | 235 |
| 234 DownloadId DownloadItem::global_id() const { | 236 DownloadId DownloadItem::global_id() const { |
| 235 return DownloadId(download_manager_, id()); | 237 return DownloadId(download_manager_, id()); |
| 236 } | 238 } |
| 237 | 239 |
| 238 void DownloadItem::AddObserver(Observer* observer) { | 240 void DownloadItem::AddObserver(Observer* observer) { |
| 239 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 241 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 240 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 242 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 | 304 |
| 303 void DownloadItem::ShowDownloadInShell() { | 305 void DownloadItem::ShowDownloadInShell() { |
| 304 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 306 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 305 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 307 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 306 | 308 |
| 307 content::GetContentClient()->browser()->ShowItemInFolder(full_path()); | 309 content::GetContentClient()->browser()->ShowItemInFolder(full_path()); |
| 308 } | 310 } |
| 309 | 311 |
| 310 void DownloadItem::DangerousDownloadValidated() { | 312 void DownloadItem::DangerousDownloadValidated() { |
| 311 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 313 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 312 DCHECK_EQ(DANGEROUS, safety_state()); | 314 DCHECK_EQ(DownloadItemInterface::DANGEROUS, safety_state()); |
| 313 | 315 |
| 314 UMA_HISTOGRAM_ENUMERATION("Download.DangerousDownloadValidated", | 316 UMA_HISTOGRAM_ENUMERATION("Download.DangerousDownloadValidated", |
| 315 GetDangerType(), | 317 GetDangerType(), |
| 316 DANGEROUS_TYPE_MAX); | 318 DownloadItemInterface::DANGEROUS_TYPE_MAX); |
| 317 | 319 |
| 318 safety_state_ = DANGEROUS_BUT_VALIDATED; | 320 safety_state_ = DownloadItemInterface::DANGEROUS_BUT_VALIDATED; |
| 319 UpdateObservers(); | 321 UpdateObservers(); |
| 320 | 322 |
| 321 download_manager_->MaybeCompleteDownload(this); | 323 download_manager_->MaybeCompleteDownload(this); |
| 322 } | 324 } |
| 323 | 325 |
| 324 void DownloadItem::UpdateSize(int64 bytes_so_far) { | 326 void DownloadItem::UpdateSize(int64 bytes_so_far) { |
| 325 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 327 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 326 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 328 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 327 | 329 |
| 328 received_bytes_ = bytes_so_far; | 330 received_bytes_ = bytes_so_far; |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 | 377 |
| 376 VLOG(20) << __FUNCTION__ << "() download = " << DebugString(true); | 378 VLOG(20) << __FUNCTION__ << "() download = " << DebugString(true); |
| 377 if (!IsPartialDownload()) { | 379 if (!IsPartialDownload()) { |
| 378 // Small downloads might be complete before this method has | 380 // Small downloads might be complete before this method has |
| 379 // a chance to run. | 381 // a chance to run. |
| 380 return; | 382 return; |
| 381 } | 383 } |
| 382 | 384 |
| 383 download_stats::RecordDownloadCount(download_stats::CANCELLED_COUNT); | 385 download_stats::RecordDownloadCount(download_stats::CANCELLED_COUNT); |
| 384 | 386 |
| 385 TransitionTo(CANCELLED); | 387 TransitionTo(DownloadItemInterface::CANCELLED); |
| 386 StopProgressTimer(); | 388 StopProgressTimer(); |
| 387 if (user_cancel) | 389 if (user_cancel) |
| 388 download_manager_->DownloadCancelledInternal(this); | 390 download_manager_->DownloadCancelledInternal(this); |
| 389 } | 391 } |
| 390 | 392 |
| 391 void DownloadItem::MarkAsComplete() { | 393 void DownloadItem::MarkAsComplete() { |
| 392 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 394 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 393 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 395 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 394 | 396 |
| 395 DCHECK(all_data_saved_); | 397 DCHECK(all_data_saved_); |
| 396 end_time_ = base::Time::Now(); | 398 end_time_ = base::Time::Now(); |
| 397 TransitionTo(COMPLETE); | 399 TransitionTo(DownloadItemInterface::COMPLETE); |
| 398 } | 400 } |
| 399 | 401 |
| 400 void DownloadItem::CompleteDelayedDownload() { | 402 void DownloadItem::CompleteDelayedDownload() { |
| 401 auto_opened_ = true; | 403 auto_opened_ = true; |
| 402 Completed(); | 404 Completed(); |
| 403 } | 405 } |
| 404 | 406 |
| 405 void DownloadItem::OnAllDataSaved(int64 size) { | 407 void DownloadItem::OnAllDataSaved(int64 size) { |
| 406 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 408 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 407 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 409 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 418 } | 420 } |
| 419 | 421 |
| 420 void DownloadItem::Completed() { | 422 void DownloadItem::Completed() { |
| 421 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 423 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 422 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 424 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 423 | 425 |
| 424 VLOG(20) << __FUNCTION__ << "() " << DebugString(false); | 426 VLOG(20) << __FUNCTION__ << "() " << DebugString(false); |
| 425 | 427 |
| 426 DCHECK(all_data_saved_); | 428 DCHECK(all_data_saved_); |
| 427 end_time_ = base::Time::Now(); | 429 end_time_ = base::Time::Now(); |
| 428 TransitionTo(COMPLETE); | 430 TransitionTo(DownloadItemInterface::COMPLETE); |
| 429 download_manager_->DownloadCompleted(id()); | 431 download_manager_->DownloadCompleted(id()); |
| 430 download_stats::RecordDownloadCompleted(start_tick_, received_bytes_); | 432 download_stats::RecordDownloadCompleted(start_tick_, received_bytes_); |
| 431 | 433 |
| 432 if (auto_opened_) { | 434 if (auto_opened_) { |
| 433 // If it was already handled by the delegate, do nothing. | 435 // If it was already handled by the delegate, do nothing. |
| 434 } else if (open_when_complete() || | 436 } else if (open_when_complete() || |
| 435 ShouldOpenFileBasedOnExtension() || | 437 ShouldOpenFileBasedOnExtension() || |
| 436 is_temporary()) { | 438 is_temporary()) { |
| 437 // If the download is temporary, like in drag-and-drop, do not open it but | 439 // If the download is temporary, like in drag-and-drop, do not open it but |
| 438 // we still need to set it auto-opened so that it can be removed from the | 440 // we still need to set it auto-opened so that it can be removed from the |
| 439 // download shelf. | 441 // download shelf. |
| 440 if (!is_temporary()) | 442 if (!is_temporary()) |
| 441 OpenDownload(); | 443 OpenDownload(); |
| 442 | 444 |
| 443 auto_opened_ = true; | 445 auto_opened_ = true; |
| 444 UpdateObservers(); | 446 UpdateObservers(); |
| 445 } | 447 } |
| 446 } | 448 } |
| 447 | 449 |
| 448 void DownloadItem::TransitionTo(DownloadState new_state) { | 450 void DownloadItem::TransitionTo( |
| 451 DownloadItemInterface::DownloadState new_state) { |
| 449 if (state_ == new_state) | 452 if (state_ == new_state) |
| 450 return; | 453 return; |
| 451 | 454 |
| 452 state_ = new_state; | 455 state_ = new_state; |
| 453 UpdateObservers(); | 456 UpdateObservers(); |
| 454 } | 457 } |
| 455 | 458 |
| 456 void DownloadItem::UpdateSafetyState() { | 459 void DownloadItem::UpdateSafetyState() { |
| 457 SafetyState updated_value( | 460 DownloadItemInterface::SafetyState updated_value( |
| 458 GetSafetyState(state_info_.is_dangerous_file, | 461 GetSafetyState(state_info_.is_dangerous_file, |
| 459 state_info_.is_dangerous_url)); | 462 state_info_.is_dangerous_url)); |
| 460 if (updated_value != safety_state_) { | 463 if (updated_value != safety_state_) { |
| 461 safety_state_ = updated_value; | 464 safety_state_ = updated_value; |
| 462 UpdateObservers(); | 465 UpdateObservers(); |
| 463 } | 466 } |
| 464 } | 467 } |
| 465 | 468 |
| 466 void DownloadItem::UpdateTarget() { | 469 void DownloadItem::UpdateTarget() { |
| 467 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 470 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 468 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 471 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 469 | 472 |
| 470 if (state_info_.target_name.value().empty()) | 473 if (state_info_.target_name.value().empty()) |
| 471 state_info_.target_name = full_path_.BaseName(); | 474 state_info_.target_name = full_path_.BaseName(); |
| 472 } | 475 } |
| 473 | 476 |
| 474 void DownloadItem::Interrupted(int64 size, InterruptReason reason) { | 477 void DownloadItem::Interrupted(int64 size, InterruptReason reason) { |
| 475 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 478 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 476 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 479 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 477 | 480 |
| 478 if (!IsInProgress()) | 481 if (!IsInProgress()) |
| 479 return; | 482 return; |
| 480 | 483 |
| 481 last_reason_ = reason; | 484 last_reason_ = reason; |
| 482 UpdateSize(size); | 485 UpdateSize(size); |
| 483 StopProgressTimer(); | 486 StopProgressTimer(); |
| 484 download_stats::RecordDownloadInterrupted(reason, | 487 download_stats::RecordDownloadInterrupted(reason, |
| 485 received_bytes_, | 488 received_bytes_, |
| 486 total_bytes_); | 489 total_bytes_); |
| 487 TransitionTo(INTERRUPTED); | 490 TransitionTo(DownloadItemInterface::INTERRUPTED); |
| 488 } | 491 } |
| 489 | 492 |
| 490 void DownloadItem::Delete(DeleteReason reason) { | 493 void DownloadItem::Delete(DeleteReason reason) { |
| 491 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 494 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 492 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 495 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 493 | 496 |
| 494 switch (reason) { | 497 switch (reason) { |
| 495 case DELETE_DUE_TO_USER_DISCARD: | 498 case DELETE_DUE_TO_USER_DISCARD: |
| 496 UMA_HISTOGRAM_ENUMERATION("Download.UserDiscard", GetDangerType(), | 499 UMA_HISTOGRAM_ENUMERATION("Download.UserDiscard", GetDangerType(), |
| 497 DANGEROUS_TYPE_MAX); | 500 DownloadItemInterface::DANGEROUS_TYPE_MAX); |
| 498 break; | 501 break; |
| 499 case DELETE_DUE_TO_BROWSER_SHUTDOWN: | 502 case DELETE_DUE_TO_BROWSER_SHUTDOWN: |
| 500 UMA_HISTOGRAM_ENUMERATION("Download.Discard", GetDangerType(), | 503 UMA_HISTOGRAM_ENUMERATION("Download.Discard", GetDangerType(), |
| 501 DANGEROUS_TYPE_MAX); | 504 DownloadItemInterface::DANGEROUS_TYPE_MAX); |
| 502 break; | 505 break; |
| 503 default: | 506 default: |
| 504 NOTREACHED(); | 507 NOTREACHED(); |
| 505 } | 508 } |
| 506 | 509 |
| 507 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, | 510 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| 508 NewRunnableFunction(&DeleteDownloadedFile, full_path_)); | 511 NewRunnableFunction(&DeleteDownloadedFile, full_path_)); |
| 509 Remove(); | 512 Remove(); |
| 510 // We have now been deleted. | 513 // We have now been deleted. |
| 511 } | 514 } |
| 512 | 515 |
| 513 void DownloadItem::Remove() { | 516 void DownloadItem::Remove() { |
| 514 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 517 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 515 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 518 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 516 | 519 |
| 517 download_manager_->AssertQueueStateConsistent(this); | 520 download_manager_->AssertQueueStateConsistent(this); |
| 518 Cancel(true); | 521 Cancel(true); |
| 519 download_manager_->AssertQueueStateConsistent(this); | 522 download_manager_->AssertQueueStateConsistent(this); |
| 520 | 523 |
| 521 TransitionTo(REMOVING); | 524 TransitionTo(DownloadItemInterface::REMOVING); |
| 522 download_manager_->RemoveDownload(db_handle_); | 525 download_manager_->RemoveDownload(db_handle_); |
| 523 // We have now been deleted. | 526 // We have now been deleted. |
| 524 } | 527 } |
| 525 | 528 |
| 526 bool DownloadItem::TimeRemaining(base::TimeDelta* remaining) const { | 529 bool DownloadItem::TimeRemaining(base::TimeDelta* remaining) const { |
| 527 if (total_bytes_ <= 0) | 530 if (total_bytes_ <= 0) |
| 528 return false; // We never received the content_length for this download. | 531 return false; // We never received the content_length for this download. |
| 529 | 532 |
| 530 int64 speed = CurrentSpeed(); | 533 int64 speed = CurrentSpeed(); |
| 531 if (speed == 0) | 534 if (speed == 0) |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 UpdateObservers(); | 585 UpdateObservers(); |
| 583 } | 586 } |
| 584 | 587 |
| 585 void DownloadItem::OnDownloadCompleting(DownloadFileManager* file_manager) { | 588 void DownloadItem::OnDownloadCompleting(DownloadFileManager* file_manager) { |
| 586 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 589 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 587 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 590 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 588 | 591 |
| 589 VLOG(20) << __FUNCTION__ << "()" | 592 VLOG(20) << __FUNCTION__ << "()" |
| 590 << " needs rename = " << NeedsRename() | 593 << " needs rename = " << NeedsRename() |
| 591 << " " << DebugString(true); | 594 << " " << DebugString(true); |
| 592 DCHECK_NE(DANGEROUS, safety_state()); | 595 DCHECK_NE(DownloadItemInterface::DANGEROUS, safety_state()); |
| 593 DCHECK(file_manager); | 596 DCHECK(file_manager); |
| 594 | 597 |
| 595 if (NeedsRename()) { | 598 if (NeedsRename()) { |
| 596 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, | 599 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| 597 NewRunnableMethod(file_manager, | 600 NewRunnableMethod(file_manager, |
| 598 &DownloadFileManager::RenameCompletingDownloadFile, global_id(), | 601 &DownloadFileManager::RenameCompletingDownloadFile, |
| 599 GetTargetFilePath(), safety_state() == SAFE)); | 602 global_id(), |
| 603 GetTargetFilePath(), |
| 604 safety_state() == DownloadItemInterface::SAFE)); |
| 600 return; | 605 return; |
| 601 } | 606 } |
| 602 | 607 |
| 603 Completed(); | 608 Completed(); |
| 604 | 609 |
| 605 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod( | 610 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod( |
| 606 file_manager, &DownloadFileManager::CompleteDownload, global_id())); | 611 file_manager, &DownloadFileManager::CompleteDownload, global_id())); |
| 607 } | 612 } |
| 608 | 613 |
| 609 void DownloadItem::OnDownloadRenamedToFinalName(const FilePath& full_path) { | 614 void DownloadItem::OnDownloadRenamedToFinalName(const FilePath& full_path) { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 656 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 661 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 657 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 662 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 658 | 663 |
| 659 VLOG(20) << " " << __FUNCTION__ << "()" << " this = " << DebugString(true); | 664 VLOG(20) << " " << __FUNCTION__ << "()" << " this = " << DebugString(true); |
| 660 state_info_ = state; | 665 state_info_ = state; |
| 661 VLOG(20) << " " << __FUNCTION__ << "()" << " this = " << DebugString(true); | 666 VLOG(20) << " " << __FUNCTION__ << "()" << " this = " << DebugString(true); |
| 662 | 667 |
| 663 UpdateSafetyState(); | 668 UpdateSafetyState(); |
| 664 } | 669 } |
| 665 | 670 |
| 666 DownloadItem::DangerType DownloadItem::GetDangerType() const { | 671 DownloadItemInterface::DangerType DownloadItem::GetDangerType() const { |
| 667 return ::GetDangerType(state_info_.is_dangerous_file, | 672 return ::GetDangerType(state_info_.is_dangerous_file, |
| 668 state_info_.is_dangerous_url); | 673 state_info_.is_dangerous_url); |
| 669 } | 674 } |
| 670 | 675 |
| 671 bool DownloadItem::IsDangerous() const { | 676 bool DownloadItem::IsDangerous() const { |
| 672 return GetDangerType() != DownloadItem::NOT_DANGEROUS; | 677 return GetDangerType() != DownloadItemInterface::NOT_DANGEROUS; |
| 673 } | 678 } |
| 674 | 679 |
| 675 void DownloadItem::MarkFileDangerous() { | 680 void DownloadItem::MarkFileDangerous() { |
| 676 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 681 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 677 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 682 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 678 | 683 |
| 679 state_info_.is_dangerous_file = true; | 684 state_info_.is_dangerous_file = true; |
| 680 UpdateSafetyState(); | 685 UpdateSafetyState(); |
| 681 } | 686 } |
| 682 | 687 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 708 FilePath DownloadItem::GetFileNameToReportUser() const { | 713 FilePath DownloadItem::GetFileNameToReportUser() const { |
| 709 if (state_info_.path_uniquifier > 0) { | 714 if (state_info_.path_uniquifier > 0) { |
| 710 FilePath name(state_info_.target_name); | 715 FilePath name(state_info_.target_name); |
| 711 DownloadFile::AppendNumberToPath(&name, state_info_.path_uniquifier); | 716 DownloadFile::AppendNumberToPath(&name, state_info_.path_uniquifier); |
| 712 return name; | 717 return name; |
| 713 } | 718 } |
| 714 return state_info_.target_name; | 719 return state_info_.target_name; |
| 715 } | 720 } |
| 716 | 721 |
| 717 FilePath DownloadItem::GetUserVerifiedFilePath() const { | 722 FilePath DownloadItem::GetUserVerifiedFilePath() const { |
| 718 return (safety_state_ == DownloadItem::SAFE) ? | 723 return (safety_state_ == DownloadItemInterface::SAFE) ? |
| 719 GetTargetFilePath() : full_path_; | 724 GetTargetFilePath() : full_path_; |
| 720 } | 725 } |
| 721 | 726 |
| 722 void DownloadItem::OffThreadCancel(DownloadFileManager* file_manager) { | 727 void DownloadItem::OffThreadCancel(DownloadFileManager* file_manager) { |
| 723 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 728 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 724 request_handle_.CancelRequest(); | 729 request_handle_.CancelRequest(); |
| 725 | 730 |
| 726 BrowserThread::PostTask( | 731 BrowserThread::PostTask( |
| 727 BrowserThread::FILE, FROM_HERE, | 732 BrowserThread::FILE, FROM_HERE, |
| 728 NewRunnableMethod( | 733 NewRunnableMethod( |
| 729 file_manager, &DownloadFileManager::CancelDownload, global_id())); | 734 file_manager, &DownloadFileManager::CancelDownload, global_id())); |
| 730 } | 735 } |
| 731 | 736 |
| 732 void DownloadItem::Init(bool active) { | 737 void DownloadItem::Init(bool active) { |
| 733 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. | 738 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
| 734 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 739 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 735 | 740 |
| 736 UpdateTarget(); | 741 UpdateTarget(); |
| 737 if (active) { | 742 if (active) { |
| 738 StartProgressTimer(); | 743 StartProgressTimer(); |
| 739 download_stats::RecordDownloadCount(download_stats::START_COUNT); | 744 download_stats::RecordDownloadCount(download_stats::START_COUNT); |
| 740 } | 745 } |
| 741 VLOG(20) << __FUNCTION__ << "() " << DebugString(true); | 746 VLOG(20) << __FUNCTION__ << "() " << DebugString(true); |
| 742 } | 747 } |
| 743 | 748 |
| 744 // TODO(ahendrickson) -- Move |INTERRUPTED| from |IsCancelled()| to | 749 // TODO(ahendrickson) -- Move |INTERRUPTED| from |IsCancelled()| to |
| 745 // |IsPartialDownload()|, when resuming interrupted downloads is implemented. | 750 // |IsPartialDownload()|, when resuming interrupted downloads is implemented. |
| 746 bool DownloadItem::IsPartialDownload() const { | 751 bool DownloadItem::IsPartialDownload() const { |
| 747 return (state_ == IN_PROGRESS); | 752 return (state_ == DownloadItemInterface::IN_PROGRESS); |
| 748 } | 753 } |
| 749 | 754 |
| 750 bool DownloadItem::IsInProgress() const { | 755 bool DownloadItem::IsInProgress() const { |
| 751 return (state_ == IN_PROGRESS); | 756 return (state_ == DownloadItemInterface::IN_PROGRESS); |
| 752 } | 757 } |
| 753 | 758 |
| 754 bool DownloadItem::IsCancelled() const { | 759 bool DownloadItem::IsCancelled() const { |
| 755 return (state_ == CANCELLED) || | 760 return (state_ == DownloadItemInterface::CANCELLED) || |
| 756 (state_ == INTERRUPTED); | 761 (state_ == DownloadItemInterface::INTERRUPTED); |
| 757 } | 762 } |
| 758 | 763 |
| 759 bool DownloadItem::IsInterrupted() const { | 764 bool DownloadItem::IsInterrupted() const { |
| 760 return (state_ == INTERRUPTED); | 765 return (state_ == DownloadItemInterface::INTERRUPTED); |
| 761 } | 766 } |
| 762 | 767 |
| 763 bool DownloadItem::IsComplete() const { | 768 bool DownloadItem::IsComplete() const { |
| 764 return (state_ == COMPLETE); | 769 return (state_ == DownloadItemInterface::COMPLETE); |
| 765 } | 770 } |
| 766 | 771 |
| 767 const GURL& DownloadItem::GetURL() const { | 772 const GURL& DownloadItem::GetURL() const { |
| 768 return url_chain_.empty() ? | 773 return url_chain_.empty() ? |
| 769 GURL::EmptyGURL() : url_chain_.back(); | 774 GURL::EmptyGURL() : url_chain_.back(); |
| 770 } | 775 } |
| 771 | 776 |
| 772 std::string DownloadItem::DebugString(bool verbose) const { | 777 std::string DownloadItem::DebugString(bool verbose) const { |
| 773 std::string description = | 778 std::string description = |
| 774 base::StringPrintf("{ id = %d" | 779 base::StringPrintf("{ id = %d" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 811 state_info_.target_name.value().c_str(), | 816 state_info_.target_name.value().c_str(), |
| 812 full_path().value().c_str()); | 817 full_path().value().c_str()); |
| 813 } else { | 818 } else { |
| 814 description += base::StringPrintf(" url = \"%s\"", url_list.c_str()); | 819 description += base::StringPrintf(" url = \"%s\"", url_list.c_str()); |
| 815 } | 820 } |
| 816 | 821 |
| 817 description += " }"; | 822 description += " }"; |
| 818 | 823 |
| 819 return description; | 824 return description; |
| 820 } | 825 } |
| OLD | NEW |