| Index: chrome/browser/sync/sessions/status_controller.h
|
| diff --git a/chrome/browser/sync/sessions/status_controller.h b/chrome/browser/sync/sessions/status_controller.h
|
| index 7663e4e87f95c22fe4d810f7fc7135557cd610df..5737dff9a77b830daf7dac0e2e76c70179b08a58 100644
|
| --- a/chrome/browser/sync/sessions/status_controller.h
|
| +++ b/chrome/browser/sync/sessions/status_controller.h
|
| @@ -87,12 +87,11 @@ class StatusController {
|
| ClientToServerResponse* mutable_commit_response() {
|
| return &shared_.commit_response;
|
| }
|
| - const syncable::MultiTypeTimeStamp& updates_request_parameters() const {
|
| - return shared_.updates_request_parameters;
|
| + const syncable::ModelTypeBitSet& updates_request_types() const {
|
| + return shared_.updates_request_types;
|
| }
|
| - void set_updates_request_parameters(
|
| - const syncable::MultiTypeTimeStamp& value) {
|
| - shared_.updates_request_parameters = value;
|
| + void set_updates_request_types(const syncable::ModelTypeBitSet& value) {
|
| + shared_.updates_request_types = value;
|
| }
|
| const ClientToServerResponse& updates_response() const {
|
| return shared_.updates_response;
|
| @@ -113,8 +112,6 @@ class StatusController {
|
| int64 num_server_changes_remaining() const {
|
| return shared_.num_server_changes_remaining.value();
|
| }
|
| - // Aggregate max over all data type timestamps, used for UI reporting.
|
| - int64 ComputeMaxLocalTimestamp() const;
|
|
|
| // Commit path data.
|
| const std::vector<syncable::Id>& commit_ids() const {
|
| @@ -206,8 +203,6 @@ class StatusController {
|
| void set_num_consecutive_errors(int value);
|
| void increment_num_consecutive_errors();
|
| void increment_num_consecutive_errors_by(int value);
|
| - void set_current_download_timestamp(syncable::ModelType model,
|
| - int64 current_timestamp);
|
| void set_num_server_changes_remaining(int64 changes_remaining);
|
| void set_invalid_store(bool invalid_store);
|
| void set_syncer_stuck(bool syncer_stuck);
|
| @@ -215,6 +210,8 @@ class StatusController {
|
| void set_num_successful_bookmark_commits(int value);
|
| void increment_num_successful_commits();
|
| void increment_num_successful_bookmark_commits();
|
| + void increment_num_updates_downloaded_by(int value);
|
| + void increment_num_tombstone_updates_downloaded_by(int value);
|
| void set_unsynced_handles(const std::vector<int64>& unsynced_handles);
|
|
|
| void set_commit_set(const OrderedCommitSet& commit_set);
|
|
|