Index: chrome/browser/ui/cocoa/history_menu_bridge.h |
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h |
index cb40d14a5eb895a4b7c25ed1c48f0a606843bb09..e48656b98347c445a2f23f17a57cbeda293aaaee 100644 |
--- a/chrome/browser/ui/cocoa/history_menu_bridge.h |
+++ b/chrome/browser/ui/cocoa/history_menu_bridge.h |
@@ -22,7 +22,6 @@ |
#include "components/sessions/session_id.h" |
class Profile; |
-class TabRestoreService; |
@class HistoryMenuCocoaController; |
namespace { |
@@ -55,7 +54,7 @@ struct FaviconImageResult; |
// unlike the typical ownership model, this bridge owns its controller. The |
// controller is very thin and only exists to interact with Cocoa, but this |
// class does the bulk of the work. |
-class HistoryMenuBridge : public TabRestoreServiceObserver, |
+class HistoryMenuBridge : public sessions::TabRestoreServiceObserver, |
public MainMenuItem, |
public history::HistoryServiceObserver { |
public: |
@@ -126,8 +125,9 @@ class HistoryMenuBridge : public TabRestoreServiceObserver, |
~HistoryMenuBridge() override; |
// TabRestoreServiceObserver: |
- void TabRestoreServiceChanged(TabRestoreService* service) override; |
- void TabRestoreServiceDestroyed(TabRestoreService* service) override; |
+ void TabRestoreServiceChanged(sessions::TabRestoreService* service) override; |
+ void TabRestoreServiceDestroyed( |
+ sessions::TabRestoreService* service) override; |
// MainMenuItem: |
void ResetMenu() override; |
@@ -179,7 +179,7 @@ class HistoryMenuBridge : public TabRestoreServiceObserver, |
// Creates a HistoryItem* for the given tab entry. Caller takes ownership of |
// the result and must delete it when finished. |
- HistoryItem* HistoryItemForTab(const TabRestoreService::Tab& entry); |
+ HistoryItem* HistoryItemForTab(const sessions::TabRestoreService::Tab& entry); |
// Helper function that sends an async request to the FaviconService to get |
// an icon. The callback will update the NSMenuItem directly. |
@@ -219,7 +219,7 @@ class HistoryMenuBridge : public TabRestoreServiceObserver, |
Profile* profile_; // weak |
history::HistoryService* history_service_; // weak |
- TabRestoreService* tab_restore_service_; // weak |
+ sessions::TabRestoreService* tab_restore_service_; // weak |
base::CancelableTaskTracker cancelable_task_tracker_; |