chrome/browser/sync/engine/conflict_resolver.cc - Issue 7879006: Delete Tracked, and move Location to its own file.

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: chrome/browser/sync/engine/conflict_resolver.cc

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc ('k') | chrome/browser/sync/engine/post_commit_message_command.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/sync/engine/conflict_resolver.h"	5 #include "chrome/browser/sync/engine/conflict_resolver.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <map>	8 #include <map>

9 #include <set>	9 #include <set>

10	10

	11 #include "base/location.h"

11 #include "base/metrics/histogram.h"	12 #include "base/metrics/histogram.h"

12 #include "base/tracked.h"

13 #include "chrome/browser/sync/engine/syncer.h"	13 #include "chrome/browser/sync/engine/syncer.h"

14 #include "chrome/browser/sync/engine/syncer_util.h"	14 #include "chrome/browser/sync/engine/syncer_util.h"

15 #include "chrome/browser/sync/protocol/service_constants.h"	15 #include "chrome/browser/sync/protocol/service_constants.h"

16 #include "chrome/browser/sync/sessions/status_controller.h"	16 #include "chrome/browser/sync/sessions/status_controller.h"

17 #include "chrome/browser/sync/syncable/directory_manager.h"	17 #include "chrome/browser/sync/syncable/directory_manager.h"

18 #include "chrome/browser/sync/syncable/syncable.h"	18 #include "chrome/browser/sync/syncable/syncable.h"

19	19

20 using std::map;	20 using std::map;

21 using std::set;	21 using std::set;

22 using syncable::BaseTransaction;	22 using syncable::BaseTransaction;

(...skipping 490 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
513 conflict_set_count_map_.erase(i++);	513 conflict_set_count_map_.erase(i++);

514 // METRIC self resolved conflict sets ++.	514 // METRIC self resolved conflict sets ++.

515 } else {	515 } else {

516 ++i;	516 ++i;

517 }	517 }

518 }	518 }

519 return rv;	519 return rv;

520 }	520 }

521	521

522 } // namespace browser_sync	522 } // namespace browser_sync

OLD	NEW