Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/sync/engine_impl/conflict_resolver.cc

Issue 2376123003: [Sync] Move //components/sync to the syncer namespace. (Closed)
Patch Set: Fix tools and iOS. Created 4 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 side-by-side diff with in-line comments
Download patch
« components/sync/driver/user_selectable_sync_type.h ('K') | « components/sync/engine_impl/commit_util.cc ('k') | components/sync/engine_impl/conflict_util.cc » ('j') | components/sync/engine_impl/syncer_proto_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/engine_impl/conflict_resolver.cc
diff --git a/components/sync/engine_impl/conflict_resolver.cc b/components/sync/engine_impl/conflict_resolver.cc
index 3c028ba48ea9a2def50fc009f9f8f0f3521d92a0..619a104155594b1be4fff544d9129fcc5cf4a640 100644
--- a/components/sync/engine_impl/conflict_resolver.cc
+++ b/components/sync/engine_impl/conflict_resolver.cc
@@ -23,11 +23,11 @@ using std::set;
namespace syncer {
-using syncable::Directory;
-using syncable::Entry;
-using syncable::Id;
-using syncable::MutableEntry;
-using syncable::WriteTransaction;
+using syncer::syncable::Directory;
+using syncer::syncable::Entry;
+using syncer::syncable::Id;
+using syncer::syncable::MutableEntry;
+using syncer::syncable::WriteTransaction;
namespace {
« components/sync/driver/user_selectable_sync_type.h ('K') | « components/sync/engine_impl/commit_util.cc ('k') | components/sync/engine_impl/conflict_util.cc » ('j') | components/sync/engine_impl/syncer_proto_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698