Chromium Code Reviews| Index: chrome/browser/ui/android/tab_model/tab_model.h |
| diff --git a/chrome/browser/ui/android/tab_model/tab_model.h b/chrome/browser/ui/android/tab_model/tab_model.h |
| index e4bd985bd4c4b170532584f1b4e947711ff4102f..443376d7ba8ee4c61effdd162ba334c8e5705f14 100644 |
| --- a/chrome/browser/ui/android/tab_model/tab_model.h |
| +++ b/chrome/browser/ui/android/tab_model/tab_model.h |
| @@ -8,6 +8,7 @@ |
| #include <memory> |
| #include "base/macros.h" |
| +#include "chrome/browser/ui/android/tab_model/android_live_tab_context.h" |
| #include "components/sessions/core/session_id.h" |
| #include "components/sync_sessions/synced_window_delegate.h" |
| #include "components/toolbar/toolbar_model.h" |
| @@ -24,6 +25,10 @@ namespace content { |
| class WebContents; |
| } |
| +namespace sessiosn { |
| +class LiveTabContext; |
| +} |
| + |
| class Profile; |
| class TabAndroid; |
| @@ -36,6 +41,8 @@ class TabModel : public content::NotificationObserver { |
| virtual bool IsOffTheRecord() const; |
| virtual browser_sync::SyncedWindowDelegate* GetSyncedWindowDelegate() const; |
| virtual SessionID::id_type GetSessionId() const; |
| + virtual const SessionID& SessionId() const; |
| + virtual sessions::LiveTabContext* GetLiveTabContext() const; |
| virtual int GetTabCount() const = 0; |
| virtual int GetActiveIndex() const = 0; |
| @@ -78,6 +85,11 @@ class TabModel : public content::NotificationObserver { |
| // The profile associated with this TabModel. |
| Profile* profile_; |
| + // The LiveTabContext adapter associated with TabModel. |
| + // Used when we access the tab restore service and write in the correct |
|
Theresa
2016/06/30 20:50:25
nit: "... service to write the correct window id..
xingliu
2016/07/01 00:30:39
Done.
|
| + // window id data into TabRestoreService::Entry. |
| + std::unique_ptr<AndroidLiveTabContext> live_tab_context_; |
| + |
| // Describes if this TabModel contains an off-the-record profile. |
| bool is_off_the_record_; |