Rewritten MountLibrary to work with non-blocking mount API calls in libcros....

chrome/browser/ui/webui/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/ui/webui/filebrowse_ui.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 104 matching lines @@
   // DirectoryLister::DirectoryListerDelegate methods:
   virtual void OnListFile(
       const net::DirectoryLister::DirectoryListerData& data);
   virtual void OnListDone(int error);
 
   // WebUIMessageHandler implementation.
   virtual WebUIMessageHandler* Attach(WebUI* web_ui);
   virtual void RegisterMessages();
 
 #if defined(OS_CHROMEOS)
-  void MountChanged(chromeos::MountLibrary* obj,
-                    chromeos::MountEventType evt,
-                    const std::string& path);
+  // chromeos::MountLibrary::Observer interface
+  virtual void DiskChanged(chromeos::MountLibraryEventType event,
+                           const chromeos::MountLibrary::Disk* disk);
+  virtual void DeviceChanged(chromeos::MountLibraryEventType event,
+                             const std::string& device_path);
 #endif
 
   // DownloadItem::Observer interface
   virtual void OnDownloadUpdated(DownloadItem* download);
   virtual void OnDownloadFileCompleted(DownloadItem* download);
   virtual void OnDownloadOpened(DownloadItem* download) { }
 
   // DownloadManager::Observer interface
   virtual void ModelChanged();
 
@@ skipping 408 matching lines @@
   std::string picture_url = kPicasawebBaseUrl;
   picture_url += username;
   picture_url += kPicasawebDropBox;
   info_value.SetString("url", picture_url);
   info_value.SetInteger("status_code", upload_response_code_);
   web_ui_->CallJavascriptFunction("uploadComplete", info_value);
 #endif
 }
 
 #if defined(OS_CHROMEOS)
-void FilebrowseHandler::MountChanged(chromeos::MountLibrary* obj,
-                                     chromeos::MountEventType evt,
-                                     const std::string& path) {
-  if (evt == chromeos::DISK_REMOVED ||
-      evt == chromeos::DISK_CHANGED) {
+void FilebrowseHandler::DiskChanged(chromeos::MountLibraryEventType event,
+                                    const chromeos::MountLibrary::Disk* disk) {
+  if (event == chromeos::MOUNT_DISK_REMOVED ||
+      event == chromeos::MOUNT_DISK_CHANGED) {
     web_ui_->CallJavascriptFunction("rootsChanged");
   }
 }
+
+void FilebrowseHandler::DeviceChanged(chromeos::MountLibraryEventType event,
+                                      const std::string& device_path) {
+}
 #endif
 
 void FilebrowseHandler::OnURLFetchComplete(const URLFetcher* source,
                                            const GURL& url,
                                            const net::URLRequestStatus& status,
                                            int response_code,
                                            const ResponseCookies& cookies,
                                            const std::string& data) {
   upload_response_code_ = response_code;
   VLOG(1) << "Response code: " << response_code;
   VLOG(1) << "Request url: " << url;
   if (StartsWithASCII(url.spec(), kPicasawebUserPrefix, true)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(current_task_, &TaskProxy::FireUploadCompleteProxy));
   }
   fetch_.reset();
 }
 
 void FilebrowseHandler::HandleGetRoots(const ListValue* args) {
   ListValue results_value;
   DictionaryValue info_value;
   // TODO(dhg): add other entries, make this more general
 #if defined(OS_CHROMEOS)
-  chromeos::MountLibrary* lib =
-      chromeos::CrosLibrary::Get()->GetMountLibrary();
-  const chromeos::MountLibrary::DiskVector& disks = lib->disks();
-
-  for (size_t i = 0; i < disks.size(); ++i) {
-    if (!disks[i].mount_path.empty()) {
+  chromeos::MountLibrary* lib = chromeos::CrosLibrary::Get()->GetMountLibrary();
+  for (chromeos::MountLibrary::DiskMap::const_iterator iter =
+          lib->disks().begin();
+       iter != lib->disks().end();
+       ++iter) {
+    const chromeos::MountLibrary::Disk* disk = iter->second;
+    if (!disk->mount_path().empty()) {
       DictionaryValue* page_value = new DictionaryValue();
-      page_value->SetString(kPropertyPath, disks[i].mount_path);
-      FilePath currentpath(disks[i].mount_path);
+      page_value->SetString(kPropertyPath, disk->mount_path());
+      FilePath currentpath(disk->mount_path());
       std::string filename;
       filename = currentpath.BaseName().value();
       page_value->SetString(kPropertyTitle, filename);
       page_value->SetBoolean(kPropertyDirectory, true);
       results_value.Append(page_value);
     }
   }
 #else
   DictionaryValue* page_value = new DictionaryValue();
   page_value->SetString(kPropertyPath, "/media");
@@ skipping 652 matching lines @@
     }
   }
 
   return NULL;
 }
 
 const int FileBrowseUI::kPopupWidth = 250;
 const int FileBrowseUI::kPopupHeight = 300;
 const int FileBrowseUI::kSmallPopupWidth = 250;
 const int FileBrowseUI::kSmallPopupHeight = 50;