Chromium Code Reviews| 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/bookmarks/bookmark_model_factory.h" | 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 8 #include "chrome/browser/extensions/api/storage/settings_frontend.h" | 8 #include "chrome/browser/extensions/api/storage/settings_frontend.h" |
| 9 #include "chrome/browser/extensions/app_notification_manager.h" | 9 #include "chrome/browser/extensions/app_notification_manager.h" |
| 10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 228 // Unless it is explicitly disabled, history delete directive sync is | 228 // Unless it is explicitly disabled, history delete directive sync is |
| 229 // enabled whenever full history sync is enabled. | 229 // enabled whenever full history sync is enabled. |
| 230 if (command_line_->HasSwitch(switches::kHistoryEnableFullHistorySync) && | 230 if (command_line_->HasSwitch(switches::kHistoryEnableFullHistorySync) && |
| 231 !command_line_->HasSwitch( | 231 !command_line_->HasSwitch( |
| 232 switches::kDisableSyncHistoryDeleteDirectives)) { | 232 switches::kDisableSyncHistoryDeleteDirectives)) { |
| 233 pss->RegisterDataTypeController( | 233 pss->RegisterDataTypeController( |
| 234 new UIDataTypeController( | 234 new UIDataTypeController( |
| 235 syncer::HISTORY_DELETE_DIRECTIVES, this, profile_, pss)); | 235 syncer::HISTORY_DELETE_DIRECTIVES, this, profile_, pss)); |
| 236 } | 236 } |
| 237 | 237 |
| 238 // Dictionary sync is disabled by default. Register only if explicitly | 238 #if !defined(OS_ANDROID) && !defined(OS_MACOSX) |
|
groby-ooo-7-16
2013/02/01 22:27:56
I'd rather explicitly enable it for a fixed set of
please use gerrit instead
2013/02/01 22:34:29
Done.
| |
| 239 // enabled. | 239 // Dictionary sync is enabled by default. |
| 240 if (command_line_->HasSwitch(switches::kEnableSyncDictionary)) { | 240 if (!command_line_->HasSwitch(switches::kDisableSyncDictionary)) { |
| 241 pss->RegisterDataTypeController( | 241 pss->RegisterDataTypeController( |
| 242 new UIDataTypeController(syncer::DICTIONARY, this, profile_, pss)); | 242 new UIDataTypeController(syncer::DICTIONARY, this, profile_, pss)); |
| 243 } | 243 } |
| 244 #endif | |
| 244 } | 245 } |
| 245 | 246 |
| 246 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( | 247 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( |
| 247 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& | 248 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& |
| 248 debug_info_listener, | 249 debug_info_listener, |
| 249 SyncBackendHost* backend, | 250 SyncBackendHost* backend, |
| 250 const DataTypeController::TypeMap* controllers, | 251 const DataTypeController::TypeMap* controllers, |
| 251 DataTypeManagerObserver* observer, | 252 DataTypeManagerObserver* observer, |
| 252 const FailedDatatypesHandler* failed_datatypes_handler) { | 253 const FailedDatatypesHandler* failed_datatypes_handler) { |
| 253 return new DataTypeManagerImpl(debug_info_listener, | 254 return new DataTypeManagerImpl(debug_info_listener, |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 392 ProfileSyncComponentsFactory::SyncComponents | 393 ProfileSyncComponentsFactory::SyncComponents |
| 393 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 394 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 394 ProfileSyncService* profile_sync_service, | 395 ProfileSyncService* profile_sync_service, |
| 395 DataTypeErrorHandler* error_handler) { | 396 DataTypeErrorHandler* error_handler) { |
| 396 SessionModelAssociator* model_associator = | 397 SessionModelAssociator* model_associator = |
| 397 new SessionModelAssociator(profile_sync_service, error_handler); | 398 new SessionModelAssociator(profile_sync_service, error_handler); |
| 398 SessionChangeProcessor* change_processor = | 399 SessionChangeProcessor* change_processor = |
| 399 new SessionChangeProcessor(error_handler, model_associator); | 400 new SessionChangeProcessor(error_handler, model_associator); |
| 400 return SyncComponents(model_associator, change_processor); | 401 return SyncComponents(model_associator, change_processor); |
| 401 } | 402 } |
| OLD | NEW |