Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Unified Diff: sync/engine/all_status.cc

Issue 10454105: sync: Refactor per-datatype throttling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/engine/all_status.h ('k') | sync/engine/get_commit_ids_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/all_status.cc
diff --git a/sync/internal_api/all_status.cc b/sync/engine/all_status.cc
similarity index 92%
rename from sync/internal_api/all_status.cc
rename to sync/engine/all_status.cc
index a8a7efded510a0924c66dc07a0e520249404545e..7afd1a4eb8e2da8951da54c447f74fa61c0209ce 100644
--- a/sync/internal_api/all_status.cc
+++ b/sync/engine/all_status.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sync/internal_api/all_status.h"
+#include "sync/engine/all_status.h"
#include <algorithm>
@@ -24,11 +24,11 @@ AllStatus::AllStatus() {
AllStatus::~AllStatus() {
}
-sync_api::SyncManager::Status AllStatus::CreateBlankStatus() const {
+sync_api::SyncStatus AllStatus::CreateBlankStatus() const {
// Status is initialized with the previous status value. Variables
// whose values accumulate (e.g. lifetime counters like updates_received)
// are not to be cleared here.
- sync_api::SyncManager::Status status = status_;
+ sync_api::SyncStatus status = status_;
status.encryption_conflicts = 0;
status.hierarchy_conflicts = 0;
status.simple_conflicts = 0;
@@ -39,9 +39,9 @@ sync_api::SyncManager::Status AllStatus::CreateBlankStatus() const {
return status;
}
-sync_api::SyncManager::Status AllStatus::CalcSyncing(
+sync_api::SyncStatus AllStatus::CalcSyncing(
const SyncEngineEvent &event) const {
- sync_api::SyncManager::Status status = CreateBlankStatus();
+ sync_api::SyncStatus status = CreateBlankStatus();
const sessions::SyncSessionSnapshot& snapshot = event.snapshot;
status.encryption_conflicts = snapshot.num_encryption_conflicts();
status.hierarchy_conflicts = snapshot.num_hierarchy_conflicts();
@@ -119,7 +119,7 @@ void AllStatus::OnSyncEngineEvent(const SyncEngineEvent& event) {
}
}
-sync_api::SyncManager::Status AllStatus::status() const {
+sync_api::SyncStatus AllStatus::status() const {
base::AutoLock lock(mutex_);
return status_;
}
@@ -139,6 +139,11 @@ void AllStatus::SetEncryptedTypes(syncable::ModelTypeSet types) {
status_.encrypted_types = types;
}
+void AllStatus::SetThrottledTypes(const syncable::ModelTypeSet& types) {
+ ScopedStatusLock lock(this);
+ status_.throttled_types = types;
+}
+
void AllStatus::SetCryptographerReady(bool ready) {
ScopedStatusLock lock(this);
status_.cryptographer_ready = ready;
« no previous file with comments | « sync/engine/all_status.h ('k') | sync/engine/get_commit_ids_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698