| Index: components/filesystem/file_impl.h
|
| diff --git a/components/filesystem/file_impl.h b/components/filesystem/file_impl.h
|
| index 6a232fd328cbdf9b3ff7e1c4960e5b4bf54d2520..f7eb1b4e5c2c35e9be9bcad1045330edb5beb8cb 100644
|
| --- a/components/filesystem/file_impl.h
|
| +++ b/components/filesystem/file_impl.h
|
| @@ -23,14 +23,14 @@ namespace filesystem {
|
| class LockTable;
|
| class SharedTempDir;
|
|
|
| -class FileImpl : public File {
|
| +class FileImpl : public mojom::File {
|
| public:
|
| - FileImpl(mojo::InterfaceRequest<File> request,
|
| + FileImpl(mojo::InterfaceRequest<mojom::File> request,
|
| const base::FilePath& path,
|
| uint32_t flags,
|
| scoped_refptr<SharedTempDir> temp_dir,
|
| scoped_refptr<LockTable> lock_table);
|
| - FileImpl(mojo::InterfaceRequest<File> request,
|
| + FileImpl(mojo::InterfaceRequest<mojom::File> request,
|
| const base::FilePath& path,
|
| base::File file,
|
| scoped_refptr<SharedTempDir> temp_dir,
|
| @@ -41,7 +41,7 @@ class FileImpl : public File {
|
| bool IsValid() const;
|
|
|
| // Attempts to perform the native operating system's locking operations on
|
| - // the internal File handle
|
| + // the internal mojom::File handle
|
| base::File::Error RawLockFile();
|
| base::File::Error RawUnlockFile();
|
|
|
| @@ -51,22 +51,22 @@ class FileImpl : public File {
|
| void Close(const CloseCallback& callback) override;
|
| void Read(uint32_t num_bytes_to_read,
|
| int64_t offset,
|
| - Whence whence,
|
| + mojom::Whence whence,
|
| const ReadCallback& callback) override;
|
| void Write(mojo::Array<uint8_t> bytes_to_write,
|
| int64_t offset,
|
| - Whence whence,
|
| + mojom::Whence whence,
|
| const WriteCallback& callback) override;
|
| void Tell(const TellCallback& callback) override;
|
| void Seek(int64_t offset,
|
| - Whence whence,
|
| + mojom::Whence whence,
|
| const SeekCallback& callback) override;
|
| void Stat(const StatCallback& callback) override;
|
| void Truncate(int64_t size, const TruncateCallback& callback) override;
|
| - void Touch(TimespecOrNowPtr atime,
|
| - TimespecOrNowPtr mtime,
|
| + void Touch(mojom::TimespecOrNowPtr atime,
|
| + mojom::TimespecOrNowPtr mtime,
|
| const TouchCallback& callback) override;
|
| - void Dup(mojo::InterfaceRequest<File> file,
|
| + void Dup(mojo::InterfaceRequest<mojom::File> file,
|
| const DupCallback& callback) override;
|
| void Flush(const FlushCallback& callback) override;
|
| void Lock(const LockCallback& callback) override;
|
| @@ -74,7 +74,7 @@ class FileImpl : public File {
|
| void AsHandle(const AsHandleCallback& callback) override;
|
|
|
| private:
|
| - mojo::StrongBinding<File> binding_;
|
| + mojo::StrongBinding<mojom::File> binding_;
|
| base::File file_;
|
| base::FilePath path_;
|
| scoped_refptr<SharedTempDir> temp_dir_;
|
|
|