Commit 072d5198 authored by Bailey Berro's avatar Bailey Berro Committed by Commit Bot

clean up SmbFileSystem member variables

This change includes some cleanup, removing unused member variables and
removing a reference to a bug that has been fixed.

Bug: chromium:757625, chromium:796334
Change-Id: I6a5901f355050a47aeb59850e34ed463b79b6899
Reviewed-on: https://chromium-review.googlesource.com/978379Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545494}
parent dd2d2b34
...@@ -411,8 +411,7 @@ AbortCallback SmbFileSystem::AddWatcher( ...@@ -411,8 +411,7 @@ AbortCallback SmbFileSystem::AddWatcher(
const storage::WatcherManager::NotificationCallback& const storage::WatcherManager::NotificationCallback&
notification_callback) { notification_callback) {
// Watchers are not supported. // Watchers are not supported.
// This method should not be getting called since watchable is set to false. NOTIMPLEMENTED();
// crbug.com/796334.
callback.Run(base::File::FILE_ERROR_INVALID_OPERATION); callback.Run(base::File::FILE_ERROR_INVALID_OPERATION);
return CreateAbortCallback(); return CreateAbortCallback();
} }
...@@ -423,8 +422,7 @@ void SmbFileSystem::RemoveWatcher( ...@@ -423,8 +422,7 @@ void SmbFileSystem::RemoveWatcher(
bool recursive, bool recursive,
const storage::AsyncFileUtil::StatusCallback& callback) { const storage::AsyncFileUtil::StatusCallback& callback) {
// Watchers are not supported. // Watchers are not supported.
// This method should not be getting called since watchable is set to false. NOTIMPLEMENTED();
// http://www.crbug.com/796334.
callback.Run(base::File::FILE_ERROR_INVALID_OPERATION); callback.Run(base::File::FILE_ERROR_INVALID_OPERATION);
} }
...@@ -440,9 +438,8 @@ file_system_provider::RequestManager* SmbFileSystem::GetRequestManager() { ...@@ -440,9 +438,8 @@ file_system_provider::RequestManager* SmbFileSystem::GetRequestManager() {
file_system_provider::Watchers* SmbFileSystem::GetWatchers() { file_system_provider::Watchers* SmbFileSystem::GetWatchers() {
// Watchers are not supported. // Watchers are not supported.
// This method should not be getting called since watchable is set to false. NOTIMPLEMENTED();
// http://www.crbug.com/796334. return nullptr;
return &watchers_;
} }
const file_system_provider::OpenedFiles& SmbFileSystem::GetOpenedFiles() const { const file_system_provider::OpenedFiles& SmbFileSystem::GetOpenedFiles() const {
......
...@@ -246,10 +246,9 @@ class SmbFileSystem : public file_system_provider::ProvidedFileSystemInterface, ...@@ -246,10 +246,9 @@ class SmbFileSystem : public file_system_provider::ProvidedFileSystemInterface,
// the OperationId for the newly created Operation. // the OperationId for the newly created Operation.
OperationId EnqueueTaskAndGetOperationId(SmbTask task); OperationId EnqueueTaskAndGetOperationId(SmbTask task);
file_system_provider::ProvidedFileSystemInfo file_system_info_; const file_system_provider::ProvidedFileSystemInfo file_system_info_;
file_system_provider::OpenedFiles opened_files_; // opened_files_ is marked const since is currently unsupported.
storage::AsyncFileUtil::EntryList entry_list_; const file_system_provider::OpenedFiles opened_files_;
file_system_provider::Watchers watchers_;
UnmountCallback unmount_callback_; UnmountCallback unmount_callback_;
TempFileManager temp_file_manager_; TempFileManager temp_file_manager_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment