| Index: sync/internal_api/public/sync_context_proxy.h
|
| diff --git a/sync/internal_api/public/sync_core_proxy.h b/sync/internal_api/public/sync_context_proxy.h
|
| similarity index 58%
|
| rename from sync/internal_api/public/sync_core_proxy.h
|
| rename to sync/internal_api/public/sync_context_proxy.h
|
| index 099b5f93a9b3e9c7c94e86c50872c535b12656bf..14bf14f1e7d80f60d213c53901f8c2e32d246d28 100644
|
| --- a/sync/internal_api/public/sync_core_proxy.h
|
| +++ b/sync/internal_api/public/sync_context_proxy.h
|
| @@ -2,32 +2,32 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_INTERNAL_API_PUBLIC_SYNC_CORE_PROXY_H_
|
| -#define SYNC_INTERNAL_API_PUBLIC_SYNC_CORE_PROXY_H_
|
| +#ifndef SYNC_INTERNAL_API_PUBLIC_SYNC_CONTEXT_PROXY_H_
|
| +#define SYNC_INTERNAL_API_PUBLIC_SYNC_CONTEXT_PROXY_H_
|
|
|
| #include "base/memory/weak_ptr.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
|
|
| namespace syncer {
|
|
|
| -class NonBlockingTypeProcessor;
|
| +class ModelTypeSyncProxyImpl;
|
| struct DataTypeState;
|
|
|
| // Interface for the datatype integration logic from non-sync threads.
|
| //
|
| -// See SyncCoreProxyImpl for an actual implementation.
|
| -class SYNC_EXPORT_PRIVATE SyncCoreProxy {
|
| +// See SyncContextProxyImpl for an actual implementation.
|
| +class SYNC_EXPORT_PRIVATE SyncContextProxy {
|
| public:
|
| - SyncCoreProxy();
|
| - virtual ~SyncCoreProxy();
|
| + SyncContextProxy();
|
| + virtual ~SyncContextProxy();
|
|
|
| - // Attempts to connect a non-blocking type to the sync core.
|
| + // Attempts to connect a non-blocking type to the sync context.
|
| //
|
| // Must be called from the thread where the data type lives.
|
| - virtual void ConnectTypeToCore(
|
| + virtual void ConnectTypeToSync(
|
| syncer::ModelType type,
|
| const DataTypeState& data_type_state,
|
| - base::WeakPtr<NonBlockingTypeProcessor> type_processor) = 0;
|
| + const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) = 0;
|
|
|
| // Tells the syncer that we're no longer interested in syncing this type.
|
| //
|
| @@ -36,10 +36,10 @@ class SYNC_EXPORT_PRIVATE SyncCoreProxy {
|
| // and applying updates for this type, too.
|
| virtual void Disconnect(syncer::ModelType type) = 0;
|
|
|
| - // Creates a clone of this SyncCoreProxy.
|
| - virtual scoped_ptr<SyncCoreProxy> Clone() const = 0;
|
| + // Creates a clone of this SyncContextProxy.
|
| + virtual scoped_ptr<SyncContextProxy> Clone() const = 0;
|
| };
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_INTERNAL_API_PUBLIC_SYNC_CORE_PROXY_H_
|
| +#endif // SYNC_INTERNAL_API_PUBLIC_SYNC_CONTEXT_PROXY_H_
|
|
|