| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/sync_file_system_service_factory.h" | 5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h" |
| 9 #include "chrome/browser/sync_file_system/sync_file_system_service.h" | 10 #include "chrome/browser/sync_file_system/sync_file_system_service.h" |
| 10 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" | 11 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" |
| 11 #include "components/browser_context_keyed_service/browser_context_dependency_ma
nager.h" | 12 #include "components/browser_context_keyed_service/browser_context_dependency_ma
nager.h" |
| 12 | 13 |
| 13 namespace sync_file_system { | 14 namespace sync_file_system { |
| 14 | 15 |
| 15 namespace { | 16 namespace { |
| 16 const char kDisableLastWriteWin[] = "disable-syncfs-last-write-win"; | 17 const char kDisableLastWriteWin[] = "disable-syncfs-last-write-win"; |
| 17 } | 18 } |
| 18 | 19 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 remote_file_service->SetConflictResolutionPolicy( | 78 remote_file_service->SetConflictResolutionPolicy( |
| 78 CONFLICT_RESOLUTION_POLICY_MANUAL); | 79 CONFLICT_RESOLUTION_POLICY_MANUAL); |
| 79 } | 80 } |
| 80 | 81 |
| 81 service->Initialize(local_file_service.Pass(), | 82 service->Initialize(local_file_service.Pass(), |
| 82 remote_file_service.Pass()); | 83 remote_file_service.Pass()); |
| 83 return service; | 84 return service; |
| 84 } | 85 } |
| 85 | 86 |
| 86 } // namespace sync_file_system | 87 } // namespace sync_file_system |
| OLD | NEW |