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 /content/browser/web_contents/interstitial_page_impl.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 'content/browser/web_contents/interstitial_page_impl.cc')
| -rw-r--r-- | content/browser/web_contents/interstitial_page_impl.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/content/browser/web_contents/interstitial_page_impl.cc b/content/browser/web_contents/interstitial_page_impl.cc index 66d2181..4acea35 100644 --- a/content/browser/web_contents/interstitial_page_impl.cc +++ b/content/browser/web_contents/interstitial_page_impl.cc @@ -493,7 +493,7 @@ RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() { DOMStorageContextImpl* dom_storage_context = static_cast<DOMStorageContextImpl*>(BrowserContext::GetStoragePartition( browser_context, site_instance.get())->GetDOMStorageContext()); - session_storage_namespace_ = + SessionStorageNamespaceImpl* session_storage_namespace_impl = new SessionStorageNamespaceImpl(dom_storage_context); RenderViewHostImpl* render_view_host = @@ -502,7 +502,8 @@ RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() { this, MSG_ROUTING_NONE, MSG_ROUTING_NONE, - false); + false, + session_storage_namespace_impl); web_contents_->RenderViewForInterstitialPageCreated(render_view_host); return render_view_host; } @@ -703,10 +704,6 @@ void InterstitialPageImpl::ShowCreatedFullscreenWidget(int route_id) { << "InterstitialPage does not support showing full screen popups."; } -SessionStorageNamespace* InterstitialPageImpl::GetSessionStorageNamespace() { - return session_storage_namespace_.get(); -} - void InterstitialPageImpl::Disable() { enabled_ = false; } |