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

Side by Side Diff: chrome/browser/sync_file_system/drive_file_sync_service.h

Issue 14701004: [Sync FileSystem] Implement directory supported RESOLVE_TO_LOCAL to LocalSync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: handle error, DCHECK fix Created 7 years, 7 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/sync_file_system/drive_file_sync_service.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_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 scoped_ptr<google_apis::ResourceEntry> entry); 216 scoped_ptr<google_apis::ResourceEntry> entry);
217 217
218 // Local synchronization related methods. 218 // Local synchronization related methods.
219 // Resolves LocalSync operation type. If non-null |param| is given 219 // Resolves LocalSync operation type. If non-null |param| is given
220 // the method also populates param->has_drive_metadata and 220 // the method also populates param->has_drive_metadata and
221 // param->drive_metadata fields. 221 // param->drive_metadata fields.
222 void ApplyLocalChangeInternal( 222 void ApplyLocalChangeInternal(
223 scoped_ptr<ApplyLocalChangeParam> param, 223 scoped_ptr<ApplyLocalChangeParam> param,
224 SyncStatusCode status, 224 SyncStatusCode status,
225 const std::string& resource_id); 225 const std::string& resource_id);
226 void DidDeleteForResolveToLocalForLocalSync(
227 const std::string& origin_resource_id,
228 const base::FilePath& local_file_path,
229 const fileapi::FileSystemURL& url,
230 scoped_ptr<ApplyLocalChangeParam> param,
231 google_apis::GDataErrorCode error);
226 void DidApplyLocalChange( 232 void DidApplyLocalChange(
227 scoped_ptr<ApplyLocalChangeParam> param, 233 scoped_ptr<ApplyLocalChangeParam> param,
228 const google_apis::GDataErrorCode error, 234 const google_apis::GDataErrorCode error,
229 SyncStatusCode status); 235 SyncStatusCode status);
230 void DidResolveConflictToRemoteChange( 236 void DidResolveConflictToRemoteChange(
231 scoped_ptr<ApplyLocalChangeParam> param, 237 scoped_ptr<ApplyLocalChangeParam> param,
232 SyncStatusCode status); 238 SyncStatusCode status);
233 void FinalizeLocalSync( 239 void FinalizeLocalSync(
234 scoped_ptr<TaskToken> token, 240 scoped_ptr<TaskToken> token,
235 const SyncStatusCallback& callback, 241 const SyncStatusCallback& callback,
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer 507 // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer
502 // in |token_|. 508 // in |token_|.
503 base::WeakPtrFactory<DriveFileSyncService> weak_factory_; 509 base::WeakPtrFactory<DriveFileSyncService> weak_factory_;
504 510
505 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService); 511 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService);
506 }; 512 };
507 513
508 } // namespace sync_file_system 514 } // namespace sync_file_system
509 515
510 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 516 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_file_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698