sync/engine/apply_updates_and_resolve_conflicts_command.cc - Issue 11638018: [sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp

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/engine/apply_updates_and_resolve_conflicts_command.cc

Issue 11638018: [sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove comments Created 8 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « sync/engine/apply_control_data_updates_unittest.cc ('k') | sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/engine/apply_updates_and_resolve_conflicts_command.cc

diff --git a/sync/engine/apply_updates_and_resolve_conflicts_command.cc b/sync/engine/apply_updates_and_resolve_conflicts_command.cc

index 971f90dde548a0699d2def479cf1008f7322e906..214fb3948afeb4be74d354b4ec65237555c1e75b 100644

--- a/sync/engine/apply_updates_and_resolve_conflicts_command.cc

+++ b/sync/engine/apply_updates_and_resolve_conflicts_command.cc

@@ -1,4 +1,4 @@

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

// found in the LICENSE file.

@@ -9,8 +9,8 @@

#include "sync/engine/update_applicator.h"

#include "sync/sessions/sync_session.h"

#include "sync/syncable/directory.h"

-#include "sync/syncable/read_transaction.h"

-#include "sync/syncable/write_transaction.h"

+#include "sync/syncable/syncable_read_transaction.h"

+#include "sync/syncable/syncable_write_transaction.h"

namespace syncer {