Index: chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc |
diff --git a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc |
index 4115f187f6d9f2b8dbf94da6334f34694dbf7b89..2851634e2eed5b59dff07a0d20a8565d3f3fd84d 100644 |
--- a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc |
+++ b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc |
@@ -24,12 +24,20 @@ TabContentsSyncedTabDelegate::TabContentsSyncedTabDelegate( |
TabContentsSyncedTabDelegate::~TabContentsSyncedTabDelegate() {} |
-SessionID::id_type TabContentsSyncedTabDelegate::GetWindowId() const { |
- return SessionTabHelper::FromWebContents(web_contents_)->window_id().id(); |
+const SessionID& TabContentsSyncedTabDelegate::GetWindowId() const { |
+ return SessionTabHelper::FromWebContents(web_contents_)->window_id(); |
} |
-SessionID::id_type TabContentsSyncedTabDelegate::GetSessionId() const { |
- return SessionTabHelper::FromWebContents(web_contents_)->session_id().id(); |
+const SessionID& TabContentsSyncedTabDelegate::GetSessionId() const { |
+ return SessionTabHelper::FromWebContents(web_contents_)->session_id(); |
+} |
+ |
+int64 TabContentsSyncedTabDelegate::GetSyncSessionId() const { |
+ return SessionTabHelper::FromWebContents(web_contents_)->GetSessionSyncId(); |
+} |
+ |
+void TabContentsSyncedTabDelegate::SetSyncSessionId(const int64 sync_id) { |
+ SessionTabHelper::FromWebContents(web_contents_)->SetSessionSyncId(sync_id); |
} |
bool TabContentsSyncedTabDelegate::IsBeingDestroyed() const { |
@@ -73,7 +81,9 @@ NavigationEntry* TabContentsSyncedTabDelegate::GetActiveEntry() const { |
bool TabContentsSyncedTabDelegate::IsPinned() const { |
const browser_sync::SyncedWindowDelegate* window = |
browser_sync::SyncedWindowDelegate::FindSyncedWindowDelegateWithId( |
- GetWindowId()); |
+ GetWindowId().id()); |
// We might not have a parent window, e.g. Developer Tools. |
return window ? window->IsTabPinned(this) : false; |
} |
+ |
+bool TabContentsSyncedTabDelegate::IsTabInMemory() const { return true; } |