Allow net::DirectoryLister to be used to recursively list the directory, and ...

chrome/browser/dom_ui/filebrowse_ui.cc

 // Copyright (c) 2009 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/logging.h"
@@ skipping 89 matching lines @@
                           public DownloadManager::Observer,
                           public DownloadItem::Observer {
  public:
   FilebrowseHandler();
   virtual ~FilebrowseHandler();
 
   // Init work after Attach.
   void Init();
 
   // DirectoryLister::DirectoryListerDelegate methods:
-  virtual void OnListFile(const file_util::FileEnumerator::FindInfo& data);
+  virtual void OnListFile(
+      const net::DirectoryLister::DirectoryListerData& data);
   virtual void OnListDone(int error);
 
   // DOMMessageHandler implementation.
   virtual DOMMessageHandler* Attach(DOMUI* dom_ui);
   virtual void RegisterMessages();
 
 #if defined(OS_CHROMEOS)
   void MountChanged(chromeos::MountLibrary* obj,
                     chromeos::MountEventType evt,
                     const std::string& path);
@@ skipping 638 matching lines @@
   }
 
   is_refresh_ = is_refresh;
   FilePath default_download_path;
   if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS,
                         &default_download_path)) {
     NOTREACHED();
   }
   if (currentpath_ == default_download_path) {
     lister_ = new net::DirectoryLister(currentpath_,
+                                       false,
                                        net::DirectoryLister::DATE,
                                        this);
   } else {
     lister_ = new net::DirectoryLister(currentpath_, this);
   }
   lister_->Start();
 }
 
 void FilebrowseHandler::HandleGetChildren(const ListValue* args) {
 #if defined(OS_CHROMEOS)
   std::string path = WideToUTF8(ExtractStringValue(args));
   FilePath currentpath(path);
   filelist_value_.reset(new ListValue());
 
   GetChildrenForPath(currentpath, false);
 #endif
 }
 
 void FilebrowseHandler::OnListFile(
-    const file_util::FileEnumerator::FindInfo& data) {
+    const net::DirectoryLister::DirectoryListerData& data) {
 #if defined(OS_WIN)
-  if (data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) {
+  if (data.info.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) {
     return;
   }
 #elif defined(OS_POSIX)
-  if (data.filename[0] == '.') {
+  if (data.info.filename[0] == '.') {
     return;
   }
 #endif
 
   DictionaryValue* file_value = new DictionaryValue();
 
 #if defined(OS_WIN)
-  int64 size = (static_cast<int64>(data.nFileSizeHigh) << 32) |
-      data.nFileSizeLow;
-  file_value->SetString(kPropertyTitle, data.cFileName);
+  int64 size = (static_cast<int64>(data.info.nFileSizeHigh) << 32) |
+      data.info.nFileSizeLow;
+  file_value->SetString(kPropertyTitle, data.info.cFileName);
   file_value->SetString(kPropertyPath,
-                        currentpath_.Append(data.cFileName).value());
+                        currentpath_.Append(data.info.cFileName).value());
   file_value->SetBoolean(kPropertyDirectory,
-      (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? true : false);
+      (data.info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? true : false);
 #elif defined(OS_POSIX)
-  file_value->SetString(kPropertyTitle, data.filename);
+  file_value->SetString(kPropertyTitle, data.info.filename);
   file_value->SetString(kPropertyPath,
-                        currentpath_.Append(data.filename).value());
-  file_value->SetBoolean(kPropertyDirectory, S_ISDIR(data.stat.st_mode));
+                        currentpath_.Append(data.info.filename).value());
+  file_value->SetBoolean(kPropertyDirectory, S_ISDIR(data.info.stat.st_mode));
 #endif
   filelist_value_->Append(file_value);
 }
 
 void FilebrowseHandler::OnListDone(int error) {
   DictionaryValue info_value;
   if (is_refresh_) {
     info_value.SetString("functionCall", "refresh");
   } else {
     info_value.SetString("functionCall", "getChildren");
@@ skipping 204 matching lines @@
     }
   }
 
   return NULL;
 }
 
 const int FileBrowseUI::kPopupWidth = 250;
 const int FileBrowseUI::kPopupHeight = 300;
 const int FileBrowseUI::kSmallPopupWidth = 250;
 const int FileBrowseUI::kSmallPopupHeight = 50;