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

chrome/browser/media_gallery/linux/mtp_device_object_enumerator.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.
 
 #include "chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h"
 
+#include "base/logging.h"
+
 namespace chrome {
 
 MTPDeviceObjectEnumerator::MTPDeviceObjectEnumerator(
     const MtpFileEntries& entries)
     : file_entries_(entries),
       file_entry_iter_(file_entries_.begin()) {
 }
 
 MTPDeviceObjectEnumerator::~MTPDeviceObjectEnumerator() {
 }
@@ skipping 12 matching lines @@
 }
 
 bool MTPDeviceObjectEnumerator::IsDirectory() {
   return current_file_info_.file_type() == MtpFileEntry::FILE_TYPE_FOLDER;
 }
 
 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