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

Side by Side Diff: chrome/browser/download/download_item.cc

Issue 7237034: sql::MetaTable.next_download_id, DownloadManager::GetNextId() (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: sql::MetaTable.next_download_id, DownloadId, DownloadManager::GetNextId() Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/download/download_item.h" 5 #include "chrome/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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 } 218 }
219 219
220 DownloadItem::~DownloadItem() { 220 DownloadItem::~DownloadItem() {
221 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. 221 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
222 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 222 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
223 223
224 TransitionTo(REMOVING); 224 TransitionTo(REMOVING);
225 download_manager_->AssertQueueStateConsistent(this); 225 download_manager_->AssertQueueStateConsistent(this);
226 } 226 }
227 227
228 DownloadId DownloadItem::gid() const {
229 return DownloadId(download_manager_, id());
230 }
231
228 void DownloadItem::AddObserver(Observer* observer) { 232 void DownloadItem::AddObserver(Observer* observer) {
229 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. 233 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
230 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 234 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
231 235
232 observers_.AddObserver(observer); 236 observers_.AddObserver(observer);
233 } 237 }
234 238
235 void DownloadItem::RemoveObserver(Observer* observer) { 239 void DownloadItem::RemoveObserver(Observer* observer) {
236 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. 240 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
237 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 241 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 641
638 VLOG(20) << __FUNCTION__ << "()" 642 VLOG(20) << __FUNCTION__ << "()"
639 << " needs rename = " << NeedsRename() 643 << " needs rename = " << NeedsRename()
640 << " " << DebugString(true); 644 << " " << DebugString(true);
641 DCHECK_NE(DANGEROUS, safety_state()); 645 DCHECK_NE(DANGEROUS, safety_state());
642 DCHECK(file_manager); 646 DCHECK(file_manager);
643 647
644 if (NeedsRename()) { 648 if (NeedsRename()) {
645 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 649 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
646 NewRunnableMethod(file_manager, 650 NewRunnableMethod(file_manager,
647 &DownloadFileManager::RenameCompletingDownloadFile, id(), 651 &DownloadFileManager::RenameCompletingDownloadFile, gid(),
648 GetTargetFilePath(), safety_state() == SAFE)); 652 GetTargetFilePath(), safety_state() == SAFE));
649 return; 653 return;
650 } 654 }
651 655
652 DCHECK(!is_extension_install()); 656 DCHECK(!is_extension_install());
653 Completed(); 657 Completed();
654 658
655 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 659 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(
656 NewRunnableMethod(file_manager, &DownloadFileManager::CompleteDownload, 660 file_manager, &DownloadFileManager::CompleteDownload, gid()));
657 id()));
658 } 661 }
659 662
660 void DownloadItem::OnDownloadRenamedToFinalName(const FilePath& full_path) { 663 void DownloadItem::OnDownloadRenamedToFinalName(const FilePath& full_path) {
661 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. 664 // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
662 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 665 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
663 666
664 VLOG(20) << __FUNCTION__ << "()" 667 VLOG(20) << __FUNCTION__ << "()"
665 << " full_path = \"" << full_path.value() << "\"" 668 << " full_path = \"" << full_path.value() << "\""
666 << " needed rename = " << NeedsRename() 669 << " needed rename = " << NeedsRename()
667 << " " << DebugString(false); 670 << " " << DebugString(false);
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 state_info_.target_name.value().c_str(), 860 state_info_.target_name.value().c_str(),
858 full_path().value().c_str()); 861 full_path().value().c_str());
859 } else { 862 } else {
860 description += base::StringPrintf(" url = \"%s\"", url_list.c_str()); 863 description += base::StringPrintf(" url = \"%s\"", url_list.c_str());
861 } 864 }
862 865
863 description += " }"; 866 description += " }";
864 867
865 return description; 868 return description;
866 } 869 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698