Commit d6466fd4 authored by Jens Widell's avatar Jens Widell Committed by Commit Bot

Stop importing syncable::WriteTransaction into syncer namespace

In jumbo/unity builds it conflicts with syncer::WriteTransaction defined
in components/sync/syncable/write_transaction.h.

Change-Id: I19a325af6299d955577aec10d36f21b948859035
Reviewed-on: https://chromium-review.googlesource.com/822091Reviewed-by: default avatarPavel Yatsuk <pavely@chromium.org>
Commit-Queue: Jens Widell <jl@opera.com>
Cr-Commit-Position: refs/heads/master@{#523502}
parent 4de3d532
...@@ -26,7 +26,6 @@ using syncable::Directory; ...@@ -26,7 +26,6 @@ using syncable::Directory;
using syncable::Entry; using syncable::Entry;
using syncable::Id; using syncable::Id;
using syncable::MutableEntry; using syncable::MutableEntry;
using syncable::WriteTransaction;
namespace { namespace {
...@@ -65,7 +64,7 @@ ConflictResolver::ConflictResolver() {} ...@@ -65,7 +64,7 @@ ConflictResolver::ConflictResolver() {}
ConflictResolver::~ConflictResolver() {} ConflictResolver::~ConflictResolver() {}
void ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans, void ConflictResolver::ProcessSimpleConflict(syncable::WriteTransaction* trans,
const Id& id, const Id& id,
const Cryptographer* cryptographer, const Cryptographer* cryptographer,
StatusController* status, StatusController* status,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment