Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/browser_tabrestore.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_tabrestore.cc
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc
index 566cb863865c01647d3154c57bb697cff00152b7..4443305c54828e9b268dcb84dc80a6fbf8d70a3e 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(
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698