Add a new SyncedTabDelegate for Android.

chrome/browser/sync/glue/synced_window_delegate_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/synced_window_delegate_android.h"
 
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/glue/synced_tab_delegate_android.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 "content/public/browser/web_contents.h"
 
 namespace browser_sync {
 
 // SyncedWindowDelegate implementations
 
 const std::set<SyncedWindowDelegate*>
     SyncedWindowDelegate::GetSyncedWindowDelegates() {
   std::set<SyncedWindowDelegate*> synced_window_delegates;
   for (TabModelList::const_iterator i = TabModelList::begin();
@@ skipping 48 matching lines @@
 bool SyncedWindowDelegateAndroid::IsTypePopup() const {
   return false;
 }
 
 bool SyncedWindowDelegateAndroid::IsTabPinned(
     const SyncedTabDelegate* tab) const {
   return false;
 }
 
 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);
+  SyncedTabDelegate* tab = GetTabAt(index);
+  return tab ? tab->GetSessionId() : -1;

[Yaron, 2013/05/21 18:32:07]

Can this be null? Don't we always have an android tab?

[shashi, 2013/05/21 23:11:21]

This should not be null, but TabModelImpl uses GetNativeTab for finding native
tab which can return NULL.
I am going to add a CHECK and say this cannot be NULL in TabModelImpl downstream
and remove this check.
On 2013/05/21 18:32:07, Yaron wrote:

 }
 
 bool SyncedWindowDelegateAndroid::IsSessionRestoreInProgress() const {
   return tab_model_->IsSessionRestoreInProgress();
 }
 
 }  // namespace browser_sync