diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-20 01:06:30 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-20 01:06:30 +0000 |
| commit | fdac6adeae4bd9a79b4d93d006d96ac2bd902bde (patch) | |
| tree | de319c63b9d50a17de408b7f4daf12da1a8c0329 /chrome/browser/ui/browser_tabrestore.cc | |
| parent | 243f55f68ef7a32d3d1c7f11ff26dfcf5cdda112 (diff) | |
| download | chromium_src-fdac6adeae4bd9a79b4d93d006d96ac2bd902bde.zip chromium_src-fdac6adeae4bd9a79b4d93d006d96ac2bd902bde.tar.gz chromium_src-fdac6adeae4bd9a79b4d93d006d96ac2bd902bde.tar.bz2 | |
Revert "Fix SessionStorage confusion between RenderViewHostImpl and NavigationController."
Reason: There's something wrong with the StoragePartition cleanup, see comments in
https://codereview.chromium.org/19756002/.
BUG=
TBR=michaeln@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19765009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_tabrestore.cc')
| -rw-r--r-- | chrome/browser/ui/browser_tabrestore.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc index a949fc5..9bb737a 100644 --- a/chrome/browser/ui/browser_tabrestore.cc +++ b/chrome/browser/ui/browser_tabrestore.cc @@ -14,6 +14,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/session_storage_namespace.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" @@ -44,6 +45,13 @@ WebContents* CreateRestoredTab( content::SessionStorageNamespace* session_storage_namespace, const std::string& user_agent_override) { GURL restore_url = navigations.at(selected_navigation).virtual_url(); + // TODO(ajwong): Remove the temporary session_storage_namespace_map when + // we teach session restore to understand that one tab can have multiple + // SessionStorageNamespace objects. Also remove the + // session_storage_namespace.h include since we only need that to assign + // into the map. + content::SessionStorageNamespaceMap session_storage_namespace_map; + session_storage_namespace_map[std::string()] = session_storage_namespace; WebContents::CreateParams create_params( browser->profile(), tab_util::GetSiteInstanceForNewTab(browser->profile(), restore_url)); @@ -55,7 +63,7 @@ WebContents* CreateRestoredTab( } WebContents* web_contents = content::WebContents::CreateWithSessionStorage( create_params, - session_storage_namespace); + session_storage_namespace_map); extensions::TabHelper::CreateForWebContents(web_contents); extensions::TabHelper::FromWebContents(web_contents)-> SetExtensionAppById(extension_app_id); |