| Index: chrome/browser/dom_ui/downloads_dom_handler.cc
|
| ===================================================================
|
| --- chrome/browser/dom_ui/downloads_dom_handler.cc (revision 19317)
|
| +++ chrome/browser/dom_ui/downloads_dom_handler.cc (working copy)
|
| @@ -47,10 +47,28 @@
|
|
|
| } // namespace
|
|
|
| -DownloadsDOMHandler::DownloadsDOMHandler(DOMUI* dom_ui, DownloadManager* dlm)
|
| - : DOMMessageHandler(dom_ui),
|
| - search_text_(),
|
| +DownloadsDOMHandler::DownloadsDOMHandler(DownloadManager* dlm)
|
| + : search_text_(),
|
| download_manager_(dlm) {
|
| + // Create our fileicon data source.
|
| + g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
|
| + NewRunnableMethod(&chrome_url_data_manager,
|
| + &ChromeURLDataManager::AddDataSource,
|
| + new FileIconSource()));
|
| +}
|
| +
|
| +DownloadsDOMHandler::~DownloadsDOMHandler() {
|
| + ClearDownloadItems();
|
| + download_manager_->RemoveObserver(this);
|
| +}
|
| +
|
| +// DownloadsDOMHandler, public: -----------------------------------------------
|
| +
|
| +void DownloadsDOMHandler::Init() {
|
| + download_manager_->AddObserver(this);
|
| +}
|
| +
|
| +void DownloadsDOMHandler::RegisterMessages() {
|
| dom_ui_->RegisterMessageCallback("getDownloads",
|
| NewCallback(this, &DownloadsDOMHandler::HandleGetDownloads));
|
| dom_ui_->RegisterMessageCallback("openFile",
|
| @@ -73,26 +91,8 @@
|
| NewCallback(this, &DownloadsDOMHandler::HandleCancel));
|
| dom_ui_->RegisterMessageCallback("clearAll",
|
| NewCallback(this, &DownloadsDOMHandler::HandleClearAll));
|
| -
|
| -
|
| - // Create our fileicon data source.
|
| - g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
|
| - NewRunnableMethod(&chrome_url_data_manager,
|
| - &ChromeURLDataManager::AddDataSource,
|
| - new FileIconSource()));
|
| }
|
|
|
| -DownloadsDOMHandler::~DownloadsDOMHandler() {
|
| - ClearDownloadItems();
|
| - download_manager_->RemoveObserver(this);
|
| -}
|
| -
|
| -// DownloadsDOMHandler, public: -----------------------------------------------
|
| -
|
| -void DownloadsDOMHandler::Init() {
|
| - download_manager_->AddObserver(this);
|
| -}
|
| -
|
| void DownloadsDOMHandler::OnDownloadUpdated(DownloadItem* download) {
|
| // Get the id for the download. Our downloads are sorted latest to first,
|
| // and the id is the index into that list. We should be careful of sync
|
|
|