Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(682)

Unified Diff: chrome/browser/ui/android/tab_model/tab_model.h

Issue 2088443003: Shortcut ctrl+shift+T added on android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit fixes based on review. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..b1d0a4aac7b821bb01e0d158d20426a1dabfeb8d 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 {
David Trainor- moved to gerrit 2016/07/14 18:25:53 sessiosn -> sessions? Do we need this at all with
+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,10 @@ class TabModel : public content::NotificationObserver {
// The profile associated with this TabModel.
Profile* profile_;
+ // The LiveTabContext associated with TabModel.
+ // Used to restore closed tabs through the TabRestoreService.
+ std::unique_ptr<AndroidLiveTabContext> live_tab_context_;
+
// Describes if this TabModel contains an off-the-record profile.
bool is_off_the_record_;

Powered by Google App Engine
This is Rietveld 408576698