| 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/conflict_resolver.h" | 5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/format_macros.h" | 8 #include "base/format_macros.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "chrome/browser/drive/drive_api_util.h" | 11 #include "chrome/browser/drive/drive_api_util.h" |
| 12 #include "chrome/browser/drive/drive_service_interface.h" | 12 #include "chrome/browser/drive/drive_service_interface.h" |
| 13 #include "chrome/browser/drive/drive_uploader.h" | 13 #include "chrome/browser/drive/drive_uploader.h" |
| 14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" | 14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" |
| 15 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" | 15 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" |
| 16 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" | 16 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" |
| 17 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" | 17 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" |
| 18 #include "chrome/browser/sync_file_system/logger.h" | 18 #include "chrome/browser/sync_file_system/logger.h" |
| 19 #include "google_apis/drive/drive_api_parser.h" | 19 #include "google_apis/drive/drive_api_parser.h" |
| 20 | 20 |
| 21 namespace sync_file_system { | 21 namespace sync_file_system { |
| 22 namespace drive_backend { | 22 namespace drive_backend { |
| 23 | 23 |
| 24 ConflictResolver::ConflictResolver(SyncEngineContext* sync_context) | 24 ConflictResolver::ConflictResolver(SyncEngineContext* sync_context) |
| 25 : sync_context_(sync_context), | 25 : sync_context_(sync_context), |
| 26 weak_ptr_factory_(this) { | 26 weak_ptr_factory_(this) {} |
| 27 } | |
| 28 | 27 |
| 29 ConflictResolver::~ConflictResolver() { | 28 ConflictResolver::~ConflictResolver() {} |
| 30 } | |
| 31 | 29 |
| 32 void ConflictResolver::RunSequential(const SyncStatusCallback& callback) { | 30 void ConflictResolver::RunSequential(const SyncStatusCallback& callback) { |
| 33 if (!IsContextReady()) { | 31 if (!IsContextReady()) { |
| 34 NOTREACHED(); | 32 NOTREACHED(); |
| 35 callback.Run(SYNC_STATUS_FAILED); | 33 callback.Run(SYNC_STATUS_FAILED); |
| 36 return; | 34 return; |
| 37 } | 35 } |
| 38 | 36 |
| 39 // Conflict resolution should be invoked on clean tree. | 37 // Conflict resolution should be invoked on clean tree. |
| 40 if (metadata_database()->HasDirtyTracker()) { | 38 if (metadata_database()->HasDirtyTracker()) { |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 set_used_network(true); | 304 set_used_network(true); |
| 307 return sync_context_->GetDriveService(); | 305 return sync_context_->GetDriveService(); |
| 308 } | 306 } |
| 309 | 307 |
| 310 MetadataDatabase* ConflictResolver::metadata_database() { | 308 MetadataDatabase* ConflictResolver::metadata_database() { |
| 311 return sync_context_->GetMetadataDatabase(); | 309 return sync_context_->GetMetadataDatabase(); |
| 312 } | 310 } |
| 313 | 311 |
| 314 } // namespace drive_backend | 312 } // namespace drive_backend |
| 315 } // namespace sync_file_system | 313 } // namespace sync_file_system |
| OLD | NEW |