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_factory.h" | 10 #include "chrome/browser/history/history_service_factory.h" |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
634 TokenServiceProvider::GetTokenServiceTaskRunner() { | 634 TokenServiceProvider::GetTokenServiceTaskRunner() { |
635 return task_runner_; | 635 return task_runner_; |
636 } | 636 } |
637 | 637 |
638 OAuth2TokenService* TokenServiceProvider::GetTokenService() { | 638 OAuth2TokenService* TokenServiceProvider::GetTokenService() { |
639 return token_service_; | 639 return token_service_; |
640 } | 640 } |
641 | 641 |
642 scoped_ptr<syncer::AttachmentService> | 642 scoped_ptr<syncer::AttachmentService> |
643 ProfileSyncComponentsFactoryImpl::CreateAttachmentService( | 643 ProfileSyncComponentsFactoryImpl::CreateAttachmentService( |
644 scoped_ptr<syncer::AttachmentStore> attachment_store, | 644 scoped_ptr<syncer::AttachmentStoreForSync> attachment_store, |
645 const syncer::UserShare& user_share, | 645 const syncer::UserShare& user_share, |
646 const std::string& store_birthday, | 646 const std::string& store_birthday, |
647 syncer::ModelType model_type, | 647 syncer::ModelType model_type, |
648 syncer::AttachmentService::Delegate* delegate) { | 648 syncer::AttachmentService::Delegate* delegate) { |
649 scoped_ptr<syncer::AttachmentUploader> attachment_uploader; | 649 scoped_ptr<syncer::AttachmentUploader> attachment_uploader; |
650 scoped_ptr<syncer::AttachmentDownloader> attachment_downloader; | 650 scoped_ptr<syncer::AttachmentDownloader> attachment_downloader; |
651 // Only construct an AttachmentUploader and AttachmentDownload if we have sync | 651 // Only construct an AttachmentUploader and AttachmentDownload if we have sync |
652 // credentials. We may not have sync credentials because there may not be a | 652 // credentials. We may not have sync credentials because there may not be a |
653 // signed in sync user (e.g. sync is running in "backup" mode). | 653 // signed in sync user (e.g. sync is running in "backup" mode). |
654 if (!user_share.sync_credentials.email.empty() && | 654 if (!user_share.sync_credentials.email.empty() && |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
728 new TypedUrlModelAssociator(profile_sync_service, | 728 new TypedUrlModelAssociator(profile_sync_service, |
729 history_backend, | 729 history_backend, |
730 error_handler); | 730 error_handler); |
731 TypedUrlChangeProcessor* change_processor = | 731 TypedUrlChangeProcessor* change_processor = |
732 new TypedUrlChangeProcessor(profile_, | 732 new TypedUrlChangeProcessor(profile_, |
733 model_associator, | 733 model_associator, |
734 history_backend, | 734 history_backend, |
735 error_handler); | 735 error_handler); |
736 return SyncComponents(model_associator, change_processor); | 736 return SyncComponents(model_associator, change_processor); |
737 } | 737 } |
OLD | NEW |