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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/drive/file_system.h

Issue 817063006: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/drive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 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 | « chrome/browser/chromeos/drive/file_cache_unittest.cc ('k') | chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9c35a33f662a0cf96a99c9b9dbd4e1945bee8023..85e6e89d414c237b05b468866603ac029a6495c3 100644
--- a/chrome/browser/chromeos/drive/file_system.h
+++ b/chrome/browser/chromeos/drive/file_system.h
@@ -70,115 +70,104 @@ class FileSystem : public FileSystemInterface,
internal::ResourceMetadata* resource_metadata,
base::SequencedTaskRunner* blocking_task_runner,
const base::FilePath& temporary_file_directory);
- virtual ~FileSystem();
+ ~FileSystem() override;
// FileSystemInterface overrides.
- 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;
- virtual void SearchMetadata(const std::string& query,
- int options,
- int at_most_num_matches,
- const SearchMetadataCallback& callback) override;
- virtual void SearchByHashes(const std::vector<std::string>& hashes,
- const SearchByHashesCallback& callback) override;
- virtual void TransferFileFromLocalToRemote(
+ void AddObserver(FileSystemObserver* observer) override;
+ void RemoveObserver(FileSystemObserver* observer) override;
+ void CheckForUpdates() override;
+ void Search(const std::string& search_query,
+ const GURL& next_link,
+ const SearchCallback& callback) override;
+ void SearchMetadata(const std::string& query,
+ int options,
+ int at_most_num_matches,
+ const SearchMetadataCallback& callback) override;
+ void SearchByHashes(const std::vector<std::string>& hashes,
+ const SearchByHashesCallback& callback) override;
+ void TransferFileFromLocalToRemote(
const base::FilePath& local_src_file_path,
const base::FilePath& remote_dest_file_path,
const FileOperationCallback& callback) override;
- virtual void OpenFile(const base::FilePath& file_path,
- OpenMode open_mode,
- const std::string& mime_type,
- const OpenFileCallback& callback) override;
- virtual void Copy(const base::FilePath& src_file_path,
- const base::FilePath& dest_file_path,
- bool preserve_last_modified,
+ void OpenFile(const base::FilePath& file_path,
+ OpenMode open_mode,
+ const std::string& mime_type,
+ const OpenFileCallback& callback) override;
+ void Copy(const base::FilePath& src_file_path,
+ const base::FilePath& dest_file_path,
+ bool preserve_last_modified,
+ const FileOperationCallback& callback) override;
+ void Move(const base::FilePath& src_file_path,
+ const base::FilePath& dest_file_path,
+ const FileOperationCallback& callback) override;
+ void Remove(const base::FilePath& file_path,
+ bool is_recursive,
+ const FileOperationCallback& callback) override;
+ void CreateDirectory(const base::FilePath& directory_path,
+ bool is_exclusive,
+ bool is_recursive,
+ const FileOperationCallback& callback) override;
+ void CreateFile(const base::FilePath& file_path,
+ bool is_exclusive,
+ const std::string& mime_type,
+ const FileOperationCallback& callback) override;
+ void TouchFile(const base::FilePath& file_path,
+ const base::Time& last_access_time,
+ const base::Time& last_modified_time,
+ const FileOperationCallback& callback) override;
+ void TruncateFile(const base::FilePath& file_path,
+ int64 length,
const FileOperationCallback& callback) override;
- virtual void Move(const base::FilePath& src_file_path,
- const base::FilePath& dest_file_path,
- const FileOperationCallback& callback) override;
- virtual void Remove(const base::FilePath& file_path,
- bool is_recursive,
- const FileOperationCallback& callback) override;
- virtual void CreateDirectory(const base::FilePath& directory_path,
- bool is_exclusive,
- bool is_recursive,
- const FileOperationCallback& callback) override;
- virtual void CreateFile(const base::FilePath& file_path,
- bool is_exclusive,
- const std::string& mime_type,
- 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;
- virtual void TruncateFile(const base::FilePath& file_path,
- int64 length,
- const FileOperationCallback& callback) override;
- virtual void Pin(const base::FilePath& file_path,
- const FileOperationCallback& callback) override;
- virtual void Unpin(const base::FilePath& file_path,
- const FileOperationCallback& callback) override;
- virtual void GetFile(const base::FilePath& file_path,
- const GetFileCallback& callback) override;
- virtual void GetFileForSaving(const base::FilePath& file_path,
- const GetFileCallback& callback) override;
- virtual base::Closure GetFileContent(
+ void Pin(const base::FilePath& file_path,
+ const FileOperationCallback& callback) override;
+ void Unpin(const base::FilePath& file_path,
+ const FileOperationCallback& callback) override;
+ void GetFile(const base::FilePath& file_path,
+ const GetFileCallback& callback) override;
+ void GetFileForSaving(const base::FilePath& file_path,
+ const GetFileCallback& callback) override;
+ base::Closure GetFileContent(
const base::FilePath& file_path,
const GetFileContentInitializedCallback& initialized_callback,
const google_apis::GetContentCallback& get_content_callback,
const FileOperationCallback& completion_callback) override;
- virtual void GetResourceEntry(
- const base::FilePath& file_path,
- const GetResourceEntryCallback& callback) override;
- virtual void ReadDirectory(
- const base::FilePath& directory_path,
- const ReadDirectoryEntriesCallback& entries_callback,
- const FileOperationCallback& completion_callback) override;
- virtual void GetAvailableSpace(
- const GetAvailableSpaceCallback& callback) override;
- virtual void GetShareUrl(
- const base::FilePath& file_path,
- const GURL& embed_origin,
- const GetShareUrlCallback& callback) override;
- virtual void GetMetadata(
- const GetFilesystemMetadataCallback& callback) override;
- virtual void MarkCacheFileAsMounted(
- const base::FilePath& drive_file_path,
- const MarkMountedCallback& callback) override;
- virtual void MarkCacheFileAsUnmounted(
- const base::FilePath& cache_file_path,
- 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;
- virtual void GetPathFromResourceId(const std::string& resource_id,
- const GetFilePathCallback& callback)
- override;
+ void GetResourceEntry(const base::FilePath& file_path,
+ const GetResourceEntryCallback& callback) override;
+ void ReadDirectory(const base::FilePath& directory_path,
+ const ReadDirectoryEntriesCallback& entries_callback,
+ const FileOperationCallback& completion_callback) override;
+ void GetAvailableSpace(const GetAvailableSpaceCallback& callback) override;
+ void GetShareUrl(const base::FilePath& file_path,
+ const GURL& embed_origin,
+ const GetShareUrlCallback& callback) override;
+ void GetMetadata(const GetFilesystemMetadataCallback& callback) override;
+ void MarkCacheFileAsMounted(const base::FilePath& drive_file_path,
+ const MarkMountedCallback& callback) override;
+ void MarkCacheFileAsUnmounted(const base::FilePath& cache_file_path,
+ const FileOperationCallback& callback) override;
+ void AddPermission(const base::FilePath& drive_file_path,
+ const std::string& email,
+ google_apis::drive::PermissionRole role,
+ const FileOperationCallback& callback) override;
+ void Reset(const FileOperationCallback& callback) override;
+ void GetPathFromResourceId(const std::string& resource_id,
+ const GetFilePathCallback& callback) override;
// file_system::OperationDelegate overrides.
- virtual void OnFileChangedByOperation(
- const FileChange& changed_files) override;
- virtual void OnEntryUpdatedByOperation(const ClientContext& context,
- const std::string& local_id) override;
- virtual void OnDriveSyncError(file_system::DriveSyncErrorType type,
- const std::string& local_id) override;
- virtual bool WaitForSyncComplete(
- const std::string& local_id,
- const FileOperationCallback& callback) override;
+ void OnFileChangedByOperation(const FileChange& changed_files) override;
+ void OnEntryUpdatedByOperation(const ClientContext& context,
+ const std::string& local_id) override;
+ void OnDriveSyncError(file_system::DriveSyncErrorType type,
+ const std::string& local_id) override;
+ bool WaitForSyncComplete(const std::string& local_id,
+ 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;
+ void OnDirectoryReloaded(const base::FilePath& directory_path) override;
+ void OnFileChanged(const FileChange& changed_files) override;
+ void OnLoadFromServerComplete() override;
+ void OnInitialLoadComplete() override;
// Used by tests.
internal::ChangeListLoader* change_list_loader_for_testing() {
« no previous file with comments | « chrome/browser/chromeos/drive/file_cache_unittest.cc ('k') | chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698