diff options
author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 19:03:27 +0000 |
---|---|---|
committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 19:03:27 +0000 |
commit | 1459fb6d13c6e8da1fd72a569e9410a1d038bd59 (patch) | |
tree | 869478ccf95444e29cffb9e5e70acc0015379057 /chrome/browser/prerender/prerender_manager.cc | |
parent | 8b001f3e36a29f590e57d46e8e1b357685eb38c1 (diff) | |
download | chromium_src-1459fb6d13c6e8da1fd72a569e9410a1d038bd59.zip chromium_src-1459fb6d13c6e8da1fd72a569e9410a1d038bd59.tar.gz chromium_src-1459fb6d13c6e8da1fd72a569e9410a1d038bd59.tar.bz2 |
Remove a chrome dependency by removing Prerender from ResourceDispatcherHost.
BUG=82590,77090
TEST=Prerender*
Review URL: http://codereview.chromium.org/6966017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_manager.cc')
-rw-r--r-- | chrome/browser/prerender/prerender_manager.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 7f3dd2b..969c564 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -11,6 +11,7 @@ #include "base/metrics/histogram.h" #include "base/time.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/browser_process.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/prerender/prerender_final_status.h" @@ -206,10 +207,12 @@ void DestroyPreloadForRenderView( final_status); } -PrerenderManager::PrerenderManager(Profile* profile) +PrerenderManager::PrerenderManager(Profile* profile, + PrerenderTracker* prerender_tracker) : rate_limit_enabled_(true), enabled_(true), profile_(profile), + prerender_tracker_(prerender_tracker), max_prerender_age_(base::TimeDelta::FromSeconds( kDefaultMaxPrerenderAgeSeconds)), max_prerender_memory_mb_(kDefaultMaxPrerenderMemoryMB), @@ -454,7 +457,7 @@ bool PrerenderManager::MaybeUsePreloadedPageOld(TabContents* tab_contents, // Try to set the prerendered page as used, so any subsequent attempts to // cancel on other threads will fail. If this fails because the prerender // was already cancelled, possibly on another thread, fail. - if (!PrerenderTracker::GetInstance()->TryUse(child_id, route_id)) + if (!prerender_tracker_->TryUse(child_id, route_id)) return false; if (!prerender_contents->load_start_time().is_null()) @@ -566,7 +569,7 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents, // Try to set the prerendered page as used, so any subsequent attempts to // cancel on other threads will fail. If this fails because the prerender // was already cancelled, possibly on another thread, fail. - if (!PrerenderTracker::GetInstance()->TryUse(child_id, route_id)) + if (!prerender_tracker_->TryUse(child_id, route_id)) return false; if (!prerender_contents->load_start_time().is_null()) @@ -688,7 +691,7 @@ PrerenderContents* PrerenderManager::CreatePrerenderContents( const GURL& referrer) { DCHECK(CalledOnValidThread()); return prerender_contents_factory_->CreatePrerenderContents( - this, profile_, url, referrer); + this, prerender_tracker_, profile_, url, referrer); } void PrerenderManager::DeletePendingDeleteEntries() { |