| Index: chrome/browser/chromeos/drive/file_system.h
|
| diff --git a/chrome/browser/chromeos/drive/file_system.h b/chrome/browser/chromeos/drive/file_system.h
|
| index 05d751012040b68d7804b50bef6e50fc6a8d2a1f..f2fcde75dcfa0979f6106a47a408766f4c62ee99 100644
|
| --- a/chrome/browser/chromeos/drive/file_system.h
|
| +++ b/chrome/browser/chromeos/drive/file_system.h
|
| @@ -75,109 +75,109 @@ class FileSystem : public FileSystemInterface,
|
| virtual ~FileSystem();
|
|
|
| // FileSystemInterface overrides.
|
| - virtual void AddObserver(FileSystemObserver* observer) OVERRIDE;
|
| - virtual void RemoveObserver(FileSystemObserver* observer) OVERRIDE;
|
| - virtual void CheckForUpdates() OVERRIDE;
|
| + virtual void AddObserver(FileSystemObserver* observer) override;
|
| + virtual void RemoveObserver(FileSystemObserver* observer) override;
|
| + virtual void CheckForUpdates() override;
|
| virtual void Search(const std::string& search_query,
|
| const GURL& next_link,
|
| - const SearchCallback& callback) OVERRIDE;
|
| + const SearchCallback& callback) override;
|
| virtual void SearchMetadata(const std::string& query,
|
| int options,
|
| int at_most_num_matches,
|
| - const SearchMetadataCallback& callback) OVERRIDE;
|
| + const SearchMetadataCallback& callback) override;
|
| virtual void TransferFileFromLocalToRemote(
|
| const base::FilePath& local_src_file_path,
|
| const base::FilePath& remote_dest_file_path,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void OpenFile(const base::FilePath& file_path,
|
| OpenMode open_mode,
|
| const std::string& mime_type,
|
| - const OpenFileCallback& callback) OVERRIDE;
|
| + const OpenFileCallback& callback) override;
|
| virtual void Copy(const base::FilePath& src_file_path,
|
| const base::FilePath& dest_file_path,
|
| bool preserve_last_modified,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void Move(const base::FilePath& src_file_path,
|
| const base::FilePath& dest_file_path,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void Remove(const base::FilePath& file_path,
|
| bool is_recursive,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void CreateDirectory(const base::FilePath& directory_path,
|
| bool is_exclusive,
|
| bool is_recursive,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void CreateFile(const base::FilePath& file_path,
|
| bool is_exclusive,
|
| const std::string& mime_type,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void TouchFile(const base::FilePath& file_path,
|
| const base::Time& last_access_time,
|
| const base::Time& last_modified_time,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void TruncateFile(const base::FilePath& file_path,
|
| int64 length,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void Pin(const base::FilePath& file_path,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void Unpin(const base::FilePath& file_path,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void GetFile(const base::FilePath& file_path,
|
| - const GetFileCallback& callback) OVERRIDE;
|
| + const GetFileCallback& callback) override;
|
| virtual void GetFileForSaving(const base::FilePath& file_path,
|
| - const GetFileCallback& callback) OVERRIDE;
|
| + const GetFileCallback& callback) override;
|
| virtual base::Closure GetFileContent(
|
| const base::FilePath& file_path,
|
| const GetFileContentInitializedCallback& initialized_callback,
|
| const google_apis::GetContentCallback& get_content_callback,
|
| - const FileOperationCallback& completion_callback) OVERRIDE;
|
| + const FileOperationCallback& completion_callback) override;
|
| virtual void GetResourceEntry(
|
| const base::FilePath& file_path,
|
| - const GetResourceEntryCallback& callback) OVERRIDE;
|
| + const GetResourceEntryCallback& callback) override;
|
| virtual void ReadDirectory(
|
| const base::FilePath& directory_path,
|
| const ReadDirectoryEntriesCallback& entries_callback,
|
| - const FileOperationCallback& completion_callback) OVERRIDE;
|
| + const FileOperationCallback& completion_callback) override;
|
| virtual void GetAvailableSpace(
|
| - const GetAvailableSpaceCallback& callback) OVERRIDE;
|
| + const GetAvailableSpaceCallback& callback) override;
|
| virtual void GetShareUrl(
|
| const base::FilePath& file_path,
|
| const GURL& embed_origin,
|
| - const GetShareUrlCallback& callback) OVERRIDE;
|
| + const GetShareUrlCallback& callback) override;
|
| virtual void GetMetadata(
|
| - const GetFilesystemMetadataCallback& callback) OVERRIDE;
|
| + const GetFilesystemMetadataCallback& callback) override;
|
| virtual void MarkCacheFileAsMounted(
|
| const base::FilePath& drive_file_path,
|
| - const MarkMountedCallback& callback) OVERRIDE;
|
| + const MarkMountedCallback& callback) override;
|
| virtual void MarkCacheFileAsUnmounted(
|
| const base::FilePath& cache_file_path,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| virtual void AddPermission(const base::FilePath& drive_file_path,
|
| const std::string& email,
|
| google_apis::drive::PermissionRole role,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| - virtual void Reset(const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
| + virtual void Reset(const FileOperationCallback& callback) override;
|
| virtual void GetPathFromResourceId(const std::string& resource_id,
|
| const GetFilePathCallback& callback)
|
| - OVERRIDE;
|
| + override;
|
|
|
| // file_system::OperationDelegate overrides.
|
| virtual void OnFileChangedByOperation(
|
| - const FileChange& changed_files) OVERRIDE;
|
| - virtual void OnEntryUpdatedByOperation(const std::string& local_id) OVERRIDE;
|
| + const FileChange& changed_files) override;
|
| + virtual void OnEntryUpdatedByOperation(const std::string& local_id) override;
|
| virtual void OnDriveSyncError(file_system::DriveSyncErrorType type,
|
| - const std::string& local_id) OVERRIDE;
|
| + const std::string& local_id) override;
|
| virtual bool WaitForSyncComplete(
|
| const std::string& local_id,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
|
|
| // ChangeListLoader::Observer overrides.
|
| // Used to propagate events from ChangeListLoader.
|
| virtual void OnDirectoryReloaded(
|
| - const base::FilePath& directory_path) OVERRIDE;
|
| - virtual void OnFileChanged(const FileChange& changed_files) OVERRIDE;
|
| - virtual void OnLoadFromServerComplete() OVERRIDE;
|
| - virtual void OnInitialLoadComplete() OVERRIDE;
|
| + const base::FilePath& directory_path) override;
|
| + virtual void OnFileChanged(const FileChange& changed_files) override;
|
| + virtual void OnLoadFromServerComplete() override;
|
| + virtual void OnInitialLoadComplete() override;
|
|
|
| // Used by tests.
|
| internal::ChangeListLoader* change_list_loader_for_testing() {
|
|
|