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

Unified Diff: sync/engine/verify_updates_command.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights 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/verify_updates_command.h ('k') | sync/engine/verify_updates_command_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/verify_updates_command.cc
diff --git a/sync/engine/verify_updates_command.cc b/sync/engine/verify_updates_command.cc
index abb3db895d2a1265b1c59796d4275a4761366aa1..0446924c72de6065cdfd2dede5f6de898cf632ec 100644
--- a/sync/engine/verify_updates_command.cc
+++ b/sync/engine/verify_updates_command.cc
@@ -21,7 +21,7 @@
namespace syncer {
using syncable::GET_BY_ID;
-using syncable::ModelTypeSet;
+using syncer::ModelTypeSet;
using syncable::SYNCER;
using syncable::WriteTransaction;
@@ -84,7 +84,7 @@ std::set<ModelSafeGroup> VerifyUpdatesCommand::GetGroupsToChange(
session.status_controller().updates_response().get_updates();
for (int i = 0; i < updates.entries().size(); i++) {
groups_with_updates.insert(
- GetGroupForModelType(syncable::GetModelType(updates.entries(i)),
+ GetGroupForModelType(syncer::GetModelType(updates.entries(i)),
session.routing_info()));
}
@@ -135,7 +135,7 @@ VerifyUpdatesCommand::VerifyUpdateResult VerifyUpdatesCommand::VerifyUpdate(
const bool deleted = entry.has_deleted() && entry.deleted();
const bool is_directory = entry.IsFolder();
- const syncable::ModelType model_type = entry.GetModelType();
+ const syncer::ModelType model_type = entry.GetModelType();
if (!id.ServerKnows()) {
LOG(ERROR) << "Illegal negative id in received updates";
@@ -152,8 +152,8 @@ VerifyUpdatesCommand::VerifyUpdateResult VerifyUpdatesCommand::VerifyUpdate(
syncable::MutableEntry same_id(trans, GET_BY_ID, id);
result.value = VerifyNewEntry(entry, &same_id, deleted);
- syncable::ModelType placement_type = !deleted ? entry.GetModelType()
- : same_id.good() ? same_id.GetModelType() : syncable::UNSPECIFIED;
+ syncer::ModelType placement_type = !deleted ? entry.GetModelType()
+ : same_id.good() ? same_id.GetModelType() : syncer::UNSPECIFIED;
result.placement = GetGroupForModelType(placement_type, routes);
if (VERIFY_UNDECIDED == result.value) {
« no previous file with comments | « sync/engine/verify_updates_command.h ('k') | sync/engine/verify_updates_command_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698