| 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..d1cf812b9908fce4f275634b496870ce3d5f7a95 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"
|
| @@ -30,7 +31,7 @@ namespace browser_sync {
|
| // A SessionsSyncManager::LocalEventRouter that drives session sync via
|
| // the NotificationService.
|
| class NotificationServiceSessionsRouter
|
| - : public LocalSessionEventRouter,
|
| + : public sync_sessions::LocalSessionEventRouter,
|
| public content::NotificationObserver {
|
| public:
|
| NotificationServiceSessionsRouter(
|
| @@ -46,7 +47,8 @@ class NotificationServiceSessionsRouter
|
| const content::NotificationDetails& details) override;
|
|
|
| // SessionsSyncManager::LocalEventRouter implementation.
|
| - void StartRoutingTo(LocalSessionEventHandler* handler) override;
|
| + void StartRoutingTo(
|
| + sync_sessions::LocalSessionEventHandler* handler) override;
|
| void Stop() override;
|
|
|
| private:
|
| @@ -65,7 +67,7 @@ class NotificationServiceSessionsRouter
|
| void OnFaviconsChanged(const std::set<GURL>& page_urls,
|
| const GURL& icon_url);
|
|
|
| - LocalSessionEventHandler* handler_;
|
| + sync_sessions::LocalSessionEventHandler* handler_;
|
| content::NotificationRegistrar registrar_;
|
| Profile* const profile_;
|
| sync_sessions::SyncSessionsClient* const sessions_client_;
|
|
|