OLD | NEW |
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 #include "sync/internal_api/public/internal_components_factory_impl.h" | 5 #include "sync/internal_api/public/internal_components_factory_impl.h" |
6 | 6 |
7 #include "sync/engine/syncer.h" | 7 #include "sync/engine/syncer.h" |
8 #include "sync/engine/sync_scheduler_impl.h" | 8 #include "sync/engine/sync_scheduler_impl.h" |
9 #include "sync/sessions/sync_session_context.h" | 9 #include "sync/sessions/sync_session_context.h" |
10 #include "sync/syncable/on_disk_directory_backing_store.h" | 10 #include "sync/syncable/on_disk_directory_backing_store.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 | 22 |
23 scoped_ptr<sessions::SyncSessionContext> | 23 scoped_ptr<sessions::SyncSessionContext> |
24 InternalComponentsFactoryImpl::BuildContext( | 24 InternalComponentsFactoryImpl::BuildContext( |
25 ServerConnectionManager* connection_manager, | 25 ServerConnectionManager* connection_manager, |
26 syncable::Directory* directory, | 26 syncable::Directory* directory, |
27 const std::vector<ModelSafeWorker*> workers, | 27 const std::vector<ModelSafeWorker*> workers, |
28 ExtensionsActivityMonitor* monitor, | 28 ExtensionsActivityMonitor* monitor, |
29 ThrottledDataTypeTracker* throttled_data_type_tracker, | 29 ThrottledDataTypeTracker* throttled_data_type_tracker, |
30 const std::vector<SyncEngineEventListener*>& listeners, | 30 const std::vector<SyncEngineEventListener*>& listeners, |
31 sessions::DebugInfoGetter* debug_info_getter, | 31 sessions::DebugInfoGetter* debug_info_getter, |
32 TrafficRecorder* traffic_recorder) { | 32 TrafficRecorder* traffic_recorder, |
| 33 bool keystore_encryption_enabled) { |
33 return scoped_ptr<sessions::SyncSessionContext>( | 34 return scoped_ptr<sessions::SyncSessionContext>( |
34 new sessions::SyncSessionContext( | 35 new sessions::SyncSessionContext( |
35 connection_manager, directory, workers, monitor, | 36 connection_manager, directory, workers, monitor, |
36 throttled_data_type_tracker, listeners, debug_info_getter, | 37 throttled_data_type_tracker, listeners, debug_info_getter, |
37 traffic_recorder)); | 38 traffic_recorder, |
| 39 keystore_encryption_enabled)); |
38 } | 40 } |
39 | 41 |
40 scoped_ptr<syncable::DirectoryBackingStore> | 42 scoped_ptr<syncable::DirectoryBackingStore> |
41 InternalComponentsFactoryImpl::BuildDirectoryBackingStore( | 43 InternalComponentsFactoryImpl::BuildDirectoryBackingStore( |
42 const std::string& dir_name, const FilePath& backing_filepath) { | 44 const std::string& dir_name, const FilePath& backing_filepath) { |
43 return scoped_ptr<syncable::DirectoryBackingStore>( | 45 return scoped_ptr<syncable::DirectoryBackingStore>( |
44 new syncable::OnDiskDirectoryBackingStore(dir_name, backing_filepath)); | 46 new syncable::OnDiskDirectoryBackingStore(dir_name, backing_filepath)); |
45 } | 47 } |
46 | 48 |
47 } // namespace syncer | 49 } // namespace syncer |
OLD | NEW |