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

Unified Diff: components/leveldb/env_mojo.cc

Issue 1962503002: Add mojom module suffix in .mojom files for components/filesystem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/filesystem/util.cc ('k') | components/leveldb/leveldb_mojo_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/leveldb/env_mojo.cc
diff --git a/components/leveldb/env_mojo.cc b/components/leveldb/env_mojo.cc
index 38b773dc7d95a03b35d2ae689dbae449cbbd843c..54681d0d1428804689ce71cdd63f973b21cafcd6 100644
--- a/components/leveldb/env_mojo.cc
+++ b/components/leveldb/env_mojo.cc
@@ -26,10 +26,10 @@ base::File::Error LastFileError() {
#endif
}
-Status FilesystemErrorToStatus(filesystem::FileError error,
+Status FilesystemErrorToStatus(filesystem::mojom::FileError error,
const std::string& filename,
leveldb_env::MethodID method) {
- if (error == filesystem::FileError::OK)
+ if (error == filesystem::mojom::FileError::OK)
return Status::OK();
std::string err_str =
@@ -193,8 +193,9 @@ class MojoWritableFile : public leveldb::WritableFile {
enum Type { kManifest, kTable, kOther };
leveldb::Status SyncParent() {
- filesystem::FileError error = thread_->SyncDirectory(dir_, parent_dir_);
- return error == filesystem::FileError::OK
+ filesystem::mojom::FileError error =
+ thread_->SyncDirectory(dir_, parent_dir_);
+ return error == filesystem::mojom::FileError::OK
? Status::OK()
: Status::IOError(filename_,
base::File::ErrorToString(base::File::Error(
@@ -226,7 +227,7 @@ Status MojoEnv::NewSequentialFile(const std::string& fname,
TRACE_EVENT1("leveldb", "MojoEnv::NewSequentialFile", "fname", fname);
base::File f = thread_->OpenFileHandle(
dir_, mojo::String::From(fname),
- filesystem::kFlagOpen | filesystem::kFlagRead);
+ filesystem::mojom::kFlagOpen | filesystem::mojom::kFlagRead);
if (!f.IsValid()) {
*result = nullptr;
return MakeIOError(fname, "Unable to create sequential file",
@@ -242,7 +243,7 @@ Status MojoEnv::NewRandomAccessFile(const std::string& fname,
TRACE_EVENT1("leveldb", "MojoEnv::NewRandomAccessFile", "fname", fname);
base::File f = thread_->OpenFileHandle(
dir_, mojo::String::From(fname),
- filesystem::kFlagRead | filesystem::kFlagOpen);
+ filesystem::mojom::kFlagRead | filesystem::mojom::kFlagOpen);
if (!f.IsValid()) {
*result = nullptr;
base::File::Error error_code = f.error_details();
@@ -259,7 +260,7 @@ Status MojoEnv::NewWritableFile(const std::string& fname,
TRACE_EVENT1("leveldb", "MojoEnv::NewWritableFile", "fname", fname);
base::File f = thread_->OpenFileHandle(
dir_, mojo::String::From(fname),
- filesystem::kCreateAlways | filesystem::kFlagWrite);
+ filesystem::mojom::kCreateAlways | filesystem::mojom::kFlagWrite);
if (!f.IsValid()) {
*result = nullptr;
return MakeIOError(fname, "Unable to create writable file",
@@ -275,7 +276,7 @@ Status MojoEnv::NewAppendableFile(const std::string& fname,
TRACE_EVENT1("leveldb", "MojoEnv::NewAppendableFile", "fname", fname);
base::File f = thread_->OpenFileHandle(
dir_, mojo::String::From(fname),
- filesystem::kFlagOpenAlways | filesystem::kFlagAppend);
+ filesystem::mojom::kFlagOpenAlways | filesystem::mojom::kFlagAppend);
if (!f.IsValid()) {
*result = nullptr;
return MakeIOError(fname, "Unable to create appendable file",
@@ -313,8 +314,8 @@ Status MojoEnv::CreateDir(const std::string& dirname) {
Status MojoEnv::DeleteDir(const std::string& dirname) {
TRACE_EVENT1("leveldb", "MojoEnv::DeleteDir", "dirname", dirname);
return FilesystemErrorToStatus(
- thread_->Delete(dir_, dirname, filesystem::kDeleteFlagRecursive), dirname,
- leveldb_env::kDeleteDir);
+ thread_->Delete(dir_, dirname, filesystem::mojom::kDeleteFlagRecursive),
+ dirname, leveldb_env::kDeleteDir);
}
Status MojoEnv::GetFileSize(const std::string& fname, uint64_t* file_size) {
@@ -333,7 +334,7 @@ Status MojoEnv::RenameFile(const std::string& src, const std::string& target) {
Status MojoEnv::LockFile(const std::string& fname, FileLock** lock) {
TRACE_EVENT1("leveldb", "MojoEnv::LockFile", "fname", fname);
- std::pair<filesystem::FileError, LevelDBMojoProxy::OpaqueLock*> p =
+ std::pair<filesystem::mojom::FileError, LevelDBMojoProxy::OpaqueLock*> p =
thread_->LockFile(dir_, mojo::String::From(fname));
if (p.second)
@@ -348,7 +349,7 @@ Status MojoEnv::UnlockFile(FileLock* lock) {
std::string fname = my_lock ? my_lock->name() : "(invalid)";
TRACE_EVENT1("leveldb", "MojoEnv::UnlockFile", "fname", fname);
- filesystem::FileError err = thread_->UnlockFile(my_lock->TakeLock());
+ filesystem::mojom::FileError err = thread_->UnlockFile(my_lock->TakeLock());
delete my_lock;
return FilesystemErrorToStatus(err, fname, leveldb_env::kUnlockFile);
}
@@ -366,7 +367,7 @@ Status MojoEnv::NewLogger(const std::string& fname, Logger** result) {
TRACE_EVENT1("leveldb", "MojoEnv::NewLogger", "fname", fname);
std::unique_ptr<base::File> f(new base::File(thread_->OpenFileHandle(
dir_, mojo::String::From(fname),
- filesystem::kCreateAlways | filesystem::kFlagWrite)));
+ filesystem::mojom::kCreateAlways | filesystem::mojom::kFlagWrite)));
if (!f->IsValid()) {
*result = NULL;
return MakeIOError(fname, "Unable to create log file",
« no previous file with comments | « components/filesystem/util.cc ('k') | components/leveldb/leveldb_mojo_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698