Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4729)

Unified Diff: chrome/browser/chromeos/cros/mount_library.cc

Issue 7457001: Adding support for mount point different from removable devices to MountLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/cros/mount_library.cc
===================================================================
--- chrome/browser/chromeos/cros/mount_library.cc (revision 93425)
+++ chrome/browser/chromeos/cros/mount_library.cc (working copy)
@@ -90,31 +90,29 @@
observers_.RemoveObserver(observer);
}
- virtual void MountPath(const char* device_path) OVERRIDE {
+ virtual void MountPath(const char* source_path,
+ MountType type,
+ const MountPathOptions& options) OVERRIDE {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (!CrosLibrary::Get()->EnsureLoaded()) {
- OnMountRemovableDevice(device_path,
- NULL,
- MOUNT_METHOD_ERROR_LOCAL,
- kLibraryNotLoaded);
+ OnMountCompleted(LIBRARY_NOT_LOADED,
+ source_path,
+ type,
+ NULL);
return;
}
- MountRemovableDevice(device_path,
- &MountLibraryImpl::MountRemovableDeviceCallback,
- this);
+ MountSourcePath(source_path, type, options, &MountCompletedHandler, this);
}
- virtual void UnmountPath(const char* device_path) OVERRIDE {
+ virtual void UnmountPath(const char* path) OVERRIDE {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (!CrosLibrary::Get()->EnsureLoaded()) {
- OnUnmountRemovableDevice(device_path,
+ OnUnmountRemovableDevice(path,
MOUNT_METHOD_ERROR_LOCAL,
kLibraryNotLoaded);
return;
}
- UnmountRemovableDevice(device_path,
- &MountLibraryImpl::UnmountRemovableDeviceCallback,
- this);
+ UnmountMountPoint(path, &MountLibraryImpl::UnmountMountPointCallback, this);
}
virtual void UnmountDeviceRecursive(const char* device_path,
@@ -151,9 +149,10 @@
cb_data = new UnmountDeviceRecursiveCallbackData(this, user_data,
callback, devices_to_unmount.size());
for (std::vector<const char*>::iterator it = devices_to_unmount.begin();
- it != devices_to_unmount.end();
- ++it) {
- UnmountRemovableDevice(*it,
+ it != devices_to_unmount.end();
+ ++it) {
+ UnmountRemovableDevice(
+ *it,
&MountLibraryImpl::UnmountDeviceRecursiveCallback,
cb_data);
}
@@ -180,26 +179,26 @@
const DiskMap& disks() const OVERRIDE { return disks_; }
private:
- // Callback for MountRemovableDevice method.
- static void MountRemovableDeviceCallback(void* object,
- const char* device_path,
- const char* mount_path,
- MountMethodErrorType error,
- const char* error_message) {
+ // Callback for MountComplete signal and MountSourcePath method.
+ static void MountCompletedHandler(void* object,
+ MountError error_code,
+ const char* source_path,
+ MountType type,
+ const char* mount_path) {
+LOG(WARNING) <<"MountCompleted" <<error_code<<source_path<<mount_path;
DCHECK(object);
MountLibraryImpl* self = static_cast<MountLibraryImpl*>(object);
- self->OnMountRemovableDevice(device_path,
- mount_path,
- error,
- error_message);
+ self->OnMountCompleted(static_cast<MountError>(error_code),
+ source_path,
+ static_cast<MountType>(type),
+ mount_path);
}
// Callback for UnmountRemovableDevice method.
- static void UnmountRemovableDeviceCallback(void* object,
- const char* device_path,
- const char* mount_path,
- MountMethodErrorType error,
- const char* error_message) {
+ static void UnmountMountPointCallback(void* object,
+ const char* device_path,
+ MountMethodErrorType error,
+ const char* error_message) {
DCHECK(object);
MountLibraryImpl* self = static_cast<MountLibraryImpl*>(object);
self->OnUnmountRemovableDevice(device_path,
@@ -275,14 +274,21 @@
}
- void OnMountRemovableDevice(const char* device_path,
- const char* mount_path,
- MountMethodErrorType error,
- const char* error_message) {
- DCHECK(device_path);
+ void OnMountCompleted(MountError error_code,
+ const char* source_path,
+ MountType type,
+ const char* mount_path) {
+ DCHECK(source_path);
- if (error == MOUNT_METHOD_ERROR_NONE && device_path && mount_path) {
- std::string path(device_path);
+LOG(WARNING) <<"MountCompleted fired" <<error_code<<source_path<<mount_path;
+ FireMountCompleted(error_code, source_path, type, mount_path);
+
+ if (error_code == NO_ERROR)
+ mount_points_.insert(mount_path);
+
+ if (error_code == NO_ERROR && type == DEVICE && source_path &&
+ mount_path) {
+ std::string path(source_path);
DiskMap::iterator iter = disks_.find(path);
if (iter == disks_.end()) {
// disk might have been removed by now?
@@ -292,10 +298,6 @@
DCHECK(disk);
disk->set_mount_path(mount_path);
FireDiskStatusUpdate(MOUNT_DISK_MOUNTED, disk);
- } else {
- LOG(WARNING) << "Mount request failed for device "
- << device_path << ", with error: "
- << (error_message ? error_message : "Unknown");
}
}
@@ -482,8 +484,8 @@
void Init() {
// Getting the monitor status so that the daemon starts up.
- mount_status_connection_ = MonitorMountEvents(
- &MonitorMountEventsHandler, this);
+ mount_status_connection_ = MonitorAllMountEvents(
+ &MonitorMountEventsHandler, &MountCompletedHandler, this);
}
void FireDiskStatusUpdate(MountLibraryEventType evt,
@@ -502,6 +504,19 @@
Observer, observers_, DeviceChanged(evt, device_path));
}
+ void FireMountCompleted(MountError error_code,
+ const char* source_path,
+ MountType mount_type,
+ const char* mount_path) {
+ // Make sure we run on UI thread.
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ FOR_EACH_OBSERVER(
+ Observer, observers_, MountCompleted(error_code,
+ source_path,
+ mount_type,
+ mount_path));
+ }
+
// Mount event change observers.
ObserverList<Observer> observers_;
@@ -512,6 +527,8 @@
// The list of disks found.
MountLibrary::DiskMap disks_;
+ MountLibrary::MountPointSet mount_points_;
+
DISALLOW_COPY_AND_ASSIGN(MountLibraryImpl);
};
@@ -525,8 +542,9 @@
virtual void RemoveObserver(Observer* observer) OVERRIDE {}
virtual const DiskMap& disks() const OVERRIDE { return disks_; }
virtual void RequestMountInfoRefresh() OVERRIDE {}
- virtual void MountPath(const char* device_path) OVERRIDE {}
- virtual void UnmountPath(const char* device_path) OVERRIDE {}
+ virtual void MountPath(const char* source_path, MountType type,
+ const MountPathOptions& options) OVERRIDE {}
+ virtual void UnmountPath(const char* path) OVERRIDE {}
virtual void UnmountDeviceRecursive(const char* device_path,
UnmountDeviceRecursiveCallbackType callback, void* user_data)
OVERRIDE {}

Powered by Google App Engine
This is Rietveld 408576698