summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_edit.cc
diff options
context:
space:
mode:
authordominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-07 21:01:39 +0000
committerdominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-07 21:01:39 +0000
commitada01b945465efd456813c51ff9090f43337d49c (patch)
tree3fcdfb6aa4d6e1d114ca4928db578a73fac75658 /chrome/browser/autocomplete/autocomplete_edit.cc
parent8c103ce463cb1ce652e89daf9403649aaea0d689 (diff)
downloadchromium_src-ada01b945465efd456813c51ff9090f43337d49c.zip
chromium_src-ada01b945465efd456813c51ff9090f43337d49c.tar.gz
chromium_src-ada01b945465efd456813c51ff9090f43337d49c.tar.bz2
Revert 100003 - Moved PrerenderManager to ProfileKeyedService system.
As per https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/554b5b0ca05e001d# it is recommended that weak references to services be removed from Profiles and constructed as ProfileKeyedServices instead. This does this for the PrerenderManager. BUG=94643 TEST=Prerender* Review URL: http://codereview.chromium.org/7795009 TBR=dominich@chromium.org Review URL: http://codereview.chromium.org/7837045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit.cc')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index a0f3f46..97e7d0c 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -25,7 +25,6 @@
#include "chrome/browser/net/predictor_api.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prerender/prerender_manager.h"
-#include "chrome/browser/prerender/prerender_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
@@ -1015,7 +1014,7 @@ void AutocompleteEditModel::DoPrerender(const AutocompleteMatch& match) {
return;
TabContentsWrapper* tab = controller_->GetTabContentsWrapper();
prerender::PrerenderManager* prerender_manager =
- prerender::PrerenderManagerFactory::GetForProfile(tab->profile());
+ tab->profile()->GetPrerenderManager();
if (prerender_manager)
prerender_manager->AddPrerenderFromOmnibox(match.destination_url);
}