summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/android
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/android')
-rw-r--r--chrome/browser/ui/android/tab_model/tab_model.h4
-rw-r--r--chrome/browser/ui/android/tab_model/tab_model_unittest.cc5
2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/ui/android/tab_model/tab_model.h b/chrome/browser/ui/android/tab_model/tab_model.h
index 32f8fcf..59e7be5 100644
--- a/chrome/browser/ui/android/tab_model/tab_model.h
+++ b/chrome/browser/ui/android/tab_model/tab_model.h
@@ -7,6 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/sessions/session_id.h"
+#include "chrome/browser/sync/glue/synced_tab_delegate.h"
#include "chrome/browser/ui/toolbar/toolbar_model.h"
#include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
#include "content/public/browser/notification_observer.h"
@@ -15,6 +16,7 @@
namespace browser_sync {
class SyncedWindowDelegate;
class SyncedWindowDelegateAndroid;
+class SyncedTabDelegate;
}
namespace content {
@@ -46,7 +48,7 @@ class TabModel : public content::NotificationObserver,
virtual int GetTabCount() const = 0;
virtual int GetActiveIndex() const = 0;
virtual content::WebContents* GetWebContentsAt(int index) const = 0;
- virtual SessionID::id_type GetTabIdAt(int index) const = 0;
+ virtual browser_sync::SyncedTabDelegate* GetTabAt(int index) const = 0;
// Used for restoring tabs from synced foreign sessions.
virtual void CreateTab(content::WebContents* web_contents) = 0;
diff --git a/chrome/browser/ui/android/tab_model/tab_model_unittest.cc b/chrome/browser/ui/android/tab_model/tab_model_unittest.cc
index 439b2bc..4a5d6d5 100644
--- a/chrome/browser/ui/android/tab_model/tab_model_unittest.cc
+++ b/chrome/browser/ui/android/tab_model/tab_model_unittest.cc
@@ -33,10 +33,13 @@ class TestTabModel : public TabModel {
virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE {
return NULL;
}
- virtual SessionID::id_type GetTabIdAt(int index) const OVERRIDE { return 0; }
virtual void CreateTab(content::WebContents* web_contents) OVERRIDE {}
virtual bool IsSessionRestoreInProgress() const OVERRIDE { return false; }
virtual void OpenClearBrowsingData() const OVERRIDE {}
+ virtual browser_sync::SyncedTabDelegate* GetTabAt(int index) const OVERRIDE {
+ return NULL;
+ }
+
};
TEST_F(TabModelTest, TestProfileHandling) {