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

Unified Diff: ios/chrome/browser/sync/sync_setup_service.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 | « ios/chrome/browser/sync/sync_observer_bridge.mm ('k') | ios/chrome/browser/sync/sync_setup_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/sync/sync_setup_service.h
diff --git a/ios/chrome/browser/sync/sync_setup_service.h b/ios/chrome/browser/sync/sync_setup_service.h
index 5fb18bb79bd13552aa7ae9e742d3291e372bd4ad..6c3dc043478618a8ac5fdb389df4ceeff4f3ff5a 100644
--- a/ios/chrome/browser/sync/sync_setup_service.h
+++ b/ios/chrome/browser/sync/sync_setup_service.h
@@ -14,12 +14,12 @@
#include "components/sync/base/model_type.h"
#include "components/sync/base/syncer_error.h"
-namespace sync_driver {
+class PrefService;
+
+namespace syncer {
class SyncService;
class SyncSetupInProgressHandle;
-}
-
-class PrefService;
+} // namespace syncer
// Class that allows configuring sync. It handles enabling and disabling it, as
// well as choosing datatypes. Most actions are delayed until a commit is done,
@@ -47,7 +47,7 @@ class SyncSetupService : public KeyedService {
kNumberOfSyncableDatatypes
} SyncableDatatype;
- SyncSetupService(sync_driver::SyncService* sync_service, PrefService* prefs);
+ SyncSetupService(syncer::SyncService* sync_service, PrefService* prefs);
~SyncSetupService() override;
// Returns the |syncer::ModelType| associated to the given
@@ -104,12 +104,12 @@ class SyncSetupService : public KeyedService {
// currently selected datatypes.
void SetSyncEnabledWithoutChangingDatatypes(bool sync_enabled);
- sync_driver::SyncService* const sync_service_;
+ syncer::SyncService* const sync_service_;
PrefService* const prefs_;
syncer::ModelTypeSet user_selectable_types_;
// Prevents Sync from running until configuration is complete.
- std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
+ std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
DISALLOW_COPY_AND_ASSIGN(SyncSetupService);
};
« no previous file with comments | « ios/chrome/browser/sync/sync_observer_bridge.mm ('k') | ios/chrome/browser/sync/sync_setup_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698