| Index: chrome/browser/jumplist_win.h
|
| diff --git a/chrome/browser/jumplist_win.h b/chrome/browser/jumplist_win.h
|
| index bc75e51ce46b18cc0c8cdd49308e17300285ae99..28f751c48e63b4ac0287135c3e50176f0437c8d7 100644
|
| --- a/chrome/browser/jumplist_win.h
|
| +++ b/chrome/browser/jumplist_win.h
|
| @@ -49,7 +49,7 @@ class Profile;
|
| //
|
| // Note. base::CancelableTaskTracker is not thread safe, so we
|
| // always delete JumpList on UI thread (the same thread it got constructed on).
|
| -class JumpList : public TabRestoreServiceObserver,
|
| +class JumpList : public sessions::TabRestoreServiceObserver,
|
| public content::NotificationObserver,
|
| public history::TopSitesObserver,
|
| public base::RefCountedThreadSafe<
|
| @@ -65,11 +65,12 @@ class JumpList : public TabRestoreServiceObserver,
|
|
|
| // Observer callback for TabRestoreService::Observer to notify when a tab is
|
| // added or removed.
|
| - void TabRestoreServiceChanged(TabRestoreService* service) override;
|
| + void TabRestoreServiceChanged(sessions::TabRestoreService* service) override;
|
|
|
| // Observer callback to notice when our associated TabRestoreService
|
| // is destroyed.
|
| - void TabRestoreServiceDestroyed(TabRestoreService* service) override;
|
| + void TabRestoreServiceDestroyed(
|
| + sessions::TabRestoreService* service) override;
|
|
|
| // Cancel a pending jumplist update.
|
| void CancelPendingUpdate();
|
| @@ -93,10 +94,10 @@ class JumpList : public TabRestoreServiceObserver,
|
| // given list.
|
| // These functions are copied from the RecentlyClosedTabsHandler class for
|
| // compatibility with the new-tab page.
|
| - bool AddTab(const TabRestoreService::Tab* tab,
|
| + bool AddTab(const sessions::TabRestoreService::Tab* tab,
|
| ShellLinkItemList* list,
|
| size_t max_items);
|
| - void AddWindow(const TabRestoreService::Window* window,
|
| + void AddWindow(const sessions::TabRestoreService::Window* window,
|
| ShellLinkItemList* list,
|
| size_t max_items);
|
|
|
|
|