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/chrome_content_browser_client.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/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 4709e32..7ab8355 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -29,6 +29,7 @@ #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/prerender/prerender_tracker.h" #include "chrome/browser/printing/printing_message_filter.h" #include "chrome/browser/profiles/profile.h" @@ -542,8 +543,8 @@ void ChromeContentBrowserClient::AllowCertificateError( return; } prerender::PrerenderManager* prerender_manager = - Profile::FromBrowserContext(tab->browser_context())-> - GetPrerenderManager(); + prerender::PrerenderManagerFactory::GetForProfile( + Profile::FromBrowserContext(tab->browser_context())); if (prerender_manager && prerender_manager->IsTabContentsPrerendering(tab)) { if (prerender_manager->prerender_tracker()->TryCancel( handler->render_process_host_id(), |