| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "chrome/browser/extensions/app_notification_manager.h" | 7 #include "chrome/browser/extensions/app_notification_manager.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
| 9 #include "chrome/browser/extensions/extension_system.h" | 9 #include "chrome/browser/extensions/extension_system.h" |
| 10 #include "chrome/browser/extensions/extension_system_factory.h" | 10 #include "chrome/browser/extensions/extension_system_factory.h" |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( | 202 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( |
| 203 SyncBackendHost* backend, | 203 SyncBackendHost* backend, |
| 204 const DataTypeController::TypeMap* controllers) { | 204 const DataTypeController::TypeMap* controllers) { |
| 205 return new DataTypeManagerImpl(backend, controllers); | 205 return new DataTypeManagerImpl(backend, controllers); |
| 206 } | 206 } |
| 207 | 207 |
| 208 browser_sync::GenericChangeProcessor* | 208 browser_sync::GenericChangeProcessor* |
| 209 ProfileSyncComponentsFactoryImpl::CreateGenericChangeProcessor( | 209 ProfileSyncComponentsFactoryImpl::CreateGenericChangeProcessor( |
| 210 ProfileSyncService* profile_sync_service, | 210 ProfileSyncService* profile_sync_service, |
| 211 browser_sync::DataTypeErrorHandler* error_handler, | 211 browser_sync::DataTypeErrorHandler* error_handler, |
| 212 const base::WeakPtr<SyncableService>& local_service) { | 212 const base::WeakPtr<csync::SyncableService>& local_service) { |
| 213 csync::UserShare* user_share = profile_sync_service->GetUserShare(); | 213 csync::UserShare* user_share = profile_sync_service->GetUserShare(); |
| 214 return new GenericChangeProcessor(error_handler, | 214 return new GenericChangeProcessor(error_handler, |
| 215 local_service, | 215 local_service, |
| 216 user_share); | 216 user_share); |
| 217 } | 217 } |
| 218 | 218 |
| 219 browser_sync::SharedChangeProcessor* ProfileSyncComponentsFactoryImpl:: | 219 browser_sync::SharedChangeProcessor* ProfileSyncComponentsFactoryImpl:: |
| 220 CreateSharedChangeProcessor() { | 220 CreateSharedChangeProcessor() { |
| 221 return new SharedChangeProcessor(); | 221 return new SharedChangeProcessor(); |
| 222 } | 222 } |
| 223 | 223 |
| 224 base::WeakPtr<SyncableService> ProfileSyncComponentsFactoryImpl:: | 224 base::WeakPtr<csync::SyncableService> ProfileSyncComponentsFactoryImpl:: |
| 225 GetSyncableServiceForType(syncable::ModelType type) { | 225 GetSyncableServiceForType(syncable::ModelType type) { |
| 226 if (!profile_) { // For tests. | 226 if (!profile_) { // For tests. |
| 227 return base::WeakPtr<SyncableService>(); | 227 return base::WeakPtr<csync::SyncableService>(); |
| 228 } | 228 } |
| 229 switch (type) { | 229 switch (type) { |
| 230 case syncable::PREFERENCES: | 230 case syncable::PREFERENCES: |
| 231 return profile_->GetPrefs()->GetSyncableService()->AsWeakPtr(); | 231 return profile_->GetPrefs()->GetSyncableService()->AsWeakPtr(); |
| 232 case syncable::AUTOFILL: | 232 case syncable::AUTOFILL: |
| 233 case syncable::AUTOFILL_PROFILE: { | 233 case syncable::AUTOFILL_PROFILE: { |
| 234 if (!web_data_service_.get()) | 234 if (!web_data_service_.get()) |
| 235 return base::WeakPtr<SyncableService>(); | 235 return base::WeakPtr<csync::SyncableService>(); |
| 236 if (type == syncable::AUTOFILL) { | 236 if (type == syncable::AUTOFILL) { |
| 237 return web_data_service_->GetAutocompleteSyncableService()->AsWeakPtr(); | 237 return web_data_service_->GetAutocompleteSyncableService()->AsWeakPtr(); |
| 238 } else { | 238 } else { |
| 239 return web_data_service_-> | 239 return web_data_service_-> |
| 240 GetAutofillProfileSyncableService()->AsWeakPtr(); | 240 GetAutofillProfileSyncableService()->AsWeakPtr(); |
| 241 } | 241 } |
| 242 } | 242 } |
| 243 case syncable::APPS: | 243 case syncable::APPS: |
| 244 case syncable::EXTENSIONS: | 244 case syncable::EXTENSIONS: |
| 245 return extension_system_->extension_service()->AsWeakPtr(); | 245 return extension_system_->extension_service()->AsWeakPtr(); |
| 246 case syncable::SEARCH_ENGINES: | 246 case syncable::SEARCH_ENGINES: |
| 247 return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr(); | 247 return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr(); |
| 248 case syncable::APP_SETTINGS: | 248 case syncable::APP_SETTINGS: |
| 249 case syncable::EXTENSION_SETTINGS: | 249 case syncable::EXTENSION_SETTINGS: |
| 250 return extension_system_->extension_service()->settings_frontend()-> | 250 return extension_system_->extension_service()->settings_frontend()-> |
| 251 GetBackendForSync(type)->AsWeakPtr(); | 251 GetBackendForSync(type)->AsWeakPtr(); |
| 252 case syncable::APP_NOTIFICATIONS: | 252 case syncable::APP_NOTIFICATIONS: |
| 253 return extension_system_->extension_service()-> | 253 return extension_system_->extension_service()-> |
| 254 app_notification_manager()->AsWeakPtr(); | 254 app_notification_manager()->AsWeakPtr(); |
| 255 default: | 255 default: |
| 256 // The following datatypes still need to be transitioned to the | 256 // The following datatypes still need to be transitioned to the |
| 257 // SyncableService API: | 257 // csync::SyncableService API: |
| 258 // Bookmarks | 258 // Bookmarks |
| 259 // Passwords | 259 // Passwords |
| 260 // Sessions | 260 // Sessions |
| 261 // Themes | 261 // Themes |
| 262 // Typed URLs | 262 // Typed URLs |
| 263 NOTREACHED(); | 263 NOTREACHED(); |
| 264 return base::WeakPtr<SyncableService>(); | 264 return base::WeakPtr<csync::SyncableService>(); |
| 265 } | 265 } |
| 266 } | 266 } |
| 267 | 267 |
| 268 ProfileSyncComponentsFactory::SyncComponents | 268 ProfileSyncComponentsFactory::SyncComponents |
| 269 ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents( | 269 ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents( |
| 270 ProfileSyncService* profile_sync_service, | 270 ProfileSyncService* profile_sync_service, |
| 271 DataTypeErrorHandler* error_handler) { | 271 DataTypeErrorHandler* error_handler) { |
| 272 BookmarkModel* bookmark_model = | 272 BookmarkModel* bookmark_model = |
| 273 profile_sync_service->profile()->GetBookmarkModel(); | 273 profile_sync_service->profile()->GetBookmarkModel(); |
| 274 csync::UserShare* user_share = profile_sync_service->GetUserShare(); | 274 csync::UserShare* user_share = profile_sync_service->GetUserShare(); |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 ProfileSyncComponentsFactory::SyncComponents | 338 ProfileSyncComponentsFactory::SyncComponents |
| 339 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 339 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 340 ProfileSyncService* profile_sync_service, | 340 ProfileSyncService* profile_sync_service, |
| 341 DataTypeErrorHandler* error_handler) { | 341 DataTypeErrorHandler* error_handler) { |
| 342 SessionModelAssociator* model_associator = | 342 SessionModelAssociator* model_associator = |
| 343 new SessionModelAssociator(profile_sync_service, error_handler); | 343 new SessionModelAssociator(profile_sync_service, error_handler); |
| 344 SessionChangeProcessor* change_processor = | 344 SessionChangeProcessor* change_processor = |
| 345 new SessionChangeProcessor(error_handler, model_associator); | 345 new SessionChangeProcessor(error_handler, model_associator); |
| 346 return SyncComponents(model_associator, change_processor); | 346 return SyncComponents(model_associator, change_processor); |
| 347 } | 347 } |
| OLD | NEW |