Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6966017: Remove a chrome dependency by removing Prerender from ResourceDispatcherHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang errors Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index ac050f17af16212f4603296080fb1fd4164af869..ade0457bfb879722ad3f032690264829f9f9f2bd 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -31,6 +31,7 @@
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/resource_dispatcher_host.h"
#include "content/browser/renderer_host/resource_request_details.h"
+#include "content/browser/resource_context.h"
#include "content/browser/site_instance.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
#include "content/browser/tab_contents/tab_contents_view.h"
@@ -186,8 +187,10 @@ void PrerenderContents::StartPrerenderingOld(
// Register this with the PrerenderTracker as a prerendering RenderViewHost.
// This must be done before the Navigate message to catch all resource
// requests.
- PrerenderTracker::GetInstance()->OnPrerenderingStarted(child_id_, route_id_,
- prerender_manager_);
+ g_browser_process->prerender_tracker()->OnPrerenderingStarted(
+ child_id_,
+ route_id_,
+ prerender_manager_);
// Close ourselves when the application is shutting down.
notification_registrar_.Add(this, NotificationType::APP_TERMINATING,
@@ -290,8 +293,10 @@ void PrerenderContents::StartPrerendering(
// RenderViewHost. This must be done before the Navigate message to catch all
// resource requests, but as it is on the same thread as the Navigate message
// (IO) there is no race condition.
- PrerenderTracker::GetInstance()->OnPrerenderingStarted(child_id_, route_id_,
- prerender_manager_);
+ g_browser_process->prerender_tracker()->OnPrerenderingStarted(
+ child_id_,
+ route_id_,
+ prerender_manager_);
// Close ourselves when the application is shutting down.
notification_registrar_.Add(this, NotificationType::APP_TERMINATING,
@@ -377,7 +382,7 @@ PrerenderContents::~PrerenderContents() {
render_view_host_->Shutdown();
if (child_id_ != -1 && route_id_ != -1) {
- PrerenderTracker::GetInstance()->OnPrerenderingFinished(
+ g_browser_process->prerender_tracker()->OnPrerenderingFinished(
child_id_, route_id_);
}
@@ -720,15 +725,14 @@ void PrerenderContents::Destroy(FinalStatus final_status) {
// because destroy may be called directly from the UI thread without calling
// TryCancel(). This is difficult to completely avoid, since prerendering
// can be cancelled before a RenderView is created.
- bool is_cancelled =
- PrerenderTracker::GetInstance()->TryCancel(child_id_, route_id_,
- final_status);
+ bool is_cancelled = g_browser_process->prerender_tracker()->TryCancel(
+ child_id_, route_id_, final_status);
CHECK(is_cancelled);
// A different final status may have been set already from another thread.
// If so, use it instead.
- if (!PrerenderTracker::GetInstance()->GetFinalStatus(child_id_, route_id_,
- &final_status)) {
+ if (!g_browser_process->prerender_tracker()->GetFinalStatus(
+ child_id_, route_id_, &final_status)) {
NOTREACHED();
}
}

Powered by Google App Engine
This is Rietveld 408576698