| 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 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 ProfileSyncComponentsFactoryImpl::CreateAttachmentService( | 570 ProfileSyncComponentsFactoryImpl::CreateAttachmentService( |
| 571 syncer::AttachmentService::Delegate* delegate) { | 571 syncer::AttachmentService::Delegate* delegate) { |
| 572 // TODO(maniscalco): Use a shared (one per profile) thread-safe instance of | 572 // TODO(maniscalco): Use a shared (one per profile) thread-safe instance of |
| 573 // AttachmentUpload instead of creating a new one per AttachmentService (bug | 573 // AttachmentUpload instead of creating a new one per AttachmentService (bug |
| 574 // 369536). | 574 // 369536). |
| 575 scoped_ptr<syncer::AttachmentUploader> attachment_uploader( | 575 scoped_ptr<syncer::AttachmentUploader> attachment_uploader( |
| 576 new syncer::FakeAttachmentUploader); | 576 new syncer::FakeAttachmentUploader); |
| 577 | 577 |
| 578 scoped_ptr<syncer::AttachmentStore> attachment_store( | 578 scoped_ptr<syncer::AttachmentStore> attachment_store( |
| 579 new syncer::FakeAttachmentStore( | 579 new syncer::FakeAttachmentStore( |
| 580 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); | 580 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE))); |
| 581 | 581 |
| 582 scoped_ptr<syncer::AttachmentService> attachment_service( | 582 scoped_ptr<syncer::AttachmentService> attachment_service( |
| 583 new syncer::AttachmentServiceImpl( | 583 new syncer::AttachmentServiceImpl( |
| 584 attachment_store.Pass(), attachment_uploader.Pass(), delegate)); | 584 attachment_store.Pass(), attachment_uploader.Pass(), delegate)); |
| 585 | 585 |
| 586 return attachment_service.Pass(); | 586 return attachment_service.Pass(); |
| 587 } | 587 } |
| 588 | 588 |
| 589 ProfileSyncComponentsFactory::SyncComponents | 589 ProfileSyncComponentsFactory::SyncComponents |
| 590 ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents( | 590 ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents( |
| (...skipping 30 matching lines...) Expand all Loading... |
| 621 new TypedUrlModelAssociator(profile_sync_service, | 621 new TypedUrlModelAssociator(profile_sync_service, |
| 622 history_backend, | 622 history_backend, |
| 623 error_handler); | 623 error_handler); |
| 624 TypedUrlChangeProcessor* change_processor = | 624 TypedUrlChangeProcessor* change_processor = |
| 625 new TypedUrlChangeProcessor(profile_, | 625 new TypedUrlChangeProcessor(profile_, |
| 626 model_associator, | 626 model_associator, |
| 627 history_backend, | 627 history_backend, |
| 628 error_handler); | 628 error_handler); |
| 629 return SyncComponents(model_associator, change_processor); | 629 return SyncComponents(model_associator, change_processor); |
| 630 } | 630 } |
| OLD | NEW |