Media Galleries: Make DeviceMediaAsyncFileUtil filter directory contents.

chrome/browser/media_galleries/fileapi/device_media_async_file_util.h

 // Copyright (c) 2013 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 CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_DEVICE_MEDIA_ASYNC_FILE_UTIL_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_DEVICE_MEDIA_ASYNC_FILE_UTIL_H_
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "webkit/browser/fileapi/async_file_util.h"
 #include "webkit/common/blob/shareable_file_reference.h"
 
 namespace fileapi {
 class FileSystemOperationContext;
 class FileSystemURL;
 }
 
@@ skipping 92 matching lines @@
   // underlying storage. The returned FileStreamReader must return an error
   // when the state of the underlying storage changes. Any errors associated
   // with reading this file are returned by the FileStreamReader itself.
   virtual scoped_ptr<webkit_blob::FileStreamReader> GetFileStreamReader(
       const fileapi::FileSystemURL& url,
       int64 offset,
       const base::Time& expected_modification_time,
       fileapi::FileSystemContext* context);
 
  private:
+  class MediaPathFilterWrapper;
+
   // Use Create() to get an instance of DeviceMediaAsyncFileUtil.
   DeviceMediaAsyncFileUtil(const base::FilePath& profile_path,
                            MediaFileValidationType validation_type);
 
   // Called when GetFileInfo method call succeeds. |file_info| contains the
   // file details of the requested url. |callback| is invoked to complete the
   // GetFileInfo request.
-  void OnDidGetFileInfo(const GetFileInfoCallback& callback,
-                        const base::File::Info& file_info);
+  void OnDidGetFileInfo(
+      scoped_ptr<fileapi::FileSystemOperationContext> context,
+      const base::FilePath& path,
+      const GetFileInfoCallback& callback,
+      const base::File::Info& file_info);
 
   // Called when ReadDirectory method call succeeds. |callback| is invoked to
   // complete the ReadDirectory request.
   //
   // If the contents of the given directory are reported in one batch, then
   // |file_list| will have the list of all files/directories in the given
   // directory and |has_more| will be false.
   //
   // If the contents of the given directory are reported in multiple chunks,
   // |file_list| will have only a subset of all contents (the subsets reported
   // in any two calls are disjoint), and |has_more| will be true, except for
   // the last chunk.
   void OnDidReadDirectory(
+      scoped_ptr<fileapi::FileSystemOperationContext> context,
       const ReadDirectoryCallback& callback,
       const EntryList& file_list,
       bool has_more);
 
   bool validate_media_files() const;
 
   // Profile path.
   const base::FilePath profile_path_;
 
-  const MediaFileValidationType validation_type_;
+  scoped_refptr<MediaPathFilterWrapper> media_path_filter_wrapper_;
 
   // For callbacks that may run after destruction.
   base::WeakPtrFactory<DeviceMediaAsyncFileUtil> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceMediaAsyncFileUtil);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_DEVICE_MEDIA_ASYNC_FILE_UTIL_H_