Index: chrome/browser/ui/sync/synced_tab_delegate_android.h |
diff --git a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h b/chrome/browser/ui/sync/synced_tab_delegate_android.h |
similarity index 55% |
copy from chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h |
copy to chrome/browser/ui/sync/synced_tab_delegate_android.h |
index 62717c4ec3deaecdedf52d8b225d85d245197ff9..b6b46ad66241a2b87755a392f243cd3dc820befc 100644 |
--- a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h |
+++ b/chrome/browser/ui/sync/synced_tab_delegate_android.h |
@@ -2,27 +2,25 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_UI_SYNC_TAB_CONTENTS_SYNCED_TAB_DELEGATE_H_ |
-#define CHROME_BROWSER_UI_SYNC_TAB_CONTENTS_SYNCED_TAB_DELEGATE_H_ |
+#ifndef CHROME_BROWSER_UI_SYNC_SYNCED_TAB_DELEGATE_ANDROID_H_ |
+#define CHROME_BROWSER_UI_SYNC_SYNCED_TAB_DELEGATE_ANDROID_H_ |
#include "base/compiler_specific.h" |
#include "chrome/browser/sessions/session_id.h" |
#include "chrome/browser/sync/glue/synced_tab_delegate.h" |
#include "content/public/browser/web_contents_user_data.h" |
-namespace content { |
-class WebContents; |
-} |
+namespace content { class WebContents; } |
-class TabContentsSyncedTabDelegate |
- : public browser_sync::SyncedTabDelegate, |
- public content::WebContentsUserData<TabContentsSyncedTabDelegate> { |
+class TabAndroid; |
+ |
+class SyncedTabDelegateAndroid : public browser_sync::SyncedTabDelegate { |
public: |
- virtual ~TabContentsSyncedTabDelegate(); |
+ virtual ~SyncedTabDelegateAndroid(); |
// Methods from SyncedTabDelegate. |
- virtual SessionID::id_type GetWindowId() const OVERRIDE; |
- virtual SessionID::id_type GetSessionId() const OVERRIDE; |
+ virtual const SessionID& GetWindowId() const OVERRIDE; |
+ virtual const SessionID& GetSessionId() const OVERRIDE; |
virtual bool IsBeingDestroyed() const OVERRIDE; |
virtual Profile* profile() const OVERRIDE; |
virtual std::string GetExtensionAppId() const OVERRIDE; |
@@ -33,14 +31,17 @@ class TabContentsSyncedTabDelegate |
virtual content::NavigationEntry* GetEntryAtIndex(int i) const OVERRIDE; |
virtual content::NavigationEntry* GetActiveEntry() const OVERRIDE; |
virtual bool IsPinned() const OVERRIDE; |
+ virtual int64 GetSyncSessionId() const OVERRIDE; |
+ virtual void SetSyncSessionId(const int64 sync_id) OVERRIDE; |
+ virtual void SetWebContents(content::WebContents* web_contents); |
+ virtual bool IsTabInMemory() const OVERRIDE; |
+ explicit SyncedTabDelegateAndroid(TabAndroid* owning_tab_); |
private: |
- explicit TabContentsSyncedTabDelegate(content::WebContents* web_contents); |
- friend class content::WebContentsUserData<TabContentsSyncedTabDelegate>; |
- |
content::WebContents* web_contents_; |
+ TabAndroid* tab_android_; |
- DISALLOW_COPY_AND_ASSIGN(TabContentsSyncedTabDelegate); |
+ DISALLOW_COPY_AND_ASSIGN(SyncedTabDelegateAndroid); |
}; |
-#endif // CHROME_BROWSER_UI_SYNC_TAB_CONTENTS_SYNCED_TAB_DELEGATE_H_ |
+#endif // CHROME_BROWSER_UI_SYNC_SYNCED_TAB_DELEGATE_ANDROID_H_ |