| 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" |
| 11 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" |
| 11 #include "chrome/browser/extensions/api/storage/settings_frontend.h" | 12 #include "chrome/browser/extensions/api/storage/settings_frontend.h" |
| 12 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
| 13 #include "chrome/browser/extensions/extension_sync_service.h" | 14 #include "chrome/browser/extensions/extension_sync_service.h" |
| 14 #include "chrome/browser/extensions/extension_system.h" | 15 #include "chrome/browser/extensions/extension_system.h" |
| 15 #include "chrome/browser/extensions/extension_system_factory.h" | 16 #include "chrome/browser/extensions/extension_system_factory.h" |
| 16 #include "chrome/browser/history/history_service.h" | 17 #include "chrome/browser/history/history_service.h" |
| 17 #include "chrome/browser/history/history_service_factory.h" | 18 #include "chrome/browser/history/history_service_factory.h" |
| 18 #include "chrome/browser/pref_service_flags_storage.h" | 19 #include "chrome/browser/pref_service_flags_storage.h" |
| 19 #include "chrome/browser/prefs/pref_model_associator.h" | 20 #include "chrome/browser/prefs/pref_model_associator.h" |
| 20 #include "chrome/browser/prefs/pref_service_syncable.h" | 21 #include "chrome/browser/prefs/pref_service_syncable.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "chrome/browser/sync/sessions2/session_data_type_controller2.h" | 56 #include "chrome/browser/sync/sessions2/session_data_type_controller2.h" |
| 56 #include "chrome/browser/themes/theme_service.h" | 57 #include "chrome/browser/themes/theme_service.h" |
| 57 #include "chrome/browser/themes/theme_service_factory.h" | 58 #include "chrome/browser/themes/theme_service_factory.h" |
| 58 #include "chrome/browser/themes/theme_syncable_service.h" | 59 #include "chrome/browser/themes/theme_syncable_service.h" |
| 59 #include "chrome/browser/webdata/autocomplete_syncable_service.h" | 60 #include "chrome/browser/webdata/autocomplete_syncable_service.h" |
| 60 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" | 61 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" |
| 61 #include "chrome/browser/webdata/web_data_service_factory.h" | 62 #include "chrome/browser/webdata/web_data_service_factory.h" |
| 62 #include "chrome/common/chrome_switches.h" | 63 #include "chrome/common/chrome_switches.h" |
| 63 #include "chrome/common/pref_names.h" | 64 #include "chrome/common/pref_names.h" |
| 64 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" | 65 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" |
| 65 #include "components/dom_distiller/content/dom_distiller_service_factory.h" | |
| 66 #include "components/dom_distiller/core/dom_distiller_service.h" | 66 #include "components/dom_distiller/core/dom_distiller_service.h" |
| 67 #include "content/public/browser/browser_thread.h" | 67 #include "content/public/browser/browser_thread.h" |
| 68 #include "sync/api/syncable_service.h" | 68 #include "sync/api/syncable_service.h" |
| 69 | 69 |
| 70 #if defined(ENABLE_MANAGED_USERS) | 70 #if defined(ENABLE_MANAGED_USERS) |
| 71 #include "chrome/browser/managed_mode/managed_user_service.h" | 71 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 72 #include "chrome/browser/managed_mode/managed_user_settings_service.h" | 72 #include "chrome/browser/managed_mode/managed_user_settings_service.h" |
| 73 #include "chrome/browser/managed_mode/managed_user_settings_service_factory.h" | 73 #include "chrome/browser/managed_mode/managed_user_settings_service_factory.h" |
| 74 #include "chrome/browser/managed_mode/managed_user_sync_service.h" | 74 #include "chrome/browser/managed_mode/managed_user_sync_service.h" |
| 75 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" | 75 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 ProfileSyncComponentsFactory::SyncComponents | 508 ProfileSyncComponentsFactory::SyncComponents |
| 509 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 509 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 510 ProfileSyncService* profile_sync_service, | 510 ProfileSyncService* profile_sync_service, |
| 511 DataTypeErrorHandler* error_handler) { | 511 DataTypeErrorHandler* error_handler) { |
| 512 SessionModelAssociator* model_associator = | 512 SessionModelAssociator* model_associator = |
| 513 new SessionModelAssociator(profile_sync_service, error_handler); | 513 new SessionModelAssociator(profile_sync_service, error_handler); |
| 514 SessionChangeProcessor* change_processor = | 514 SessionChangeProcessor* change_processor = |
| 515 new SessionChangeProcessor(error_handler, model_associator); | 515 new SessionChangeProcessor(error_handler, model_associator); |
| 516 return SyncComponents(model_associator, change_processor); | 516 return SyncComponents(model_associator, change_processor); |
| 517 } | 517 } |
| OLD | NEW |