Base: Rename File::error() to File::error_details()
BUG=322664
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/126453004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243676 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: ee8808c5d8d188be99eb69c6efbd27135ccb2956
diff --git a/base/files/file.cc b/base/files/file.cc
index 508103a..478f902 100644
--- a/base/files/file.cc
+++ b/base/files/file.cc
@@ -20,7 +20,7 @@
File::File()
: file_(kInvalidPlatformFileValue),
- error_(FILE_OK),
+ error_details_(FILE_OK),
created_(false),
async_(false) {
}
@@ -28,7 +28,7 @@
#if !defined(OS_NACL)
File::File(const FilePath& name, uint32 flags)
: file_(kInvalidPlatformFileValue),
- error_(FILE_OK),
+ error_details_(FILE_OK),
created_(false),
async_(false) {
Initialize(name, flags);
@@ -37,14 +37,14 @@
File::File(PlatformFile platform_file)
: file_(platform_file),
- error_(FILE_OK),
+ error_details_(FILE_OK),
created_(false),
async_(false) {
}
File::File(RValue other)
: file_(other.object->TakePlatformFile()),
- error_(other.object->error()),
+ error_details_(other.object->error_details()),
created_(other.object->created()),
async_(other.object->async_) {
}
@@ -57,7 +57,7 @@
if (this != other.object) {
Close();
SetPlatformFile(other.object->TakePlatformFile());
- error_ = other.object->error();
+ error_details_ = other.object->error_details();
created_ = other.object->created();
async_ = other.object->async_;
}
@@ -67,7 +67,7 @@
#if !defined(OS_NACL)
void File::Initialize(const FilePath& name, uint32 flags) {
if (name.ReferencesParent()) {
- error_ = FILE_ERROR_ACCESS_DENIED;
+ error_details_ = FILE_ERROR_ACCESS_DENIED;
return;
}
InitializeUnsafe(name, flags);