| Index: chrome/browser/media_galleries/fileapi/filtering_file_enumerator.h
|
| diff --git a/webkit/fileapi/media/filtering_file_enumerator.h b/chrome/browser/media_galleries/fileapi/filtering_file_enumerator.h
|
| similarity index 55%
|
| rename from webkit/fileapi/media/filtering_file_enumerator.h
|
| rename to chrome/browser/media_galleries/fileapi/filtering_file_enumerator.h
|
| index accb2b097a130b02b8be85865117b7bb4e0ccbe0..7e17dae26676d3a96675c1f47bd5cc26e887231b 100644
|
| --- a/webkit/fileapi/media/filtering_file_enumerator.h
|
| +++ b/chrome/browser/media_galleries/fileapi/filtering_file_enumerator.h
|
| @@ -2,23 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_FILEAPI_MEDIA_FILTERING_FILE_ENUMERATOR_H_
|
| -#define WEBKIT_FILEAPI_MEDIA_FILTERING_FILE_ENUMERATOR_H_
|
| +#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_FILTERING_FILE_ENUMERATOR_H_
|
| +#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_FILTERING_FILE_ENUMERATOR_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
|
| #include "webkit/fileapi/file_system_file_util.h"
|
| -#include "webkit/fileapi/media/media_path_filter.h"
|
| -#include "webkit/storage/webkit_storage_export.h"
|
|
|
| -namespace fileapi {
|
| +namespace chrome {
|
|
|
| // This class wraps another file enumerator and filters out non-media files
|
| // from its result, refering given MediaPathFilter.
|
| -class WEBKIT_STORAGE_EXPORT FilteringFileEnumerator
|
| - : public NON_EXPORTED_BASE(FileSystemFileUtil::AbstractFileEnumerator) {
|
| +class FilteringFileEnumerator
|
| + : public fileapi::FileSystemFileUtil::AbstractFileEnumerator {
|
| public:
|
| FilteringFileEnumerator(
|
| - scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> base_enumerator,
|
| + scoped_ptr<fileapi::FileSystemFileUtil::AbstractFileEnumerator>
|
| + base_enumerator,
|
| MediaPathFilter* filter);
|
| virtual ~FilteringFileEnumerator();
|
|
|
| @@ -29,12 +29,13 @@ class WEBKIT_STORAGE_EXPORT FilteringFileEnumerator
|
|
|
| private:
|
| // The file enumerator to be wrapped.
|
| - scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> base_enumerator_;
|
| + scoped_ptr<fileapi::FileSystemFileUtil::AbstractFileEnumerator>
|
| + base_enumerator_;
|
|
|
| // Path filter to filter out non-Media files.
|
| MediaPathFilter* filter_;
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace chrome
|
|
|
| -#endif // WEBKIT_FILEAPI_MEDIA_FILTERING_FILE_ENUMERATOR_H_
|
| +#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_FILTERING_FILE_ENUMERATOR_H_
|
|
|