OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/extensions/extension_service.h" | 6 #include "chrome/browser/extensions/extension_service.h" |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/sync/api/syncable_service.h" | 8 #include "chrome/browser/sync/api/syncable_service.h" |
9 #include "chrome/browser/sync/glue/app_change_processor.h" | 9 #include "chrome/browser/sync/glue/app_change_processor.h" |
10 #include "chrome/browser/sync/glue/app_data_type_controller.h" | 10 #include "chrome/browser/sync/glue/app_data_type_controller.h" |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 } | 160 } |
161 | 161 |
162 if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) { | 162 if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) { |
163 pss->RegisterDataTypeController( | 163 pss->RegisterDataTypeController( |
164 new AutofillProfileDataTypeController(this, profile_)); | 164 new AutofillProfileDataTypeController(this, profile_)); |
165 } | 165 } |
166 } | 166 } |
167 | 167 |
168 DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager( | 168 DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager( |
169 SyncBackendHost* backend, | 169 SyncBackendHost* backend, |
170 const DataTypeController::TypeMap& controllers) { | 170 DataTypeController::TypeMap* controllers) { |
171 return new DataTypeManagerImpl(backend, controllers); | 171 return new DataTypeManagerImpl(backend, controllers); |
172 } | 172 } |
173 | 173 |
174 ProfileSyncFactory::SyncComponents | 174 ProfileSyncFactory::SyncComponents |
175 ProfileSyncFactoryImpl::CreateAppSyncComponents( | 175 ProfileSyncFactoryImpl::CreateAppSyncComponents( |
176 ProfileSyncService* profile_sync_service, | 176 ProfileSyncService* profile_sync_service, |
177 UnrecoverableErrorHandler* error_handler) { | 177 UnrecoverableErrorHandler* error_handler) { |
178 // For now we simply use extensions sync objects with the app sync | 178 // For now we simply use extensions sync objects with the app sync |
179 // traits. If apps become more than simply extensions, we may have | 179 // traits. If apps become more than simply extensions, we may have |
180 // to write our own apps model associator and/or change processor. | 180 // to write our own apps model associator and/or change processor. |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 ProfileSyncFactory::SyncComponents | 317 ProfileSyncFactory::SyncComponents |
318 ProfileSyncFactoryImpl::CreateSessionSyncComponents( | 318 ProfileSyncFactoryImpl::CreateSessionSyncComponents( |
319 ProfileSyncService* profile_sync_service, | 319 ProfileSyncService* profile_sync_service, |
320 UnrecoverableErrorHandler* error_handler) { | 320 UnrecoverableErrorHandler* error_handler) { |
321 SessionModelAssociator* model_associator = | 321 SessionModelAssociator* model_associator = |
322 new SessionModelAssociator(profile_sync_service); | 322 new SessionModelAssociator(profile_sync_service); |
323 SessionChangeProcessor* change_processor = | 323 SessionChangeProcessor* change_processor = |
324 new SessionChangeProcessor(error_handler, model_associator); | 324 new SessionChangeProcessor(error_handler, model_associator); |
325 return SyncComponents(model_associator, change_processor); | 325 return SyncComponents(model_associator, change_processor); |
326 } | 326 } |
OLD | NEW |