diff options
| author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 17:50:50 +0000 |
|---|---|---|
| committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 17:50:50 +0000 |
| commit | 3085c50e9961a71ec0bb473c26efad9ca6589e46 (patch) | |
| tree | 7fd256605ce42e8e4ddee423e0dde13a655ff355 /chrome/browser/prerender/prerender_tab_helper.cc | |
| parent | 56f38f4aee4a6fb282d20bd6f0f506661e00d81f (diff) | |
| download | chromium_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/prerender/prerender_tab_helper.cc')
| -rw-r--r-- | chrome/browser/prerender/prerender_tab_helper.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc index 6f10593..592d484 100644 --- a/chrome/browser/prerender/prerender_tab_helper.cc +++ b/chrome/browser/prerender/prerender_tab_helper.cc @@ -8,6 +8,7 @@ #include "base/string_number_conversions.h" #include "base/time.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/ui/tab_contents/tab_contents_wrapper.h" #include "content/browser/tab_contents/tab_contents.h" @@ -241,11 +242,8 @@ void PrerenderTabHelper::DidStartProvisionalLoadForFrame( } PrerenderManager* PrerenderTabHelper::MaybeGetPrerenderManager() const { - Profile* profile = - Profile::FromBrowserContext(tab_contents()->browser_context()); - if (!profile) - return NULL; - return profile->GetPrerenderManager(); + return PrerenderManagerFactory::GetForProfile( + Profile::FromBrowserContext(tab_contents()->browser_context())); } bool PrerenderTabHelper::MaybeUsePrerenderedPage(const GURL& url, |