diff options
author | skym <skym@chromium.org> | 2016-02-23 14:11:27 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-23 22:12:52 +0000 |
commit | 24820c067cb649a4eee2387eda8761e776a18d63 (patch) | |
tree | 9d1218f9bae0a7e998c7ec045f4d904f7f4f3d54 /sync/sessions | |
parent | 9e0e03af41092d8647e4c4125a0b75a78a99cf8b (diff) | |
download | chromium_src-24820c067cb649a4eee2387eda8761e776a18d63.zip chromium_src-24820c067cb649a4eee2387eda8761e776a18d63.tar.gz chromium_src-24820c067cb649a4eee2387eda8761e776a18d63.tar.bz2 |
[Sync] Now also check get updates request types before performing sessions garbage collection.
BUG=129654
Review URL: https://codereview.chromium.org/1717383002
Cr-Commit-Position: refs/heads/master@{#377103}
Diffstat (limited to 'sync/sessions')
-rw-r--r-- | sync/sessions/status_controller.cc | 16 | ||||
-rw-r--r-- | sync/sessions/status_controller.h | 12 |
2 files changed, 21 insertions, 7 deletions
diff --git a/sync/sessions/status_controller.cc b/sync/sessions/status_controller.cc index 01b9781..4f9e141 100644 --- a/sync/sessions/status_controller.cc +++ b/sync/sessions/status_controller.cc @@ -17,6 +17,22 @@ StatusController::StatusController() { StatusController::~StatusController() {} +const ModelTypeSet StatusController::get_updates_request_types() const { + return model_neutral_.get_updates_request_types; +} + +void StatusController::set_get_updates_request_types(ModelTypeSet value) { + model_neutral_.get_updates_request_types = value; +} + +const ModelTypeSet StatusController::commit_request_types() const { + return model_neutral_.commit_request_types; +} + +void StatusController::set_commit_request_types(ModelTypeSet value) { + model_neutral_.commit_request_types = value; +} + void StatusController::increment_num_updates_downloaded_by(int value) { model_neutral_.num_updates_downloaded_total += value; } diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h index 9cf63d8..4551dfd 100644 --- a/sync/sessions/status_controller.h +++ b/sync/sessions/status_controller.h @@ -36,13 +36,11 @@ class SYNC_EXPORT StatusController { StatusController(); ~StatusController(); - // ClientToServer messages. - const ModelTypeSet commit_request_types() const { - return model_neutral_.commit_request_types; - } - void set_commit_request_types(ModelTypeSet value) { - model_neutral_.commit_request_types = value; - } + // The types included in the get updates and commit client to server requests. + const ModelTypeSet get_updates_request_types() const; + void set_get_updates_request_types(ModelTypeSet value); + const ModelTypeSet commit_request_types() const; + void set_commit_request_types(ModelTypeSet value); // Various conflict counters. int num_encryption_conflicts() const; |