| Index: chrome/browser/sync/sessions/session_state.h
|
| diff --git a/chrome/browser/sync/sessions/session_state.h b/chrome/browser/sync/sessions/session_state.h
|
| index fc42994c0f68626d6d786b1b7ed90fd602825a01..2d8381e3eafa3179c22cf06675d29e738af1d598 100644
|
| --- a/chrome/browser/sync/sessions/session_state.h
|
| +++ b/chrome/browser/sync/sessions/session_state.h
|
| @@ -32,6 +32,9 @@ namespace sessions {
|
|
|
| class UpdateProgress;
|
|
|
| +typedef std::pair<sync_pb::GetUpdatesCallerInfo::GetUpdatesSource,
|
| + syncable::ModelTypeBitSet> SyncSourceInfo;
|
| +
|
| // Data pertaining to the status of an active Syncer object.
|
| struct SyncerStatus {
|
| SyncerStatus();
|
| @@ -79,7 +82,8 @@ struct SyncSessionSnapshot {
|
| bool is_silenced,
|
| int64 unsynced_count,
|
| int num_conflicting_updates,
|
| - bool did_commit_items);
|
| + bool did_commit_items,
|
| + const SyncSourceInfo& source);
|
| ~SyncSessionSnapshot();
|
|
|
| const SyncerStatus syncer_status;
|
| @@ -93,6 +97,7 @@ struct SyncSessionSnapshot {
|
| const int64 unsynced_count;
|
| const int num_conflicting_updates;
|
| const bool did_commit_items;
|
| + const SyncSourceInfo source;
|
| };
|
|
|
| // Tracks progress of conflicts and their resolution using conflict sets.
|
|
|