Small refactoring in DiskMountManager (event reporting; format method).

chromeos/dbus/cros_disks_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
 #define CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 
 namespace dbus {
 class Bus;
 class Response;
 }
 
-// TODO(tbarzic): We should probably move these enums inside CrosDisksClient,
-// to be clearer where they come from.
+// TODO(tbarzic): We should move these enums inside CrosDisksClient,
+// to be clearer where they come from. Also, most of these are partially or
+// completely duplicated in third_party/dbus/service_constants.h. We should
+// probably use enums from service_contstants directly.
 namespace chromeos {
 
 // Enum describing types of mount used by cros-disks.
 enum MountType {
   MOUNT_TYPE_INVALID,
   MOUNT_TYPE_DEVICE,
   MOUNT_TYPE_ARCHIVE,
   MOUNT_TYPE_GDATA,
   MOUNT_TYPE_NETWORK_STORAGE,
 };
 
 // Type of device.
 enum DeviceType {
   DEVICE_TYPE_UNKNOWN,
   DEVICE_TYPE_USB,  // USB stick.
   DEVICE_TYPE_SD,  // SD card.
   DEVICE_TYPE_OPTICAL_DISC,  // e.g. Optical disc excluding DVD.
   DEVICE_TYPE_MOBILE,  // Storage on a mobile device (e.g. Android).
   DEVICE_TYPE_DVD,  // DVD.
 };
 
 // Mount error code used by cros-disks.
 enum MountError {
   MOUNT_ERROR_NONE = 0,
   MOUNT_ERROR_UNKNOWN = 1,
   MOUNT_ERROR_INTERNAL = 2,
+  MOUNT_ERROR_INVALID_ARGUMENT = 3,
+  MOUNT_ERROR_INVALID_PATH = 4,
+  MOUNT_ERROR_PATH_ALREADY_MOUNTED = 5,
+  MOUNT_ERROR_PATH_NOT_MOUNTED = 6,
+  MOUNT_ERROR_DIRECTORY_CREATION_FAILED = 7,
+  MOUNT_ERROR_INVALID_MOUNT_OPTIONS = 8,
+  MOUNT_ERROR_INVALID_UNMOUNT_OPTIONS = 9,
+  MOUNT_ERROR_INSUFFICIENT_PERMISSIONS = 10,
+  MOUNT_ERROR_MOUNT_PROGRAM_NOT_FOUND = 11,
+  MOUNT_ERROR_MOUNT_PROGRAM_FAILED = 12,
+  MOUNT_ERROR_INVALID_DEVICE_PATH = 100,
   MOUNT_ERROR_UNKNOWN_FILESYSTEM = 101,
   MOUNT_ERROR_UNSUPPORTED_FILESYSTEM = 102,
   MOUNT_ERROR_INVALID_ARCHIVE = 201,
   MOUNT_ERROR_NOT_AUTHENTICATED = 601,
   MOUNT_ERROR_PATH_UNMOUNTED = 901,
   // TODO(tbarzic): Add more error codes as they get added to cros-disks and
   // consider doing explicit translation from cros-disks error_types.
 };
 
+// Format error reported by cros-disks.
+enum FormatError {
+  FORMAT_ERROR_NONE,
+  FORMAT_ERROR_UNKNOWN,
+  FORMAT_ERROR_INTERNAL,
+  FORMAT_ERROR_INVALID_DEVICE_PATH,
+  FORMAT_ERROR_DEVICE_BEING_FORMATTED,
+  FORMAT_ERROR_UNSUPPORTED_FILESYSTEM,
+  FORMAT_ERROR_FORMAT_PROGRAM_NOT_FOUND,
+  FORMAT_ERROR_FORMAT_PROGRAM_FAILED,
+  FORMAT_ERROR_DEVICE_NOT_ALLOWED,
+};
+
 // Event type each corresponding to a signal sent from cros-disks.
 enum MountEventType {
-  DISK_ADDED,
-  DISK_REMOVED,
-  DISK_CHANGED,
-  DEVICE_ADDED,
-  DEVICE_REMOVED,
-  DEVICE_SCANNED,
-  FORMATTING_FINISHED,
+  CROS_DISKS_DISK_ADDED,
+  CROS_DISKS_DISK_REMOVED,
+  CROS_DISKS_DISK_CHANGED,
+  CROS_DISKS_DEVICE_ADDED,
+  CROS_DISKS_DEVICE_REMOVED,
+  CROS_DISKS_DEVICE_SCANNED,
+  CROS_DISKS_FORMATTING_FINISHED,
 };
 
 // Additional unmount flags to be added to unmount request.
 enum UnmountOptions {
   UNMOUNT_OPTIONS_NONE,
   UNMOUNT_OPTIONS_LAZY,  // Do lazy unmount.
 };
 
 // A class to represent information about a disk sent from cros-disks.
 class DiskInfo {
@@ skipping 189 matching lines @@
   // Create() should be used instead.
   CrosDisksClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CrosDisksClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_