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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
337 | 337 |
338 // App setting sync is enabled by default. Register unless explicitly | 338 // App setting sync is enabled by default. Register unless explicitly |
339 // disabled. | 339 // disabled. |
340 if (!command_line_->HasSwitch(switches::kDisableSyncAppSettings)) { | 340 if (!command_line_->HasSwitch(switches::kDisableSyncAppSettings)) { |
341 pss->RegisterDataTypeController( | 341 pss->RegisterDataTypeController( |
342 new ExtensionSettingDataTypeController( | 342 new ExtensionSettingDataTypeController( |
343 syncer::APP_SETTINGS, this, profile_, pss)); | 343 syncer::APP_SETTINGS, this, profile_, pss)); |
344 } | 344 } |
345 | 345 |
346 #if defined(ENABLE_APP_LIST) | 346 #if defined(ENABLE_APP_LIST) |
347 // App List sync is disabled by default. Register only if enabled. | 347 // App List sync is disabled by default. Register only if enabled. |
tapted
2014/03/05 22:33:38
nit: update comment
stevenjb
2014/03/05 23:20:00
Done.
| |
348 if (command_line_->HasSwitch(switches::kEnableSyncAppList)) { | 348 if (!command_line_->HasSwitch(switches::kDisableSyncAppList)) { |
349 pss->RegisterDataTypeController( | 349 pss->RegisterDataTypeController( |
350 new UIDataTypeController( | 350 new UIDataTypeController( |
351 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), | 351 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
352 base::Bind(&ChromeReportUnrecoverableError), | 352 base::Bind(&ChromeReportUnrecoverableError), |
353 syncer::APP_LIST, | 353 syncer::APP_LIST, |
354 this, | 354 this, |
355 profile_, | 355 profile_, |
356 pss)); | 356 pss)); |
357 } | 357 } |
358 #endif | 358 #endif |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
609 ProfileSyncComponentsFactory::SyncComponents | 609 ProfileSyncComponentsFactory::SyncComponents |
610 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 610 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
611 ProfileSyncService* profile_sync_service, | 611 ProfileSyncService* profile_sync_service, |
612 DataTypeErrorHandler* error_handler) { | 612 DataTypeErrorHandler* error_handler) { |
613 SessionModelAssociator* model_associator = | 613 SessionModelAssociator* model_associator = |
614 new SessionModelAssociator(profile_sync_service, error_handler); | 614 new SessionModelAssociator(profile_sync_service, error_handler); |
615 SessionChangeProcessor* change_processor = | 615 SessionChangeProcessor* change_processor = |
616 new SessionChangeProcessor(error_handler, model_associator); | 616 new SessionChangeProcessor(error_handler, model_associator); |
617 return SyncComponents(model_associator, change_processor); | 617 return SyncComponents(model_associator, change_processor); |
618 } | 618 } |
OLD | NEW |