| 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/bookmarks/enhanced_bookmarks_features.h" | 8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
| 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" | 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" |
| 10 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" | 52 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" |
| 53 #include "components/dom_distiller/core/dom_distiller_service.h" | 53 #include "components/dom_distiller/core/dom_distiller_service.h" |
| 54 #include "components/password_manager/core/browser/password_store.h" | 54 #include "components/password_manager/core/browser/password_store.h" |
| 55 #include "components/signin/core/browser/signin_manager.h" | 55 #include "components/signin/core/browser/signin_manager.h" |
| 56 #include "components/sync_driver/data_type_manager_observer.h" | 56 #include "components/sync_driver/data_type_manager_observer.h" |
| 57 #include "components/sync_driver/generic_change_processor.h" | 57 #include "components/sync_driver/generic_change_processor.h" |
| 58 #include "components/sync_driver/proxy_data_type_controller.h" | 58 #include "components/sync_driver/proxy_data_type_controller.h" |
| 59 #include "content/public/browser/browser_thread.h" | 59 #include "content/public/browser/browser_thread.h" |
| 60 #include "extensions/browser/extension_system.h" | 60 #include "extensions/browser/extension_system.h" |
| 61 #include "sync/api/attachments/attachment_service.h" | 61 #include "sync/api/attachments/attachment_service.h" |
| 62 #include "sync/api/attachments/fake_attachment_service.h" | |
| 63 #include "sync/api/attachments/fake_attachment_store.h" | |
| 64 #include "sync/api/syncable_service.h" | 62 #include "sync/api/syncable_service.h" |
| 63 #include "sync/internal_api/public/attachments/fake_attachment_store.h" |
| 65 | 64 |
| 66 #if defined(ENABLE_EXTENSIONS) | 65 #if defined(ENABLE_EXTENSIONS) |
| 67 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" | 66 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" |
| 68 #include "chrome/browser/extensions/extension_sync_service.h" | 67 #include "chrome/browser/extensions/extension_sync_service.h" |
| 69 #endif | 68 #endif |
| 70 | 69 |
| 71 #if defined(ENABLE_APP_LIST) | 70 #if defined(ENABLE_APP_LIST) |
| 72 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" | 71 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
| 73 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" | 72 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
| 74 #include "ui/app_list/app_list_switches.h" | 73 #include "ui/app_list/app_list_switches.h" |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 new TypedUrlModelAssociator(profile_sync_service, | 605 new TypedUrlModelAssociator(profile_sync_service, |
| 607 history_backend, | 606 history_backend, |
| 608 error_handler); | 607 error_handler); |
| 609 TypedUrlChangeProcessor* change_processor = | 608 TypedUrlChangeProcessor* change_processor = |
| 610 new TypedUrlChangeProcessor(profile_, | 609 new TypedUrlChangeProcessor(profile_, |
| 611 model_associator, | 610 model_associator, |
| 612 history_backend, | 611 history_backend, |
| 613 error_handler); | 612 error_handler); |
| 614 return SyncComponents(model_associator, change_processor); | 613 return SyncComponents(model_associator, change_processor); |
| 615 } | 614 } |
| OLD | NEW |