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

Side by Side Diff: webkit/browser/database/vfs_backend.cc

Issue 16950028: Move file_util::Delete to the base namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/database/vfs_backend.h" 5 #include "webkit/browser/database/vfs_backend.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 "third_party/sqlite/sqlite3.h" 10 #include "third_party/sqlite/sqlite3.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 if (!file_util::CreateTemporaryFileInDir(dir_path, &temp_file_path)) 115 if (!file_util::CreateTemporaryFileInDir(dir_path, &temp_file_path))
116 return; 116 return;
117 117
118 OpenFile(temp_file_path, desired_flags, file_handle); 118 OpenFile(temp_file_path, desired_flags, file_handle);
119 } 119 }
120 120
121 // static 121 // static
122 int VfsBackend::DeleteFile(const base::FilePath& file_path, bool sync_dir) { 122 int VfsBackend::DeleteFile(const base::FilePath& file_path, bool sync_dir) {
123 if (!file_util::PathExists(file_path)) 123 if (!file_util::PathExists(file_path))
124 return SQLITE_OK; 124 return SQLITE_OK;
125 if (!file_util::Delete(file_path, false)) 125 if (!base::Delete(file_path, false))
126 return SQLITE_IOERR_DELETE; 126 return SQLITE_IOERR_DELETE;
127 127
128 int error_code = SQLITE_OK; 128 int error_code = SQLITE_OK;
129 #if defined(OS_POSIX) 129 #if defined(OS_POSIX)
130 if (sync_dir) { 130 if (sync_dir) {
131 base::PlatformFile dir_fd = base::CreatePlatformFile( 131 base::PlatformFile dir_fd = base::CreatePlatformFile(
132 file_path.DirName(), base::PLATFORM_FILE_READ, NULL, NULL); 132 file_path.DirName(), base::PLATFORM_FILE_READ, NULL, NULL);
133 if (dir_fd == base::kInvalidPlatformFileValue) { 133 if (dir_fd == base::kInvalidPlatformFileValue) {
134 error_code = SQLITE_CANTOPEN; 134 error_code = SQLITE_CANTOPEN;
135 } else { 135 } else {
(...skipping 22 matching lines...) Expand all
158 return attributes; 158 return attributes;
159 } 159 }
160 160
161 // static 161 // static
162 int64 VfsBackend::GetFileSize(const base::FilePath& file_path) { 162 int64 VfsBackend::GetFileSize(const base::FilePath& file_path) {
163 int64 size = 0; 163 int64 size = 0;
164 return (file_util::GetFileSize(file_path, &size) ? size : 0); 164 return (file_util::GetFileSize(file_path, &size) ? size : 0);
165 } 165 }
166 166
167 } // namespace webkit_database 167 } // namespace webkit_database
OLDNEW
« no previous file with comments | « webkit/browser/database/database_tracker.cc ('k') | webkit/browser/dom_storage/session_storage_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698