| Index: chrome/browser/sync/glue/synced_tab_delegate_android.cc
|
| diff --git a/chrome/browser/sync/glue/synced_tab_delegate_android.cc b/chrome/browser/sync/glue/synced_tab_delegate_android.cc
|
| index a3b04d7f4600413b09c302f1cb63ee3f1d5b5365..aad84129391b8df612c4e91bf01adea226fc7e14 100644
|
| --- a/chrome/browser/sync/glue/synced_tab_delegate_android.cc
|
| +++ b/chrome/browser/sync/glue/synced_tab_delegate_android.cc
|
| @@ -38,10 +38,6 @@ bool SyncedTabDelegateAndroid::IsBeingDestroyed() const {
|
| return tab_contents_delegate_->IsBeingDestroyed();
|
| }
|
|
|
| -Profile* SyncedTabDelegateAndroid::profile() const {
|
| - return tab_contents_delegate_->profile();
|
| -}
|
| -
|
| std::string SyncedTabDelegateAndroid::GetExtensionAppId() const {
|
| return tab_contents_delegate_->GetExtensionAppId();
|
| }
|
| @@ -58,20 +54,23 @@ int SyncedTabDelegateAndroid::GetEntryCount() const {
|
| return tab_contents_delegate_->GetEntryCount();
|
| }
|
|
|
| -int SyncedTabDelegateAndroid::GetPendingEntryIndex() const {
|
| - return tab_contents_delegate_->GetPendingEntryIndex();
|
| +GURL SyncedTabDelegateAndroid::GetVirtualURLAtIndex(int i) const {
|
| + return tab_contents_delegate_->GetVirtualURLAtIndex(i);
|
| }
|
|
|
| -NavigationEntry* SyncedTabDelegateAndroid::GetPendingEntry() const {
|
| - return tab_contents_delegate_->GetPendingEntry();
|
| +GURL SyncedTabDelegateAndroid::GetFaviconURLAtIndex(int i) const {
|
| + return tab_contents_delegate_->GetFaviconURLAtIndex(i);
|
| }
|
|
|
| -NavigationEntry* SyncedTabDelegateAndroid::GetEntryAtIndex(int i) const {
|
| - return tab_contents_delegate_->GetEntryAtIndex(i);
|
| +ui::PageTransition SyncedTabDelegateAndroid::GetTransitionAtIndex(
|
| + int i) const {
|
| + return tab_contents_delegate_->GetTransitionAtIndex(i);
|
| }
|
|
|
| -NavigationEntry* SyncedTabDelegateAndroid::GetActiveEntry() const {
|
| - return tab_contents_delegate_->GetActiveEntry();
|
| +void SyncedTabDelegateAndroid::GetSerializedNavigationAtIndex(
|
| + int i,
|
| + sessions::SerializedNavigationEntry* serialized_entry) const {
|
| + tab_contents_delegate_->GetSerializedNavigationAtIndex(i, serialized_entry);
|
| }
|
|
|
| bool SyncedTabDelegateAndroid::IsPinned() const {
|
| @@ -82,10 +81,6 @@ bool SyncedTabDelegateAndroid::HasWebContents() const {
|
| return web_contents_ != NULL;
|
| }
|
|
|
| -content::WebContents* SyncedTabDelegateAndroid::GetWebContents() const {
|
| - return web_contents_;
|
| -}
|
| -
|
| void SyncedTabDelegateAndroid::SetWebContents(
|
| content::WebContents* web_contents) {
|
| web_contents_ = web_contents;
|
| @@ -104,7 +99,7 @@ bool SyncedTabDelegateAndroid::ProfileIsSupervised() const {
|
| return tab_contents_delegate_->ProfileIsSupervised();
|
| }
|
|
|
| -const std::vector<const content::NavigationEntry*>*
|
| +const std::vector<const sessions::SerializedNavigationEntry*>*
|
| SyncedTabDelegateAndroid::GetBlockedNavigations() const {
|
| return tab_contents_delegate_->GetBlockedNavigations();
|
| }
|
| @@ -117,11 +112,4 @@ void SyncedTabDelegateAndroid::SetSyncId(int sync_id) {
|
| tab_android_->SetSyncId(sync_id);
|
| }
|
|
|
| -// static
|
| -SyncedTabDelegate* SyncedTabDelegate::ImplFromWebContents(
|
| - content::WebContents* web_contents) {
|
| - TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
|
| - return tab ? tab->GetSyncedTabDelegate() : nullptr;
|
| -}
|
| -
|
| } // namespace browser_sync
|
|
|