| Index: components/sessions/core/tab_restore_service_delegate.h
|
| diff --git a/components/sessions/core/tab_restore_service_delegate.h b/components/sessions/core/tab_restore_service_delegate.h
|
| index 2a29141354882fcfb0eaa2000b68919a951bbd9a..9f9ea8d96fe3f0593a1dc4a5041e930ba9a0c50f 100644
|
| --- a/components/sessions/core/tab_restore_service_delegate.h
|
| +++ b/components/sessions/core/tab_restore_service_delegate.h
|
| @@ -12,13 +12,10 @@
|
| #include "components/sessions/sessions_export.h"
|
|
|
| namespace sessions {
|
| -class LiveTab;
|
| -}
|
|
|
| -namespace sessions {
|
| +class LiveTab;
|
| class SerializedNavigationEntry;
|
| class TabClientData;
|
| -}
|
|
|
| // Objects implement this interface to provide necessary functionality for
|
| // TabRestoreService to operate. These methods are mostly copies of existing
|
| @@ -40,32 +37,32 @@ class SESSIONS_EXPORT TabRestoreServiceDelegate {
|
| // see Browser::app_name()
|
| virtual std::string GetAppName() const = 0;
|
|
|
| - virtual sessions::LiveTab* GetLiveTabAt(int index) const = 0;
|
| - virtual sessions::LiveTab* GetActiveLiveTab() const = 0;
|
| + virtual LiveTab* GetLiveTabAt(int index) const = 0;
|
| + virtual LiveTab* GetActiveLiveTab() const = 0;
|
| virtual bool IsTabPinned(int index) const = 0;
|
|
|
| // Note: |tab_client_data| may be null (e.g., if |from_last_session| is true,
|
| // as the tab client data is not persisted, or if the embedder did not supply
|
| // client data for the tab in question).
|
| - virtual sessions::LiveTab* AddRestoredTab(
|
| - const std::vector<sessions::SerializedNavigationEntry>& navigations,
|
| + virtual LiveTab* AddRestoredTab(
|
| + const std::vector<SerializedNavigationEntry>& navigations,
|
| int tab_index,
|
| int selected_navigation,
|
| const std::string& extension_app_id,
|
| bool select,
|
| bool pin,
|
| bool from_last_session,
|
| - const sessions::TabClientData* tab_client_data,
|
| + const TabClientData* tab_client_data,
|
| const std::string& user_agent_override) = 0;
|
|
|
| // Note: |tab_client_data| may be null (e.g., if |from_last_session| is true,
|
| // as the tab client data is not persisted, or if the embedder did not supply
|
| - virtual sessions::LiveTab* ReplaceRestoredTab(
|
| - const std::vector<sessions::SerializedNavigationEntry>& navigations,
|
| + virtual LiveTab* ReplaceRestoredTab(
|
| + const std::vector<SerializedNavigationEntry>& navigations,
|
| int selected_navigation,
|
| bool from_last_session,
|
| const std::string& extension_app_id,
|
| - const sessions::TabClientData* tab_client_data,
|
| + const TabClientData* tab_client_data,
|
| const std::string& user_agent_override) = 0;
|
| virtual void CloseTab() = 0;
|
|
|
| @@ -73,4 +70,6 @@ class SESSIONS_EXPORT TabRestoreServiceDelegate {
|
| virtual ~TabRestoreServiceDelegate() {}
|
| };
|
|
|
| +} // namespace sessions
|
| +
|
| #endif // COMPONENTS_SESSIONS_CORE_TAB_RESTORE_SERVICE_DELEGATE_H_
|
|
|