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/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
9 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | 9 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
305 pss->RegisterDataTypeController( | 305 pss->RegisterDataTypeController( |
306 new UIDataTypeController(syncer::APP_LIST, this, profile_, pss)); | 306 new UIDataTypeController(syncer::APP_LIST, this, profile_, pss)); |
307 } | 307 } |
308 #endif | 308 #endif |
309 | 309 |
310 // Synced Notifications are enabled by default. | 310 // Synced Notifications are enabled by default. |
311 pss->RegisterDataTypeController( | 311 pss->RegisterDataTypeController( |
312 new UIDataTypeController( | 312 new UIDataTypeController( |
313 syncer::SYNCED_NOTIFICATIONS, this, profile_, pss)); | 313 syncer::SYNCED_NOTIFICATIONS, this, profile_, pss)); |
314 | 314 |
315 // Synced Notification App Info is also enabled by default. | |
Nicolas Zea
2014/01/22 00:43:39
nit: Until the datatype is actually enabled by def
Pete Williamson
2014/01/22 19:51:10
Done.
| |
316 // TODO(petewil): Enable the data type controller once we have a handler. | |
317 | |
315 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 318 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
316 // Dictionary sync is enabled by default. | 319 // Dictionary sync is enabled by default. |
317 if (!command_line_->HasSwitch(switches::kDisableSyncDictionary)) { | 320 if (!command_line_->HasSwitch(switches::kDisableSyncDictionary)) { |
318 pss->RegisterDataTypeController( | 321 pss->RegisterDataTypeController( |
319 new UIDataTypeController(syncer::DICTIONARY, this, profile_, pss)); | 322 new UIDataTypeController(syncer::DICTIONARY, this, profile_, pss)); |
320 } | 323 } |
321 #endif | 324 #endif |
322 } | 325 } |
323 | 326 |
324 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( | 327 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
530 ProfileSyncComponentsFactory::SyncComponents | 533 ProfileSyncComponentsFactory::SyncComponents |
531 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 534 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
532 ProfileSyncService* profile_sync_service, | 535 ProfileSyncService* profile_sync_service, |
533 DataTypeErrorHandler* error_handler) { | 536 DataTypeErrorHandler* error_handler) { |
534 SessionModelAssociator* model_associator = | 537 SessionModelAssociator* model_associator = |
535 new SessionModelAssociator(profile_sync_service, error_handler); | 538 new SessionModelAssociator(profile_sync_service, error_handler); |
536 SessionChangeProcessor* change_processor = | 539 SessionChangeProcessor* change_processor = |
537 new SessionChangeProcessor(error_handler, model_associator); | 540 new SessionChangeProcessor(error_handler, model_associator); |
538 return SyncComponents(model_associator, change_processor); | 541 return SyncComponents(model_associator, change_processor); |
539 } | 542 } |
OLD | NEW |