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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 #include "chrome/browser/webdata/web_data_service.h" | 44 #include "chrome/browser/webdata/web_data_service.h" |
45 #include "chrome/common/chrome_switches.h" | 45 #include "chrome/common/chrome_switches.h" |
46 #include "chrome/common/pref_names.h" | 46 #include "chrome/common/pref_names.h" |
47 #include "content/browser/browser_thread.h" | 47 #include "content/browser/browser_thread.h" |
48 | 48 |
49 using browser_sync::AppDataTypeController; | 49 using browser_sync::AppDataTypeController; |
50 using browser_sync::AutofillChangeProcessor; | 50 using browser_sync::AutofillChangeProcessor; |
51 using browser_sync::AutofillDataTypeController; | 51 using browser_sync::AutofillDataTypeController; |
52 using browser_sync::AutofillProfileDataTypeController; | 52 using browser_sync::AutofillProfileDataTypeController; |
53 using browser_sync::AutofillModelAssociator; | 53 using browser_sync::AutofillModelAssociator; |
54 using browser_sync::AutofillProfileSyncableService; | |
55 using browser_sync::BookmarkChangeProcessor; | 54 using browser_sync::BookmarkChangeProcessor; |
56 using browser_sync::BookmarkDataTypeController; | 55 using browser_sync::BookmarkDataTypeController; |
57 using browser_sync::BookmarkModelAssociator; | 56 using browser_sync::BookmarkModelAssociator; |
58 using browser_sync::DataTypeController; | 57 using browser_sync::DataTypeController; |
59 using browser_sync::DataTypeManager; | 58 using browser_sync::DataTypeManager; |
60 using browser_sync::DataTypeManagerImpl; | 59 using browser_sync::DataTypeManagerImpl; |
61 using browser_sync::ExtensionDataTypeController; | 60 using browser_sync::ExtensionDataTypeController; |
62 using browser_sync::ExtensionSettingDataTypeController; | 61 using browser_sync::ExtensionSettingDataTypeController; |
63 using browser_sync::GenericChangeProcessor; | 62 using browser_sync::GenericChangeProcessor; |
64 using browser_sync::PasswordChangeProcessor; | 63 using browser_sync::PasswordChangeProcessor; |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 error_handler); | 215 error_handler); |
217 return SyncComponents(model_associator, change_processor); | 216 return SyncComponents(model_associator, change_processor); |
218 } | 217 } |
219 | 218 |
220 ProfileSyncFactory::SyncComponents | 219 ProfileSyncFactory::SyncComponents |
221 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( | 220 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( |
222 ProfileSyncService* profile_sync_service, | 221 ProfileSyncService* profile_sync_service, |
223 WebDataService* web_data_service, | 222 WebDataService* web_data_service, |
224 browser_sync::UnrecoverableErrorHandler* error_handler) { | 223 browser_sync::UnrecoverableErrorHandler* error_handler) { |
225 AutofillProfileSyncableService* sync_service = | 224 AutofillProfileSyncableService* sync_service = |
226 new AutofillProfileSyncableService(web_data_service); | 225 web_data_service->GetAutofillProfileSyncableService(); |
227 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 226 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
228 GenericChangeProcessor* change_processor = | 227 GenericChangeProcessor* change_processor = |
229 new GenericChangeProcessor(sync_service, error_handler, user_share); | 228 new GenericChangeProcessor(sync_service, error_handler, user_share); |
230 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 229 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
231 new browser_sync::SyncableServiceAdapter(syncable::AUTOFILL_PROFILE, | 230 new browser_sync::SyncableServiceAdapter(syncable::AUTOFILL_PROFILE, |
232 sync_service, | 231 sync_service, |
233 change_processor); | 232 change_processor); |
234 return SyncComponents(sync_service_adapter, change_processor); | 233 return SyncComponents(sync_service_adapter, change_processor); |
235 } | 234 } |
236 | 235 |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 DCHECK(se_sync_service); | 364 DCHECK(se_sync_service); |
366 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 365 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
367 GenericChangeProcessor* change_processor = | 366 GenericChangeProcessor* change_processor = |
368 new GenericChangeProcessor(se_sync_service, error_handler, user_share); | 367 new GenericChangeProcessor(se_sync_service, error_handler, user_share); |
369 SyncableServiceAdapter* sync_service_adapter = | 368 SyncableServiceAdapter* sync_service_adapter = |
370 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, | 369 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, |
371 se_sync_service, | 370 se_sync_service, |
372 change_processor); | 371 change_processor); |
373 return SyncComponents(sync_service_adapter, change_processor); | 372 return SyncComponents(sync_service_adapter, change_processor); |
374 } | 373 } |
OLD | NEW |