[Linux, Media Gallery] Fix MTPRecursiveDeviceObjectEnumerator to recursively enumerate all the medi…

chrome/browser/media_gallery/linux/mtp_device_object_enumerator.cc

Index: chrome/browser/media_gallery/linux/mtp_device_object_enumerator.cc
diff --git a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.cc b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.cc
index dfbc4078cfcb461bbcaed5480c3b756efecb67d6..d58c95dfbc9527784568652b2bfa631ff4fb0b9b 100644
--- a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.cc
+++ b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h"
 
+#include "base/logging.h"
+
 namespace chrome {
 
 MTPDeviceObjectEnumerator::MTPDeviceObjectEnumerator(
@@ -36,4 +38,17 @@ base::Time MTPDeviceObjectEnumerator::LastModifiedTime() {
   return base::Time::FromTimeT(current_file_info_.modification_time());
 }
 
+bool MTPDeviceObjectEnumerator::GetEntryId(uint32_t* entry_id) {
+  DCHECK(entry_id);
+  if (file_entry_iter_ == file_entries_.end())
+    return false;
+
+  *entry_id = (*file_entry_iter_).item_id();

[Lei Zhang, 2013/01/12 01:48:01]

Can't you write it as: file_entry_iter-_>item_id() ?

[kmadhusu, 2013/01/14 18:47:32]

Done.

+  return true;
+}
+
+bool MTPDeviceObjectEnumerator::HasMoreEntries() {
+  return file_entry_iter_ != file_entries_.end();
+}
+
 }  // namespace chrome