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/api/webdata/autofill_web_data_service.h" |
7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
8 #include "chrome/browser/extensions/api/storage/settings_frontend.h" | 9 #include "chrome/browser/extensions/api/storage/settings_frontend.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/extensions/extension_system.h" | 11 #include "chrome/browser/extensions/extension_system.h" |
11 #include "chrome/browser/extensions/extension_system_factory.h" | 12 #include "chrome/browser/extensions/extension_system_factory.h" |
12 #include "chrome/browser/history/history_service.h" | 13 #include "chrome/browser/history/history_service.h" |
13 #include "chrome/browser/history/history_service_factory.h" | 14 #include "chrome/browser/history/history_service_factory.h" |
14 #if !defined(OS_ANDROID) | 15 #if !defined(OS_ANDROID) |
15 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" | 16 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" |
16 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac
tory.h" | 17 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac
tory.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 #include "chrome/browser/sync/glue/typed_url_model_associator.h" | 51 #include "chrome/browser/sync/glue/typed_url_model_associator.h" |
51 #include "chrome/browser/sync/glue/ui_data_type_controller.h" | 52 #include "chrome/browser/sync/glue/ui_data_type_controller.h" |
52 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" | 53 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" |
53 #include "chrome/browser/sync/profile_sync_service.h" | 54 #include "chrome/browser/sync/profile_sync_service.h" |
54 #include "chrome/browser/sync/profile_sync_service_factory.h" | 55 #include "chrome/browser/sync/profile_sync_service_factory.h" |
55 #include "chrome/browser/themes/theme_service.h" | 56 #include "chrome/browser/themes/theme_service.h" |
56 #include "chrome/browser/themes/theme_service_factory.h" | 57 #include "chrome/browser/themes/theme_service_factory.h" |
57 #include "chrome/browser/themes/theme_syncable_service.h" | 58 #include "chrome/browser/themes/theme_syncable_service.h" |
58 #include "chrome/browser/webdata/autocomplete_syncable_service.h" | 59 #include "chrome/browser/webdata/autocomplete_syncable_service.h" |
59 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" | 60 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" |
60 #include "chrome/browser/webdata/web_data_service.h" | |
61 #include "chrome/common/chrome_switches.h" | 61 #include "chrome/common/chrome_switches.h" |
62 #include "chrome/common/pref_names.h" | 62 #include "chrome/common/pref_names.h" |
63 #include "content/public/browser/browser_thread.h" | 63 #include "content/public/browser/browser_thread.h" |
64 #include "sync/api/syncable_service.h" | 64 #include "sync/api/syncable_service.h" |
65 | 65 |
66 using browser_sync::AutofillDataTypeController; | 66 using browser_sync::AutofillDataTypeController; |
67 using browser_sync::AutofillProfileDataTypeController; | 67 using browser_sync::AutofillProfileDataTypeController; |
68 using browser_sync::BookmarkChangeProcessor; | 68 using browser_sync::BookmarkChangeProcessor; |
69 using browser_sync::BookmarkDataTypeController; | 69 using browser_sync::BookmarkDataTypeController; |
70 using browser_sync::BookmarkModelAssociator; | 70 using browser_sync::BookmarkModelAssociator; |
(...skipping 21 matching lines...) Expand all Loading... |
92 using browser_sync::TypedUrlModelAssociator; | 92 using browser_sync::TypedUrlModelAssociator; |
93 using browser_sync::UIDataTypeController; | 93 using browser_sync::UIDataTypeController; |
94 using content::BrowserThread; | 94 using content::BrowserThread; |
95 | 95 |
96 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( | 96 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( |
97 Profile* profile, CommandLine* command_line) | 97 Profile* profile, CommandLine* command_line) |
98 : profile_(profile), | 98 : profile_(profile), |
99 command_line_(command_line), | 99 command_line_(command_line), |
100 extension_system_( | 100 extension_system_( |
101 extensions::ExtensionSystemFactory::GetForProfile(profile)), | 101 extensions::ExtensionSystemFactory::GetForProfile(profile)), |
102 web_data_service_(WebDataService::FromBrowserContext(profile_)) { | 102 web_data_service_(AutofillWebDataService::FromBrowserContext(profile_)) { |
103 } | 103 } |
104 | 104 |
105 ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() { | 105 ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() { |
106 } | 106 } |
107 | 107 |
108 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( | 108 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( |
109 ProfileSyncService* pss) { | 109 ProfileSyncService* pss) { |
110 RegisterCommonDataTypes(pss); | 110 RegisterCommonDataTypes(pss); |
111 #if !defined(OS_ANDROID) | 111 #if !defined(OS_ANDROID) |
112 RegisterDesktopDataTypes(pss); | 112 RegisterDesktopDataTypes(pss); |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 ProfileSyncComponentsFactory::SyncComponents | 419 ProfileSyncComponentsFactory::SyncComponents |
420 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 420 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
421 ProfileSyncService* profile_sync_service, | 421 ProfileSyncService* profile_sync_service, |
422 DataTypeErrorHandler* error_handler) { | 422 DataTypeErrorHandler* error_handler) { |
423 SessionModelAssociator* model_associator = | 423 SessionModelAssociator* model_associator = |
424 new SessionModelAssociator(profile_sync_service, error_handler); | 424 new SessionModelAssociator(profile_sync_service, error_handler); |
425 SessionChangeProcessor* change_processor = | 425 SessionChangeProcessor* change_processor = |
426 new SessionChangeProcessor(error_handler, model_associator); | 426 new SessionChangeProcessor(error_handler, model_associator); |
427 return SyncComponents(model_associator, change_processor); | 427 return SyncComponents(model_associator, change_processor); |
428 } | 428 } |
OLD | NEW |