sync/internal_api/public/sessions/model_neutral_state.cc - Issue 11314008: sync: Follow-up to conflict resolution refactor

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: sync/internal_api/public/sessions/model_neutral_state.cc

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log

« sync/engine/all_status.cc ('K') | « sync/internal_api/public/sessions/model_neutral_state.h ('k') | sync/internal_api/public/sessions/sync_session_snapshot.h » ('j') | sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 namespace syncer {	7 namespace syncer {

8 namespace sessions {	8 namespace sessions {

9	9

10 ModelNeutralState::ModelNeutralState()	10 ModelNeutralState::ModelNeutralState()

11 : num_successful_commits(0),	11 : num_successful_commits(0),

12 num_successful_bookmark_commits(0),	12 num_successful_bookmark_commits(0),

13 num_updates_downloaded_total(0),	13 num_updates_downloaded_total(0),

14 num_tombstone_updates_downloaded_total(0),	14 num_tombstone_updates_downloaded_total(0),

15 num_reflected_updates_downloaded_total(0),	15 num_reflected_updates_downloaded_total(0),

16 num_updates_applied(0),	16 num_updates_applied(0),

17 num_encryption_conflicts(0),	17 num_encryption_conflicts(0),

18 num_server_conflicts(0),	18 num_server_conflicts(0),

19 num_hierarchy_conflicts(0),	19 num_hierarchy_conflicts(0),

20 num_local_overwrites(0),	20 num_local_overwrites(0),

21 num_server_overwrites(0),	21 num_server_overwrites(0),

22 last_get_key_result(UNSET),	22 last_get_key_result(UNSET),

23 last_download_updates_result(UNSET),	23 last_download_updates_result(UNSET),

24 commit_result(UNSET),	24 commit_result(UNSET),

25 conflicts_resolved(false),

26 items_committed(false),	25 items_committed(false),

27 debug_info_sent(false),	26 debug_info_sent(false),

28 num_server_changes_remaining(0) {	27 num_server_changes_remaining(0) {

29 }	28 }

30	29

31 ModelNeutralState::~ModelNeutralState() {}	30 ModelNeutralState::~ModelNeutralState() {}

32	31

33 } // namespace sessions	32 } // namespace sessions

34 } // namespace syncer	33 } // namespace syncer

OLD	NEW