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, | |
akalin
2011/10/11 22:41:08
is this necessary? I think what calls this alread
Nicolas Zea
2011/10/12 04:24:19
It's useful for mocking. But yes, I've changed Sha
| |
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 return new SharedChangeProcessor(); | |
akalin
2011/10/11 22:41:08
here, too. Is this necessary? caller can just cr
Nicolas Zea
2011/10/12 04:24:19
Primarily useful for mocking/testing.
| |
200 } | |
201 | |
186 ProfileSyncFactory::SyncComponents | 202 ProfileSyncFactory::SyncComponents |
187 ProfileSyncFactoryImpl::CreateAppSyncComponents( | 203 ProfileSyncFactoryImpl::CreateAppSyncComponents( |
188 ProfileSyncService* profile_sync_service, | 204 ProfileSyncService* profile_sync_service, |
189 UnrecoverableErrorHandler* error_handler) { | 205 UnrecoverableErrorHandler* error_handler) { |
190 SyncableService* app_sync_service = | 206 SyncableService* app_sync_service = |
191 profile_sync_service->profile()->GetExtensionService(); | 207 profile_sync_service->profile()->GetExtensionService(); |
192 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 208 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
193 GenericChangeProcessor* change_processor = | 209 GenericChangeProcessor* change_processor = |
194 new GenericChangeProcessor(app_sync_service, error_handler, user_share); | 210 new GenericChangeProcessor(error_handler, app_sync_service, user_share); |
195 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 211 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
196 new browser_sync::SyncableServiceAdapter(syncable::APPS, | 212 new browser_sync::SyncableServiceAdapter(syncable::APPS, |
197 app_sync_service, | 213 app_sync_service, |
198 change_processor); | 214 change_processor); |
199 return SyncComponents(sync_service_adapter, change_processor); | 215 return SyncComponents(sync_service_adapter, change_processor); |
200 } | 216 } |
201 | 217 |
202 ProfileSyncFactory::SyncComponents | 218 ProfileSyncFactory::SyncComponents |
203 ProfileSyncFactoryImpl::CreateAutofillSyncComponents( | 219 ProfileSyncFactoryImpl::CreateAutofillSyncComponents( |
204 ProfileSyncService* profile_sync_service, | 220 ProfileSyncService* profile_sync_service, |
205 WebDatabase* web_database, | 221 WebDatabase* web_database, |
206 browser_sync::UnrecoverableErrorHandler* error_handler) { | 222 browser_sync::UnrecoverableErrorHandler* error_handler) { |
207 | 223 |
208 AutofillModelAssociator* model_associator = | 224 AutofillModelAssociator* model_associator = |
209 new AutofillModelAssociator(profile_sync_service, | 225 new AutofillModelAssociator(profile_sync_service, |
210 web_database, | 226 web_database, |
211 profile_sync_service->profile()); | 227 profile_sync_service->profile()); |
212 AutofillChangeProcessor* change_processor = | 228 AutofillChangeProcessor* change_processor = |
213 new AutofillChangeProcessor(model_associator, | 229 new AutofillChangeProcessor(model_associator, |
214 web_database, | 230 web_database, |
215 profile_sync_service->profile(), | 231 profile_sync_service->profile(), |
216 error_handler); | 232 error_handler); |
217 return SyncComponents(model_associator, change_processor); | 233 return SyncComponents(model_associator, change_processor); |
218 } | 234 } |
219 | 235 |
220 ProfileSyncFactory::SyncComponents | 236 SyncableService* |
221 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( | 237 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( |
222 ProfileSyncService* profile_sync_service, | 238 ProfileSyncService* profile_sync_service, |
223 WebDatabase* web_database, | 239 WebDatabase* web_database) { |
224 browser_sync::UnrecoverableErrorHandler* error_handler) { | |
225 AutofillProfileSyncableService* sync_service = | 240 AutofillProfileSyncableService* sync_service = |
226 new AutofillProfileSyncableService(web_database, | 241 new AutofillProfileSyncableService(web_database, |
227 profile_sync_service->profile()); | 242 profile_sync_service->profile()); |
228 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 243 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 } | 244 } |
237 | 245 |
238 ProfileSyncFactory::SyncComponents | 246 ProfileSyncFactory::SyncComponents |
239 ProfileSyncFactoryImpl::CreateBookmarkSyncComponents( | 247 ProfileSyncFactoryImpl::CreateBookmarkSyncComponents( |
240 ProfileSyncService* profile_sync_service, | 248 ProfileSyncService* profile_sync_service, |
241 UnrecoverableErrorHandler* error_handler) { | 249 UnrecoverableErrorHandler* error_handler) { |
242 BookmarkModel* bookmark_model = | 250 BookmarkModel* bookmark_model = |
243 profile_sync_service->profile()->GetBookmarkModel(); | 251 profile_sync_service->profile()->GetBookmarkModel(); |
244 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 252 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
245 BookmarkModelAssociator* model_associator = | 253 BookmarkModelAssociator* model_associator = |
246 new BookmarkModelAssociator(bookmark_model, | 254 new BookmarkModelAssociator(bookmark_model, |
247 user_share, | 255 user_share, |
248 error_handler); | 256 error_handler); |
249 BookmarkChangeProcessor* change_processor = | 257 BookmarkChangeProcessor* change_processor = |
250 new BookmarkChangeProcessor(model_associator, | 258 new BookmarkChangeProcessor(model_associator, |
251 error_handler); | 259 error_handler); |
252 return SyncComponents(model_associator, change_processor); | 260 return SyncComponents(model_associator, change_processor); |
253 } | 261 } |
254 | 262 |
255 ProfileSyncFactory::SyncComponents | 263 ProfileSyncFactory::SyncComponents |
256 ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents( | 264 ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents( |
257 ExtensionSettingsBackend* extension_settings_backend, | 265 ExtensionSettingsBackend* extension_settings_backend, |
258 ProfileSyncService* profile_sync_service, | 266 ProfileSyncService* profile_sync_service, |
259 UnrecoverableErrorHandler* error_handler) { | 267 UnrecoverableErrorHandler* error_handler) { |
260 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); | 268 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
261 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 269 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
262 GenericChangeProcessor* change_processor = | 270 GenericChangeProcessor* change_processor = |
263 new GenericChangeProcessor( | 271 new GenericChangeProcessor(error_handler, |
264 extension_settings_backend, | 272 extension_settings_backend, |
265 error_handler, | 273 user_share); |
266 user_share); | |
267 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 274 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
268 new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS, | 275 new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS, |
269 extension_settings_backend, | 276 extension_settings_backend, |
270 change_processor); | 277 change_processor); |
271 return SyncComponents(sync_service_adapter, change_processor); | 278 return SyncComponents(sync_service_adapter, change_processor); |
272 } | 279 } |
273 | 280 |
274 ProfileSyncFactory::SyncComponents | 281 ProfileSyncFactory::SyncComponents |
275 ProfileSyncFactoryImpl::CreateExtensionSyncComponents( | 282 ProfileSyncFactoryImpl::CreateExtensionSyncComponents( |
276 ProfileSyncService* profile_sync_service, | 283 ProfileSyncService* profile_sync_service, |
277 UnrecoverableErrorHandler* error_handler) { | 284 UnrecoverableErrorHandler* error_handler) { |
278 SyncableService* extension_sync_service = | 285 SyncableService* extension_sync_service = |
279 profile_sync_service->profile()->GetExtensionService(); | 286 profile_sync_service->profile()->GetExtensionService(); |
280 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 287 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
281 GenericChangeProcessor* change_processor = | 288 GenericChangeProcessor* change_processor = |
282 new GenericChangeProcessor(extension_sync_service, error_handler, | 289 new GenericChangeProcessor(error_handler, extension_sync_service, |
283 user_share); | 290 user_share); |
284 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 291 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
285 new browser_sync::SyncableServiceAdapter(syncable::EXTENSIONS, | 292 new browser_sync::SyncableServiceAdapter(syncable::EXTENSIONS, |
286 extension_sync_service, | 293 extension_sync_service, |
287 change_processor); | 294 change_processor); |
288 return SyncComponents(sync_service_adapter, change_processor); | 295 return SyncComponents(sync_service_adapter, change_processor); |
289 } | 296 } |
290 | 297 |
291 ProfileSyncFactory::SyncComponents | 298 ProfileSyncFactory::SyncComponents |
292 ProfileSyncFactoryImpl::CreatePasswordSyncComponents( | 299 ProfileSyncFactoryImpl::CreatePasswordSyncComponents( |
293 ProfileSyncService* profile_sync_service, | 300 ProfileSyncService* profile_sync_service, |
(...skipping 10 matching lines...) Expand all Loading... | |
304 } | 311 } |
305 | 312 |
306 ProfileSyncFactory::SyncComponents | 313 ProfileSyncFactory::SyncComponents |
307 ProfileSyncFactoryImpl::CreatePreferenceSyncComponents( | 314 ProfileSyncFactoryImpl::CreatePreferenceSyncComponents( |
308 ProfileSyncService* profile_sync_service, | 315 ProfileSyncService* profile_sync_service, |
309 UnrecoverableErrorHandler* error_handler) { | 316 UnrecoverableErrorHandler* error_handler) { |
310 SyncableService* pref_sync_service = | 317 SyncableService* pref_sync_service = |
311 profile_->GetPrefs()->GetSyncableService(); | 318 profile_->GetPrefs()->GetSyncableService(); |
312 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 319 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
313 GenericChangeProcessor* change_processor = | 320 GenericChangeProcessor* change_processor = |
314 new GenericChangeProcessor(pref_sync_service, error_handler, user_share); | 321 new GenericChangeProcessor(error_handler, pref_sync_service, user_share); |
315 SyncableServiceAdapter* sync_service_adapter = | 322 SyncableServiceAdapter* sync_service_adapter = |
316 new SyncableServiceAdapter(syncable::PREFERENCES, | 323 new SyncableServiceAdapter(syncable::PREFERENCES, |
317 pref_sync_service, | 324 pref_sync_service, |
318 change_processor); | 325 change_processor); |
319 return SyncComponents(sync_service_adapter, change_processor); | 326 return SyncComponents(sync_service_adapter, change_processor); |
320 } | 327 } |
321 | 328 |
322 ProfileSyncFactory::SyncComponents | 329 ProfileSyncFactory::SyncComponents |
323 ProfileSyncFactoryImpl::CreateThemeSyncComponents( | 330 ProfileSyncFactoryImpl::CreateThemeSyncComponents( |
324 ProfileSyncService* profile_sync_service, | 331 ProfileSyncService* profile_sync_service, |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
359 | 366 |
360 ProfileSyncFactory::SyncComponents | 367 ProfileSyncFactory::SyncComponents |
361 ProfileSyncFactoryImpl::CreateSearchEngineSyncComponents( | 368 ProfileSyncFactoryImpl::CreateSearchEngineSyncComponents( |
362 ProfileSyncService* profile_sync_service, | 369 ProfileSyncService* profile_sync_service, |
363 UnrecoverableErrorHandler* error_handler) { | 370 UnrecoverableErrorHandler* error_handler) { |
364 SyncableService* se_sync_service = | 371 SyncableService* se_sync_service = |
365 TemplateURLServiceFactory::GetForProfile(profile_); | 372 TemplateURLServiceFactory::GetForProfile(profile_); |
366 DCHECK(se_sync_service); | 373 DCHECK(se_sync_service); |
367 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 374 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
368 GenericChangeProcessor* change_processor = | 375 GenericChangeProcessor* change_processor = |
369 new GenericChangeProcessor(se_sync_service, error_handler, user_share); | 376 new GenericChangeProcessor(error_handler, se_sync_service, user_share); |
370 SyncableServiceAdapter* sync_service_adapter = | 377 SyncableServiceAdapter* sync_service_adapter = |
371 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, | 378 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, |
372 se_sync_service, | 379 se_sync_service, |
373 change_processor); | 380 change_processor); |
374 return SyncComponents(sync_service_adapter, change_processor); | 381 return SyncComponents(sync_service_adapter, change_processor); |
375 } | 382 } |
OLD | NEW |