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

Unified Diff: sync/engine/syncer_proto_util.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/syncer_proto_util.h ('k') | sync/engine/syncer_proto_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer_proto_util.cc
diff --git a/sync/engine/syncer_proto_util.cc b/sync/engine/syncer_proto_util.cc
index 917f64404ebacd7ad5b9b021a7cdc2c4d8b816f3..8a20b95067620ef6ac8a59dacf6e8024898adab4 100644
--- a/sync/engine/syncer_proto_util.cc
+++ b/sync/engine/syncer_proto_util.cc
@@ -111,9 +111,9 @@ void SyncerProtoUtil::HandleMigrationDoneResponse(
sessions::SyncSession* session) {
LOG_IF(ERROR, 0 >= response->migrated_data_type_id_size())
<< "MIGRATION_DONE but no types specified.";
- syncable::ModelTypeSet to_migrate;
+ syncer::ModelTypeSet to_migrate;
for (int i = 0; i < response->migrated_data_type_id_size(); i++) {
- to_migrate.Put(syncable::GetModelTypeFromSpecificsFieldNumber(
+ to_migrate.Put(syncer::GetModelTypeFromSpecificsFieldNumber(
response->migrated_data_type_id(i)));
}
// TODO(akalin): This should be a set union.
@@ -303,7 +303,7 @@ syncer::SyncProtocolError ConvertErrorPBToLocalType(
DCHECK_EQ(error.error_type(), sync_pb::SyncEnums::THROTTLED);
for (int i = 0; i < error.error_data_type_ids_size(); ++i) {
sync_protocol_error.error_data_types.Put(
- syncable::GetModelTypeFromSpecificsFieldNumber(
+ syncer::GetModelTypeFromSpecificsFieldNumber(
error.error_data_type_ids(i)));
}
}
« no previous file with comments | « sync/engine/syncer_proto_util.h ('k') | sync/engine/syncer_proto_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698