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

chrome/browser/chromeos/webui/imageburner_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/chromeos/webui/imageburner_ui.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
@@ skipping 198 matching lines @@
   web_ui_->RegisterMessageCallback("getRoots",
       NewCallback(this, &ImageBurnHandler::HandleGetRoots));
   web_ui_->RegisterMessageCallback("downloadImage",
       NewCallback(this, &ImageBurnHandler::HandleDownloadImage));
   web_ui_->RegisterMessageCallback("burnImage",
       NewCallback(this, &ImageBurnHandler::HandleBurnImage));
   web_ui_->RegisterMessageCallback("cancelBurnImage",
       NewCallback(this, &ImageBurnHandler::HandleCancelBurnImage));
 }
 
-void ImageBurnHandler::MountChanged(chromeos::MountLibrary* obj,
-                                    chromeos::MountEventType evt,
-                                    const std::string& path) {
-  if ((evt == chromeos::DISK_REMOVED ||
-      evt == chromeos::DISK_CHANGED ||
-      evt == chromeos::DEVICE_REMOVED)) {
+void ImageBurnHandler::DiskChanged(chromeos::MountLibraryEventType event,
+                                   const chromeos::MountLibrary::Disk* disk) {
+  if (event == chromeos::MOUNT_DISK_REMOVED ||
+      event == chromeos::MOUNT_DISK_CHANGED ||
+      event == chromeos::MOUNT_DISK_UNMOUNTED) {
     web_ui_->CallJavascriptFunction("rootsChanged");
   }
 }
 
+void ImageBurnHandler::DeviceChanged(chromeos::MountLibraryEventType event,
+                                     const std::string& device_path) {
+  if (event == chromeos::MOUNT_DEVICE_REMOVED) {
+    web_ui_->CallJavascriptFunction("rootsChanged");
+  }

[stevenjb, 2011/03/16 22:52:55]

nit: extra { }

[zel, 2011/03/17 01:00:30]

Done.

+}
+
+
 void ImageBurnHandler::ProgressUpdated(chromeos::BurnLibrary* object,
                                        chromeos::BurnEventType evt,
                                        const ImageBurnStatus& status) {
     UpdateBurnProgress(status.amount_burnt, status.total_size,
                        status.target_path, evt);
     if (evt == chromeos::BURN_COMPLETE) {
       ImageBurnTaskProxy* task = new ImageBurnTaskProxy(AsWeakPtr());
       task->AddRef();
       task->FinalizeBurn(true);
     } else if (evt == chromeos::BURN_CANCELED) {
@@ skipping 42 matching lines @@
       break;
     }
   }
 }
 
 void ImageBurnHandler::HandleGetRoots(const ListValue* args) {
   ListValue results_value;
   DictionaryValue info_value;
   chromeos::MountLibrary* mount_lib =
       chromeos::CrosLibrary::Get()->GetMountLibrary();
-  const chromeos::MountLibrary::DiskVector& disks = mount_lib->disks();
+  const chromeos::MountLibrary::DiskMap& disks = mount_lib->disks();
   if (!burn_resource_manager_->CheckBurnInProgress()) {
-    for (size_t i = 0; i < disks.size(); ++i) {
-      if (!disks[i].mount_path.empty()) {
-        FilePath disk_path = FilePath(disks[i].system_path).DirName();
+    for (chromeos::MountLibrary::DiskMap::const_iterator iter =  disks.begin();
+         iter != disks.end();
+         ++iter) {
+      if (iter->second->mount_path().empty()) {
+        FilePath disk_path = FilePath(iter->second->system_path()).DirName();
         std::string title = "/dev/" + disk_path.BaseName().value();
-        if (!mount_lib->IsBootPath(title.c_str())) {
+        if (!iter->second->on_boot_device()) {
           DictionaryValue* page_value = new DictionaryValue();
           page_value->SetString(std::string(kPropertyTitle), title);
           page_value->SetString(std::string(kPropertyPath), title);
           page_value->SetBoolean(std::string(kPropertyDirectory), true);
           results_value.Append(page_value);
         }
       }
     }
   }
   info_value.SetString("functionCall", "getRoots");
@@ skipping 336 matching lines @@
 //
 // ImageBurnUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 ImageBurnUI::ImageBurnUI(TabContents* contents) : WebUI(contents) {
   ImageBurnHandler* handler = new ImageBurnHandler(contents);
   AddMessageHandler((handler)->Attach(this));
   ImageBurnUIHTMLSource* html_source = new ImageBurnUIHTMLSource();
   contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }