summaryrefslogtreecommitdiffstats
path: root/webkit/base/file_path_string_conversions.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/base/file_path_string_conversions.cc')
-rw-r--r--webkit/base/file_path_string_conversions.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/webkit/base/file_path_string_conversions.cc b/webkit/base/file_path_string_conversions.cc
index 3ff7557..566c8bb 100644
--- a/webkit/base/file_path_string_conversions.cc
+++ b/webkit/base/file_path_string_conversions.cc
@@ -10,7 +10,8 @@
namespace webkit_base {
-FilePath::StringType WebStringToFilePathString(const WebKit::WebString& str) {
+base::FilePath::StringType WebStringToFilePathString(
+ const WebKit::WebString& str) {
#if defined(OS_POSIX)
return base::SysWideToNativeMB(UTF16ToWideHack(str));
#elif defined(OS_WIN)
@@ -18,7 +19,8 @@ FilePath::StringType WebStringToFilePathString(const WebKit::WebString& str) {
#endif
}
-WebKit::WebString FilePathStringToWebString(const FilePath::StringType& str) {
+WebKit::WebString FilePathStringToWebString(
+ const base::FilePath::StringType& str) {
#if defined(OS_POSIX)
return WideToUTF16Hack(base::SysNativeMBToWide(str));
#elif defined(OS_WIN)
@@ -26,11 +28,11 @@ WebKit::WebString FilePathStringToWebString(const FilePath::StringType& str) {
#endif
}
-FilePath WebStringToFilePath(const WebKit::WebString& str) {
- return FilePath(WebStringToFilePathString(str));
+base::FilePath WebStringToFilePath(const WebKit::WebString& str) {
+ return base::FilePath(WebStringToFilePathString(str));
}
-WebKit::WebString FilePathToWebString(const FilePath& file_path) {
+WebKit::WebString FilePathToWebString(const base::FilePath& file_path) {
return FilePathStringToWebString(file_path.value());
}