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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 void AddPermissionAfterGetResourceEntry( | 235 void AddPermissionAfterGetResourceEntry( |
236 const std::string& email, | 236 const std::string& email, |
237 google_apis::drive::PermissionRole role, | 237 google_apis::drive::PermissionRole role, |
238 const FileOperationCallback& callback, | 238 const FileOperationCallback& callback, |
239 ResourceEntry* entry, | 239 ResourceEntry* entry, |
240 FileError error); | 240 FileError error); |
241 | 241 |
242 // Part of OnDriveSyncError(). | 242 // Part of OnDriveSyncError(). |
243 virtual void OnDriveSyncErrorAfterGetFilePath( | 243 virtual void OnDriveSyncErrorAfterGetFilePath( |
244 file_system::DriveSyncErrorType type, | 244 file_system::DriveSyncErrorType type, |
245 const base::FilePath& fiepath); | 245 const base::FilePath* file_path, |
| 246 FileError error); |
246 | 247 |
247 // Used to get Drive related preferences. | 248 // Used to get Drive related preferences. |
248 PrefService* pref_service_; | 249 PrefService* pref_service_; |
249 | 250 |
250 // Sub components owned by DriveIntegrationService. | 251 // Sub components owned by DriveIntegrationService. |
251 EventLogger* logger_; | 252 EventLogger* logger_; |
252 internal::FileCache* cache_; | 253 internal::FileCache* cache_; |
253 DriveServiceInterface* drive_service_; | 254 DriveServiceInterface* drive_service_; |
254 JobScheduler* scheduler_; | 255 JobScheduler* scheduler_; |
255 internal::ResourceMetadata* resource_metadata_; | 256 internal::ResourceMetadata* resource_metadata_; |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
296 // Note: This should remain the last member so it'll be destroyed and | 297 // Note: This should remain the last member so it'll be destroyed and |
297 // invalidate the weak pointers before any other members are destroyed. | 298 // invalidate the weak pointers before any other members are destroyed. |
298 base::WeakPtrFactory<FileSystem> weak_ptr_factory_; | 299 base::WeakPtrFactory<FileSystem> weak_ptr_factory_; |
299 | 300 |
300 DISALLOW_COPY_AND_ASSIGN(FileSystem); | 301 DISALLOW_COPY_AND_ASSIGN(FileSystem); |
301 }; | 302 }; |
302 | 303 |
303 } // namespace drive | 304 } // namespace drive |
304 | 305 |
305 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ | 306 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ |
OLD | NEW |