diff options
| author | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-14 15:20:42 +0000 |
|---|---|---|
| committer | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-14 15:20:42 +0000 |
| commit | 1c7fa0a26fed6f48fbb2a7fe5724c5f9143610ff (patch) | |
| tree | b88ecd45df859d7486de533bb5d6fa198dc1a4be /chrome/browser/predictors/autocomplete_action_predictor.cc | |
| parent | 5463c700e47a3beac464d95b251335bd90145a4d (diff) | |
| download | chromium_src-1c7fa0a26fed6f48fbb2a7fe5724c5f9143610ff.zip chromium_src-1c7fa0a26fed6f48fbb2a7fe5724c5f9143610ff.tar.gz chromium_src-1c7fa0a26fed6f48fbb2a7fe5724c5f9143610ff.tar.bz2 | |
Revert 146735 - Handle interface to prerenders.
It broke the windows aura build, which isn't on standard tries.
The prerender_manager now returns a PrerenderHandle* when creating a prerender; this is a useful object for canceling the prerender, as well as signaling navigation, etc...
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10553029
TBR=gavinp@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10783013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/predictors/autocomplete_action_predictor.cc')
| -rw-r--r-- | chrome/browser/predictors/autocomplete_action_predictor.cc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc index 642bc7c..2ac67fa 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc @@ -26,7 +26,6 @@ #include "chrome/browser/predictors/predictor_database.h" #include "chrome/browser/predictors/predictor_database_factory.h" #include "chrome/browser/prerender/prerender_field_trial.h" -#include "chrome/browser/prerender/prerender_handle.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/profiles/profile.h" @@ -120,8 +119,6 @@ AutocompleteActionPredictor::~AutocompleteActionPredictor() { main_profile_predictor_->incognito_predictor_ = NULL; else if (incognito_predictor_) incognito_predictor_->main_profile_predictor_ = NULL; - if (prerender_handle_.get()) - prerender_handle_->OnCancel(); } void AutocompleteActionPredictor::RegisterTransitionalMatches( @@ -156,22 +153,6 @@ void AutocompleteActionPredictor::ClearTransitionalMatches() { transitional_matches_.clear(); } -void AutocompleteActionPredictor::StartPrerendering( - const GURL& url, - content::SessionStorageNamespace* session_storage_namespace, - const gfx::Size& size) { - if (prerender_handle_.get()) - prerender_handle_->OnNavigateAway(); - if (prerender::PrerenderManager* prerender_manager = - prerender::PrerenderManagerFactory::GetForProfile(profile_)) { - prerender_handle_.reset( - prerender_manager->AddPrerenderFromOmnibox( - url, session_storage_namespace, size)); - } else { - prerender_handle_.reset(); - } -} - // Given a match, return a recommended action. AutocompleteActionPredictor::Action AutocompleteActionPredictor::RecommendAction( |