diff options
| author | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 21:36:00 +0000 |
|---|---|---|
| committer | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 21:36:00 +0000 |
| commit | 141bcc5b660175f90a351d0b1fc412eecbeb70e6 (patch) | |
| tree | 8e168b52c493c7de6b18f7d06efeffa2971e5b03 /webkit/glue | |
| parent | 1f0a90767aadea0859d037be675106941338c5e5 (diff) | |
| download | chromium_src-141bcc5b660175f90a351d0b1fc412eecbeb70e6.zip chromium_src-141bcc5b660175f90a351d0b1fc412eecbeb70e6.tar.gz chromium_src-141bcc5b660175f90a351d0b1fc412eecbeb70e6.tar.bz2 | |
Convert Media Galleries to use base::File
Unfortunately, this brings in changes to webkit/browser/fileapi, and once
that changes, a lot of files have to be updated.
The bright side is that most of the collateral changes are just trivial
renaming of PlatformFileError -> File::Error and PlatformFileInfo ->
File::Info
BUG=322664
Review URL: https://codereview.chromium.org/145303002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webfileutilities_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/webkit/glue/webfileutilities_impl.cc b/webkit/glue/webfileutilities_impl.cc index 6e70ff5..eca5326 100644 --- a/webkit/glue/webfileutilities_impl.cc +++ b/webkit/glue/webfileutilities_impl.cc @@ -32,12 +32,12 @@ bool WebFileUtilitiesImpl::getFileInfo(const WebString& path, return false; } // TODO(rvargas): convert this code to use base::File::Info. - base::PlatformFileInfo file_info; + base::File::Info file_info; if (!base::GetFileInfo(base::FilePath::FromUTF16Unsafe(path), reinterpret_cast<base::File::Info*>(&file_info))) return false; - webkit_glue::PlatformFileInfoToWebFileInfo(file_info, &web_file_info); + webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info); web_file_info.platformPath = path; return true; } diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index b051e43..3b332e2 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -14,8 +14,8 @@ void SetJavaScriptFlags(const std::string& str) { v8::V8::SetFlagsFromString(str.data(), static_cast<int>(str.size())); } -void PlatformFileInfoToWebFileInfo( - const base::PlatformFileInfo& file_info, +void FileInfoToWebFileInfo( + const base::File::Info& file_info, blink::WebFileInfo* web_file_info) { DCHECK(web_file_info); // WebKit now expects NaN as uninitialized/null Date. diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 8f3a62b..6f11f7f 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -7,7 +7,7 @@ #include <string> -#include "base/platform_file.h" +#include "base/files/file.h" #include "webkit/glue/webkit_glue_export.h" namespace blink { @@ -19,8 +19,8 @@ namespace webkit_glue { WEBKIT_GLUE_EXPORT void SetJavaScriptFlags(const std::string& flags); // File info conversion -WEBKIT_GLUE_EXPORT void PlatformFileInfoToWebFileInfo( - const base::PlatformFileInfo& file_info, +WEBKIT_GLUE_EXPORT void FileInfoToWebFileInfo( + const base::File::Info& file_info, blink::WebFileInfo* web_file_info); } // namespace webkit_glue |