chrome.experimental.downloads

chrome/browser/ui/webui/downloads_dom_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/downloads_dom_handler.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/basictypes.h"
@@ skipping 34 matching lines @@
     return lhs->start_time() > rhs->start_time();
   }
 };
 
 }  // namespace
 
 DownloadsDOMHandler::DownloadsDOMHandler(DownloadManager* dlm)
     : search_text_(),
       download_manager_(dlm),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+  DVLOG(1) << __PRETTY_FUNCTION__ << " " << dlm;
   // Create our fileicon data source.
   dlm->profile()->GetChromeURLDataManager()->AddDataSource(
 #if defined(OS_CHROMEOS)
       new FileIconSourceCros());
 #else
       new FileIconSource());
 #endif  // OS_CHROMEOS
 }
 
 DownloadsDOMHandler::~DownloadsDOMHandler() {
@@ skipping 71 matching lines @@
   // Add ourself to all download items as an observer.
   for (OrderedDownloads::iterator it = download_items_.begin();
        it != download_items_.end(); ++it) {
     if (static_cast<int>(it - download_items_.begin()) > kMaxDownloads)
       break;
 
     // TODO(rdsmith): Convert to DCHECK()s when http://crbug.com/84508 is
     // fixed.
     // We should never see anything that isn't already in the history.
     CHECK(*it);
-    CHECK_NE(DownloadHistory::kUninitializedHandle, (*it)->db_handle());
+    CHECK((*it)->IsInHistory());
 
     (*it)->AddObserver(this);
   }
 
   SendCurrentDownloads();
 }
 
 void DownloadsDOMHandler::HandleGetDownloads(const ListValue* args) {
   std::wstring new_search = UTF16ToWideHack(ExtractStringValue(args));
   if (search_text_.compare(new_search) != 0) {
@@ skipping 22 matching lines @@
     {
       // Enable nested tasks during DnD, while |DragDownload()| blocks.
       MessageLoop::ScopedNestableTaskAllower allower(MessageLoop::current());
       download_util::DragDownload(file, icon, view);
     }
   }
 }
 
 void DownloadsDOMHandler::HandleSaveDangerous(const ListValue* args) {
   DownloadItem* file = GetDownloadByValue(args);
+  DVLOG(1) << __PRETTY_FUNCTION__ << " " << file;
   if (file)
     download_manager_->DangerousDownloadValidated(file);
 }
 
 void DownloadsDOMHandler::HandleDiscardDangerous(const ListValue* args) {
   DownloadItem* file = GetDownloadByValue(args);
   if (file)
     file->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
 }
 
 void DownloadsDOMHandler::HandleShow(const ListValue* args) {
   DownloadItem* file = GetDownloadByValue(args);
   if (file)
     file->ShowDownloadInShell();
 }
 
 void DownloadsDOMHandler::HandlePause(const ListValue* args) {
   DownloadItem* file = GetDownloadByValue(args);
   if (file)
     file->TogglePause();
 }
 
 void DownloadsDOMHandler::HandleRemove(const ListValue* args) {
   DownloadItem* file = GetDownloadByValue(args);
   if (file) {
-    // TODO(rdsmith): Change to DCHECK when http://crbug.com/84508 is fixed.
-    CHECK_NE(DownloadHistory::kUninitializedHandle, file->db_handle());
     file->Remove();
   }
 }
 
 void DownloadsDOMHandler::HandleCancel(const ListValue* args) {
   DownloadItem* file = GetDownloadByValue(args);
   if (file)
     file->Cancel(true);
 }
 
@@ skipping 26 matching lines @@
       continue;
     (*it)->RemoveObserver(this);
   }
   download_items_.clear();
 }
 
 DownloadItem* DownloadsDOMHandler::GetDownloadById(int id) {
   for (OrderedDownloads::iterator it = download_items_.begin();
       it != download_items_.end(); ++it) {
     if (static_cast<int>(it - download_items_.begin() == id)) {
+      DVLOG(1) << " " << id << " " << *it;
       return (*it);
     }
   }
 
   return NULL;
 }
 
 DownloadItem* DownloadsDOMHandler::GetDownloadByValue(const ListValue* args) {
   int id;
   if (ExtractIntegerValue(args, &id)) {
+    DVLOG(1) << id;
     return GetDownloadById(id);
   }
   return NULL;
 }