diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 16:16:40 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 16:16:40 +0000 |
| commit | 9567f9cc4114c1f004aa57a5cb166f07e9c86693 (patch) | |
| tree | 7473450b0322cf354b21ef8061f426efaceaeb87 /chrome/browser/ui/browser_tabrestore.cc | |
| parent | bed56af283f2f3426cb6c9549518393032cebd84 (diff) | |
| download | chromium_src-9567f9cc4114c1f004aa57a5cb166f07e9c86693.zip chromium_src-9567f9cc4114c1f004aa57a5cb166f07e9c86693.tar.gz chromium_src-9567f9cc4114c1f004aa57a5cb166f07e9c86693.tar.bz2 | |
Switch Extensions::TabHelper to use WebContents, WebContentsUserData.
BUG=107201
TEST=no visible change
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10917026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_tabrestore.cc')
| -rw-r--r-- | chrome/browser/ui/browser_tabrestore.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc index 566cb86..4443305 100644 --- a/chrome/browser/ui/browser_tabrestore.cc +++ b/chrome/browser/ui/browser_tabrestore.cc @@ -57,7 +57,8 @@ content::WebContents* AddRestoredTab( chrome::GetActiveWebContents(browser), session_storage_namespace_map); WebContents* new_tab = tab_contents->web_contents(); - tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id); + extensions::TabHelper::FromWebContents(new_tab)-> + SetExtensionAppById(extension_app_id); std::vector<NavigationEntry*> entries; TabNavigation::CreateNavigationEntriesFromTabNavigations( browser->profile(), navigations, &entries); @@ -118,8 +119,9 @@ 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<NavigationEntry*> entries; TabNavigation::CreateNavigationEntriesFromTabNavigations( |