| Index: chrome/browser/sync/sessions/notification_service_sessions_router.h
|
| diff --git a/chrome/browser/sync/sessions/notification_service_sessions_router.h b/chrome/browser/sync/sessions/notification_service_sessions_router.h
|
| index d4a2feec6c080ef33ce8b318bae85a50aad6757f..51ca72a82dbfc4bd4245f1af61503f01ca19d2de 100644
|
| --- a/chrome/browser/sync/sessions/notification_service_sessions_router.h
|
| +++ b/chrome/browser/sync/sessions/notification_service_sessions_router.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CHROME_BROWSER_SYNC_SESSIONS_NOTIFICATION_SERVICE_SESSIONS_ROUTER_H_
|
| #define CHROME_BROWSER_SYNC_SESSIONS_NOTIFICATION_SERVICE_SESSIONS_ROUTER_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "base/callback_list.h"
|
| @@ -22,10 +23,8 @@ class WebContents;
|
| }
|
|
|
| namespace sync_sessions {
|
| -class SyncSessionsClient;
|
| -}
|
|
|
| -namespace browser_sync {
|
| +class SyncSessionsClient;
|
|
|
| // A SessionsSyncManager::LocalEventRouter that drives session sync via
|
| // the NotificationService.
|
| @@ -35,7 +34,7 @@ class NotificationServiceSessionsRouter
|
| public:
|
| NotificationServiceSessionsRouter(
|
| Profile* profile,
|
| - sync_sessions::SyncSessionsClient* sessions_client_,
|
| + SyncSessionsClient* sessions_client_,
|
| const syncer::SyncableService::StartSyncFlare& flare);
|
| ~NotificationServiceSessionsRouter() override;
|
|
|
| @@ -68,7 +67,7 @@ class NotificationServiceSessionsRouter
|
| LocalSessionEventHandler* handler_;
|
| content::NotificationRegistrar registrar_;
|
| Profile* const profile_;
|
| - sync_sessions::SyncSessionsClient* const sessions_client_;
|
| + SyncSessionsClient* const sessions_client_;
|
| syncer::SyncableService::StartSyncFlare flare_;
|
|
|
| std::unique_ptr<base::CallbackList<void(const std::set<GURL>&,
|
| @@ -80,6 +79,6 @@ class NotificationServiceSessionsRouter
|
| DISALLOW_COPY_AND_ASSIGN(NotificationServiceSessionsRouter);
|
| };
|
|
|
| -} // namespace browser_sync
|
| +} // namespace sync_sessions
|
|
|
| #endif // CHROME_BROWSER_SYNC_SESSIONS_NOTIFICATION_SERVICE_SESSIONS_ROUTER_H_
|
|
|