| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.
h" | 5 #include "chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.
h" |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "chrome/browser/sync_file_system/drive_backend_v1/remote_sync_operation
_resolver.h" | 8 #include "chrome/browser/sync_file_system/drive_backend_v1/remote_sync_operation
_resolver.h" |
| 9 #include "chrome/browser/sync_file_system/logger.h" | 9 #include "chrome/browser/sync_file_system/logger.h" |
| 10 #include "chrome/browser/sync_file_system/remote_change_processor.h" | 10 #include "chrome/browser/sync_file_system/remote_change_processor.h" |
| 11 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" | 11 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" |
| 12 #include "content/public/browser/browser_thread.h" | |
| 13 | 12 |
| 14 using fileapi::FileSystemURL; | 13 using fileapi::FileSystemURL; |
| 15 | 14 |
| 16 namespace { | 15 namespace { |
| 17 | 16 |
| 18 void EmptyStatusCallback(sync_file_system::SyncStatusCode status) {} | 17 void EmptyStatusCallback(sync_file_system::SyncStatusCode status) {} |
| 19 | 18 |
| 20 } // namespace | 19 } // namespace |
| 21 | 20 |
| 22 namespace sync_file_system { | 21 namespace sync_file_system { |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 RemoteChangeProcessor* RemoteSyncDelegate::remote_change_processor() { | 483 RemoteChangeProcessor* RemoteSyncDelegate::remote_change_processor() { |
| 485 return sync_service_->remote_change_processor_; | 484 return sync_service_->remote_change_processor_; |
| 486 } | 485 } |
| 487 | 486 |
| 488 ConflictResolutionResolver* RemoteSyncDelegate::conflict_resolution_resolver() { | 487 ConflictResolutionResolver* RemoteSyncDelegate::conflict_resolution_resolver() { |
| 489 return &sync_service_->conflict_resolution_resolver_; | 488 return &sync_service_->conflict_resolution_resolver_; |
| 490 } | 489 } |
| 491 | 490 |
| 492 } // namespace drive_backend | 491 } // namespace drive_backend |
| 493 } // namespace sync_file_system | 492 } // namespace sync_file_system |
| OLD | NEW |