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_data_type_controller.h" | 9 #include "chrome/browser/sync/glue/app_data_type_controller.h" |
10 #include "chrome/browser/sync/glue/autofill_change_processor.h" | 10 #include "chrome/browser/sync/glue/autofill_change_processor.h" |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 } | 151 } |
152 | 152 |
153 if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) { | 153 if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) { |
154 pss->RegisterDataTypeController( | 154 pss->RegisterDataTypeController( |
155 new AutofillProfileDataTypeController(this, profile_)); | 155 new AutofillProfileDataTypeController(this, profile_)); |
156 } | 156 } |
157 } | 157 } |
158 | 158 |
159 DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager( | 159 DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager( |
160 SyncBackendHost* backend, | 160 SyncBackendHost* backend, |
161 const DataTypeController::TypeMap& controllers) { | 161 const DataTypeController::TypeMap* controllers) { |
162 return new DataTypeManagerImpl(backend, controllers); | 162 return new DataTypeManagerImpl(backend, controllers); |
163 } | 163 } |
164 | 164 |
165 ProfileSyncFactory::SyncComponents | 165 ProfileSyncFactory::SyncComponents |
166 ProfileSyncFactoryImpl::CreateAppSyncComponents( | 166 ProfileSyncFactoryImpl::CreateAppSyncComponents( |
167 ProfileSyncService* profile_sync_service, | 167 ProfileSyncService* profile_sync_service, |
168 UnrecoverableErrorHandler* error_handler) { | 168 UnrecoverableErrorHandler* error_handler) { |
169 SyncableService* app_sync_service = | 169 SyncableService* app_sync_service = |
170 profile_sync_service->profile()->GetExtensionService(); | 170 profile_sync_service->profile()->GetExtensionService(); |
171 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 171 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 ProfileSyncFactory::SyncComponents | 310 ProfileSyncFactory::SyncComponents |
311 ProfileSyncFactoryImpl::CreateSessionSyncComponents( | 311 ProfileSyncFactoryImpl::CreateSessionSyncComponents( |
312 ProfileSyncService* profile_sync_service, | 312 ProfileSyncService* profile_sync_service, |
313 UnrecoverableErrorHandler* error_handler) { | 313 UnrecoverableErrorHandler* error_handler) { |
314 SessionModelAssociator* model_associator = | 314 SessionModelAssociator* model_associator = |
315 new SessionModelAssociator(profile_sync_service); | 315 new SessionModelAssociator(profile_sync_service); |
316 SessionChangeProcessor* change_processor = | 316 SessionChangeProcessor* change_processor = |
317 new SessionChangeProcessor(error_handler, model_associator); | 317 new SessionChangeProcessor(error_handler, model_associator); |
318 return SyncComponents(model_associator, change_processor); | 318 return SyncComponents(model_associator, change_processor); |
319 } | 319 } |
OLD | NEW |