| Index: sync/sessions/status_controller.h
|
| diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h
|
| index c2a3cfc7a52598ef587bd2057b18c91854f51c36..e76605447bf3a37b0f4c708476551221ebed81d9 100644
|
| --- a/sync/sessions/status_controller.h
|
| +++ b/sync/sessions/status_controller.h
|
| @@ -61,15 +61,23 @@ class StatusController {
|
| ConflictProgress* mutable_conflict_progress();
|
| const UpdateProgress* update_progress() const;
|
| UpdateProgress* mutable_update_progress();
|
| + // TODO(tim): Bug 121521. Remove this unrestricted getter in favor of
|
| + // something like GetAllGroupsWithUnappliedUpdates.
|
| const ConflictProgress* GetUnrestrictedConflictProgress(
|
| ModelSafeGroup group) const;
|
| ConflictProgress* GetUnrestrictedMutableConflictProgressForTest(
|
| ModelSafeGroup group);
|
| + // TODO(tim): Bug 121521. Remove this unrestricted getter in favor of
|
| + // something like GetAllGroupsWithUnappliedUpdates.
|
| const UpdateProgress* GetUnrestrictedUpdateProgress(
|
| ModelSafeGroup group) const;
|
| UpdateProgress* GetUnrestrictedMutableUpdateProgressForTest(
|
| ModelSafeGroup group);
|
|
|
| + // Returns a set of ModelSafeGroups, one for each UpdateProgress that has
|
| + // unapplied updates.
|
| + std::set<ModelSafeGroup> GetModelSafeGroupsWithUnappliedUpdates() const;
|
| +
|
| // ClientToServer messages.
|
| const ClientToServerMessage& commit_message() {
|
| return shared_.commit_message;
|
|
|