Adding a format device button to UI.

chrome/browser/chromeos/cros/mount_library.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/cros/mount_library.h"
 
 #include <set>
 #include <vector>
 
 #include "base/message_loop.h"
@@ skipping 162 matching lines @@
   virtual void FormatMountedDevice(const char* mount_path) OVERRIDE {
     DCHECK(mount_path);
     Disk* disk = NULL;
     for (MountLibrary::DiskMap::iterator it = disks_.begin();
         it != disks_.end(); ++it) {
       if (it->second->mount_path().compare(mount_path) == 0) {
         disk = it->second;
         break;
       }
     }
-
     if (!disk) {
-      OnFormatDevice(disk->device_path().c_str(),
+      OnFormatDevice(mount_path,
                      false,
                      MOUNT_METHOD_ERROR_LOCAL,
                      "Device with this mount path not found.");
       return;
     }
     if (formatting_pending_.find(disk->device_path()) !=
         formatting_pending_.end()) {
-      OnFormatDevice(disk->device_path().c_str(),
+      OnFormatDevice(mount_path,
                      false,
                      MOUNT_METHOD_ERROR_LOCAL,
                      "Formatting is already pending.");
       return;
     }
     // Formatting process continues, after unmounting.
     formatting_pending_[disk->device_path()] = disk->file_path();
     UnmountPath(disk->mount_path().c_str());
   }
 
@@ skipping 86 matching lines @@
                                         const char* mount_path,
                                         MountMethodErrorType error,
                                         const char* error_message) {
     DCHECK(object);
     MountLibraryImpl* self = static_cast<MountLibraryImpl*>(object);
     self->OnUnmountPath(mount_path, error, error_message);
   }
 
   // Callback for FormatRemovableDevice method.
   static void FormatDeviceCallback(void* object,
-                                   const char* device_path,
+                                   const char* file_path,
                                    bool success,
                                    MountMethodErrorType error,
                                    const char* error_message) {
     DCHECK(object);
     MountLibraryImpl* self = static_cast<MountLibraryImpl*>(object);
+    const char* device_path = NULL;
+    for (MountLibrary::DiskMap::iterator it = self->disks_.begin();
+        it != self->disks_.end(); ++it) {

[tbarzic, 2011/08/12 18:29:35]

You should encapsulate path conversion into separate method

[sidor.dev, 2011/08/12 19:14:20]

Done.

+      if (it->second->file_path().compare(file_path) == 0) {
+        device_path = it->second->device_path().c_str();
+        break;
+      }
+    }
+    if (!device_path) {
+      LOG(ERROR) << "Error while handling disks metadata. Cannot find "
+          << "device that is being formatted.";
+      return;
+    }
     self->OnFormatDevice(device_path, success, error, error_message);
   }
 
   // Callback for UnmountDeviceRecursive.
   static void UnmountDeviceRecursiveCallback(void* object,
                                              const char* mount_path,
                                              MountMethodErrorType error,
                                              const char* error_message) {
     DCHECK(object);
     UnmountDeviceRecursiveCallbackData* cb_data =
@@ skipping 124 matching lines @@
                    << mount_path << ", with error: "
                    << (error_message ? error_message : "Unknown");
     }
   }
 
   void OnFormatDevice(const char* device_path,
                       bool success,
                       MountMethodErrorType error,
                       const char* error_message) {
     DCHECK(device_path);
+    // In mount library we use device path to identify device.

[tbarzic, 2011/08/12 18:29:35]

I don't think this comment is needed

[sidor.dev, 2011/08/12 19:14:20]

Sorry, forgot to delete it. 

     if (error == MOUNT_METHOD_ERROR_NONE && device_path && success) {
       FireDeviceStatusUpdate(MOUNT_FORMATTING_STARTED, device_path);
     } else {
       FireDeviceStatusUpdate(MOUNT_FORMATTING_STARTED,
                              std::string("!") + device_path);
       LOG(WARNING) << "Format request failed for device "
                    << device_path << ", with error: "
                    << (error_message ? error_message : "Unknown");
     }
   }
@@ skipping 148 matching lines @@
       }
       case DEVICE_REMOVED: {
         type = MOUNT_DEVICE_REMOVED;
         break;
       }
       case DEVICE_SCANNED: {
         type = MOUNT_DEVICE_SCANNED;
         break;
       }
       case FORMATTING_FINISHED: {
+        // FORMATTING_FINISHED actually returns file path instead of device
+        // path.
+        const char* path = NULL;
+        for (MountLibrary::DiskMap::iterator it = disks_.begin();
+            it != disks_.end(); ++it) {

[tbarzic, 2011/08/12 18:29:35]

use 5 space indent here

[sidor.dev, 2011/08/12 19:14:20]

Done.

+          if (it->second->file_path().compare(device_path) == 0) {
+            path = it->second->device_path().c_str();

[tbarzic, 2011/08/12 18:29:35]

Why don't you loose path and use device_path directly here?

[sidor.dev, 2011/08/12 19:14:20]

Done.

+            break;
+          }
+        }
+        if (!path) {
+          LOG(ERROR) << "Error while handling disks metadata. Cannot find "
+              << "device that is being formatted.";

[tbarzic, 2011/08/12 18:29:35]

align << with << in the previous row.

[sidor.dev, 2011/08/12 19:14:20]

Done.

+          return;
+        }
+        device_path = path;
         type = MOUNT_FORMATTING_FINISHED;
         break;
       }
       default: {
         return;
       }
     }
     FireDeviceStatusUpdate(type, std::string(device_path));
   }
 
@@ skipping 86 matching lines @@
   else
     return new MountLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::MountLibraryImpl);