diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 22:34:20 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 22:34:20 +0000 |
| commit | 3d1e89a41697e2b9dbcf0bce6a61467957c7904f (patch) | |
| tree | 5896a3b51a4e67707396e622ce2389d4d33eb92f /webkit | |
| parent | 30e9ade55fc1d09e77151c7813d16647d062d8f6 (diff) | |
| download | chromium_src-3d1e89a41697e2b9dbcf0bce6a61467957c7904f.zip chromium_src-3d1e89a41697e2b9dbcf0bce6a61467957c7904f.tar.gz chromium_src-3d1e89a41697e2b9dbcf0bce6a61467957c7904f.tar.bz2 | |
[Media Gallery] Added code to support mtp device media file system on Windows.
BUG=151679
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11297002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/fileapi/file_system_file_util.h | 5 | ||||
| -rw-r--r-- | webkit/fileapi/media/mtp_device_file_system_config.h | 4 | ||||
| -rw-r--r-- | webkit/storage/webkit_storage.gypi | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/webkit/fileapi/file_system_file_util.h b/webkit/fileapi/file_system_file_util.h index 6593c97..a1e4e89 100644 --- a/webkit/fileapi/file_system_file_util.h +++ b/webkit/fileapi/file_system_file_util.h @@ -31,7 +31,7 @@ class FileSystemOperationContext; class WEBKIT_STORAGE_EXPORT FileSystemFileUtil { public: // It will be implemented by each subclass such as FileSystemFileEnumerator. - class AbstractFileEnumerator { + class WEBKIT_STORAGE_EXPORT AbstractFileEnumerator { public: virtual ~AbstractFileEnumerator() {} @@ -57,7 +57,8 @@ class WEBKIT_STORAGE_EXPORT FileSystemFileUtil { kSnapshotFileTemporary, }; - class EmptyFileEnumerator : public AbstractFileEnumerator { + class WEBKIT_STORAGE_EXPORT EmptyFileEnumerator + : public AbstractFileEnumerator { virtual FilePath Next() OVERRIDE; virtual int64 Size() OVERRIDE; virtual base::Time LastModifiedTime() OVERRIDE; diff --git a/webkit/fileapi/media/mtp_device_file_system_config.h b/webkit/fileapi/media/mtp_device_file_system_config.h index 71bc634..b7cd5d2 100644 --- a/webkit/fileapi/media/mtp_device_file_system_config.h +++ b/webkit/fileapi/media/mtp_device_file_system_config.h @@ -7,7 +7,9 @@ #include "build/build_config.h" -#if defined(OS_LINUX) // Implies defined(OS_CHROMEOS) +// Support MTP device file system for Windows, Linux and ChromeOS. Note that +// OS_LINUX implies OS_CHROMEOS. +#if defined(OS_WIN) || defined(OS_LINUX) #define SUPPORT_MTP_DEVICE_FILESYSTEM #endif diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi index 344a2f1..a5cfed3 100644 --- a/webkit/storage/webkit_storage.gypi +++ b/webkit/storage/webkit_storage.gypi @@ -58,7 +58,7 @@ '<@(webkit_fileapi_chromeos_sources)', ], }], - ['OS=="linux" or chromeos==1', { + ['OS=="linux" or chromeos==1 or OS=="win"', { 'sources': [ '<@(webkit_fileapi_media_sources)', ], |