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

Unified Diff: components/sync_sessions/sessions_sync_manager.h

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: 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
Index: components/sync_sessions/sessions_sync_manager.h
diff --git a/components/sync_sessions/sessions_sync_manager.h b/components/sync_sessions/sessions_sync_manager.h
index a0ff584d3f0bee4fa1444c12f0dcadf2cd7ca6df..360601ba5a93b6aa42406e2450c3cb8cd5004986 100644
--- a/components/sync_sessions/sessions_sync_manager.h
+++ b/components/sync_sessions/sessions_sync_manager.h
@@ -33,10 +33,13 @@
#include "components/sync_sessions/tab_node_pool.h"
namespace syncer {
-class LocalDeviceInfoProvider;
class SyncErrorFactory;
+}
+
+namespace sync_driver {
+class LocalDeviceInfoProvider;
class SyncPrefs;
-} // namespace syncer
+}
namespace sync_pb {
class SessionHeader;
@@ -62,8 +65,8 @@ class SessionsSyncManager : public syncer::SyncableService,
public LocalSessionEventHandler {
public:
SessionsSyncManager(SyncSessionsClient* sessions_client,
- syncer::SyncPrefs* sync_prefs,
- syncer::LocalDeviceInfoProvider* local_device,
+ sync_driver::SyncPrefs* sync_prefs,
+ sync_driver::LocalDeviceInfoProvider* local_device,
std::unique_ptr<LocalSessionEventRouter> router,
const base::Closure& sessions_updated_callback,
const base::Closure& datatype_refresh_callback);
@@ -341,13 +344,13 @@ class SessionsSyncManager : public syncer::SyncableService,
// proves that we are still relevant.
bool local_tab_pool_out_of_sync_;
- syncer::SyncPrefs* sync_prefs_;
+ sync_driver::SyncPrefs* sync_prefs_;
std::unique_ptr<syncer::SyncErrorFactory> error_handler_;
std::unique_ptr<syncer::SyncChangeProcessor> sync_processor_;
// Local device info provider, owned by ProfileSyncService.
- const syncer::LocalDeviceInfoProvider* const local_device_;
+ const sync_driver::LocalDeviceInfoProvider* const local_device_;
// Unique client tag.
std::string current_machine_tag_;
« no previous file with comments | « components/sync_sessions/session_data_type_controller_unittest.cc ('k') | components/sync_sessions/sessions_sync_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698