chrome/browser/sync/engine/conflict_resolver.cc - Issue 495001: sync: Fix license copyright text.

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 495001: sync: Fix license copyright text. (Closed)

Patch Set: " Created 11 years ago

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

Jump to:

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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 entry.	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 <map>	7 #include <map>

8 #include <set>	8 #include <set>

9	9

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

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

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

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

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

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

503 } else {	503 } else {

504 ++i;	504 ++i;

505 }	505 }

506 }	506 }

507 return rv;	507 return rv;

508 }	508 }

509	509

510 } // namespace browser_sync	510 } // namespace browser_sync

OLD	NEW