OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ |
6 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ | 6 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 virtual void GetPathFromResourceId(const std::string& resource_id, | 161 virtual void GetPathFromResourceId(const std::string& resource_id, |
162 const GetFilePathCallback& callback) | 162 const GetFilePathCallback& callback) |
163 OVERRIDE; | 163 OVERRIDE; |
164 | 164 |
165 // file_system::OperationObserver overrides. | 165 // file_system::OperationObserver overrides. |
166 virtual void OnFileChangedByOperation( | 166 virtual void OnFileChangedByOperation( |
167 const FileChange& changed_files) OVERRIDE; | 167 const FileChange& changed_files) OVERRIDE; |
168 virtual void OnEntryUpdatedByOperation(const std::string& local_id) OVERRIDE; | 168 virtual void OnEntryUpdatedByOperation(const std::string& local_id) OVERRIDE; |
169 virtual void OnDriveSyncError(file_system::DriveSyncErrorType type, | 169 virtual void OnDriveSyncError(file_system::DriveSyncErrorType type, |
170 const std::string& local_id) OVERRIDE; | 170 const std::string& local_id) OVERRIDE; |
| 171 virtual bool WaitForSyncComplete( |
| 172 const std::string& local_id, |
| 173 const FileOperationCallback& callback) OVERRIDE; |
171 | 174 |
172 // ChangeListLoader::Observer overrides. | 175 // ChangeListLoader::Observer overrides. |
173 // Used to propagate events from ChangeListLoader. | 176 // Used to propagate events from ChangeListLoader. |
174 virtual void OnDirectoryReloaded( | 177 virtual void OnDirectoryReloaded( |
175 const base::FilePath& directory_path) OVERRIDE; | 178 const base::FilePath& directory_path) OVERRIDE; |
176 virtual void OnFileChanged(const FileChange& changed_files) OVERRIDE; | 179 virtual void OnFileChanged(const FileChange& changed_files) OVERRIDE; |
177 virtual void OnLoadFromServerComplete() OVERRIDE; | 180 virtual void OnLoadFromServerComplete() OVERRIDE; |
178 virtual void OnInitialLoadComplete() OVERRIDE; | 181 virtual void OnInitialLoadComplete() OVERRIDE; |
179 | 182 |
180 // Used by tests. | 183 // Used by tests. |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 // Note: This should remain the last member so it'll be destroyed and | 298 // Note: This should remain the last member so it'll be destroyed and |
296 // invalidate the weak pointers before any other members are destroyed. | 299 // invalidate the weak pointers before any other members are destroyed. |
297 base::WeakPtrFactory<FileSystem> weak_ptr_factory_; | 300 base::WeakPtrFactory<FileSystem> weak_ptr_factory_; |
298 | 301 |
299 DISALLOW_COPY_AND_ASSIGN(FileSystem); | 302 DISALLOW_COPY_AND_ASSIGN(FileSystem); |
300 }; | 303 }; |
301 | 304 |
302 } // namespace drive | 305 } // namespace drive |
303 | 306 |
304 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ | 307 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ |
OLD | NEW |