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

Unified Diff: chrome/browser/sync/glue/synced_window_delegate_android.cc

Issue 15499005: Add a new SyncedTabDelegate for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit. Created 7 years, 7 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/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..e66e09bcc90535bba91a727a4b04f47aeee056af 100644
--- a/chrome/browser/sync/glue/synced_window_delegate_android.cc
+++ b/chrome/browser/sync/glue/synced_window_delegate_android.cc
@@ -5,10 +5,9 @@
#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 {
@@ -77,13 +76,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 GetTabAt(index)->GetSessionId();
}
bool SyncedWindowDelegateAndroid::IsSessionRestoreInProgress() const {

Powered by Google App Engine
This is Rietveld 408576698