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

Side by Side Diff: webkit/glue/webfileutilities_impl.cc

Issue 101143006: Convert base::file_util to use File instead of PlatformFile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove base:: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/browser/fileapi/sandbox_directory_database.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/webfileutilities_impl.h" 5 #include "webkit/glue/webfileutilities_impl.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "net/base/file_stream.h" 10 #include "net/base/file_stream.h"
(...skipping 13 matching lines...) Expand all
24 24
25 WebFileUtilitiesImpl::~WebFileUtilitiesImpl() { 25 WebFileUtilitiesImpl::~WebFileUtilitiesImpl() {
26 } 26 }
27 27
28 bool WebFileUtilitiesImpl::getFileInfo(const WebString& path, 28 bool WebFileUtilitiesImpl::getFileInfo(const WebString& path,
29 blink::WebFileInfo& web_file_info) { 29 blink::WebFileInfo& web_file_info) {
30 if (sandbox_enabled_) { 30 if (sandbox_enabled_) {
31 NOTREACHED(); 31 NOTREACHED();
32 return false; 32 return false;
33 } 33 }
34 // TODO(rvargas): convert this code to use base::File::Info.
34 base::PlatformFileInfo file_info; 35 base::PlatformFileInfo file_info;
35 if (!base::GetFileInfo(base::FilePath::FromUTF16Unsafe(path), &file_info)) 36 if (!base::GetFileInfo(base::FilePath::FromUTF16Unsafe(path),
37 reinterpret_cast<base::File::Info*>(&file_info)))
36 return false; 38 return false;
37 39
38 webkit_glue::PlatformFileInfoToWebFileInfo(file_info, &web_file_info); 40 webkit_glue::PlatformFileInfoToWebFileInfo(file_info, &web_file_info);
39 web_file_info.platformPath = path; 41 web_file_info.platformPath = path;
40 return true; 42 return true;
41 } 43 }
42 44
43 WebString WebFileUtilitiesImpl::directoryName(const WebString& path) { 45 WebString WebFileUtilitiesImpl::directoryName(const WebString& path) {
44 return base::FilePath::FromUTF16Unsafe(path).DirName().AsUTF16Unsafe(); 46 return base::FilePath::FromUTF16Unsafe(path).DirName().AsUTF16Unsafe();
45 } 47 }
(...skipping 30 matching lines...) Expand all
76 78
77 int WebFileUtilitiesImpl::readFromFile(base::PlatformFile handle, 79 int WebFileUtilitiesImpl::readFromFile(base::PlatformFile handle,
78 char* data, 80 char* data,
79 int length) { 81 int length) {
80 if (handle == base::kInvalidPlatformFileValue || !data || length <= 0) 82 if (handle == base::kInvalidPlatformFileValue || !data || length <= 0)
81 return -1; 83 return -1;
82 return base::ReadPlatformFileCurPosNoBestEffort(handle, data, length); 84 return base::ReadPlatformFileCurPosNoBestEffort(handle, data, length);
83 } 85 }
84 86
85 } // namespace webkit_glue 87 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/browser/fileapi/sandbox_directory_database.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698