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/extensions/extension_settings_backend.h" | 7 #include "chrome/browser/extensions/extension_settings_backend.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/search_engines/template_url_service.h" | 9 #include "chrome/browser/search_engines/template_url_service.h" |
10 #include "chrome/browser/search_engines/template_url_service_factory.h" | 10 #include "chrome/browser/search_engines/template_url_service_factory.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "chrome/browser/sync/glue/extension_setting_data_type_controller.h" | 23 #include "chrome/browser/sync/glue/extension_setting_data_type_controller.h" |
24 #include "chrome/browser/sync/glue/generic_change_processor.h" | 24 #include "chrome/browser/sync/glue/generic_change_processor.h" |
25 #include "chrome/browser/sync/glue/password_change_processor.h" | 25 #include "chrome/browser/sync/glue/password_change_processor.h" |
26 #include "chrome/browser/sync/glue/password_data_type_controller.h" | 26 #include "chrome/browser/sync/glue/password_data_type_controller.h" |
27 #include "chrome/browser/sync/glue/password_model_associator.h" | 27 #include "chrome/browser/sync/glue/password_model_associator.h" |
28 #include "chrome/browser/sync/glue/preference_data_type_controller.h" | 28 #include "chrome/browser/sync/glue/preference_data_type_controller.h" |
29 #include "chrome/browser/sync/glue/search_engine_data_type_controller.h" | 29 #include "chrome/browser/sync/glue/search_engine_data_type_controller.h" |
30 #include "chrome/browser/sync/glue/session_change_processor.h" | 30 #include "chrome/browser/sync/glue/session_change_processor.h" |
31 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 31 #include "chrome/browser/sync/glue/session_data_type_controller.h" |
32 #include "chrome/browser/sync/glue/session_model_associator.h" | 32 #include "chrome/browser/sync/glue/session_model_associator.h" |
| 33 #include "chrome/browser/sync/glue/shared_change_processor.h" |
33 #include "chrome/browser/sync/glue/syncable_service_adapter.h" | 34 #include "chrome/browser/sync/glue/syncable_service_adapter.h" |
34 #include "chrome/browser/sync/glue/sync_backend_host.h" | 35 #include "chrome/browser/sync/glue/sync_backend_host.h" |
35 #include "chrome/browser/sync/glue/theme_change_processor.h" | 36 #include "chrome/browser/sync/glue/theme_change_processor.h" |
36 #include "chrome/browser/sync/glue/theme_data_type_controller.h" | 37 #include "chrome/browser/sync/glue/theme_data_type_controller.h" |
37 #include "chrome/browser/sync/glue/theme_model_associator.h" | 38 #include "chrome/browser/sync/glue/theme_model_associator.h" |
38 #include "chrome/browser/sync/glue/typed_url_change_processor.h" | 39 #include "chrome/browser/sync/glue/typed_url_change_processor.h" |
39 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" | 40 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" |
40 #include "chrome/browser/sync/glue/typed_url_model_associator.h" | 41 #include "chrome/browser/sync/glue/typed_url_model_associator.h" |
41 #include "chrome/browser/sync/profile_sync_service.h" | 42 #include "chrome/browser/sync/profile_sync_service.h" |
42 #include "chrome/browser/sync/profile_sync_factory_impl.h" | 43 #include "chrome/browser/sync/profile_sync_factory_impl.h" |
(...skipping 19 matching lines...) Expand all Loading... |
62 using browser_sync::ExtensionSettingDataTypeController; | 63 using browser_sync::ExtensionSettingDataTypeController; |
63 using browser_sync::GenericChangeProcessor; | 64 using browser_sync::GenericChangeProcessor; |
64 using browser_sync::PasswordChangeProcessor; | 65 using browser_sync::PasswordChangeProcessor; |
65 using browser_sync::PasswordDataTypeController; | 66 using browser_sync::PasswordDataTypeController; |
66 using browser_sync::PasswordModelAssociator; | 67 using browser_sync::PasswordModelAssociator; |
67 using browser_sync::PreferenceDataTypeController; | 68 using browser_sync::PreferenceDataTypeController; |
68 using browser_sync::SearchEngineDataTypeController; | 69 using browser_sync::SearchEngineDataTypeController; |
69 using browser_sync::SessionChangeProcessor; | 70 using browser_sync::SessionChangeProcessor; |
70 using browser_sync::SessionDataTypeController; | 71 using browser_sync::SessionDataTypeController; |
71 using browser_sync::SessionModelAssociator; | 72 using browser_sync::SessionModelAssociator; |
| 73 using browser_sync::SharedChangeProcessor; |
72 using browser_sync::SyncableServiceAdapter; | 74 using browser_sync::SyncableServiceAdapter; |
73 using browser_sync::SyncBackendHost; | 75 using browser_sync::SyncBackendHost; |
74 using browser_sync::ThemeChangeProcessor; | 76 using browser_sync::ThemeChangeProcessor; |
75 using browser_sync::ThemeDataTypeController; | 77 using browser_sync::ThemeDataTypeController; |
76 using browser_sync::ThemeModelAssociator; | 78 using browser_sync::ThemeModelAssociator; |
77 using browser_sync::TypedUrlChangeProcessor; | 79 using browser_sync::TypedUrlChangeProcessor; |
78 using browser_sync::TypedUrlDataTypeController; | 80 using browser_sync::TypedUrlDataTypeController; |
79 using browser_sync::TypedUrlModelAssociator; | 81 using browser_sync::TypedUrlModelAssociator; |
80 using browser_sync::UnrecoverableErrorHandler; | 82 using browser_sync::UnrecoverableErrorHandler; |
81 | 83 |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 new SearchEngineDataTypeController(this, profile_, pss)); | 178 new SearchEngineDataTypeController(this, profile_, pss)); |
177 } | 179 } |
178 } | 180 } |
179 | 181 |
180 DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager( | 182 DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager( |
181 SyncBackendHost* backend, | 183 SyncBackendHost* backend, |
182 const DataTypeController::TypeMap* controllers) { | 184 const DataTypeController::TypeMap* controllers) { |
183 return new DataTypeManagerImpl(backend, controllers); | 185 return new DataTypeManagerImpl(backend, controllers); |
184 } | 186 } |
185 | 187 |
| 188 browser_sync::GenericChangeProcessor* ProfileSyncFactoryImpl:: |
| 189 CreateGenericChangeProcessor( |
| 190 ProfileSyncService* profile_sync_service, |
| 191 browser_sync::UnrecoverableErrorHandler* error_handler, |
| 192 SyncableService *local_service) { |
| 193 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
| 194 return new GenericChangeProcessor(error_handler, local_service, user_share); |
| 195 } |
| 196 |
| 197 browser_sync::SharedChangeProcessor* ProfileSyncFactoryImpl:: |
| 198 CreateSharedChangeProcessor( |
| 199 browser_sync::UnrecoverableErrorHandler* error_handler) { |
| 200 return new SharedChangeProcessor(error_handler); |
| 201 } |
| 202 |
186 ProfileSyncFactory::SyncComponents | 203 ProfileSyncFactory::SyncComponents |
187 ProfileSyncFactoryImpl::CreateAppSyncComponents( | 204 ProfileSyncFactoryImpl::CreateAppSyncComponents( |
188 ProfileSyncService* profile_sync_service, | 205 ProfileSyncService* profile_sync_service, |
189 UnrecoverableErrorHandler* error_handler) { | 206 UnrecoverableErrorHandler* error_handler) { |
190 SyncableService* app_sync_service = | 207 SyncableService* app_sync_service = |
191 profile_sync_service->profile()->GetExtensionService(); | 208 profile_sync_service->profile()->GetExtensionService(); |
192 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 209 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
193 GenericChangeProcessor* change_processor = | 210 GenericChangeProcessor* change_processor = |
194 new GenericChangeProcessor(app_sync_service, error_handler, user_share); | 211 new GenericChangeProcessor(error_handler, app_sync_service, user_share); |
195 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 212 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
196 new browser_sync::SyncableServiceAdapter(syncable::APPS, | 213 new browser_sync::SyncableServiceAdapter(syncable::APPS, |
197 app_sync_service, | 214 app_sync_service, |
198 change_processor); | 215 change_processor); |
199 return SyncComponents(sync_service_adapter, change_processor); | 216 return SyncComponents(sync_service_adapter, change_processor); |
200 } | 217 } |
201 | 218 |
202 ProfileSyncFactory::SyncComponents | 219 ProfileSyncFactory::SyncComponents |
203 ProfileSyncFactoryImpl::CreateAutofillSyncComponents( | 220 ProfileSyncFactoryImpl::CreateAutofillSyncComponents( |
204 ProfileSyncService* profile_sync_service, | 221 ProfileSyncService* profile_sync_service, |
205 WebDatabase* web_database, | 222 WebDatabase* web_database, |
206 browser_sync::UnrecoverableErrorHandler* error_handler) { | 223 browser_sync::UnrecoverableErrorHandler* error_handler) { |
207 | 224 |
208 AutofillModelAssociator* model_associator = | 225 AutofillModelAssociator* model_associator = |
209 new AutofillModelAssociator(profile_sync_service, | 226 new AutofillModelAssociator(profile_sync_service, |
210 web_database, | 227 web_database, |
211 profile_sync_service->profile()); | 228 profile_sync_service->profile()); |
212 AutofillChangeProcessor* change_processor = | 229 AutofillChangeProcessor* change_processor = |
213 new AutofillChangeProcessor(model_associator, | 230 new AutofillChangeProcessor(model_associator, |
214 web_database, | 231 web_database, |
215 profile_sync_service->profile(), | 232 profile_sync_service->profile(), |
216 error_handler); | 233 error_handler); |
217 return SyncComponents(model_associator, change_processor); | 234 return SyncComponents(model_associator, change_processor); |
218 } | 235 } |
219 | 236 |
220 ProfileSyncFactory::SyncComponents | 237 SyncableService* |
221 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( | 238 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( |
222 ProfileSyncService* profile_sync_service, | 239 ProfileSyncService* profile_sync_service, |
223 WebDatabase* web_database, | 240 WebDatabase* web_database) { |
224 browser_sync::UnrecoverableErrorHandler* error_handler) { | |
225 AutofillProfileSyncableService* sync_service = | 241 AutofillProfileSyncableService* sync_service = |
226 new AutofillProfileSyncableService(web_database, | 242 new AutofillProfileSyncableService(web_database, |
227 profile_sync_service->profile()); | 243 profile_sync_service->profile()); |
228 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 244 return sync_service; |
229 GenericChangeProcessor* change_processor = | |
230 new GenericChangeProcessor(sync_service, error_handler, user_share); | |
231 browser_sync::SyncableServiceAdapter* sync_service_adapter = | |
232 new browser_sync::SyncableServiceAdapter(syncable::AUTOFILL_PROFILE, | |
233 sync_service, | |
234 change_processor); | |
235 return SyncComponents(sync_service_adapter, change_processor); | |
236 } | 245 } |
237 | 246 |
238 ProfileSyncFactory::SyncComponents | 247 ProfileSyncFactory::SyncComponents |
239 ProfileSyncFactoryImpl::CreateBookmarkSyncComponents( | 248 ProfileSyncFactoryImpl::CreateBookmarkSyncComponents( |
240 ProfileSyncService* profile_sync_service, | 249 ProfileSyncService* profile_sync_service, |
241 UnrecoverableErrorHandler* error_handler) { | 250 UnrecoverableErrorHandler* error_handler) { |
242 BookmarkModel* bookmark_model = | 251 BookmarkModel* bookmark_model = |
243 profile_sync_service->profile()->GetBookmarkModel(); | 252 profile_sync_service->profile()->GetBookmarkModel(); |
244 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 253 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
245 BookmarkModelAssociator* model_associator = | 254 BookmarkModelAssociator* model_associator = |
246 new BookmarkModelAssociator(bookmark_model, | 255 new BookmarkModelAssociator(bookmark_model, |
247 user_share, | 256 user_share, |
248 error_handler); | 257 error_handler); |
249 BookmarkChangeProcessor* change_processor = | 258 BookmarkChangeProcessor* change_processor = |
250 new BookmarkChangeProcessor(model_associator, | 259 new BookmarkChangeProcessor(model_associator, |
251 error_handler); | 260 error_handler); |
252 return SyncComponents(model_associator, change_processor); | 261 return SyncComponents(model_associator, change_processor); |
253 } | 262 } |
254 | 263 |
255 ProfileSyncFactory::SyncComponents | 264 ProfileSyncFactory::SyncComponents |
256 ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents( | 265 ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents( |
257 ExtensionSettingsBackend* extension_settings_backend, | 266 ExtensionSettingsBackend* extension_settings_backend, |
258 ProfileSyncService* profile_sync_service, | 267 ProfileSyncService* profile_sync_service, |
259 UnrecoverableErrorHandler* error_handler) { | 268 UnrecoverableErrorHandler* error_handler) { |
260 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); | 269 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
261 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 270 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
262 GenericChangeProcessor* change_processor = | 271 GenericChangeProcessor* change_processor = |
263 new GenericChangeProcessor( | 272 new GenericChangeProcessor(error_handler, |
264 extension_settings_backend, | 273 extension_settings_backend, |
265 error_handler, | 274 user_share); |
266 user_share); | |
267 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 275 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
268 new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS, | 276 new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS, |
269 extension_settings_backend, | 277 extension_settings_backend, |
270 change_processor); | 278 change_processor); |
271 return SyncComponents(sync_service_adapter, change_processor); | 279 return SyncComponents(sync_service_adapter, change_processor); |
272 } | 280 } |
273 | 281 |
274 ProfileSyncFactory::SyncComponents | 282 ProfileSyncFactory::SyncComponents |
275 ProfileSyncFactoryImpl::CreateExtensionSyncComponents( | 283 ProfileSyncFactoryImpl::CreateExtensionSyncComponents( |
276 ProfileSyncService* profile_sync_service, | 284 ProfileSyncService* profile_sync_service, |
277 UnrecoverableErrorHandler* error_handler) { | 285 UnrecoverableErrorHandler* error_handler) { |
278 SyncableService* extension_sync_service = | 286 SyncableService* extension_sync_service = |
279 profile_sync_service->profile()->GetExtensionService(); | 287 profile_sync_service->profile()->GetExtensionService(); |
280 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 288 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
281 GenericChangeProcessor* change_processor = | 289 GenericChangeProcessor* change_processor = |
282 new GenericChangeProcessor(extension_sync_service, error_handler, | 290 new GenericChangeProcessor(error_handler, extension_sync_service, |
283 user_share); | 291 user_share); |
284 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 292 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
285 new browser_sync::SyncableServiceAdapter(syncable::EXTENSIONS, | 293 new browser_sync::SyncableServiceAdapter(syncable::EXTENSIONS, |
286 extension_sync_service, | 294 extension_sync_service, |
287 change_processor); | 295 change_processor); |
288 return SyncComponents(sync_service_adapter, change_processor); | 296 return SyncComponents(sync_service_adapter, change_processor); |
289 } | 297 } |
290 | 298 |
291 ProfileSyncFactory::SyncComponents | 299 ProfileSyncFactory::SyncComponents |
292 ProfileSyncFactoryImpl::CreatePasswordSyncComponents( | 300 ProfileSyncFactoryImpl::CreatePasswordSyncComponents( |
293 ProfileSyncService* profile_sync_service, | 301 ProfileSyncService* profile_sync_service, |
(...skipping 10 matching lines...) Expand all Loading... |
304 } | 312 } |
305 | 313 |
306 ProfileSyncFactory::SyncComponents | 314 ProfileSyncFactory::SyncComponents |
307 ProfileSyncFactoryImpl::CreatePreferenceSyncComponents( | 315 ProfileSyncFactoryImpl::CreatePreferenceSyncComponents( |
308 ProfileSyncService* profile_sync_service, | 316 ProfileSyncService* profile_sync_service, |
309 UnrecoverableErrorHandler* error_handler) { | 317 UnrecoverableErrorHandler* error_handler) { |
310 SyncableService* pref_sync_service = | 318 SyncableService* pref_sync_service = |
311 profile_->GetPrefs()->GetSyncableService(); | 319 profile_->GetPrefs()->GetSyncableService(); |
312 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 320 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
313 GenericChangeProcessor* change_processor = | 321 GenericChangeProcessor* change_processor = |
314 new GenericChangeProcessor(pref_sync_service, error_handler, user_share); | 322 new GenericChangeProcessor(error_handler, pref_sync_service, user_share); |
315 SyncableServiceAdapter* sync_service_adapter = | 323 SyncableServiceAdapter* sync_service_adapter = |
316 new SyncableServiceAdapter(syncable::PREFERENCES, | 324 new SyncableServiceAdapter(syncable::PREFERENCES, |
317 pref_sync_service, | 325 pref_sync_service, |
318 change_processor); | 326 change_processor); |
319 return SyncComponents(sync_service_adapter, change_processor); | 327 return SyncComponents(sync_service_adapter, change_processor); |
320 } | 328 } |
321 | 329 |
322 ProfileSyncFactory::SyncComponents | 330 ProfileSyncFactory::SyncComponents |
323 ProfileSyncFactoryImpl::CreateThemeSyncComponents( | 331 ProfileSyncFactoryImpl::CreateThemeSyncComponents( |
324 ProfileSyncService* profile_sync_service, | 332 ProfileSyncService* profile_sync_service, |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 | 367 |
360 ProfileSyncFactory::SyncComponents | 368 ProfileSyncFactory::SyncComponents |
361 ProfileSyncFactoryImpl::CreateSearchEngineSyncComponents( | 369 ProfileSyncFactoryImpl::CreateSearchEngineSyncComponents( |
362 ProfileSyncService* profile_sync_service, | 370 ProfileSyncService* profile_sync_service, |
363 UnrecoverableErrorHandler* error_handler) { | 371 UnrecoverableErrorHandler* error_handler) { |
364 SyncableService* se_sync_service = | 372 SyncableService* se_sync_service = |
365 TemplateURLServiceFactory::GetForProfile(profile_); | 373 TemplateURLServiceFactory::GetForProfile(profile_); |
366 DCHECK(se_sync_service); | 374 DCHECK(se_sync_service); |
367 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 375 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
368 GenericChangeProcessor* change_processor = | 376 GenericChangeProcessor* change_processor = |
369 new GenericChangeProcessor(se_sync_service, error_handler, user_share); | 377 new GenericChangeProcessor(error_handler, se_sync_service, user_share); |
370 SyncableServiceAdapter* sync_service_adapter = | 378 SyncableServiceAdapter* sync_service_adapter = |
371 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, | 379 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, |
372 se_sync_service, | 380 se_sync_service, |
373 change_processor); | 381 change_processor); |
374 return SyncComponents(sync_service_adapter, change_processor); | 382 return SyncComponents(sync_service_adapter, change_processor); |
375 } | 383 } |
OLD | NEW |