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

Unified Diff: sync/engine/store_timestamps_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/resolve_conflicts_command_unittest.cc ('k') | sync/engine/sync_scheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/store_timestamps_command.cc
diff --git a/sync/engine/store_timestamps_command.cc b/sync/engine/store_timestamps_command.cc
index d83d154da21a49e80fab41a1030dce4b455309d3..5911fca41a71e3434962b807861c377811a397f3 100644
--- a/sync/engine/store_timestamps_command.cc
+++ b/sync/engine/store_timestamps_command.cc
@@ -26,12 +26,12 @@ SyncerError StoreTimestampsCommand::ExecuteImpl(
// Update the progress marker tokens from the server result. If a marker
// was omitted for any one type, that indicates no change from the previous
// state.
- syncable::ModelTypeSet forward_progress_types;
+ syncer::ModelTypeSet forward_progress_types;
for (int i = 0; i < updates.new_progress_marker_size(); ++i) {
- syncable::ModelType model =
- syncable::GetModelTypeFromSpecificsFieldNumber(
+ syncer::ModelType model =
+ syncer::GetModelTypeFromSpecificsFieldNumber(
updates.new_progress_marker(i).data_type_id());
- if (model == syncable::UNSPECIFIED || model == syncable::TOP_LEVEL_FOLDER) {
+ if (model == syncer::UNSPECIFIED || model == syncer::TOP_LEVEL_FOLDER) {
NOTREACHED() << "Unintelligible server response.";
continue;
}
@@ -43,9 +43,9 @@ SyncerError StoreTimestampsCommand::ExecuteImpl(
if (VLOG_IS_ON(1)) {
DVLOG_IF(1, !forward_progress_types.Empty())
<< "Get Updates got new progress marker for types: "
- << syncable::ModelTypeSetToString(forward_progress_types)
+ << syncer::ModelTypeSetToString(forward_progress_types)
<< " out of possible: "
- << syncable::ModelTypeSetToString(status->updates_request_types());
+ << syncer::ModelTypeSetToString(status->updates_request_types());
}
if (updates.has_changes_remaining()) {
int64 changes_left = updates.changes_remaining();
« no previous file with comments | « sync/engine/resolve_conflicts_command_unittest.cc ('k') | sync/engine/sync_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698