chrome/browser/sessions/tab_restore_service.cc - Issue 10917026: Switch Extensions::TabHelper to use WebContents, 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/sessions/tab_restore_service.cc

Issue 10917026: Switch Extensions::TabHelper to use WebContents, WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase only Created 8 years, 3 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/sessions/tab_restore_service.cc

diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc

index d66cc8c112452d0f9277eb3dd9f1a8eb653a9e8c..19f5ada8491f171530a31e112fd8eb19074ece2e 100644

--- a/chrome/browser/sessions/tab_restore_service.cc

+++ b/chrome/browser/sessions/tab_restore_service.cc

@@ -542,7 +542,8 @@ void TabRestoreService::PopulateTab(Tab* tab,

// tab_contents is NULL in some browser tests.

if (tab_contents) {

const extensions::Extension* extension =

- tab_contents->extension_tab_helper()->extension_app();

+ extensions::TabHelper::FromWebContents(controller->GetWebContents())->

+ extension_app();

if (extension)

tab->extension_app_id = extension->id();

}