| Index: chrome/browser/sync/sessions/sessions_sync_manager.h
|
| diff --git a/chrome/browser/sync/sessions/sessions_sync_manager.h b/chrome/browser/sync/sessions/sessions_sync_manager.h
|
| index 92dc1e67cf2aceb844b2789dd9d2bb8a050fac53..01ecf900996664daeabbf1353da296dff945f3a3 100644
|
| --- a/chrome/browser/sync/sessions/sessions_sync_manager.h
|
| +++ b/chrome/browser/sync/sessions/sessions_sync_manager.h
|
| @@ -16,13 +16,13 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| #include "chrome/browser/sessions/session_types.h"
|
| -#include "chrome/browser/sync/glue/device_info.h"
|
| #include "chrome/browser/sync/glue/favicon_cache.h"
|
| #include "chrome/browser/sync/glue/synced_session.h"
|
| #include "chrome/browser/sync/glue/synced_session_tracker.h"
|
| #include "chrome/browser/sync/open_tabs_ui_delegate.h"
|
| #include "chrome/browser/sync/sessions/tab_node_pool.h"
|
| #include "components/sessions/session_id.h"
|
| +#include "components/sync_driver/device_info.h"
|
| #include "components/sync_driver/sync_prefs.h"
|
| #include "sync/api/syncable_service.h"
|
|
|
| @@ -32,6 +32,10 @@ namespace syncer {
|
| class SyncErrorFactory;
|
| }
|
|
|
| +namespace sync_driver {
|
| +class LocalDeviceInfoProvider;
|
| +}
|
| +
|
| namespace sync_pb {
|
| class SessionHeader;
|
| class SessionSpecifics;
|
| @@ -43,7 +47,6 @@ class TabNavigation;
|
| namespace browser_sync {
|
|
|
| class DataTypeErrorHandler;
|
| -class LocalDeviceInfoProvider;
|
| class SyncedTabDelegate;
|
| class SyncedWindowDelegate;
|
| class SyncedWindowDelegatesGetter;
|
| @@ -84,7 +87,7 @@ class SessionsSyncManager : public syncer::SyncableService,
|
| public LocalSessionEventHandler {
|
| public:
|
| SessionsSyncManager(Profile* profile,
|
| - LocalDeviceInfoProvider* local_device,
|
| + sync_driver::LocalDeviceInfoProvider* local_device,
|
| scoped_ptr<LocalSessionEventRouter> router);
|
| virtual ~SessionsSyncManager();
|
|
|
| @@ -353,7 +356,7 @@ class SessionsSyncManager : public syncer::SyncableService,
|
| scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
|
|
|
| // Local device info provider, owned by ProfileSyncService.
|
| - const LocalDeviceInfoProvider* const local_device_;
|
| + const sync_driver::LocalDeviceInfoProvider* const local_device_;
|
|
|
| // Unique client tag.
|
| std::string current_machine_tag_;
|
|
|