| Index: chrome/browser/sync/sessions/sync_session.cc
|
| diff --git a/chrome/browser/sync/sessions/sync_session.cc b/chrome/browser/sync/sessions/sync_session.cc
|
| index d968e83c953007d7e67f5113dfc03f005ecceeca..95d679252f453b407f82d21a04e48736b8426d75 100644
|
| --- a/chrome/browser/sync/sessions/sync_session.cc
|
| +++ b/chrome/browser/sync/sessions/sync_session.cc
|
| @@ -24,6 +24,21 @@ SyncSession::SyncSession(SyncSessionContext* context, Delegate* delegate,
|
|
|
| SyncSession::~SyncSession() {}
|
|
|
| +void SyncSession::Coalesce(const SyncSession* session) {
|
| + if (context_ != session->context() || delegate_ != session->delegate_) {
|
| + NOTREACHED();
|
| + return;
|
| + }
|
| +
|
| + source_ = SyncSourceInfo(session->source_.first,
|
| + source_.second | session->source_.second);
|
| + // TODO(tim): Update routing_info_ and workers_.
|
| +}
|
| +
|
| +void SyncSession::ResetTransientState() {
|
| + status_controller_.reset(new StatusController(routing_info_));
|
| +}
|
| +
|
| SyncSessionSnapshot SyncSession::TakeSnapshot() const {
|
| syncable::ScopedDirLookup dir(context_->directory_manager(),
|
| context_->account_name());
|
|
|