diff options
| author | benchan@chromium.org <benchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:57:00 +0000 |
|---|---|---|
| committer | benchan@chromium.org <benchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:57:00 +0000 |
| commit | f4ae40ac431194914ec96f2fed953f97a0aba86f (patch) | |
| tree | 241f9a61afb7b7a5190e727e3f2301087fd94dd0 /chromeos/dbus/cros_disks_client.cc | |
| parent | 72f5c971d964710adc2d7e7415b8e7cdbf960ca5 (diff) | |
| download | chromium_src-f4ae40ac431194914ec96f2fed953f97a0aba86f.zip chromium_src-f4ae40ac431194914ec96f2fed953f97a0aba86f.tar.gz chromium_src-f4ae40ac431194914ec96f2fed953f97a0aba86f.tar.bz2 | |
Update CrosDisksClient to recognize the DVD device type.
cros-disks has added a DVD device type to the DeviceMediaType property
returned by the org.chromium.CrosDisks.GetDeviceProperties DBus method.
This CL updates CrosDisksClient to recognize the DVD device type. It
also removes unused DEVICE_TYPE_* string constants from the file browser
extension.
BUG=chromium-os:30494
TEST=Build Chrome for Chrome OS
Review URL: http://codereview.chromium.org/10381005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/cros_disks_client.cc')
| -rw-r--r-- | chromeos/dbus/cros_disks_client.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc index 693372d..a4c49f5 100644 --- a/chromeos/dbus/cros_disks_client.cc +++ b/chromeos/dbus/cros_disks_client.cc @@ -57,6 +57,8 @@ DeviceType DeviceMediaTypeToDeviceType(uint32 media_type_uint32) { return DEVICE_TYPE_OPTICAL_DISC; case(cros_disks::DEVICE_MEDIA_MOBILE): return DEVICE_TYPE_MOBILE; + case(cros_disks::DEVICE_MEDIA_DVD): + return DEVICE_TYPE_DVD; default: return DEVICE_TYPE_UNKNOWN; } @@ -466,10 +468,6 @@ DiskInfo::~DiskInfo() { // variant bool false // } // dict entry { -// string "DeviceIsOpticalDisc" -// variant bool false -// } -// dict entry { // string "DeviceIsReadOnly" // variant bool false // } |