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;
 }
 
+// Callback executed when the unmount call is run by DiskMountManager.
+// Forwards result to |EjectDevice| caller.
+void NotifyEjectSuccess(
+    base::Callback<void(chrome::StorageMonitor::EjectStatus)> callback,
+    chromeos::MountError error_code) {
+  if (error_code == MOUNT_ERROR_NONE)
+    callback.Run(chrome::StorageMonitor::EJECT_OK);
+  else
+    callback.Run(chrome::StorageMonitor::EJECT_FAILURE);
+}
+
+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) {
+    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,
+                       base::Bind(NotifyEjectSuccess, callback));

[tbarzic, 2013/03/18 19:48:26]

nit: how about NotifyEjectResult

[Greg Billock, 2013/03/18 21:44:44]

Good point. Changed to NotifyUnmountResult.

+}
+
 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