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.h" |
7 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/search_engines/template_url_service.h" | 9 #include "chrome/browser/search_engines/template_url_service.h" |
9 #include "chrome/browser/search_engines/template_url_service_factory.h" | 10 #include "chrome/browser/search_engines/template_url_service_factory.h" |
10 #include "chrome/browser/sync/api/syncable_service.h" | 11 #include "chrome/browser/sync/api/syncable_service.h" |
11 #include "chrome/browser/sync/glue/app_data_type_controller.h" | 12 #include "chrome/browser/sync/glue/app_data_type_controller.h" |
12 #include "chrome/browser/sync/glue/autofill_change_processor.h" | 13 #include "chrome/browser/sync/glue/autofill_change_processor.h" |
13 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" | 14 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" |
14 #include "chrome/browser/sync/glue/autofill_model_associator.h" | 15 #include "chrome/browser/sync/glue/autofill_model_associator.h" |
15 #include "chrome/browser/sync/glue/autofill_profile_change_processor.h" | 16 #include "chrome/browser/sync/glue/autofill_profile_change_processor.h" |
16 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h" | 17 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h" |
17 #include "chrome/browser/sync/glue/autofill_profile_model_associator.h" | 18 #include "chrome/browser/sync/glue/autofill_profile_model_associator.h" |
18 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 19 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
19 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" | 20 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" |
20 #include "chrome/browser/sync/glue/bookmark_model_associator.h" | 21 #include "chrome/browser/sync/glue/bookmark_model_associator.h" |
21 #include "chrome/browser/sync/glue/data_type_manager_impl.h" | 22 #include "chrome/browser/sync/glue/data_type_manager_impl.h" |
22 #include "chrome/browser/sync/glue/extension_data_type_controller.h" | 23 #include "chrome/browser/sync/glue/extension_data_type_controller.h" |
| 24 #include "chrome/browser/sync/glue/extension_setting_data_type_controller.h" |
23 #include "chrome/browser/sync/glue/generic_change_processor.h" | 25 #include "chrome/browser/sync/glue/generic_change_processor.h" |
24 #include "chrome/browser/sync/glue/password_change_processor.h" | 26 #include "chrome/browser/sync/glue/password_change_processor.h" |
25 #include "chrome/browser/sync/glue/password_data_type_controller.h" | 27 #include "chrome/browser/sync/glue/password_data_type_controller.h" |
26 #include "chrome/browser/sync/glue/password_model_associator.h" | 28 #include "chrome/browser/sync/glue/password_model_associator.h" |
27 #include "chrome/browser/sync/glue/preference_data_type_controller.h" | 29 #include "chrome/browser/sync/glue/preference_data_type_controller.h" |
28 #include "chrome/browser/sync/glue/search_engine_data_type_controller.h" | 30 #include "chrome/browser/sync/glue/search_engine_data_type_controller.h" |
29 #include "chrome/browser/sync/glue/session_change_processor.h" | 31 #include "chrome/browser/sync/glue/session_change_processor.h" |
30 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 32 #include "chrome/browser/sync/glue/session_data_type_controller.h" |
31 #include "chrome/browser/sync/glue/session_model_associator.h" | 33 #include "chrome/browser/sync/glue/session_model_associator.h" |
32 #include "chrome/browser/sync/glue/syncable_service_adapter.h" | 34 #include "chrome/browser/sync/glue/syncable_service_adapter.h" |
(...skipping 18 matching lines...) Expand all Loading... |
51 using browser_sync::AutofillProfileDataTypeController; | 53 using browser_sync::AutofillProfileDataTypeController; |
52 using browser_sync::AutofillModelAssociator; | 54 using browser_sync::AutofillModelAssociator; |
53 using browser_sync::AutofillProfileModelAssociator; | 55 using browser_sync::AutofillProfileModelAssociator; |
54 using browser_sync::BookmarkChangeProcessor; | 56 using browser_sync::BookmarkChangeProcessor; |
55 using browser_sync::BookmarkDataTypeController; | 57 using browser_sync::BookmarkDataTypeController; |
56 using browser_sync::BookmarkModelAssociator; | 58 using browser_sync::BookmarkModelAssociator; |
57 using browser_sync::DataTypeController; | 59 using browser_sync::DataTypeController; |
58 using browser_sync::DataTypeManager; | 60 using browser_sync::DataTypeManager; |
59 using browser_sync::DataTypeManagerImpl; | 61 using browser_sync::DataTypeManagerImpl; |
60 using browser_sync::ExtensionDataTypeController; | 62 using browser_sync::ExtensionDataTypeController; |
| 63 using browser_sync::ExtensionSettingDataTypeController; |
61 using browser_sync::GenericChangeProcessor; | 64 using browser_sync::GenericChangeProcessor; |
62 using browser_sync::PasswordChangeProcessor; | 65 using browser_sync::PasswordChangeProcessor; |
63 using browser_sync::PasswordDataTypeController; | 66 using browser_sync::PasswordDataTypeController; |
64 using browser_sync::PasswordModelAssociator; | 67 using browser_sync::PasswordModelAssociator; |
65 using browser_sync::PreferenceDataTypeController; | 68 using browser_sync::PreferenceDataTypeController; |
66 using browser_sync::SearchEngineDataTypeController; | 69 using browser_sync::SearchEngineDataTypeController; |
67 using browser_sync::SessionChangeProcessor; | 70 using browser_sync::SessionChangeProcessor; |
68 using browser_sync::SessionDataTypeController; | 71 using browser_sync::SessionDataTypeController; |
69 using browser_sync::SessionModelAssociator; | 72 using browser_sync::SessionModelAssociator; |
70 using browser_sync::SyncableServiceAdapter; | 73 using browser_sync::SyncableServiceAdapter; |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 new TypedUrlDataTypeController(this, profile_)); | 151 new TypedUrlDataTypeController(this, profile_)); |
149 } | 152 } |
150 | 153 |
151 // Session sync is disabled by default. Register only if explicitly | 154 // Session sync is disabled by default. Register only if explicitly |
152 // enabled. | 155 // enabled. |
153 if (command_line_->HasSwitch(switches::kEnableSyncTabs)) { | 156 if (command_line_->HasSwitch(switches::kEnableSyncTabs)) { |
154 pss->RegisterDataTypeController( | 157 pss->RegisterDataTypeController( |
155 new SessionDataTypeController(this, profile_, pss)); | 158 new SessionDataTypeController(this, profile_, pss)); |
156 } | 159 } |
157 | 160 |
| 161 // Extension setting sync is disabled by default. Register only if |
| 162 // explicitly enabled. |
| 163 if (command_line_->HasSwitch(switches::kEnableSyncExtensionSettings)) { |
| 164 pss->RegisterDataTypeController( |
| 165 new ExtensionSettingDataTypeController(this, profile_, pss)); |
| 166 } |
| 167 |
158 if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) { | 168 if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) { |
159 pss->RegisterDataTypeController( | 169 pss->RegisterDataTypeController( |
160 new AutofillProfileDataTypeController(this, profile_)); | 170 new AutofillProfileDataTypeController(this, profile_)); |
161 } | 171 } |
162 | 172 |
163 // Search Engine sync is disabled by default. Register only if explicitly | 173 // Search Engine sync is disabled by default. Register only if explicitly |
164 // enabled. | 174 // enabled. |
165 if (command_line_->HasSwitch(switches::kEnableSyncSearchEngines)) { | 175 if (command_line_->HasSwitch(switches::kEnableSyncSearchEngines)) { |
166 pss->RegisterDataTypeController( | 176 pss->RegisterDataTypeController( |
167 new SearchEngineDataTypeController(this, profile_, pss)); | 177 new SearchEngineDataTypeController(this, profile_, pss)); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 new BookmarkModelAssociator(bookmark_model, | 249 new BookmarkModelAssociator(bookmark_model, |
240 user_share, | 250 user_share, |
241 error_handler); | 251 error_handler); |
242 BookmarkChangeProcessor* change_processor = | 252 BookmarkChangeProcessor* change_processor = |
243 new BookmarkChangeProcessor(model_associator, | 253 new BookmarkChangeProcessor(model_associator, |
244 error_handler); | 254 error_handler); |
245 return SyncComponents(model_associator, change_processor); | 255 return SyncComponents(model_associator, change_processor); |
246 } | 256 } |
247 | 257 |
248 ProfileSyncFactory::SyncComponents | 258 ProfileSyncFactory::SyncComponents |
| 259 ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents( |
| 260 ProfileSyncService* profile_sync_service, |
| 261 UnrecoverableErrorHandler* error_handler) { |
| 262 SyncableService* sync_service = |
| 263 profile_->GetExtensionService()->extension_settings()-> |
| 264 GetSyncableService(); |
| 265 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
| 266 GenericChangeProcessor* change_processor = |
| 267 new GenericChangeProcessor(sync_service, error_handler, user_share); |
| 268 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
| 269 new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS, |
| 270 sync_service, |
| 271 change_processor); |
| 272 return SyncComponents(sync_service_adapter, change_processor); |
| 273 } |
| 274 |
| 275 ProfileSyncFactory::SyncComponents |
249 ProfileSyncFactoryImpl::CreateExtensionSyncComponents( | 276 ProfileSyncFactoryImpl::CreateExtensionSyncComponents( |
250 ProfileSyncService* profile_sync_service, | 277 ProfileSyncService* profile_sync_service, |
251 UnrecoverableErrorHandler* error_handler) { | 278 UnrecoverableErrorHandler* error_handler) { |
252 SyncableService* extension_sync_service = | 279 SyncableService* extension_sync_service = |
253 profile_sync_service->profile()->GetExtensionService(); | 280 profile_sync_service->profile()->GetExtensionService(); |
254 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 281 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
255 GenericChangeProcessor* change_processor = | 282 GenericChangeProcessor* change_processor = |
256 new GenericChangeProcessor(extension_sync_service, error_handler, | 283 new GenericChangeProcessor(extension_sync_service, error_handler, |
257 user_share); | 284 user_share); |
258 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 285 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 DCHECK(se_sync_service); | 366 DCHECK(se_sync_service); |
340 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 367 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
341 GenericChangeProcessor* change_processor = | 368 GenericChangeProcessor* change_processor = |
342 new GenericChangeProcessor(se_sync_service, error_handler, user_share); | 369 new GenericChangeProcessor(se_sync_service, error_handler, user_share); |
343 SyncableServiceAdapter* sync_service_adapter = | 370 SyncableServiceAdapter* sync_service_adapter = |
344 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, | 371 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, |
345 se_sync_service, | 372 se_sync_service, |
346 change_processor); | 373 change_processor); |
347 return SyncComponents(sync_service_adapter, change_processor); | 374 return SyncComponents(sync_service_adapter, change_processor); |
348 } | 375 } |
OLD | NEW |