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/predictors | |
| 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/predictors')
| -rw-r--r-- | chrome/browser/predictors/autocomplete_action_predictor.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/predictors/autocomplete_action_predictor.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc index 5a1e75b..2b9e732 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc @@ -138,7 +138,7 @@ void AutocompleteActionPredictor::ClearTransitionalMatches() { void AutocompleteActionPredictor::StartPrerendering( const GURL& url, - content::SessionStorageNamespace* session_storage_namespace, + const content::SessionStorageNamespaceMap& session_storage_namespace_map, const gfx::Size& size) { // Only cancel the old prerender after starting the new one, so if the URLs // are the same, the underlying prerender will be reused. @@ -146,6 +146,11 @@ void AutocompleteActionPredictor::StartPrerendering( prerender_handle_.release()); if (prerender::PrerenderManager* prerender_manager = prerender::PrerenderManagerFactory::GetForProfile(profile_)) { + content::SessionStorageNamespace* session_storage_namespace = NULL; + content::SessionStorageNamespaceMap::const_iterator it = + session_storage_namespace_map.find(std::string()); + if (it != session_storage_namespace_map.end()) + session_storage_namespace = it->second.get(); prerender_handle_.reset(prerender_manager->AddPrerenderFromOmnibox( url, session_storage_namespace, size)); } diff --git a/chrome/browser/predictors/autocomplete_action_predictor.h b/chrome/browser/predictors/autocomplete_action_predictor.h index 762d31a..b1c4f97 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.h +++ b/chrome/browser/predictors/autocomplete_action_predictor.h @@ -98,7 +98,7 @@ class AutocompleteActionPredictor // prerenders (if any). void StartPrerendering( const GURL& url, - content::SessionStorageNamespace* session_storage_namespace, + const content::SessionStorageNamespaceMap& session_storage_namespace_map, const gfx::Size& size); // Return true if the suggestion type warrants a TCP/IP preconnection. |