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

Side by Side Diff: chrome/browser/chromeos/drive/file_system.h

Issue 148233006: drive: Use UploadNewFile from EntryUpdatePerformer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/file_system.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 DriveServiceInterface* drive_service_; 248 DriveServiceInterface* drive_service_;
249 JobScheduler* scheduler_; 249 JobScheduler* scheduler_;
250 internal::ResourceMetadata* resource_metadata_; 250 internal::ResourceMetadata* resource_metadata_;
251 251
252 // Time of the last update check. 252 // Time of the last update check.
253 base::Time last_update_check_time_; 253 base::Time last_update_check_time_;
254 254
255 // Error of the last update check. 255 // Error of the last update check.
256 FileError last_update_check_error_; 256 FileError last_update_check_error_;
257 257
258 scoped_ptr<internal::SyncClient> sync_client_;
259
260 // The loader is used to load the change lists. 258 // The loader is used to load the change lists.
261 scoped_ptr<internal::ChangeListLoader> change_list_loader_; 259 scoped_ptr<internal::ChangeListLoader> change_list_loader_;
262 260
261 scoped_ptr<internal::SyncClient> sync_client_;
262
263 ObserverList<FileSystemObserver> observers_; 263 ObserverList<FileSystemObserver> observers_;
264 264
265 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; 265 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
266 266
267 base::FilePath temporary_file_directory_; 267 base::FilePath temporary_file_directory_;
268 268
269 // Implementation of each file system operation. 269 // Implementation of each file system operation.
270 scoped_ptr<file_system::CopyOperation> copy_operation_; 270 scoped_ptr<file_system::CopyOperation> copy_operation_;
271 scoped_ptr<file_system::CreateDirectoryOperation> create_directory_operation_; 271 scoped_ptr<file_system::CreateDirectoryOperation> create_directory_operation_;
272 scoped_ptr<file_system::CreateFileOperation> create_file_operation_; 272 scoped_ptr<file_system::CreateFileOperation> create_file_operation_;
(...skipping 10 matching lines...) Expand all
283 // Note: This should remain the last member so it'll be destroyed and 283 // Note: This should remain the last member so it'll be destroyed and
284 // invalidate the weak pointers before any other members are destroyed. 284 // invalidate the weak pointers before any other members are destroyed.
285 base::WeakPtrFactory<FileSystem> weak_ptr_factory_; 285 base::WeakPtrFactory<FileSystem> weak_ptr_factory_;
286 286
287 DISALLOW_COPY_AND_ASSIGN(FileSystem); 287 DISALLOW_COPY_AND_ASSIGN(FileSystem);
288 }; 288 };
289 289
290 } // namespace drive 290 } // namespace drive
291 291
292 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_ 292 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/file_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698