Index: base/files/file.cc |
diff --git a/base/files/file.cc b/base/files/file.cc |
index 508103ac7d4e1ebac1d376565bd25f3b86abe258..478f9028443437c4a14480f11fe864132f02252b 100644 |
--- a/base/files/file.cc |
+++ b/base/files/file.cc |
@@ -20,7 +20,7 @@ File::Info::~Info() { |
File::File() |
: file_(kInvalidPlatformFileValue), |
- error_(FILE_OK), |
+ error_details_(FILE_OK), |
created_(false), |
async_(false) { |
} |
@@ -28,7 +28,7 @@ File::File() |
#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(const FilePath& name, uint32 flags) |
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 @@ File& File::operator=(RValue other) { |
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 @@ File& File::operator=(RValue other) { |
#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); |