sync/internal_api/public/sessions/sync_session_snapshot.h - Issue 11185064: FYI: Move conflict resolve + clean up afterwards

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 11185064: FYI: Move conflict resolve + clean up afterwards (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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/sessions/model_neutral_state.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 16b07531397cd87204927536517811116ef2d2c6..2f329f6eee87ffa18b470d1c36bea2c6c2aa1571 100644

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

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

@@ -34,11 +34,9 @@ class SyncSessionSnapshot {

bool is_share_usable,

ModelTypeSet initial_sync_ended,

const ProgressMarkerMap& download_progress_markers,

- bool more_to_sync,

bool is_silenced,

int num_encryption_conflicts,

int num_hierarchy_conflicts,

- int num_simple_conflicts,

int num_server_conflicts,

const SyncSourceInfo& source,

bool notifications_enabled,

@@ -59,11 +57,9 @@ class SyncSessionSnapshot {

bool is_share_usable() const;

ModelTypeSet initial_sync_ended() const;

const ProgressMarkerMap& download_progress_markers() const;

- bool has_more_to_sync() const;

bool is_silenced() const;

int num_encryption_conflicts() const;

int num_hierarchy_conflicts() const;

- int num_simple_conflicts() const;

int num_server_conflicts() const;

SyncSourceInfo source() const;

bool notifications_enabled() const;

@@ -79,11 +75,9 @@ class SyncSessionSnapshot {

bool is_share_usable_;

ModelTypeSet initial_sync_ended_;

ProgressMarkerMap download_progress_markers_;

- bool has_more_to_sync_;

bool is_silenced_;

int num_encryption_conflicts_;

int num_hierarchy_conflicts_;

- int num_simple_conflicts_;

int num_server_conflicts_;

SyncSourceInfo source_;

bool notifications_enabled_;