chrome/browser/sync/glue/synced_window_delegate_android.cc - Issue 11030004: Switch TabContentsSyncedTabDelegate to use WebContentsUserData.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11030004: Switch TabContentsSyncedTabDelegate to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, added TODO Created 8 years, 2 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:

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 6eea8c5cbcfb857fa7b7d45cdc71167d19ecc813..66d9d21f76a7842002e0d17b8b5fbfb4ec21da4e 100644

--- a/chrome/browser/sync/glue/synced_window_delegate_android.cc

+++ b/chrome/browser/sync/glue/synced_window_delegate_android.cc

@@ -7,6 +7,7 @@

#include "chrome/browser/profiles/profile.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/ui/tab_contents/tab_contents.h"

#include "chrome/browser/sessions/session_id.h"

@@ -77,7 +78,8 @@ bool SyncedWindowDelegateAndroid::IsTabPinned(

SyncedTabDelegate* SyncedWindowDelegateAndroid::GetTabAt(int index) const {

TabContents* tab_contents = tab_model_->GetTabContentsAt(index);

- return tab_contents ? tab_contents->synced_tab_delegate() : NULL;

+ return tab_contents ? TabContentsSyncedTabDelegate::FromWebContents(

+ tab_contents->web_contents()) : NULL;

}

SessionID::id_type SyncedWindowDelegateAndroid::GetTabIdAt(int index) const {