| 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 "chrome/browser/sync/glue/generic_change_processor.h" | 5 #include "chrome/browser/sync/glue/generic_change_processor.h" |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 const base::WeakPtr<syncer::SyncableService>& local_service, | 71 const base::WeakPtr<syncer::SyncableService>& local_service, |
| 72 const base::WeakPtr<syncer::SyncMergeResult>& merge_result, | 72 const base::WeakPtr<syncer::SyncMergeResult>& merge_result, |
| 73 syncer::UserShare* user_share, | 73 syncer::UserShare* user_share, |
| 74 scoped_ptr<syncer::AttachmentService> attachment_service) | 74 scoped_ptr<syncer::AttachmentService> attachment_service) |
| 75 : ChangeProcessor(error_handler), | 75 : ChangeProcessor(error_handler), |
| 76 local_service_(local_service), | 76 local_service_(local_service), |
| 77 merge_result_(merge_result), | 77 merge_result_(merge_result), |
| 78 share_handle_(user_share), | 78 share_handle_(user_share), |
| 79 attachment_service_(attachment_service.Pass()), | 79 attachment_service_(attachment_service.Pass()), |
| 80 attachment_service_weak_ptr_factory_(attachment_service_.get()), | 80 attachment_service_weak_ptr_factory_(attachment_service_.get()), |
| 81 attachment_service_proxy_(syncer::AttachmentServiceProxy( | 81 attachment_service_proxy_( |
| 82 base::MessageLoopProxy::current(), | 82 base::MessageLoopProxy::current(), |
| 83 attachment_service_weak_ptr_factory_.GetWeakPtr())) { | 83 attachment_service_weak_ptr_factory_.GetWeakPtr()) { |
| 84 DCHECK(CalledOnValidThread()); | 84 DCHECK(CalledOnValidThread()); |
| 85 DCHECK(attachment_service_); | 85 DCHECK(attachment_service_); |
| 86 } | 86 } |
| 87 | 87 |
| 88 GenericChangeProcessor::~GenericChangeProcessor() { | 88 GenericChangeProcessor::~GenericChangeProcessor() { |
| 89 DCHECK(CalledOnValidThread()); | 89 DCHECK(CalledOnValidThread()); |
| 90 } | 90 } |
| 91 | 91 |
| 92 void GenericChangeProcessor::ApplyChangesFromSyncModel( | 92 void GenericChangeProcessor::ApplyChangesFromSyncModel( |
| 93 const syncer::BaseTransaction* trans, | 93 const syncer::BaseTransaction* trans, |
| (...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 void GenericChangeProcessor::StartImpl(Profile* profile) { | 626 void GenericChangeProcessor::StartImpl(Profile* profile) { |
| 627 DCHECK(CalledOnValidThread()); | 627 DCHECK(CalledOnValidThread()); |
| 628 } | 628 } |
| 629 | 629 |
| 630 syncer::UserShare* GenericChangeProcessor::share_handle() const { | 630 syncer::UserShare* GenericChangeProcessor::share_handle() const { |
| 631 DCHECK(CalledOnValidThread()); | 631 DCHECK(CalledOnValidThread()); |
| 632 return share_handle_; | 632 return share_handle_; |
| 633 } | 633 } |
| 634 | 634 |
| 635 } // namespace browser_sync | 635 } // namespace browser_sync |
| OLD | NEW |