Index: storage/browser/fileapi/file_system_url.h |
diff --git a/webkit/browser/fileapi/file_system_url.h b/storage/browser/fileapi/file_system_url.h |
similarity index 93% |
rename from webkit/browser/fileapi/file_system_url.h |
rename to storage/browser/fileapi/file_system_url.h |
index ead076254b1f059bab9901e2b395421a830651d1..822260d252c1d04ce1f6f13958a7125fef1bf2dc 100644 |
--- a/webkit/browser/fileapi/file_system_url.h |
+++ b/storage/browser/fileapi/file_system_url.h |
@@ -10,11 +10,11 @@ |
#include "base/files/file_path.h" |
#include "url/gurl.h" |
-#include "webkit/browser/webkit_storage_browser_export.h" |
-#include "webkit/common/fileapi/file_system_mount_option.h" |
-#include "webkit/common/fileapi/file_system_types.h" |
+#include "storage/common/storage_export.h" |
+#include "storage/common/fileapi/file_system_mount_option.h" |
+#include "storage/common/fileapi/file_system_types.h" |
-namespace fileapi { |
+namespace storage { |
// A class representing a filesystem URL which consists of origin URL, |
// type and an internal path used inside the filesystem. |
@@ -75,7 +75,7 @@ namespace fileapi { |
// illegal on the current platform. |
// To avoid problems, use VirtualPath::BaseName and |
// VirtualPath::GetComponents instead of the base::FilePath methods. |
-class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemURL { |
+class STORAGE_EXPORT FileSystemURL { |
public: |
FileSystemURL(); |
~FileSystemURL(); |
@@ -127,12 +127,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemURL { |
bool operator==(const FileSystemURL& that) const; |
- bool operator!=(const FileSystemURL& that) const { |
- return !(*this == that); |
- } |
+ bool operator!=(const FileSystemURL& that) const { return !(*this == that); } |
- struct WEBKIT_STORAGE_BROWSER_EXPORT Comparator { |
- bool operator() (const FileSystemURL& lhs, const FileSystemURL& rhs) const; |
+ struct STORAGE_EXPORT Comparator { |
+ bool operator()(const FileSystemURL& lhs, const FileSystemURL& rhs) const; |
}; |
private: |
@@ -175,6 +173,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemURL { |
typedef std::set<FileSystemURL, FileSystemURL::Comparator> FileSystemURLSet; |
-} // namespace fileapi |
+} // namespace storage |
#endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_H_ |