Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(407)

Unified Diff: webkit/common/fileapi/file_system_util.h

Issue 15716007: Split webkit_storage target into webkit_storage_{browser,common,renderer} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: char* -> char[] Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/common/fileapi/file_system_types.h ('k') | webkit/common/fileapi/webkit_common_fileapi.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/common/fileapi/file_system_util.h
diff --git a/webkit/common/fileapi/file_system_util.h b/webkit/common/fileapi/file_system_util.h
index aed0800b9465ebf2b84dcc23970e9a6e936ee39c..2185d3ac2ebaeec5bf78289be935e551448906ae 100644
--- a/webkit/common/fileapi/file_system_util.h
+++ b/webkit/common/fileapi/file_system_util.h
@@ -14,19 +14,19 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
#include "webkit/common/fileapi/file_system_types.h"
#include "webkit/common/quota/quota_types.h"
-#include "webkit/storage/webkit_storage_export.h"
+#include "webkit/common/webkit_common_export.h"
class GURL;
namespace fileapi {
-extern const char kPersistentDir[];
-extern const char kTemporaryDir[];
-extern const char kExternalDir[];
-extern const char kIsolatedDir[];
-extern const char kTestDir[];
+WEBKIT_COMMON_EXPORT extern const char kPersistentDir[];
+WEBKIT_COMMON_EXPORT extern const char kTemporaryDir[];
+WEBKIT_COMMON_EXPORT extern const char kExternalDir[];
+WEBKIT_COMMON_EXPORT extern const char kIsolatedDir[];
+WEBKIT_COMMON_EXPORT extern const char kTestDir[];
-class WEBKIT_STORAGE_EXPORT VirtualPath {
+class WEBKIT_COMMON_EXPORT VirtualPath {
public:
static const base::FilePath::CharType kRoot[];
static const base::FilePath::CharType kSeparator;
@@ -67,7 +67,7 @@ class WEBKIT_STORAGE_EXPORT VirtualPath {
// returns URL without the filesystem ID.
//
// |type| needs to be public type as the returned URI is given to the renderer.
-WEBKIT_STORAGE_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
+WEBKIT_COMMON_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
FileSystemType type);
// Returns the name for the filesystem that is specified by a pair of
@@ -81,25 +81,25 @@ WEBKIT_STORAGE_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
// Example:
// The name for a TEMPORARY filesystem of "http://www.example.com:80/"
// should look like: "http_www.example.host_80:temporary"
-WEBKIT_STORAGE_EXPORT std::string GetFileSystemName(const GURL& origin_url,
+WEBKIT_COMMON_EXPORT std::string GetFileSystemName(const GURL& origin_url,
FileSystemType type);
// Converts FileSystemType |type| to/from the StorageType |storage_type| that
// is used for the unified quota system.
// (Basically this naively maps TEMPORARY storage type to TEMPORARY filesystem
// type, PERSISTENT storage type to PERSISTENT filesystem type and vice versa.)
-WEBKIT_STORAGE_EXPORT FileSystemType QuotaStorageTypeToFileSystemType(
+WEBKIT_COMMON_EXPORT FileSystemType QuotaStorageTypeToFileSystemType(
quota::StorageType storage_type);
-WEBKIT_STORAGE_EXPORT quota::StorageType FileSystemTypeToQuotaStorageType(
+WEBKIT_COMMON_EXPORT quota::StorageType FileSystemTypeToQuotaStorageType(
FileSystemType type);
// Returns the string representation of the given filesystem |type|.
// Returns an empty string if the |type| is invalid.
-WEBKIT_STORAGE_EXPORT std::string GetFileSystemTypeString(FileSystemType type);
+WEBKIT_COMMON_EXPORT std::string GetFileSystemTypeString(FileSystemType type);
// Sets type to FileSystemType enum that corresponds to the string name.
// Returns false if the |type_string| is invalid.
-WEBKIT_STORAGE_EXPORT bool GetFileSystemPublicType(
+WEBKIT_COMMON_EXPORT bool GetFileSystemPublicType(
std::string type_string,
WebKit::WebFileSystemType* type);
@@ -111,20 +111,20 @@ WEBKIT_STORAGE_EXPORT bool GetFileSystemPublicType(
//
// TODO(tzik): Replace CreateFilePath and FilePathToString in
// third_party/leveldatabase/env_chromium.cc with them.
-WEBKIT_STORAGE_EXPORT std::string FilePathToString(
+WEBKIT_COMMON_EXPORT std::string FilePathToString(
const base::FilePath& file_path);
// Decode a file path from |file_path_string|.
-WEBKIT_STORAGE_EXPORT base::FilePath StringToFilePath(
+WEBKIT_COMMON_EXPORT base::FilePath StringToFilePath(
const std::string& file_path_string);
// File error conversion
-WEBKIT_STORAGE_EXPORT WebKit::WebFileError PlatformFileErrorToWebFileError(
+WEBKIT_COMMON_EXPORT WebKit::WebFileError PlatformFileErrorToWebFileError(
base::PlatformFileError error_code);
// Generate a file system name for the given arguments. Should only be used by
// platform apps.
-WEBKIT_STORAGE_EXPORT std::string GetIsolatedFileSystemName(
+WEBKIT_COMMON_EXPORT std::string GetIsolatedFileSystemName(
const GURL& origin_url,
const std::string& filesystem_id);
@@ -132,21 +132,21 @@ WEBKIT_STORAGE_EXPORT std::string GetIsolatedFileSystemName(
// platform apps. This function will return false if the file system name is
// not of the form {origin}:Isolated_{id}, and will also check that there is an
// origin and id present. It will not check that the origin or id are valid.
-WEBKIT_STORAGE_EXPORT bool CrackIsolatedFileSystemName(
+WEBKIT_COMMON_EXPORT bool CrackIsolatedFileSystemName(
const std::string& filesystem_name,
std::string* filesystem_id);
// Returns the root URI for an isolated filesystem for origin |origin_url|
// and |filesystem_id|. If the |optional_root_name| is given the resulting
// root URI will point to the subfolder within the isolated filesystem.
-WEBKIT_STORAGE_EXPORT std::string GetIsolatedFileSystemRootURIString(
+WEBKIT_COMMON_EXPORT std::string GetIsolatedFileSystemRootURIString(
const GURL& origin_url,
const std::string& filesystem_id,
const std::string& optional_root_name);
// Returns the root URI for an external filesystem for origin |origin_url|
// and |mount_name|.
-WEBKIT_STORAGE_EXPORT std::string GetExternalFileSystemRootURIString(
+WEBKIT_COMMON_EXPORT std::string GetExternalFileSystemRootURIString(
const GURL& origin_url,
const std::string& mount_name);
« no previous file with comments | « webkit/common/fileapi/file_system_types.h ('k') | webkit/common/fileapi/webkit_common_fileapi.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698