Eject support for ChromeOS

chrome/browser/storage_monitor/storage_monitor_chromeos.cc

 // Copyright (c) 2012 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.
 
 // chromeos::StorageMonitorCros implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 194 matching lines @@
   return true;
 }
 
 uint64 StorageMonitorCros::GetStorageSize(
     const std::string& device_location) const {
   MountMap::const_iterator info_it = mount_map_.find(device_location);
   return (info_it != mount_map_.end()) ?
       info_it->second.total_size_in_bytes : 0;
 }
 
+void NotifyEjectSuccess(
+    base::Callback<void(chrome::StorageMonitor::EjectStatus)> callback) {
+  callback.Run(chrome::StorageMonitor::EJECT_OK);
+}
+
+void StorageMonitorCros::EjectDevice(
+    const std::string& device_id,
+    base::Callback<void(EjectStatus)> callback) {
+  std::string mount_path;
+  for (MountMap::const_iterator info_it = mount_map_.begin();
+       info_it != mount_map_.end(); info_it++) {

[Lei Zhang, 2013/03/13 22:39:27]

nit: ++info_it

[Greg Billock, 2013/03/18 19:38:40]

Done.

+    if (info_it->second.device_id == device_id)
+      mount_path = info_it->first;
+  }
+
+  if (mount_path.empty()) {
+    callback.Run(EJECT_NO_SUCH_DEVICE);
+    return;
+  }
+
+  disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
+  if (!manager) {
+    callback.Run(EJECT_FAILURE);
+    return;
+  }
+
+  manager->UnmountPath(mount_path, chromeos::UNMOUNT_OPTIONS_NONE);

[tbarzic, 2013/03/13 18:57:04]

unmount path may actually fail, but the success/failure is reported using
DiskMountManager's Observer interface (OnMountEvent)

I guess it would make sense to add a callback param to UnmountPath in addition
to broadcasting the result.
Would it be a problem to wait for a day with this cl (until I add callback to
unmount method)

[Greg Billock, 2013/03/18 19:38:40]

Done.

+
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&NotifyEjectSuccess, callback));

[Lei Zhang, 2013/03/13 22:39:27]

You probably don't need NotifyEjectSuccess().

BrowserThread::PostTask(
    BrowserThread::UI, FROM_HERE,
    base::Bind(callback, chrome::StorageMonitor::EJECT_OK));

[Greg Billock, 2013/03/18 19:38:40]

Replaced with trampoline to convert parameter from DiskMountManager now.

+}
+
 void StorageMonitorCros::CheckMountedPathOnFileThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   bool has_dcim = chrome::MediaStorageUtil::HasDcim(mount_info.mount_path);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&StorageMonitorCros::AddMountedPathOnUIThread, this,
                  mount_info, has_dcim));
@@ skipping 45 matching lines @@
       vendor_name,
       model_name,
       storage_size_in_bytes);
 
   mount_map_.insert(std::make_pair(mount_info.mount_path, object_info));
 
   receiver()->ProcessAttach(object_info);
 }
 
 }  // namespace chromeos