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

Unified Diff: sync/engine/all_status.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix indent Created 8 years, 5 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/apply_updates_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/engine/all_status.cc b/sync/engine/all_status.cc
index 8f8b649acc1d027ac1fb12f2483079177c1006e8..ffa831103e4296aca7a52cbe55bcfadc95f1817a 100644
--- a/sync/engine/all_status.cc
+++ b/sync/engine/all_status.cc
@@ -24,11 +24,11 @@ AllStatus::AllStatus() {
AllStatus::~AllStatus() {
}
-syncer::SyncStatus AllStatus::CreateBlankStatus() const {
+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.
- syncer::SyncStatus status = status_;
+ SyncStatus status = status_;
status.encryption_conflicts = 0;
status.hierarchy_conflicts = 0;
status.simple_conflicts = 0;
@@ -39,9 +39,8 @@ syncer::SyncStatus AllStatus::CreateBlankStatus() const {
return status;
}
-syncer::SyncStatus AllStatus::CalcSyncing(
- const SyncEngineEvent &event) const {
- syncer::SyncStatus status = CreateBlankStatus();
+SyncStatus AllStatus::CalcSyncing(const SyncEngineEvent &event) const {
+ SyncStatus status = CreateBlankStatus();
const sessions::SyncSessionSnapshot& snapshot = event.snapshot;
status.encryption_conflicts = snapshot.num_encryption_conflicts();
status.hierarchy_conflicts = snapshot.num_hierarchy_conflicts();
@@ -120,7 +119,7 @@ void AllStatus::OnSyncEngineEvent(const SyncEngineEvent& event) {
}
}
-syncer::SyncStatus AllStatus::status() const {
+SyncStatus AllStatus::status() const {
base::AutoLock lock(mutex_);
return status_;
}
@@ -135,12 +134,12 @@ void AllStatus::IncrementNotificationsReceived() {
++status_.notifications_received;
}
-void AllStatus::SetEncryptedTypes(syncer::ModelTypeSet types) {
+void AllStatus::SetEncryptedTypes(ModelTypeSet types) {
ScopedStatusLock lock(this);
status_.encrypted_types = types;
}
-void AllStatus::SetThrottledTypes(const syncer::ModelTypeSet& types) {
+void AllStatus::SetThrottledTypes(const ModelTypeSet& types) {
ScopedStatusLock lock(this);
status_.throttled_types = types;
}
« no previous file with comments | « sync/engine/all_status.h ('k') | sync/engine/apply_updates_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698