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

Unified Diff: components/sync/driver/sync_client.h

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 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 | « components/sync/driver/sync_api_component_factory_mock.cc ('k') | components/sync/driver/sync_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/driver/sync_client.h
diff --git a/components/sync/driver/sync_client.h b/components/sync/driver/sync_client.h
index 48a8611b116e488660ac3c196efa81fbd4d7bc8a..7e5b2d6fea590b71728dd5103d88d932c042ded8 100644
--- a/components/sync/driver/sync_client.h
+++ b/components/sync/driver/sync_client.h
@@ -39,17 +39,14 @@ namespace invalidation {
class InvalidationService;
} // namespace invalidation
-namespace syncer {
-class SyncableService;
-} // namespace syncer
-
namespace sync_sessions {
class SyncSessionsClient;
} // namespace sync_sessions
-namespace sync_driver {
+namespace syncer {
class SyncService;
+class SyncableService;
// Interface for clients of the Sync API to plumb through necessary dependent
// components. This interface is purely for abstracting dependencies, and
@@ -78,7 +75,7 @@ class SyncClient {
// Returns a callback that will register the types specific to the current
// platform.
- virtual sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod
+ virtual SyncApiComponentFactory::RegisterDataTypesMethod
GetRegisterPlatformTypesCallback() = 0;
// Returns a callback that will be invoked when password sync state has
@@ -88,27 +85,27 @@ class SyncClient {
virtual autofill::PersonalDataManager* GetPersonalDataManager() = 0;
virtual BookmarkUndoService* GetBookmarkUndoServiceIfExists() = 0;
virtual invalidation::InvalidationService* GetInvalidationService() = 0;
- virtual scoped_refptr<syncer::ExtensionsActivity> GetExtensionsActivity() = 0;
+ virtual scoped_refptr<ExtensionsActivity> GetExtensionsActivity() = 0;
virtual sync_sessions::SyncSessionsClient* GetSyncSessionsClient() = 0;
// Returns a weak pointer to the syncable service specified by |type|.
// Weak pointer may be unset if service is already destroyed.
// Note: Should only be dereferenced from the model type thread.
- virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
- syncer::ModelType type) = 0;
+ virtual base::WeakPtr<SyncableService> GetSyncableServiceForType(
+ ModelType type) = 0;
// Returns a weak pointer to the ModelTypeService specified by |type|. Weak
// pointer may be unset if service is already destroyed.
// Note: Should only be dereferenced from the model type thread.
- virtual base::WeakPtr<syncer_v2::ModelTypeService> GetModelTypeServiceForType(
- syncer::ModelType type) = 0;
+ virtual base::WeakPtr<ModelTypeService> GetModelTypeServiceForType(
+ ModelType type) = 0;
// Creates and returns a new ModelSafeWorker for the group, or null if one
// cannot be created.
// TODO(maxbogue): Move this inside SyncApiComponentFactory.
- virtual scoped_refptr<syncer::ModelSafeWorker> CreateModelWorkerForGroup(
- syncer::ModelSafeGroup group,
- syncer::WorkerLoopDestructionObserver* observer) = 0;
+ virtual scoped_refptr<ModelSafeWorker> CreateModelWorkerForGroup(
+ ModelSafeGroup group,
+ WorkerLoopDestructionObserver* observer) = 0;
// Returns the current SyncApiComponentFactory instance.
virtual SyncApiComponentFactory* GetSyncApiComponentFactory() = 0;
@@ -117,6 +114,6 @@ class SyncClient {
DISALLOW_COPY_AND_ASSIGN(SyncClient);
};
-} // namespace sync_driver
+} // namespace syncer
#endif // COMPONENTS_SYNC_DRIVER_SYNC_CLIENT_H_
« no previous file with comments | « components/sync/driver/sync_api_component_factory_mock.cc ('k') | components/sync/driver/sync_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698