| Index: sync/internal_api/public/sessions/sync_session_snapshot.h
|
| diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.h b/sync/internal_api/public/sessions/sync_session_snapshot.h
|
| index d599f9d6ff7e4a11836841070ea25d07105cc4dd..d6fb0258748aeb8b41bd6b2a8bcab0f03e87ef63 100644
|
| --- a/sync/internal_api/public/sessions/sync_session_snapshot.h
|
| +++ b/sync/internal_api/public/sessions/sync_session_snapshot.h
|
| @@ -32,8 +32,8 @@ class SyncSessionSnapshot {
|
| SyncSessionSnapshot(
|
| const ModelNeutralState& model_neutral_state,
|
| bool is_share_usable,
|
| - syncer::ModelTypeSet initial_sync_ended,
|
| - const syncer::ModelTypePayloadMap& download_progress_markers,
|
| + ModelTypeSet initial_sync_ended,
|
| + const ModelTypePayloadMap& download_progress_markers,
|
| bool more_to_sync,
|
| bool is_silenced,
|
| int num_encryption_conflicts,
|
| @@ -57,8 +57,8 @@ class SyncSessionSnapshot {
|
| }
|
| int64 num_server_changes_remaining() const;
|
| bool is_share_usable() const;
|
| - syncer::ModelTypeSet initial_sync_ended() const;
|
| - syncer::ModelTypePayloadMap download_progress_markers() const;
|
| + ModelTypeSet initial_sync_ended() const;
|
| + ModelTypePayloadMap download_progress_markers() const;
|
| bool has_more_to_sync() const;
|
| bool is_silenced() const;
|
| int num_encryption_conflicts() const;
|
| @@ -77,8 +77,8 @@ class SyncSessionSnapshot {
|
| private:
|
| ModelNeutralState model_neutral_state_;
|
| bool is_share_usable_;
|
| - syncer::ModelTypeSet initial_sync_ended_;
|
| - syncer::ModelTypePayloadMap download_progress_markers_;
|
| + ModelTypeSet initial_sync_ended_;
|
| + ModelTypePayloadMap download_progress_markers_;
|
| bool has_more_to_sync_;
|
| bool is_silenced_;
|
| int num_encryption_conflicts_;
|
|
|