diff options
| author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 21:01:39 +0000 |
|---|---|---|
| committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 21:01:39 +0000 |
| commit | ada01b945465efd456813c51ff9090f43337d49c (patch) | |
| tree | 3fcdfb6aa4d6e1d114ca4928db578a73fac75658 /chrome/browser/instant | |
| parent | 8c103ce463cb1ce652e89daf9403649aaea0d689 (diff) | |
| download | chromium_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/instant')
| -rw-r--r-- | chrome/browser/instant/instant_controller.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index 41d94e4..c7dd79b 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -18,7 +18,6 @@ #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.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" @@ -206,8 +205,7 @@ void InstantController::Update(TabContentsWrapper* tab_contents, } else if (preview_condition == PREVIEW_CONDITION_INSTANT_SEARCH_ONLY) { // Start Prerender of this page instead. prerender::PrerenderManager* prerender_manager = - prerender::PrerenderManagerFactory::GetForProfile( - tab_contents_->profile()); + tab_contents_->profile()->GetPrerenderManager(); if (prerender_manager) prerender_manager->AddPrerenderFromOmnibox(match.destination_url); |