From 728842bcb9fe1aa7ac502189b7737bfd755530aa Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Tue, 11 Sep 2012 01:32:29 +0000 Subject: Revert r155743, "Switch Extensions::TabHelper to use WebContents, WebContentsUserData." BUG=107201 TEST=no visible change TBR=aa@chromium.org, ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10914186 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155901 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/browser_tabrestore.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'chrome/browser/ui/browser_tabrestore.cc') diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc index 4443305..566cb86 100644 --- a/chrome/browser/ui/browser_tabrestore.cc +++ b/chrome/browser/ui/browser_tabrestore.cc @@ -57,8 +57,7 @@ content::WebContents* AddRestoredTab( chrome::GetActiveWebContents(browser), session_storage_namespace_map); WebContents* new_tab = tab_contents->web_contents(); - extensions::TabHelper::FromWebContents(new_tab)-> - SetExtensionAppById(extension_app_id); + tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id); std::vector entries; TabNavigation::CreateNavigationEntriesFromTabNavigations( browser->profile(), navigations, &entries); @@ -119,9 +118,8 @@ void ReplaceRestoredTab( MSG_ROUTING_NONE, GetActiveWebContents(browser), session_storage_namespace_map); + tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id); WebContents* replacement = tab_contents->web_contents(); - extensions::TabHelper::FromWebContents(replacement)-> - SetExtensionAppById(extension_app_id); replacement->SetUserAgentOverride(user_agent_override); std::vector entries; TabNavigation::CreateNavigationEntriesFromTabNavigations( -- cgit v1.1