sync/internal_api/public/sessions/sync_session_snapshot.h - Issue 10837214: Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/internal_api/public/sessions/sync_session_snapshot.h

Issue 10837214: Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unit test Created 8 years, 4 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/internal_api/public/engine/model_safe_worker_unittest.cc ('k') | sync/internal_api/public/sessions/sync_session_snapshot.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d6fb0258748aeb8b41bd6b2a8bcab0f03e87ef63..74e972bf850bd5a622f00681635c009588006283 100644

--- a/sync/internal_api/public/sessions/sync_session_snapshot.h

+++ b/sync/internal_api/public/sessions/sync_session_snapshot.h

@@ -10,7 +10,7 @@

#include "base/basictypes.h"

#include "base/time.h"

#include "sync/internal_api/public/base/model_type.h"

-#include "sync/internal_api/public/base/model_type_payload_map.h"

+#include "sync/internal_api/public/base/model_type_state_map.h"

#include "sync/internal_api/public/sessions/model_neutral_state.h"

#include "sync/internal_api/public/sessions/sync_source_info.h"

@@ -33,7 +33,7 @@ class SyncSessionSnapshot {

const ModelNeutralState& model_neutral_state,

bool is_share_usable,

ModelTypeSet initial_sync_ended,

- const ModelTypePayloadMap& download_progress_markers,

+ const ModelTypeStateMap& download_progress_markers,

bool more_to_sync,

bool is_silenced,

int num_encryption_conflicts,

@@ -58,7 +58,7 @@ class SyncSessionSnapshot {

int64 num_server_changes_remaining() const;

bool is_share_usable() const;

ModelTypeSet initial_sync_ended() const;

- ModelTypePayloadMap download_progress_markers() const;

+ ModelTypeStateMap download_progress_markers() const;

bool has_more_to_sync() const;

bool is_silenced() const;

int num_encryption_conflicts() const;

@@ -78,7 +78,7 @@ class SyncSessionSnapshot {

ModelNeutralState model_neutral_state_;

bool is_share_usable_;

ModelTypeSet initial_sync_ended_;

- ModelTypePayloadMap download_progress_markers_;

+ ModelTypeStateMap download_progress_markers_;

bool has_more_to_sync_;

bool is_silenced_;

int num_encryption_conflicts_;