diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 04:36:34 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 04:36:34 +0000 |
| commit | bb0e79474b4a2a50643901aae666a9e67ae9da8d (patch) | |
| tree | e28e0c8988f303e44024df880d8735ac4a895e87 /content/worker | |
| parent | a0100c9d99acc92d6801f8d113873898e004e4d9 (diff) | |
| download | chromium_src-bb0e79474b4a2a50643901aae666a9e67ae9da8d.zip chromium_src-bb0e79474b4a2a50643901aae666a9e67ae9da8d.tar.gz chromium_src-bb0e79474b4a2a50643901aae666a9e67ae9da8d.tar.bz2 | |
webkit: Move FilePath/WebString conversion functions from 'glue' to 'base'
Add new files file_path_string_conversions.h/cc.
'dom_storage' no longer depends on 'glue'
Function declarations of RemoveForDataFromHistoryState(), RemovePasswordDataFromHistoryState(), RemoveScrollOffsetFromHistoryState(), CreateHistoryStateForURL() are moved from webkit_glue.h to glue_serialize.h. (This move is needed to export these functions without including webkit_glue.h from glue_serialize.cc)
BUG=157095
TEST=build
Review URL: https://chromiumcodereview.appspot.com/11232035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/worker_webkitplatformsupport_impl.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc index c88bbb0..3fa7273 100644 --- a/content/worker/worker_webkitplatformsupport_impl.cc +++ b/content/worker/worker_webkitplatformsupport_impl.cc @@ -21,6 +21,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegistry.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" +#include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/webfileutilities_impl.h" #include "webkit/glue/webkit_glue.h" @@ -64,7 +65,7 @@ bool WorkerWebKitPlatformSupportImpl::FileUtilities::getFileInfo( base::PlatformFileInfo file_info; base::PlatformFileError status; if (!SendSyncMessageFromAnyThread(new FileUtilitiesMsg_GetFileInfo( - webkit_glue::WebStringToFilePath(path), &file_info, &status)) || + webkit_base::WebStringToFilePath(path), &file_info, &status)) || status != base::PLATFORM_FILE_OK) { return false; } @@ -251,7 +252,7 @@ WebString WorkerWebKitPlatformSupportImpl::mimeTypeForExtension( const WebString& file_extension) { std::string mime_type; SendSyncMessageFromAnyThread(new MimeRegistryMsg_GetMimeTypeFromExtension( - webkit_glue::WebStringToFilePathString(file_extension), &mime_type)); + webkit_base::WebStringToFilePathString(file_extension), &mime_type)); return ASCIIToUTF16(mime_type); } @@ -259,7 +260,7 @@ WebString WorkerWebKitPlatformSupportImpl::wellKnownMimeTypeForExtension( const WebString& file_extension) { std::string mime_type; net::GetWellKnownMimeTypeFromExtension( - webkit_glue::WebStringToFilePathString(file_extension), &mime_type); + webkit_base::WebStringToFilePathString(file_extension), &mime_type); return ASCIIToUTF16(mime_type); } @@ -267,7 +268,7 @@ WebString WorkerWebKitPlatformSupportImpl::mimeTypeFromFile( const WebString& file_path) { std::string mime_type; SendSyncMessageFromAnyThread(new MimeRegistryMsg_GetMimeTypeFromFile( - FilePath(webkit_glue::WebStringToFilePathString(file_path)), + FilePath(webkit_base::WebStringToFilePathString(file_path)), &mime_type)); return ASCIIToUTF16(mime_type); } @@ -278,7 +279,7 @@ WebString WorkerWebKitPlatformSupportImpl::preferredExtensionForMIMEType( SendSyncMessageFromAnyThread( new MimeRegistryMsg_GetPreferredExtensionForMimeType( UTF16ToASCII(mime_type), &file_extension)); - return webkit_glue::FilePathStringToWebString(file_extension); + return webkit_base::FilePathStringToWebString(file_extension); } WebBlobRegistry* WorkerWebKitPlatformSupportImpl::blobRegistry() { |