| 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;
|
|
|
|
|