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

Unified Diff: sync/internal_api/sync_manager.cc

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: sync/internal_api/sync_manager.cc
diff --git a/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc
index 9ba62a4065fb86f3c0e6509316cad25a73e910c4..0e5debb641a95a7202ba1820acdd1c035b91b28f 100644
--- a/sync/internal_api/sync_manager.cc
+++ b/sync/internal_api/sync_manager.cc
@@ -62,34 +62,6 @@
#include "sync/util/time.h"
using base::TimeDelta;
-using syncer::AllStatus;
-using syncer::Cryptographer;
-using syncer::Encryptor;
-using syncer::JsArgList;
-using syncer::JsBackend;
-using syncer::JsEventDetails;
-using syncer::JsEventHandler;
-using syncer::JsEventHandler;
-using syncer::JsReplyHandler;
-using syncer::JsMutationEventObserver;
-using syncer::JsSyncManagerObserver;
-using syncer::kNigoriTag;
-using syncer::KeyParams;
-using syncer::ModelSafeRoutingInfo;
-using syncer::ReportUnrecoverableErrorFunction;
-using syncer::ServerConnectionEvent;
-using syncer::ServerConnectionEventListener;
-using syncer::SyncEngineEvent;
-using syncer::SyncEngineEventListener;
-using syncer::SyncScheduler;
-using syncer::Syncer;
-using syncer::UnrecoverableErrorHandler;
-using syncer::WeakHandle;
-using syncer::sessions::SyncSessionContext;
-using syncable::ImmutableWriteTransactionInfo;
-using syncable::ModelType;
-using syncable::ModelTypeSet;
-using syncable::SPECIFICS;
using sync_pb::GetUpdatesCallerInfo;
namespace {
@@ -124,6 +96,12 @@ static const int kNigoriOverwriteLimit = 10;
namespace syncer {
+using sessions::SyncSessionContext;
+using syncable::ImmutableWriteTransactionInfo;
+using syncable::ModelType;
+using syncable::ModelTypeSet;
+using syncable::SPECIFICS;
+
const int SyncManager::kDefaultNudgeDelayMilliseconds = 200;
const int SyncManager::kPreferencesNudgeDelayMilliseconds = 2000;

Powered by Google App Engine
This is Rietveld 408576698