summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authordominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 17:50:50 +0000
committerdominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 17:50:50 +0000
commit3085c50e9961a71ec0bb473c26efad9ca6589e46 (patch)
tree7fd256605ce42e8e4ddee423e0dde13a655ff355 /chrome/browser/autocomplete
parent56f38f4aee4a6fb282d20bd6f0f506661e00d81f (diff)
downloadchromium_src-3085c50e9961a71ec0bb473c26efad9ca6589e46.zip
chromium_src-3085c50e9961a71ec0bb473c26efad9ca6589e46.tar.gz
chromium_src-3085c50e9961a71ec0bb473c26efad9ca6589e46.tar.bz2
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. (Continuation of http://codereview.chromium.org/7795009/) BUG=94643 TEST=Prerender* Review URL: http://codereview.chromium.org/7846001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 6b31345..6dea848 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prerender/prerender_field_trial.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"
@@ -1022,7 +1023,7 @@ void AutocompleteEditModel::DoPrerender(const AutocompleteMatch& match) {
if (user_input_in_progress() && popup_->IsOpen()) {
TabContentsWrapper* tab = controller_->GetTabContentsWrapper();
prerender::PrerenderManager* prerender_manager =
- tab->profile()->GetPrerenderManager();
+ prerender::PrerenderManagerFactory::GetForProfile(tab->profile());
if (prerender_manager)
prerender_manager->AddPrerenderFromOmnibox(match.destination_url);
}