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

Unified Diff: sync/internal_api/public/sessions/sync_session_snapshot.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
Index: sync/internal_api/public/sessions/sync_session_snapshot.cc
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc
index 4427236570d8735c83556fda1bdd84005536dcc1..4d966deef0371cf936bf30047971057f428240d2 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc
@@ -27,8 +27,8 @@ SyncSessionSnapshot::SyncSessionSnapshot()
SyncSessionSnapshot::SyncSessionSnapshot(
const ModelNeutralState& model_neutral_state,
bool is_share_usable,
- syncable::ModelTypeSet initial_sync_ended,
- const syncable::ModelTypePayloadMap& download_progress_markers,
+ syncer::ModelTypeSet initial_sync_ended,
+ const syncer::ModelTypePayloadMap& download_progress_markers,
bool more_to_sync,
bool is_silenced,
int num_encryption_conflicts,
@@ -80,9 +80,9 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
static_cast<int>(model_neutral_state_.num_server_changes_remaining));
value->SetBoolean("isShareUsable", is_share_usable_);
value->Set("initialSyncEnded",
- syncable::ModelTypeSetToValue(initial_sync_ended_));
+ syncer::ModelTypeSetToValue(initial_sync_ended_));
value->Set("downloadProgressMarkers",
- syncable::ModelTypePayloadMapToValue(download_progress_markers_));
+ syncer::ModelTypePayloadMapToValue(download_progress_markers_));
value->SetBoolean("hasMoreToSync", has_more_to_sync_);
value->SetBoolean("isSilenced", is_silenced_);
// We don't care too much if we lose precision here, also.
@@ -117,11 +117,11 @@ bool SyncSessionSnapshot::is_share_usable() const {
return is_share_usable_;
}
-syncable::ModelTypeSet SyncSessionSnapshot::initial_sync_ended() const {
+syncer::ModelTypeSet SyncSessionSnapshot::initial_sync_ended() const {
return initial_sync_ended_;
}
-syncable::ModelTypePayloadMap
+syncer::ModelTypePayloadMap
SyncSessionSnapshot::download_progress_markers() const {
return download_progress_markers_;
}
« no previous file with comments | « sync/internal_api/public/sessions/sync_session_snapshot.h ('k') | sync/internal_api/public/sessions/sync_source_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698