Updates filebrowser list when download starts/ends.

chrome/browser/dom_ui/filebrowse_ui.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/dom_ui/filebrowse_ui.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 108 matching lines @@
   virtual void RegisterMessages();
 
 #if defined(OS_CHROMEOS)
   void MountChanged(chromeos::MountLibrary* obj,
                     chromeos::MountEventType evt,
                     const std::string& path);
 #endif
 
   // DownloadItem::Observer interface
   virtual void OnDownloadUpdated(DownloadItem* download);
-  virtual void OnDownloadFileCompleted(DownloadItem* download) { }
+  virtual void OnDownloadFileCompleted(DownloadItem* download);
   virtual void OnDownloadOpened(DownloadItem* download) { }
 
   // DownloadManager::Observer interface
   virtual void ModelChanged();
 
   // Callback for the "getRoots" message.
   void HandleGetRoots(const ListValue* args);
 
   void GetChildrenForPath(FilePath& path, bool is_refresh);
 
@@ skipping 49 matching lines @@
   void HandleValidateSavePath(const ListValue* args);
 
   // Validate a save path on file thread.
   void ValidateSavePathOnFileThread(const FilePath& save_path);
 
   // Fire save path validation result to JS onValidatedSavePath.
   void FireOnValidatedSavePathOnUIThread(bool valid, const FilePath& save_path);
 
  private:
 
+  // Retrieves downloads from the DownloadManager.
+  void GetDownloads();
+
   void OpenNewWindow(const ListValue* args, bool popup);
 
   // Clear all download items and their observers.
   void ClearDownloadItems();
 
   // Send the current list of downloads to the page.
   void SendCurrentDownloads();
 
   void SendNewDownload(DownloadItem* download);
 
@@ skipping 495 matching lines @@
 }
 
 void FilebrowseHandler::OpenNewFullWindow(const ListValue* args) {
   OpenNewWindow(args, false);
 }
 
 void FilebrowseHandler::OpenNewPopupWindow(const ListValue* args) {
   OpenNewWindow(args, true);
 }
 
+void FilebrowseHandler::GetDownloads() {

[achuithb, 2011/01/18 17:53:44]

Maybe you could move this function to after the definition of ModelChanged? That
would make the diff smaller and have this function closer to where it's used for
readability.

Also GetDownloads may perhaps be too generic a name? Maybe have a more
descriptive name like UpdateDownloadList or something along those lines?

LGTM otherwise.

[altimofeev, 2011/01/19 10:29:35]

Done.

+  ClearDownloadItems();
+
+  std::vector<DownloadItem*> downloads;
+  download_manager_->GetAllDownloads(FilePath(), &downloads);
+
+  std::vector<DownloadItem*> new_downloads;
+  // Scan for any in progress downloads and add ourself to them as an observer.
+  for (DownloadList::iterator it = downloads.begin();
+       it != downloads.end(); ++it) {
+    DownloadItem* download = *it;
+    // We want to know what happens as the download progresses and be notified
+    // when the user validates the dangerous download.
+    if (download->state() == DownloadItem::IN_PROGRESS ||
+        download->safety_state() == DownloadItem::DANGEROUS) {
+      download->AddObserver(this);
+      active_download_items_.push_back(download);
+    }
+    DownloadList::iterator item = find(download_items_.begin(),
+                                       download_items_.end(),
+                                       download);
+    if (item == download_items_.end() && got_first_download_list_) {
+      SendNewDownload(download);
+    }
+    new_downloads.push_back(download);
+  }
+  download_items_.swap(new_downloads);
+  got_first_download_list_ = true;
+  SendCurrentDownloads();
+}
+
 void FilebrowseHandler::OpenNewWindow(const ListValue* args, bool popup) {
   std::string url = WideToUTF8(ExtractStringValue(args));
   Browser* browser = popup ?
       Browser::CreateForType(Browser::TYPE_APP_PANEL, profile_) :
       BrowserList::GetLastActive();
   browser::NavigateParams params(browser, GURL(url), PageTransition::LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   browser::Navigate(&params);
   // TODO(beng): The following two calls should be automatic by Navigate().
   if (popup) {
@@ skipping 170 matching lines @@
   info_value.SetString(kPropertyPath, currentpath_.value());
   dom_ui_->CallJavascriptFunction(L"browseFileResult",
                                   info_value, *(filelist_value_.get()));
   SendCurrentDownloads();
 }
 
 void FilebrowseHandler::HandleGetMetadata(const ListValue* args) {
 }
 
 void FilebrowseHandler::HandleGetDownloads(const ListValue* args) {
-  ModelChanged();
+  GetDownloads();
 }
 
 void FilebrowseHandler::ModelChanged() {
-  ClearDownloadItems();
-
-  std::vector<DownloadItem*> downloads;
-  download_manager_->GetAllDownloads(FilePath(), &downloads);
-
-  std::vector<DownloadItem*> new_downloads;
-  // Scan for any in progress downloads and add ourself to them as an observer.
-  for (DownloadList::iterator it = downloads.begin();
-       it != downloads.end(); ++it) {
-    DownloadItem* download = *it;
-    // We want to know what happens as the download progresses and be notified
-    // when the user validates the dangerous download.
-    if (download->state() == DownloadItem::IN_PROGRESS ||
-        download->safety_state() == DownloadItem::DANGEROUS) {
-      download->AddObserver(this);
-      active_download_items_.push_back(download);
-    }
-    DownloadList::iterator item = find(download_items_.begin(),
-                                       download_items_.end(),
-                                       download);
-    if (item == download_items_.end() && got_first_download_list_) {
-      SendNewDownload(download);
-    }
-    new_downloads.push_back(download);
-  }
-  download_items_.swap(new_downloads);
-  got_first_download_list_ = true;
-  SendCurrentDownloads();
+  if (!currentpath_.empty())
+    GetChildrenForPath(currentpath_, true);
+  else
+    GetDownloads();
 }
 
 void FilebrowseHandler::SendNewDownload(DownloadItem* download) {
   ListValue results_value;
   results_value.Append(download_util::CreateDownloadItemValue(download, -1));
   dom_ui_->CallJavascriptFunction(L"newDownload", results_value);
 }
 
 void FilebrowseHandler::DeleteFile(const FilePath& path) {
   if (!file_util::Delete(path, true)) {
@@ skipping 160 matching lines @@
   ListValue results_value;
   for (DownloadList::iterator it = active_download_items_.begin();
       it != active_download_items_.end(); ++it) {
     int index = static_cast<int>(it - active_download_items_.begin());
     results_value.Append(download_util::CreateDownloadItemValue(*it, index));
   }
 
   dom_ui_->CallJavascriptFunction(L"downloadsList", results_value);
 }
 
+void FilebrowseHandler::OnDownloadFileCompleted(DownloadItem* download) {
+  GetChildrenForPath(currentpath_, true);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // FileBrowseUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 FileBrowseUI::FileBrowseUI(TabContents* contents) : HtmlDialogUI(contents) {
   FilebrowseHandler* handler = new FilebrowseHandler();
   AddMessageHandler((handler)->Attach(this));
   handler->Init();
@@ skipping 78 matching lines @@
     }
   }
 
   return NULL;
 }
 
 const int FileBrowseUI::kPopupWidth = 250;
 const int FileBrowseUI::kPopupHeight = 300;
 const int FileBrowseUI::kSmallPopupWidth = 250;
 const int FileBrowseUI::kSmallPopupHeight = 50;