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

Unified Diff: sync/engine/conflict_resolver.h

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head Created 8 years, 6 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
« no previous file with comments | « sync/engine/commit.cc ('k') | sync/engine/conflict_resolver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/conflict_resolver.h
diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h
index 733348ce9a3310b03855afa4a315969344240991..e0fce1d8ce2d978153ea036d4e6fafd7e643cf5c 100644
--- a/sync/engine/conflict_resolver.h
+++ b/sync/engine/conflict_resolver.h
@@ -17,6 +17,8 @@
#include "base/gtest_prod_util.h"
#include "sync/engine/syncer_types.h"
+namespace syncer {
+
namespace syncable {
class BaseTransaction;
class Id;
@@ -24,8 +26,6 @@ class MutableEntry;
class WriteTransaction;
} // namespace syncable
-namespace syncer {
-
class Cryptographer;
namespace sessions {
« no previous file with comments | « sync/engine/commit.cc ('k') | sync/engine/conflict_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698