Index: chrome/browser/sync/glue/synced_window_delegate_android.cc |
diff --git a/chrome/browser/sync/glue/synced_window_delegate_android.cc b/chrome/browser/sync/glue/synced_window_delegate_android.cc |
index 4d8f4bab319670a69cacb8c865a396b2f0d414d1..ce0107ba5b169caf93a8bc88f60a7aeb9db558ba 100644 |
--- a/chrome/browser/sync/glue/synced_window_delegate_android.cc |
+++ b/chrome/browser/sync/glue/synced_window_delegate_android.cc |
@@ -5,10 +5,10 @@ |
#include "chrome/browser/sync/glue/synced_window_delegate_android.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/sessions/session_id.h" |
#include "chrome/browser/ui/android/tab_model/tab_model.h" |
#include "chrome/browser/ui/android/tab_model/tab_model_list.h" |
-#include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" |
-#include "chrome/browser/sessions/session_id.h" |
+#include "chrome/browser/ui/sync/synced_tab_delegate_android.h" |
#include "content/public/browser/web_contents.h" |
namespace browser_sync { |
@@ -77,13 +77,11 @@ bool SyncedWindowDelegateAndroid::IsTabPinned( |
} |
SyncedTabDelegate* SyncedWindowDelegateAndroid::GetTabAt(int index) const { |
- content::WebContents* web_contents = tab_model_->GetWebContentsAt(index); |
- return web_contents ? TabContentsSyncedTabDelegate::FromWebContents( |
- web_contents) : NULL; |
+ return tab_model_->GetTabAt(index); |
} |
SessionID::id_type SyncedWindowDelegateAndroid::GetTabIdAt(int index) const { |
- return tab_model_->GetTabIdAt(index); |
+ return tab_model_->GetTabAt(index)->GetSessionId().id(); |
} |
bool SyncedWindowDelegateAndroid::IsSessionRestoreInProgress() const { |